diff --git a/vue3/src/components/display/MealPlanView.vue b/vue3/src/components/display/MealPlanView.vue index 24d082746..af8370787 100644 --- a/vue3/src/components/display/MealPlanView.vue +++ b/vue3/src/components/display/MealPlanView.vue @@ -2,7 +2,8 @@ - - + @@ -52,6 +54,8 @@ import {useUserPreferenceStore} from "@/stores/UserPreferenceStore"; const {lgAndUp} = useDisplay() +const calendarDate = ref(new Date()) + const currentlyDraggedMealplan = ref({} as IMealPlanNormalizedCalendarItem) const newPlanDialog = ref(false) @@ -74,8 +78,11 @@ const planItems = computed(() => { return items }) +/** + * determine item height (one or two rows) based on how much space is available and how many days are shown + */ const calendarItemHeight = computed(() => { - if (lgAndUp.value) { + if (lgAndUp.value && useUserPreferenceStore().deviceSettings.mealplan_displayPeriod == 'week') { return '2.6rem' } else { return '1.3rem' diff --git a/vue3/src/components/display/NavigationDrawerContextMenu.vue b/vue3/src/components/display/NavigationDrawerContextMenu.vue index e7b789f63..bba227113 100644 --- a/vue3/src/components/display/NavigationDrawerContextMenu.vue +++ b/vue3/src/components/display/NavigationDrawerContextMenu.vue @@ -11,12 +11,22 @@ + + + + + \ No newline at end of file diff --git a/vue3/src/components/settings/MealPlanSettings.vue b/vue3/src/components/settings/MealPlanSettings.vue index 3d1490606..a96adbc38 100644 --- a/vue3/src/components/settings/MealPlanSettings.vue +++ b/vue3/src/components/settings/MealPlanSettings.vue @@ -13,16 +13,7 @@

{{ $t('DeviceSettingsHelp') }}

- - - - - - +

{{ $t('Meal_Types') }} @@ -59,24 +50,7 @@ import {onMounted, ref} from "vue"; import {ApiApi, MealType} from "@/openapi"; import {ErrorMessageType, useMessageStore} from "@/stores/MessageStore"; import ModelEditDialog from "@/components/dialogs/ModelEditDialog.vue"; - -const {t} = useI18n() - -const MEALPLAN_PERIODS = ref([ - {title: t("Week"), value: "week"}, - {title: t("Month"), value: "month"}, - {title: t("Year"), value: "year"}, -]) -const MEALPLAN_STARTING_DAYS = ref([ - {title: t("Sunday"), value: 0}, - {title: t("Monday"), value: 1}, - {title: t("Tuesday"), value: 2}, - {title: t("Wednesday"), value: 3}, - {title: t("Thursday"), value: 4}, - {title: t("Friday"), value: 5}, - {title: t("Saturday"), value: 6}, -]) -const MEALPLAN_PERIOD_COUNTS = ref([1, 2, 3, 4]) +import MealPlanDeviceSettings from "@/components/settings/MealPlanDeviceSettings.vue"; const mealTypes = ref([] as MealType[]) diff --git a/vue3/src/locales/ar.json b/vue3/src/locales/ar.json index 667f7e24a..9463e9ed5 100644 --- a/vue3/src/locales/ar.json +++ b/vue3/src/locales/ar.json @@ -321,6 +321,7 @@ "Time": "", "Title": "", "Title_or_Recipe_Required": "", + "Today": "", "Toggle": "", "Tuesday": "", "Type": "", diff --git a/vue3/src/locales/bg.json b/vue3/src/locales/bg.json index 9951d0144..74bbc0294 100644 --- a/vue3/src/locales/bg.json +++ b/vue3/src/locales/bg.json @@ -314,6 +314,7 @@ "Time": "Време", "Title": "Заглавие", "Title_or_Recipe_Required": "Изисква се избор на заглавие или рецепта", + "Today": "", "Toggle": "Превключете", "Tuesday": "", "Type": "Тип", diff --git a/vue3/src/locales/ca.json b/vue3/src/locales/ca.json index 46b9282f8..d8d9f7960 100644 --- a/vue3/src/locales/ca.json +++ b/vue3/src/locales/ca.json @@ -405,6 +405,7 @@ "Time": "", "Title": "", "Title_or_Recipe_Required": "", + "Today": "", "Toggle": "", "Transpose_Words": "", "Tuesday": "", diff --git a/vue3/src/locales/cs.json b/vue3/src/locales/cs.json index 95dcfdfc9..2db998076 100644 --- a/vue3/src/locales/cs.json +++ b/vue3/src/locales/cs.json @@ -401,6 +401,7 @@ "Time": "Čas", "Title": "Název", "Title_or_Recipe_Required": "Je požadován název nebo výběr receptu", + "Today": "", "Toggle": "Přepnout", "Transpose_Words": "Transponovat slova", "Tuesday": "", diff --git a/vue3/src/locales/da.json b/vue3/src/locales/da.json index 9ad626c20..fd0a9e20f 100644 --- a/vue3/src/locales/da.json +++ b/vue3/src/locales/da.json @@ -379,6 +379,7 @@ "Time": "Tid", "Title": "Titel", "Title_or_Recipe_Required": "Titel eller valg af opskrift påkrævet", + "Today": "", "Toggle": "Skift", "Transpose_Words": "Omstil ord", "Tuesday": "", diff --git a/vue3/src/locales/de.json b/vue3/src/locales/de.json index 981d40d2f..65201fd86 100644 --- a/vue3/src/locales/de.json +++ b/vue3/src/locales/de.json @@ -408,6 +408,7 @@ "Time": "Zeit", "Title": "Titel", "Title_or_Recipe_Required": "Auswahl von Titel oder Rezept erforderlich", + "Today": "Heute", "Toggle": "Umschalten", "Transpose_Words": "Wörter Umwandeln", "Tuesday": "Dienstag", diff --git a/vue3/src/locales/el.json b/vue3/src/locales/el.json index 308020db8..cfff43142 100644 --- a/vue3/src/locales/el.json +++ b/vue3/src/locales/el.json @@ -370,6 +370,7 @@ "Time": "Χρόνος", "Title": "Τίτλος", "Title_or_Recipe_Required": "Η επιλογή τίτλου ή συνταγής είναι απαραίτητη", + "Today": "", "Toggle": "Εναλλαγή", "Tuesday": "", "Type": "Είδος", diff --git a/vue3/src/locales/en.json b/vue3/src/locales/en.json index a672a3de4..a7822b6a0 100644 --- a/vue3/src/locales/en.json +++ b/vue3/src/locales/en.json @@ -407,6 +407,7 @@ "Time": "Time", "Title": "Title", "Title_or_Recipe_Required": "Title or recipe selection required", + "Today": "Today", "Toggle": "Toggle", "Transpose_Words": "Transpose Words", "Tuesday": "Tuesday", diff --git a/vue3/src/locales/es.json b/vue3/src/locales/es.json index 5f7883454..e2dd1707f 100644 --- a/vue3/src/locales/es.json +++ b/vue3/src/locales/es.json @@ -404,6 +404,7 @@ "Time": "Tiempo", "Title": "Titulo", "Title_or_Recipe_Required": "Es necesario especificar un título o elegir una receta", + "Today": "", "Toggle": "Alternar", "Transpose_Words": "Transponer Palabras", "Tuesday": "", diff --git a/vue3/src/locales/fi.json b/vue3/src/locales/fi.json index c4fb0698c..e4ee634a8 100644 --- a/vue3/src/locales/fi.json +++ b/vue3/src/locales/fi.json @@ -238,6 +238,7 @@ "Time": "Aika", "Title": "Otsikko", "Title_or_Recipe_Required": "Otsikko tai resepti valinta vaadittu", + "Today": "", "Tuesday": "", "Type": "Tyyppi", "Unit": "Yksikkö", diff --git a/vue3/src/locales/fr.json b/vue3/src/locales/fr.json index 45aa8976b..df6f57d5e 100644 --- a/vue3/src/locales/fr.json +++ b/vue3/src/locales/fr.json @@ -404,6 +404,7 @@ "Time": "Temps", "Title": "Titre", "Title_or_Recipe_Required": "Sélection du titre ou de la recette requise", + "Today": "", "Toggle": "Basculer", "Transpose_Words": "Transposer les mots", "Tuesday": "", diff --git a/vue3/src/locales/he.json b/vue3/src/locales/he.json index e6109cf8a..7d22df1b7 100644 --- a/vue3/src/locales/he.json +++ b/vue3/src/locales/he.json @@ -406,6 +406,7 @@ "Time": "זמן", "Title": "כותרת", "Title_or_Recipe_Required": "בחירת כותרת או רכיב חובה", + "Today": "", "Toggle": "אפשר", "Transpose_Words": "להחליף מילים", "Tuesday": "", diff --git a/vue3/src/locales/hu.json b/vue3/src/locales/hu.json index 2592d0025..facf15b5e 100644 --- a/vue3/src/locales/hu.json +++ b/vue3/src/locales/hu.json @@ -371,6 +371,7 @@ "Time": "Idő", "Title": "Cím", "Title_or_Recipe_Required": "Cím vagy recept kiválasztása kötelező", + "Today": "", "Toggle": "Váltás", "Tuesday": "", "Type": "Típus", diff --git a/vue3/src/locales/hy.json b/vue3/src/locales/hy.json index 4746280eb..f78a664db 100644 --- a/vue3/src/locales/hy.json +++ b/vue3/src/locales/hy.json @@ -172,6 +172,7 @@ "ThanksTextHosted": "", "ThanksTextSelfhosted": "", "Thursday": "", + "Today": "", "Tuesday": "", "UnitConversion": "", "UpgradeNow": "", diff --git a/vue3/src/locales/id.json b/vue3/src/locales/id.json index 3c3cdefbc..b7cbcbc09 100644 --- a/vue3/src/locales/id.json +++ b/vue3/src/locales/id.json @@ -347,6 +347,7 @@ "Time": "", "Title": "", "Title_or_Recipe_Required": "", + "Today": "", "Toggle": "", "Tuesday": "", "Type": "", diff --git a/vue3/src/locales/is.json b/vue3/src/locales/is.json index 91795c023..126eb0749 100644 --- a/vue3/src/locales/is.json +++ b/vue3/src/locales/is.json @@ -404,6 +404,7 @@ "Time": "", "Title": "", "Title_or_Recipe_Required": "", + "Today": "", "Toggle": "", "Transpose_Words": "", "Tuesday": "", diff --git a/vue3/src/locales/it.json b/vue3/src/locales/it.json index cd89cca61..3648e4d2e 100644 --- a/vue3/src/locales/it.json +++ b/vue3/src/locales/it.json @@ -356,6 +356,7 @@ "Time": "Tempo", "Title": "Titolo", "Title_or_Recipe_Required": "Sono richiesti titolo o ricetta", + "Today": "", "Toggle": "Attiva/Disattiva", "Tuesday": "", "Type": "Tipo", diff --git a/vue3/src/locales/lt.json b/vue3/src/locales/lt.json index 5288fface..e66d8cd88 100644 --- a/vue3/src/locales/lt.json +++ b/vue3/src/locales/lt.json @@ -377,6 +377,7 @@ "Time": "", "Title": "", "Title_or_Recipe_Required": "", + "Today": "", "Toggle": "", "Transpose_Words": "", "Tuesday": "", diff --git a/vue3/src/locales/nb_NO.json b/vue3/src/locales/nb_NO.json index 29b54814c..9f30bdafc 100644 --- a/vue3/src/locales/nb_NO.json +++ b/vue3/src/locales/nb_NO.json @@ -368,6 +368,7 @@ "Time": "Tid", "Title": "Tittel", "Title_or_Recipe_Required": "Tittel- eller oppskrifts-valg nødvendig", + "Today": "", "Toggle": "", "Tuesday": "", "Type": "Type", diff --git a/vue3/src/locales/nl.json b/vue3/src/locales/nl.json index 379041320..7d79c1026 100644 --- a/vue3/src/locales/nl.json +++ b/vue3/src/locales/nl.json @@ -372,6 +372,7 @@ "Time": "Tijd", "Title": "Titel", "Title_or_Recipe_Required": "Titel of recept selectie is verplicht", + "Today": "", "Toggle": "Schakelaar", "Tuesday": "", "Type": "Type", diff --git a/vue3/src/locales/pl.json b/vue3/src/locales/pl.json index fd7c1d0d4..823c445e4 100644 --- a/vue3/src/locales/pl.json +++ b/vue3/src/locales/pl.json @@ -407,6 +407,7 @@ "Time": "Czas", "Title": "Tytuł", "Title_or_Recipe_Required": "Wymagany wybór tytułu lub przepisu", + "Today": "", "Toggle": "Przełącznik", "Transpose_Words": "Transponuj słowa", "Tuesday": "", diff --git a/vue3/src/locales/pt.json b/vue3/src/locales/pt.json index 736c88715..0d55c9344 100644 --- a/vue3/src/locales/pt.json +++ b/vue3/src/locales/pt.json @@ -309,6 +309,7 @@ "Time": "tempo", "Title": "Título", "Title_or_Recipe_Required": "Título ou seleção de receitas é necessário", + "Today": "", "Tuesday": "", "Type": "Tipo", "Undefined": "Não definido", diff --git a/vue3/src/locales/pt_BR.json b/vue3/src/locales/pt_BR.json index 4ef44e07a..476b705b3 100644 --- a/vue3/src/locales/pt_BR.json +++ b/vue3/src/locales/pt_BR.json @@ -388,6 +388,7 @@ "Time": "Hora", "Title": "Título", "Title_or_Recipe_Required": "Seleção do tipo de comida ou receita é obrigatória", + "Today": "", "Tuesday": "", "Type": "Tipo", "Undefined": "Indefinido", diff --git a/vue3/src/locales/ro.json b/vue3/src/locales/ro.json index ea6307ad1..cd10269a7 100644 --- a/vue3/src/locales/ro.json +++ b/vue3/src/locales/ro.json @@ -360,6 +360,7 @@ "Time": "Timp", "Title": "Titlu", "Title_or_Recipe_Required": "Titlul sau selecția rețetei necesare", + "Today": "", "Toggle": "Comutare", "Tuesday": "", "Type": "Tip", diff --git a/vue3/src/locales/ru.json b/vue3/src/locales/ru.json index 3ae0e7de6..dbdbb09c7 100644 --- a/vue3/src/locales/ru.json +++ b/vue3/src/locales/ru.json @@ -290,6 +290,7 @@ "Time": "Время", "Title": "Заголовок", "Title_or_Recipe_Required": "Требуется выбор названия или рецепта", + "Today": "", "Tuesday": "", "Type": "Тип", "Undefined": "Неизвестно", diff --git a/vue3/src/locales/sl.json b/vue3/src/locales/sl.json index bc498fb76..78cab9ae5 100644 --- a/vue3/src/locales/sl.json +++ b/vue3/src/locales/sl.json @@ -281,6 +281,7 @@ "Time": "Čas", "Title": "Naslov", "Title_or_Recipe_Required": "Zahtevan je naslov ali izbran recept", + "Today": "", "Tuesday": "", "Type": "Tip", "Undefined": "Nedefiniran", diff --git a/vue3/src/locales/sv.json b/vue3/src/locales/sv.json index 27385ca13..e09b4b937 100644 --- a/vue3/src/locales/sv.json +++ b/vue3/src/locales/sv.json @@ -407,6 +407,7 @@ "Time": "Tid", "Title": "Titel", "Title_or_Recipe_Required": "Val av titel eller recept krävs", + "Today": "", "Toggle": "Växla", "Transpose_Words": "Omvandla ord", "Tuesday": "", diff --git a/vue3/src/locales/tr.json b/vue3/src/locales/tr.json index e4aa463a6..bfc6ba352 100644 --- a/vue3/src/locales/tr.json +++ b/vue3/src/locales/tr.json @@ -406,6 +406,7 @@ "Time": "Zaman", "Title": "Başlık", "Title_or_Recipe_Required": "Başlık veya tarif seçimi gereklidir", + "Today": "", "Toggle": "Değiştir", "Transpose_Words": "Devrik Kelimeler", "Tuesday": "", diff --git a/vue3/src/locales/uk.json b/vue3/src/locales/uk.json index 517fadd81..485ad37b4 100644 --- a/vue3/src/locales/uk.json +++ b/vue3/src/locales/uk.json @@ -330,6 +330,7 @@ "Time": "Час", "Title": "Заголовок", "Title_or_Recipe_Required": "Вибір заголовку, або рецепту, є обов'язковим", + "Today": "", "Toggle": "", "Tuesday": "", "Type": "Тип", diff --git a/vue3/src/locales/zh_Hans.json b/vue3/src/locales/zh_Hans.json index f245ccd1d..522ee319a 100644 --- a/vue3/src/locales/zh_Hans.json +++ b/vue3/src/locales/zh_Hans.json @@ -400,6 +400,7 @@ "Time": "时间", "Title": "标题", "Title_or_Recipe_Required": "需要标题或食谱选择", + "Today": "", "Toggle": "切换", "Tuesday": "", "Type": "类型", diff --git a/vue3/src/locales/zh_Hant.json b/vue3/src/locales/zh_Hant.json index afe9104f9..558db98c4 100644 --- a/vue3/src/locales/zh_Hant.json +++ b/vue3/src/locales/zh_Hant.json @@ -142,6 +142,7 @@ "ThanksTextHosted": "", "ThanksTextSelfhosted": "", "Thursday": "", + "Today": "", "Tuesday": "", "UnitConversion": "", "UpgradeNow": "",