More work on native gui. Make data editable.
This commit is contained in:
1 parent
5641e1706f
commit
7aa5d2af3b
43 files changed
+2686
-1037
No files matched your search
+117
-39
@@ -8,6 +8,7 @@ from datetime import datetime
|
||||
from .view import View, DatePicker
|
||||
from yms import gtkutils, combobox, treeview
|
||||
from yms.model import provision
|
||||
from yms.lookup import Dropdown
|
||||
|
||||
class ProvisionsView(View):
|
||||
|
||||
@@ -18,25 +19,21 @@ class ProvisionsView(View):
|
||||
self.prov = provision.Provision(context.db) # current record
|
||||
self.newrecord = False
|
||||
|
||||
self.load_dropdown()
|
||||
# Category
|
||||
self.dd_category = self.context.lookup.dropdown(Dropdown.PROVISION_CATEGORY)
|
||||
combobox.load_from_dict(self.combo['category'], {-1: _("─── none ───")} | self.dd_category, -1)
|
||||
# Storage
|
||||
self.dd_storage = self.context.lookup.storage(context.vessel.vid)
|
||||
combobox.load_from_dict(self.combo['storage'], {-1: _("─── none ───")} | self.dd_storage)
|
||||
# Box
|
||||
self.dd_box = self.context.lookup.box(context.vessel.vid)
|
||||
combobox.load_from_dict(self.combo['box'], {-1: _("─── none ───")} | self.dd_box)
|
||||
# Provision unit
|
||||
self.dd_unit = self.context.lookup.dropdown(Dropdown.PROVISION_UNIT)
|
||||
combobox.load_from_dict(self.combo['unit'], {-1: _("─── none ───")} | self.dd_unit, -1)
|
||||
|
||||
self.lst_provisions = Gtk.ListStore(int, str, int, str, str, str)
|
||||
sql = (
|
||||
"SELECT p.provid, p.provname, p.number, p.unit, p.storedate, p.shelflife "
|
||||
"FROM provisions AS p LEFT OUTER JOIN storage AS s USING (sid) "
|
||||
"WHERE s.vid=%s OR vid IS NULL"
|
||||
)
|
||||
self.db.dcur.execute(sql, (context.vessel.vid,))
|
||||
for row in self.db.dcur.fetchall():
|
||||
data = (
|
||||
row['provid'],
|
||||
row['provname'],
|
||||
row['number'],
|
||||
self.prov_unit[row['unit']],
|
||||
self.format_date(row['storedate']),
|
||||
self.format_date(row['shelflife'])
|
||||
)
|
||||
self.lst_provisions.append(data)
|
||||
self.load_list()
|
||||
|
||||
treeview.add_column(self.tree['provisions'], _('ID'), 0)
|
||||
treeview.add_column(self.tree['provisions'], _('Description'), 1)
|
||||
@@ -49,54 +46,117 @@ class ProvisionsView(View):
|
||||
# TODO Date format
|
||||
self.entry['storedate'].set_placeholder_text("TT.MM.JJJJ")
|
||||
self.dt_storedate = DatePicker(self.entry['storedate'], self.button['storedate'], context.datefmt)
|
||||
self.entry['shelflife'].set_placeholder_text("TT.MM.JJJJ")
|
||||
self.dt_shelflife = DatePicker(self.entry['shelflife'], self.button['shelflife'], context.datefmt)
|
||||
|
||||
def load_list(self):
|
||||
selected_id = treeview.get_value(self.tree['provisions'])
|
||||
self.lst_provisions.clear()
|
||||
sql = (
|
||||
"SELECT p.provid, p.provname, p.number, p.unit, p.storedate, p.shelflife "
|
||||
"FROM provisions AS p LEFT OUTER JOIN storage AS s USING (sid) "
|
||||
"WHERE s.vid=%s OR vid IS NULL"
|
||||
)
|
||||
self.db.dcur.execute(sql, (self.context.vessel.vid,))
|
||||
for row in self.db.dcur.fetchall():
|
||||
data = (
|
||||
row['provid'],
|
||||
row['provname'],
|
||||
row['number'],
|
||||
self.dd_unit[row['unit']] if row['unit'] is not None else _("─── none ───"),
|
||||
self.format_date(row['storedate']),
|
||||
self.format_date(row['shelflife'])
|
||||
)
|
||||
treeiter = self.lst_provisions.append(data)
|
||||
if row['provid'] == selected_id:
|
||||
# restore previous selected row
|
||||
selection.select_iter(treeiter)
|
||||
|
||||
def clear_record(self):
|
||||
self.prov.clear()
|
||||
|
||||
self.entry['name'].set_text('')
|
||||
combobox.activate_row(self.combo['category'], -1)
|
||||
combobox.activate_row(self.combo['storage'], -1)
|
||||
combobox.activate_row(self.combo['box'], -1)
|
||||
self.spin['number'].set_value(1)
|
||||
self.spin['target'].set_value(0)
|
||||
combobox.activate_row(self.combo['unit'], -1)
|
||||
self.spin['weight'].set_value(0)
|
||||
self.spin['weight_net'].set_value(0)
|
||||
self.spin['price'].set_value(0)
|
||||
self.spin['calories'].set_value(0)
|
||||
self.entry['storedate'].set_text('')
|
||||
self.entry['shelflife'].set_text('')
|
||||
self.text['remarks'].get_buffer().set_text( '')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
def display_record(self):
|
||||
self.label['name'].set_text(self.prov.provname)
|
||||
self.label['category'].set_text(str(self.prov.provcat))
|
||||
self.label['storage'].set_text(str(self.prov.sid))
|
||||
self.label['box'].set_text(str(self.prov.boxid))
|
||||
self.label['number'].set_text(str(self.prov.number))
|
||||
self.label['unit'].set_text(str(self.prov.unit))
|
||||
self.label['target'].set_text(str(self.prov.target))
|
||||
self.label['unit'].set_text(str(self.prov.unit))
|
||||
self.label['weight'].set_text(self.format_float(self.prov.weight, 2, suffix='kg'))
|
||||
self.label['weight_net'].set_text(self.format_float(self.prov.weight_net, 2, suffix='kg'))
|
||||
self.label['price'].set_text(self.format_float(self.prov.price, 2, suffix='€'))
|
||||
self.label['calories'].set_text(str(self.prov.calories))
|
||||
self.label['storedate'].set_text(self.prov.storedate or '')
|
||||
self.label['shelflife'].set_text(self.prov.shelflife or '')
|
||||
self.label['remarks'].set_text(self.prov.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
self.entry['name'].set_text(self.prov.provname)
|
||||
combobox.activate_row(self.combo['category'], self.prov.provcat)
|
||||
combobox.activate_row(self.combo['storage'], self.prov.sid)
|
||||
combobox.activate_row(self.combo['box'], self.prov.boxid)
|
||||
self.spin['number'].set_value(self.prov.number)
|
||||
combobox.activate_row(self.combo['category'], self.prov.provcat or -1)
|
||||
combobox.activate_row(self.combo['storage'], self.prov.sid or -1)
|
||||
combobox.activate_row(self.combo['box'], self.prov.boxid or -1)
|
||||
self.spin['number'].set_value(self.prov.number or 1)
|
||||
self.spin['target'].set_value(self.prov.target or 0)
|
||||
combobox.activate_row(self.combo['unit'], self.prov.unit or -1)
|
||||
self.spin['weight'].set_value(self.prov.weight or 0)
|
||||
self.spin['weight_net'].set_value(self.prov.weight_net or 0)
|
||||
combobox.activate_row(self.combo['unit'], self.prov.unit)
|
||||
self.spin['price'].set_value(self.prov.price or 0)
|
||||
self.spin['calories'].set_value(self.prov.calories or 0)
|
||||
self.entry['storedate'].set_text(self.prov.storedate or '')
|
||||
self.entry['shelflife'].set_text(self.prov.shelflife or '')
|
||||
# self.dt_storedate.set_date
|
||||
# self.dt_shelflife.set_date
|
||||
self.text['remarks'].get_buffer().set_text(self.prov.remarks or '')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
def save_record(self):
|
||||
# fields must have been validated beforehand
|
||||
self.prov.provname = self.entry['name'].get_text()
|
||||
self.prov.provcat = combobox.get_list_value(self.combo['category'])
|
||||
if self.prov.provcat == -1:
|
||||
self.prov.provcat = None
|
||||
self.prov.sid = combobox.get_list_value(self.combo['storage'])
|
||||
if self.prov.sid == -1:
|
||||
self.prov.sid = None
|
||||
self.prov.boxid = combobox.get_list_value(self.combo['box'])
|
||||
self.prov.number = int(self.spin['number'].get_value())
|
||||
if self.prov.boxid == -1:
|
||||
self.prov.boxid = None
|
||||
self.prov.number = self.spin['number'].get_value_as_int()
|
||||
self.prov.target = self.spin['target'].get_value_as_int()
|
||||
self.prov.weight = self.spin['weight'].get_value()
|
||||
self.prov.weight_net = self.spin['wehigt_net'].get_value()
|
||||
self.prov.weight_net = self.spin['weight_net'].get_value()
|
||||
self.prov.unit = combobox.get_list_value(self.combo['unit'])
|
||||
self.prov.storedate = self.entry['storedate'].get_text()
|
||||
self.prov.shelflife = self.entry['shelflife'].get_text()
|
||||
if self.prov.unit == -1:
|
||||
self.prov.unit = None
|
||||
# TODO respect configured date format
|
||||
# self.prov.storedate = self.dt_storedate.get_date()
|
||||
# self.prov.shelflife = self.dt_shelflife.get_date()
|
||||
try:
|
||||
self.prov.storedate = parse(self.entry['storedate'].get_text(), dayfirst=True)
|
||||
except ValueError:
|
||||
self.prov.shelfstoredatelife = None
|
||||
try:
|
||||
self.prov.shelflife = parse(self.entry['shelflife'].get_text(), dayfirst=True)
|
||||
except ValueError:
|
||||
self.prov.shelflife = None
|
||||
self.prov.remarks = gtkutils.get_text_contents(self.text['remarks'])
|
||||
|
||||
def load_dropdown(self):
|
||||
self.db.cur.execute("SELECT ddval, ddtext FROM dropdown WHERE ddid=6 ORDER BY ddval")
|
||||
self.prov_unit = dict(self.db.cur.fetchall())
|
||||
|
||||
# buttons on list page
|
||||
def on_but_new_clicked(self, widget):
|
||||
self.newrecord = True
|
||||
@@ -144,21 +204,39 @@ class ProvisionsView(View):
|
||||
|
||||
# buttons on edit page
|
||||
def on_but_storedate_clicked(self, widget):
|
||||
try:
|
||||
curdate = parse(self.entry['storedate'].get_text())
|
||||
except:
|
||||
curdate = datetime.date.today()
|
||||
selected_date = self.calendar_dialog(None, self.entry['storedate'], curdate)
|
||||
self.entry['storedate'].set_text(self.format_date(selected_date, curdate))
|
||||
#try:
|
||||
# curdate = parse(self.entry['storedate'].get_text())
|
||||
#except:
|
||||
# curdate = datetime.today()
|
||||
#selected_date = self.calendar_dialog(None, self.entry['storedate'], curdate)
|
||||
#self.entry['storedate'].set_text(self.format_date(selected_date, curdate))
|
||||
pass
|
||||
|
||||
def on_but_shelflife_clicked(self, widget):
|
||||
#try:
|
||||
# curdate = parse(self.entry['shelflife'].get_text())
|
||||
#except:
|
||||
# curdate = datetime.today()
|
||||
#selected_date = self.calendar_dialog(None, self.entry['shelflife'], curdate)
|
||||
#self.entry['shelflife'].set_text(self.format_date(selected_date, curdate))
|
||||
pass
|
||||
|
||||
def on_but_save_clicked(self, widget):
|
||||
# check mandatory fields
|
||||
if not self.entry['provname'].get_text().strip():
|
||||
if not self.entry['name'].get_text().strip():
|
||||
# TODO error marker
|
||||
return
|
||||
self.save_record()
|
||||
print(self.prov)
|
||||
self.prov.save()
|
||||
if self.newrecord:
|
||||
self.load_list()
|
||||
else:
|
||||
pass
|
||||
# TODO aktuelle Listenzeile aktualisieren!
|
||||
self.newrecord = False
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['prov_detail'])
|
||||
|
||||
def on_but_cancel_clicked(self, widget):
|
||||
self.topwidget.set_visible_child(self.box['provisions'])
|
||||
Reference in new issue
Block a user