diff options
Diffstat (limited to 'src/database')
-rw-r--r-- | src/database/database.vala | 18 | ||||
-rw-r--r-- | src/database/db-interface.vala | 7 |
2 files changed, 25 insertions, 0 deletions
diff --git a/src/database/database.vala b/src/database/database.vala index 9c4e495..012842b 100644 --- a/src/database/database.vala +++ b/src/database/database.vala @@ -127,6 +127,7 @@ public class DataBase : Object { queries["user_invoice_sum"] = "SELECT SUM(CASE WHEN user < 0 THEN (SELECT price FROM purchaseprices WHERE purchaseprices.product = id) else (SELECT CASE WHEN user=0 THEN guestprice else memberprice END FROM prices WHERE product = id AND valid_from <= timestamp ORDER BY valid_from DESC LIMIT 1) END) FROM sales INNER JOIN products ON sales.product = products.id WHERE user = ? AND timestamp >= ? AND timestamp <= ? ORDER BY timestamp"; queries["cashbox_status"] = "SELECT amount FROM current_cashbox_status"; queries["cashbox_add"] = "INSERT INTO cashbox_diff ('user', 'amount', 'timestamp') VALUES (?, ?, ?)"; + queries["cashbox_history"] = "SELECT user, amount, timestamp FROM cashbox_diff ORDER BY timestamp DESC LIMIT 10"; /* compile queries into statements */ foreach(var entry in queries.entries) { @@ -928,6 +929,23 @@ public class DataBase : Object { if(rc != Sqlite.DONE) { throw new DatabaseError.INTERNAL_ERROR("internal error: %d", rc); } + } + + public CashboxDiff[] cashbox_history() { + CashboxDiff[] result = {}; + + statements["cashbox_history"].reset(); + + while(statements["cashbox_history"].step() == Sqlite.ROW) { + CashboxDiff entry = { + statements["cashbox_history"].column_int(0), + statements["cashbox_history"].column_int(1), + statements["cashbox_history"].column_int64(2), + }; + + result += entry; + }; + return result; } } diff --git a/src/database/db-interface.vala b/src/database/db-interface.vala index 979abf5..579d5a9 100644 --- a/src/database/db-interface.vala +++ b/src/database/db-interface.vala @@ -53,6 +53,7 @@ public interface Database : Object { public abstract Price get_user_invoice_sum(int user, int64 timestamp_from, int64 timestamp_to) throws IOError; public abstract Price cashbox_status() throws IOError; public abstract void cashbox_add(int user, Price amount, int64 timestamp) throws IOError, DatabaseError; + public abstract CashboxDiff[] cashbox_history() throws IOError; } public struct StockEntry { @@ -133,6 +134,12 @@ public struct InvoiceEntry { Price price; } +public struct CashboxDiff { + public int user; + public Price amount; + public int64 timestamp; +} + public struct StatsInfo { public int count_articles; public int count_users; |