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
+85
-15
@@ -5,7 +5,7 @@ from gi.repository import GLib, Gtk, Gdk
|
||||
from dateutil.parser import parse
|
||||
from gettext import pgettext
|
||||
|
||||
from .view import View
|
||||
from .view import View, DatePicker
|
||||
from yms import gtkutils, combobox, treeview
|
||||
from yms.lookup import Dropdown
|
||||
from yms.model import inventory
|
||||
@@ -52,6 +52,15 @@ class InventoryView(View):
|
||||
self.dd_condition = self.context.lookup.enum('inventory.invcond')
|
||||
combobox.load_from_dict(self.combo['condition'], self.dd_condition)
|
||||
|
||||
self.entry['purchdate'].set_placeholder_text(context.get_datefmt_placeholder())
|
||||
DatePicker(self.entry['purchdate'], self.button['purchdate'], 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("equipment_modified", self.equipment_modified)
|
||||
self.context.subscribe("dd_invcat_modified", self.category_modified)
|
||||
|
||||
def load_list(self):
|
||||
selected_id = treeview.get_value(self.tree['inventory'])
|
||||
self.lst_inventory.clear()
|
||||
@@ -71,13 +80,66 @@ class InventoryView(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 equipment_modified(self, eventtype, data):
|
||||
self.dd_equipment[data[0]] = data[1]
|
||||
lst = self.combo['equipment'].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 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 on_page_activated(self):
|
||||
print("Inventory activated")
|
||||
|
||||
def clear_record(self):
|
||||
self.inv.clear()
|
||||
self.entry['name'].set_text('')
|
||||
combobox.activate_row(self.combo['conttype'], -1)
|
||||
combobox.activate_row(self.combo['conttype'], 'storage')
|
||||
combobox.activate_row(self.combo['storage'], -1)
|
||||
combobox.activate_row(self.combo['box'], -1)
|
||||
combobox.activate_row(self.combo['equipment'], -1)
|
||||
@@ -108,7 +170,7 @@ class InventoryView(View):
|
||||
self.label['category'].set_text(self.dd_category[self.inv.icat])
|
||||
else:
|
||||
self.label['category'].set_text('')
|
||||
self.label['flags'].set_text(self.inv.flags)
|
||||
self.label['flags'].set_text(self.inv.flags or '')
|
||||
self.label['remarks'].set_text(self.inv.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
@@ -123,7 +185,7 @@ class InventoryView(View):
|
||||
self.entry['purchdate'].set_text(self.format_date(self.inv.purchdate))
|
||||
combobox.activate_row(self.combo['condition'], self.inv.invcond)
|
||||
combobox.activate_row(self.combo['category'], self.inv.icat or -1)
|
||||
flags = self.inv.flags.split(',')
|
||||
flags = (self.inv.flags or '').split(',')
|
||||
for flag in self.context.lookup.enum('inventory.flags'):
|
||||
self.check[flag].set_active(flag in flags)
|
||||
self.text['remarks'].get_buffer().set_text(self.inv.remarks or '')
|
||||
@@ -134,15 +196,16 @@ class InventoryView(View):
|
||||
self.inv.invname = self.entry['name'].get_text()
|
||||
self.inv.conttype = combobox.get_list_value(self.combo['conttype'])
|
||||
self.inv.sid = combobox.get_list_value(self.combo['storage'])
|
||||
if self.inv.sid < 0:
|
||||
self.inv.sid = None
|
||||
self.inv.boxid = combobox.get_list_value(self.combo['box'])
|
||||
if self.inv.boxid < 0:
|
||||
# only one of storage or box can be set depending of container type
|
||||
if self.inv.conttype == 'storage':
|
||||
self.inv.boxid = None
|
||||
else:
|
||||
self.inv.sid = None
|
||||
self.inv.eid = combobox.get_list_value(self.combo['equipment'])
|
||||
if self.inv.eid < 0:
|
||||
self.inv.eid = None
|
||||
self.inv.number = self.spin['number'].get_value()
|
||||
self.inv.number = self.spin['number'].get_value_as_int()
|
||||
self.inv.weight = self.spin['weight'].get_value()
|
||||
self.inv.price = self.spin['price'].get_value()
|
||||
try:
|
||||
@@ -154,13 +217,7 @@ class InventoryView(View):
|
||||
self.inv.icat = combobox.get_list_value(self.combo['category'])
|
||||
if self.inv.icat == -1:
|
||||
self.inv.icat = None
|
||||
# TODO this could be a generic function operating on a list
|
||||
# of check controls
|
||||
flags = []
|
||||
if self.check['ordered'].get_active(): flags.append('ordered')
|
||||
if self.check['removed'].get_active(): flags.append('removed')
|
||||
if self.check['deleted'].get_active(): flags.append('deleted')
|
||||
self.inv.flags = ','.join(flags)
|
||||
self.inv.flags = self.get_checks(('ordered', 'removed', 'deleted'))
|
||||
self.inv.remarks = gtkutils.get_text_contents(self.text['remarks'])
|
||||
|
||||
# buttons on list page
|
||||
@@ -196,6 +253,19 @@ class InventoryView(View):
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['inv_detail'])
|
||||
|
||||
def on_cmb_conttype_changed(self, widget):
|
||||
print("contenttype changed")
|
||||
if combobox.get_list_value(widget) == 'storage':
|
||||
self.label['edit_storage'].set_visible(True)
|
||||
self.combo['storage'].set_visible(True)
|
||||
self.label['edit_box'].set_visible(False)
|
||||
self.combo['box'].set_visible(False)
|
||||
else:
|
||||
self.label['edit_storage'].set_visible(False)
|
||||
self.combo['storage'].set_visible(False)
|
||||
self.label['edit_box'].set_visible(True)
|
||||
self.combo['box'].set_visible(True)
|
||||
|
||||
# buttons on detail page
|
||||
# edit2 uses edit callback
|
||||
def on_but_close_clicked(self, widget):
|
||||
|
||||
Reference in new issue
Block a user