kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-07-03 14:26:27 +00:00
Code Issues Projects Releases Wiki Activity

Make product card recipe ingredient indentation dynamic (references #556)

Browse Source
This commit is contained in:
Bernd Bestel 2020-02-10 19:30:49 +01:00
parent aa787e765e
commit a32206834b
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
views/recipes.blade.php
View File

@ -195,16 +195,22 @@
@if(count($selectedRecipeSubRecipePositionsFiltered) > 0) @if(count($selectedRecipeSubRecipePositionsFiltered) > 0)
<h5 class="mb-0">{{ $__t('Ingredients') }}</h5> <h5 class="mb-0">{{ $__t('Ingredients') }}</h5>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
@php $lastIngredientGroup = 'undefined'; @endphp @php
@php $lastProductGroup = 'undefined'; @endphp $lastIngredientGroup = 'undefined';
$lastProductGroup = 'undefined';
$hasIngredientGroups = false;
$hasProductGroups = false;
@endphp
@foreach($selectedRecipeSubRecipePositionsFiltered as $selectedRecipePosition) @foreach($selectedRecipeSubRecipePositionsFiltered as $selectedRecipePosition)
@if($lastIngredientGroup != $selectedRecipePosition->ingredient_group) @if($lastIngredientGroup != $selectedRecipePosition->ingredient_group && !empty($selectedRecipePosition->ingredient_group))
<h5 class="mb-2 mt-2 ml-2"><strong>{{ $selectedRecipePosition->ingredient_group }}</strong></h5> @php $hasIngredientGroups = true; @endphp
<h5 class="mb-2 mt-2 ml-1"><strong>{{ $selectedRecipePosition->ingredient_group }}</strong></h5>
@endif @endif
@if(boolval($userSettings['recipe_ingredients_group_by_product_group']) && $lastProductGroup != $selectedRecipePosition->product_group) @if(boolval($userSettings['recipe_ingredients_group_by_product_group']) && $lastProductGroup != $selectedRecipePosition->product_group && !empty($selectedRecipePosition->product_group))
<h6 class="mb-2 mt-2 ml-4"><strong>{{ $selectedRecipePosition->product_group }}</strong></h6> @php $hasProductGroups = true; @endphp
<h6 class="mb-2 mt-2 @if($hasIngredientGroups) ml-3 @else ml-1 @endif"><strong>{{ $selectedRecipePosition->product_group }}</strong></h6>
@endif @endif
<li class="list-group-item px-0 ml-5"> <li class="list-group-item px-0 @if($hasIngredientGroups && $hasProductGroups) ml-4 @elseif($hasIngredientGroups || $hasProductGroups) ml-2 @else ml-0 @endif">
@php @php
$product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id); $product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id);
$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id); $productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);
@ -252,16 +258,22 @@
@if($selectedRecipePositionsResolved->count() > 0) @if($selectedRecipePositionsResolved->count() > 0)
<h5 class="mb-0">{{ $__t('Ingredients') }}</h5> <h5 class="mb-0">{{ $__t('Ingredients') }}</h5>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
@php $lastIngredientGroup = 'undefined'; @endphp @php
@php $lastProductGroup = 'undefined'; @endphp $lastIngredientGroup = 'undefined';
$lastProductGroup = 'undefined';
$hasIngredientGroups = false;
$hasProductGroups = false;
@endphp
@foreach($selectedRecipePositionsResolved as $selectedRecipePosition) @foreach($selectedRecipePositionsResolved as $selectedRecipePosition)
@if($lastIngredientGroup != $selectedRecipePosition->ingredient_group) @if($lastIngredientGroup != $selectedRecipePosition->ingredient_group && !empty($selectedRecipePosition->ingredient_group))
<h5 class="mb-2 mt-2 ml-2"><strong>{{ $selectedRecipePosition->ingredient_group }}</strong></h5> @php $hasIngredientGroups = true; @endphp
<h5 class="mb-2 mt-2 ml-1"><strong>{{ $selectedRecipePosition->ingredient_group }}</strong></h5>
@endif @endif
@if(boolval($userSettings['recipe_ingredients_group_by_product_group']) && $lastProductGroup != $selectedRecipePosition->product_group) @if(boolval($userSettings['recipe_ingredients_group_by_product_group']) && $lastProductGroup != $selectedRecipePosition->product_group && !empty($selectedRecipePosition->product_group))
<h6 class="mb-2 mt-2 ml-4"><strong>{{ $selectedRecipePosition->product_group }}</strong></h6> @php $hasProductGroups = true; @endphp
<h6 class="mb-2 mt-2 @if($hasIngredientGroups) ml-3 @else ml-1 @endif"><strong>{{ $selectedRecipePosition->product_group }}</strong></h6>
@endif @endif
<li class="list-group-item px-0 ml-5"> <li class="list-group-item px-0 @if($hasIngredientGroups && $hasProductGroups) ml-4 @elseif($hasIngredientGroups || $hasProductGroups) ml-2 @else ml-0 @endif">
@php @php
$product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id); $product = FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id);
$productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id); $productQuConversions = FindAllObjectsInArrayByPropertyValue($quantityUnitConversionsResolved, 'product_id', $product->id);