diff --git a/brmbar3/TODO b/brmbar3/TODO index e27fe22..9950883 100644 --- a/brmbar3/TODO +++ b/brmbar3/TODO @@ -1,7 +1,7 @@ -/ Management view ++ Management view + Stock management link + User management link - - Bilance overview (Cash, Profit, Credit total) + + Bilance overview (Cash, Profit, Credit total) - Withdrawal of user credit 1. choose user 2. choose amount diff --git a/brmbar3/brmbar-gui-qt4.py b/brmbar3/brmbar-gui-qt4.py index 65bf9a7..73eda65 100755 --- a/brmbar3/brmbar-gui-qt4.py +++ b/brmbar3/brmbar-gui-qt4.py @@ -61,6 +61,19 @@ class ShopAdapter(QtCore.QObject): shop.add_credit(credit = credit, user = user) return user.negbalance_str() + @QtCore.Slot(result='QVariant') + def balance_cash(self): + return shop.cash.balance_str() + @QtCore.Slot(result='QVariant') + def balance_profit(self): + return shop.profits.balance_str() + @QtCore.Slot(result='QVariant') + def balance_inventory(self): + return shop.inventory_negbalance_str() + @QtCore.Slot(result='QVariant') + def balance_credit(self): + return shop.credit_negbalance_str() + db = psycopg2.connect("dbname=brmbar") shop = brmbar.Shop.new_with_defaults(db) currency = shop.currency diff --git a/brmbar3/brmbar-gui-qt4/Management.qml b/brmbar3/brmbar-gui-qt4/Management.qml index e3b6f6c..21ef7e8 100644 --- a/brmbar3/brmbar-gui-qt4/Management.qml +++ b/brmbar3/brmbar-gui-qt4/Management.qml @@ -6,6 +6,115 @@ Item { id: page anchors.fill: parent + property variant cash: shop.balance_cash() + property variant profit: shop.balance_profit() + property variant inv_money: shop.balance_inventory() + property variant credit_money: shop.balance_credit() + + Text { + id: profit_name + x: 65 + y: 156 + width: 337 + height: 160 + color: "#ffffff" + text: "Profit:" + wrapMode: Text.WordWrap + verticalAlignment: Text.AlignVCenter + font.pointSize: 34 + } + + Text { + id: profit_amount + x: 215 + y: 156 + height: 160 + width: 254 + color: "#ffff7c" + text: parent.profit + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignRight + font.pointSize: 34 + } + + Text { + id: cash_name + x: 65 + y: 266 + width: 337 + height: 160 + color: "#ffffff" + text: "Cash:" + wrapMode: Text.WordWrap + verticalAlignment: Text.AlignVCenter + font.pointSize: 34 + } + + Text { + id: cash_amount + x: 215 + y: 266 + height: 160 + width: 254 + color: "#ffff7c" + text: parent.cash + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignRight + font.pointSize: 34 + } + + Text { + id: credit_name + x: 535 + y: 156 + width: 337 + height: 160 + color: "#ffffff" + text: "Credit:" + wrapMode: Text.WordWrap + verticalAlignment: Text.AlignVCenter + font.pointSize: 34 + } + + Text { + id: credit_amount + x: 705 + y: 156 + height: 160 + width: 254 + color: "#ffff7c" + text: parent.credit_money + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignRight + font.pointSize: 34 + } + + Text { + id: inv_name + x: 535 + y: 266 + width: 337 + height: 160 + color: "#ffffff" + text: "Stock:" + wrapMode: Text.WordWrap + verticalAlignment: Text.AlignVCenter + font.pointSize: 34 + } + + Text { + id: inv_amount + x: 705 + y: 266 + height: 160 + width: 254 + color: "#ffff7c" + text: parent.inv_money + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignRight + font.pointSize: 34 + } + BarButton { id: stock_manager x: 65