kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 03:25:50 +00:00
Code Issues Projects Releases Wiki Activity

Added total calories as a column to stock overview (references #1058)

Browse Source
This commit is contained in:
Bernd Bestel
2020-11-11 22:38:01 +01:00
parent 0a600d3277
commit 0c8b6c55c1
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
migrations/0105.sql
View File

@@ -20,7 +20,9 @@ SELECT
sc.is_aggregated_amount, sc.is_aggregated_amount,
sc.amount_opened_aggregated, sc.amount_opened_aggregated,
sc.amount_aggregated, sc.amount_aggregated,
p.calories p.calories AS product_calories,
sc.amount * p.calories AS calories,
sc.amount_aggregated * p.calories AS calories_aggregated
FROM ( FROM (
SELECT * SELECT *
FROM stock_current FROM stock_current
@@ -55,7 +57,9 @@ SELECT
sc.is_aggregated_amount, sc.is_aggregated_amount,
sc.amount_opened_aggregated, sc.amount_opened_aggregated,
sc.amount_aggregated, sc.amount_aggregated,
p.calories p.calories AS product_calories,
sc.amount * p.calories AS calories,
sc.amount_aggregated * p.calories AS calories_aggregated
FROM ( FROM (
SELECT * SELECT *
FROM stock_current FROM stock_current

3
public/viewjs/stockoverview.js
View File

@@ -10,7 +10,8 @@
{ 'visible': false, 'targets': 8 }, { 'visible': false, 'targets': 8 },
{ 'visible': false, 'targets': 2 }, { 'visible': false, 'targets': 2 },
{ 'visible': false, 'targets': 4 }, { 'visible': false, 'targets': 4 },
{ 'visible': false, 'targets': 9 } { 'visible': false, 'targets': 9 },
{ 'visible': false, 'targets': 10 }
], ],
}); });

4
views/stockoverview.blade.php
View File

@@ -161,6 +161,7 @@
<th class="d-none">Hidden status</th> <th class="d-none">Hidden status</th>
<th class="d-none">Hidden product group</th> <th class="d-none">Hidden product group</th>
<th>{{ $__t('Calories') }}</th> <th>{{ $__t('Calories') }}</th>
<th>{{ $__t('Calories') }} ({{ $__t('Per stock quantity unit') }})</th>
@include('components.userfields_thead', array( @include('components.userfields_thead', array(
'userfields' => $userfields 'userfields' => $userfields
@@ -367,6 +368,9 @@
<td class="d-none"> <td class="d-none">
xx{{ $currentStockEntry->product_group_name }}xx xx{{ $currentStockEntry->product_group_name }}xx
</td> </td>
<td>
<span class="locale-number locale-number-generic">{{ $currentStockEntry->product_calories }}</span>
</td>
<td> <td>
<span class="locale-number locale-number-generic">{{ $currentStockEntry->calories }}</span> <span class="locale-number locale-number-generic">{{ $currentStockEntry->calories }}</span>
</td> </td>