Applied formatting rules for by #989 changed files

This commit is contained in:
Bernd Bestel
2020-09-06 13:31:54 +02:00
parent f68e96a235
commit 6adac0588a
2 changed files with 73 additions and 63 deletions

View File

@@ -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,
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
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;
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,
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
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;