thooge/YMS
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Webgui: More mobile friendly touch and much more improvements

Browse Source
This commit is contained in:
Thomas Hooge
2026-06-14 10:56:17 +02:00
parent a59f02e21b
commit f109e2621f
25 changed files with 1624 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/mariadb.sql
+29 -10
View File
@@ -8,7 +8,7 @@ CREATE TABLE user (
login varchar(20) NOT NULL,
pass binary(60) NOT NULL,
displayname varchar(100) NOT NULL,
role set('vessel', 'captain','helmsman','sailor') NOT NULL DEFAULT 'sailor',
role enum('vessel','captain','helmsman','sailor') NOT NULL DEFAULT 'sailor',
flags set('deleted','locked'),
language char(2) NOT NULL DEFAULT 'en',
PRIMARY KEY (userid),
@@ -48,7 +48,7 @@ CREATE TABLE dropdown (
ddtext varchar(50) NOT NULL,
ddshort varchar(4) DEFAULT NULL,
color char(6) DEFAULT NULL,
flags enum('locked', 'fixed') DEFAULT NULL,
flags enum('locked','fixed') DEFAULT NULL,
PRIMARY KEY (ddid, ddval)
);
@@ -77,13 +77,15 @@ CREATE TABLE storage (
sname varchar(40) NOT NULL,
stype tinyint(3) NOT NULL DEFAULT 0,
capacity smallint(6) DEFAULT NULL,
capaunit enum('kg', 'l') DEFAULT NULL,
capaunit enum('kg','l') DEFAULT NULL,
x smallint(6) UNSIGNED NOT NULL DEFAULT 0,
y smallint(6) NOT NULL DEFAULT 0,
z smallint(6) NOT NULL DEFAULT 0,
wx smallint(6) UNSIGNED NOT NULL DEFAULT 0,
wy smallint(6) UNSIGNED NOT NULL DEFAULT 0,
wz smallint(6) UNSIGNED NOT NULL DEFAULT 0,
angle smallint(4) NOT NULL DEFAULT 0,
color char(6) DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
PRIMARY KEY (sid)
);
@@ -137,7 +139,7 @@ CREATE TABLE equipment (
price decimal(12,2) DEFAULT NULL,
weight float(5,2) UNSIGNED DEFAULT NULL,
remarks varchar(150) DEFAULT NULL,
flags set('ordered','deleted') DEFAULT NULL,
flags set('ordered','removed','deleted') DEFAULT NULL,
PRIMARY KEY(eid)
);
@@ -157,16 +159,19 @@ CREATE TABLE inventory (
PRIMARY KEY (invid),
INDEX ix_invname (invname)
);
/*
TODO: unit -> unit1, unit2, unit3
*/
CREATE TABLE measurement (
mid smallint(6) NOT NULL AUTO_INCREMENT,
mtype enum('generic','cable','fuse') NOT NULL default 'generic',
mname varchar(80) NOT NULL,
nval tinyint(1) UNSIGNED NOT NULL DEFAULT 1,
val1 int(10) NOT NULL,
val2 int(10) NOT NULL,
val3 int(10) NOT NULL,
unit tinyint(3) NOT NULL DEFAULT 1,
accuracy enum('unknown', 'precise', 'normal', 'rough', 'estimated') NOT NULL DEFAULT 'unknown',
accuracy enum('unknown','precise','normal','rough','estimated') NOT NULL DEFAULT 'unknown',
mdate date DEFAULT NULL,
note varchar(80) DEFAULT NULL,
eid smallint(6) DEFAULT NULL,
@@ -178,7 +183,10 @@ CREATE TABLE provisions (
provname varchar(40) NOT NULL,
provcat tinyint(3) DEFAULT NULL,
sid smallint(6) DEFAULT NULL,
boxid smallint(6) NOT NULL DEFAULT 1,
number smallint(6) UNSIGNED NOT NULL DEFAULT 1,
weight float(5,2) UNSIGNED DEFAULT NULL,
weight_net float(5,2) UNSIGNED DEFAULT NULL,
unit tinyint(3) DEFAULT NULL,
storedate date DEFAULT CURRENT_DATE,
shelflife date DEFAULT NULL,
@@ -187,7 +195,7 @@ CREATE TABLE provisions (
CREATE TABLE document (
docid smallint(6) NOT NULL AUTO_INCREMENT,
doctype enum('generic', 'manual', 'invoice', 'drawing', 'picture') NOT NULL DEFAULT 'generic',
doctype enum('generic','manual','invoice','drawing','picture') NOT NULL DEFAULT 'generic',
mimetype varchar(80) NOT NULL DEFAULT 'application/octet-stream',
filename varchar(200) NOT NULL,
extension char(3) NOT NULL,
@@ -197,13 +205,14 @@ CREATE TABLE document (
title varchar(40) DEFAULT NULL,
pages smallint(6) unsigned NOT NULL DEFAULT 1,
remarks varchar(150) DEFAULT NULL,
roleaccess enum('captain','helmsman','sailor','unauth') NOT NULL DEFAULT 'captain',
PRIMARY KEY (docid),
UNIQUE INDEX ix_hash (hash)
) ENGINE=InnoDB;
CREATE TABLE docref (
drid int(10) NOT NULL AUTO_INCREMENT,
reftype enum('vessel', 'box', 'equipment', 'project', 'task', 'user', 'company') NOT NULL DEFAULT 'vessel',
reftype enum('vessel','box','equipment','project','task','user','company') NOT NULL DEFAULT 'vessel',
docid smallint(6) NOT NULL,
refid smallint(6) NOT NULL,
PRIMARY KEY (drid),
@@ -270,7 +279,8 @@ CREATE TABLE task (
projid smallint(6) DEFAULT NULL,
taskname varchar(60) NOT NULL,
priority enum('high','medium','low') DEFAULT NULL,
taskstate enum('pending','waiting','deleted','completed') NOT NULL DEFAULT 'pending',
taskstate enum('pending','active','waiting','deleted','completed') NOT NULL DEFAULT 'pending',
state_ts timestamp DEFAULT NULL,
plandate date DEFAULT NULL,
duedate date DEFAULT NULL,
started datetime DEFAULT NULL,
@@ -280,9 +290,10 @@ CREATE TABLE task (
PRIMARY KEY (taskid)
);
// Notes can be assigned to tasks,maintenances and equipment
CREATE TABLE note (
noteid int(10) NOT NULL AUTO_INCREMENT,
notetype enum('task','maint') NOT NULL DEFAULT 'task',
notetype enum('task','maint','equip') NOT NULL DEFAULT 'task',
refid smallint(6) NOT NULL,
annotation text NOT NULL,
PRIMARY KEY (noteid)
@@ -291,6 +302,7 @@ CREATE TABLE note (
CREATE TABLE checklist (
clid smallint(6) NOT NULL AUTO_INCREMENT,
title varchar(30) NOT NULL,
parent smallint(6) DEFAULT NULL,
clstate enum('new','open','closed') NOT NULL DEFAULT 'new',
PRIMARY KEY (clid)
);
@@ -299,6 +311,7 @@ CREATE TABLE checkitem (
checkid int(10) NOT NULL AUTO_INCREMENT,
checkname varchar(60) NOT NULL,
groupid tinyint(3) DEFAULT NULL,
checkresult enum('unchecked','checked','unused') NOT NULL DEFAULT 'unused',
PRIMARY KEY (checkid)
);
@@ -308,3 +321,9 @@ CREATE TABLE checkref (
sort smallint(6) DEFAULT NULL,
PRIMARY KEY (clid, checkid)
);
CREATE TABLE checkgroup (
groupid int(10) NOT NULL,
title varchar(30) NOT NULL,
PRIMARY KEY (groupid)
);
db/minimal.sql
+9 -3
View File
@@ -12,13 +12,19 @@ INSERT INTO user (userid, login, pass, displayname, role) VALUES
(1, 'captain', '$2y$10$naVMnC4S6bZ3IakxLJPJK.iSazlkYxVLeiRt9CB/j0jSExQZU1SCK', 'Captain', 'captain');
INSERT INTO settings (userid, sno, valint) VALUES
(0, 0, 1), -- Databankschema-Version
(0, 1, 0), -- Keine Bootszuordnung für SYSTEM
(1, 1, 0); -- Keine Bootszuordnung für Benutzer "captain"
(0, 0, 1), -- Database schema version
(0, 1, 0), -- No vessel assignment to SYSTEM
(1, 1, 0), -- No vessel assignment to user "captain"
(0, 20, 1280), -- Image width limit
(0, 21, 1024); -- Image height limit
/* setting descriptions */
INSERT INTO settings (userid, sno, valstr) VALUES
(-1, 1, 'vessel id'),
(-1, 2, 'date format'),
(-1, 10, 'rows in table'),
(-1, 20, 'maximum image width'),
(-1, 21, 'maximum image height'),
(-1, 100, 'equipment sorting order'),
(-1, 101, 'inventory sorting order'),
(-1, 102, 'provision sorting order'),