diff --git a/migrations/0115.sql b/migrations/0115.sql index 9a5d50ec..65b7840e 100644 --- a/migrations/0115.sql +++ b/migrations/0115.sql @@ -1,41 +1,51 @@ -ALTER TABLE stock_log ADD COLUMN - user_id INTEGER NOT NULL DEFAULT 1; +ALTER TABLE stock_log +ADD user_id INTEGER NOT NULL DEFAULT 1; CREATE VIEW uihelper_stock_journal AS -SELECT stock_log.id, - stock_log.row_created_timestamp, - stock_log.correlation_id, - stock_log.undone, - stock_log.undone_timestamp, - stock_log.row_created_timestamp, - stock_log.transaction_type, - stock_log.spoiled, - stock_log.amount, - stock_log.location_id, - l.name AS location_name, - p.name AS product_name, - qu.name AS qu_name, - qu.name_plural AS qu_name_plural, - u.display_name AS user_display_name - -FROM stock_log - JOIN users_dto u on stock_log.user_id = u.id - JOIN products p on stock_log.product_id = p.id - JOIN locations l on p.location_id = l.id - JOIN quantity_units qu ON p.qu_id_stock = qu.id; - +SELECT + sl.id, + sl.row_created_timestamp, + sl.correlation_id, + sl.undone, + sl.undone_timestamp, + sl.row_created_timestamp, + sl.transaction_type, + sl.spoiled, + sl.amount, + sl.location_id, + l.name AS location_name, + p.name AS product_name, + qu.name AS qu_name, + qu.name_plural AS qu_name_plural, + u.display_name AS user_display_name +FROM stock_log sl +JOIN users_dto u + ON sl.user_id = u.id +JOIN products p + ON sl.product_id = p.id +JOIN locations l + ON p.location_id = l.id +JOIN quantity_units qu + ON p.qu_id_stock = qu.id; CREATE VIEW uihelper_stock_journal_summary AS -SELECT user_id AS id, -- dummy, LessQL needs an id column - user_id, u.display_name AS user_display_name, p.name AS product_name, product_id, transaction_type, - qu.name AS qu_name, - qu.name_plural AS qu_name_plural, - SUM(amount) AS amount -FROM stock_log - JOIN users_dto u on stock_log.user_id = u.id - JOIN products p on stock_log.product_id = p.id - JOIN quantity_units qu ON p.qu_id_stock = qu.id +SELECT + user_id AS id, -- Dummy, LessQL needs an id column + user_id, u.display_name AS user_display_name, + p.name AS product_name, + product_id, + transaction_type, + qu.name AS qu_name, + qu.name_plural AS qu_name_plural, + SUM(amount) AS amount +FROM stock_log sl +JOIN users_dto u + on sl.user_id = u.id +JOIN products p + ON sl.product_id = p.id +JOIN quantity_units qu + ON p.qu_id_stock = qu.id WHERE undone = 0 - GROUP BY user_id, product_id,transaction_type; +GROUP BY user_id, product_id, transaction_type; diff --git a/views/stockjournalsummary.blade.php b/views/stockjournalsummary.blade.php index ba3e2b5f..a315679b 100644 --- a/views/stockjournalsummary.blade.php +++ b/views/stockjournalsummary.blade.php @@ -5,43 +5,43 @@ @section('viewJsName', 'stockjournalsummary') @section('content') -
-
-

@yield('title')

-
+
+
+

@yield('title')

-
-
-
- - + +
+
+
+
+ - - + + @foreach($entries as $journalEntry) - - - - - - + + + + + + @endforeach - -
{{ $__t('Product') }} {{ $__t('Booking type') }} {{ $__t('User') }} {{ $__t('Amount') }}
- {{ $journalEntry->product_name }} - - {{ $__t($journalEntry->transaction_type) }} - - {{ $journalEntry->user_display_name }} - - {{ $journalEntry->amount }} {{ $__n($journalEntry->amount, $journalEntry->qu_name, $journalEntry->qu_name_plural) }} -
+ {{ $journalEntry->product_name }} + + {{ $__t($journalEntry->transaction_type) }} + + {{ $journalEntry->user_display_name }} + + {{ $journalEntry->amount }} {{ $__n($journalEntry->amount, $journalEntry->qu_name, $journalEntry->qu_name_plural) }} +
-
+ +
+
@stop