Native gui: ongoing work, cables and fuses

db/mariadb.sql

@@ -484,3 +484,25 @@ CREATE TABLE signalk (
     FOREIGN KEY fk_signalk_vessel (vid)
         REFERENCES vessel(vid)
 ) ENGINE=InnoDB;
+
+/* Token
+   - Python: secrets.token_hex(8)
+   - PHP: bin2hex(random_bytes(8)) */
+CREATE TABLE recordlock (
+    lock_table varchar(40) NOT NULL,
+    lock_key int(10) NOT NULL,
+    token varchar(16) NOT NULL,
+    userid smallint(6) NOT NULL,
+    created_at timestamp NOT NULL DEFAULT current_timestamp,
+    last_seen timestamp NOT NULL DEFAULT current_timestamp,
+    PRIMARY KEY (lock_table, lock_key),
+    UNIQUE KEY ix_lock_token (token)
+) ENGINE=MEMORY;
+
+/* Use with: UPDATE revision SET changed=CURRENT_TIMESTAMP WHERE revid=? */
+CREATE TABLE revision (
+   revid smallint(6) UNSIGNED NOT NULL,
+   changed timestamp NOT NULL,
+   PRIMARY KEY (revid),
+   INDEX ix_revision_ts (changed) -- for select by timestamp
+) ENGINE=MEMORY;

db/minimal.sql

@@ -11,12 +11,13 @@ UPDATE user SET userid=0 WHERE userid=1;
 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),      -- 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
+INSERT INTO settings (userid, sno, valint, valstr) VALUES
+(0, 0, 1, NULL),      -- Database schema version
+(0, 1, 0, NULL),      -- No vessel assignment to SYSTEM
+(1, 1, 0), NULL,      -- No vessel assignment to user "captain"
+(0, 20, 1280, NULL),  -- Image width limit
+(0, 21, 1024, NULL),  -- Image height limit
+(0, 4, NULL, '€');    -- Currency symbol
 
 /* setting descriptions */
 INSERT INTO settings (userid, sno, valstr) VALUES
@@ -24,6 +25,7 @@ INSERT INTO settings (userid, sno, valstr) VALUES
 (-1, 1, 'vessel id'),
 (-1, 2, 'date format'),
 (-1, 3, 'user menu'),
+(-1, 4, 'currency symbol e.g. €, $, £, ¥'),
 (-1, 10, 'rows in table'),
 (-1, 20, 'maximum image width'),
 (-1, 21, 'maximum image height'),

db/minimal_en.sql

@@ -11,18 +11,20 @@ UPDATE user SET userid=0 WHERE userid=1;
 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),      -- 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
+INSERT INTO settings (userid, sno, valint, valstr) VALUES
+(0, 0, 1, NULL),      -- Database schema version
+(0, 1, 0, NULL),      -- No vessel assignment to SYSTEM
+(1, 1, 0), NULL,      -- No vessel assignment to user "captain"
+(0, 20, 1280, NULL),  -- Image width limit
+(0, 21, 1024, NULL),  -- Image height limit
+(0, 4, NULL, '€');    -- Currency symbol
 
 /* setting descriptions */
 INSERT INTO settings (userid, sno, valstr) VALUES
 (-1, 1, 'vessel id'),
 (-1, 2, 'date format'),
 (-1, 3, 'user menu'),
+(-1, 4, 'currency symbol e.g. €, $, £, ¥'),
 (-1, 10, 'rows in table'),
 (-1, 20, 'maximum image width'),
 (-1, 21, 'maximum image height'),
@@ -63,7 +65,7 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES
 (0, 5, 'provision category'),
 (0, 6, 'provision unit'),
 (0, 7, 'fuse type'),
-(0, 8 , 'unit'),
+(0, 8, 'unit'),
 (0, 9, 'box types'),
 (0, 10, 'fuse blocks'),
 (0, 11, 'cable types'),