diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php index 06ec6195..5b1f0b72 100644 --- a/controllers/RecipesController.php +++ b/controllers/RecipesController.php @@ -16,6 +16,8 @@ class RecipesController extends BaseController public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args) { + $recipes = $this->Database->recipes()->orderBy('name'); + $selectedRecipe = null; $selectedRecipePositions = null; if (isset($request->getQueryParams()['recipe'])) @@ -23,9 +25,17 @@ class RecipesController extends BaseController $selectedRecipe = $this->Database->recipes($request->getQueryParams()['recipe']); $selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $request->getQueryParams()['recipe']); } + else + { + foreach ($recipes as $recipe) + { + $selectedRecipe = $recipe; + $selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id); + } + } return $this->AppContainer->view->render($response, 'recipes', [ - 'recipes' => $this->Database->recipes()->orderBy('name'), + 'recipes' => $recipes, 'recipesFulfillment' => $this->RecipesService->GetRecipesFulfillment(), 'recipesSumFulfillment' => $this->RecipesService->GetRecipesSumFulfillment(), 'selectedRecipe' => $selectedRecipe, diff --git a/public/viewjs/recipes.js b/public/viewjs/recipes.js index 80449aae..c6133737 100644 --- a/public/viewjs/recipes.js +++ b/public/viewjs/recipes.js @@ -8,7 +8,11 @@ 'scrollY': false, 'colReorder': true, 'stateSave': true, - 'select': 'single' + 'select': 'single', + 'initComplete': function() + { + this.api().row({ order: 'current' }, 0).select(); + } }); var rowSelect = GetUriParam("row");