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
+30
-2
@@ -47,6 +47,9 @@ class EquipmentView(View):
|
||||
self.entry['purchdate'].set_placeholder_text(context.get_datefmt_placeholder())
|
||||
self.dt_purchdate = DatePicker(self.entry['purchdate'], self.button['purchdate'], context.get_datefmt())
|
||||
|
||||
# subscribe to data change events
|
||||
self.context.subscribe("dd_ecat_modified", self.category_modified)
|
||||
|
||||
def get_list_row(self):
|
||||
return (
|
||||
self.equip.eid,
|
||||
@@ -86,6 +89,20 @@ class EquipmentView(View):
|
||||
def on_page_activated(self):
|
||||
print("Equipment activated")
|
||||
|
||||
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 clear_record(self):
|
||||
self.equip.clear()
|
||||
self.entry['name'].set_text('')
|
||||
@@ -103,7 +120,7 @@ class EquipmentView(View):
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
def display_record(self):
|
||||
self.label['name'].set_text(self.equip.ename)
|
||||
self.label['name'].set_text(self.equip.ename or '')
|
||||
self.label['shortname'].set_text(self.equip.shortname or '')
|
||||
if self.equip.manufacturer:
|
||||
self.label['manufacturer'].set_text(self.dd_manufacturer[self.equip.manufacturer])
|
||||
@@ -123,7 +140,8 @@ class EquipmentView(View):
|
||||
else:
|
||||
self.label['category'].set_text('')
|
||||
self.label['flags'].set_text(self.equip.flags or '')
|
||||
self.label['condition'].set_text(pgettext("equipment.econd", self.equip.econd))
|
||||
#self.label['condition'].set_text(pgettext("equipment.econd", self.equip.econd))
|
||||
self.label['condition'].set_text(self.dd_condition[self.equip.econd])
|
||||
self.label['remarks'].set_text(self.equip.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
@@ -139,6 +157,9 @@ class EquipmentView(View):
|
||||
combobox.activate_row(self.combo['supplier'], self.equip.supplier or -1)
|
||||
combobox.activate_row(self.combo['category'], self.equip.ecat or -1)
|
||||
combobox.activate_row(self.combo['condition'], self.equip.econd or 'unknown')
|
||||
flags = (self.equip.flags or '').split(',')
|
||||
for flag in self.context.lookup.enum('equipment.flags'):
|
||||
self.check[flag].set_active(flag in flags)
|
||||
self.text['remarks'].get_buffer().set_text(self.equip.remarks or '')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
@@ -166,6 +187,7 @@ class EquipmentView(View):
|
||||
if self.equip.ecat < 0:
|
||||
self.equip.ecat = None
|
||||
self.equip.econd = combobox.get_list_value(self.combo['condition'])
|
||||
self.equip.flags = self.get_checks(('ordered', 'removed', 'deleted'))
|
||||
self.equip.remarks = gtkutils.get_text_contents(self.text['remarks'])
|
||||
print(self.equip)
|
||||
|
||||
@@ -244,8 +266,14 @@ class EquipmentView(View):
|
||||
if self.newrecord:
|
||||
self.add_row()
|
||||
#self.load_list()
|
||||
self.context.publish("equipment_modified", self.context.EVENT_ADD,
|
||||
(self.equip.pk_value, self.equip.ename)
|
||||
)
|
||||
else:
|
||||
self.refresh_row()
|
||||
self.context.publish("equipment_modified", self.context.EVENT_UPD,
|
||||
(self.equip.pk_value, self.equip.ename)
|
||||
)
|
||||
self.newrecord = False
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['equip_detail'])
|
||||
|
||||
Reference in new issue
Block a user