From 218a5a0ed21f5f9117229d3e7a45000570ecfab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20H=C3=BCppi?=
Date: Thu, 2 May 2024 10:54:26 +0200
Subject: [PATCH 1/3] Try to fix "true" in meal participant calculation
---
.../dialoges/recipe-info/recipe-info.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html b/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html
index 6c40458a..e5d2a7af 100644
--- a/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html
+++ b/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html
@@ -28,7 +28,7 @@ Anzahl Teilnehmende
camp.vegetarians,
camp.leaders,
specificMeal.participants,
- this.recipeForm.get('overrideParticipants').value,
+ this.recipeForm.get('overrideParticipants').value ? this.recipeForm.get('participants') : 0,
specificMeal.overrideParticipants,
this.recipeForm.get('overrideParticipants').value,
this.recipeForm.get('vegi').value)
From 74db7ecc62400bf2942f51df332279708fd0dc1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20H=C3=BCppi?=
Date: Thu, 2 May 2024 10:59:52 +0200
Subject: [PATCH 2/3] Add ".value"
---
.../dialoges/recipe-info/recipe-info.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html b/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html
index e5d2a7af..a5e99162 100644
--- a/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html
+++ b/frontend/src/app/modules/application-module/dialoges/recipe-info/recipe-info.component.html
@@ -28,7 +28,7 @@ Anzahl Teilnehmende
camp.vegetarians,
camp.leaders,
specificMeal.participants,
- this.recipeForm.get('overrideParticipants').value ? this.recipeForm.get('participants') : 0,
+ this.recipeForm.get('overrideParticipants').value ? this.recipeForm.get('participants').value : 0,
specificMeal.overrideParticipants,
this.recipeForm.get('overrideParticipants').value,
this.recipeForm.get('vegi').value)
From 7d237f46a492348cfc6f3c71f38f924034672f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyrill=20P=C3=BCntener?=
Date: Thu, 2 May 2024 22:14:24 +0200
Subject: [PATCH 3/3] bump version and fill changelog
---
frontend/package.json | 2 +-
.../dialoges/change-log/change-log.component.html | 4 ++--
.../version-history/version-history.component.html | 7 +++++++
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/frontend/package.json b/frontend/package.json
index 3e27914c..ad102e1e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "@emeal/menuplanung",
- "version": "1.15.2",
+ "version": "1.15.3",
"license": "MIT",
"copyrights": "© 2019 - 2024 Cevi Züri 11 - eMeal Menüplanung",
"scripts": {
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 fb8f5ae8..104f1ce1 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,4 +1,4 @@
-Neue Versionen - v1.15.2
+Neue Versionen - v1.15.3
@@ -7,7 +7,7 @@
Was gibt es neues in eMeal - Menüplanung?
Dieses Update behebt einen Fehler:
- Bisher hat das Berechnen einer Mahlzeit nur für Leiter*innen nicht funktioniert. Dieser Fehler wurde behoben.
+ Behebt einen Dahrstellungsfehler bei der Personenberechnung in der Rezeptansicht.
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 da57c364..d0a2b9fa 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,6 +6,13 @@ Informationen zur aktuellen Version von eMeal.
Fehlerbehebungen.
+
+ Neues in der Version 1.15.3 (2. Mai 2024)
+
+
+ Behebt einen Dahrstellungsfehler bei der Personenberechnung in der Rezeptansicht.
+
+
Neues in der Version 1.15.2 (1. Mai 2024)