Native gui make almost every data editable
This commit is contained in:
1 parent
b8ac8d0185
commit
1a6674c819
48 files changed
+2168
-737
No files matched your search
+81
-24
@@ -2,9 +2,12 @@
|
||||
|
||||
import os
|
||||
from gi.repository import Gtk
|
||||
from dateutil.parser import parse
|
||||
from datetime import datetime
|
||||
|
||||
from .view import View
|
||||
from .view import View, DatePicker
|
||||
from yms import gtkutils, combobox, treeview
|
||||
from yms.lookup import Dropdown
|
||||
from yms.model import maintenance
|
||||
|
||||
class MaintenanceView(View):
|
||||
@@ -16,15 +19,7 @@ class MaintenanceView(View):
|
||||
self.newrecord = False
|
||||
|
||||
self.lst_maintenance = Gtk.ListStore(int, str, str, str)
|
||||
sql = (
|
||||
"SELECT m.maintid, m.activities, e.ename, m.remarks "
|
||||
"FROM maintenance AS m LEFT OUTER JOIN equipment AS e USING (eid) "
|
||||
"WHERE m.vid=%s "
|
||||
"ORDER BY m.maintid"
|
||||
)
|
||||
self.db.cur.execute(sql, (context.vessel.vid,))
|
||||
for row in self.db.cur.fetchall():
|
||||
self.lst_maintenance.append(row)
|
||||
self.load_list()
|
||||
|
||||
treeview.add_column(self.tree['maintenance'], _('ID'), 0)
|
||||
treeview.add_column(self.tree['maintenance'], _('Activities'), 1)
|
||||
@@ -32,14 +27,49 @@ class MaintenanceView(View):
|
||||
treeview.add_column(self.tree['maintenance'], _('Remarks'), 3)
|
||||
self.tree['maintenance'].set_model(self.lst_maintenance)
|
||||
|
||||
# Equipment
|
||||
self.dd_equipment = self.context.lookup.equipment(context.vessel.vid)
|
||||
combobox.load_from_dict(self.combo['equipment'], {-1: _("─── none ───")} | self.dd_equipment)
|
||||
|
||||
# Plan date precision
|
||||
self.dd_precision = self.context.lookup.enum('maintenance.plan_precision')
|
||||
combobox.load_from_dict(self.combo['plan_precision'], self.dd_precision, 'month')
|
||||
|
||||
# Status
|
||||
self.dd_status = self.context.lookup.enum('maintenance.maintstate')
|
||||
combobox.load_from_dict(self.combo['status'], self.dd_status, 'new')
|
||||
|
||||
self.entry['plandate'].set_placeholder_text(context.get_datefmt_placeholder())
|
||||
self.dt_plandate = DatePicker(self.entry['plandate'], self.button['plandate'], context.get_datefmt())
|
||||
self.entry['completion'].set_placeholder_text(context.get_datefmt_placeholder())
|
||||
self.dt_completion = DatePicker(self.entry['completion'], self.button['completion'], context.get_datefmt())
|
||||
|
||||
def load_list(self):
|
||||
selected_id = treeview.get_value(self.tree['maintenance'])
|
||||
self.lst_maintenance.clear()
|
||||
sql = (
|
||||
"SELECT m.maintid, m.activities, e.ename, m.remarks "
|
||||
"FROM maintenance AS m LEFT OUTER JOIN equipment AS e USING (eid) "
|
||||
"WHERE m.vid=%s "
|
||||
"ORDER BY m.maintid"
|
||||
)
|
||||
self.db.cur.execute(sql, (self.context.vessel.vid,))
|
||||
selection = self.tree['maintenance'].get_selection()
|
||||
for row in self.db.cur.fetchall():
|
||||
treeiter = self.lst_maintenance.append(row)
|
||||
if row[0] == selected_id:
|
||||
# restore previous selected row
|
||||
selection.select_iter(treeiter)
|
||||
|
||||
def clear_record(self):
|
||||
self.maint.clear()
|
||||
self.entry['activities'].set_text('')
|
||||
combobox.activate_row(self.combo['equipment'], -1)
|
||||
self.spin['series'].set_value(0)
|
||||
self.spin['interval'].set_value(0)
|
||||
self.spin['last'].set_value(0)
|
||||
self.spin['series'].set_text('')
|
||||
self.spin['interval'].set_text('')
|
||||
self.spin['last_hours'].set_text('')
|
||||
self.entry['plandate'].set_text('')
|
||||
combobox.activate_row(self.combo['plan_precision'], 'month')
|
||||
self.entry['completion'].set_text('')
|
||||
combobox.activate_row(self.combo['status'], 'new')
|
||||
self.text['remarks'].get_buffer().set_text('')
|
||||
@@ -57,31 +87,49 @@ class MaintenanceView(View):
|
||||
self.label['remarks'].set_text(self.maint.remarks or '')
|
||||
|
||||
def edit_record(self):
|
||||
self.entry['activities'].set_text(self.maint.activities)
|
||||
combobox.activate_row(self.combo['equipment'], self.maint.eid)
|
||||
self.entry['activities'].set_text(self.maint.activities or '')
|
||||
combobox.activate_row(self.combo['equipment'], self.maint.eid or -1)
|
||||
self.spin['series'].set_value(self.maint.series or 0)
|
||||
self.spin['interval'].set_value(self.maint.interval_hours or 0)
|
||||
self.spin['last'].set_value(self.maint.last_hours or 0)
|
||||
self.entry['plandate'].set_text(self.maint.plan_date)
|
||||
self.entry['completion'].set_text(self.maint.completion_date)
|
||||
self.spin['last_hours'].set_value(self.maint.last_hours or 0)
|
||||
self.entry['plandate'].set_text(self.format_date(self.maint.plan_date))
|
||||
self.entry['completion'].set_text(self.format_date(self.maint.completion_date))
|
||||
combobox.activate_row(self.combo['status'], self.maint.maintstate)
|
||||
self.text['remarks'].get_buffer().set_text(self.maint.remarks or '')
|
||||
self.entry['activities'].grab_focus()
|
||||
|
||||
def save_record(self):
|
||||
# fields must have been validated beforehand
|
||||
self.maint.vid = self.context.vessel.vid
|
||||
self.maint.activities = self.entry['activities'].get_text()
|
||||
self.maint.eid = combobox.get_list_value(self.combo['equipment'])
|
||||
self.maint.series = int(self.spin['series'].get_value())
|
||||
self.maint.interval_hours = int(self.spin['interval'].get_value())
|
||||
self.maint.last_hours = int(self.spin['last'].get_value())
|
||||
self.maint.plan_date = self.entry['plandate'].get_text()
|
||||
self.maint.completion_date = self.entry['completion'].get_text()
|
||||
if self.maint.eid == -1:
|
||||
self.maint.eid = None
|
||||
self.maint.series = self.spin['series'].get_value_as_int()
|
||||
if self.maint.series == -1:
|
||||
self.maint.series = None
|
||||
self.maint.interval_hours = self.spin['interval'].get_value_as_int()
|
||||
if self.maint.interval_hours == 0:
|
||||
self.maint.interval_hours = None
|
||||
self.maint.last_hours = self.spin['last_hours'].get_value_as_int()
|
||||
if self.maint.last_hours == 0:
|
||||
self.maint.last_hours = None
|
||||
try:
|
||||
self.maint.plan_date = parse(self.entry['plandate'].get_text(), dayfirst=True)
|
||||
except ValueError:
|
||||
self.maint.plan_date = None
|
||||
try:
|
||||
self.maint.completion_date = parse(self.entry['completion'].get_text(), dayfirst=True)
|
||||
except ValueError:
|
||||
self.maint.completion_date = None
|
||||
self.maint.maintstate = combobox.get_list_value(self.combo['status'])
|
||||
self.maint.remarks = gtkutils.get_text_contents(self.text['remarks'])
|
||||
|
||||
# buttons on list page
|
||||
def on_but_new_clicked(self, widget):
|
||||
self.clear_record()
|
||||
self.newrecord = True
|
||||
print("New:Datefmt={}".format(self.context.datefmt))
|
||||
self.topwidget.set_visible_child(self.box['maint_edit'])
|
||||
|
||||
def on_but_edit_clicked(self, widget):
|
||||
@@ -132,7 +180,16 @@ class MaintenanceView(View):
|
||||
return
|
||||
self.save_record()
|
||||
print(self.maint)
|
||||
self.maint.save()
|
||||
if not self.maint.save():
|
||||
print("Save error")
|
||||
# TODO error in infobox
|
||||
print(self.context.db.last_error())
|
||||
return
|
||||
if self.newrecord:
|
||||
self.load_list()
|
||||
self.newrecord = False
|
||||
self.display_record()
|
||||
self.topwidget.set_visible_child(self.box['maint_detail'])
|
||||
|
||||
def on_but_cancel_clicked(self, widget):
|
||||
self.topwidget.set_visible_child(self.box['maintenance'])
|
||||
Reference in new issue
Block a user