Update dependencies for next release

* typo corrections

* more typos

* initial work towards dockerized version of grocy

* placeholder for future README

* fully working dockerized grocy

* updated final size of docker images

.dockerignore

@@ -0,0 +1,6 @@
+.git
+.vscode
+.gitignore
+build.bat
+Dockerfile
+.DS_store

.gitignore

@@ -1,3 +1,4 @@
 /public/node_modules
 /vendor
 /.release
+embedded.txt

Dockerfile-grocy

@@ -0,0 +1,58 @@
+FROM php:7.2-fpm-alpine
+MAINTAINER Talmai Oliveira <to@talm.ai>
+
+RUN	apk update && \
+	apk upgrade && \
+	apk add --update yarn git &&\
+	mkdir -p /www && \
+    # Set environments
+	sed -i "s|;*daemonize\s*=\s*yes|daemonize = no|g" /usr/local/etc/php-fpm.conf && \
+	sed -i "s|;*listen\s*=\s*127.0.0.1:9000|listen = 9000|g" /usr/local/etc/php-fpm.conf && \
+	sed -i "s|;*listen\s*=\s*/||g" /usr/local/etc/php-fpm.conf && \
+#	sed -i "s|;*log_level\s*=\s*notice|log_level = debug|g" /usr/local/etc/php-fpm.conf && \
+	sed -i "s|;*chdir\s*=\s*/var/www|chdir = /www|g" /usr/local/etc/php-fpm.d/www.conf && \
+#	sed -i "s|;*access.log\s*=\s*log/\$pool.access.log|access.log = \$pool.access.log|g" /usr/local/etc/php-fpm.d/www.conf && \
+#	sed -i "s|;*pm.status_path\s*=\s*/status|pm.status_path = /status|g" /usr/local/etc/php-fpm.d/www.conf && \
+#	sed -i "s|;*memory_limit =.*|memory_limit = ${PHP_MEMORY_LIMIT}|i" /usr/local/etc/php.ini && \
+#    sed -i "s|;*upload_max_filesize =.*|upload_max_filesize = ${MAX_UPLOAD}|i" /usr/local/etc/php.ini && \
+#    sed -i "s|;*max_file_uploads =.*|max_file_uploads = ${PHP_MAX_FILE_UPLOAD}|i" /usr/local/etc/php.ini && \
+#    sed -i "s|;*post_max_size =.*|post_max_size = ${PHP_MAX_POST}|i" /usr/local/etc/php.ini && \
+#    sed -i "s|;*cgi.fix_pathinfo=.*|cgi.fix_pathinfo= 0|i" /usr/local/etc/php.ini && \
+	wget https://raw.githubusercontent.com/composer/getcomposer.org/1b137f8bf6db3e79a38a5bc45324414a6b1f9df2/web/installer -O - -q | php -- --quiet && \
+    # Cleaning up
+	rm -rf /var/cache/apk/*
+
+COPY public /www/public
+COPY info.php /www/public
+COPY controllers /www/controllers
+COPY data /www/data
+COPY helpers /www/helpers
+COPY localization/ /www/localization
+COPY middleware/ /www/middleware
+COPY migrations/ /www/migrations
+COPY publication_assets/ /www/publication_assets
+COPY services/ /www/services
+COPY views/ /www/views
+COPY .yarnrc /www/
+COPY *.php /www/
+COPY *.json /www/
+COPY composer.* /root/.composer/
+COPY *yarn* /www/
+COPY *.sh /www/
+
+# run php composer.phar with -vvv for extra debug information
+RUN cd /var/www/html && \
+	php composer.phar --working-dir=/www/ -n install && \
+	cp /www/config-dist.php /www/data/config.php && \
+	cd /www && \
+	yarn install && \
+	chown www-data:www-data -R /www/
+
+# Set Workdir
+WORKDIR /www/public
+
+# Expose volumes
+VOLUME ["/www"]
+
+# Expose ports
+EXPOSE 9000

Dockerfile-grocy-nginx

@@ -0,0 +1,32 @@
+FROM alpine:latest
+MAINTAINER Talmai Oliveira <to@talm.ai>
+
+RUN	apk update && \
+	apk upgrade && \
+	apk add --update openssl nginx && \
+	mkdir -p /etc/nginx/certificates && \
+	mkdir -p /var/run/nginx && \
+	mkdir -p /usr/share/nginx/html && \
+	openssl req \
+		-x509 \
+		-newkey rsa:2048 \
+		-keyout /etc/nginx/certificates/key.pem \
+		-out /etc/nginx/certificates/cert.pem \
+		-days 365 \
+		-nodes \
+		-subj /CN=localhost && \
+	rm -rf /var/cache/apk/*
+
+COPY docker_nginx/nginx.conf /etc/nginx/nginx.conf
+COPY docker_nginx/common.conf /etc/nginx/common.conf
+COPY docker_nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf
+COPY docker_nginx/conf.d/ssl.conf /etc/nginx/conf.d/ssl.conf
+
+# Expose volumes
+VOLUME ["/etc/nginx/conf.d", "/var/log/nginx"]
+
+# Expose ports
+EXPOSE 80 443
+
+# Entry point
+ENTRYPOINT ["/usr/sbin/nginx", "-g", "daemon off;"]

README.md

@@ -2,25 +2,41 @@
 ERP beyond your fridge
 
 ## Give it a try
-Public demo of the latest version → [https://demo.grocy.info](https://demo.grocy.info) 
+- Public demo of the latest stable version → [https://demo.grocy.info](https://demo.grocy.info)
+- Public demo of the latest pre-release version (current master branch) → [https://demo-prerelease.grocy.info](https://demo-prerelease.grocy.info)
 
 ## Motivation
-A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete houshold management"-thing.
-
-## What it is about
-For now my main focus is on stock management, ERP your fridge!
+A household needs to be managed. I did this so far (almost 10 years) with my first self written software (a C# windows forms application) and with a bunch of Excel sheets. The software is a pain to use and Excel is Excel. So I searched for and tried different things for a (very) long time, nothing 100 % fitted, so this is my aim for a "complete household management"-thing. ERP your fridge!
 
 ## How to install
-Just unpack the [latest release](https://github.com/berrnd/grocy/releases/latest) on your PHP (SQLite extension required, currently only tested with PHP 7.2) enabled webserver (webservers root should point to the `/public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go.
+> **NEW**
+>
+> There is now grocy-desktop if you want to run grocy without a webserver just like a normal (windows) desktop application.
+>
+> See https://github.com/berrnd/grocy-desktop or directly download the [latest release](https://releases.grocy.info/latest-desktop) - the installation is nothing more than just clicking 2 times "next"...
 
-Default login is user `admin` with password `admin` - see the `data/config.php` file. Alternatively clone this repository and install Composer and Yarn dependencies manually.
+Just unpack the [latest release](https://releases.grocy.info/latest) on your PHP (SQLite extension required, currently only tested with PHP 7.2) enabled webserver (webservers root should point to the `public` directory), copy `config-dist.php` to `data/config.php`, edit it to your needs, ensure that the `data` directory is writable and you're ready to go, (to make writable `chown -R www-data:www-data data/`). Default login is user `admin` with password `admin`, please change the password immediately (see user menu).
+
+Alternatively clone this repository and install Composer and Yarn dependencies manually.
 
 If you use nginx as your webserver, please include `try_files $uri /index.php;` in your location block.
 
 If, however, your webserver does not support URL rewriting, set `DISABLE_URL_REWRITING` in `data/config.php` (`Setting('DISABLE_URL_REWRITING', true);`).
 
+## How to run using Docker
+
+The docker images build are based on [Alpine](https://hub.docker.com/_/alpine/), with an extremelly low footprint (less than 10 MB for nginx, and less than 70MB for grocy with php-fm. That number is eventually bumped up to 353MB after all the dependencies are downloaded, however). Anyhow, to run using docker just do the following:
+
+```
+> docker-compose up
+```
+
+And grocy should be accessible via `http(s)://localhost/`. The https option will work. However, since the certificate is self-signed, most browsers will complain.
+
 ## How to update
-Just overwrite everything with the latest release while keeping the `/data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings).
+Just overwrite everything with the latest release while keeping the `data` directory, check `config-dist.php` for new configuration options and add them to your `data/config.php` (the default from values `config-dist.php` will be used for not in `data/config.php` defined settings). Just to be sure, please empty `data/viewcache`.
+
+If you run grocy on Linux, there is also `update.sh` (remember to make the script executable, `chmod +x update.sh` and ensure that you have `unzip` installed) which does exactly this and additionally creates a backup (`.tgz` archive) of the current installation in `data/backups` (backups older than 60 days will be deleted during the update).
 
 ## Localization
 grocy is fully localizable - the default language is English (integrated into code), a German localization is always maintained by me. There is one file per language in the `localization` directory, if you want to create a translation, it's best to copy `localization/de.php` to a new one (e. g. `localization/it.php`) and translating all strings there. (Language can be changed in `data/config.php`, e. g. `Setting('CULTURE', 'it');`)
@@ -39,10 +55,12 @@ Some fields also allow to select a value by scanning a barcode. It works best wh
 ### Input shorthands for date fields
 For (productivity) reasons all date (and time) input fields use the ISO-8601 format regardless of localization.
 The following shorthands are available:
-- `MMDD` gets expanded to the given day on the current year in proper notation
+- `MMDD` gets expanded to the given day on the current year, if > today, or to the given day next year, if < today, in proper notation
   - Example: `0517` will be converted to `2018-05-17`
 - `YYYYMMDD` gets expanded to the proper ISO-8601 notation
   - Example: `20190417` will be converted to `2019-04-17`
+- `YYYYMMe` or `YYYYMM+` gets expanded to the end of the given month in the given year in proper notation
+  - Example: `201807e` will be converted to `2018-07-31`
 - `x` gets expanded to `2999-12-31` (which I use for products which never expire)
 - Down/up arrow keys will increase/decrease the date by one day
 - Right/left arrow keys will increase/decrease the date by 1 week
@@ -59,13 +77,18 @@ There is no plugin included for any service, see the reference implementation in
 ### Database migrations
 Database schema migration is automatically done when visiting the root (`/`) route (click on the logo in the left upper edge).
 
-### Demo mode
-When the file `data/demo.txt` exists, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
-
 ### Adding your own CSS or JS without to have to modify the application itself
 - When the file `data/custom_js.html` exists, the contents of the file will be added just before `</body>` (end of body) on every page
 - When the file `data/custom_css.html` exists, the contents of the file will be added just before `</head>` (end of head) on every page
 
+### Demo mode
+When the file `data/demo.txt` exists, the application will work in a demo mode which means authentication is disabled and some demo data will be generated during the database schema migration.
+
+### Embedded mode
+When the file `embedded.txt` exists, it must contain a valid and writable path which will be used as the data directory instead of `data` and authentication will be disabled (used in [grocy-desktop](https://github.com/berrnd/grocy-desktop)).
+
+In embedded mode, settings can be overridden by text files in `data/settingoverrides`, the file name must be `<SettingName>.txt` (e. g. `BASE_URL.txt`) and the content must be the setting value (normally one single line).
+
 ## Screenshots
 #### Dashboard
 ![Dashboard](https://github.com/berrnd/grocy/raw/master/publication_assets/dashboard.png "Dashboard")

app.php

@@ -6,8 +6,38 @@ use \Psr\Http\Message\ResponseInterface as Response;
 use \Grocy\Helpers\UrlManager;
 use \Grocy\Controllers\LoginController;
 
+// Definitions for embedded mode
+if (file_exists(__DIR__ . '/embedded.txt'))
+{
+	define('GROCY_IS_EMBEDDED_INSTALL', true);
+	define('GROCY_DATAPATH', file_get_contents(__DIR__ . '/embedded.txt'));
+	define('GROCY_USER_ID', 1);
+}
+else
+{
+	define('GROCY_IS_EMBEDDED_INSTALL', false);
+	define('GROCY_DATAPATH', __DIR__ . '/data');
+}
+
+// Definitions for demo mode
+if (file_exists(GROCY_DATAPATH . '/demo.txt'))
+{
+	define('GROCY_IS_DEMO_INSTALL', true);
+	if (!defined('GROCY_USER_ID'))
+	{
+		define('GROCY_USER_ID', 1);
+	}
+}
+else
+{
+	define('GROCY_IS_DEMO_INSTALL', false);
+}
+
+// Load composer dependencies
 require_once __DIR__ . '/vendor/autoload.php';
-require_once __DIR__ . '/data/config.php';
+
+// Load config files
+require_once GROCY_DATAPATH . '/config.php';
 require_once __DIR__ . '/config-dist.php'; //For not in own config defined values we use the default ones
 
 // Setup base application
@@ -18,7 +48,7 @@ $appContainer = new \Slim\Container([
 	],
 	'view' => function($container)
 	{
-		return new \Slim\Views\Blade(__DIR__ . '/views', __DIR__ . '/data/viewcache');
+		return new \Slim\Views\Blade(__DIR__ . '/views', GROCY_DATAPATH . '/viewcache');
 	},
 	'LoginControllerInstance' => function($container)
 	{
@@ -26,7 +56,7 @@ $appContainer = new \Slim\Container([
 	},
 	'UrlManager' => function($container)
 	{
-		return new UrlManager(BASE_URL);
+		return new UrlManager(GROCY_BASE_URL);
 	},
 	'ApiKeyHeaderName' => function($container)
 	{
@@ -35,11 +65,7 @@ $appContainer = new \Slim\Container([
 ]);
 $app = new \Slim\App($appContainer);
 
-if (PHP_SAPI === 'cli')
-{
-	$app->add(\pavlakis\cli\CliRequest::class);
-}
-
+// Load routes from separate file
 require_once __DIR__ . '/routes.php';
 
 $app->run();

build.bat

@@ -10,4 +10,4 @@ del "%releasePath%\grocy_%version%.zip"
 "build_tools\7za.exe" a -r "%releasePath%\grocy_%version%.zip" "%projectPath%\*" -xr!.* -xr!build_tools -xr!build.bat -xr!composer.json -xr!composer.lock -xr!package.json -xr!yarn.lock -xr!publication_assets
 "build_tools\7za.exe" a "%releasePath%\grocy_%version%.zip" "%projectPath%\public\.htaccess"
 "build_tools\7za.exe" rn "%releasePath%\grocy_%version%.zip" .htaccess public\.htaccess
-"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\sessions data\viewcache\*
+"build_tools\7za.exe" d "%releasePath%\grocy_%version%.zip" data\*.* data\storage data\viewcache\*

composer.json

@@ -3,7 +3,6 @@
 		"php": ">=7.2",
 		"slim/slim": "^3.8",
 		"morris/lessql": "^0.3.4",
-		"pavlakis/slim-cli": "^1.0",
 		"rubellum/slim-blade-view": "^0.1.1",
 		"tuupola/cors-middleware": "^0.7.0"
 	},

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "131ab83ecb1ea3d1a431cc70b5092448",
+    "content-hash": "c1bc4c17739e9d0ee8b33628f6d4b9a4",
     "packages": [
         {
             "name": "container-interop/container-interop",
@@ -154,31 +154,32 @@
                 "request",
                 "response"
             ],
+            "abandoned": "psr/http-factory",
             "time": "2017-03-24T14:48:51+00:00"
         },
         {
             "name": "illuminate/container",
-            "version": "v5.6.27",
+            "version": "v5.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
-                "reference": "1f0757cae8749400aeda730f6438a081fc3c082d"
+                "reference": "0fc33b14ae6cf9a1e694fd43f2a274e590a824b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/container/zipball/1f0757cae8749400aeda730f6438a081fc3c082d",
-                "reference": "1f0757cae8749400aeda730f6438a081fc3c082d",
+                "url": "https://api.github.com/repos/illuminate/container/zipball/0fc33b14ae6cf9a1e694fd43f2a274e590a824b2",
+                "reference": "0fc33b14ae6cf9a1e694fd43f2a274e590a824b2",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "5.6.*",
+                "illuminate/contracts": "5.7.*",
                 "php": "^7.1.3",
-                "psr/container": "~1.0"
+                "psr/container": "^1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -198,31 +199,31 @@
             ],
             "description": "The Illuminate Container package.",
             "homepage": "https://laravel.com",
-            "time": "2018-05-24T13:16:56+00:00"
+            "time": "2018-05-28T08:50:10+00:00"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v5.6.27",
+            "version": "v5.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "3dc639feabe0f302f574157a782ede323881a944"
+                "reference": "2daf3c078610f744e2a4dc2f44fb5060cce9835b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/3dc639feabe0f302f574157a782ede323881a944",
-                "reference": "3dc639feabe0f302f574157a782ede323881a944",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/2daf3c078610f744e2a4dc2f44fb5060cce9835b",
+                "reference": "2daf3c078610f744e2a4dc2f44fb5060cce9835b",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
-                "psr/container": "~1.0",
-                "psr/simple-cache": "~1.0"
+                "psr/container": "^1.0",
+                "psr/simple-cache": "^1.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -242,32 +243,32 @@
             ],
             "description": "The Illuminate Contracts package.",
             "homepage": "https://laravel.com",
-            "time": "2018-05-11T23:38:58+00:00"
+            "time": "2018-09-18T12:50:05+00:00"
         },
         {
             "name": "illuminate/events",
-            "version": "v5.6.27",
+            "version": "v5.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/events.git",
-                "reference": "b6e73ed40478cef2ef98d5ddb27f333291606cea"
+                "reference": "4cf622acc05592f86d4a5c77ad1a544d38e58dee"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/events/zipball/b6e73ed40478cef2ef98d5ddb27f333291606cea",
-                "reference": "b6e73ed40478cef2ef98d5ddb27f333291606cea",
+                "url": "https://api.github.com/repos/illuminate/events/zipball/4cf622acc05592f86d4a5c77ad1a544d38e58dee",
+                "reference": "4cf622acc05592f86d4a5c77ad1a544d38e58dee",
                 "shasum": ""
             },
             "require": {
-                "illuminate/container": "5.6.*",
-                "illuminate/contracts": "5.6.*",
-                "illuminate/support": "5.6.*",
+                "illuminate/container": "5.7.*",
+                "illuminate/contracts": "5.7.*",
+                "illuminate/support": "5.7.*",
                 "php": "^7.1.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -287,39 +288,39 @@
             ],
             "description": "The Illuminate Events package.",
             "homepage": "https://laravel.com",
-            "time": "2018-02-26T19:00:55+00:00"
+            "time": "2018-07-26T15:27:42+00:00"
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v5.6.27",
+            "version": "v5.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "2677365f61c66fad13ff12a37cd4fa8aaeb048d2"
+                "reference": "a09fae4470494dc9867609221b46fe844f2f3b70"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/2677365f61c66fad13ff12a37cd4fa8aaeb048d2",
-                "reference": "2677365f61c66fad13ff12a37cd4fa8aaeb048d2",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/a09fae4470494dc9867609221b46fe844f2f3b70",
+                "reference": "a09fae4470494dc9867609221b46fe844f2f3b70",
                 "shasum": ""
             },
             "require": {
-                "illuminate/contracts": "5.6.*",
-                "illuminate/support": "5.6.*",
+                "illuminate/contracts": "5.7.*",
+                "illuminate/support": "5.7.*",
                 "php": "^7.1.3",
-                "symfony/finder": "~4.0"
+                "symfony/finder": "^4.1"
             },
             "suggest": {
-                "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).",
-                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).",
-                "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).",
-                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0)."
+                "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
+                "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
+                "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (^1.0).",
+                "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -339,42 +340,43 @@
             ],
             "description": "The Illuminate Filesystem package.",
             "homepage": "https://laravel.com",
-            "time": "2018-07-07T14:54:27+00:00"
+            "time": "2018-08-14T19:42:44+00:00"
         },
         {
             "name": "illuminate/support",
-            "version": "v5.6.27",
+            "version": "v5.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "97ca44c95392ce0a41749fa47b953734d88b94b1"
+                "reference": "f7c68e8c8aab200cc8ad84f974d5511cda58a742"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/97ca44c95392ce0a41749fa47b953734d88b94b1",
-                "reference": "97ca44c95392ce0a41749fa47b953734d88b94b1",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/f7c68e8c8aab200cc8ad84f974d5511cda58a742",
+                "reference": "f7c68e8c8aab200cc8ad84f974d5511cda58a742",
                 "shasum": ""
             },
             "require": {
-                "doctrine/inflector": "~1.1",
+                "doctrine/inflector": "^1.1",
                 "ext-mbstring": "*",
-                "illuminate/contracts": "5.6.*",
-                "nesbot/carbon": "^1.24.1",
+                "illuminate/contracts": "5.7.*",
+                "nesbot/carbon": "^1.26.3",
                 "php": "^7.1.3"
             },
             "conflict": {
                 "tightenco/collect": "<5.5.33"
             },
             "suggest": {
-                "illuminate/filesystem": "Required to use the composer class (5.6.*).",
+                "illuminate/filesystem": "Required to use the composer class (5.7.*).",
+                "moontoast/math": "Required to use ordered UUIDs (^1.1).",
                 "ramsey/uuid": "Required to use Str::uuid() (^3.7).",
-                "symfony/process": "Required to use the composer class (~4.0).",
-                "symfony/var-dumper": "Required to use the dd function (~4.0)."
+                "symfony/process": "Required to use the composer class (^4.1).",
+                "symfony/var-dumper": "Required to use the dd function (^4.1)."
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -397,35 +399,35 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "https://laravel.com",
-            "time": "2018-07-04T01:23:57+00:00"
+            "time": "2018-09-19T18:36:57+00:00"
         },
         {
             "name": "illuminate/view",
-            "version": "v5.6.27",
+            "version": "v5.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/view.git",
-                "reference": "625c35e8942f0ecd467acb8db8daf8449390d559"
+                "reference": "3ccd29550afe61eb02ad9e4bae0c2e661aadd7af"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/view/zipball/625c35e8942f0ecd467acb8db8daf8449390d559",
-                "reference": "625c35e8942f0ecd467acb8db8daf8449390d559",
+                "url": "https://api.github.com/repos/illuminate/view/zipball/3ccd29550afe61eb02ad9e4bae0c2e661aadd7af",
+                "reference": "3ccd29550afe61eb02ad9e4bae0c2e661aadd7af",
                 "shasum": ""
             },
             "require": {
-                "illuminate/container": "5.6.*",
-                "illuminate/contracts": "5.6.*",
-                "illuminate/events": "5.6.*",
-                "illuminate/filesystem": "5.6.*",
-                "illuminate/support": "5.6.*",
+                "illuminate/container": "5.7.*",
+                "illuminate/contracts": "5.7.*",
+                "illuminate/events": "5.7.*",
+                "illuminate/filesystem": "5.7.*",
+                "illuminate/support": "5.7.*",
                 "php": "^7.1.3",
-                "symfony/debug": "~4.0"
+                "symfony/debug": "^4.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.6-dev"
+                    "dev-master": "5.7-dev"
                 }
             },
             "autoload": {
@@ -445,7 +447,7 @@
             ],
             "description": "The Illuminate View package.",
             "homepage": "https://laravel.com",
-            "time": "2018-07-06T14:55:12+00:00"
+            "time": "2018-09-18T12:50:05+00:00"
         },
         {
             "name": "morris/lessql",
@@ -552,16 +554,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.32.0",
+            "version": "1.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343"
+                "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/64563e2b9f69e4db1b82a60e81efa327a30ff343",
-                "reference": "64563e2b9f69e4db1b82a60e81efa327a30ff343",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
+                "reference": "1dbd3cb01c5645f3e7deda7aa46ef780d95fcc33",
                 "shasum": ""
             },
             "require": {
@@ -603,7 +605,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2018-07-05T06:59:26+00:00"
+            "time": "2018-09-20T19:36:25+00:00"
         },
         {
             "name": "nikic/fast-route",
@@ -651,55 +653,6 @@
             ],
             "time": "2018-02-13T20:26:39+00:00"
         },
-        {
-            "name": "pavlakis/slim-cli",
-            "version": "1.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/pavlakis/slim-cli.git",
-                "reference": "603933a54e391b3c70c573206cce543b75d8b1db"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/pavlakis/slim-cli/zipball/603933a54e391b3c70c573206cce543b75d8b1db",
-                "reference": "603933a54e391b3c70c573206cce543b75d8b1db",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5|^5.6|^7.0|^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.0",
-                "slim/slim": "^3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "pavlakis\\cli\\tests\\": "tests/phpunit",
-                    "pavlakis\\cli\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Antonis Pavlakis",
-                    "email": "adoni@pavlakis.info",
-                    "homepage": "http://pavlakis.info"
-                }
-            ],
-            "description": "Making a mock GET request through the CLI and enabling the same application entry point on CLI scripts.",
-            "homepage": "http://github.com/pavlakis/slim-cli",
-            "keywords": [
-                "cli",
-                "framework",
-                "middleware",
-                "slim"
-            ],
-            "time": "2017-01-30T22:50:06+00:00"
-        },
         {
             "name": "philo/laravel-blade",
             "version": "v3.1",
@@ -1143,16 +1096,16 @@
         },
         {
             "name": "slim/slim",
-            "version": "3.10.0",
+            "version": "3.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/slimphp/Slim.git",
-                "reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748"
+                "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
-                "reference": "d8aabeacc3688b25e2f2dd2db91df91ec6fdd748",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
+                "reference": "d378e70431e78ee92ee32ddde61ecc72edf5dc0a",
                 "shasum": ""
             },
             "require": {
@@ -1210,20 +1163,20 @@
                 "micro",
                 "router"
             ],
-            "time": "2018-04-19T19:29:08+00:00"
+            "time": "2018-09-16T10:54:21+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.1.1",
+            "version": "v4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d"
+                "reference": "b4a0b67dee59e2cae4449a8f8eabc508d622fd33"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
-                "reference": "dbe0fad88046a755dcf9379f2964c61a02f5ae3d",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/b4a0b67dee59e2cae4449a8f8eabc508d622fd33",
+                "reference": "b4a0b67dee59e2cae4449a8f8eabc508d622fd33",
                 "shasum": ""
             },
             "require": {
@@ -1266,20 +1219,20 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2018-06-08T09:39:36+00:00"
+            "time": "2018-09-22T19:04:12+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v4.1.1",
+            "version": "v4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb"
+                "reference": "f0b042d445c155501793e7b8007457f9f5bb1c8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/84714b8417d19e4ba02ea78a41a975b3efaafddb",
-                "reference": "84714b8417d19e4ba02ea78a41a975b3efaafddb",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/f0b042d445c155501793e7b8007457f9f5bb1c8c",
+                "reference": "f0b042d445c155501793e7b8007457f9f5bb1c8c",
                 "shasum": ""
             },
             "require": {
@@ -1315,20 +1268,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2018-06-19T21:38:16+00:00"
+            "time": "2018-09-21T12:49:42+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.8.0",
+            "version": "v1.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "3296adf6a6454a050679cde90f95350ad604b171"
+                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171",
-                "reference": "3296adf6a6454a050679cde90f95350ad604b171",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8",
+                "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8",
                 "shasum": ""
             },
             "require": {
@@ -1340,7 +1293,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.8-dev"
+                    "dev-master": "1.9-dev"
                 }
             },
             "autoload": {
@@ -1374,20 +1327,20 @@
                 "portable",
                 "shim"
             ],
-            "time": "2018-04-26T10:06:28+00:00"
+            "time": "2018-08-06T14:22:27+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v4.1.1",
+            "version": "v4.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854"
+                "reference": "6e49130ddf150b7bfe9e34edb2f3f698aa1aa43b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
-                "reference": "b6d8164085ee0b6debcd1b7a131fd6f63bb04854",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/6e49130ddf150b7bfe9e34edb2f3f698aa1aa43b",
+                "reference": "6e49130ddf150b7bfe9e34edb2f3f698aa1aa43b",
                 "shasum": ""
             },
             "require": {
@@ -1443,7 +1396,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2018-06-22T08:59:39+00:00"
+            "time": "2018-09-21T12:49:42+00:00"
         },
         {
             "name": "tuupola/callable-handler",

config-dist.php

@@ -1,16 +1,17 @@
 <?php
 
-# Login credentials
-Setting('HTTP_USER', 'admin');
-Setting('HTTP_PASSWORD', 'admin');
-
-# Either "production" or "dev"
+# Either "production", "dev" or "prerelease"
 Setting('MODE', 'production');
 
 # Either "en" or "de" or the filename (without extension) of
 # one of the other available localization files in the "/localization" directory
 Setting('CULTURE', 'en');
 
+# To keep it simple: grocy does not handle any currency conversions,
+# this here is used to format all money values,
+# so can be anything (e. g. "USD" OR "$", doesn't matter...)
+Setting('CURRENCY', '$');
+
 # The base url of your installation,
 # should be just "/" when running directly under the root of a (sub)domain
 # or for example "https:/example.com/grocy" when using a subdirectory
@@ -24,3 +25,20 @@ Setting('STOCK_BARCODE_LOOKUP_PLUGIN', 'DemoBarcodeLookupPlugin');
 # If, however, your webserver does not support URL rewriting,
 # set this to true
 Setting('DISABLE_URL_REWRITING', false);
+
+
+# Default user settings
+# These settings can be changed per user, here the defaults
+# are defined which are used when the user has not changed the setting so far
+
+# Night mode related
+DefaultUserSetting('night_mode_enabled', false); // If night mode is enabled always
+DefaultUserSetting('auto_night_mode_enabled', false); // If night mode is enabled automatically when inside a given time range (see the two settings below)
+DefaultUserSetting('auto_night_mode_time_range_from', "20:00"); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_to', "07:00"); // Format HH:mm
+DefaultUserSetting('auto_night_mode_time_range_goes_over_midnight', true); // If the time range above goes over midnight
+DefaultUserSetting('currently_inside_night_mode_range', false); // If we're currently inside of night mode time range (this is not user configurable, but stored as a user setting because it's evaluated client side to be able to use the client time instead of the maybe different server time)
+
+# If the page should be automatically reloaded when there was
+# an external change
+DefaultUserSetting('auto_reload_on_db_change', true);

controllers/BaseController.php

@@ -5,6 +5,7 @@ namespace Grocy\Controllers;
 use \Grocy\Services\DatabaseService;
 use \Grocy\Services\ApplicationService;
 use \Grocy\Services\LocalizationService;
+use \Grocy\Services\UsersService;
 
 class BaseController
 {
@@ -12,13 +13,24 @@ class BaseController
 		$databaseService = new DatabaseService();
 		$this->Database = $databaseService->GetDbConnection();
 		
-		$localizationService = new LocalizationService(CULTURE);
+		$localizationService = new LocalizationService(GROCY_CULTURE);
 		$this->LocalizationService = $localizationService;
 
-		$applicationService = new ApplicationService();
-		$versionInfo = $applicationService->GetInstalledVersion();
-		$container->view->set('version', $versionInfo->Version);
-		$container->view->set('releaseDate', $versionInfo->ReleaseDate);
+		if (GROCY_MODE === 'prerelease')
+		{
+			$commitHash = trim(exec('git log --pretty="%h" -n1 HEAD'));
+			$commitDate = trim(exec('git log --date=iso --pretty="%cd" -n1 HEAD'));
+			
+			$container->view->set('version', "pre-release-$commitHash");
+			$container->view->set('releaseDate', \substr($commitDate, 0, 19));
+		}
+		else
+		{
+			$applicationService = new ApplicationService();
+			$versionInfo = $applicationService->GetInstalledVersion();
+			$container->view->set('version', $versionInfo->Version);
+			$container->view->set('releaseDate', $versionInfo->ReleaseDate);
+		}
 
 		$container->view->set('localizationStrings', $localizationService->GetCurrentCultureLocalizations());
 		$container->view->set('L', function($text, ...$placeholderValues) use($localizationService)
@@ -30,6 +42,15 @@ class BaseController
 			return $container->UrlManager->ConstructUrl($relativePath, $isResource);
 		});
 
+		try {
+			$usersService = new UsersService();
+			$container->view->set('userSettings', $usersService->GetUserSettings(GROCY_USER_ID));
+		}
+		catch (\Exception $ex)
+		{
+			// Happens when database is not initialised or migrated...
+		}
+
 		$this->AppContainer = $container;
 	}
 

controllers/BatteriesApiController.php

@@ -44,4 +44,9 @@ class BatteriesApiController extends BaseApiController
 			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
 		}
 	}
+
+	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->BatteriesService->GetCurrent());
+	}
 }

controllers/BatteriesController.php

@@ -16,22 +16,10 @@ class BatteriesController extends BaseController
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$nextChargeTimes = array();
-		foreach($this->Database->batteries() as $battery)
-		{
-			$nextChargeTimes[$battery->id] = $this->BatteriesService->GetNextChargeTime($battery->id);
-		}
-
-		$nextXDays = 5;
-		$countDueNextXDays = count(FindAllItemsInArrayByValue($nextChargeTimes, date('Y-m-d', strtotime("+$nextXDays days")), '<'));
-		$countOverdue = count(FindAllItemsInArrayByValue($nextChargeTimes, date('Y-m-d', strtotime('-1 days')), '<'));
 		return $this->AppContainer->view->render($response, 'batteriesoverview', [
 			'batteries' => $this->Database->batteries()->orderBy('name'),
 			'current' => $this->BatteriesService->GetCurrent(),
-			'nextChargeTimes' => $nextChargeTimes,
-			'nextXDays' => $nextXDays,
-			'countDueNextXDays' => $countDueNextXDays - $countOverdue,
-			'countOverdue' => $countOverdue
+			'nextXDays' => 5
 		]);
 	}
 

controllers/ChoresApiController.php

@@ -2,19 +2,19 @@
 
 namespace Grocy\Controllers;
 
-use \Grocy\Services\HabitsService;
+use \Grocy\Services\ChoresService;
 
-class HabitsApiController extends BaseApiController
+class ChoresApiController extends BaseApiController
 {
 	public function __construct(\Slim\Container $container)
 	{
 		parent::__construct($container);
-		$this->HabitsService = new HabitsService();
+		$this->ChoresService = new ChoresService();
 	}
 
-	protected $HabitsService;
+	protected $ChoresService;
 
-	public function TrackHabitExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$trackedTime = date('Y-m-d H:i:s');
 		if (isset($request->getQueryParams()['tracked_time']) && !empty($request->getQueryParams()['tracked_time']) && IsIsoDateTime($request->getQueryParams()['tracked_time']))
@@ -22,9 +22,15 @@ class HabitsApiController extends BaseApiController
 			$trackedTime = $request->getQueryParams()['tracked_time'];
 		}
 
+		$doneBy = GROCY_USER_ID;
+		if (isset($request->getQueryParams()['done_by']) && !empty($request->getQueryParams()['done_by']))
+		{
+			$doneBy = $request->getQueryParams()['done_by'];
+		}
+
 		try
 		{
-			$this->HabitsService->TrackHabit($args['habitId'], $trackedTime);
+			$this->ChoresService->TrackChore($args['choreId'], $trackedTime, $doneBy);
 			return $this->VoidApiActionResponse($response);
 		}
 		catch (\Exception $ex)
@@ -33,15 +39,20 @@ class HabitsApiController extends BaseApiController
 		}
 	}
 
-	public function HabitDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	public function ChoreDetails(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		try
 		{
-			return $this->ApiResponse($this->HabitsService->GetHabitDetails($args['habitId']));
+			return $this->ApiResponse($this->ChoresService->GetChoreDetails($args['choreId']));
 		}
 		catch (\Exception $ex)
 		{
 			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
 		}
 	}
+
+	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->ChoresService->GetCurrent());
+	}
 }

controllers/ChoresController.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\ChoresService;
+
+class ChoresController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->ChoresService = new ChoresService();
+	}
+
+	protected $ChoresService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choresoverview', [
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'currentChores' => $this->ChoresService->GetCurrent(),
+			'nextXDays' => 5
+		]);
+	}
+
+	public function TrackChoreExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choretracking', [
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'users' => $this->Database->users()->orderBy('username')
+		]);
+	}
+
+	public function ChoresList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'chores', [
+			'chores' => $this->Database->chores()->orderBy('name')
+		]);
+	}
+
+	public function Analysis(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'choresanalysis', [
+			'choresLog' => $this->Database->chores_log()->orderBy('tracked_time', 'DESC'),
+			'chores' => $this->Database->chores()->orderBy('name'),
+			'users' => $this->Database->users()->orderBy('username')
+		]);
+	}
+
+	public function ChoreEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['choreId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'choreform', [
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'choreform', [
+				'chore' =>  $this->Database->chores($args['choreId']),
+				'periodTypes' => GetClassConstants('\Grocy\Services\ChoresService'),
+				'mode' => 'edit'
+			]);
+		}
+	}
+}

controllers/CliController.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\ApplicationService;
-use \Grocy\Services\DatabaseMigrationService;
-
-class CliController extends BaseController
-{
-	public function RecreateDemo(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		$applicationService = new ApplicationService();
-		if ($applicationService->IsDemoInstallation())
-		{
-			$databaseMigrationService = new DatabaseMigrationService();
-			$databaseMigrationService->RecreateDemo();
-		}
-	}
-}

controllers/FilesApiController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\FilesService;
+
+class FilesApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->FilesService = new FilesService();
+	}
+
+	protected $FilesService;
+
+	public function Upload(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			if (isset($request->getQueryParams()['file_name']) && !empty($request->getQueryParams()['file_name']) && IsValidFileName($request->getQueryParams()['file_name']))
+			{
+				$fileName = $request->getQueryParams()['file_name'];
+			}
+			else
+			{
+				throw new \Exception('file_name query parameter missing or contains an invalid filename');
+			}
+
+			$data = $request->getBody()->getContents();
+			file_put_contents($this->FilesService->GetFilePath($args['group'], $fileName), $data);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+}

controllers/HabitsController.php

@@ -1,70 +0,0 @@
-<?php
-
-namespace Grocy\Controllers;
-
-use \Grocy\Services\HabitsService;
-
-class HabitsController extends BaseController
-{
-	public function __construct(\Slim\Container $container)
-	{
-		parent::__construct($container);
-		$this->HabitsService = new HabitsService();
-	}
-
-	protected $HabitsService;
-
-	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		$nextHabitTimes = array();
-		foreach($this->Database->habits() as $habit)
-		{
-			$nextHabitTimes[$habit->id] = $this->HabitsService->GetNextHabitTime($habit->id);
-		}
-
-		$nextXDays = 5;
-		$countDueNextXDays = count(FindAllItemsInArrayByValue($nextHabitTimes, date('Y-m-d', strtotime("+$nextXDays days")), '<'));
-		$countOverdue = count(FindAllItemsInArrayByValue($nextHabitTimes, date('Y-m-d', strtotime('-1 days')), '<'));
-		return $this->AppContainer->view->render($response, 'habitsoverview', [
-			'habits' => $this->Database->habits()->orderBy('name'),
-			'currentHabits' => $this->HabitsService->GetCurrentHabits(),
-			'nextHabitTimes' => $nextHabitTimes,
-			'nextXDays' => $nextXDays,
-			'countDueNextXDays' => $countDueNextXDays - $countOverdue,
-			'countOverdue' => $countOverdue
-		]);
-	}
-
-	public function TrackHabitExecution(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		return $this->AppContainer->view->render($response, 'habittracking', [
-			'habits' => $this->Database->habits()->orderBy('name')
-		]);
-	}
-
-	public function HabitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		return $this->AppContainer->view->render($response, 'habits', [
-			'habits' => $this->Database->habits()->orderBy('name')
-		]);
-	}
-
-	public function HabitEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
-	{
-		if ($args['habitId'] == 'new')
-		{
-			return $this->AppContainer->view->render($response, 'habitform', [
-				'periodTypes' => GetClassConstants('\Grocy\Services\HabitsService'),
-				'mode' => 'create'
-			]);
-		}
-		else
-		{
-			return $this->AppContainer->view->render($response, 'habitform', [
-				'habit' =>  $this->Database->habits($args['habitId']),
-				'periodTypes' => GetClassConstants('\Grocy\Services\HabitsService'),
-				'mode' => 'edit'
-			]);
-		}
-	}
-}

controllers/LoginController.php

@@ -3,7 +3,6 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\SessionService;
-use \Grocy\Services\ApplicationService;
 use \Grocy\Services\DatabaseMigrationService;
 use \Grocy\Services\DemoDataGeneratorService;
 
@@ -24,10 +23,21 @@ class LoginController extends BaseController
 		$postParams = $request->getParsedBody();
 		if (isset($postParams['username']) && isset($postParams['password']))
 		{
-			if ($postParams['username'] === HTTP_USER && $postParams['password'] === HTTP_PASSWORD)
+			$user = $this->Database->users()->where('username', $postParams['username'])->fetch();
+			$inputPassword = $postParams['password'];
+			$stayLoggedInPermanently = $postParams['stay_logged_in'] == 'on';
+
+			if ($user !== null && password_verify($inputPassword, $user->password))
 			{
-				$sessionKey = $this->SessionService->CreateSession();
-				setcookie($this->SessionCookieName, $sessionKey, time() + 31536000); // Cookie expires in 1 year, but session validity is up to SessionService
+				$sessionKey = $this->SessionService->CreateSession($user->id, $stayLoggedInPermanently);
+				setcookie($this->SessionCookieName, $sessionKey, time() + 31220640000); // Cookie expires in 999 years, but session validity is up to SessionService
+
+				if (password_needs_rehash($user->password, PASSWORD_DEFAULT))
+				{
+					$user->update(array(
+						'password' => password_hash($inputPassword, PASSWORD_DEFAULT)
+					));
+				}
 
 				return $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/'));
 			}
@@ -59,8 +69,7 @@ class LoginController extends BaseController
 		$databaseMigrationService = new DatabaseMigrationService();
 		$databaseMigrationService->MigrateDatabase();
 
-		$applicationService = new ApplicationService();
-		if ($applicationService->IsDemoInstallation())
+		if (GROCY_IS_DEMO_INSTALL)
 		{
 			$demoDataGeneratorService = new DemoDataGeneratorService();
 			$demoDataGeneratorService->PopulateDemoData();

controllers/OpenApiController.php

@@ -35,7 +35,8 @@ class OpenApiController extends BaseApiController
 	public function ApiKeysList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'manageapikeys', [
-			'apiKeys' => $this->Database->api_keys()
+			'apiKeys' => $this->Database->api_keys(),
+			'users' => $this->Database->users()
 		]);
 	}
 

controllers/RecipesApiController.php

@@ -19,4 +19,17 @@ class RecipesApiController extends BaseApiController
 		$this->RecipesService->AddNotFulfilledProductsToShoppingList($args['recipeId']);
 		return $this->VoidApiActionResponse($response);
 	}
+
+	public function ConsumeRecipe(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->RecipesService->ConsumeRecipe($args['recipeId']);
+			return $this->VoidApiActionResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
 }

controllers/RecipesController.php

@@ -76,8 +76,9 @@ class RecipesController extends BaseController
 		{
 			return $this->AppContainer->view->render($response, 'recipeposform', [
 				'mode' => 'create',
-				'recipe' =>  $this->Database->recipes($args['recipeId']),
-				'products' =>  $this->Database->products()->orderBy('name')
+				'recipe' => $this->Database->recipes($args['recipeId']),
+				'products' => $this->Database->products()->orderBy('name'),
+				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
 			]);
 		}
 		else
@@ -85,8 +86,9 @@ class RecipesController extends BaseController
 			return $this->AppContainer->view->render($response, 'recipeposform', [
 				'mode' => 'edit',
 				'recipe' =>  $this->Database->recipes($args['recipeId']),
-				'recipePos' =>  $this->Database->recipes_pos($args['recipePosId']),
-				'products' =>  $this->Database->products()->orderBy('name')
+				'recipePos' => $this->Database->recipes_pos($args['recipePosId']),
+				'products' => $this->Database->products()->orderBy('name'),
+				'quantityUnits' => $this->Database->quantity_units()->orderBy('name')
 			]);
 		}
 	}

controllers/StockApiController.php

@@ -26,6 +26,18 @@ class StockApiController extends BaseApiController
 		}
 	}
 
+	public function ProductPriceHistory(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->StockService->GetProductPriceHistory($args['productId']));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+
 	public function AddProduct(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$bestBeforeDate = date('Y-m-d');
@@ -34,6 +46,12 @@ class StockApiController extends BaseApiController
 			$bestBeforeDate = $request->getQueryParams()['bestbeforedate'];
 		}
 
+		$price = null;
+		if (isset($request->getQueryParams()['price']) && !empty($request->getQueryParams()['price']) && is_numeric($request->getQueryParams()['price']))
+		{
+			$price = $request->getQueryParams()['price'];
+		}
+
 		$transactionType = StockService::TRANSACTION_TYPE_PURCHASE;
 		if (isset($request->getQueryParams()['transactiontype']) && !empty($request->getQueryParams()['transactiontype']))
 		{
@@ -42,7 +60,7 @@ class StockApiController extends BaseApiController
 
 		try
 		{
-			$this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $transactionType);
+			$this->StockService->AddProduct($args['productId'], $args['amount'], $bestBeforeDate, $transactionType, date('Y-m-d'), $price);
 			return $this->VoidApiActionResponse($response);
 		}
 		catch (\Exception $ex)
@@ -100,6 +118,24 @@ class StockApiController extends BaseApiController
 		return $this->ApiResponse($this->StockService->GetCurrentStock());
 	}
 
+	public function CurrentVolatilStock(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$nextXDays = 5;
+		if (isset($request->getQueryParams()['expiring_days']) && !empty($request->getQueryParams()['expiring_days']) && is_numeric($request->getQueryParams()['expiring_days']))
+		{
+			$nextXDays = $request->getQueryParams()['expiring_days'];
+		}
+
+		$expiringProducts = $this->StockService->GetExpiringProducts($nextXDays);
+		$expiredProducts = $this->StockService->GetExpiringProducts(-1);
+		$missingProducts = $this->StockService->GetMissingProducts();
+		return $this->ApiResponse(array(
+			 'expiring_products' => $expiringProducts,
+			 'expired_products' => $expiredProducts,
+			 'missing_products' => $missingProducts
+		));
+	}
+
 	public function AddMissingProductsToShoppingList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		$this->StockService->AddMissingProductsToShoppingList();

controllers/StockController.php

@@ -17,19 +17,13 @@ class StockController extends BaseController
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$currentStock = $this->StockService->GetCurrentStock();
-		$nextXDays = 5;
-		$countExpiringNextXDays = count(FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('+5 days')), '<'));
-		$countAlreadyExpired = count(FindAllObjectsInArrayByPropertyValue($currentStock, 'best_before_date', date('Y-m-d', strtotime('-1 days')), '<'));
 		return $this->AppContainer->view->render($response, 'stockoverview', [
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
 			'locations' => $this->Database->locations()->orderBy('name'),
-			'currentStock' => $currentStock,
+			'currentStock' => $this->StockService->GetCurrentStock(),
 			'missingProducts' => $this->StockService->GetMissingProducts(),
-			'nextXDays' => $nextXDays,
-			'countExpiringNextXDays' => $countExpiringNextXDays,
-			'countAlreadyExpired' => $countAlreadyExpired
+			'nextXDays' => 5
 		]);
 	}
 
@@ -60,7 +54,8 @@ class StockController extends BaseController
 			'listItems' => $this->Database->shopping_list(),
 			'products' => $this->Database->products()->orderBy('name'),
 			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
-			'missingProducts' => $this->StockService->GetMissingProducts()
+			'missingProducts' => $this->StockService->GetMissingProducts(),
+			'productGroups' => $this->Database->product_groups()->orderBy('name')
 		]);
 	}
 
@@ -69,7 +64,8 @@ class StockController extends BaseController
 		return $this->AppContainer->view->render($response, 'products', [
 			'products' => $this->Database->products()->orderBy('name'),
 			'locations' => $this->Database->locations()->orderBy('name'),
-			'quantityunits' => $this->Database->quantity_units()->orderBy('name')
+			'quantityunits' => $this->Database->quantity_units()->orderBy('name'),
+			'productGroups' => $this->Database->product_groups()->orderBy('name')
 		]);
 	}
 
@@ -80,6 +76,13 @@ class StockController extends BaseController
 		]);
 	}
 
+	public function ProductGroupsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'productgroups', [
+			'productGroups' => $this->Database->product_groups()->orderBy('name')
+		]);
+	}
+
 	public function QuantityUnitsList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		return $this->AppContainer->view->render($response, 'quantityunits', [
@@ -94,6 +97,7 @@ class StockController extends BaseController
 			return $this->AppContainer->view->render($response, 'productform', [
 				'locations' =>  $this->Database->locations()->orderBy('name'),
 				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
+				'productgroups' => $this->Database->product_groups()->orderBy('name'),
 				'mode' => 'create'
 			]);
 		}
@@ -103,6 +107,7 @@ class StockController extends BaseController
 				'product' =>  $this->Database->products($args['productId']),
 				'locations' =>  $this->Database->locations()->orderBy('name'),
 				'quantityunits' =>  $this->Database->quantity_units()->orderBy('name'),
+				'productgroups' => $this->Database->product_groups()->orderBy('name'),
 				'mode' => 'edit'
 			]);
 		}
@@ -125,6 +130,23 @@ class StockController extends BaseController
 		}
 	}
 
+	public function ProductGroupEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['productGroupId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'productgroupform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'productgroupform', [
+				'group' =>  $this->Database->product_groups($args['productGroupId']),
+				'mode' => 'edit'
+			]);
+		}
+	}
+
 	public function QuantityUnitEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
 		if ($args['quantityunitId'] == 'new')

controllers/SystemApiController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\DatabaseService;
+
+class SystemApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->DatabaseService = new DatabaseService();
+	}
+
+	protected $DatabaseService;
+
+	public function GetDbChangedTime(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse(array(
+			'changed_time' => $this->DatabaseService->GetDbChangedTime()
+		));
+	}
+
+	public function LogMissingLocalization(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if (GROCY_MODE === 'dev')
+		{
+			try
+			{
+				$requestBody = $request->getParsedBody();
+
+				$this->LocalizationService->LogMissingLocalization(GROCY_CULTURE, $requestBody['text']);
+				return $this->ApiResponse(array('success' => true));
+			}
+			catch (\Exception $ex)
+			{
+				return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+			}
+		}	
+	}
+}

controllers/TasksApiController.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\TasksService;
+
+class TasksApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->TasksService = new TasksService();
+	}
+
+	protected $TasksService;
+
+	public function Current(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->ApiResponse($this->TasksService->GetCurrent());
+	}
+
+	public function MarkTaskAsCompleted(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$doneTime = date('Y-m-d H:i:s');
+		if (isset($request->getQueryParams()['done_time']) && !empty($request->getQueryParams()['done_time']) && IsIsoDateTime($request->getQueryParams()['done_time']))
+		{
+			$doneTime = $request->getQueryParams()['done_time'];
+		}
+
+		try
+		{
+			$this->TasksService->MarkTaskAsCompleted($args['taskId'], $doneTime);
+			return $this->VoidApiActionResponse($response);
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+}

controllers/TasksController.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\TasksService;
+
+class TasksController extends BaseController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->TasksService = new TasksService();
+	}
+
+	protected $TasksService;
+
+	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if (isset($request->getQueryParams()['include_done']))
+		{
+			$tasks = $this->Database->tasks()->orderBy('name');
+		}
+		else
+		{
+			$tasks = $this->TasksService->GetCurrent();
+		}
+
+		return $this->AppContainer->view->render($response, 'tasks', [
+			'tasks' => $tasks,
+			'nextXDays' => 5,
+			'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+			'users' => $this->Database->users()
+		]);
+	}
+
+	public function TaskEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['taskId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'taskform', [
+				'mode' => 'create',
+				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+				'users' => $this->Database->users()->orderBy('username')
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'taskform', [
+				'task' =>  $this->Database->tasks($args['taskId']),
+				'mode' => 'edit',
+				'taskCategories' => $this->Database->task_categories()->orderBy('name'),
+				'users' => $this->Database->users()->orderBy('username')
+			]);
+		}
+	}
+
+	public function TaskCategoriesList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'taskcategories', [
+			'taskCategories' => $this->Database->task_categories()->orderBy('name')
+		]);
+	}
+
+	public function TaskCategoryEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['categoryId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'taskcategoryform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'taskcategoryform', [
+				'category' =>  $this->Database->task_categories($args['categoryId']),
+				'mode' => 'edit'
+			]);
+		}
+	}
+}

controllers/UsersApiController.php

@@ -0,0 +1,99 @@
+<?php
+
+namespace Grocy\Controllers;
+
+use \Grocy\Services\UsersService;
+
+class UsersApiController extends BaseApiController
+{
+	public function __construct(\Slim\Container $container)
+	{
+		parent::__construct($container);
+		$this->UsersService = new UsersService();
+	}
+
+	protected $UsersService;
+
+	public function GetUsers(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			return $this->ApiResponse($this->UsersService->GetUsersAsDto());
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+
+	public function CreateUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			$this->UsersService->CreateUser($requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			return $this->ApiResponse(array('success' => true));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+
+	public function DeleteUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$this->UsersService->DeleteUser($args['userId']);
+			return $this->ApiResponse(array('success' => true));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+
+	public function EditUser(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		$requestBody = $request->getParsedBody();
+
+		try
+		{
+			$this->UsersService->EditUser($args['userId'], $requestBody['username'], $requestBody['first_name'], $requestBody['last_name'], $requestBody['password']);
+			return $this->ApiResponse(array('success' => true));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+
+	public function GetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$value = $this->UsersService->GetUserSetting(GROCY_USER_ID, $args['settingKey']);
+			return $this->ApiResponse(array('value' => $value));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+
+	public function SetUserSetting(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		try
+		{
+			$requestBody = $request->getParsedBody();
+
+			$value = $this->UsersService->SetUserSetting(GROCY_USER_ID, $args['settingKey'], $requestBody['value']);
+			return $this->ApiResponse(array('success' => true));
+		}
+		catch (\Exception $ex)
+		{
+			return $this->VoidApiActionResponse($response, false, 400, $ex->getMessage());
+		}
+	}
+}

controllers/UsersController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace Grocy\Controllers;
+
+class UsersController extends BaseController
+{
+	public function UsersList(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		return $this->AppContainer->view->render($response, 'users', [
+			'users' => $this->Database->users()->orderBy('username')
+		]);
+	}
+
+	public function UserEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
+	{
+		if ($args['userId'] == 'new')
+		{
+			return $this->AppContainer->view->render($response, 'userform', [
+				'mode' => 'create'
+			]);
+		}
+		else
+		{
+			return $this->AppContainer->view->render($response, 'userform', [
+				'user' =>  $this->Database->users($args['userId']),
+				'mode' => 'edit'
+			]);
+		}
+	}
+}

docker-compose.yml

@@ -0,0 +1,30 @@
+# Usage:
+# docker-compose build && docker-compose up
+version: '2'
+
+services:
+  grocy-nginx:
+    build:
+      context: .
+      dockerfile: Dockerfile-grocy-nginx
+    depends_on:
+      - grocy
+    ports:
+      - '80:80'
+      - '443:443'
+    volumes_from:
+      - grocy
+    container_name: grocy-nginx
+
+  grocy:
+    build:
+      context: .
+      dockerfile: Dockerfile-grocy
+    expose:
+      - 9000
+    environment:
+      PHP_MEMORY_LIMIT:    512M
+      MAX_UPLOAD:          50M
+      PHP_MAX_FILE_UPLOAD: 200
+      PHP_MAX_POST:        100M
+    container_name: grocy

docker_nginx/common.conf

@@ -0,0 +1,28 @@
+index index.php index.html index.htm;
+
+charset utf-8;
+
+location / {
+    try_files $uri $uri/ /index.php?$query_string;
+}
+
+location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
+	expires 365d;
+}
+
+error_page 404 /404.html;
+error_page 500 502 503 504 /50x.html;
+location = /50x.html {
+	root /usr/share/nginx/html;
+}
+
+location ~ \.php$ {
+    fastcgi_pass   grocy:9000;
+    fastcgi_index  index.php;
+    fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+    include        fastcgi_params;
+}
+
+location ~ /\.ht {
+    deny  all;
+}

docker_nginx/conf.d/default.conf

@@ -0,0 +1,8 @@
+server {
+    listen 80 default_server;
+    server_name _;
+    
+    root /www/public; # see: volumes_from 
+    
+    include /etc/nginx/common.conf;
+}

docker_nginx/conf.d/ssl.conf

@@ -0,0 +1,20 @@
+server {
+    listen 443 ssl;
+    server_name _;
+    
+    root /www/public; # see: volumes_from 
+
+    ssl_certificate      /etc/nginx/certificates/cert.pem;
+    ssl_certificate_key  /etc/nginx/certificates/key.pem;
+    
+    error_log /var/log/nginx/error.log;
+
+    # ssl_session_cache    shared:SSL:1m;
+    # ssl_session_timeout  5m;
+
+    # ssl_ciphers  HIGH:!aNULL:!MD5;
+    # ssl_prefer_server_ciphers  on;
+    
+    include /etc/nginx/common.conf;
+
+}

docker_nginx/nginx.conf

@@ -0,0 +1,42 @@
+user nobody;
+worker_processes 1;
+
+pid /var/run/nginx/nginx.pid;
+
+error_log /var/log/nginx/error.log;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include mime.types;
+    default_type application/octet-stream;
+
+    log_format main '$remote_addr - $remote_user [$time_local] "$request" '
+                    '$status $body_bytes_sent "$http_referer" '
+                    '"$http_user_agent" "$http_x_forwarded_for"';
+
+    sendfile on;
+    #tcp_nopush on;
+
+    client_body_timeout 12;
+	client_header_timeout 12;
+	keepalive_timeout 15;
+	send_timeout 10;
+	
+	client_body_buffer_size 10K;
+	client_header_buffer_size 1k;
+	client_max_body_size 50M;
+	large_client_header_buffers 2 1k;
+
+    gzip on;
+	gzip_comp_level 2;
+	gzip_min_length 1000;
+	gzip_proxied expired no-cache no-store private auth;
+	gzip_types text/plain application/x-javascript text/xml text/css application/xml;
+	
+	access_log on;
+
+    include /etc/nginx/conf.d/*.conf;
+}

helpers/UrlManager.php

@@ -20,7 +20,7 @@ class UrlManager
 
 	public function ConstructUrl($relativePath, $isResource = false)
 	{
-		if (DISABLE_URL_REWRITING === false || $isResource === true)
+		if (GROCY_DISABLE_URL_REWRITING === false || $isResource === true)
 		{
 			return rtrim($this->BasePath, '/') . $relativePath;
 		}
@@ -32,6 +32,11 @@ class UrlManager
 
 	private function GetBaseUrl()
 	{
+		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && strpos($_SERVER['HTTP_X_FORWARDED_PROTO'], 'https') !== false)
+		{
+			$_SERVER['HTTPS'] = 'on';
+		}
+
 		return (isset($_SERVER['HTTPS']) ? "https" : "http") . "://$_SERVER[HTTP_HOST]";
 	}
 }

helpers/extensions.php

@@ -130,8 +130,72 @@ function BoolToString(bool $bool)
 
 function Setting(string $name, $value)
 {
-	if (!defined($name))
+	if (!defined('GROCY_' . $name))
 	{
-		define($name, $value);
+		// The content of a $name.txt file in /data/settingoverrides can overwrite the given setting (for embedded mode)
+		$settingOverrideFile = GROCY_DATAPATH . '/settingoverrides/' . $name . '.txt';
+		if (file_exists($settingOverrideFile))
+		{
+			define('GROCY_' . $name, file_get_contents($settingOverrideFile));
+		}
+		else
+		{
+			define('GROCY_' . $name, $value);
+		}
 	}
 }
+
+global $GROCY_DEFAULT_USER_SETTINGS;
+$GROCY_DEFAULT_USER_SETTINGS = array();
+function DefaultUserSetting(string $name, $value)
+{
+	global $GROCY_DEFAULT_USER_SETTINGS;
+	if (!array_key_exists($name, $GROCY_DEFAULT_USER_SETTINGS))
+	{
+		$GROCY_DEFAULT_USER_SETTINGS[$name] = $value;
+	}
+}
+
+function GetUserDisplayName($user)
+{
+	$displayName = '';
+	
+	if (empty($user->first_name) && !empty($user->last_name))
+	{
+		$displayName = $user->last_name;
+	}
+	elseif (empty($user->last_name) && !empty($user->first_name))
+	{
+		$displayName = $user->first_name;
+	}
+	elseif (!empty($user->last_name) && !empty($user->first_name))
+	{
+		$displayName = $user->first_name . ' ' . $user->last_name;
+	}
+	else
+	{
+		$displayName = $user->username;
+	}
+
+	return $displayName;
+}
+
+function Pluralize($number, $singularForm, $pluralForm)
+{
+	$text = $singularForm;
+	if ($number != 1 && $pluralForm !== null && !empty($pluralForm))
+	{
+		$text = $pluralForm;
+	}
+	return $text;
+}
+
+function IsValidFileName($fileName)
+{
+	if(preg_match('#^[a-z0-9]+\.[a-z]+?$#i', $fileName))
+	{
+		return true;
+	}
+
+	return false;
+}

info.php

@@ -0,0 +1,6 @@
+<?php
+
+// Show all information, defaults to INFO_ALL
+phpinfo();
+
+?>

localization/de.php

@@ -2,7 +2,6 @@
 
 return array(
 	'Stock overview' => 'Bestand',
-	'#1 products with #2 units in stock' => '#1 Produkte (#2 Einheiten) vorrätig',
 	'#1 products expiring within the next #2 days' => '#1 Produkte laufen innerhalb der nächsten #2 Tage ab',
 	'#1 products are already expired' => '#1 Produkte sind bereits abgelaufen',
 	'#1 products are below defined min. stock amount' => '#1 Produkte sind unter Mindestbestand',
@@ -10,20 +9,20 @@ return array(
 	'Amount' => 'Menge',
 	'Next best before date' => 'Nächstes MHD',
 	'Logout' => 'Abmelden',
-	'Habits overview' => 'Gewohnheiten',
+	'Chores overview' => 'Hausarbeiten',
 	'Batteries overview' => 'Batterien',
 	'Purchase' => 'Einkauf',
 	'Consume' => 'Verbrauch',
 	'Inventory' => 'Inventur',
 	'Shopping list' => 'Einkaufszettel',
-	'Habit tracking' => 'Gewohnheit-Ausführung',
+	'Chore tracking' => 'Hausarbeiten-Ausführung',
 	'Battery tracking' => 'Batterie-Ladzyklus',
 	'Products' => 'Produkte',
 	'Locations' => 'Standorte',
 	'Quantity units' => 'Mengeneinheiten',
-	'Habits' => 'Gewohnheiten',
+	'Chores' => 'Hausarbeiten',
 	'Batteries' => 'Batterien',
-	'Habit' => 'Gewohnheit',
+	'Chore' => 'Hausarbeit',
 	'Next estimated tracking' => 'Nächste geplante Ausführung',
 	'Last tracked' => 'Zuletzt ausgeführt',
 	'Battery' => 'Batterie',
@@ -42,7 +41,7 @@ return array(
 	'New amount' => 'Neue Menge',
 	'Note' => 'Notiz',
 	'Tracked time' => 'Ausführungszeit',
-	'Habit overview' => 'Gewohnheit Übersicht',
+	'Chore overview' => 'Hausarbeit Übersicht',
 	'Tracked count' => 'Ausführungsanzahl',
 	'Battery overview' => 'Batterie Übersicht',
 	'Charge cycles count' => 'Ladezyklen',
@@ -69,11 +68,11 @@ return array(
 	'Create quantity unit' => 'Mengeneinheit erstellen',
 	'Period type' => 'Periodentyp',
 	'Period days' => 'Tage/Periode',
-	'Create habit' => 'Gewohnheit erstellen',
+	'Create chore' => 'Hausarbeit erstellen',
 	'Used in' => 'Benutzt in',
 	'Create battery' => 'Batterie erstellen',
 	'Edit battery' => 'Batterie bearbeiten',
-	'Edit habit' => 'Gewohnheit bearbeiten',
+	'Edit chore' => 'Hausarbeit bearbeiten',
 	'Edit quantity unit' => 'Mengeneinheit bearbeiten',
 	'Edit product' => 'Produkt bearbeiten',
 	'Edit location' => 'Standort bearbeiten',
@@ -91,7 +90,7 @@ return array(
 	'Are you sure to delete battery "#1"?' => 'Battery "#1" wirklich löschen?',
 	'Yes' => 'Ja',
 	'No' => 'Nein',
-	'Are you sure to delete habit "#1"?' => 'Gewohnheit "#1" wirklich löschen?',
+	'Are you sure to delete chore "#1"?' => 'Hausarbeit "#1" wirklich löschen?',
 	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" konnte nicht zu einem Produkt aufgelöst werden, wie möchtest du weiter machen?',
 	'Create or assign product' => 'Produkt erstellen oder verknüpfen',
 	'Cancel' => 'Abbrechen',
@@ -111,29 +110,29 @@ return array(
 	'This product is not in stock' => 'Dieses Produkt ist nicht vorrätig',
 	'This means #1 will be added to stock' => 'Das bedeutet #1 wird dem Bestand hinzugefügt',
 	'This means #1 will be removed from stock' => 'Das bedeutet #1 wird aus dem Bestand entfernt',
-	'This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked' => 'Das bedeutet, dass eine erneute Ausführung der Gewohnheit #1 Tage nach der letzten Ausführung geplant wird',
+	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'Das bedeutet, dass eine erneute Ausführung der Hausarbeit #1 Tage nach der letzten Ausführung geplant wird',
 	'Removed #1 #2 of #3 from stock' => '#1 #2 #3 aus dem Bestand entfernt',
 	'About grocy' => 'Über grocy',
 	'Close' => 'Schließen',
 	'#1 batteries are due to be charged within the next #2 days' => '#1 Batterien müssen in den nächsten #2 Tagen geladen werden',
 	'#1 batteries are overdue to be charged' => '#1 Batterien sind überfällig',
-	'#1 habits are due to be done within the next #2 days' => '#1 Gewohnheiten stehen in den nächsten #2 Tagen an',
-	'#1 habits are overdue to be done' => '#1 Gewohnheiten sind überfällig',
+	'#1 chores are due to be done within the next #2 days' => '#1 Hausarbeiten stehen in den nächsten #2 Tagen an',
+	'#1 chores are overdue to be done' => '#1 Hausarbeiten sind überfällig',
 	'Released on' => 'Veröffentlicht am',
 	'Consume #3 #1 of #2' => 'Verbrauche #3 #1 #2',
 	'Added #1 #2 of #3 to stock' => '#1 #2 #3 dem Bestand hinzugefügt',
 	'Stock amount of #1 is now #2 #3' => 'Es sind nun #2 #3 #1 im Bestand',
-	'Tracked execution of habit #1 on #2' => 'Ausführung von #1 am #2 erfasst',
-	'Tracked charge cylce of battery #1 on #2' => 'Ladezyklus für Batterie #1 am #2 erfasst',
+	'Tracked execution of chore #1 on #2' => 'Ausführung von #1 am #2 erfasst',
+	'Tracked charge cycle of battery #1 on #2' => 'Ladezyklus für Batterie #1 am #2 erfasst',
 	'Consume all #1 which are currently in stock' => 'Verbrauche den kompletten Bestand von #1',
 	'All' => 'Alle',
 	'Track charge cycle of battery #1' => 'Erfasse einen Ladezyklus für Batterie #1',
-	'Track execution of habit #1' => 'Erfasse eine Ausführung von #1',
+	'Track execution of chore #1' => 'Erfasse eine Ausführung von #1',
 	'Filter by location' => 'Nach Standort filtern',
 	'Search' => 'Suche',
 	'Not logged in' => 'Nicht angemeldet',
 	'You have to select a product' => 'Ein Produkt muss ausgewählt werden',
-	'You have to select a habit' => 'Eine Gewohnheit muss ausgewählt werden',
+	'You have to select a chore' => 'Eine Hausarbeit muss ausgewählt werden',
 	'You have to select a battery' => 'Eine Batterie muss ausgewählt werden',
 	'A name is required' => 'Ein Name ist erforderlich',
 	'A location is required' => 'Ein Standort ist erforderlich',
@@ -169,6 +168,95 @@ return array(
 	'Put missing amount on shopping list' => 'Fehlende Menge auf den Einkaufszettel setzen',
 	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Sicher alle fehlenden Zutaten für Rezept "#1" auf die Einkaufsliste zu setzen?',
 	'Added for recipe #1' => 'Hinzugefügt für Rezept #1',
+	'Manage users' => 'Benutzer verwalten',
+	'User' => 'Benutzer',
+	'Users' => 'Benutzer',
+	'Are you sure to delete user "#1"?' => 'Benutzer "#1" wirklich löschen?',
+	'Create user' => 'Benutzer erstellen',
+	'Edit user' => 'Benutzer bearbeiten',
+	'First name' => 'Vorname',
+	'Last name' => 'Nachname',
+	'A username is required' => 'Ein Benutzername ist erforderlich',
+	'Confirm password' => 'Passwort bestätigen',
+	'Passwords do not match' => 'Passwörter stimmen nicht überein',
+	'Change password' => 'Passwort ändern',
+	'Done by' => 'Ausgeführt von',
+	'Last done by' => 'Zuletzt ausgeführt von',
+	'Unknown' => 'Unbekannt',
+	'Filter by chore' => 'Nach Hausarbeit filtern',
+	'Chores analysis' => 'Hausarbeiten Analyse',
+	'0 means suggestions for the next charge cycle are disabled' => '0 bedeutet dass Vorschläge für den nächsten Ladezyklus deaktiviert sind',
+	'Charge cycle interval (days)' => 'Ladezyklusintervall (Tage)',
+	'Last price' => 'Letzter Preis',
+	'Price history' => 'Preisentwicklung',
+	'No price history available' => 'Keine Preisdaten verfügbar',
+	'Price' => 'Preis',
+	'in #1 per purchase quantity unit' => 'in #1 pro Einkaufsmengeneinheit',
+	'The price cannot be lower than #1' => 'Der Preis darf nicht niedriger als #1 sein',
+	'#1 product expires within the next #2 days' => '#1 Produkt läuft innerhalb der nächsten #2 Tage ab',
+	'#1 product is already expired' => '#1 Produkt ist bereits abgelaufen',
+	'#1 product is below defined min. stock amount' => '#1 Produkt ist unter Mindestbestand',
+	'Unit' => 'Einheit',
+	'Units' => 'Einheiten',
+	'#1 chore is due to be done within the next #2 days' => '#1 Hausarbeit steht in den nächsten #2 Tagen an',
+	'#1 chore is overdue to be done' => '#1 Hausarbeit ist überfällig',
+	'#1 battery is due to be charged within the next #2 days' => '#1 Batterie muss in den nächsten #2 Tagen geladen werden',
+	'#1 battery is overdue to be charged' => '#1 Batterie ist überfällig',
+	'#1 unit was automatically added and will apply in addition to the amount entered here' => '#1 Einheit wurde automatisch hinzugefügt und gilt zusätzlich der hier eingegebenen Menge',
+	'in singular form' => 'in der Einzahl',
+	'in plural form' => 'in der Mehrzahl',
+	'Never expires' => 'Läuft nie ab',
+	'This cannot be lower than #1' => 'Dies darf nicht kleiner als #1 sein',
+	'-1 means that this product never expires' => '-1 bedeuet, dass dieses Produkt niemals abläuft',
+	'Quantity unit' => 'Mengeneinheit',
+	'Only check if a single unit is in stock (a different quantity can then be used above)' => 'Nur prüfen, ob eine einzelne Einheit vorrätig ist (eine abweichende Mengeneinheit kann dann oben verwendet werden)',
+	'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?' => 'Sicher, dass alle Zutaten die vom Rezept "#1" benötigt werden aus dem Bestand entfernt werden sollen (Zutaten markiert mit "nur prüfen, ob eine einzelne Einheit vorrätig ist" werden ignoriert)?',
+	'Removed all ingredients of recipe "#1" from stock' => 'Alle Zutaten, die vom Rezept "#1" benötigt werden, wurdem aus dem Bestand entfernt',
+	'Consume all ingredients needed by this recipe' => 'Alle Zutaten, die von diesem Rezept benötigt werden, aus dem Bestand enternen',
+	'Click to show technical details' => 'Klick um technische Details anzuzeigen',
+	'Error while saving, probably this item already exists' => 'Fehler beim Speichern, möglicherweise existiert das Element bereits',
+	'Error details' => 'Fehlerdetails',
+	'Tasks' => 'Aufgaben',
+	'Show done tasks' => 'Erledigte Aufgaben anzeigen',
+	'Task' => 'Aufgabe',
+	'Due' => 'Fällig',
+	'Assigned to' => 'Zugewiesen an',
+	'Mark task "#1" as completed' => 'Aufgabe "#1" als erledigt markieren',
+	'Uncategorized' => 'Nicht kategorisiert',
+	'Task categories' => 'Aufgabenkategorien',
+	'Create task' => 'Aufgabe erstellen',
+	'A due date is required' => 'Ein Fälligkeitsdatum ist erforderlich',
+	'Category' => 'Kategorie',
+	'Edit task' => 'Aufgabe bearbeiten',
+	'Are you sure to delete task "#1"?' => 'Aufgabe "#1" wirklich löschen?',
+	'#1 task is due to be done within the next #2 days' => '#1 Aufgabe steht in den nächsten #2 Tagen an',
+	'#1 tasks are due to be done within the next #2 days' => '#1 Aufgaben stehen in den nächsten #2 Tagen an',
+	'#1 task is overdue to be done' => '#1 Aufgabe ist überfällig',
+	'#1 tasks are overdue to be done' => '#1 Aufgaben sind überfällig',
+	'Edit task category' => 'Aufgabenkategorie bearbeiten',
+	'Create task category' => 'Aufgabenkategorie erstellen',
+	'Product groups' => 'Produktgruppen',
+	'Ungrouped' => 'Ungruppiert',
+	'Create product group' => 'Produktgruppe erstellen',
+	'Edit product group' => 'Produktgruppe bearbeiten',
+	'Product group' => 'Produktgruppe',
+	'Are you sure to delete product group "#1"?' => 'Produktgruppe "#1" wirklich löschen?',
+	'Stay logged in permanently' => 'Dauerhaft angemeldet bleiben',
+	'When not set, you will get logged out at latest after 30 days' => 'Wenn nicht gesetzt, wirst du spätestens nach 30 Tagen automatisch abgemeldet',
+	'Filter by status' => 'Nach Status filtern',
+	'Below min. stock amount' => 'Unter Mindestbestand',
+	'Expiring soon' => 'Bald ablaufend',
+	'Already expired' => 'Bereits abgelaufen',
+	'Due soon' => 'Bald fällig',
+	'Overdue' => 'Überfällig',
+	'View settings' => 'xxx',
+	'Auto reload on external changes' => 'Autom. akt. bei externen Änderungen',
+	'Enable night mode' => 'Nachtmodus aktivieren',
+	'Auto enable in time range' => 'Autom. akt. in diesem Zeitraum',
+	'From' => 'Von',
+	'in format' => 'im Format',
+	'To' => 'Bis',
+	'Time range goes over midnight' => 'Zeitraum geht über Mitternacht',
 	
 	//Constants
 	'manually' => 'Manuell',
@@ -188,11 +276,17 @@ return array(
 	'Tinned food cupboard' => 'Konservenschrank',
 	'Fridge' => 'Kühlschrank',
 	'Piece' => 'Stück',
+	'Pieces' => 'Stücke',
 	'Pack' => 'Packung',
+	'Packs' => 'Packungen',
 	'Glass' => 'Glas',
+	'Glasses' => 'Gläser',
 	'Tin' => 'Dose',
+	'Tins' => 'Dosen',
 	'Can' => 'Becher',
+	'Cans' => 'Becher',
 	'Bunch' => 'Bund',
+	'Bunches' => 'Bunde',
 	'Gummy bears' => 'Gummibärchen',
 	'Crisps' => 'Chips',
 	'Eggs' => 'Eier',
@@ -226,5 +320,23 @@ return array(
 	'German' => 'Deutsch',
 	'Italian' => 'Italienisch',
 	'Demo in different language' => 'Demo in anderer Sprache',
-	'This is the note content of the recipe ingredient' => 'Dies ist der Inhalt der Notiz der Zutat'
+	'This is the note content of the recipe ingredient' => 'Dies ist der Inhalt der Notiz der Zutat',
+	'Demo User' => 'Demo Benutzer',
+	'Gram' => 'Gramm',
+    'Grams' => 'Gramm',
+    'Flour' => 'Mehl',
+    'Pancakes' => 'Pfannkuchen',
+	'Sugar' => 'Zucker',
+	'Home' => 'Zuhause',
+	'Life' => 'Leben',
+	'Projects' => 'Projekte',
+	'Repair the garage door' => 'Garagentor reparieren',
+	'Fork and improve grocy' => 'grocy forken und verbessern',
+	'Find a solution for what to do when I forget the door keys' => 'Eine Lösung für "Haustürschlüssel vergessen" finden',
+	'Sweets' => 'Süßigkeiten',
+	'Bakery products' => 'Bäckerei Produkte',
+	'Tinned food' => 'Konservern',
+	'Butchery products' => 'Metzgerei',
+	'Vegetables/Fruits' => 'Obst/Gemüse',
+	'Refrigerated products' => 'Kühlregal'
 );

localization/it.php

@@ -2,7 +2,6 @@
 
 return array(
 	'Stock overview' => 'Dispensa',
-	'#1 products with #2 units in stock' => '#1 prodotti stano per finire(#2 unità)',
 	'#1 products expiring within the next #2 days' => '#1 prodotti scadranno tra #2 giorni',
 	'#1 products are already expired' => '#1 prodotti scaduti',
 	'#1 products are below defined min. stock amount' => '#1 prodotti sotto il limite minimo',
@@ -10,20 +9,20 @@ return array(
 	'Amount' => 'quantità',
 	'Next best before date' => 'Prossima data di scadenza',
 	'Logout' => 'Logout',
-	'Habits overview' => 'Riepilogo delle abitudini',
+	'Chores overview' => 'Riepilogo delle abitudini',
 	'Batteries overview' => 'Riepilogo delle batterie',
 	'Purchase' => 'Acquisti',
 	'Consume' => 'Consumi',
 	'Inventory' => 'Inventario',
 	'Shopping list' => 'Lista della spesa',
-	'Habit tracking' => 'Dati abitudini',
+	'Chore tracking' => 'Dati abitudini',
 	'Battery tracking' => 'Dati batterie',
 	'Products' => 'Prodotti',
 	'Locations' => 'Posizioni',
 	'Quantity units' => 'Unità di misura',
-	'Habits' => 'Abitudini',
+	'Chores' => 'Abitudini',
 	'Batteries' => 'Batterie',
-	'Habit' => 'Abitudine',
+	'Chore' => 'Abitudine',
 	'Next estimated tracking' => 'Prossima esecuzione',
 	'Last tracked' => 'Ultima esecuzione',
 	'Battery' => 'Batterie',
@@ -42,7 +41,7 @@ return array(
 	'New amount' => 'Nuova quantità',
 	'Note' => 'Nota',
 	'Tracked time' => 'Ora di esecuzione',
-	'Habit overview' => 'Riepilogo dell\'abitudine',
+	'Chore overview' => 'Riepilogo dell\'abitudine',
 	'Tracked count' => 'Numero di esecuzioni',
 	'Battery overview' => 'Riepilogo della batteria',
 	'Charge cycles count' => 'Numero di ricariche',
@@ -69,11 +68,11 @@ return array(
 	'Create quantity unit' => 'Aggiungi unità di misura',
 	'Period type' => 'Tipo di ripetizione',
 	'Period days' => 'Periodo in giorni',
-	'Create habit' => 'Aggiungi abitudine',
+	'Create chore' => 'Aggiungi abitudine',
 	'Used in' => 'Usato in',
 	'Create battery' => 'Aggiungi batteria',
 	'Edit battery' => 'Modifica batteria',
-	'Edit habit' => 'Modifica abitudine',
+	'Edit chore' => 'Modifica abitudine',
 	'Edit quantity unit' => 'Modifica unità di misura',
 	'Edit product' => 'Modifica prodotto',
 	'Edit location' => 'Modifica posizione',
@@ -91,7 +90,7 @@ return array(
 	'Are you sure to delete battery "#1"?' => 'Sei sicuro di voler eliminare la batteria "#1"?',
 	'Yes' => 'Si',
 	'No' => 'No',
-	'Are you sure to delete habit "#1"?' => 'Sei sicuro di voler eliminare l\'abitudine "#1"?',
+	'Are you sure to delete chore "#1"?' => 'Sei sicuro di voler eliminare l\'abitudine "#1"?',
 	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" non è stato associato a nessun prodotto, vuoi procedere?',
 	'Create or assign product' => 'Aggiungi o assegna prodotto',
 	'Cancel' => 'Annulla',
@@ -111,29 +110,29 @@ return array(
 	'This product is not in stock' => 'Questo prodotto non è in dispensa',
 	'This means #1 will be added to stock' => '#1 sarà aggiunto alla dispensa',
 	'This means #1 will be removed from stock' => '#1 sarà rimosso dalla dispensa',
-	'This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked' => 'L\'esecuzione dell\'abitudine è #1 giorni dopo la precedente',
+	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'L\'esecuzione dell\'abitudine è #1 giorni dopo la precedente',
 	'Removed #1 #2 of #3 from stock' => '#1 #2 su #3 rimossi dalla dispensa',
 	'About grocy' => 'Riguardo grocy',
 	'Close' => 'Chiudi',
 	'#1 batteries are due to be charged within the next #2 days' => '#1 batterie da ricaricare entro #2 giorni',
 	'#1 batteries are overdue to be charged' => '#1 batterie devono essere ricaricate',
-	'#1 habits are due to be done within the next #2 days' => '#1 abitudini da eseguire entro #2 giorni',
-	'#1 habits are overdue to be done' => '#1 abitudini da eseguire',
+	'#1 chores are due to be done within the next #2 days' => '#1 abitudini da eseguire entro #2 giorni',
+	'#1 chores are overdue to be done' => '#1 abitudini da eseguire',
 	'Released on' => 'Rilasciato il',
 	'Consume #3 #1 of #2' => 'Consumati #3 #1 di #2',
 	'Added #1 #2 of #3 to stock' => 'Aggiunti #1 #2 di #3',
 	'Stock amount of #1 is now #2 #3' => 'La quantità in dispensa di #1 è ora #2 #3',
-	'Tracked execution of habit #1 on #2' => 'Esecuzione dell\'abitudine #1 registrata il #2',
-	'Tracked charge cylce of battery #1 on #2' => 'Ricarica della batteria #1 effettuata il #2',
+	'Tracked execution of chore #1 on #2' => 'Esecuzione dell\'abitudine #1 registrata il #2',
+	'Tracked charge cycle of battery #1 on #2' => 'Ricarica della batteria #1 effettuata il #2',
 	'Consume all #1 which are currently in stock' => 'Consuma tutto #1 in dispensa',
 	'All' => 'Tutto',
 	'Track charge cycle of battery #1' => 'Registra la ricarica della batteria #1',
-	'Track execution of habit #1' => 'Registra l\'esecuzione dell\'abitudine #1',
+	'Track execution of chore #1' => 'Registra l\'esecuzione dell\'abitudine #1',
 	'Filter by location' => 'Filtra per posizione',
 	'Search' => 'Cerca',
 	'Not logged in' => 'Non autenticato',
 	'You have to select a product' => 'Devi selezionare un prodotto',
-	'You have to select a habit' => 'Devi selezionare un\'abitudine',
+	'You have to select a chore' => 'Devi selezionare un\'abitudine',
 	'You have to select a battery' => 'Devi selezionare una batteria',
 	'A name is required' => 'Inserisci un nome',
 	'A location is required' => 'Inserisci la posizione',
@@ -160,11 +159,17 @@ return array(
 	'Tinned food cupboard' => 'Konservenschrank',
 	'Fridge' => 'Kühlschrank',
 	'Piece' => 'Pezzo',
+	'Pieces' => 'Pezzi',
 	'Pack' => 'Pacco',
+	'Packs' => 'Pacchi',
 	'Glass' => 'Bicchiere',
+	'Glasses' => 'Bicchieri',
 	'Tin' => 'Scatola',
+	'Tins' => 'Scatole',
 	'Can' => 'Lattina',
+	'Cans' => 'Lattine',
 	'Bunch' => 'Cespo',
+	'Bunches' => 'Cespi',
 	'Gummy bears' => 'Caramelle',
 	'Crisps' => 'Patatine',
 	'Eggs' => 'Uova',

localization/no.php

@@ -2,28 +2,27 @@
 
 return array(
 	'Stock overview' => 'Husholdning',
-	'#1 products with #2 units in stock' => '#1 Produkter med #2 i husholdningen',
-	'#1 products expiring within the next #2 days' => '#1 Produkter som går ut på dato innen de neste #2 dagene',
+	'#1 products expiring within the next #2 days' => '#1 Produkt som går ut på dato innen de neste #2 dagene',
 	'#1 products are already expired' => '#1 Produkt som har gått ut på dato',
 	'#1 products are below defined min. stock amount' => '#1 Produkt under minimum husholdningsnivå',
 	'Product' => 'Produkt',
 	'Amount' => 'Antall',
 	'Next best before date' => 'Kommende best før dato',
-	'Logout' => 'Logg Av',
-	'Habits overview' => 'Oversikt Husoppgaver',
+	'Logout' => 'Logg ut',
+	'Chores overview' => 'Oversikt Husarbeid',
 	'Batteries overview' => 'Oversikt Batteri',
 	'Purchase' => 'Innkjøp',
-	'Consume' => 'Forbrukt',
+	'Consume' => 'Forbruk produkt',
 	'Inventory' => 'Endre Husholdning',
 	'Shopping list' => 'Handleliste',
-	'Habit tracking' => 'Logge Husoppgaver',
-	'Battery tracking' => 'Ladesyklus Batteri',
+	'Chore tracking' => 'Logge Husarbeid',
+	'Battery tracking' => 'Batteri Ladesyklus',
 	'Products' => 'Produkter',
 	'Locations' => 'Lokasjoner',
 	'Quantity units' => 'Forpakning',
-	'Habits' => 'Husoppgaver',
+	'Chores' => 'Husarbeid',
 	'Batteries' => 'Batterier',
-	'Habit' => 'Husoppgave',
+	'Chore' => 'Husarbeid',
 	'Next estimated tracking' => 'Neste handling',
 	'Last tracked' => 'Sist logget',
 	'Battery' => 'Batteri',
@@ -31,8 +30,8 @@ return array(
 	'Next planned charge cycle' => 'Neste planlagte ladesyklus',
 	'Best before' => 'Best før',
 	'OK' => 'OK',
-	'Product overview' => 'Oversikt Produkt',
-	'Stock quantity unit' => 'Forpakning i husholdningen',
+	'Product overview' => 'Produkt oversikt',
+	'Stock quantity unit' => 'Forpakningstype i husholdningen',
 	'Stock amount' => 'Husholdning',
 	'Last purchased' => 'Sist kjøpt',
 	'Last used' => 'Sist brukt',
@@ -41,9 +40,9 @@ return array(
 	'will be added to the list of barcodes for the selected product on submit' => 'Blir lagt til liste over strekkoder når produkt blir lagt inn.',
 	'New amount' => 'Nytt antall',
 	'Note' => 'Info',
-	'Tracked time' => 'Tid logget',
-	'Habit overview' => 'Oversikt Husoppgave',
-	'Tracked count' => 'Logget',
+	'Tracked time' => 'Tid utført/ ladet',
+	'Chore overview' => 'Oversikt Husarbeid',
+	'Tracked count' => 'Antall utførelser/ ladninger',
 	'Battery overview' => 'Batteri Oversikt',
 	'Charge cycles count' => 'Antall ladesykluser',
 	'Create shopping list item' => 'Opprett handelisteoppføring',
@@ -54,9 +53,9 @@ return array(
 	'Name' => 'Navn',
 	'Location' => 'Lokasjon',
 	'Min. stock amount' => 'Minimums antall for husholdingen',
-	'QU purchase' => 'QU innkjøp',
-	'QU stock' => 'QU husholdning',
-	'QU factor' => 'QU faktor',
+	'QU purchase' => 'FPK innkjøp',
+	'QU stock' => 'FPK husholdning',
+	'QU factor' => 'FPK faktor',
 	'Description' => 'Beskrivelse',
 	'Create product' => 'Opprett produkt',
 	'Barcode(s)' => 'Strekkode(r)',
@@ -67,13 +66,13 @@ return array(
 	'Factor purchase to stock quantity unit' => 'Innkjøpsfaktor for forpakning',
 	'Create location' => 'Opprett lokasjon',
 	'Create quantity unit' => 'Opprett forpakning',
-	'Period type' => 'Periodetype',
-	'Period days' => 'Dager/ Periode',
-	'Create habit' => 'Opprett husoppgave',
+	'Period type' => 'Gjentakelse',
+	'Period days' => 'Antall dager for gjentakelse',
+	'Create chore' => 'Opprett husarbeid oppgave',
 	'Used in' => 'Brukt',
 	'Create battery' => 'Opprett batteri',
 	'Edit battery' => 'Endre batteri',
-	'Edit habit' => 'Endre husoppgave',
+	'Edit chore' => 'Endre husarbeid oppgave',
 	'Edit quantity unit' => 'Endre forpakning',
 	'Edit product' => 'Endre produkt',
 	'Edit location' => 'Endre lokasjon',
@@ -81,7 +80,7 @@ return array(
 	'Manage master data' => 'Administrer masterdata',
 	'This will apply to added products' => 'Dette vil gjelde for produkt som blir lagt til',
 	'never' => 'aldri',
-	'Add products that are below defined min. stock amount' => 'Legg til produkt som er under definert minimums antall for husholdningen',
+	'Add products that are below defined min. stock amount' => 'Legg til produkt som er under minimumsnivå for husholdningen',
 	'For purchases this amount of days will be added to today for the best before date suggestion' => 'For innkjøp vil dette antallet dager legges til bestfør forslaget',
 	'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Dette betyr at 1 #1 innkjøp vil bli omgjort til #2 #3 husholdning',
 	'Login' => 'Logg inn',
@@ -91,12 +90,12 @@ return array(
 	'Are you sure to delete battery "#1"?' => 'Er du sikker du ønsker å slette Batteri "#1"?',
 	'Yes' => 'Ja',
 	'No' => 'Nei',
-	'Are you sure to delete habit "#1"?' => 'Er du sikker på du ønsker å slette husoppgave "#1"?',
+	'Are you sure to delete chore "#1"?' => 'Er du sikker på du ønsker å slette husarbeid oppgave "#1"?',
 	'"#1" could not be resolved to a product, how do you want to proceed?' => '"#1" kunne ikke bli tildelt et produkt, hvordan ønsker du å fortsette?',
 	'Create or assign product' => 'Opprett eller tildel til produkt',
 	'Cancel' => 'Avbryt',
 	'Add as new product' => 'Legg til som nytt produkt',
-	'Add as barcode to existing product' => 'Legg til strekkode til allerede eksiterende produkt',
+	'Add as barcode to existing product' => 'Legg til strekkode til allerede eksisterende produkt',
 	'Add as new product and prefill barcode' => 'Legg til som nytt produkt med forhåndsutfylt strekkode',
 	'Are you sure to delete quantity unit "#1"?' => 'Er du sikker du ønsker å slette forpakning "#1"?',
 	'Are you sure to delete product "#1"?' => 'Er du sikker du ønsker å slette produkt "#1"?',
@@ -111,38 +110,38 @@ return array(
 	'This product is not in stock' => 'Dette produktet er ikke i husholdningen',
 	'This means #1 will be added to stock' => 'Dette betyr at #1 vil bli lagt til i husholdningen',
 	'This means #1 will be removed from stock' => 'Dette betyr at #1 vil bli fjernet fra husholdningen',
-	'This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked' => 'Dette betyr at det er estimert at den nye utførelsen av denne husoppgaven er logget #1 dag etter den sist var logget',
-	'Removed #1 #2 of #3 from stock' => 'Fjernet #1 #2 av #3 fra husholdningen',
+	'This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked' => 'Dette betyr at det er estimert at den nye utførelsen av denne husarbeid oppgaven er logget #1 dag etter den sist var logget',
+	'Removed #1 #2 of #3 from stock' => 'Fjernet #1 #2 #3 fra husholdningen',
 	'About grocy' => 'Om Grocy',
 	'Close' => 'Lukk',
-	'#1 batteries are due to be charged within the next #2 days' => '#1 Batteri må lades innen de #2 dagene',
+	'#1 batteries are due to be charged within the next #2 days' => '#1 Batteri må lades innen de #2 neste dagene',
 	'#1 batteries are overdue to be charged' => '#1 Batteri har gått over fristen for å bli ladet opp',
-	'#1 habits are due to be done within the next #2 days' => '#1 husoppgaver skal gjøres inne de #2 neste dagene',
-	'#1 habits are overdue to be done' => '#1 husoppgaver har gått over fristen for utførelse',
+	'#1 chores are due to be done within the next #2 days' => '#1 husarbeid(s) oppgave(r) skal gjøres inne de #2 neste dagene',
+	'#1 chores are overdue to be done' => '#1 husarbeid(s) oppgave(r) har gått over fristen for utførelse',
 	'Released on' => 'Utgitt',
 	'Consume #3 #1 of #2' => 'Forbruk #3 #1 #2',
 	'Added #1 #2 of #3 to stock' => '#1 #2 #3 lagt til i husholdningen',
 	'Stock amount of #1 is now #2 #3' => 'Husholdning antall #1 er nå #2 #3',
-	'Tracked execution of habit #1 on #2' => 'Logget utførelse av husoppgave "#1" den #2',
-	'Tracked charge cylce of battery #1 on #2' => 'Logget ladesyklus for batteri #1 og #2',
-	'Consume all #1 which are currently in stock' => 'Konsumér alle #1 som er i husholdningen',
+	'Tracked execution of chore #1 on #2' => 'Utførte husarbeid oppgave "#1" den #2',
+	'Tracked charge cycle of battery #1 on #2' => 'Ladet #1 den #2',
+	'Consume all #1 which are currently in stock' => 'Forbruk alle #1 som er i husholdningen',
 	'All' => 'Alle',
-	'Track charge cycle of battery #1' => 'Logg ladesyklus for batteri #1',
-	'Track execution of habit #1' => 'Logg utførelse av husoppgave #1',
+	'Track charge cycle of battery #1' => '#1 ladet',
+	'Track execution of chore #1' => 'Utfør husarbeid oppgave #1',
 	'Filter by location' => 'Filtrér etter lokasjon',
 	'Search' => 'Søk',
 	'Not logged in' => 'Ikke logget inn',
 	'You have to select a product' => 'Du må velge et produkt',
-	'You have to select a habit' => 'Du mpå velge en husoppgaven',
+	'You have to select a chore' => 'Du må velge en husarbeid oppgave',
 	'You have to select a battery' => 'Du må velge et batteri',
-	'A name is required' => 'Et navn kreves',
+	'A name is required' => 'Vennligst fyll inn et navn',
 	'A location is required' => 'En lokasjon kreves',
 	'The amount cannot be lower than #1' => 'Antallet kan ikke være lavere enn #1',
 	'This cannot be negative' => 'Dette kan ikke være negativt',
 	'A quantity unit is required' => 'Forpakning antall/størrelse kreves',
 	'A period type is required' => 'En periodetype kreves',
 	'A best before date is required and must be later than today' => 'En best før dato kreves, denne må være senere enn i dag',
-	'Settings' => 'Instillinger',
+	'Settings' => 'Innstillinger',
 	'This can only be before now' => 'Dette kan kun være før nå',
         'Calendar' => 'Kalender',
 	'Recipes' => 'Oppskrifter',
@@ -153,26 +152,107 @@ return array(
 	'Edit recipe ingredient' => 'Endre ingrediens i oppskrift',
 	'Are you sure to delete recipe "#1"?' => 'Er du sikker du ønsker å slette oppskrift "#1"?',
 	'Are you sure to delete recipe ingredient "#1"?' => 'Er du sikker du ønsker å slette ingrediens "#1" fra oppskriften?',
-	'Are you sure to empty the shopping list?' => 'Er du sikker du ønsker å slette handlelisten??',
+	'Are you sure to empty the shopping list?' => 'Er du sikker du ønsker å slette handlelisten?',
 	'Clear list' => 'Tøm liste',
-	'Requirements fulfilled' => 'Krav oppfylt',
+	'Requirements fulfilled' => 'Har jeg alt jeg trenger for denne oppskriften?',
 	'Put missing products on shopping list' => 'Legg manglende produkter til handlelisten',
-	'Not enough in stock, #1 ingredients missing' => 'Ikke nok i husholdningen, #1 ingrediens mangler',
+	'Not enough in stock, #1 ingredients missing' => 'Ikke nok i husholdningen, #1 ingredienser mangler',
 	'Enough in stock' => 'Nok i husholdningen',
-	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Ikke nok i husholdningen, #1 ingrediens mangler, men lagt til i handelisten',
+	'Not enough in stock, #1 ingredients missing but already on the shopping list' => 'Ikke nok i husholdningen, #1 ingrediens mangler, men denne er på handelisten',
 	'Expand to fullscreen' => 'Full skjerm',
-	'Ingredients' => 'Ingrediens',
-	'Preparation' => 'Forberedelse',
+	'Ingredients' => 'Ingredienser',
+	'Preparation' => 'Forberedelse / Slik gjør du',
 	'Recipe' => 'Oppskrift',
-	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Ikke nok i husholdningen, #1 mangler, #2 allerede i handlisten',
+	'Not enough in stock, #1 missing, #2 already on shopping list' => 'Ikke nok i husholdningen, mangler #1, er #2 på handlelisten',
 	'Show notes' => 'Vis notater',
 	'Put missing amount on shopping list' => 'Legg manglende til handlelisten',
 	'Are you sure to put all missing ingredients for recipe "#1" on the shopping list?' => 'Er du sikker du ønsker å legge alle manglende ingredienser til oppskrift "#1"?',
-	'Added for recipe #1' => 'Lagt til oppskrift #1',
+	'Added for recipe #1' => 'Lagt til fra oppskrift "#1"',
+	'Manage users' => 'Administrer brukere',
+	'User' => 'Bruker',
+	'Users' => 'Brukere',
+	'Are you sure to delete user "#1"?' => 'Er du sikker på du ønsker å slette bruker, "#1"?',
+	'Create user' => 'Legg til bruker',
+	'Edit user' => 'Endre på bruker',
+	'First name' => 'Fornavn',
+	'Last name' => 'Etternavn',
+	'A username is required' => 'Et brukernavn er nødvendig',
+	'Confirm password' => 'Bekreft passord',
+	'Passwords do not match' => 'Passord er ikke like',
+	'Change password' => 'Endre passord',
+	'Done by' => 'Utført av',
+	'Last done by' => 'Sist utført av',
+	'Unknown' => 'Ukjent',
+	'Filter by chore' => 'Filtrér husarbeid',
+	'Chores analysis' => 'Statistikk husarbeid',
+ 	'0 means suggestions for the next charge cycle are disabled' => '0 betyr neste ladesyklus er avslått',
+ 	'Charge cycle interval (days)' => 'Ladesyklysintervall (Dager)',
+ 	'Last price' => 'Siste pris',
+ 	'Price history' => 'Prishistorikk',
+ 	'No price history available' => 'Ingen prishistorikk tilgjengelig',
+	'Price' => 'Pris',
+	'in #1 per purchase quantity unit' => 'I #1 per kjøpt forpakning ',
+	'The price cannot be lower than #1' => 'Prisen kan ikke være lavere enn #1',
+	'#1 product expires within the next #2 days' => '#1 Produkt går ut på dato innen de #2  neste dagene',
+	'#1 product is already expired' => '#1 Produkt er allerede gått ut på dato',
+	'#1 product is below defined min. stock amount' => '#1 Produkt er under minimums husholdningsnivå',
+	'Unit' => 'Enhet',
+	'Units' => 'Enheter',
+	'#1 chore is due to be done within the next #2 days' => '#1 husarbeid oppgave(r) skal gjøres inne de #2 neste dagene',
+	'#1 chore is overdue to be done' => '#1 husarbeid(s) oppgave(r) har gått over fristen for utførelse',
+	'#1 battery is due to be charged within the next #2 days' => '#1 Batteri må lades innen #2 dager',
+	'#1 battery is overdue to be charged' => '#1 Batteri har gått over fristen for å lades',
+	'#1 unit was automatically added and will apply in addition to the amount entered here' => '#1 enhet ble automatisk lagt til i tillegg til hva som blir skrevet inn her',
+	'in singular form' => 'I entall',
+	'in plural form' => 'I flertall',
+	'Never expires' => 'Går ikke ut på dato',
+	'This cannot be lower than #1' => 'Dette kan ikke være lavere enn #1',
+	'-1 means that this product never expires' => '-1 Betyr at dette produktet aldri går ut på dato',
+	'Quantity unit' => 'Forpakning',
+	'Only check if a single unit is in stock (a different quantity can then be used above)' => 'Huk av hvis du ønsker å bruke mindre enn forpakningsstørrelse i husholdningen',
+	'Are you sure to consume all ingredients needed by recipe "#1" (ingredients marked with "check only if a single unit is in stock" will be ignored)?' => 'Er du sikker du ønsker å forbruke alle ingredienser for "#1" oppskriften? (Ingredienser merket med "bruke mindre enn forpakningsstørrelse i husholdningen" blir ignorert',
+	'Removed all ingredients of recipe "#1" from stock' => 'Fjern alle ingredienser for "#1" oppskriften fra husholdningen.',
+	'Consume all ingredients needed by this recipe' => 'Forbruk alle ingredienser for denne oppskriften',
+	'Click to show technical details' => 'Klikk for å vise teknisk informasjon',
+	'Error while saving, probably this item already exists' => 'Kunne ikke lagre, produkt er lagt til fra før',
+	'Error details' => 'Detaljer om feil',
+	'Tasks' => 'Oppgaver',
+	'Show done tasks' => 'Vis ferdige oppgaver',
+	'Task' => 'Oppgave',
+	'Due' => 'Forfall',
+	'Assigned to' => 'Tildelt',
+	'Mark task "#1" as completed' => 'Merk oppgave "#1" som ferdig',
+	'Uncategorized' => 'Mangler kategori',
+	'Task categories' => 'Oppgave kategorier',
+	'Create task' => 'Opprett en oppgave',
+	'A due date is required' => 'En forfallsdato kreves',
+	'Category' => 'Kategori',
+	'Edit task' => 'Endre oppgave',
+	'Are you sure to delete task "#1"?' => 'Er du sikker du ønsker slette oppgave "#1"?',
+	'#1 task is due to be done within the next #2 days' => '#1 oppgave har utførelse forfall innen de neste #2 dagene',
+	'#1 tasks are due to be done within the next #2 days' => '#1 oppgaver har utførelse forfall innen de neste #2 dagene',
+	'#1 task is overdue to be done' => '#1 oppgave har forfalt utførelse dato',
+	'#1 tasks are overdue to be done' => '#1 oppgaver har forfalt utførelse dato',
+	'Edit task category' => 'Endre oppgave kategori',
+	'Create task category' => 'Opprett oppgave kategori',
+	'Product groups' => 'Produktgrupper',
+	'Ungrouped' => 'Ikke i grupper',
+	'Create product group' => 'Opprett produkt gruppe',
+	'Edit product group' => 'Endre produkt gruppe',
+	'Product group' => 'Produktgruppe',
+	'Are you sure to delete product group "#1"?' => 'Er du sikker du ønsker å slette produktgruppe "#1"?',
+	'Stay logged in permanently' => 'Alltid være innlogget',
+	'When not set, you will get logged out at latest after 30 days' => 'Når den ikke er satt vil du bli logget ut etter 30 dager',
+	'Filter by status' => 'Filtrér etter status',
+	'Below min. stock amount' => 'Under under minimum husholdningsnivå',
+	'Expiring soon' => 'Går snart ut på dato',
+	'Already expired' => 'Utgått på dato',
+	'Due soon' => 'Forfaller snart',
+	'Overdue' => 'Forfalt',
 	
 	//Constants
 	'manually' => 'Manuel',
-	'dynamic-regular' => 'Dynamisk Regulering',
+	'dynamic-regular' => 'Automatisk',
 	
 	//Technical component translations
 	'timeago_locale' => 'no',
@@ -188,11 +268,17 @@ return array(
 	'Tinned food cupboard' => 'Boksematskapet',
 	'Fridge' => 'Kjøleskapet',
 	'Piece' => 'Ett',
+	'Pieces' => 'Flere',
 	'Pack' => 'Pakke',
+	'Packs' => 'Pakker',
 	'Glass' => 'Glass',
+	'Glasses' => 'Glass',
 	'Tin' => 'Hermetikkboks',
+	'Tins' => 'Hermetikkbokser',
 	'Can' => 'Boks',
+	'Cans' => 'Bokser',
 	'Bunch' => 'Klase',
+	'Bunches' => 'Klaser',	
 	'Gummy bears' => 'Vingummibjørner',
 	'Crisps' => 'Chips',
 	'Eggs' => 'Egg',
@@ -206,18 +292,18 @@ return array(
 	'Cucumber' => 'Agurk',
 	'Radish' => 'Reddik',
 	'Tomato' => 'Tomat',
-	'Changed towels in the bathroom' => 'Bytt handler på badet',
+	'Changed towels in the bathroom' => 'Bytt handklær på badet',
 	'Cleaned the kitchen floor' => 'Vasket kjøkkengulvet',
 	'Warranty ends' => 'Garanti utgår',
 	'TV remote control' => 'Fjernkontroll for TV',
-	'Alarm clock' => 'Alarm klokke',
+	'Alarm clock' => 'Alarmklokke',
 	'Heat remote control' => 'Fjernkontroll for termostat',
-        'Lawn mowed in the garden' => 'Kuttet gresse i hagen',
+        'Lawn mowed in the garden' => 'Kuttet gresset i hagen',
 	'Some good snacks' => 'Noen gode snacks',
 	'Pizza dough' => 'Pizzadeig',
-	'Sieved tomatoes' => 'Passierte Tomaten',
+	'Sieved tomatoes' => 'Tomatpuré',
 	'Salami' => 'Salami',
-	'Toast' => 'Risted brød',
+	'Toast' => 'Ristet brød',
 	'Minced meat' => 'Kjøttdeig',
 	'Pizza' => 'Pizza',
 	'Spaghetti bolognese' => 'Spaghetti Bolognese',
@@ -226,5 +312,23 @@ return array(
 	'German' => 'Tysk',
 	'Italian' => 'Italiensk',
 	'Demo in different language' => 'Demo i annet språk',
-	'This is the note content of the recipe ingredient' => 'Dette er notisen for ingrediensen i oppskriften'
+	'This is the note content of the recipe ingredient' => 'Dette er notisen for ingrediensen i oppskriften',
+	'Demo User' => 'Demo Bruker',
+	'Gram' => 'Gram',
+    'Grams' => 'Gram',
+    'Flour' => 'Mel',
+    'Pancakes' => 'Pannekaker',
+	'Sugar' => 'Sukker',
+	'Home' => 'Hus',
+	'Life' => 'Livstil',
+	'Projects' => 'Projekter',
+	'Repair the garage door' => 'Reparere garasjedøren',
+	'Fork and improve grocy' => 'Fork og forbedre grocy',
+	'Find a solution for what to do when I forget the door keys' => 'Finne på løsning for hva jeg skal gjøre når jeg mister dørnøklene',
+	'Sweets' => 'Godteri',
+	'Bakery products' => 'Produkt fra bakeren ',
+	'Tinned food' => 'Boksemat',
+	'Butchery products' => 'Produkt fra slakteren',
+	'Vegetables/Fruits' => 'Frukt/ Grønnsaker',
+	'Refrigerated products' => 'Kjølte produkter'
 );

middleware/ApiKeyAuthMiddleware.php

@@ -22,8 +22,9 @@ class ApiKeyAuthMiddleware extends BaseMiddleware
 		$route = $request->getAttribute('route');
 		$routeName = $route->getName();
 
-		if ($this->ApplicationService->IsDemoInstallation())
+		if (GROCY_IS_DEMO_INSTALL || GROCY_IS_EMBEDDED_INSTALL)
 		{
+			define('GROCY_AUTHENTICATED', true);
 			$response = $next($request, $response);
 		}
 		else
@@ -45,10 +46,23 @@ class ApiKeyAuthMiddleware extends BaseMiddleware
 
 			if (!$validSession && !$validApiKey)
 			{
+				define('GROCY_AUTHENTICATED', false);
 				$response = $response->withStatus(401);
 			}
-			else
+			elseif ($validApiKey)
 			{
+				$user = $apiKeyService->GetUserByApiKey($request->getHeaderLine($this->ApiKeyHeaderName));
+				define('GROCY_AUTHENTICATED', true);
+				define('GROCY_USER_ID', $user->id);
+
+				$response = $next($request, $response);
+			}
+			elseif ($validSession)
+			{
+				$user = $sessionService->GetUserBySessionKey($_COOKIE[$this->SessionCookieName]);
+				define('GROCY_AUTHENTICATED', true);
+				define('GROCY_USER_ID', $user->id);
+
 				$response = $next($request, $response);
 			}
 		}

middleware/CliMiddleware.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace Grocy\Middleware;
-
-class CliMiddleware extends BaseMiddleware
-{
-	public function __invoke(\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next)
-	{
-		if (PHP_SAPI !== 'cli')
-		{
-			$response->write('Please call this only from CLI');
-			return $response->withHeader('Content-Type', 'text/plain')->withStatus(400);
-		}
-		else
-		{
-			$response = $next($request, $response);
-			return $response->withHeader('Content-Type', 'text/plain');
-		}
-	}
-}

middleware/SessionAuthMiddleware.php

@@ -3,6 +3,7 @@
 namespace Grocy\Middleware;
 
 use \Grocy\Services\SessionService;
+use \Grocy\Services\LocalizationService;
 
 class SessionAuthMiddleware extends BaseMiddleware
 {
@@ -18,23 +19,41 @@ class SessionAuthMiddleware extends BaseMiddleware
 	{
 		$route = $request->getAttribute('route');
 		$routeName = $route->getName();
+		$sessionService = new SessionService();
 
-		if ($routeName === 'root' || $this->ApplicationService->IsDemoInstallation())
+		if ($routeName === 'root')
 		{
-			define('AUTHENTICATED', $this->ApplicationService->IsDemoInstallation());
+			$response = $next($request, $response);
+		}
+		elseif (GROCY_IS_DEMO_INSTALL || GROCY_IS_EMBEDDED_INSTALL)
+		{
+			$user = $sessionService->GetDefaultUser();
+			define('GROCY_AUTHENTICATED', true);
+			define('GROCY_USER_USERNAME', $user->username);
+
 			$response = $next($request, $response);
 		}
 		else
 		{
-			$sessionService = new SessionService();
 			if ((!isset($_COOKIE[$this->SessionCookieName]) || !$sessionService->IsValidSession($_COOKIE[$this->SessionCookieName])) && $routeName !== 'login')
 			{
-				define('AUTHENTICATED', false);
+				define('GROCY_AUTHENTICATED', false);
 				$response = $response->withRedirect($this->AppContainer->UrlManager->ConstructUrl('/login'));
 			}
 			else
 			{
-				define('AUTHENTICATED', $routeName !== 'login');
+				if ($routeName !== 'login')
+				{
+					$user = $sessionService->GetUserBySessionKey($_COOKIE[$this->SessionCookieName]);
+					define('GROCY_AUTHENTICATED', true);
+					define('GROCY_USER_USERNAME', $user->username);
+					define('GROCY_USER_ID', $user->id);
+				}
+				else
+				{
+					define('GROCY_AUTHENTICATED', false);
+				}
+
 				$response = $next($request, $response);
 			}
 		}

migrations/0008.sql

@@ -3,4 +3,3 @@ AS
 SELECT product_id, SUM(amount) AS amount, MIN(best_before_date) AS best_before_date
 FROM stock
 GROUP BY product_id
-ORDER BY MIN(best_before_date) ASC

migrations/0012.sql

@@ -3,4 +3,3 @@ AS
 SELECT habit_id, MAX(tracked_time) AS last_tracked_time
 FROM habits_log
 GROUP BY habit_id
-ORDER BY MAX(tracked_time) DESC

migrations/0015.sql

@@ -3,4 +3,3 @@ AS
 SELECT battery_id, MAX(tracked_time) AS last_tracked_time
 FROM battery_charge_cycles
 GROUP BY battery_id
-ORDER BY MAX(tracked_time) DESC

migrations/0026.sql

@@ -0,0 +1,20 @@
+CREATE TABLE users (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	username TEXT NOT NULL UNIQUE,
+	first_name TEXT,
+	last_name TEXT,
+	password TEXT NOT NULL,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+DROP TABLE sessions;
+
+CREATE TABLE sessions (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	session_key TEXT NOT NULL UNIQUE,
+	user_id INTEGER NOT NULL,
+	expires DATETIME,
+	last_used DATETIME,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+)
+

migrations/0027.php

@@ -0,0 +1,24 @@
+<?php
+
+// This is executed inside DatabaseMigrationService class/context
+
+$db = $this->DatabaseService->GetDbConnection();
+
+if (defined('GROCY_HTTP_USER'))
+{
+	// Migrate old user defined in config file to database
+	$newUserRow = $db->users()->createRow(array(
+		'username' => GROCY_HTTP_USER,
+		'password' => password_hash(GROCY_HTTP_PASSWORD, PASSWORD_DEFAULT)
+	));
+	$newUserRow->save();
+}
+else
+{
+	// Create default user "admin" with password "admin"
+	$newUserRow = $db->users()->createRow(array(
+		'username' => 'admin',
+		'password' => password_hash('admin', PASSWORD_DEFAULT)
+	));
+	$newUserRow->save();
+}

migrations/0028.sql

@@ -0,0 +1,13 @@
+ALTER TABLE habits_log
+ADD done_by_user_id INTEGER;
+
+DROP TABLE api_keys;
+
+CREATE TABLE api_keys (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	api_key TEXT NOT NULL UNIQUE,
+	user_id INTEGER NOT NULL,
+	expires DATETIME,
+	last_used DATETIME,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);

migrations/0029.sql

@@ -0,0 +1,5 @@
+ALTER TABLE stock
+ADD price DECIMAL(15, 2);
+
+ALTER TABLE stock_log
+ADD price DECIMAL(15, 2);

migrations/0030.sql

@@ -0,0 +1,2 @@
+ALTER TABLE quantity_units
+ADD name_plural TEXT;

migrations/0031.php

@@ -0,0 +1,32 @@
+<?php
+
+// This is executed inside DatabaseMigrationService class/context
+
+use \Grocy\Services\LocalizationService;
+$localizationService = new LocalizationService(GROCY_CULTURE);
+
+$db = $this->DatabaseService->GetDbConnection();
+
+if ($db->quantity_units()->count() === 0)
+{
+	// Create 2 default quantity units
+	$newRow = $db->quantity_units()->createRow(array(
+		'name' => $localizationService->Localize('Piece'),
+		'name_plural' => $localizationService->Localize('Pieces')
+	));
+	$newRow->save();
+	$newRow = $db->quantity_units()->createRow(array(
+		'name' => $localizationService->Localize('Pack'),
+		'name_plural' => $localizationService->Localize('Packs')
+	));
+	$newRow->save();
+}
+
+if ($db->locations()->count() === 0)
+{
+	// Create a default location
+	$newRow = $db->locations()->createRow(array(
+		'name' => $localizationService->Localize('Fridge')
+	));
+	$newRow->save();
+}

migrations/0032.sql

@@ -0,0 +1,20 @@
+DROP VIEW stock_current;
+CREATE VIEW stock_current
+AS
+SELECT product_id, SUM(amount) AS amount, MIN(best_before_date) AS best_before_date
+FROM stock
+GROUP BY product_id;
+
+DROP VIEW habits_current;
+CREATE VIEW habits_current
+AS
+SELECT habit_id, MAX(tracked_time) AS last_tracked_time
+FROM habits_log
+GROUP BY habit_id;
+
+DROP VIEW batteries_current;
+CREATE VIEW batteries_current
+AS
+SELECT battery_id, MAX(tracked_time) AS last_tracked_time
+FROM battery_charge_cycles
+GROUP BY battery_id;

migrations/0033.sql

@@ -0,0 +1,29 @@
+DROP VIEW habits_current;
+CREATE VIEW habits_current
+AS
+SELECT
+	h.id AS habit_id,
+	MAX(l.tracked_time) AS last_tracked_time,
+	CASE h.period_type
+		WHEN 'manually' THEN '2999-12-31 23:59:59'
+		WHEN 'dynamic-regular' THEN datetime(MAX(l.tracked_time), '+' || CAST(h.period_days AS TEXT) || ' day')
+	END AS next_estimated_execution_time
+FROM habits h
+LEFT JOIN habits_log l
+	ON h.id = l.habit_id
+GROUP BY h.id, h.period_days;
+
+DROP VIEW batteries_current;
+CREATE VIEW batteries_current
+AS
+SELECT
+	b.id AS battery_id,
+	MAX(l.tracked_time) AS last_tracked_time,
+	CASE WHEN b.charge_interval_days = 0
+		THEN '2999-12-31 23:59:59'
+		ELSE datetime(MAX(l.tracked_time), '+' || CAST(b.charge_interval_days AS TEXT) || ' day')
+	END AS next_estimated_charge_time
+FROM batteries b
+LEFT JOIN battery_charge_cycles l
+	ON b.id = l.battery_id
+GROUP BY b.id, b.charge_interval_days;

migrations/0034.sql

@@ -0,0 +1,41 @@
+ALTER TABLE recipes_pos
+ADD qu_id INTEGER;
+
+UPDATE recipes_pos
+SET qu_id = (SELECT qu_id_stock FROM products where id = product_id);
+
+CREATE TRIGGER recipes_pos_qu_id_default AFTER INSERT ON recipes_pos
+BEGIN
+	UPDATE recipes_pos
+	SET qu_id = (SELECT qu_id_stock FROM products where id = product_id)
+	WHERE qu_id IS NULL
+		AND id = NEW.id;
+END;
+
+ALTER TABLE recipes_pos
+ADD only_check_single_unit_in_stock TINYINT NOT NULL DEFAULT 0;
+
+DROP VIEW recipes_fulfillment;
+CREATE VIEW recipes_fulfillment
+AS
+SELECT
+	r.id AS recipe_id,
+	rp.id AS recipe_pos_id,
+	rp.product_id AS product_id,
+	rp.amount AS recipe_amount,
+	IFNULL(sc.amount, 0) AS stock_amount,
+	CASE WHEN IFNULL(sc.amount, 0) >= CASE WHEN rp.only_check_single_unit_in_stock = 1 THEN 1 ELSE IFNULL(rp.amount, 0) END THEN 1 ELSE 0 END AS need_fulfilled,
+	CASE WHEN IFNULL(sc.amount, 0) - CASE WHEN rp.only_check_single_unit_in_stock = 1 THEN 1 ELSE IFNULL(rp.amount, 0) END < 0 THEN ABS(IFNULL(sc.amount, 0) - CASE WHEN rp.only_check_single_unit_in_stock = 1 THEN 1 ELSE IFNULL(rp.amount, 0) END) ELSE 0 END AS missing_amount,
+	IFNULL(sl.amount, 0) AS amount_on_shopping_list,
+	CASE WHEN IFNULL(sc.amount, 0) + IFNULL(sl.amount, 0) >= CASE WHEN rp.only_check_single_unit_in_stock = 1 THEN 1 ELSE IFNULL(rp.amount, 0) END THEN 1 ELSE 0 END AS need_fulfilled_with_shopping_list,
+	rp.qu_id
+FROM recipes r
+JOIN recipes_pos rp
+	ON r.id = rp.recipe_id
+LEFT JOIN (
+	SELECT product_id, SUM(amount + amount_autoadded) AS amount
+	FROM shopping_list
+	GROUP BY product_id) sl
+	ON rp.product_id = sl.product_id
+LEFT JOIN stock_current sc
+	ON rp.product_id = sc.product_id;

migrations/0035.sql

@@ -0,0 +1,31 @@
+ALTER TABLE habits RENAME TO chores;
+
+CREATE TABLE chores_log (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	chore_id INTEGER NOT NULL,
+	tracked_time DATETIME,
+	done_by_user_id INTEGER,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+INSERT INTO chores_log
+	(chore_id, tracked_time, done_by_user_id, row_created_timestamp)
+SELECT habit_id, tracked_time, done_by_user_id, row_created_timestamp
+FROM habits_log;
+
+DROP TABLE habits_log;
+
+DROP VIEW habits_current;
+CREATE VIEW chores_current
+AS
+SELECT
+	h.id AS chore_id,
+	MAX(l.tracked_time) AS last_tracked_time,
+	CASE h.period_type
+		WHEN 'manually' THEN '2999-12-31 23:59:59'
+		WHEN 'dynamic-regular' THEN datetime(MAX(l.tracked_time), '+' || CAST(h.period_days AS TEXT) || ' day')
+	END AS next_estimated_execution_time
+FROM chores h
+LEFT JOIN chores_log l
+	ON h.id = l.chore_id
+GROUP BY h.id, h.period_days;

migrations/0036.sql

@@ -0,0 +1,24 @@
+CREATE TABLE tasks (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	name TEXT NOT NULL UNIQUE,
+	description TEXT,
+	due_date DATETIME,
+	done TINYINT NOT NULL DEFAULT 0 CHECK(done IN (0, 1)),
+	done_timestamp DATETIME,
+	category_id INTEGER,
+	assigned_to_user_id INTEGER,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+CREATE TABLE task_categories (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	name TEXT NOT NULL UNIQUE,
+	description TEXT,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);
+
+CREATE VIEW tasks_current
+AS
+SELECT *
+FROM tasks
+WHERE done = 0;

migrations/0037.sql

@@ -0,0 +1,9 @@
+ALTER TABLE products
+ADD product_group_id INTEGER;
+
+CREATE TABLE product_groups (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	name TEXT NOT NULL UNIQUE,
+	description TEXT,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime'))
+);

migrations/0038.sql

@@ -0,0 +1,27 @@
+DROP VIEW stock_missing_products;
+CREATE VIEW stock_missing_products
+AS
+SELECT
+	p.id,
+	MAX(p.name) AS name,
+	p.min_stock_amount - IFNULL(SUM(s.amount), 0) AS amount_missing,
+	CASE WHEN s.id IS NOT NULL THEN 1 ELSE 0 END AS is_partly_in_stock
+FROM products p
+LEFT JOIN stock s
+	ON p.id = s.product_id
+WHERE p.min_stock_amount != 0
+GROUP BY p.id
+HAVING IFNULL(SUM(s.amount), 0) < p.min_stock_amount;
+
+DROP VIEW stock_current;
+CREATE VIEW stock_current
+AS
+SELECT product_id, SUM(amount) AS amount, MIN(best_before_date) AS best_before_date
+FROM stock
+GROUP BY product_id
+
+UNION
+
+SELECT id, 0, null
+FROM stock_missing_products
+WHERE is_partly_in_stock = 0;

migrations/0039.sql

@@ -0,0 +1,10 @@
+CREATE TABLE user_settings (
+	id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE,
+	user_id INTEGER NOT NULL,
+	key TEXT NOT NULL,
+	value TEXT,
+	row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime')),
+	row_updated_timestamp DATETIME DEFAULT (datetime('now', 'localtime')),
+
+	UNIQUE(user_id, key)
+);

package.json

@@ -2,18 +2,20 @@
 	"name": "grocy",
 	"private": true,
 	"dependencies": {
-		"@danielfarrell/bootstrap-combobox": "https://github.com/pallidus-fintech/bootstrap-combobox.git#enhance/boostrap_4",
+		"@danielfarrell/bootstrap-combobox": "https://github.com/berrnd/bootstrap-combobox.git#master",
 		"@fortawesome/fontawesome-free": "^5.1.0",
 		"TagManager": "https://github.com/max-favilli/tagmanager.git#3.0.2",
 		"bootbox": "https://github.com/makeusabrew/bootbox.git#v5.x",
 		"bootstrap": "^4.1.1",
-		"bootstrap-side-navbar": "https://github.com/samrayner/bootstrap-side-navbar.git#1.0.1",
+		"chart.js": "^2.7.2",
 		"datatables.net": "^1.10.19",
 		"datatables.net-bs4": "^1.10.19",
 		"datatables.net-colreorder": "^1.5.1",
 		"datatables.net-colreorder-bs4": "^1.5.1",
 		"datatables.net-responsive": "^2.2.3",
 		"datatables.net-responsive-bs4": "^2.2.3",
+		"datatables.net-rowgroup": "^1.0.4",
+		"datatables.net-rowgroup-bs4": "^1.0.4",
 		"datatables.net-select": "^1.2.7",
 		"datatables.net-select-bs4": "^1.2.7",
 		"jquery": "^3.3.1",

public/css/grocy.css

@@ -11,10 +11,6 @@ body {
     white-space: normal;
 }
 
-.no-real-button {
-	pointer-events: none;
-}
-
 .timeago-contextual {
 	font-style: italic;
 	font-size: 0.8em;
@@ -54,14 +50,37 @@ a.discrete-link:focus {
 }
 
 .fullscreen {
-	z-index: 9999; 
-	width: 100%; 
-	height: 100%; 
-	position: fixed; 
-	top: 0; 
-	left: 0; 
+	z-index: 9999;
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	overflow: auto;
  }
 
+ .form-check-input.is-valid ~ .form-check-label,
+ .was-validated .form-check-input:valid ~ .form-check-label {
+    color: inherit;
+}
+
+.text-strike-through {
+	text-decoration: line-through;
+}
+
+button.disabled {
+	pointer-events: none;
+}
+
+/* Hide the default up/down arrow buttons for number inputs because we use our own buttons in numberpicker */
+input[type='number'] {
+	-moz-appearance: textfield;
+}
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+	-webkit-appearance: none;
+}
+
 /* Navigation style customizations */
 #mainNav {
 	background-color: #e5e5e5 !important;
