diff --git a/migrations/0105.sql b/migrations/0105.sql index 77746b75..803d7628 100644 --- a/migrations/0105.sql +++ b/migrations/0105.sql @@ -20,7 +20,9 @@ SELECT sc.is_aggregated_amount, sc.amount_opened_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 ( SELECT * FROM stock_current @@ -55,7 +57,9 @@ SELECT sc.is_aggregated_amount, sc.amount_opened_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 ( SELECT * FROM stock_current diff --git a/public/viewjs/stockoverview.js b/public/viewjs/stockoverview.js index 0d127611..e53b8309 100755 --- a/public/viewjs/stockoverview.js +++ b/public/viewjs/stockoverview.js @@ -10,7 +10,8 @@ { 'visible': false, 'targets': 8 }, { 'visible': false, 'targets': 2 }, { 'visible': false, 'targets': 4 }, - { 'visible': false, 'targets': 9 } + { 'visible': false, 'targets': 9 }, + { 'visible': false, 'targets': 10 } ], }); diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php index b9bfffbc..e2d00110 100755 --- a/views/stockoverview.blade.php +++ b/views/stockoverview.blade.php @@ -161,6 +161,7 @@