From db74fb69704fd02e723ecd61ed3cacd2a0e62ef8 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Thu, 12 Nov 2026 19:34:59 +0100 Subject: [PATCH] Fixed vessel change code in native gui --- debian/copyright | 27 +++++++++++++++++++++ yms/ui/projects.ui | 3 +++ yms/view/base.py | 53 +++++++++++++++++++++++++---------------- yms/view/boxes.py | 6 +++++ yms/view/cables.py | 40 +++++++++++++++++++++++++------ yms/view/companies.py | 1 - yms/view/equipment.py | 26 ++++++++++++++++++++ yms/view/fuses.py | 6 +++++ yms/view/inventory.py | 6 +++++ yms/view/maintenance.py | 8 +++++++ yms/view/measurement.py | 7 ++++++ yms/view/projects.py | 8 +++++++ yms/view/provisions.py | 6 +++++ yms/view/status.py | 10 ++++---- yms/view/storage.py | 8 +++++++ yms/view/tasks.py | 10 +++++++- 16 files changed, 192 insertions(+), 33 deletions(-) create mode 100644 debian/copyright diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..0b38853 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: YMS +Upstream-Contact: Thomas Hooge +Source: https://git.hoogi.de/thooge/YMS + +Files: * +Copyright: 2020-2026 Thomas Hooge +License: WTFPL-2 + +Files: debian/* +Copyright: 2020-2026 Thomas Hooge +License: WTFPL-2 + +License: WTFPL-2 + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + Version 2, December 2004 + + Copyright (C) 2004 Sam Hocevar + + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/yms/ui/projects.ui b/yms/ui/projects.ui index a064c61..8fd7785 100644 --- a/yms/ui/projects.ui +++ b/yms/ui/projects.ui @@ -377,6 +377,9 @@ False Remarks 0 + 0 diff --git a/yms/view/base.py b/yms/view/base.py index a612c8a..f559193 100644 --- a/yms/view/base.py +++ b/yms/view/base.py @@ -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 diff --git a/yms/view/boxes.py b/yms/view/boxes.py index 8385e93..0c09b5d 100644 --- a/yms/view/boxes.py +++ b/yms/view/boxes.py @@ -35,6 +35,7 @@ class BoxesView(View): # subscribe to data change events self.context.subscribe("storage_modified", self.storage_modified) self.context.subscribe("dd_boxtype_modified", self.boxtype_modified) + self.context.subscribe("vessel_modified", self.vessel_modified) def get_list_row(self): return ( @@ -96,6 +97,11 @@ class BoxesView(View): # not implemented pass + def vessel_modified(self, eventtype, data): + self.tree['box'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['box']) + def clear_record(self): self.entry['label'].set_text('') combobox.activate_row(self.combo['storage'], 1) diff --git a/yms/view/cables.py b/yms/view/cables.py index ea7bc20..d1b0ada 100644 --- a/yms/view/cables.py +++ b/yms/view/cables.py @@ -29,8 +29,8 @@ class CablesView(View): self.dd_type = self.context.lookup.dropdown(Dropdown.CABLE_TYPE) combobox.load_from_dict(self.combo['type'], {-1: _("─── none ───")} | self.dd_type) # Cable tech type - self.dd_tech = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME) - combobox.load_from_dict(self.combo['techname'], {-1: _("─── none ───")} | self.dd_tech) + self.dd_techname = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME) + combobox.load_from_dict(self.combo['techname'], {-1: _("─── none ───")} | self.dd_techname) # Supplier self.dd_supplier = self.context.lookup.company(1) combobox.load_from_dict(self.combo['supplier'], {-1: _("─── none ───")} | self.dd_supplier) @@ -42,8 +42,10 @@ class CablesView(View): combobox.load_from_dict(self.combo['condition'], self.dd_condition, 'unknown') # subscribe to data change events - #self.context.subscribe("dd_type_modified", self.type_modified) - #self.context.subscribe("dd_techname_modified", self.techname_modified) + self.context.subscribe("dd_cabletype_modified", self.type_modified) + self.context.subscribe("dd_techname_modified", self.techname_modified) + self.context.subscribe("company_modified", self.company_modified) + self.context.subscribe("vessel_modified", self.vessel_modified) def get_list_row(self): return ( @@ -111,6 +113,30 @@ class CablesView(View): # not implemented pass + def company_modified(self, eventtype, data): + if data[1] == 1: + # supplier + self.dd_supplier[data[0]] = data[2] + lst = self.combo['supplier'].get_model() + elif data[1] == 2: + # manufacturer + self.dd_manufacturer[data[0]] = data[2] + lst = self.combo['manufacturer'].get_model() + else: + # all other + return + if eventtype == self.context.EVENT_UPD: + for row in lst: + if row[0] == data[0]: + row[1] = data[2] + elif eventtype == self.context.EVENT_ADD: + lst.append((data[0], data[2])) + + def vessel_modified(self, eventtype, data): + self.tree['cables'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['cables']) + def display_record(self): self.label['name'].set_text(self.cable.cablename or '') if self.cable.cabletype: @@ -118,7 +144,7 @@ class CablesView(View): else: self.label['type'].set_text('') if self.cable.techname: - self.label['techname'].set_text(self.dd_tech[self.cable.techname]) + self.label['techname'].set_text(self.dd_techname[self.cable.techname]) else: self.label['techname'].set_text('') self.label['length'].set_text(self.format_float(self.cable.length, suffix="m")) @@ -130,8 +156,8 @@ class CablesView(View): self.label['color'].set_markup(f'#{self.cable.color} ●') else: self.label['color'].set_text('') - self.label['supplier'].set_text(str(self.cable.supplier)) - self.label['manufacturer'].set_text(str(self.cable.manufacturer)) + self.label['supplier'].set_text(self.dd_supplier.get(self.cable.supplier, '-')) + self.label['manufacturer'].set_text(self.dd_manufacturer.get(self.cable.manufacturer, '-')) self.label['condition'].set_text(self.cable.cablecond) self.label['remarks'].set_text(self.cable.remarks or '') diff --git a/yms/view/companies.py b/yms/view/companies.py index f529c79..764b980 100644 --- a/yms/view/companies.py +++ b/yms/view/companies.py @@ -230,7 +230,6 @@ class CompaniesView(View): pass self.record_unlock() if self.newrecord: - #self.load_list() self.add_row() self.context.publish("company_modified", self.context.EVENT_ADD, (self.comp.pk_value, self.comp.comptype, self.comp.compname) diff --git a/yms/view/equipment.py b/yms/view/equipment.py index 4e5d8b9..052f145 100644 --- a/yms/view/equipment.py +++ b/yms/view/equipment.py @@ -49,6 +49,8 @@ class EquipmentView(View): # subscribe to data change events self.context.subscribe("dd_ecat_modified", self.category_modified) + self.context.subscribe("company_modified", self.company_modified) + self.context.subscribe("vessel_modified", self.vessel_modified) def get_list_row(self): return ( @@ -89,6 +91,11 @@ class EquipmentView(View): def on_page_activated(self): print("Equipment activated") + def vessel_modified(self, eventtype, data): + self.tree['equipment'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['equipment']) + def category_modified(self, eventtype, data): self.dd_category[data[0]] = data[1] lst = self.combo['category'].get_model() @@ -103,6 +110,25 @@ class EquipmentView(View): # not implemented pass + def company_modified(self, eventtype, data): + if data[1] == 1: + # supplier + self.dd_supplier[data[0]] = data[2] + lst = self.combo['supplier'].get_model() + elif data[1] == 2: + # manufacturer + self.dd_manufacturer[data[0]] = data[2] + lst = self.combo['manufacturer'].get_model() + else: + # all other + return + if eventtype == self.context.EVENT_UPD: + for row in lst: + if row[0] == data[0]: + row[1] = data[2] + elif eventtype == self.context.EVENT_ADD: + lst.append((data[0], data[2])) + def clear_record(self): self.equip.clear() self.entry['name'].set_text('') diff --git a/yms/view/fuses.py b/yms/view/fuses.py index 755f576..ab7264c 100644 --- a/yms/view/fuses.py +++ b/yms/view/fuses.py @@ -43,6 +43,7 @@ class FusesView(View): self.context.subscribe("cable_modified", self.cable_modified) self.context.subscribe("dd_ftype_modified", self.ftype_modified) self.context.subscribe("dd_location_modified", self.location_modified) + self.context.subscribe("vessel_modified", self.vessel_modified) def get_list_row(self): return ( @@ -138,6 +139,11 @@ class FusesView(View): # not implemented pass + def vessel_modified(self, eventtype, data): + self.tree['fuses'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['fuses']) + def clear_record(self): self.fuse.clear() self.spin['fnumber'].set_value(0) diff --git a/yms/view/inventory.py b/yms/view/inventory.py index 4c92ff9..538e488 100644 --- a/yms/view/inventory.py +++ b/yms/view/inventory.py @@ -60,6 +60,7 @@ class InventoryView(View): 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) + self.context.subscribe("vessel_modified", self.vessel_modified) def load_list(self): selected_id = treeview.get_value(self.tree['inventory']) @@ -133,6 +134,11 @@ class InventoryView(View): # not implemented pass + def vessel_modified(self, eventtype, data): + self.tree['inventory'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['inventory']) + def on_page_activated(self): print("Inventory activated") diff --git a/yms/view/maintenance.py b/yms/view/maintenance.py index 380da7a..fe858a0 100644 --- a/yms/view/maintenance.py +++ b/yms/view/maintenance.py @@ -44,6 +44,9 @@ class MaintenanceView(View): self.entry['completion'].set_placeholder_text(context.get_datefmt_placeholder()) self.dt_completion = DatePicker(self.entry['completion'], self.button['completion'], context.get_datefmt()) + # subscribe to data change events + self.context.subscribe("vessel_modified", self.vessel_modified) + def get_list_row(self): return ( self.maint.maintid, @@ -76,6 +79,11 @@ class MaintenanceView(View): # restore previous selected row selection.select_iter(treeiter) + def vessel_modified(self, eventtype, data): + self.tree['maintenance'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['maintenance']) + def clear_record(self): self.maint.clear() self.entry['activities'].set_text('') diff --git a/yms/view/measurement.py b/yms/view/measurement.py index 5ef3db1..993bdc0 100644 --- a/yms/view/measurement.py +++ b/yms/view/measurement.py @@ -55,9 +55,11 @@ class MeasurementView(View): self.entry['date'].set_placeholder_text(context.get_datefmt_placeholder()) DatePicker(self.entry['date'], self.button['date'], context.get_datefmt()) + # subscribe to data change events self.context.subscribe("dd_mcat_modified", self.category_modified) self.context.subscribe("dd_unit_modified", self.unit_modified) self.context.subscribe("equipment_modified", self.equipment_modified) + self.context.subscribe("vessel_modified", self.vessel_modified) def get_list_row(self): unit = self.dd_unit[self.measure.unit] @@ -165,6 +167,11 @@ class MeasurementView(View): # not implemented pass + def vessel_modified(self, eventtype, data): + self.tree['measurement'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['measurement']) + def clear_record(self): self.measure.clear() self.entry['name'].set_text('') diff --git a/yms/view/projects.py b/yms/view/projects.py index 0d158c6..c1c60d2 100644 --- a/yms/view/projects.py +++ b/yms/view/projects.py @@ -40,6 +40,9 @@ class ProjectsView(View): self.entry['date_start'].set_placeholder_text(context.get_datefmt_placeholder()) DatePicker(self.entry['date_start'], self.button['date_start'], context.get_datefmt()) + # subscribe to data change events + self.context.subscribe("vessel_modified", self.vessel_modified) + def get_list_row(self): return ( self.project.projid, @@ -82,6 +85,11 @@ class ProjectsView(View): # restore previous selected row selection.select_iter(treeiter) + def vessel_modified(self, eventtype, data): + self.tree['projects'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['projects']) + def clear_record(self): self.project.clear() self.entry['name'].set_text('') diff --git a/yms/view/provisions.py b/yms/view/provisions.py index d99bb80..8700467 100644 --- a/yms/view/provisions.py +++ b/yms/view/provisions.py @@ -54,6 +54,7 @@ class ProvisionsView(View): self.context.subscribe("box_modified", self.box_modified) self.context.subscribe("dd_provcat_modified", self.category_modified) self.context.subscribe("dd_provunit_modified", self.unit_modified) + self.context.subscribe("vessel_modified", self.vessel_modified) def get_list_row(self): return ( @@ -149,6 +150,11 @@ class ProvisionsView(View): # not implemented pass + def vessel_modified(self, eventtype, data): + self.tree['provisions'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['provisions']) + def clear_record(self): self.prov.clear() self.entry['name'].set_text('') diff --git a/yms/view/status.py b/yms/view/status.py index edc989f..6175b74 100644 --- a/yms/view/status.py +++ b/yms/view/status.py @@ -57,9 +57,11 @@ class StatusView: def vessel_modified(self, eventtype, data): print(f"Vessel changed. New ID={data[0]}") self.load_svg() + #? self.area['status'].queue_draw() def load_svg(self): if not self.context.vessel.shapefile: + self.svg = None print("No Shapefile defined for current vessel") return shapefile = os.path.join(self.context.cfg['shapedir'], self.context.vessel.shapefile) @@ -111,13 +113,13 @@ class StatusView: print("No centerline with id='centerline' found!") def on_drw_status_draw(self, area, cr): - if self.context.vessel.pk_value is None: - # no vessel defined - return - cr.set_source_rgb(0.92, 0.97, 1.0) cr.paint() + if self.context.vessel.pk_value is None: + # no vessel defined, empty area + return False + if self.svg: allocation = area.get_allocation() scale_x = allocation.width / self.svg_width diff --git a/yms/view/storage.py b/yms/view/storage.py index 351d8f8..e0c12ec 100644 --- a/yms/view/storage.py +++ b/yms/view/storage.py @@ -34,6 +34,9 @@ class StorageView(View): self.dd_capaunit = self.context.lookup.enum('storage.capaunit') combobox.load_from_dict(self.combo['capaunit'], {"-1": _("─── none ───")} | self.dd_capaunit) + # subscribe to data change events + self.context.subscribe("vessel_modified", self.vessel_modified) + def get_list_row(self): return ( self.storage.sid, @@ -67,6 +70,11 @@ class StorageView(View): # restore previous selected row selection.select_iter(treeiter) + def vessel_modified(self, eventtype, data): + self.tree['storage'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['storage']) + def clear_record(self): self.storage.clear() self.entry['sname'].set_text('') diff --git a/yms/view/tasks.py b/yms/view/tasks.py index eedbd69..91a0762 100644 --- a/yms/view/tasks.py +++ b/yms/view/tasks.py @@ -49,6 +49,9 @@ class TasksView(View): self.entry['duedate'].set_placeholder_text(context.get_datefmt_placeholder()) self.dt_duedate = DatePicker(self.entry['duedate'], self.button['duedate'], context.get_datefmt()) + # subscribe to data change events + self.context.subscribe("vessel_modified", self.vessel_modified) + def get_list_row(self): return ( self.task.taskid, @@ -89,6 +92,11 @@ class TasksView(View): # restore previous selected row selection.select_iter(treeiter) + def vessel_modified(self, eventtype, data): + self.tree['tasks'].get_selection().unselect_all() + self.load_list() + self.topwidget.set_visible_child(self.box['tasks']) + def clear_record(self): self.task.clear() self.entry['name'].set_text('') @@ -117,7 +125,7 @@ class TasksView(View): def edit_record(self): self.entry['name'].set_text(self.task.taskname) - combobox.activate_row(self.combo['project'], self.task.projid) + combobox.activate_row(self.combo['project'], self.task.projid or -1) combobox.activate_row(self.combo['priority'], self.task.priority) self.entry['plandate'].set_text(self.format_date(self.task.plandate)) self.entry['duedate'].set_text(self.format_date(self.task.duedate))