Native gui usable for data editing. Lots of fixes and improvenemts
This commit is contained in:
1 parent
a6abdaa614
commit
09387280fc
52 files changed
+1579
-294
No files matched your search
+108
-21
@@ -49,6 +49,29 @@ class ProvisionsView(View):
|
||||
self.entry['shelflife'].set_placeholder_text(context.get_datefmt_placeholder())
|
||||
self.dt_shelflife = DatePicker(self.entry['shelflife'], self.button['shelflife'], context.get_datefmt())
|
||||
|
||||
# subscribe to data change events
|
||||
self.context.subscribe("storage_modified", self.storage_modified)
|
||||
self.context.subscribe("box_modified", self.box_modified)
|
||||
self.context.subscribe("dd_provcat_modified", self.category_modified)
|
||||
self.context.subscribe("dd_provunit_modified", self.unit_modified)
|
||||
|
||||
def get_list_row(self):
|
||||
return (
|
||||
self.prov.provid,
|
||||
self.prov.provname,
|
||||
self.prov.number,
|
||||
self.dd_unit[self.prov.unit] if self.prov.unit is not None else _("─── none ───"),
|
||||
self.format_date(self.prov.storedate),
|
||||
self.format_date(self.prov.shelflife)
|
||||
)
|
||||
|
||||
def add_row(self):
|
||||
treeiter = self.lst_provisions.append(self.get_list_row())
|
||||
self.tree['provisions'].get_selection().select_iter(treeiter)
|
||||
|
||||
def refresh_row(self):
|
||||
treeview.set_row_values(self.tree['provisions'], self.get_list_row())
|
||||
|
||||
def load_list(self):
|
||||
selected_id = treeview.get_value(self.tree['provisions'])
|
||||
self.lst_provisions.clear()
|
||||
@@ -73,6 +96,59 @@ class ProvisionsView(View):
|
||||
# restore previous selected row
|
||||
selection.select_iter(treeiter)
|
||||
|
||||
def storage_modified(self, eventtype, data):
|
||||
self.dd_storage[data[0]] = data[1]
|
||||
lst = self.combo['storage'].get_model()
|
||||
if eventtype == self.context.EVENT_UPD:
|
||||
for row in lst:
|
||||
if row[0] == data[0]:
|
||||
row[1] = data[1]
|
||||
return
|
||||
elif eventtype == self.context.EVENT_ADD:
|
||||
lst.append(data)
|
||||
else:
|
||||
# not implemented
|
||||
pass
|
||||
|
||||
def box_modified(self, eventtype, data):
|
||||
self.dd_box[data[0]] = data[1]
|
||||
lst = self.combo['box'].get_model()
|
||||
if eventtype == self.context.EVENT_UPD:
|
||||
for row in lst:
|
||||
if row[0] == data[0]:
|
||||
row[1] = data[1]
|
||||
return
|
||||
else:
|
||||
lst.append(data)
|
||||
|
||||
def category_modified(self, eventtype, data):
|
||||
self.dd_category[data[0]] = data[1]
|
||||
lst = self.combo['category'].get_model()
|
||||
if eventtype == self.context.EVENT_UPD:
|
||||
for row in lst:
|
||||
if row[0] == data[0]:
|
||||
row[1] = data[1]
|
||||
return
|
||||
elif eventtype == self.context.EVENT_ADD:
|
||||
lst.append(data)
|
||||
else:
|
||||
# not implemented
|
||||
pass
|
||||
|
||||
def unit_modified(self, eventtype, data):
|
||||
self.dd_unit[data[0]] = data[1]
|
||||
lst = self.combo['unit'].get_model()
|
||||
if eventtype == self.context.EVENT_UPD:
|
||||
for row in lst:
|
||||
if row[0] == data[0]:
|
||||
row[1] = data[1]
|
||||
return
|
||||
elif eventtype == self.context.EVENT_ADD:
|
||||
lst.append(data)
|
||||
else:
|
||||
# not implemented
|
||||
pass
|
||||
|
||||
def clear_record(self):
|
||||
self.prov.clear()
|
||||
self.entry['name'].set_text('')
|
||||
@@ -92,19 +168,19 @@ class ProvisionsView(View):
|
||||
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['target'].set_text(str(self.prov.target))
|
||||
self.label['unit'].set_text(str(self.prov.unit))
|
||||
self.label['name'].set_text(self.prov.provname or '')
|
||||
self.label['category'].set_text(self.dd_category.get(self.prov.provcat, ''))
|
||||
self.label['storage'].set_text(self.dd_storage.get(self.prov.sid, ''))
|
||||
self.label['box'].set_text(self.dd_box.get(self.prov.boxid, ''))
|
||||
self.label['number'].set_text(self.format_int(self.prov.number))
|
||||
self.label['target'].set_text(self.format_int(self.prov.target))
|
||||
self.label['unit'].set_text(self.dd_unit.get(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['calories'].set_text(self.format_int(self.prov.calories, suffix='kCal'))
|
||||
self.label['storedate'].set_text(self.format_date(self.prov.storedate))
|
||||
self.label['shelflife'].set_text(self.format_date(self.prov.shelflife))
|
||||
self.label['remarks'].set_text(self.prov.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
@@ -115,14 +191,24 @@ class ProvisionsView(View):
|
||||
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)
|
||||
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
|
||||
if not self.prov.weight:
|
||||
self.spin['weight'].set_text('')
|
||||
else:
|
||||
self.spin['weight'].set_value(self.prov.weight)
|
||||
if not self.prov.weight_net:
|
||||
self.spin['weight'].set_text('')
|
||||
else:
|
||||
self.spin['weight_net'].set_value(self.prov.weight_net)
|
||||
if not self.prov.price:
|
||||
self.spin['price'].set_text('')
|
||||
else:
|
||||
self.spin['price'].set_value(self.prov.price)
|
||||
if not self.prov.calories:
|
||||
self.spin['calories'].set_text('')
|
||||
else:
|
||||
self.spin['calories'].set_value(self.prov.calories)
|
||||
self.entry['storedate'].set_text(self.format_date(self.prov.storedate))
|
||||
self.entry['shelflife'].set_text(self.format_date(self.prov.shelflife))
|
||||
self.text['remarks'].get_buffer().set_text(self.prov.remarks or '')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
@@ -140,6 +226,7 @@ class ProvisionsView(View):
|
||||
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.price = self.spin['price'].get_value()
|
||||
self.prov.weight = self.spin['weight'].get_value()
|
||||
self.prov.weight_net = self.spin['weight_net'].get_value()
|
||||
self.prov.unit = combobox.get_list_value(self.combo['unit'])
|
||||
@@ -236,10 +323,10 @@ class ProvisionsView(View):
|
||||
pass
|
||||
self.record_unlock()
|
||||
if self.newrecord:
|
||||
self.load_list()
|
||||
#self.load_list()
|
||||
self.add_row()
|
||||
else:
|
||||
pass
|
||||
# TODO aktuelle Listenzeile aktualisieren!
|
||||
self.refresh_row()
|
||||
self.newrecord = False
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['prov_detail'])
|
||||
|
||||
Reference in new issue
Block a user