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

Ui fixes (#1018)

Browse Source 
* Fixes #1005. Recipes: filter by stock-status in gallery

* Fixes #1017. Productform: Remove "Store"-Header from barcode-table if FEATURE_FLAG_STOCK_PRICE_TRACKING is not set.

* Fixed typo

Co-authored-by: Bernd Bestel <bernd@berrnd.de>
This commit is contained in:
fipwmaqzufheoxq92ebc
2020-10-04 15:00:34 +02:00
committed by GitHub
parent 4b5b7bcb19
commit b03e43b708
3 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
public/viewjs/recipes.js
View File

@@ -75,6 +75,23 @@ $("#status-filter").on("change", function()
} }
recipesTables.column(5).search(value).draw(); recipesTables.column(5).search(value).draw();
$('.recipe-gallery-item').removeClass('d-none');
if (value !== "")
{
if (value === 'enoughinstock')
{
$('.recipe-gallery-item').not('.recipe-enoughinstock').addClass('d-none');
}
else if (value === 'enoughinstockwithshoppinglist')
{
$('.recipe-gallery-item').not('.recipe-enoughinstockwithshoppinglist').addClass('d-none');
}
if (value === 'notenoughinstock')
{
$('.recipe-gallery-item').not('.recipe-notenoughinstock').addClass('d-none');
}
}
}); });
$(".recipe-delete").on('click', function(e) $(".recipe-delete").on('click', function(e)

4
views/productform.blade.php
View File

@@ -457,7 +457,9 @@
<th class="border-right"></th> <th class="border-right"></th>
<th>{{ $__t('Barcode') }}</th> <th>{{ $__t('Barcode') }}</th>
<th>{{ $__t('Factor purchase to stock quantity unit') }}</th> <th>{{ $__t('Factor purchase to stock quantity unit') }}</th>
<th>{{ $__t('Store') }}</th> @if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
<th>{{ $__t('Store') }}</th>
@endif
</tr> </tr>
</thead> </thead>
<tbody class="d-none"> <tbody class="d-none">

6
views/recipes.blade.php
View File

@@ -47,7 +47,7 @@
<select class="form-control" <select class="form-control"
id="status-filter"> id="status-filter">
<option value="all">{{ $__t('All') }}</option> <option value="all">{{ $__t('All') }}</option>
<option value="enoughtinstock">{{ $__t('Enough in stock') }}</option> <option value="enoughinstock">{{ $__t('Enough in stock') }}</option>
<option value="enoughinstockwithshoppinglist">{{ $__t('Not enough in stock, but already on the shopping list') }}</option> <option value="enoughinstockwithshoppinglist">{{ $__t('Not enough in stock, but already on the shopping list') }}</option>
<option value="notenoughinstock">{{ $__t('Not enough in stock') }}</option> <option value="notenoughinstock">{{ $__t('Not enough in stock') }}</option>
</select> </select>
@@ -121,7 +121,7 @@
{{ FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count }} {{ FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->missing_products_count }}
</td> </td>
<td class="d-none"> <td class="d-none">
@if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) enoughtinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) enoughinstockwithshoppinglist @else notenoughinstock @endif @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) enoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) enoughinstockwithshoppinglist @else notenoughinstock @endif
</td> </td>
<td class="d-none"> <td class="d-none">
@foreach(FindAllObjectsInArrayByPropertyValue($recipePositionsResolved, 'recipe_id', $recipe->id) as $recipePos) @foreach(FindAllObjectsInArrayByPropertyValue($recipePositionsResolved, 'recipe_id', $recipe->id) as $recipePos)
@@ -144,7 +144,7 @@
id="gallery"> id="gallery">
<div class="card-columns no-gutters"> <div class="card-columns no-gutters">
@foreach($recipes as $recipe) @foreach($recipes as $recipe)
<a class="discrete-link recipe-gallery-item" <a class="discrete-link recipe-gallery-item @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled == 1) recipe-enoughinstock @elseif(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $recipe->id)->need_fulfilled_with_shopping_list == 1) recipe-enoughinstockwithshoppinglist @else recipe-notenoughinstock @endif"
data-recipe-id="{{ $recipe->id }}" data-recipe-id="{{ $recipe->id }}"
href="#"> href="#">
<div id="RecipeGalleryCard-{{ $recipe->id }}" <div id="RecipeGalleryCard-{{ $recipe->id }}"