kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 19:16:37 +00:00
Code Issues Projects Releases Wiki Activity

Show the number of items per shopping list in the shopping lists dropdown (closes #2467)

Browse Source
This commit is contained in:
Bernd Bestel
2024-02-12 20:36:33 +01:00
parent c7abed0d68
commit 40d1a9c3d0
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/75_UNRELEASED_xxxx-xx-xx.md
View File

@@ -17,7 +17,7 @@
### Shopping list ### Shopping list
- xxx - The shopping lists dropdown on the shopping list page now also shows the number of items on the corresponding shopping list
### Recipes ### Recipes

2
controllers/StockController.php
View File

@@ -397,7 +397,7 @@ class StockController extends BaseController
'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'), 'products' => $this->getDatabase()->products()->where('active = 1')->orderBy('name', 'COLLATE NOCASE'),
'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'), 'quantityunits' => $this->getDatabase()->quantity_units()->orderBy('name', 'COLLATE NOCASE'),
'missingProducts' => $this->getStockService()->GetMissingProducts(), 'missingProducts' => $this->getStockService()->GetMissingProducts(),
'shoppingLists' => $this->getDatabase()->shopping_lists()->orderBy('name', 'COLLATE NOCASE'), 'shoppingLists' => $this->getDatabase()->shopping_lists_view()->orderBy('name', 'COLLATE NOCASE'),
'selectedShoppingListId' => $listId, 'selectedShoppingListId' => $listId,
'quantityUnitConversionsResolved' => $this->getDatabase()->cache__quantity_unit_conversions_resolved(), 'quantityUnitConversionsResolved' => $this->getDatabase()->cache__quantity_unit_conversions_resolved(),
'productUserfields' => $this->getUserfieldsService()->GetFields('products'), 'productUserfields' => $this->getUserfieldsService()->GetFields('products'),

6
migrations/0235.sql Normal file
View File

@@ -0,0 +1,6 @@
CREATE VIEW shopping_lists_view
AS
SELECT
*,
(SELECT IFNULL(COUNT(*), 0) FROM shopping_list WHERE shopping_list_id = sl.id) AS item_count
FROM shopping_lists sl;

2
views/shoppinglist.blade.php
View File

@@ -45,7 +45,7 @@
<select class="custom-control custom-select custom-select-sm" <select class="custom-control custom-select custom-select-sm"
id="selected-shopping-list"> id="selected-shopping-list">
@foreach($shoppingLists as $shoppingList) @foreach($shoppingLists as $shoppingList)
<option @if($shoppingList->id == $selectedShoppingListId) selected="selected" @endif value="{{ $shoppingList->id }}">{{ $shoppingList->name }}</option> <option @if($shoppingList->id == $selectedShoppingListId) selected="selected" @endif value="{{ $shoppingList->id }}">{{ $shoppingList->name }} ({{ $shoppingList->item_count }})</option>
@endforeach @endforeach
</select> </select>
</div> </div>