kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix all the little things for the next release

Browse Source
This commit is contained in:
Bernd Bestel 2018-07-15 13:33:59 +02:00
parent 0fc7c297bf
commit 254e1a9bc1
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
controllers/RecipesController.php
View File

@ -31,6 +31,7 @@ class RecipesController extends BaseController
{ {
$selectedRecipe = $recipe; $selectedRecipe = $recipe;
$selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id); $selectedRecipePositions = $this->Database->recipes_pos()->where('recipe_id', $recipe->id);
break;
} }
} }

3
localization/de.php
View File

@ -225,5 +225,6 @@ return array(
'English' => 'Englisch', 'English' => 'Englisch',
'German' => 'Deutsch', 'German' => 'Deutsch',
'Italian' => 'Italienisch', 'Italian' => 'Italienisch',
'Demo in different language' => 'Demo in anderer Sprache' 'Demo in different language' => 'Demo in anderer Sprache',
'This is the note content of the recipe ingredient' => 'Dies ist der Inhalt der Notiz der Zutat'
); );

4
services/DemoDataGeneratorService.php
View File

@ -60,11 +60,11 @@ class DemoDataGeneratorService extends BaseService
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 16, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 16, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 17, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 18, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount, note) VALUES (1, 18, 1, '{$localizationService->Localize('This is the note content of the recipe ingredient')}');
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 10, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (1, 10, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 6, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 6, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 10, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 10, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 17, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount, note) VALUES (2, 17, 1, '{$localizationService->Localize('This is the note content of the recipe ingredient')}');
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 20, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (2, 20, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 10, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 10, 1);
INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 11, 1); INSERT INTO recipes_pos (recipe_id, product_id, amount) VALUES (3, 11, 1);

2
views/layout/default.blade.php
View File

@ -192,7 +192,7 @@
<div class="content-wrapper"> <div class="content-wrapper">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row mb-3">
<div class="col content-text"> <div class="col content-text">
@yield('content') @yield('content')
</div> </div>

4
views/recipes.blade.php
View File

@ -73,6 +73,10 @@
<li class="list-group-item"> <li class="list-group-item">
{{ $selectedRecipePosition->amount }} {{ FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->qu_id_stock)->name }} {{ FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->name }} {{ $selectedRecipePosition->amount }} {{ FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $selectedRecipePosition->product_id)->qu_id_stock)->name }} {{ 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> <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> </li>
@endforeach @endforeach
</ul> </ul>

10
views/shoppinglist.blade.php
View File

@ -22,15 +22,11 @@
</div> </div>
</div> </div>
<div class="row mt-3">
<div class="col-xs-12 col-md-6 col-xl-3">
<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
<input type="text" class="form-control" id="search">
</div>
</div>
<div class="row"> <div class="row">
<div class="col-xs-12 col-md-8 pb-3"> <div class="col-xs-12 col-md-8 pb-3">
<label for="search">{{ $L('Search') }}</label> <i class="fas fa-search"></i>
<input type="text" class="form-control" id="search">
<table id="shoppinglist-table" class="table table-sm table-striped dt-responsive"> <table id="shoppinglist-table" class="table table-sm table-striped dt-responsive">
<thead> <thead>
<tr> <tr>