kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Finish first version of nested recipes feature (references #77)

Browse Source
This commit is contained in:
Bernd Bestel
2018-10-25 20:36:29 +02:00
parent 12a2cb0bdf
commit fc3a4c6899
10 changed files with 172 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
controllers/RecipesController.php
View File

@@ -35,6 +35,9 @@ class RecipesController extends BaseController
}
}
$selectedRecipeSubRecipes = $this->Database->recipes()->where('id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->orderBy('name')->fetchAll();
$selectedRecipeSubRecipesPositions = $this->Database->recipes_pos()->where('recipe_id IN (SELECT includes_recipe_id FROM recipes_nestings_resolved WHERE recipe_id = :1 AND includes_recipe_id != :1)', $selectedRecipe->id)->fetchAll();
return $this->AppContainer->view->render($response, 'recipes', [
'recipes' => $recipes,
'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
@@ -42,7 +45,9 @@ class RecipesController extends BaseController
'selectedRecipe' => $selectedRecipe,
'selectedRecipePositions' => $selectedRecipePositions,
'products' => $this->Database->products(),
'quantityunits' => $this->Database->quantity_units()
'quantityunits' => $this->Database->quantity_units(),
'selectedRecipeSubRecipes' => $selectedRecipeSubRecipes,
'selectedRecipeSubRecipesPositions' => $selectedRecipeSubRecipesPositions
]);
}
@@ -67,7 +72,7 @@ class RecipesController extends BaseController
'quantityunits' => $this->Database->quantity_units(),
'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(),
'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(),
'recipes' => $this->Database->recipes(),
'recipes' => $this->Database->recipes()->orderBy('name'),
'recipeNestings' => $this->Database->recipes_nestings()->where('recipe_id', $recipeId)
]);
}
@@ -94,25 +99,4 @@ class RecipesController extends BaseController
]);
}
}
public function RecipeIncludeEditForm(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
{
if ($args['recipeIncludeId'] == 'new')
{
return $this->AppContainer->view->render($response, 'recipeincludeform', [
'mode' => 'create',
'recipe' => $this->Database->recipes($args['recipeId']),
'recipes' => $this->Database->recipes()->orderBy('name')
]);
}
else
{
return $this->AppContainer->view->render($response, 'recipeincludeform', [
'mode' => 'edit',
'recipe' => $this->Database->recipes($args['recipeId']),
'recipeInclude' => $this->Database->recipes_nestings($args['recipeIncludeId']),
'recipes' => $this->Database->recipes()->orderBy('name')
]);
}
}
}