Work on native gui. Display records and add missing tasks and measurements.

yms/view/equipment.py

@@ -5,12 +5,14 @@ from gi.repository import GLib, Gtk, Gdk
 
 from .view import View
 from yms import gtkutils, combobox, treeview
+from yms.lookup import Dropdown
 from yms.model import equipment
 
 class EquipmentView(View):
 
     def __init__(self, context):
         super().__init__(context, _("Equipment"), "equipment.ui")
+        self.context = context
 
         self.equip = equipment.Equipment(context.db) # current record
         self.newrecord = False
@@ -36,11 +38,19 @@ class EquipmentView(View):
         treeview.add_column(self.tree['equipment'], _('Remarks'), 6)
         self.tree['equipment'].set_model(self.lst_equipment)
 
+        self.dd_category = self.context.lookup.dropdown(Dropdown.EQUIPMENT_CATEGORY)
+        #combobox.load_from_dict(self.combo['unit'], self.dd_unit)
+
     # buttons on list page
     def on_but_new_clicked(self, widget):
+        self.newrecord = True
+        self.label['title_editor'].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.label['title_edit'].set_text(_("Edit Equipment"))
         self.topwidget.set_visible_child(self.box['equip_edit'])
 
     def on_but_detail_clicked(self, widget):
@@ -48,6 +58,7 @@ class EquipmentView(View):
         self.equip.load(eid)
         self.display_record()
         self.topwidget.set_visible_child(self.box['equip_detail'])
+        self.button['close'].grab_focus()
 
     def on_tvw_equipment_row_activated(self, widget, path, column):
         eid = treeview.get_value(widget, 0)
@@ -72,7 +83,17 @@ class EquipmentView(View):
 
     def display_record(self):
         print(self.equip)
-        #self.label['name'].set_text(self.equip.sname)
+        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):