Work on localization and some small fixes
This commit is contained in:
1 parent
3a43f749f5
commit
ee947b772f
6 files changed
+1190
-289
No files matched your search
+83
-6
@@ -111,13 +111,19 @@ class Lookup:
|
||||
'task.priority': ('task', 'priority'),
|
||||
'task.taskstate': ('task', 'taskstate'),
|
||||
'user.role': ('user', 'role'),
|
||||
'vessel.vtype': ('vessel', 'vtype')
|
||||
'vessel.htype': ('vessel', 'htype')
|
||||
}
|
||||
for key, (table, column) in db_enums.items():
|
||||
self._enums[key] = self.db.load_enum(table, column)
|
||||
|
||||
def _load_dropdowns(self):
|
||||
self._dropdowns.clear()
|
||||
sql = "SELECT ddval FROM dropdown WHERE ddid=0 AND ddval>0"
|
||||
# Step 1: init all lists as empty
|
||||
self.db.cur.execute(sql)
|
||||
for ddval in self.db.cur.fetchall():
|
||||
self._dropdowns[ddval[0]] = {}
|
||||
# Step 2: fill values where defined
|
||||
sql = (
|
||||
"SELECT ddid, ddval, ddtext "
|
||||
"FROM dropdown "
|
||||
@@ -127,6 +133,8 @@ class Lookup:
|
||||
self.db.cur.execute(sql)
|
||||
for ddid, ddval, ddtext in self.db.cur.fetchall():
|
||||
if ddid not in self._dropdowns:
|
||||
# should really not happen!
|
||||
print("unknown dropdown list id found!")
|
||||
self._dropdowns[ddid] = {}
|
||||
self._dropdowns[ddid][ddval] = ddtext
|
||||
|
||||
@@ -137,12 +145,81 @@ class Lookup:
|
||||
return self._dropdowns[ddid]
|
||||
|
||||
def user(self):
|
||||
userlist = {}
|
||||
sql = "SELECT userid, displayname FROM user ORDER BY displayname"
|
||||
self.db.cur.execute(sql)
|
||||
self.db.cur.execute("SELECT userid, displayname FROM user ORDER BY displayname")
|
||||
return dict(self.db.cur.fetchall())
|
||||
|
||||
def vessel(self):
|
||||
vessellist = {}
|
||||
self.db.dcur.execute("SELECT vid, vesselname, model FROM vessel ORDER BY vid")
|
||||
for row in self.db.dcur.fetchall():
|
||||
vessellist[row['vid']] = (
|
||||
row['vesselname'] + " - " + row['model'] if row['model']
|
||||
else row['vesselname']
|
||||
)
|
||||
return vessellist
|
||||
|
||||
def company(self, comptype):
|
||||
sql = (
|
||||
"SELECT compid, compname "
|
||||
"FROM company "
|
||||
"WHERE comptype=%(type)s OR comptype2=%(type)s "
|
||||
"ORDER BY compname"
|
||||
)
|
||||
self.db.cur.execute(sql, {"type": comptype})
|
||||
return dict(self.db.cur.fetchall())
|
||||
|
||||
def storage(self, vid):
|
||||
storagelist = {}
|
||||
sql = (
|
||||
"SELECT sid, sname, CONCAT(x, ',', y, ',', z) AS position, remarks "
|
||||
"FROM storage "
|
||||
"WHERE vid=%s "
|
||||
"ORDER BY sname"
|
||||
)
|
||||
self.db.cur.execute(sql, (vid,))
|
||||
for row in self.db.cur.fetchall():
|
||||
userlist[row[0]] = row[1]
|
||||
return userlist
|
||||
storagelist[row[0]] = "{} ({}) - {}".format(row[1], row[2], row[3])
|
||||
return storagelist
|
||||
|
||||
def equipment(self, vid):
|
||||
sql = (
|
||||
"SELECT eid, ename "
|
||||
"FROM equipment "
|
||||
"WHERE vid=%s "
|
||||
"ORDER BY ename"
|
||||
)
|
||||
self.db.cur.execute(sql, (vid,))
|
||||
return dict(self.db.cur.fetchall())
|
||||
|
||||
def inventory(self, vid):
|
||||
sql = (
|
||||
"SELECT invid, invname "
|
||||
"FROM inventory "
|
||||
"WHERE vid=%s "
|
||||
"ORDER BY invname"
|
||||
)
|
||||
self.db.cur.execute(sql, (vid,))
|
||||
return dict(self.db.cur.fetchall())
|
||||
|
||||
def cable(self, vid):
|
||||
sql = (
|
||||
"SELECT cableid, cablename "
|
||||
"FROM cable "
|
||||
"WHERE vid=%s "
|
||||
"ORDER BY cablename"
|
||||
)
|
||||
self.db.cur.execute(sql, (vid,))
|
||||
return dict(self.db.cur.fetchall())
|
||||
|
||||
def fuse(self, vid):
|
||||
sql = (
|
||||
"SELECT fuseid, CONCAT('F', fnumber, ' - ', description) "
|
||||
"FROM fuse "
|
||||
"WHERE vid=%s "
|
||||
"ORDER BY fnumber"
|
||||
)
|
||||
self.db.cur.execute(sql, (vid,))
|
||||
return dict(self.db.cur.fetchall())
|
||||
|
||||
def refresh(self):
|
||||
# TODO ugly hack please improve
|
||||
|
||||
@@ -145,5 +145,9 @@ class DbRecord:
|
||||
out = [self._title.format(self.pk_value)]
|
||||
for field in self.fields:
|
||||
value = getattr(self, field, None)
|
||||
out.append(" {:15}: {}".format(field, value))
|
||||
oldvalue = self.data[field]
|
||||
if value != oldvalue:
|
||||
out.append(" {:15}: {} ({})".format(field, value, oldvalue))
|
||||
else:
|
||||
out.append(" {:15}: {}".format(field, value))
|
||||
return "\n".join(out)
|
||||
Reference in new issue
Block a user