diff --git a/backend/firebase-cloud-functions/functions/src/exportCamp/createHTMLForExport.ts b/backend/firebase-cloud-functions/functions/src/exportCamp/createHTMLForExport.ts index c49aaafa..e1f9cf87 100644 --- a/backend/firebase-cloud-functions/functions/src/exportCamp/createHTMLForExport.ts +++ b/backend/firebase-cloud-functions/functions/src/exportCamp/createHTMLForExport.ts @@ -114,7 +114,7 @@ export const createHTML = (camp: ExportedCamp) => { */ const createWeekView = function () { - const mealUsages = ["Leitersnack", "Znacht", "Zvieri", "Zmittag", "Znüni", "Zmorgen"]; + const mealUsages = ["Dessert", "Leitersnack", "Znacht", "Zvieri", "Zmittag", "Znüni", "Zmorgen"]; let innerHTMLStr = ''; diff --git a/backend/firebase-cloud-functions/functions/src/exportCamp/exportData.ts b/backend/firebase-cloud-functions/functions/src/exportCamp/exportData.ts index 3e743848..929a7736 100644 --- a/backend/firebase-cloud-functions/functions/src/exportCamp/exportData.ts +++ b/backend/firebase-cloud-functions/functions/src/exportCamp/exportData.ts @@ -149,7 +149,7 @@ async function loadDay(camp: ExportedCamp, day: ExportedDay, categories: Categor */ function mealCompareFn(a: ExportedMeal, b: ExportedMeal) { - const orderOfMahlzeiten = ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Leitersnack', 'Vorbereiten']; + const orderOfMahlzeiten = ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Dessert', 'Leitersnack', 'Vorbereiten']; // sortiert nach Verwendung if (a.meal_data_as_date.getTime() === b.meal_data_as_date.getTime()) { diff --git a/backend/firebase-cloud-functions/functions/src/interfaces/firestoreDatatypes.ts b/backend/firebase-cloud-functions/functions/src/interfaces/firestoreDatatypes.ts index 92aa222b..6df52fea 100644 --- a/backend/firebase-cloud-functions/functions/src/interfaces/firestoreDatatypes.ts +++ b/backend/firebase-cloud-functions/functions/src/interfaces/firestoreDatatypes.ts @@ -77,7 +77,7 @@ export interface FirestoreCamp extends FirestoreDocument { * Verwendung einer Mahlziet als Zmorgen, Zmittag, Znacht, Zvieri usw. * */ -export type MealUsage = 'Zmorgen' | 'Zmittag' | 'Znacht' | 'Zvieri' | 'Znüni' | 'Leitersnack'; +export type MealUsage = 'Zmorgen' | 'Zmittag' | 'Znacht' | 'Zvieri' | 'Znüni' | 'Leitersnack' | 'Dessert'; /** * Representiert ein FirestoreMeal, d.h. ein Meal in der Datenbank diff --git a/backend/pdf-export-module/script/exportData/camp.py b/backend/pdf-export-module/script/exportData/camp.py index 4334b84f..4287a2f6 100644 --- a/backend/pdf-export-module/script/exportData/camp.py +++ b/backend/pdf-export-module/script/exportData/camp.py @@ -46,7 +46,7 @@ def get_meal_type_names(self): """ Creates a list of all used meal type names. The resulting list is ordered - according as follows: Zmorgen, Znüni, Zmittag, Zvieri, Znacht, Leitersnack, + according as follows: Zmorgen, Znüni, Zmittag, Zvieri, Znacht, Dessert, Leitersnack, Vorbereiten. The three main meals, i.g., Zmorgen, Zmittag, Znacht, are always included. :return: an array of meal type names. diff --git a/backend/pdf-export-module/script/exportData/data_fetcher.py b/backend/pdf-export-module/script/exportData/data_fetcher.py index 7f1da092..6246f457 100644 --- a/backend/pdf-export-module/script/exportData/data_fetcher.py +++ b/backend/pdf-export-module/script/exportData/data_fetcher.py @@ -10,7 +10,7 @@ from exportData.utils import convert_document # defines order of meal types -meal_types = ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Leitersnack', 'Vorbereiten'] +meal_types = ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Dessert', 'Leitersnack', 'Vorbereiten'] class DataFetcher(object): diff --git a/backend/pdf-export-module/tests/create_test_case.py b/backend/pdf-export-module/tests/create_test_case.py index bf5586ce..1a121108 100644 --- a/backend/pdf-export-module/tests/create_test_case.py +++ b/backend/pdf-export-module/tests/create_test_case.py @@ -71,7 +71,7 @@ def load_recipe_data(db, specific_meals, test_case_data): recipe['recipe_override_participants'] = spec_recipe['recipe_override_participants'] # defines order of meal types - meal_types = ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Leitersnack', 'Vorbereiten'] + meal_types = ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Dessert', 'Leitersnack', 'Vorbereiten'] # sort meals specific_meals = sorted(specific_meals, key=lambda x: meal_types.index(x['meal_used_as'])) diff --git a/frontend/package.json b/frontend/package.json index 6f9cdcc7..5fbc3688 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,8 +1,8 @@ { "name": "@emeal/menuplanung", - "version": "1.15.0", + "version": "1.15.1", "license": "MIT", - "copyrights": "© 2019 - 2023 Cevi Züri 11 - eMeal Menüplanung", + "copyrights": "© 2019 - 2024 Cevi Züri 11 - eMeal Menüplanung", "scripts": { "ng": "ng", "start": "angular-build-info && ng serve --ssl", diff --git a/frontend/src/app/modules/application-module/components/day-overview/day-overview.component.ts b/frontend/src/app/modules/application-module/components/day-overview/day-overview.component.ts index 77ee54f3..c2372682 100644 --- a/frontend/src/app/modules/application-module/components/day-overview/day-overview.component.ts +++ b/frontend/src/app/modules/application-module/components/day-overview/day-overview.component.ts @@ -79,7 +79,7 @@ export class DayOverviewComponent implements OnChanges, OnInit, OnDestroy { getMealNames() { - return ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Leitersnack', 'Vorbereiten']; + return ['Zmorgen', 'Znüni', 'Zmittag', 'Zvieri', 'Znacht', 'Dessert', 'Leitersnack', 'Vorbereiten']; } diff --git a/frontend/src/app/modules/application-module/dialoges/add-meal/add-meal.component.html b/frontend/src/app/modules/application-module/dialoges/add-meal/add-meal.component.html index 39e6a475..f93fdf87 100644 --- a/frontend/src/app/modules/application-module/dialoges/add-meal/add-meal.component.html +++ b/frontend/src/app/modules/application-module/dialoges/add-meal/add-meal.component.html @@ -56,6 +56,7 @@

Mahlzeiten hinzufügen.

+ diff --git a/frontend/src/app/modules/application-module/dialoges/change-log/change-log.component.html b/frontend/src/app/modules/application-module/dialoges/change-log/change-log.component.html index 55755840..aaa24f1e 100644 --- a/frontend/src/app/modules/application-module/dialoges/change-log/change-log.component.html +++ b/frontend/src/app/modules/application-module/dialoges/change-log/change-log.component.html @@ -1,14 +1,13 @@ -

Neue Versionen - v1.15.0

+

Neue Versionen - v1.15.1

Was gibt es neues in eMeal - Menüplanung?

-

Dieses Update behebt einen Fehler beim Export:

+

Dieses Update fügt Neues hinzu:

-

- Wurde das '&'-Zeichen verwendet (z.B. bei 'Hörndli & g'Hacktes') wurde der Export nicht korrekt ausgeführt und die - Wochenübersicht wurde verschoben dargestellt. Dies ist nun behoben. +

+ Neuerdings gibt es auch den Menu-Typ "Dessert".

diff --git a/frontend/src/app/modules/application-module/interfaces/firestoreDatatypes.ts b/frontend/src/app/modules/application-module/interfaces/firestoreDatatypes.ts index 4adbc753..8123d677 100644 --- a/frontend/src/app/modules/application-module/interfaces/firestoreDatatypes.ts +++ b/frontend/src/app/modules/application-module/interfaces/firestoreDatatypes.ts @@ -84,7 +84,7 @@ export interface FirestoreSettings { * Verwendung einer Mahlziet als Zmorgen, Zmittag, Znacht, Zvieri usw. * */ -export type MealUsage = 'Zmorgen' | 'Zmittag' | 'Znacht' | 'Zvieri' | 'Znüni' | 'Leitersnack'; +export type MealUsage = 'Zmorgen' | 'Zmittag' | 'Znacht' | 'Zvieri' | 'Znüni' | 'Leitersnack' | 'Dessert'; /** * Representiert ein FirestoreMeal, d.h. ein Meal in der Datenbank diff --git a/frontend/src/app/modules/change-log-module/components/version-history/version-history.component.html b/frontend/src/app/modules/change-log-module/components/version-history/version-history.component.html index 5d57224f..57051b4e 100644 --- a/frontend/src/app/modules/change-log-module/components/version-history/version-history.component.html +++ b/frontend/src/app/modules/change-log-module/components/version-history/version-history.component.html @@ -6,7 +6,13 @@

Informationen zur aktuellen Version von eMeal.

Fehlerbehebungen.

-

Neues in der Version 1.15.0 (1. Juni 2023)

+

Neues in der Version 1.15.1 (1. Mai 2024)

+ +

+ Neuerdings gibt es auch den Menu-Typ "Dessert". +

+ +

Neues in der Version 1.14.14 (1. Juni 2023)

Behebt einen Fehler beim Export: Der Export ist fehlgeschlagen, wenn '&'-Zeichen verwendet wurden.