From 21e3c324c6f5fd5dae55e0921327d8fdc17345ae Mon Sep 17 00:00:00 2001 From: Paul Sinclair <24625998+sinclairpaul@users.noreply.github.com> Date: Sun, 1 Mar 2020 14:32:39 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8Add=20mealplan=20and=20calendar=20f?= =?UTF-8?q?irst=20day=20of=20week=20(#72)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🔨Add mealplan first day of week * 🔨Rename variable to mealday * 📚Update documentation * 🔨Add Calendar Day of week option --- README.md | 6 ++++++ grocy/config.json | 2 ++ grocy/rootfs/etc/services.d/php-fpm/run | 12 ++++++++++++ 3 files changed, 20 insertions(+) diff --git a/README.md b/README.md index c8f3f84..b2eb581 100755 --- a/README.md +++ b/README.md @@ -194,6 +194,12 @@ The following sub features can be enabled or disabled: Set it `true` to enable it, `false` otherwise. +The following sub features can be set to specify a day (0-6), where 0 would +equal Sunday: + +- `calendar_first_day_of_week` +- `meal_plan_first_day_of_week` + ## Known issues and limitations - Grocy support to provide custom lookup resources to lookup information diff --git a/grocy/config.json b/grocy/config.json index f854b1b..6087637 100755 --- a/grocy/config.json +++ b/grocy/config.json @@ -63,7 +63,9 @@ "tasks": "bool" }, "tweaks": { + "calendar_first_day_of_week": "int(0,6)?", "chores_assignment": "bool", + "meal_plan_first_day_of_week": "int(0,6)?", "multiple_shopping_lists": "bool", "stock_best_before_date_tracking": "bool", "stock_location_tracking": "bool", diff --git a/grocy/rootfs/etc/services.d/php-fpm/run b/grocy/rootfs/etc/services.d/php-fpm/run index c628ac5..d703fa5 100644 --- a/grocy/rootfs/etc/services.d/php-fpm/run +++ b/grocy/rootfs/etc/services.d/php-fpm/run @@ -3,6 +3,8 @@ # Home Assistant Community Add-on: Grocy # Runs the PHP-FPM daemon # ============================================================================== +declare caldayweek +declare mealday export GROCY_CULTURE export GROCY_CURRENCY export GROCY_ENTRY_PAGE @@ -41,10 +43,20 @@ if bashio::config.false 'features.tasks'; then export GROCY_FEATURE_FLAG_TASKS=0 fi +if bashio::config.has_value 'tweaks.calendar_first_day_of_week'; then + caldayweek=$(bashio::config 'tweaks.calendar_first_day_of_week') + export GROCY_CALENDAR_FIRST_DAY_OF_WEEK=${caldayweek} +fi + if bashio::config.false 'tweaks.chores_assignment'; then export GROCY_FEATURE_FLAG_CHORES_ASSIGNMENTS=0 fi +if bashio::config.has_value 'tweaks.meal_plan_first_day_of_week'; then + mealday=$(bashio::config 'tweaks.meal_plan_first_day_of_week') + export GROCY_MEAL_PLAN_FIRST_DAY_OF_WEEK=${mealday} +fi + if bashio::config.false 'tweaks.multiple_shopping_lists'; then export GROCY_FEATURE_FLAG_SHOPPINGLIST_MULTIPLE_LISTS=0 fi