@@ -70,8 +89,7 @@ a.discrete-link:focus {
 }
 
 .navbar-sidenav {
-	overflow-y: auto;
-	overflow-x: hidden;
+	overflow: hidden;
 	border-top: 2px solid !important;
 }
 
@@ -175,7 +193,12 @@ td {
 	width: auto !important;
 }
 
-/* Third party component customizations - Popper.js */
-.tooltip .arrow {
-	display: none;
+/* Third party component customizations - Bootstrap Combobox */
+.typeahead .active {
+	background-color: #e5e5e5;
+}
+
+/* Third party component customizations - Popper.js */
+.tooltip {
+	pointer-events: none;
 }

public/css/grocy_night_mode.css

@@ -0,0 +1,199 @@
+body.night-mode {
+	color: #c1c1c1;
+}
+
+.night-mode .table-info,
+.night-mode .table-info > td,
+.night-mode .table-info > th {
+	background-color: #07373f;
+}
+
+.night-mode .btn,
+.night-mode .nav-link,
+.night-mode #mainNav.navbar-light .navbar-collapse .navbar-nav > .nav-item.dropdown > .nav-link::after,
+.night-mode .dropdown-item {
+	color: #c1c1c1 !important;
+}
+
+.night-mode .btn-outline-dark {
+	border-color: #c1c1c1;
+}
+
+.night-mode .btn-info {
+	color: #c1c1c1;
+	background-color: #07373f;
+	border-color: #07373f;
+}
+
+.night-mode .btn-warning {
+	color: #c1c1c1;
+	background-color: #473604;
+	border-color: #473604;
+}
+
+.night-mode .btn-danger {
+	color: #c1c1c1;
+	background-color: #471116;
+	border-color: #471116;
+}
+
+.night-mode .btn-success {
+	color: #c1c1c1;
+	background-color: #0d3a18;
+	border-color: #0d3a18;
+}
+
+.night-mode .form-control {
+	color: #495057;
+	background-color: #333131;
+	border: 1px solid #ced4da;
+}
+
+.night-mode .content-wrapper {
+	background: #333131;
+}
+
+.night-mode table.dataTable tr.group td {
+	font-weight: bold;
+	background-color: #333131;
+}
+
+.night-mode .table-danger,
+.night-mode .table-danger > td,
+.night-mode .table-danger > th {
+	background-color: #471116;
+}
+
+.night-mode .table-warning,
+.night-mode .table-warning > td,
+.night-mode .table-warning > th {
+	background-color: #473604;
+}
+
+.night-mode .bg-warning {
+	background-color: #473604!important;
+}
+
+.night-mode .bg-info {
+	background-color: #07373f!important;
+}
+
+.night-mode .bg-danger {
+	background-color: #471116!important;
+}
+
+.night-mode .form-control:focus {
+	color: #495057;
+	background-color: #333131;
+	border-color: #80bdff;
+}
+
+.night-mode .dropdown-item:focus,
+.night-mode .dropdown-item:hover {
+	color: #16181b;
+	background-color: #333131;
+}
+
+.night-mode .dropdown-item {
+	color: #7c7b6f;
+	background-color: #333131;
+}
+
+.night-mode .list-group-item {
+	background-color: #333131;
+}
+
+.night-mode .modal-content {
+	background-color: #1a1919;
+	border: 1px solid rgba(186, 189, 189, 0.66);
+}
+
+.night-mode .modal-footer {
+	border-top: 1px solid #6f7173;
+}
+
+.night-mode .container-fluid {
+	background-color: #333131;
+}
+
+.night-mode a.discrete-link:hover {
+	color: #16354f !important;
+	text-decoration: none !important;
+	background-color: #333131;
+}
+
+.night-mode a.discrete-link:focus {
+	color: #3a0b0f !important;
+	background-color: #333131;
+}
+
+.night-mode .card {
+	border: 2px solid;
+	border-color: #383838;
+	background-color: #333131;
+}
+
+.night-mode .card-header {
+	background-color: #333131;
+}
+
+.night-mode #mainNav {
+	background-color: #333131 !important;
+	border-bottom: 2px solid !important;
+	border-color: #383838 !important;
+}
+
+.night-mode .navbar-sidenav,
+.night-mode .sidenav-second-level {
+	background-color: #333131 !important;
+	border-right: 2px solid !important;
+	border-color: #383838 !important;
+}
+
+.night-mode .navbar-nav .dropdown-menu {
+	background-color: #333131 !important;
+}
+
+.night-mode .navbar-nav .dropdown-divider {
+	border-color: #383838 !important;
+	background-color: #333131;
+}
+
+.night-mode .sidenav-toggler {
+	background-color: #383838 !important;
+	border-right: 2px solid !important;
+	border-color: #383838 !important;
+}
+
+.night-mode .navbar-sidenav > li:hover,
+.night-mode .sidenav-second-level > li:hover,
+.night-mode .navbar-nav .dropdown-item:hover {
+	box-shadow: inset 5px 0 0 #112a3f !important;
+	background-color: #383838 !important;
+	color: #c1c1c1 !important;
+}
+
+.night-mode .navbar-sidenav > li > a:focus,
+.night-mode .sidenav-second-level > li > a:focus,
+.night-mode .navbar-nav .dropdown-item:focus {
+	box-shadow: inset 5px 0 0 #350a0f !important;
+	background-color: #383838 !important;
+	color: #c1c1c1 !important;
+}
+
+.night-mode .active-page {
+	box-shadow: inset 5px 0 0 #350a0f !important;
+	background-color: #383838 !important;
+}
+
+.night-mode .toast-success {
+	background-color: #092810;
+}
+
+.night-mode .toast-error {
+	background-color: #471015;
+}
+
+.night-mode .typeahead .active {
+	background-color: #333131;
+}

