Implement record locking for native gui
This commit is contained in:
1 parent
1a6674c819
commit
669c15109a
16 files changed
+162
-66
No files matched your search
+30
-12
@@ -2,6 +2,7 @@
|
||||
|
||||
import os
|
||||
from gi.repository import Gtk
|
||||
from dateutil.parser import parse
|
||||
|
||||
from .view import View
|
||||
from yms import gtkutils, combobox, treeview
|
||||
@@ -51,6 +52,9 @@ class MeasurementView(View):
|
||||
treeview.add_column(self.tree['measurement'], _('Note'), 5)
|
||||
self.tree['measurement'].set_model(self.lst_measurement)
|
||||
|
||||
self.entry['date'].set_placeholder_text(context.get_datefmt_placeholder())
|
||||
DatePicker(self.entry['date'], self.button['date'], context.get_datefmt())
|
||||
|
||||
def load_list(self):
|
||||
selected_id = treeview.get_value(self.tree['measurement'])
|
||||
self.lst_measurement.clear()
|
||||
@@ -64,12 +68,13 @@ class MeasurementView(View):
|
||||
self.db.dcur.execute(sql, (self.context.vessel.vid,))
|
||||
selection = self.tree['measurement'].get_selection()
|
||||
for row in self.db.dcur.fetchall():
|
||||
unit = self.dd_unit[row['unit']]
|
||||
if row['nval'] == 1:
|
||||
value = "{} {}".format(row['val1'], row['unit'])
|
||||
value = "{} {}".format(row['val1'], unit)
|
||||
elif row['nval'] == 2:
|
||||
value = "{}x{} {}".format(row['val1'], row['val2'], row['unit'])
|
||||
value = "{}x{} {}".format(row['val1'], row['val2'], unit)
|
||||
elif row['nval'] == 3:
|
||||
value = "{}x{}x{} {}".format(row['val1'], row['val2'], row['val3'], row['unit'])
|
||||
value = "{}x{}x{} {}".format(row['val1'], row['val2'], row['val3'], unit)
|
||||
else:
|
||||
#invalid
|
||||
value = "#invalid"
|
||||
@@ -82,7 +87,7 @@ class MeasurementView(View):
|
||||
row['note'] or ''
|
||||
)
|
||||
treeiter = self.lst_measurement.append(data)
|
||||
if row[0] == selected_id:
|
||||
if row['mid'] == selected_id:
|
||||
# restore previous selected row
|
||||
selection.select_iter(treeiter)
|
||||
|
||||
@@ -120,7 +125,7 @@ class MeasurementView(View):
|
||||
self.label['unit'].set_text(self.dd_unit.get(self.measure.unit, ''))
|
||||
self.label['accuracy'].set_text(self.dd_accuracy[self.measure.accuracy])
|
||||
self.label['date'].set_text(self.format_date(self.measure.mdate))
|
||||
self.label['category'].set_text(self.dd_category[self.measure.mcat])
|
||||
self.label['category'].set_text(self.dd_category.get(self.measure.mcat, ''))
|
||||
self.label['note'].set_text(self.measure.note or '')
|
||||
|
||||
def edit_record(self):
|
||||
@@ -140,10 +145,10 @@ class MeasurementView(View):
|
||||
self.spin['val3'].set_value(self.measure.val3)
|
||||
combobox.activate_row(self.combo['unit'], self.measure.unit or 1)
|
||||
combobox.activate_row(self.combo['accuracy'], self.measure.accuracy)
|
||||
self.entry['date'].set_text(self.measure.mdate)
|
||||
self.entry['date'].set_text(self.format_date(self.measure.mdate))
|
||||
combobox.activate_row(self.combo['equipment'], self.measure.eid)
|
||||
combobox.activate_row(self.combo['category'], self.measure.mcat)
|
||||
self.text['note'].get_buffer().set_text(self.task.note or '')
|
||||
self.text['note'].get_buffer().set_text(self.measure.note or '')
|
||||
self.entry['name'].grab_focus()
|
||||
|
||||
self.label['edit_val2'].set_visible(self.measure.nval > 1)
|
||||
@@ -153,15 +158,24 @@ class MeasurementView(View):
|
||||
|
||||
def save_record(self):
|
||||
# fields must have been validated beforehand
|
||||
self.measure.vid = self.context.vessel.vid
|
||||
self.measure.mname = self.entry['name'].get_text()
|
||||
self.measure.nval = combobox.get_list_value(self.combo['dimensions'])
|
||||
self.measure.val1 = self.spin['val1'].get_value_as_int()
|
||||
self.measure.val2 = self.spin['val2'].get_value_as_int()
|
||||
self.measure.val3 = self.spin['val3'].get_value_as_int()
|
||||
self.measure.unit = combobox.get_list_value(self.combo['unit'])
|
||||
self.measure.accuracy = combobox.get_list_value(self.combo['accuracy'])
|
||||
self.measure.mdate = self.entry['date'].get_text()
|
||||
try:
|
||||
self.measure.mdate = parse(self.entry['date'].get_text(), dayfirst=True)
|
||||
except ValueError:
|
||||
self.measure.mdate = None
|
||||
self.measure.eid = combobox.get_list_value(self.combo['equipment'])
|
||||
if self.measure.eid == -1:
|
||||
self.measure.eid = None
|
||||
self.measure.mcat = combobox.get_list_value(self.combo['category'])
|
||||
if self.measure.mcat == -1:
|
||||
self.measure.mcat = None
|
||||
self.measure.note = gtkutils.get_text_contents(self.text['note'])
|
||||
|
||||
# buttons on list page
|
||||
@@ -172,11 +186,13 @@ class MeasurementView(View):
|
||||
self.topwidget.set_visible_child(self.box['measure_edit'])
|
||||
|
||||
def on_but_edit_clicked(self, widget):
|
||||
self.newrecord = False
|
||||
self.label['title_edit'].set_text(_("Edit Measurement"))
|
||||
mid = treeview.get_value(self.tree['measurement'], 0)
|
||||
if not mid:
|
||||
return
|
||||
self.newrecord = False
|
||||
self.label['title_edit'].set_text(_("Edit Measurement"))
|
||||
if not self.record_lock('measurement', mid):
|
||||
return
|
||||
self.measure.load(mid)
|
||||
self.edit_record()
|
||||
self.topwidget.set_visible_child(self.box['measure_edit'])
|
||||
@@ -233,13 +249,15 @@ class MeasurementView(View):
|
||||
self.infobar.set_revealed(False)
|
||||
self.save_record()
|
||||
print(self.measure)
|
||||
self.measure.save()
|
||||
if not self.measure.save():
|
||||
pass
|
||||
self.record_unlock()
|
||||
if self.newrecord:
|
||||
self.load_list()
|
||||
self.newrecord = False
|
||||
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['measure_detail'])
|
||||
|
||||
def on_but_cancel_clicked(self, widget):
|
||||
self.record_unlock()
|
||||
self.topwidget.set_visible_child(self.box['measurement'])
|
||||
Reference in new issue
Block a user