Fixes for webgui and more native gui development

yms/view/base.py

@@ -14,6 +14,7 @@ from gi.repository import GLib, Gtk, Gdk, Rsvg
 
 from .view import View
 from yms import gtkutils, combobox, treeview
+from yms.lookup import Dropdown
 
 class BaseView(View):
 
@@ -63,7 +64,15 @@ class BaseView(View):
             self.db.cur.execute("INSERT INTO settings (userid, sno, valint) VALUES (0, 1, 0)")
             self.db.conn.commit()
         else:
-            self.context.vessel.vid = row[0]
+            # check if vessel from settings exist
+            self.db.cur.execute("SELECT count(*) FROM vessel WHERE vid=%s", (row[0],))
+            res = self.db.cur.fetchone()[0]
+            if res > 0:
+                self.context.vessel.vid = row[0]
+            else:
+                # TODO set vessel to first in list
+                self.context.vessel.vid = 0
+                self.context.vessel.vesselname = "Ghost"
 
         # default storage for current vessel
         sql = "SELECT sid, sname FROM storage WHERE stype=0 AND vid=%s ORDER BY sname"
@@ -75,7 +84,7 @@ class BaseView(View):
         vessellist = {}
         self.db.dcur.execute("SELECT vid, vesselname, model FROM vessel ORDER BY vid")
         for row in self.db.dcur.fetchall():
-            vessellist[row['vid']] = (
+           vessellist[row['vid']] = (
                     row['vesselname'] if row['model'] is None
                     else row['vesselname'] + " - " + row['model']
                 )
@@ -154,6 +163,15 @@ class BaseView(View):
         if answer == False:
             return
         self.context.vessel.create()
+        model = self.combo['vessel'].get_model()
+        model.append((self.context.vessel.vid, self.context.vessel.vesselname))
+        combobox.activate_row(self.combo['vessel'], self.context.vessel.vid)
+        self.edit_vessel(self.context.vessel)
+        self.stack['vessel'].set_visible_child(self.box['vessel_edit'])
+
+    def on_but_vessel_edit_clicked(self, widget):
+        self.edit_vessel(self.context.vessel)
+        self.stack['vessel'].set_visible_child(self.box['vessel_edit'])
 
     def on_but_vessel_save_clicked(self, widget):
         print("Save vessel")
@@ -172,6 +190,13 @@ class BaseView(View):
         txtbuf = self.text['vessel_remarks'].get_buffer()
         vessel.remarks = txtbuf.get_text(txtbuf.get_start_iter(), txtbuf.get_end_iter(), True)
         vessel.save()
+        self.stack['vessel'].set_visible_child(self.box['vessel'])
+
+    def on_but_vessel_cancel_clicked(self, widget):
+        self.stack['vessel'].set_visible_child(self.box['vessel'])
+
+    def on_but_vessel_delete_clicked(self, widget):
+        pass
 
     def on_but_comp_new_clicked(self, widget):
         print("New company")
@@ -189,7 +214,11 @@ class BaseView(View):
         pass
 
     def display_vessel(self, vessel):
-        print("Display vessel")
+        self.label['vesselname'].set_text(vessel.vesselname)
+        self.label['model'].set_text(vessel.model or '')
+        self.label['year_built'].set_text(self.format_int(vessel.year_built, default='n/a'))
+
+    def edit_vessel(self, vessel):
         self.entry['vesselname'].set_text(vessel.vesselname)
         self.entry['model'].set_text(vessel.model or '')
         self.spin['year_built'].set_value(vessel.year_built or 0)