From 9cf69f20fb749e69516893ae6b0f345082cb0ee7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20H=C3=BCppi?= <maede97@hotmail.com>
Date: Wed, 1 May 2024 16:35:40 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Fix=20"nur=20F=C3=BCr=20Leitende"=20=3D=200?=
 =?UTF-8?q?=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../edit-recipe-in-camp/edit-recipe-in-camp.component.ts       | 1 +
 .../dialoges/recipe-info/recipe-info.component.html            | 1 +
 .../modules/application-module/services/settings.service.ts    | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/app/modules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts b/frontend/src/app/modules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts
index 901c5897..88e2bbde 100644
--- a/frontend/src/app/modules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts
+++ b/frontend/src/app/modules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts
@@ -272,6 +272,7 @@ export class EditRecipeInCampComponent implements OnInit, Saveable, OnChanges {
       this.mealPart = SettingsService.calcRecipeParticipants(
         this.camp.participants,
         this.camp.vegetarians,
+        this.camp.leaders,
         this.specificMeal.participants,
         specificRecipe.participants,
         this.specificMeal.overrideParticipants,
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 ec1b972a..6c40458a 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
@@ -26,6 +26,7 @@ <h3>Anzahl Teilnehmende</h3>
       {{calcRecipeParticipants(
       camp.participants,
       camp.vegetarians,
+      camp.leaders,
       specificMeal.participants,
       this.recipeForm.get('overrideParticipants').value,
       specificMeal.overrideParticipants,
diff --git a/frontend/src/app/modules/application-module/services/settings.service.ts b/frontend/src/app/modules/application-module/services/settings.service.ts
index 779f74d5..6d0317d1 100644
--- a/frontend/src/app/modules/application-module/services/settings.service.ts
+++ b/frontend/src/app/modules/application-module/services/settings.service.ts
@@ -54,6 +54,7 @@ export class SettingsService {
   public static calcRecipeParticipants(
     campPart: number,
     campVegis: number,
+    campLeaders: number,
     mealPart: number,
     recipePart: number,
     mealOver: boolean,
@@ -74,7 +75,7 @@ export class SettingsService {
 
     } else if (vegiState === 'leaders') {
 
-      return 0;
+      return campLeaders;
     }
 
     return calcRecipePart;

From 6ea68afd4edffde10cfc84e5b3fcb4b969b4265a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyrill=20P=C3=BCntener?= <wp99cp@gmx.net>
Date: Wed, 1 May 2024 18:44:21 +0200
Subject: [PATCH 2/2] bump version number

---
 frontend/package.json                                     | 2 +-
 .../dialoges/change-log/change-log.component.html         | 8 ++++----
 .../version-history/version-history.component.html        | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 5fbc3688..3e27914c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@emeal/menuplanung",
-  "version": "1.15.1",
+  "version": "1.15.2",
   "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 aaa24f1e..fb8f5ae8 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,13 +1,13 @@
-<h2>Neue Versionen - v1.15.1</h2>
+<h2>Neue Versionen - v1.15.2</h2>
 
 <div mat-dialog-content>
 
   <h3>Was gibt es neues in eMeal - Menüplanung? </h3>
 
-  <p>Dieses Update fügt Neues hinzu:</p>
+  <p>Dieses Update behebt einen Fehler:</p>
 
-  <p class="news-element news-feature">
-    Neuerdings gibt es auch den Menu-Typ "Dessert".
+  <p class="news-element news-fixed">
+    Bisher hat das Berechnen einer Mahlzeit nur für Leiter*innen nicht funktioniert. Dieser Fehler wurde behoben.
   </p>
 
 </div>
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 57051b4e..da57c364 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 @@ <h2>Informationen zur aktuellen Version von eMeal.</h2>
     Fehlerbehebungen.
   </p>
 
+  <h3>Neues in der Version 1.15.2 (1. Mai 2024)</h3>
+
+  <p class="news-element news-fixed">
+  Bisher hat das Berechnen einer Mahlzeit nur für Leiter*innen nicht funktioniert. Dieser Fehler wurde behoben.
+  </p>
+
+
   <h3>Neues in der Version 1.15.1 (1. Mai 2024)</h3>
 
   <p class="news-element news-feature">