kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 01:55:47 +00:00
Code Issues Projects Releases Wiki Activity

Applied formatting rules for by #989 changed files

Browse Source
This commit is contained in:
Bernd Bestel 2020-09-06 13:31:54 +02:00
parent f68e96a235
commit 6adac0588a
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 73 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
migrations/0115.sql
View File

@ -1,41 +1,51 @@
ALTER TABLE stock_log ADD COLUMN ALTER TABLE stock_log
user_id INTEGER NOT NULL DEFAULT 1; ADD user_id INTEGER NOT NULL DEFAULT 1;
CREATE VIEW uihelper_stock_journal CREATE VIEW uihelper_stock_journal
AS AS
SELECT stock_log.id, SELECT
stock_log.row_created_timestamp, sl.id,
stock_log.correlation_id, sl.row_created_timestamp,
stock_log.undone, sl.correlation_id,
stock_log.undone_timestamp, sl.undone,
stock_log.row_created_timestamp, sl.undone_timestamp,
stock_log.transaction_type, sl.row_created_timestamp,
stock_log.spoiled, sl.transaction_type,
stock_log.amount, sl.spoiled,
stock_log.location_id, sl.amount,
sl.location_id,
l.name AS location_name, l.name AS location_name,
p.name AS product_name, p.name AS product_name,
qu.name AS qu_name, qu.name AS qu_name,
qu.name_plural AS qu_name_plural, qu.name_plural AS qu_name_plural,
u.display_name AS user_display_name u.display_name AS user_display_name
FROM stock_log sl
FROM stock_log JOIN users_dto u
JOIN users_dto u on stock_log.user_id = u.id ON sl.user_id = u.id
JOIN products p on stock_log.product_id = p.id JOIN products p
JOIN locations l on p.location_id = l.id ON sl.product_id = p.id
JOIN quantity_units qu ON p.qu_id_stock = qu.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 CREATE VIEW uihelper_stock_journal_summary
AS AS
SELECT user_id AS id, -- dummy, LessQL needs an id column SELECT
user_id, u.display_name AS user_display_name, p.name AS product_name, product_id, transaction_type, 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 AS qu_name,
qu.name_plural AS qu_name_plural, qu.name_plural AS qu_name_plural,
SUM(amount) AS amount SUM(amount) AS amount
FROM stock_log FROM stock_log sl
JOIN users_dto u on stock_log.user_id = u.id JOIN users_dto u
JOIN products p on stock_log.product_id = p.id on sl.user_id = u.id
JOIN quantity_units qu ON p.qu_id_stock = qu.id JOIN products p
ON sl.product_id = p.id
JOIN quantity_units qu
ON p.qu_id_stock = qu.id
WHERE undone = 0 WHERE undone = 0
GROUP BY user_id, product_id,transaction_type; GROUP BY user_id, product_id, transaction_type;

10
views/stockjournalsummary.blade.php
View File

@ -5,13 +5,13 @@
@section('viewJsName', 'stockjournalsummary') @section('viewJsName', 'stockjournalsummary')
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<h2 class="title">@yield('title')</h2> <h2 class="title">@yield('title')</h2>
</div> </div>
</div> </div>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<table id="journal-summary-table" <table id="journal-summary-table"
class="table table-sm table-striped dt-responsive"> class="table table-sm table-striped dt-responsive">
@ -43,5 +43,5 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>
@stop @stop