From 1671beacb7ca92b7f6e827a023d22d7627bccd10 Mon Sep 17 00:00:00 2001 From: Kurt Riddlesperger Date: Sat, 25 Jan 2020 22:19:43 -0600 Subject: [PATCH] Add meal plan notes and products to Calendar --- services/CalendarService.php | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/services/CalendarService.php b/services/CalendarService.php index e951cb91..310fa117 100644 --- a/services/CalendarService.php +++ b/services/CalendarService.php @@ -92,7 +92,7 @@ class CalendarService extends BaseService $recipes = $this->Database->recipes(); $mealPlanDayRecipes = $this->Database->recipes()->where('type', 'mealplan-day'); - $titlePrefix = $this->LocalizationService->__t('Meal plan') . ': '; + $titlePrefix = $this->LocalizationService->__t('Meal plan recipe') . ': '; $mealPlanRecipeEvents = array(); foreach($mealPlanDayRecipes as $mealPlanDayRecipe) { @@ -108,6 +108,31 @@ class CalendarService extends BaseService } } - return array_merge($stockEvents, $taskEvents, $choreEvents, $batteryEvents, $mealPlanRecipeEvents); + $mealPlanDayNotes = $this->Database->meal_plan()->where('type', 'note'); + $titlePrefix = $this->LocalizationService->__t('Meal plan note') . ': '; + $mealPlanNotesEvents = array(); + foreach($mealPlanDayNotes as $mealPlanDayNote) + { + $mealPlanNotesEvents[] = array( + 'title' => $titlePrefix . $mealPlanDayNote->note, + 'start' => $mealPlanDayNote->day, + 'date_format' => 'date' + ); + } + + $products = $this->Database->products(); + $mealPlanDayProducts = $this->Database->meal_plan()->where('type', 'product'); + $titlePrefix = $this->LocalizationService->__t('Meal plan product') . ': '; + $mealPlanProductEvents = array(); + foreach($mealPlanDayProducts as $mealPlanDayProduct) + { + $mealPlanProductEvents[] = array( + 'title' => $titlePrefix . FindObjectInArrayByPropertyValue($products, 'id', $mealPlanDayProduct->product_id)->name, + 'start' => $mealPlanDayProduct->day, + 'date_format' => 'date' + ); + } + + return array_merge($stockEvents, $taskEvents, $choreEvents, $batteryEvents, $mealPlanRecipeEvents, $mealPlanNotesEvents, $mealPlanProductEvents); } }