Fixed vessel change code in native gui
This commit is contained in:
1 parent
09387280fc
commit
db74fb6970
16 files changed
+192
-33
No files matched your search
+33
-20
@@ -111,7 +111,7 @@ class BaseView(View):
|
||||
self.tree['user'].set_model(self.lst_user)
|
||||
|
||||
# list of dropdown lists (static!)
|
||||
self.lst_lists = Gtk.ListStore(int, str, int)
|
||||
self.lst_lists = Gtk.ListStore(int, str, int, bool)
|
||||
sql = (
|
||||
"SELECT dd.ddval, dd.ddtext, FIND_IN_SET('locked', dd.flags) AS locked, "
|
||||
"COUNT(n.ddval) AS records "
|
||||
@@ -130,6 +130,7 @@ class BaseView(View):
|
||||
else:
|
||||
data.append(row['ddtext'])
|
||||
data.append(row['records'])
|
||||
data.append(row['locked'])
|
||||
self.lst_lists.append(data)
|
||||
treeview.create_columns(
|
||||
self.tree['ddlists'],
|
||||
@@ -151,8 +152,6 @@ class BaseView(View):
|
||||
|
||||
self.ddid_cur = None # Current selected dropdown entry
|
||||
self.ddval_cur = None
|
||||
self.ddid_iter = None # to easy update selected item
|
||||
self.ddval_iter = None # to easy update selected item
|
||||
self.dd_newrecord = False
|
||||
|
||||
# Settings date format selection list
|
||||
@@ -457,6 +456,11 @@ class BaseView(View):
|
||||
vessel.remarks = gtkutils.get_text_contents(self.text['vessel_remarks'])
|
||||
vessel.save()
|
||||
self.context.publish("vessel_modified", self.context.EVENT_UPD, (vessel.vid, ))
|
||||
# refresh vessel selection list
|
||||
model = self.combo['vessel'].get_model()
|
||||
active = self.combo['vessel'].get_active()
|
||||
model[active][1] = f"{vessel.vesselname} - {vessel.model}" if vessel.model else vessel.vesselname
|
||||
# switch to display mode
|
||||
self.stack['vessel'].set_visible_child(self.box['vessel'])
|
||||
self.display_vessel(self.context.vessel)
|
||||
|
||||
@@ -495,22 +499,22 @@ class BaseView(View):
|
||||
self.db.conn.commit()
|
||||
|
||||
def display_vessel(self, vessel):
|
||||
self.label['vesselname'].set_text(vessel.vesselname)
|
||||
self.label['vesselname'].set_text(vessel.vesselname or '')
|
||||
self.label['model'].set_text(vessel.model or '')
|
||||
self.label['shipyard'].set_text(str(vessel.shipyard))
|
||||
self.label['shipyard'].set_text(self.dd_storage.get(vessel.shipyard, '-'))
|
||||
self.label['year_built'].set_text(self.format_int(vessel.year_built, False, default='n/a'))
|
||||
self.label['hull_number'].set_text(vessel.hull_number or '')
|
||||
self.label['loa'].set_text(self.format_float(vessel.loa, 2, suffix="m"))
|
||||
self.label['lwl'].set_text(self.format_float(vessel.lwl, 2, suffix="m"))
|
||||
self.label['beam'].set_text(self.format_float(vessel.beam, 2, suffix="m"))
|
||||
self.label['draught'].set_text(self.format_float(vessel.draught, 2, suffix="m"))
|
||||
self.label['draught_min'].set_text(self.format_float(vessel.draught_min, 2, suffix="m"))
|
||||
self.label['displacement'].set_text(self.format_int(vessel.displacement, 2, suffix="kg"))
|
||||
self.label['ballast'].set_text(self.format_int(vessel.ballast, 2, suffix="kg"))
|
||||
self.label['belt_bow'].set_text(self.format_float(vessel.beltpos_bow, 2, suffix="m"))
|
||||
self.label['belt_aft'].set_text(self.format_float(vessel.beltpos_aft, 2, suffix="m"))
|
||||
self.label['hull_shape'].set_text(vessel.shapefile or '')
|
||||
self.label['storage_def'].set_text(str(vessel.sid_default))
|
||||
self.label['loa'].set_text(self.format_float(vessel.loa, 2, suffix='m'))
|
||||
self.label['lwl'].set_text(self.format_float(vessel.lwl, 2, suffix='m'))
|
||||
self.label['beam'].set_text(self.format_float(vessel.beam, 2, suffix='m'))
|
||||
self.label['draught'].set_text(self.format_float(vessel.draught, 2, suffix='m'))
|
||||
self.label['draught_min'].set_text(self.format_float(vessel.draught_min, 2, suffix='m'))
|
||||
self.label['displacement'].set_text(self.format_int(vessel.displacement, 2, suffix='kg'))
|
||||
self.label['ballast'].set_text(self.format_int(vessel.ballast, 2, suffix='kg'))
|
||||
self.label['belt_bow'].set_text(self.format_float(vessel.beltpos_bow, 2, suffix='m'))
|
||||
self.label['belt_aft'].set_text(self.format_float(vessel.beltpos_aft, 2, suffix='m'))
|
||||
self.label['hull_shape'].set_text(vessel.shapefile or '-')
|
||||
self.label['storage_def'].set_text(self.dd_storage.get(vessel.sid_default, '-'))
|
||||
self.label['remarks'].set_text(vessel.remarks or '')
|
||||
|
||||
def edit_vessel(self, vessel):
|
||||
@@ -664,6 +668,9 @@ class BaseView(View):
|
||||
self.entry['dd_text'].grab_focus()
|
||||
|
||||
def on_but_list_save_clicked(self, widget):
|
||||
"""
|
||||
Flags locked and fixed should not be overwritten!
|
||||
"""
|
||||
if self.dd_newrecord:
|
||||
sql = (
|
||||
"INSERT INTO dropdown (ddid, ddval, ddtext, ddshort, sort, color, flags) "
|
||||
@@ -694,7 +701,7 @@ class BaseView(View):
|
||||
self.entry['dd_short'].get_text(),
|
||||
self.spin['dd_sort'].get_value_as_int(),
|
||||
self.entry['dd_color'].get_text().lstrip('#'),
|
||||
'' # TODO flags
|
||||
'' # TODO flags: fixed must not be overwritten!
|
||||
)
|
||||
treeiter = self.lst_list.append(data)
|
||||
selection = self.tree['ddlist'].get_selection()
|
||||
@@ -759,16 +766,21 @@ class BaseView(View):
|
||||
|
||||
def on_tvw_ddlists_row_activated(self, widget, path, column):
|
||||
# load single list
|
||||
self.ddid_iter = widget.get_selection().get_selected()[1]
|
||||
self.button['list_save'].set_sensitive(False)
|
||||
if treeview.get_value(widget, 3) == True:
|
||||
# List is locked!
|
||||
self.lst_list.clear()
|
||||
self.clear_dd_entry()
|
||||
self.button['list_new'].set_sensitive(False)
|
||||
return
|
||||
self.ddid_cur = treeview.get_value(widget, 0)
|
||||
self.ddval_cur = None
|
||||
self.load_list_dropdown(self.ddid_cur)
|
||||
self.clear_dd_entry()
|
||||
self.button['list_save'].set_sensitive(False)
|
||||
self.button['list_new'].set_sensitive(True)
|
||||
|
||||
def on_tvw_ddlist_row_activated(self, widget, path, column):
|
||||
# load list entry details
|
||||
self.ddval_iter = widget.get_selection().get_selected()[1]
|
||||
self.ddval_cur = treeview.get_value(widget, 0)
|
||||
sql = (
|
||||
"SELECT ddtext, ddshort, sort, color, flags "
|
||||
@@ -797,5 +809,6 @@ class BaseView(View):
|
||||
self.check['dd_fixed'].set_active('fixed' in flags)
|
||||
self.check['dd_locked'].set_active('locked' in flags)
|
||||
|
||||
self.button['list_delete'].set_sensitive(not 'fixed' in flags)
|
||||
self.button['list_save'].set_sensitive(True)
|
||||
self.dd_newrecord = False
|
||||
Reference in new issue
Block a user