Merge pull request #226 from wp99cp/develop

Fix "nur Für Leitende" = 0 bug
wp99cp · May 1, 2024 · dc1e9f8 · dc1e9f8
2 parents 8b61c8c + 6ea68af
commit dc1e9f8
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git 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/...odules/application-module/components/edit-recipe-in-camp/edit-recipe-in-camp.component.ts b/...odules/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/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/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
@@ -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;

diff --git a/...c/app/modules/change-log-module/components/version-history/version-history.component.html b/...c/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">