Native gui first steps: storage, box and companies are editable

This commit is contained in:
thooge committed 2026-10-21 17:16:55 +02:00
1 parent 1eea4058bf
commit 06a9834688
47 files changed
+3119 -883

No files matched your search

+6
View File
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
class Box(DbRecord):
@@ -12,3 +13,8 @@ class Box(DbRecord):
def __init__(self, db, boxid=None):
super().__init__(db, boxid)
self.title = _("Box({})")
def save(self, commit=True):
super().save(Table.BOXES)
if commit:
self.conn.commit()
+6
View File
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
class Cable(DbRecord):
@@ -13,3 +14,8 @@ class Cable(DbRecord):
def __init__(self, db, cableid=None):
super().__init__(db, cableid)
self.title = _("Cable({})")
def save(self, commit=True):
super().save(Table.CABLES)
if commit:
self.conn.commit()
+12
View File
@@ -1,6 +1,13 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
# names for fixed dropdown values
SUPPLIER = 1
MANUFACTURER = 2
SHIPYARD = 3
MISC = 9
class Company(DbRecord):
@@ -13,3 +20,8 @@ class Company(DbRecord):
def __init__(self, db, compid=None):
super().__init__(db, compid)
self.title = _("Company({})")
def save(self, commit=True):
super().save(Table.COMPANIES)
if commit:
self.conn.commit()
+12 -3
View File
@@ -62,12 +62,21 @@ class DbRecord:
self.clear()
return False
def save(self):
def save(self, rev_id=None):
self.last_update = datetime.now()
if self.pk_value is not None:
return self._update()
ret = self._update()
else:
return self._insert()
ret = self._insert()
if ret == True and rev_id is not None:
# set list change marker
sql = (
"INSERT INTO revision (revtype, revid, changed) "
"VALUES ('table', %s, NOW()) "
"ON DUPLICATE KEY UPDATE changed = NOW()"
)
self.cur.execute(sql, (rev_id,))
return ret
def _update(self):
sqlfield = []
+7 -1
View File
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
class Equipment(DbRecord):
@@ -8,8 +9,13 @@ class Equipment(DbRecord):
pk_field = "eid"
fields = ('eid', 'vid', 'ename', 'shortname', 'model', 'ecat', 'serial',
'supplier', 'manufacturer', 'purchdate', 'price', 'weight', 'remarks',
'flags')
'econd', 'flags')
def __init__(self, db, eid=None):
super().__init__(db, eid)
self.title = _("Equipment({})")
def save(self, commit=True):
super().save(Table.EQUIPMENT)
if commit:
self.conn.commit()
+6
View File
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
class Fuse(DbRecord):
@@ -12,3 +13,8 @@ class Fuse(DbRecord):
def __init__(self, db, fuseid=None):
super().__init__(db, fuseid)
self.title = _("Fuse({})")
def save(self, commit=True):
super().save(Table.FUSES)
if commit:
self.conn.commit()
+6
View File
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
class Project(DbRecord):
@@ -12,3 +13,8 @@ class Project(DbRecord):
def __init__(self, db, projid=None):
super().__init__(db, projid)
self.title = _("Project({})")
def save(self, commit=True):
super().save(Table.PROJECTS)
if commit:
self.conn.commit()
+8 -2
View File
@@ -1,6 +1,12 @@
# SPDX-License-Identifier: WTFPL
from .dbrecord import DbRecord
from yms.lookup import Table
# names for fixed dropdown values
GENERIC = 0
TANK = 1
EXT = 2
class Storage(DbRecord):
@@ -14,10 +20,10 @@ class Storage(DbRecord):
self.title = _("Storage({})")
def save(self, commit=True):
super().save()
super().save(Table.STORAGE)
if commit:
self.conn.commit()
def delete(self):
# there must be no assiciated data!
# there must be no associated data!
pass
+14
View File
@@ -104,6 +104,13 @@ class User(object):
# create mandatory settings
sql = "INSERT INTO settings (userid, sno, valint) VALUES (%s, 1, 0)"
self.cur.execute(sql, (newid,))
# set list change marker
sql = (
"INSERT INTO revision (revtype, revid, changed) "
"VALUES ('table', 2, NOW()) "
"ON DUPLICATE KEY UPDATE changed = NOW()"
)
self.db.cur.execute()
self.conn.commit()
return newid
@@ -112,6 +119,13 @@ class User(object):
self.cur.execute(sql, (self.user_id,))
sql = "DELETE FROM user WHERE userid=%s"
self.cur.execute(sql, (self.user_id,))
# set list change marker
sql = (
"INSERT INTO revision (revtype, revid, changed) "
"VALUES ('table', 2, NOW()) "
"ON DUPLICATE KEY UPDATE changed = NOW()"
)
self.db.cur.execute()
self.conn.commit()
def setpass(self, newpass):
+17 -3
View File
@@ -6,8 +6,8 @@ class Vessel(DbRecord):
table = "vessel"
pk_field = "vid"
fields = ('vid', 'vtype', 'vesselname', 'model', 'shipyard', 'loa', 'lwl',
'beam', 'draught', 'draught_min', 'displacement', 'ballast',
fields = ('vid', 'vtype', 'htype', 'vesselname', 'model', 'shipyard', 'hull_number',
'loa', 'lwl', 'beam', 'draught', 'draught_min', 'displacement', 'ballast',
'beltpos_aft', 'beltpos_bow', 'shapefile', 'sid_default', 'year_built',
'remarks')
@@ -32,8 +32,15 @@ class Vessel(DbRecord):
self.clear()
self.vid = self.pk_value
self.vesselname = f"Vessel #{self.pk_value}"
self.vtype = 1 # monohull
self.htype = 'mono'
self._insert()
# set list change marker
sql = (
"INSERT INTO revision (revtype, revid, changed) "
"VALUES ('table', 1, NOW()) "
"ON DUPLICATE KEY UPDATE changed = NOW()"
)
self.db.cur.execute()
self.conn.commit()
def save(self, commit=True):
@@ -44,3 +51,10 @@ class Vessel(DbRecord):
def delete(self):
# there must be no assiciated data!
pass
# set list change marker
sql = (
"INSERT INTO revision (revtype, revid, changed) "
"VALUES ('table', 1, NOW()) "
"ON DUPLICATE KEY UPDATE changed = NOW()"
)
self.db.cur.execute()