kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-24 14:06:44 +00:00
Code Issues Projects Releases Wiki Activity

Make it possible to add recipes from /recipes to the meal plan (closes #2003)

Browse Source
This commit is contained in:
Bernd Bestel
2022-12-26 14:25:33 +01:00
parent c60a1783da
commit 3f2ad17460
6 changed files with 146 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
controllers/RecipesController.php
View File

@@ -95,7 +95,7 @@ class RecipesController extends BaseController
$totalCalories = FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->calories;
}
$renderArray = [
$viewData = [
'recipes' => $recipes,
'recipesResolved' => $recipesResolved,
'recipePositionsResolved' => $this->getDatabase()->recipes_pos_resolved()->where('recipe_id', $selectedRecipe->id),
@@ -106,7 +106,8 @@ class RecipesController extends BaseController
'userfieldValues' => $this->getUserfieldsService()->GetAllValues('recipes'),
'quantityUnitConversionsResolved' => $this->getDatabase()->quantity_unit_conversions_resolved(),
'selectedRecipeTotalCosts' => $totalCosts,
'selectedRecipeTotalCalories' => $totalCalories
'selectedRecipeTotalCalories' => $totalCalories,
'mealplanSections' => $this->getDatabase()->meal_plan_sections()->orderBy('sort_number')
];
if ($selectedRecipe)
@@ -137,12 +138,12 @@ class RecipesController extends BaseController
}
}
$renderArray['selectedRecipeSubRecipes'] = $selectedRecipeSubRecipes;
$renderArray['includedRecipeIdsAbsolute'] = $includedRecipeIdsAbsolute;
$renderArray['allRecipePositions'] = $allRecipePositions;
$viewData['selectedRecipeSubRecipes'] = $selectedRecipeSubRecipes;
$viewData['includedRecipeIdsAbsolute'] = $includedRecipeIdsAbsolute;
$viewData['allRecipePositions'] = $allRecipePositions;
}
return $this->renderPage($response, 'recipes', $renderArray);
return $this->renderPage($response, 'recipes', $viewData);
}
public function RecipeEditForm(\Psr\Http\Message\ServerRequestInterface $request, \Psr\Http\Message\ResponseInterface $response, array $args)