public/js/extensions.js

@@ -31,3 +31,26 @@ GetUriParam = function(key)
 		}
 	}
 };
+
+IsTouchInputDevice = function()
+{
+	if (("ontouchstart" in window) || window.DocumentTouch && document instanceof DocumentTouch)
+	{
+		return true;
+	}
+
+	return false;
+}
+
+BoolVal = function(test)
+{
+	var anything = test.toString().toLowerCase();
+	if (anything === true || anything === "true" || anything === "1" || anything === "on")
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}

public/js/grocy.js

@@ -3,6 +3,22 @@
 	var localizedText = Grocy.LocalizationStrings[text];
 	if (localizedText === undefined)
 	{
+		if (Grocy.Mode === 'dev')
+		{
+			jsonData = {};
+			jsonData.text = text;
+			Grocy.Api.Post('system/log-missing-localization', jsonData,
+				function(result)
+				{
+					// Nothing to do...
+				},
+				function(xhr)
+				{
+					Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
+				}
+			);
+		}
+
 		localizedText = text;
 	}
 	
@@ -19,6 +35,16 @@ U = function(relativePath)
 	return Grocy.BaseUrl.replace(/\/$/, '') + relativePath;
 }
 
+Pluralize = function(number, singularForm, pluralForm)
+{
+	var text = singularForm;
+	if (number != 1 && pluralForm !== null && !pluralForm.isEmpty())
+	{
+		text = pluralForm;
+	}
+	return text;
+}
+
 if (!Grocy.ActiveNav.isEmpty())
 {
 	var menuItem = $('#sidebarResponsive').find("[data-nav-for-page='" + Grocy.ActiveNav + "']");
@@ -61,7 +87,12 @@ if (window.localStorage.getItem("sidebar_state") === "collapsed")
 $.timeago.settings.allowFuture = true;
 RefreshContextualTimeago = function()
 {	
-	$('time.timeago').timeago();
+	$("time.timeago").each(function()
+	{
+		var element = $(this);
+		var timestamp = element.attr("datetime");
+		element.timeago("update", timestamp);
+	});
 }
 RefreshContextualTimeago();
 
@@ -76,6 +107,14 @@ window.FontAwesomeConfig = {
 	searchPseudoElements: true
 }
 
+// Don't show tooltips on touch input devices
+if (IsTouchInputDevice())
+{
+	var css = document.createElement("style");
+	css.innerHTML = ".tooltip { display: none; }";
+	document.body.appendChild(css);
+}
+
 Grocy.Api = { };
 Grocy.Api.Get = function(apiFunction, success, error)
 {
@@ -153,3 +192,59 @@ Grocy.FrontendHelpers.ValidateForm = function(formId)
 
 	$(form).addClass('was-validated');
 }
+
+Grocy.FrontendHelpers.ShowGenericError = function(message, exception)
+{
+	toastr.error(L(message) + '<br><br>' + L('Click to show technical details'), '', {
+		onclick: function()
+		{
+			bootbox.alert({
+				title: L('Error details'),
+				message: JSON.stringify(exception, null, 4)
+			});
+		}
+	});
+	
+	console.error(exception);
+}
+
+$("form").on("keyup paste", "input, textarea", function()
+{
+	$(this).closest("form").addClass("is-dirty");
+});
+$("form").on("click", "select", function()
+{
+	$(this).closest("form").addClass("is-dirty");
+});
+
+// Auto saving user setting controls
+$(".user-setting-control").on("change", function()
+{
+	var element = $(this);
+	var inputType = element.attr("type").toLowerCase();
+	var settingKey = element.attr("data-setting-key");
+	
+	if (inputType === "checkbox")
+	{
+		value = element.is(":checked");
+	}
+	else
+	{
+		var value = element.val();
+	}
+	
+	Grocy.UserSettings[settingKey] = value;
+	
+	jsonData = { };
+	jsonData.value = value;
+	Grocy.Api.Post('user/settings/' + settingKey, jsonData,
+		function(result)
+		{
+			// Nothing to do...
+		},
+		function(xhr)
+		{
+			Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
+		}
+	);
+});

public/js/grocy_dbchangedhandling.js

@@ -0,0 +1,62 @@
+Grocy.Api.Get('system/get-db-changed-time',
+	function(result)
+	{
+		Grocy.DatabaseChangedTime = moment(result.changed_time);
+	},
+	function(xhr)
+	{
+		console.error(xhr);
+	}
+);
+
+// Check if the database has changed once a minute
+// If a change is detected, reload the current page, but only if already idling for at least 50 seconds,
+// when there is no unsaved form data and when the user enabled auto reloading
+setInterval(function()
+{
+	Grocy.Api.Get('system/get-db-changed-time',
+		function(result)
+		{
+			var newDbChangedTime = moment(result.changed_time);
+			if (newDbChangedTime.isAfter(Grocy.DatabaseChangedTime))
+			{
+				if (Grocy.IdleTime >= 50)
+				{
+					if (BoolVal(Grocy.UserSettings.auto_reload_on_db_change) && $("form.is-dirty").length === 0)
+					{
+						window.location.reload();
+					}
+				}
+
+				Grocy.DatabaseChangedTime = newDbChangedTime;
+			}
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+}, 60000);
+
+Grocy.IdleTime = 0;
+Grocy.ResetIdleTime = function()
+{
+	Grocy.IdleTime = 0;
+}
+window.onmousemove = Grocy.ResetIdleTime;
+window.onmousedown = Grocy.ResetIdleTime;
+window.onclick = Grocy.ResetIdleTime;
+window.onscroll = Grocy.ResetIdleTime;
+window.onkeypress = Grocy.ResetIdleTime;
+
+// Increase the idle time once every second
+// On any interaction it will be reset to 0 (see above)
+setInterval(function()
+{
+	Grocy.IdleTime += 1;
+}, 1000);
+
+if (BoolVal(Grocy.UserSettings.auto_reload_on_db_change))
+{
+	$("#auto-reload-enabled").prop("checked", true);
+}

public/js/grocy_nightmode.js

@@ -0,0 +1,106 @@
+$("#night-mode-enabled").on("change", function()
+{
+	var value = $(this).is(":checked");
+	if (value)
+	{
+		$("body").addClass("night-mode");
+	}
+	else
+	{
+		$("body").removeClass("night-mode");
+	}
+});
+
+$("#auto-night-mode-enabled").on("change", function()
+{
+	var value = $(this).is(":checked");
+	$("#auto-night-mode-time-range-from").prop("readonly", !value);
+	$("#auto-night-mode-time-range-to").prop("readonly", !value);
+
+	if (!value && !BoolVal(Grocy.UserSettings.night_mode_enabled))
+	{
+		$("body").removeClass("night-mode");
+	}
+});
+
+$(document).on("keyup", "#auto-night-mode-time-range-from, #auto-night-mode-time-range-to", function()
+{
+	var value = $(this).val();
+	var valueIsValid = moment(value, "HH:mm", true).isValid();
+	
+	if (valueIsValid)
+	{
+		$(this).removeClass("bg-danger");
+	}
+	else
+	{
+		$(this).addClass("bg-danger");
+	}
+
+	CheckNightMode();
+});
+
+$("#auto-night-mode-time-range-goes-over-midgnight").on("change", function()
+{
+	CheckNightMode();
+});
+
+$("#night-mode-enabled").prop("checked", BoolVal(Grocy.UserSettings.night_mode_enabled));
+$("#auto-night-mode-enabled").prop("checked", BoolVal(Grocy.UserSettings.auto_night_mode_enabled));
+$("#auto-night-mode-time-range-goes-over-midgnight").prop("checked", BoolVal(Grocy.UserSettings.auto_night_mode_time_range_goes_over_midnight));
+$("#auto-night-mode-enabled").trigger("change");
+$("#auto-night-mode-time-range-from").val(Grocy.UserSettings.auto_night_mode_time_range_from);
+$("#auto-night-mode-time-range-from").trigger("keyup");
+$("#auto-night-mode-time-range-to").val(Grocy.UserSettings.auto_night_mode_time_range_to);
+$("#auto-night-mode-time-range-to").trigger("keyup");
+
+function CheckNightMode()
+{
+	if (!BoolVal(Grocy.UserSettings.auto_night_mode_enabled))
+	{
+		return;
+	}
+
+	var start = moment(Grocy.UserSettings.auto_night_mode_time_range_from, "HH:mm", true);
+	var end = moment(Grocy.UserSettings.auto_night_mode_time_range_to, "HH:mm", true);
+	var now = moment();
+
+	if (!start.isValid() || !end.isValid)
+	{
+		return;
+	}
+
+	if (BoolVal(Grocy.UserSettings.auto_night_mode_time_range_goes_over_midnight))
+	{
+		end.add(1, "day");
+	}
+
+	if (start.isSameOrBefore(now) && end.isSameOrAfter(now)) // We're INSIDE of night mode time range
+	{
+		if (!$("body").hasClass("night-mode"))
+		{
+			$("body").addClass("night-mode");
+			$("#currently-inside-night-mode-range").prop("checked", true);
+			$("#currently-inside-night-mode-range").trigger("change");
+		}
+	}
+	else // We're OUTSIDE of night mode time range
+	{
+		if ($("body").hasClass("night-mode"))
+		{
+			$("body").removeClass("night-mode");
+			$("#currently-inside-night-mode-range").prop("checked", false);
+			$("#currently-inside-night-mode-range").trigger("change");
+		}		
+	}
+}
+CheckNightMode();
+
+if (Grocy.Mode === "production")
+{
+	setInterval(CheckNightMode, 60000);
+}
+else
+{
+	setInterval(CheckNightMode, 4000);
+}

public/viewjs/batteries.js

@@ -7,7 +7,16 @@
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
-	'stateSave': true
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
 });
 
 $("#search").on("keyup", function()

public/viewjs/batteriesoverview.js

@@ -7,7 +7,16 @@
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
-	'stateSave': true
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
 });
 
 $("#search").on("keyup", function()
@@ -21,23 +30,87 @@ $("#search").on("keyup", function()
 	batteriesOverviewTable.search(value).draw();
 });
 
