kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-10-14 09:11:11 +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

40
views/recipes.blade.php
View File

@@ -62,6 +62,41 @@
<i class="fas fa-expand-arrows-alt"></i>
</a>
</div>
<!-- Subrecipes first -->
@foreach($selectedRecipeSubRecipes as $selectedRecipeSubRecipe)
<div class="card-body">
<h3 class="mb-0">{{ $selectedRecipeSubRecipe->name }}</h3>
</div>
@php $selectedRecipeSubRecipePositionsFiltered = FindAllObjectsInArrayByPropertyValue($selectedRecipeSubRecipesPositions, 'recipe_id', $selectedRecipeSubRecipe->id); @endphp
@if(count($selectedRecipeSubRecipePositionsFiltered) > 0)
<div class="card-body">
<h5 class="mb-0">{{ $L('Ingredients') }}</h5>
</div>
<ul class="list-group list-group-flush">
@foreach($selectedRecipeSubRecipePositionsFiltered as $selectedRecipePosition)
<li class="list-group-item">
{{ $selectedRecipePosition->amount }} {{ Pluralize($selectedRecipePosition->amount, FindObjectInArrayByPropertyValue($quantityunits, 'id', $selectedRecipePosition->qu_id)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', $selectedRecipePosition->qu_id)->name_plural) }} {{ FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->name }}
<span class="timeago-contextual">@if(FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1) {{ $L('Enough in stock') }} @else {{ $L('Not enough in stock, #1 missing, #2 already on shopping list', FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list) }} @endif</span>
@if(!empty($selectedRecipePosition->note))
<div class="text-muted">{{ $selectedRecipePosition->note }}</div>
@endif
</li>
@endforeach
</ul>
@endif
@if(!empty($selectedRecipeSubRecipe->description))
<div class="card-body">
<h5>{{ $L('Preparation') }}</h5>
{!! $selectedRecipeSubRecipe->description !!}
</div>
@endif
@endforeach
<!-- Selected recipe -->
@if($selectedRecipePositions->count() > 0)
<div class="card-body">
<h5 class="mb-0">{{ $L('Ingredients') }}</h5>
</div>
@@ -72,15 +107,18 @@
<span class="timeago-contextual">@if(FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1) {{ $L('Enough in stock') }} @else {{ $L('Not enough in stock, #1 missing, #2 already on shopping list', FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list) }} @endif</span>
@if(!empty($selectedRecipePosition->note))
<div class="text-muted">{{ $selectedRecipePosition->note }} </div>
<div class="text-muted">{{ $selectedRecipePosition->note }}</div>
@endif
</li>
@endforeach
</ul>
@endif
@if(!empty($selectedRecipe->description))
<div class="card-body">
<h5>{{ $L('Preparation') }}</h5>
{!! $selectedRecipe->description !!}
</div>
@endif
</div>
</div>
@endif