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

Implemented that included recipes can have a serving amount (closes #163 and references #127)

Browse Source
This commit is contained in:
Bernd Bestel
2019-03-05 23:45:04 +01:00
parent 45db9ff90c
commit 2d8ad24887
7 changed files with 174 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
views/recipeform.blade.php
View File

@@ -154,6 +154,7 @@
<tr>
<th>#</th>
<th>{{ $L('Recipe') }}</th>
<th>{{ $L('Servings') }}</th>
</tr>
</thead>
<tbody class="d-none">
@@ -161,7 +162,7 @@
@foreach($recipeNestings as $recipeNesting)
<tr>
<td class="fit-content">
<a class="btn btn-sm btn-info recipe-include-edit-button" href="#" data-recipe-include-id="{{ $recipeNesting->id }}" data-recipe-included-recipe-id="{{ $recipeNesting->includes_recipe_id }}">
<a class="btn btn-sm btn-info recipe-include-edit-button" href="#" data-recipe-include-id="{{ $recipeNesting->id }}" data-recipe-included-recipe-id="{{ $recipeNesting->includes_recipe_id }}" data-recipe-included-recipe-servings="{{ $recipeNesting->servings }}">
<i class="fas fa-edit"></i>
</a>
<a class="btn btn-sm btn-danger recipe-include-delete-button" href="#" data-recipe-include-id="{{ $recipeNesting->id }}" data-recipe-include-name="{{ FindObjectInArrayByPropertyValue($recipes, 'id', $recipeNesting->includes_recipe_id)->name }}">
@@ -171,6 +172,9 @@
<td>
{{ FindObjectInArrayByPropertyValue($recipes, 'id', $recipeNesting->includes_recipe_id)->name }}
</td>
<td>
{{ $recipeNesting->servings }}
</td>
</tr>
@endforeach
@endif
@@ -202,18 +206,20 @@
</div>
<div class="modal-body">
<form id="recipe-include-form" novalidate>
<div class="form-group">
<label for="includes_recipe_id">{{ $L('Recipe') }}</label>
<select required class="form-control" id="includes_recipe_id" name="includes_recipe_id">
<option></option>
@foreach($recipes as $recipeForList)
@if($recipeForList->id !== $recipe->id)
<option data-already-included="{{ BoolToString(FindObjectInArrayByPropertyValue($recipeNestings, 'includes_recipe_id', $recipeForList->id) === null) }}" value="{{ $recipeForList->id }}">{{ $recipeForList->name }}</option>
@endif
@endforeach
</select>
<div class="invalid-feedback">{{ $L('A recipe is required') }}</div>
</div>
@include('components.recipepicker', array(
'recipes' => $recipes,
'isRequired' => true
))
@include('components.numberpicker', array(
'id' => 'includes_servings',
'label' => 'Servings',
'min' => 1,
'value' => '1',
'invalidFeedback' => $L('This cannot be lower than #1', '1')
))
</form>
</div>
<div class="modal-footer">