+$("#status-filter").on("change", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+
+	// Transfer CSS classes of selected element to dropdown element (for background)
+	$(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control");
+	
+	batteriesOverviewTable.column(4).search(value).draw();
+});
+
+$(".status-filter-button").on("click", function()
+{
+	var value = $(this).data("status-filter");
+	$("#status-filter").val(value);
+	$("#status-filter").trigger("change");
+});
+
 $(document).on('click', '.track-charge-cycle-button', function(e)
 {
+	e.preventDefault();
+
+	// Remove the focus from the current button
+	// to prevent that the tooltip stays until clicked anywhere else
+	document.activeElement.blur();
+	
 	var batteryId = $(e.currentTarget).attr('data-battery-id');
 	var batteryName = $(e.currentTarget).attr('data-battery-name');
 	var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
 
 	Grocy.Api.Get('batteries/track-charge-cycle/' + batteryId + '?tracked_time=' + trackedTime,
-		function(result)
+		function()
 		{
-			$('#battery-' + batteryId + '-last-tracked-time').parent().effect('highlight', {}, 500);
-			$('#battery-' + batteryId + '-last-tracked-time').fadeOut(500, function () {
-				$(this).text(trackedTime).fadeIn(500);
-			});
-			$('#battery-' + batteryId + '-last-tracked-time-timeago').attr('datetime', trackedTime);
-			RefreshContextualTimeago();
+			Grocy.Api.Get('batteries/get-battery-details/' + batteryId,
+				function(result)
+				{
+					var batteryRow = $('#battery-' + batteryId + '-row');
+					var nextXDaysThreshold = moment().add($("#info-due-batteries").data("next-x-days"), "days");
+					var now = moment();
+					var nextExecutionTime = moment(result.next_estimated_charge_time);
 
-			toastr.success(L('Tracked charge cylce of battery #1 on #2', batteryName, trackedTime));
+					batteryRow.removeClass("table-warning");
+					batteryRow.removeClass("table-danger");
+					if (nextExecutionTime.isBefore(now))
+					{
+						batteryRow.addClass("table-danger");
+					}
+					else if (nextExecutionTime.isBefore(nextXDaysThreshold))
+					{
+						batteryRow.addClass("table-warning");
+					}
+
+					$('#battery-' + batteryId + '-last-tracked-time').parent().effect('highlight', { }, 500);
+					$('#battery-' + batteryId + '-last-tracked-time').fadeOut(500, function()
+					{
+						$(this).text(trackedTime).fadeIn(500);
+					});
+					$('#battery-' + batteryId + '-last-tracked-time-timeago').attr('datetime', trackedTime);
+
+					if (result.battery.charge_interval_days != 0)
+					{
+						$('#battery-' + batteryId + '-next-charge-time').parent().effect('highlight', { }, 500);
+						$('#battery-' + batteryId + '-next-charge-time').fadeOut(500, function()
+						{
+							$(this).text(result.next_estimated_charge_time).fadeIn(500);
+						});
+						$('#battery-' + batteryId + '-next-charge-time-timeago').attr('datetime', result.next_estimated_charge_time);
+					}
+
+					toastr.success(L('Tracked charge cycle of battery #1 on #2', batteryName, trackedTime));
+					RefreshContextualTimeago();
+					RefreshStatistics();
+				},
+				function(xhr)
+				{
+					console.error(xhr);
+				}
+			);
 		},
 		function(xhr)
 		{
@@ -45,3 +118,37 @@ $(document).on('click', '.track-charge-cycle-button', function(e)
 		}
 	);
 });
+
+function RefreshStatistics()
+{
+	var nextXDays = $("#info-due-batteries").data("next-x-days");
+	Grocy.Api.Get('batteries/get-current',
+		function(result)
+		{
+			var dueCount = 0;
+			var overdueCount = 0;
+			var now = moment();
+			var nextXDaysThreshold = moment().add(nextXDays, "days");
+			result.forEach(element => {
+				var date = moment(element.next_estimated_charge_time);
+				if (date.isBefore(now))
+				{
+					overdueCount++;
+				}
+				else if (date.isBefore(nextXDaysThreshold))
+				{
+					dueCount++;
+				}
+			});
+			
+			$("#info-due-batteries").text(Pluralize(dueCount, L('#1 battery is due to be charged within the next #2 days', dueCount, nextXDays), L('#1 batteries are due to be charged within the next #2 days', dueCount, nextXDays)));
+			$("#info-overdue-batteries").text(Pluralize(overdueCount, L('#1 battery is overdue to be charged', overdueCount), L('#1 batteries are overdue to be charged', overdueCount)));
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+}
+
+RefreshStatistics();

public/viewjs/batteryform.js

@@ -11,7 +11,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -24,7 +24,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -39,9 +39,10 @@ $('#battery-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('battery-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/batterytracking.js

@@ -35,17 +35,22 @@
 
 $('#battery_id').on('change', function(e)
 {
-	var batteryId = $(e.target).val();
+	var input = $('#battery_id_text_input').val().toString();
+	$('#battery_id_text_input').val(input);
+	$('#battery_id').data('combobox').refresh();
 
+	var batteryId = $(e.target).val();
 	if (batteryId)
 	{
 		Grocy.Components.BatteryCard.Refresh(batteryId);
 		$('#tracked_time').find('input').focus();
+		Grocy.FrontendHelpers.ValidateForm('batterytracking-form');
 	}
 });
 
 $('.combobox').combobox({
-	appendId: '_text_input'
+	appendId: '_text_input',
+	bsVersion: '4'
 });
 
 $('#battery_id').val('');
@@ -63,9 +68,10 @@ $('#batterytracking-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('batterytracking-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/choreform.js

@@ -0,0 +1,72 @@
+$('#save-chore-button').on('click', function(e)
+{
+	e.preventDefault();
+
+	if (Grocy.EditMode === 'create')
+	{
+		Grocy.Api.Post('add-object/chores', $('#chore-form').serializeJSON(),
+			function(result)
+			{
+				window.location.href = U('/chores');
+			},
+			function(xhr)
+			{
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
+			}
+		);
+	}
+	else
+	{
+		Grocy.Api.Post('edit-object/chores/' + Grocy.EditObjectId, $('#chore-form').serializeJSON(),
+			function(result)
+			{
+				window.location.href = U('/chores');
+			},
+			function(xhr)
+			{
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
+			}
+		);
+	}
+});
+
+$('#chore-form input').keyup(function(event)
+{
+	Grocy.FrontendHelpers.ValidateForm('chore-form');
+});
+
+$('#chore-form input').keydown(function(event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		event.preventDefault();
+
+		if (document.getElementById('chore-form').checkValidity() === false) //There is at least one validation error
+		{
+			return false;
+		}
+		else
+		{
+			$('#save-chore-button').click();
+		}
+	}
+});
+
+$('#name').focus();
+Grocy.FrontendHelpers.ValidateForm('chore-form');
+
+$('.input-group-chore-period-type').on('change', function(e)
+{
+	var periodType = $('#period_type').val();
+	var periodDays = $('#period_days').val();
+
+	if (periodType === 'dynamic-regular')
+	{
+		$('#chore-period-type-info').text(L('This means it is estimated that a new execution of this chore is tracked #1 days after the last was tracked', periodDays.toString()));
+		$('#chore-period-type-info').removeClass('d-none');
+	}
+	else
+	{
+		$('#chore-period-type-info').addClass('d-none');
+	}
+});

public/viewjs/chores.js

@@ -0,0 +1,67 @@
+var choresTable  = $('#chores-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	choresTable.search(value).draw();
+});
+
+$(document).on('click', '.chore-delete-button', function (e)
+{
+	var objectName = $(e.currentTarget).attr('data-chore-name');
+	var objectId = $(e.currentTarget).attr('data-chore-id');
+
+	bootbox.confirm({
+		message: L('Are you sure to delete chore "#1"?', objectName),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Get('delete-object/chores/' + objectId,
+					function(result)
+					{
+						window.location.href = U('/chores');
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
+});

public/viewjs/choresanalysis.js

@@ -0,0 +1,46 @@
+var choresAnalysisTable = $('#chores-analysis-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'desc']],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
+});
+
+$("#chore-filter").on("change", function()
+{
+	var value = $(this).val();
+	var text = $("#chore-filter option:selected").text();
+	if (value === "all")
+	{
+		text = "";
+	}
+	
+	choresAnalysisTable.column(0).search(text).draw();
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	choresAnalysisTable.search(value).draw();
+});
+
+if (typeof GetUriParam("chore") !== "undefined")
+{
+	$("#chore-filter").val(GetUriParam("chore"));
+	$("#chore-filter").trigger("change");
+}

public/viewjs/choresoverview.js

@@ -0,0 +1,154 @@
+var choresOverviewTable = $('#chores-overview-table').DataTable({
+	'paginate': false,
+	'order': [[2, 'desc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	choresOverviewTable.search(value).draw();
+});
+
+$("#status-filter").on("change", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+
+	// Transfer CSS classes of selected element to dropdown element (for background)
+	$(this).attr("class", $("#" + $(this).attr("id") + " option[value='" + value + "']").attr("class") + " form-control");
+	
+	choresOverviewTable.column(4).search(value).draw();
+});
+
+$(".status-filter-button").on("click", function()
+{
+	var value = $(this).data("status-filter");
+	$("#status-filter").val(value);
+	$("#status-filter").trigger("change");
+});
+
+$(document).on('click', '.track-chore-button', function(e)
+{
+	e.preventDefault();
+
+	// Remove the focus from the current button
+	// to prevent that the tooltip stays until clicked anywhere else
+	document.activeElement.blur();
+	
+	var choreId = $(e.currentTarget).attr('data-chore-id');
+	var choreName = $(e.currentTarget).attr('data-chore-name');
+	var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
+
+	Grocy.Api.Get('chores/track-chore-execution/' + choreId + '?tracked_time=' + trackedTime,
+		function()
+		{
+			Grocy.Api.Get('chores/get-chore-details/' + choreId,
+				function(result)
+				{
+					var choreRow = $('#chore-' + choreId + '-row');
+					var nextXDaysThreshold = moment().add($("#info-due-chores").data("next-x-days"), "days");
+					var now = moment();
+					var nextExecutionTime = moment(result.next_estimated_execution_time);
+
+					choreRow.removeClass("table-warning");
+					choreRow.removeClass("table-danger");
+					if (nextExecutionTime.isBefore(now))
+					{
+						choreRow.addClass("table-danger");
+					}
+					else if (nextExecutionTime.isBefore(nextXDaysThreshold))
+					{
+						choreRow.addClass("table-warning");
+					}
+
+					$('#chore-' + choreId + '-last-tracked-time').parent().effect('highlight', { }, 500);
+					$('#chore-' + choreId + '-last-tracked-time').fadeOut(500, function()
+					{
+						$(this).text(trackedTime).fadeIn(500);
+					});
+					$('#chore-' + choreId + '-last-tracked-time-timeago').attr('datetime', trackedTime);
+
+					if (result.chore.period_type == "dynamic-regular")
+					{
+						$('#chore-' + choreId + '-next-execution-time').parent().effect('highlight', { }, 500);
+						$('#chore-' + choreId + '-next-execution-time').fadeOut(500, function()
+						{
+							$(this).text(result.next_estimated_execution_time).fadeIn(500);
+						});
+						$('#chore-' + choreId + '-next-execution-time-timeago').attr('datetime', result.next_estimated_execution_time);
+					}
+
+					toastr.success(L('Tracked execution of chore #1 on #2', choreName, trackedTime));
+					RefreshContextualTimeago();
+					RefreshStatistics();
+				},
+				function(xhr)
+				{
+					console.error(xhr);
+				}
+			);
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});
+
+function RefreshStatistics()
+{
+	var nextXDays = $("#info-due-chores").data("next-x-days");
+	Grocy.Api.Get('chores/get-current',
+		function(result)
+		{
+			var dueCount = 0;
+			var overdueCount = 0;
+			var now = moment();
+			var nextXDaysThreshold = moment().add(nextXDays, "days");
+			result.forEach(element => {
+				var date = moment(element.next_estimated_execution_time);
+				if (date.isBefore(now))
+				{
+					overdueCount++;
+				}
+				else if (date.isBefore(nextXDaysThreshold))
+				{
+					dueCount++;
+				}
+			});
+			
+			$("#info-due-chores").text(Pluralize(dueCount, L('#1 chore is due to be done within the next #2 days', dueCount, nextXDays), L('#1 chores are due to be done within the next #2 days', dueCount, nextXDays)));
+			$("#info-overdue-chores").text(Pluralize(overdueCount, L('#1 chore is overdue to be done', overdueCount), L('#1 chores are overdue to be done', overdueCount)));
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+}
+
+RefreshStatistics();

public/viewjs/choretracking.js

@@ -0,0 +1,84 @@
+$('#save-choretracking-button').on('click', function(e)
+{
+	e.preventDefault();
+
+	var jsonForm = $('#choretracking-form').serializeJSON();
+
+	Grocy.Api.Get('chores/get-chore-details/' + jsonForm.chore_id,
+		function (choreDetails)
+		{
+			Grocy.Api.Get('chores/track-chore-execution/' + jsonForm.chore_id + '?tracked_time=' + Grocy.Components.DateTimePicker.GetValue() + "&done_by=" + Grocy.Components.UserPicker.GetValue(),
+				function(result)
+				{
+					toastr.success(L('Tracked execution of chore #1 on #2', choreDetails.chore.name, Grocy.Components.DateTimePicker.GetValue()));
+
+					$('#chore_id').val('');
+					$('#chore_id_text_input').focus();
+					$('#chore_id_text_input').val('');
+					Grocy.Components.DateTimePicker.SetValue(moment().format('YYYY-MM-DD HH:mm:ss'));
+					$('#chore_id_text_input').trigger('change');
+					Grocy.FrontendHelpers.ValidateForm('choretracking-form');
+				},
+				function(xhr)
+				{
+					console.error(xhr);
+				}
+			);
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+});
+
+$('#chore_id').on('change', function(e)
+{
+	var input = $('#chore_id_text_input').val().toString();
+	$('#chore_id_text_input').val(input);
+	$('#chore_id').data('combobox').refresh();
+
+	var choreId = $(e.target).val();
+	if (choreId)
+	{
+		Grocy.Components.ChoreCard.Refresh(choreId);
+		Grocy.Components.DateTimePicker.GetInputElement().focus();
+		Grocy.FrontendHelpers.ValidateForm('choretracking-form');
+	}
+});
+
+$('.combobox').combobox({
+	appendId: '_text_input',
+	bsVersion: '4'
+});
+
+$('#chore_id_text_input').focus();
+$('#chore_id_text_input').trigger('change');
+Grocy.FrontendHelpers.ValidateForm('choretracking-form');
+
+$('#choretracking-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('choretracking-form');
+});
+
+$('#choretracking-form input').keydown(function(event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		event.preventDefault();
+
+		if (document.getElementById('choretracking-form').checkValidity() === false) //There is at least one validation error
+		{
+			return false;
+		}
+		else
+		{
+			$('#save-choretracking-button').click();
+		}
+	}
+});
+
+Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
+{
+	Grocy.FrontendHelpers.ValidateForm('choretracking-form');
+});

public/viewjs/components/batterycard.js

@@ -7,7 +7,7 @@ Grocy.Components.BatteryCard.Refresh = function(batteryId)
 		{
 			$('#batterycard-battery-name').text(batteryDetails.battery.name);
 			$('#batterycard-battery-used_in').text(batteryDetails.battery.used_in);
-			$('#batterycard-battery-last-charged').text((batteryDetails.last_charged || 'never'));
+			$('#batterycard-battery-last-charged').text((batteryDetails.last_charged || L('never')));
 			$('#batterycard-battery-last-charged-timeago').text($.timeago(batteryDetails.last_charged || ''));
 			$('#batterycard-battery-charge-cycles-count').text((batteryDetails.charge_cycles_count || '0'));
 

public/viewjs/components/chorecard.js

@@ -0,0 +1,21 @@
+Grocy.Components.ChoreCard = { };
+
+Grocy.Components.ChoreCard.Refresh = function(choreId)
+{
+	Grocy.Api.Get('chores/get-chore-details/' + choreId,
+		function(choreDetails)
+		{
+			$('#chorecard-chore-name').text(choreDetails.chore.name);
+			$('#chorecard-chore-last-tracked').text((choreDetails.last_tracked || L('never')));
+			$('#chorecard-chore-last-tracked-timeago').text($.timeago(choreDetails.last_tracked || ''));
+			$('#chorecard-chore-tracked-count').text((choreDetails.tracked_count || '0'));
+			$('#chorecard-chore-last-done-by').text((choreDetails.last_done_by.display_name || L('Unknown')));
+
+			EmptyElementWhenMatches('#chorecard-chore-last-tracked-timeago', L('timeago_nan'));
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
+};

public/viewjs/components/datetimepicker.js

@@ -2,7 +2,7 @@ Grocy.Components.DateTimePicker = { };
 
 Grocy.Components.DateTimePicker.GetInputElement = function()
 {
-	return $('.datetimepicker').find('input');
+	return $('.datetimepicker').find('input').not(".form-check-input");
 }
 
 Grocy.Components.DateTimePicker.GetValue = function()
@@ -14,6 +14,14 @@ Grocy.Components.DateTimePicker.SetValue = function(value)
 {
 	Grocy.Components.DateTimePicker.GetInputElement().val(value);
 	Grocy.Components.DateTimePicker.GetInputElement().trigger('change');
+
+	// "Click" the shortcut checkbox when the desired value is
+	// not the shortcut value and it is currently set
+	var shortcutValue = $("#datetimepicker-shortcut").data("datetimepicker-shortcut-value");
+	if (value != shortcutValue && $("#datetimepicker-shortcut").is(":checked"))
+	{
+		$("#datetimepicker-shortcut").click();
+	}
 }
 
 var startDate = null;
@@ -21,6 +29,10 @@ if (Grocy.Components.DateTimePicker.GetInputElement().data('init-with-now') ===
 {
 	startDate = moment().format(Grocy.Components.DateTimePicker.GetInputElement().data('format'));
 }
+if (Grocy.Components.DateTimePicker.GetInputElement().data('init-value').length > 0)
+{
+	startDate = moment(Grocy.Components.DateTimePicker.GetInputElement().data('init-value')).format(Grocy.Components.DateTimePicker.GetInputElement().data('format'));
+}
 
 var limitDate = moment('2999-12-31 23:59:59');
 if (Grocy.Components.DateTimePicker.GetInputElement().data('limit-end-to-now') === true)
@@ -79,7 +91,7 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
 	var centuryEnd = Number.parseInt(now.getFullYear().toString().substring(0, 2) + '99');
 	var format = Grocy.Components.DateTimePicker.GetInputElement().data('format');
 	var nextInputElement = $(Grocy.Components.DateTimePicker.GetInputElement().data('next-input-selector'));
-
+	
 	//If input is empty and any arrow key is pressed, set date to today
 	if (value.length === 0 && (e.keyCode === 38 || e.keyCode === 40 || e.keyCode === 37 || e.keyCode === 39))
 	{
@@ -93,7 +105,12 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
 	}
 	else if (value.length === 4 && !(Number.parseInt(value) > centuryStart && Number.parseInt(value) < centuryEnd))
 	{
-		Grocy.Components.DateTimePicker.SetValue((new Date()).getFullYear().toString() + value);
+		var date = moment((new Date()).getFullYear().toString() + value);
+		if (date.isBefore(moment()))
+		{
+			date.add(1, "year");
+		}
+		Grocy.Components.DateTimePicker.SetValue(date.format(format));
 		nextInputElement.focus();
 	}
 	else if (value.length === 8 && $.isNumeric(value))
@@ -101,6 +118,12 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
 		Grocy.Components.DateTimePicker.SetValue(value.replace(/(\d{4})(\d{2})(\d{2})/, '$1-$2-$3'));
 		nextInputElement.focus();
 	}
+	else if (value.length === 7 && $.isNumeric(value.substring(0, 6)) && (value.substring(6, 7).toLowerCase() === "e" || value.substring(6, 7).toLowerCase() === "+"))
+	{
+		var date = moment(value.substring(0, 4) + "-" + value.substring(4, 6) + "-01").endOf("month");
+		Grocy.Components.DateTimePicker.SetValue(date.format(format));
+		nextInputElement.focus();
+	}
 	else
 	{
 		var dateObj = moment(value, format, true);
@@ -148,6 +171,14 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keyup', function(e)
 			element.setCustomValidity("");
 		}
 	}
+
+	// "Click" the shortcut checkbox when the shortcut value was
+	// entered manually and it is currently not set
+	var shortcutValue = $("#datetimepicker-shortcut").data("datetimepicker-shortcut-value");
+	if (value == shortcutValue && !$("#datetimepicker-shortcut").is(":checked"))
+	{
+		$("#datetimepicker-shortcut").click();
+	}
 });
 
 Grocy.Components.DateTimePicker.GetInputElement().on('input', function(e)
@@ -160,3 +191,20 @@ $('.datetimepicker').on('update.datetimepicker', function(e)
 {
 	Grocy.Components.DateTimePicker.GetInputElement().trigger('input');
 });
+
+$("#datetimepicker-shortcut").on("click", function()
+{
+	if (this.checked)
+	{
+		var value = $("#datetimepicker-shortcut").data("datetimepicker-shortcut-value");
+		Grocy.Components.DateTimePicker.SetValue(value);
+		Grocy.Components.DateTimePicker.GetInputElement().attr("readonly", "");
+		$(Grocy.Components.DateTimePicker.GetInputElement().data('next-input-selector')).focus();
+	}
+	else
+	{
+		Grocy.Components.DateTimePicker.SetValue("");
+		Grocy.Components.DateTimePicker.GetInputElement().removeAttr("readonly");
+		Grocy.Components.DateTimePicker.GetInputElement().focus();
+	}
+});

public/viewjs/components/habitcard.js

@@ -1,20 +0,0 @@
-Grocy.Components.HabitCard = { };
-
-Grocy.Components.HabitCard.Refresh = function(habitId)
-{
-	Grocy.Api.Get('habits/get-habit-details/' + habitId,
-		function(habitDetails)
-		{
-			$('#habitcard-habit-name').text(habitDetails.habit.name);
-			$('#habitcard-habit-last-tracked').text((habitDetails.last_tracked || 'never'));
-			$('#habitcard-habit-last-tracked-timeago').text($.timeago(habitDetails.last_tracked || ''));
-			$('#habitcard-habit-tracked-count').text((habitDetails.tracked_count || '0'));
-
-			EmptyElementWhenMatches('#habitcard-habit-last-tracked-timeago', L('timeago_nan'));
-		},
-		function(xhr)
-		{
-			console.error(xhr);
-		}
-	);
-};

public/viewjs/components/numberpicker.js

@@ -0,0 +1,15 @@
+$(".numberpicker-down-button").unbind('click').on("click", function ()
+{
+	var inputElement = $(this).parent().parent().find('input[type="number"]')[0];
+	inputElement.stepDown();
+	$(inputElement).trigger('keyup');
+	$(inputElement).trigger('change');
+});
+
+$(".numberpicker-up-button").unbind('click').on("click", function()
+{
+	var inputElement = $(this).parent().parent().find('input[type="number"]')[0];
+	inputElement.stepUp();
+	$(inputElement).trigger('keyup');
+	$(inputElement).trigger('change');
+});

public/viewjs/components/productcard.js

@@ -5,15 +5,25 @@ Grocy.Components.ProductCard.Refresh = function(productId)
 	Grocy.Api.Get('stock/get-product-details/' + productId,
 		function(productDetails)
 		{
+			var stockAmount = productDetails.stock_amount || '0';
 			$('#productcard-product-name').text(productDetails.product.name);
-			$('#productcard-product-stock-amount').text(productDetails.stock_amount || '0');
+			$('#productcard-product-stock-amount').text(stockAmount);
 			$('#productcard-product-stock-qu-name').text(productDetails.quantity_unit_stock.name);
-			$('#productcard-product-stock-qu-name2').text(productDetails.quantity_unit_stock.name);
+			$('#productcard-product-stock-qu-name2').text(Pluralize(stockAmount, productDetails.quantity_unit_stock.name, productDetails.quantity_unit_stock.name_plural));
 			$('#productcard-product-last-purchased').text((productDetails.last_purchased || L('never')).substring(0, 10));
 			$('#productcard-product-last-purchased-timeago').text($.timeago(productDetails.last_purchased || ''));
 			$('#productcard-product-last-used').text((productDetails.last_used || L('never')).substring(0, 10));
 			$('#productcard-product-last-used-timeago').text($.timeago(productDetails.last_used || ''));
 
+			if (productDetails.last_price !== null)
+			{
+				$('#productcard-product-last-price').text(Number.parseFloat(productDetails.last_price).toLocaleString() + ' ' + Grocy.Currency);
+			}
+			else
+			{
+				$('#productcard-product-last-price').text(L('Unknown'));
+			}
+
 			EmptyElementWhenMatches('#productcard-product-last-purchased-timeago', L('timeago_nan'));
 			EmptyElementWhenMatches('#productcard-product-last-used-timeago', L('timeago_nan'));
 		},
@@ -22,4 +32,88 @@ Grocy.Components.ProductCard.Refresh = function(productId)
 			console.error(xhr);
 		}
 	);
+
+	Grocy.Api.Get('stock/get-product-price-history/' + productId,
+		function(priceHistoryDataPoints)
+		{
+			if (priceHistoryDataPoints.length > 0)
+			{
+				$("#productcard-product-price-history-chart").removeClass("d-none");
+				$("#productcard-no-price-data-hint").addClass("d-none");
+
+				Grocy.Components.ProductCard.ReInitPriceHistoryChart();
+				priceHistoryDataPoints.forEach((dataPoint) =>
+				{
+					Grocy.Components.ProductCard.PriceHistoryChart.data.labels.push(moment(dataPoint.date).toDate());
+
+					var dataset = Grocy.Components.ProductCard.PriceHistoryChart.data.datasets[0];
+					dataset.data.push(dataPoint.price);
+				});
+				Grocy.Components.ProductCard.PriceHistoryChart.update();
+			}
+			else
+			{
+				$("#productcard-product-price-history-chart").addClass("d-none");
+				$("#productcard-no-price-data-hint").removeClass("d-none");
+			}
+		},
+		function(xhr)
+		{
+			console.error(xhr);
+		}
+	);
 };
+
+Grocy.Components.ProductCard.ReInitPriceHistoryChart = function()
+{
+	if (typeof Grocy.Components.ProductCard.PriceHistoryChart !== "undefined")
+	{
+		Grocy.Components.ProductCard.PriceHistoryChart.destroy();
+	}
+
+	var format = 'YYYY-MM-DD';
+	Grocy.Components.ProductCard.PriceHistoryChart = new Chart(document.getElementById("productcard-product-price-history-chart"), {
+		type: "line",
+		data: {
+			labels: [ //Date objects
+				// Will be populated in Grocy.Components.ProductCard.Refresh
+			],
+			datasets: [{
+				data: [
+					// Will be populated in Grocy.Components.ProductCard.Refresh
+				],
+				fill: false,
+				borderColor: '#17a2b8'
+			}]
+		},
+		options: {
+			scales: {
+				xAxes: [{
+					type: 'time',
+					time: {
+						parser: format,
+						round: 'day',
+						tooltipFormat: format,
+						unit: 'day',
+						unitStepSize: 10,
+						displayFormats: {
+							'day': format
+						}
+					},
+					ticks: {
+						autoSkip: true,
+						maxRotation: 0
+					}
+				}],
+				yAxes: [{
+					ticks: {
+						beginAtZero: true
+					}
+				}]
+			},
+			legend: {
+				display: false
+			}
+		}
+	});
+}

public/viewjs/components/productpicker.js

@@ -1,6 +1,6 @@
 Grocy.Components.ProductPicker = { };
 
-Grocy.Components.ProductPicker.GetPicker = function ()
+Grocy.Components.ProductPicker.GetPicker = function()
 {
 	return $('#product_id');
 }
@@ -43,9 +43,10 @@ Grocy.Components.ProductPicker.HideCustomError = function()
 	$("#custom-productpicker-error").addClass("d-none");
 }
 
-$('.combobox').combobox({
+$('.product-combobox').combobox({
 	appendId: '_text_input',
-	bsVersion: '4'
+	bsVersion: '4',
+	clearIfNoMatch: false
 });
 
 var prefillProduct = GetUriParam('createdproduct');
@@ -81,8 +82,13 @@ if (addBarcode !== undefined)
 	$('#barcode-lookup-disabled-hint').removeClass('d-none');
 }
 
-$('#product_id_text_input').on('change', function(e)
+$('#product_id_text_input').on('blur', function(e)
 {
+	if (Grocy.Components.ProductPicker.GetPicker().hasClass("combobox-menu-visible"))
+	{
+		return;	
+	}
+
 	var input = $('#product_id_text_input').val().toString();
 	var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first();
 	
@@ -106,14 +112,20 @@ $('#product_id_text_input').on('change', function(e)
 			bootbox.dialog({
 				message: L('"#1" could not be resolved to a product, how do you want to proceed?', input),
 				title: L('Create or assign product'),
-				onEscape: function() { },
+				onEscape: function()
+				{
+					Grocy.Components.ProductPicker.SetValue('');
+				},
 				size: 'large',
 				backdrop: true,
 				buttons: {
 					cancel: {
-						label: 'Cancel',
+						label: L('Cancel'),
 						className: 'btn-default responsive-button',
-						callback: function() { }
+						callback: function()
+						{
+							Grocy.Components.ProductPicker.SetValue('');
+						}
 					},
 					addnewproduct: {
 						label: '<strong>P</strong> ' + L('Add as new product'),

public/viewjs/components/userpicker.js

@@ -0,0 +1,62 @@
+Grocy.Components.UserPicker = { };
+
+Grocy.Components.UserPicker.GetPicker = function()
+{
+	return $('#user_id');
+}
+
+Grocy.Components.UserPicker.GetInputElement = function()
+{
+	return $('#user_id_text_input');
+}
+
+Grocy.Components.UserPicker.GetValue = function()
+{
+	return $('#user_id').val();
+}
+
+Grocy.Components.UserPicker.SetValue = function(value)
+{
+	Grocy.Components.UserPicker.GetInputElement().val(value);
+	Grocy.Components.UserPicker.GetInputElement().trigger('change');
+}
+
+$('.user-combobox').combobox({
+	appendId: '_text_input',
+	bsVersion: '4'
+});
+
+var prefillUser = Grocy.Components.UserPicker.GetPicker().parent().data('prefill-by-username').toString();
+if (typeof prefillUser !== "undefined")
+{
+	var possibleOptionElement = $("#user_id option[data-additional-searchdata*='" + prefillUser + "']").first();
+	if (possibleOptionElement.length === 0)
+	{
+		possibleOptionElement = $("#user_id option:contains('" + prefillUser + "')").first();
+	}
+
+	if (possibleOptionElement.length > 0)
+	{
+		$('#user_id').val(possibleOptionElement.val());
+		$('#user_id').data('combobox').refresh();
+		$('#user_id').trigger('change');
+
+		var nextInputElement = $(Grocy.Components.UserPicker.GetPicker().parent().data('next-input-selector').toString());
+		nextInputElement.focus();
+	}
+}
+
+var prefillUserId = Grocy.Components.UserPicker.GetPicker().parent().data('prefill-by-user-id').toString();
+if (typeof prefillUserId !== "undefined")
+{
+	var possibleOptionElement = $("#user_id option[value='" + prefillUserId + "']").first();
+	if (possibleOptionElement.length > 0)
+	{
+		$('#user_id').val(possibleOptionElement.val());
+		$('#user_id').data('combobox').refresh();
+		$('#user_id').trigger('change');
+
+		var nextInputElement = $(Grocy.Components.UserPicker.GetPicker().parent().data('next-input-selector').toString());
+		nextInputElement.focus();
+	}
+}

public/viewjs/consume.js

@@ -90,9 +90,10 @@ $('#consume-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('consume-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/habitform.js

@@ -1,71 +0,0 @@
-$('#save-habit-button').on('click', function(e)
-{
-	e.preventDefault();
-
-	if (Grocy.EditMode === 'create')
-	{
-		Grocy.Api.Post('add-object/habits', $('#habit-form').serializeJSON(),
-			function(result)
-			{
-				window.location.href = U('/habits');
-			},
-			function(xhr)
-			{
-				console.error(xhr);
-			}
-		);
-	}
-	else
-	{
-		Grocy.Api.Post('edit-object/habits/' + Grocy.EditObjectId, $('#habit-form').serializeJSON(),
-			function(result)
-			{
-				window.location.href = U('/habits');
-			},
-			function(xhr)
-			{
-				console.error(xhr);
-			}
-		);
-	}
-});
-
-$('#habit-form input').keyup(function(event)
-{
-	Grocy.FrontendHelpers.ValidateForm('habit-form');
-});
-
-$('#habit-form input').keydown(function(event)
-{
-	if (event.keyCode === 13) //Enter
-	{
-		if (document.getElementById('habit-form').checkValidity() === false) //There is at least one validation error
-		{
-			event.preventDefault();
-			return false;
-		}
-		else
-		{
-			$('#save-habit-button').click();
-		}
-	}
-});
-
-$('#name').focus();
-Grocy.FrontendHelpers.ValidateForm('habit-form');
-
-$('.input-group-habit-period-type').on('change', function(e)
-{
-	var periodType = $('#period_type').val();
-	var periodDays = $('#period_days').val();
-
-	if (periodType === 'dynamic-regular')
-	{
-		$('#habit-period-type-info').text(L('This means it is estimated that a new execution of this habit is tracked #1 days after the last was tracked', periodDays.toString()));
-		$('#habit-period-type-info').removeClass('d-none');
-	}
-	else
-	{
-		$('#habit-period-type-info').addClass('d-none');
-	}
-});

public/viewjs/habitsoverview.js

@@ -1,47 +0,0 @@
-var habitsOverviewTable = $('#habits-overview-table').DataTable({
-	'paginate': false,
-	'order': [[2, 'desc']],
-	'columnDefs': [
-		{ 'orderable': false, 'targets': 0 }
-	],
-	'language': JSON.parse(L('datatables_localization')),
-	'scrollY': false,
-	'colReorder': true,
-	'stateSave': true
-});
-
-$("#search").on("keyup", function()
-{
-	var value = $(this).val();
-	if (value === "all")
-	{
-		value = "";
-	}
-	
-	habitsOverviewTable.search(value).draw();
-});
-
-$(document).on('click', '.track-habit-button', function(e)
-{
-	var habitId = $(e.currentTarget).attr('data-habit-id');
-	var habitName = $(e.currentTarget).attr('data-habit-name');
-	var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
-
-	Grocy.Api.Get('habits/track-habit-execution/' + habitId + '?tracked_time=' + trackedTime,
-		function(result)
-		{
-			$('#habit-' + habitId + '-last-tracked-time').parent().effect('highlight', {}, 500);
-			$('#habit-' + habitId + '-last-tracked-time').fadeOut(500, function () {
-				$(this).text(trackedTime).fadeIn(500);
-			});
-			$('#habit-' + habitId + '-last-tracked-time-timeago').attr('datetime', trackedTime);
-			RefreshContextualTimeago();
-
-			toastr.success(L('Tracked execution of habit #1 on #2', habitName, trackedTime));
-		},
-		function(xhr)
-		{
-			console.error(xhr);
-		}
-	);
-});

public/viewjs/habittracking.js

@@ -1,78 +0,0 @@
-$('#save-habittracking-button').on('click', function(e)
-{
-	e.preventDefault();
-
-	var jsonForm = $('#habittracking-form').serializeJSON();
-
-	Grocy.Api.Get('habits/get-habit-details/' + jsonForm.habit_id,
-		function (habitDetails)
-		{
-			Grocy.Api.Get('habits/track-habit-execution/' + jsonForm.habit_id + '?tracked_time=' + Grocy.Components.DateTimePicker.GetValue(),
-				function(result)
-				{
-					toastr.success(L('Tracked execution of habit #1 on #2', habitDetails.habit.name, Grocy.Components.DateTimePicker.GetValue()));
-
-					$('#habit_id').val('');
-					$('#habit_id_text_input').focus();
-					$('#habit_id_text_input').val('');
-					Grocy.Components.DateTimePicker.SetValue(moment().format('YYYY-MM-DD HH:mm:ss'));
-					$('#habit_id_text_input').trigger('change');
-					Grocy.FrontendHelpers.ValidateForm('habittracking-form');
-				},
-				function(xhr)
-				{
-					console.error(xhr);
-				}
-			);
-		},
-		function(xhr)
-		{
-			console.error(xhr);
-		}
-	);
-});
-
-$('#habit_id').on('change', function(e)
-{
-	var habitId = $(e.target).val();
-
-	if (habitId)
-	{
-		Grocy.Components.HabitCard.Refresh(habitId);
-		Grocy.Components.DateTimePicker.GetInputElement().focus();
-	}
-});
-
-$('.combobox').combobox({
-	appendId: '_text_input'
-});
-
-$('#habit_id_text_input').focus();
-$('#habit_id_text_input').trigger('change');
-Grocy.FrontendHelpers.ValidateForm('habittracking-form');
-
-$('#habittracking-form input').keyup(function (event)
-{
-	Grocy.FrontendHelpers.ValidateForm('habittracking-form');
-});
-
-$('#habittracking-form input').keydown(function(event)
-{
-	if (event.keyCode === 13) //Enter
-	{
-		if (document.getElementById('habittracking-form').checkValidity() === false) //There is at least one validation error
-		{
-			event.preventDefault();
-			return false;
-		}
-		else
-		{
-			$('#save-habittracking-button').click();
-		}
-	}
-});
-
-Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
-{
-	Grocy.FrontendHelpers.ValidateForm('habittracking-form');
-});

public/viewjs/inventory.js

@@ -118,9 +118,10 @@ $('#inventory-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('inventory-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/locationform.js

@@ -11,7 +11,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -24,7 +24,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -39,9 +39,10 @@ $('#location-form input').keydown(function (event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('location-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/locations.js

@@ -7,7 +7,16 @@
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
-	'stateSave': true
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
 });
 
 $("#search").on("keyup", function()

public/viewjs/manageapikeys.js

@@ -7,7 +7,16 @@
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
-	'stateSave': true
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
 });
 
 var createdApiKeyId = GetUriParam('CreatedApiKeyId');

public/viewjs/productform.js

@@ -18,7 +18,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -31,7 +31,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -99,9 +99,10 @@ $('#product-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/productgroupform.js

@@ -0,0 +1,56 @@
+$('#save-product-group-button').on('click', function(e)
+{
+	e.preventDefault();
+
+	if (Grocy.EditMode === 'create')
+	{
+		Grocy.Api.Post('add-object/product_groups', $('#product-group-form').serializeJSON(),
+			function(result)
+			{
+				window.location.href = U('/productgroups');
+			},
+			function(xhr)
+			{
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
+			}
+		);
+	}
+	else
+	{
+		Grocy.Api.Post('edit-object/product_groups/' + Grocy.EditObjectId, $('#product-group-form').serializeJSON(),
+			function(result)
+			{
+				window.location.href = U('/productgroups');
+			},
+			function(xhr)
+			{
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
+			}
+		);
+	}
+});
+
+$('#product-group-form input').keyup(function (event)
+{
+	Grocy.FrontendHelpers.ValidateForm('product-group-form');
+});
+
+$('#product-group-form input').keydown(function (event)
+{
+	if (event.keyCode === 13) //Enter
+	{
+		event.preventDefault();
+		
+		if (document.getElementById('product-group-form').checkValidity() === false) //There is at least one validation error
+		{
+			return false;
+		}
+		else
+		{
+			$('#save-product-group-button').click();
+		}
+	}
+});
+
+$('#name').focus();
+Grocy.FrontendHelpers.ValidateForm('product-group-form');

public/viewjs/productgroups.js

@@ -0,0 +1,67 @@
+var groupsTable = $('#productgroups-table').DataTable({
+	'paginate': false,
+	'order': [[1, 'asc']],
+	'columnDefs': [
+		{ 'orderable': false, 'targets': 0 }
+	],
+	'language': JSON.parse(L('datatables_localization')),
+	'scrollY': false,
+	'colReorder': true,
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
+});
+
+$("#search").on("keyup", function()
+{
+	var value = $(this).val();
+	if (value === "all")
+	{
+		value = "";
+	}
+	
+	groupsTable.search(value).draw();
+});
+
+$(document).on('click', '.product-group-delete-button', function(e)
+{
+	var objectName = $(e.currentTarget).attr('data-group-name');
+	var objectId = $(e.currentTarget).attr('data-group-id');
+
+	bootbox.confirm({
+		message: L('Are you sure to delete product group "#1"?', objectName),
+		buttons: {
+			confirm: {
+				label: L('Yes'),
+				className: 'btn-success'
+			},
+			cancel: {
+				label: L('No'),
+				className: 'btn-danger'
+			}
+		},
+		callback: function(result)
+		{
+			if (result === true)
+			{
+				Grocy.Api.Get('delete-object/product_groups/' + objectId,
+					function(result)
+					{
+						window.location.href = U('/productgroups');
+					},
+					function(xhr)
+					{
+						console.error(xhr);
+					}
+				);
+			}
+		}
+	});
+});

public/viewjs/products.js

@@ -7,7 +7,16 @@
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
-	'stateSave': true
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
 });
 
 $("#search").on("keyup", function()

public/viewjs/purchase.js

@@ -9,7 +9,13 @@
 		{
 			var amount = jsonForm.amount * productDetails.product.qu_factor_purchase_to_stock;
 
-			Grocy.Api.Get('stock/add-product/' + jsonForm.product_id + '/' + amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue(),
+			var price = "";
+			if (!jsonForm.price.toString().isEmpty())
+			{
+				price = parseFloat(jsonForm.price).toFixed(2);
+			}
+
+			Grocy.Api.Get('stock/add-product/' + jsonForm.product_id + '/' + amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue() + '&price=' + price,
 				function(result)
 				{
 					var addBarcode = GetUriParam('addbarcodetoselection');
@@ -43,6 +49,7 @@
 					else
 					{
 						$('#amount').val(0);
+						$('#price').val('');
 						Grocy.Components.DateTimePicker.SetValue('');
 						Grocy.Components.ProductPicker.SetValue('');
 						Grocy.Components.ProductPicker.GetInputElement().focus();
@@ -74,10 +81,21 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
 			function(productDetails)
 			{
 				$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
+				$('#price').val(productDetails.last_price);
 				
 				if (productDetails.product.default_best_before_days.toString() !== '0')
 				{
-					Grocy.Components.DateTimePicker.SetValue(moment().add(productDetails.product.default_best_before_days, 'days').format('YYYY-MM-DD'));
+					if (productDetails.product.default_best_before_days == -1)
+					{
+						if (!$("#datetimepicker-shortcut").is(":checked"))
+						{
+							$("#datetimepicker-shortcut").click();
+						}
+					}
+					else
+					{
+						Grocy.Components.DateTimePicker.SetValue(moment().add(productDetails.product.default_best_before_days, 'days').format('YYYY-MM-DD'));
+					}
 					$('#amount').focus();
 				}
 				else
@@ -126,9 +144,10 @@ $('#purchase-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('purchase-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/quantityunitform.js

@@ -11,7 +11,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -24,7 +24,7 @@
 			},
 			function(xhr)
 			{
-				console.error(xhr);
+				Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
 			}
 		);
 	}
@@ -39,9 +39,10 @@ $('#quantityunit-form input').keydown(function(event)
 {
 	if (event.keyCode === 13) //Enter
 	{
+		event.preventDefault();
+		
 		if (document.getElementById('quantityunit-form').checkValidity() === false) //There is at least one validation error
 		{
-			event.preventDefault();
 			return false;
 		}
 		else

public/viewjs/quantityunits.js

@@ -7,7 +7,16 @@
 	'language': JSON.parse(L('datatables_localization')),
 	'scrollY': false,
 	'colReorder': true,
-	'stateSave': true
+	'stateSave': true,
+	'stateSaveParams': function(settings, data)
+	{
+		data.search.search = "";
+
+		data.columns.forEach(column =>
+		{
+			column.search.search = "";
+		});
+	}
 });
 
 $("#search").on("keyup", function()