Native gui first steps: storage, box and companies are editable
This commit is contained in:
1 parent
1eea4058bf
commit
06a9834688
47 files changed
+3119
-883
No files matched your search
+145
-34
@@ -2,6 +2,7 @@
|
||||
|
||||
import os
|
||||
from gi.repository import GLib, Gtk, Gdk
|
||||
from dateutil.parser import parse
|
||||
|
||||
from .view import View
|
||||
from yms import gtkutils, combobox, treeview
|
||||
@@ -18,16 +19,7 @@ class EquipmentView(View):
|
||||
self.newrecord = False
|
||||
|
||||
self.lst_equipment = Gtk.ListStore(int, str, str, str, str, str, str)
|
||||
sql = (
|
||||
"SELECT e.eid, e.ename, c.compname, e.model, e.serial, "
|
||||
"DATE_FORMAT(e.purchdate, '{}'), e.remarks "
|
||||
"FROM equipment AS e LEFT OUTER JOIN company AS c ON (e.manufacturer=c.compid) "
|
||||
"WHERE e.vid=%s "
|
||||
"ORDER BY e.ename"
|
||||
).format("%%d.%%m.%%Y") # TODO format from settings via mapping
|
||||
self.db.cur.execute(sql, (context.vessel.vid,))
|
||||
for row in self.db.cur.fetchall():
|
||||
self.lst_equipment.append(row)
|
||||
self.load_list()
|
||||
|
||||
treeview.add_column(self.tree['equipment'], _('ID'), 0)
|
||||
treeview.add_column(self.tree['equipment'], _('Name'), 1)
|
||||
@@ -38,23 +30,132 @@ class EquipmentView(View):
|
||||
treeview.add_column(self.tree['equipment'], _('Remarks'), 6)
|
||||
self.tree['equipment'].set_model(self.lst_equipment)
|
||||
|
||||
# Supplier
|
||||
self.dd_supplier = self.context.lookup.company(1)
|
||||
combobox.load_from_dict(self.combo['supplier'], {-1: _("─── none ───")} | self.dd_supplier)
|
||||
# Manufacturer
|
||||
self.dd_manufacturer = self.context.lookup.company(2)
|
||||
combobox.load_from_dict(self.combo['manufacturer'], {-1: _("─── none ───")} | self.dd_manufacturer)
|
||||
# Category
|
||||
self.dd_category = self.context.lookup.dropdown(Dropdown.EQUIPMENT_CATEGORY)
|
||||
#combobox.load_from_dict(self.combo['unit'], self.dd_unit)
|
||||
combobox.load_from_dict(self.combo['category'], {-1: _("─── none ───")} | self.dd_category)
|
||||
# Condition
|
||||
self.dd_condition = self.context.lookup.enum('equipment.econd')
|
||||
combobox.load_from_dict(self.combo['condition'], self.dd_condition, 'unknown')
|
||||
|
||||
def load_list(self):
|
||||
self.lst_equipment.clear()
|
||||
sql = (
|
||||
"SELECT e.eid, e.ename, c.compname, e.model, e.serial, "
|
||||
"DATE_FORMAT(e.purchdate, '{}'), e.remarks "
|
||||
"FROM equipment AS e LEFT OUTER JOIN company AS c ON (e.manufacturer=c.compid) "
|
||||
"WHERE e.vid=%s "
|
||||
"ORDER BY e.ename"
|
||||
).format(self.context.datefmt.replace('%', '%%'))
|
||||
# ).format("%%d.%%m.%%Y") # TODO format from settings via mapping
|
||||
self.db.cur.execute(sql, (self.context.vessel.vid,))
|
||||
for row in self.db.cur.fetchall():
|
||||
self.lst_equipment.append(row)
|
||||
|
||||
def clear_record(self):
|
||||
self.equip.clear()
|
||||
self.entry['name'].set_text('')
|
||||
self.entry['shortname'].set_text('')
|
||||
combobox.activate_row(self.combo['manufacturer'], -1)
|
||||
self.entry['model'].set_text('')
|
||||
self.entry['serial'].set_text('')
|
||||
self.spin['weight'].set_value(0)
|
||||
self.spin['price'].set_value(0)
|
||||
self.entry['purchdate'].set_text('')
|
||||
combobox.activate_row(self.combo['supplier'], -1)
|
||||
combobox.activate_row(self.combo['category'], -1)
|
||||
combobox.activate_row(self.combo['condition'], 'unknown')
|
||||
self.text['remarks'].get_buffer().set_text('')
|
||||
|
||||
def display_record(self):
|
||||
print(self.equip)
|
||||
self.label['name'].set_text(self.equip.ename)
|
||||
self.label['shortname'].set_text(self.equip.shortname or '')
|
||||
if self.equip.manufacturer:
|
||||
self.label['manufacturer'].set_text(self.dd_manufacturer[self.equip.manufacturer])
|
||||
else:
|
||||
self.label['manufacturer'].set_text('')
|
||||
self.label['model'].set_text(self.equip.model or '')
|
||||
self.label['serial'].set_text(self.equip.serial or '')
|
||||
self.label['weight'].set_text(self.format_float(self.equip.weight, 2, suffix='kg'))
|
||||
self.label['price'].set_text(self.format_float(self.equip.price, 2, suffix='€'))
|
||||
self.label['purchdate'].set_text(self.format_date(self.equip.purchdate))
|
||||
if self.equip.supplier:
|
||||
self.label['supplier'].set_text(self.dd_supplier[self.equip.supplier])
|
||||
else:
|
||||
self.label['supplier'].set_text('')
|
||||
if self.equip.ecat:
|
||||
self.label['category'].set_text(self.dd_category[self.equip.ecat])
|
||||
else:
|
||||
self.label['category'].set_text('')
|
||||
self.label['flags'].set_text(self.equip.flags or '')
|
||||
self.label['remarks'].set_text(self.equip.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
self.entry['name'].set_text(self.equip.ename)
|
||||
self.entry['shortname'].set_text(self.equip.shortname or '')
|
||||
combobox.activate_row(self.combo['manufacturer'], self.equip.manufacturer or -1)
|
||||
self.entry['model'].set_text(self.equip.model or '')
|
||||
self.entry['serial'].set_text(self.equip.serial or '')
|
||||
self.spin['weight'].set_value(self.equip.weight or 0)
|
||||
self.spin['price'].set_value(self.equip.price or 0)
|
||||
self.entry['purchdate'].set_text(self.format_date(self.equip.purchdate))
|
||||
self.text['remarks'].get_buffer().set_text(self.equip.remarks or '')
|
||||
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')
|
||||
self.text['remarks'].get_buffer().set_text(self.equip.remarks or '')
|
||||
print("Edit record")
|
||||
print(self.equip)
|
||||
|
||||
def save_record(self):
|
||||
# fields must have been validated beforehand
|
||||
print(self.equip)
|
||||
self.equip.ename = self.entry['name'].get_text()
|
||||
self.equip.shortname = self.entry['shortname'].get_text()
|
||||
self.equip.manufacturer = combobox.get_list_value(self.combo['manufacturer'])
|
||||
if self.equip.manufacturer < 0:
|
||||
self.equip.manufacturer = None
|
||||
self.equip.model = self.entry['model'].get_text()
|
||||
self.equip.serial = self.entry['serial'].get_text()
|
||||
self.equip.weight = self.spin['weight'].get_value()
|
||||
self.equip.price = self.spin['price'].get_value()
|
||||
self.equip.supplier = combobox.get_list_value(self.combo['supplier'])
|
||||
if self.equip.supplier < 0:
|
||||
self.equip.supplier = None
|
||||
self.equip.ecat = combobox.get_list_value(self.combo['category'])
|
||||
if self.equip.ecat < 0:
|
||||
self.equip.ecat = None
|
||||
self.equip.remarks = gtkutils.get_text_contents(self.text['remarks'])
|
||||
print(self.equip)
|
||||
|
||||
# buttons on list page
|
||||
def on_but_new_clicked(self, widget):
|
||||
self.newrecord = True
|
||||
self.label['title_editor'].set_text(_("Add new Equipment"))
|
||||
self.label['title_edit'].set_text(_("Add new Equipment"))
|
||||
self.clear_record()
|
||||
self.equip.vid = self.context.vessel.vid
|
||||
self.topwidget.set_visible_child(self.box['equip_edit'])
|
||||
|
||||
def on_but_edit_clicked(self, widget):
|
||||
self.newrecord = False
|
||||
eid = treeview.get_value(self.tree['equipment'], 0)
|
||||
if eid is None:
|
||||
return
|
||||
self.label['title_edit'].set_text(_("Edit Equipment"))
|
||||
self.equip.load(eid)
|
||||
self.edit_record()
|
||||
self.topwidget.set_visible_child(self.box['equip_edit'])
|
||||
|
||||
def on_but_detail_clicked(self, widget):
|
||||
eid = treeview.get_value(self.tree['equipment'], 0)
|
||||
if eid is None:
|
||||
return
|
||||
self.equip.load(eid)
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['equip_detail'])
|
||||
@@ -71,34 +172,44 @@ class EquipmentView(View):
|
||||
def on_but_close_clicked(self, widget):
|
||||
self.topwidget.set_visible_child(self.box['equipment'])
|
||||
|
||||
def on_but_convert_clicked(self, widget):
|
||||
# convert equipment to inventory
|
||||
answer = gtkutils.questionbox(
|
||||
_("Convert equipment to inventory?\n"
|
||||
"Some properties will be lost!\n\n"
|
||||
"Are you sure?"), title="YMS"
|
||||
)
|
||||
if answer == False:
|
||||
return
|
||||
# TODO
|
||||
|
||||
def on_but_delete_clicked(self, widget):
|
||||
answer = gtkutils.questionbox(
|
||||
_("Delete equipment!\n"
|
||||
"Are you sure?"), title="YMS"
|
||||
)
|
||||
if answer == False:
|
||||
return
|
||||
self.topwidget.set_visible_child(self.box['equipment'])
|
||||
|
||||
# buttons on edit page
|
||||
def on_but_save_clicked(self, widget):
|
||||
pass
|
||||
# check mandatory fields
|
||||
if not self.entry['name'].get_text().strip():
|
||||
# TODO error marker
|
||||
return
|
||||
self.save_record()
|
||||
print(self.equip)
|
||||
self.equip.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['equip_detail'])
|
||||
|
||||
def on_but_cancel_clicked(self, widget):
|
||||
self.topwidget.set_visible_child(self.box['equipment'])
|
||||
|
||||
def display_record(self):
|
||||
print(self.equip)
|
||||
self.label['name'].set_text(self.equip.ename)
|
||||
self.label['shortname'].set_text(self.equip.shortname or '')
|
||||
#lookup self.label['manufacturer'].set_text(self.equip.manufacturer)
|
||||
self.label['model'].set_text(self.equip.model or '')
|
||||
self.label['serial'].set_text(self.equip.serial or '')
|
||||
self.label['weight'].set_text(self.format_float(self.equip.weight, 2, suffix='kg'))
|
||||
self.label['price'].set_text(self.format_float(self.equip.price, 2, suffix='€'))
|
||||
self.label['date_purch'].set_text(self.equip.purchdate or '')
|
||||
#lookup self.label['supplier'].set_text(self.equip.supplier)
|
||||
self.label['category'].set_text(self.dd_category[self.equip.ecat])
|
||||
self.label['flags'].set_text(self.equip.flags or '')
|
||||
self.label['remarks'].set_text(self.equip.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
self.entry['sname'].set_text(self.storage.sname)
|
||||
self.spin['x'].set_value(self.storage.x)
|
||||
self.spin['y'].set_value(self.storage.y)
|
||||
self.spin['z'].set_value(self.storage.z)
|
||||
self.text['remarks'].get_buffer().set_text(self.storage.remarks or '')
|
||||
Reference in new issue
Block a user