diff --git a/yms/model/vessel.py b/yms/model/vessel.py index 85a1344..818edcd 100644 --- a/yms/model/vessel.py +++ b/yms/model/vessel.py @@ -40,7 +40,7 @@ class Vessel(DbRecord): "VALUES ('table', 1, NOW()) " "ON DUPLICATE KEY UPDATE changed = NOW()" ) - self.db.cur.execute() + self.db.cur.execute(sql) self.conn.commit() def save(self, commit=True): diff --git a/yms/ui/icons/appointment.svg b/yms/ui/icons/appointment.svg new file mode 100644 index 0000000..43e8a05 --- /dev/null +++ b/yms/ui/icons/appointment.svg @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yms/view/boxes.py b/yms/view/boxes.py index 01f4d31..9c1e88e 100644 --- a/yms/view/boxes.py +++ b/yms/view/boxes.py @@ -32,6 +32,10 @@ class BoxesView(View): self.dd_boxtype = self.context.lookup.dropdown(Dropdown.BOX_TYPE) combobox.load_from_dict(self.combo['type'], {-1: _("─── none ───")} | self.dd_boxtype) + # subscribe to data change events + self.context.subscribe("storage_added", self.storage_added) + self.context.subscribe("storage_changed", self.storage_changed) + def load_list(self): selected_id = treeview.get_value(self.tree['box']) self.lst_box.clear() @@ -49,6 +53,19 @@ class BoxesView(View): # restore previous selected row selection.select_iter(treeiter) + def storage_added(self, data): + self.dd_storage.append(data) + lst = self.combo['storage'].get_model() + lst.append(data) + + def storage_changed(self, data): + self.dd_storage[data[0]] = data[1] + lst = self.combo['storage'].get_model() + for row in lst: + if row[0] == data[0]: + row[1] = data[1] + return + def clear_record(self): self.entry['label'].set_text('') combobox.activate_row(self.combo['storage'], 0) diff --git a/yms/view/companies.py b/yms/view/companies.py index fda09e1..29c4b88 100644 --- a/yms/view/companies.py +++ b/yms/view/companies.py @@ -53,6 +53,7 @@ class CompaniesView(View): selection.select_iter(treeiter) def clear_record(self): + self.comp.clear() self.entry['compname'].set_text('') self.entry['shortname'].set_text('') self.entry['street'].set_text('') diff --git a/yms/view/storage.py b/yms/view/storage.py index 998d517..70afd73 100644 --- a/yms/view/storage.py +++ b/yms/view/storage.py @@ -189,9 +189,10 @@ class StorageView(View): self.storage.save() if self.newrecord: self.load_list() + self.context.publish("storage_added", (self.storage.pk_value, self.storage.sname)) self.newrecord = False else: - pass + self.context.publish("storage_changed", (self.storage.pk_value, self.storage.sname)) # TODO aktuelle Listenzeile aktualisieren! self.display_record() self.topwidget.set_visible_child(self.box['stor_detail']) diff --git a/ymsgui.py b/ymsgui.py index e60a8d0..12b5216 100755 --- a/ymsgui.py +++ b/ymsgui.py @@ -100,6 +100,8 @@ class AppContext: self.curr_sym = '€' self.img_max_width = 1024 self.img_max_height = 768 + # event system + self.callbacks = {} def set_db(self, db): self.db = db @@ -125,6 +127,13 @@ class AppContext: self.lookup.load() self.init_scanner() + def subscribe(self, event, callback): + self.callbacks.setdefault(event, []).append(callback) + + def publish(self, event, data=None): + for callback in self.callbacks.get(event, []): + callback(data) + def init_scanner(self): self.scan_enabled = False if not self.cfg['scanner']: