diff --git a/INSTALL b/INSTALL index a9bdbcd..ae390ee 100644 --- a/INSTALL +++ b/INSTALL @@ -53,11 +53,16 @@ According to your desired language import minimal required dataset into your new database. For german use mariadb yms < minimal.sql - -or alternatively for english language - + or alternatively for english language mariadb yms < minimal_en.sql +It is strongly recommended to import the following data. +These are selection lists that are typically always required. + + mariadb yms < generic.sql + or alternatively for english language + mariadb yms < generic_en.sql + Optional import some sample data mariadb yms < mariadb_sample.sql diff --git a/db/generic.sql b/db/generic.sql index 40c2f46..efdbb46 100644 --- a/db/generic.sql +++ b/db/generic.sql @@ -9,8 +9,12 @@ INSERT INTO user (userid, login, pass, displayname, role) VALUES (2, 'helmsman', '$2y$10$LFl2jvrt2kB.c2KXBLaCI.RF2XAGNmFsoRc.V2tzLKrfCPiBCbI0e', 'Helmsman', 'helmsman'), (3, 'sailor', '$2y$10$H5ZKd9r3KLAzI7W5u3ocgOCcXF4aDgjMAFYCzVC9Q9/Q9BqAV0MKS', 'Sailor', 'sailor'); -INSERT INTO vessel (vid, vesselname, model, loa, lwl, beam, draught, displacement, ballast) VALUES -(1, 'Generic vessel', 'Generic model', 10.0, 9.5, 3.0, 1.8, 4000, 1200); +INSERT INTO vessel (vid, htype, vesselname, model, loa, lwl, beam, draught, displacement, ballast, shapefile) VALUES +(1, 'mono', 'Generic vessel', 'Generic model', 10.0, 9.5, 3.0, 1.8, 4000, 1200, 'generic.svg'); + +INSERT INTO settings (userid, sno, valint) VALUES +(2, 1, 1), -- Vessel 1 for helmsman +(3, 1, 1); -- Vessel 1 for sailor INSERT INTO storage (sid, vid, sname, stype, x, y, z, remarks) VALUES (0, 1, 'An Bord', 0, 0, 0, 0, 'Alles wo der Ort nicht spezifiziert werden kann'); @@ -30,9 +34,9 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES (1, 12, 'Sonstiges'); INSERT INTO dropdown (ddid, ddval, ddtext, flags) VALUES -(2, 4, 'Dienstleister', NULL), -- Service -(2, 5, 'Segelmacher', NULL), -- Sailmaker -(2, 6, 'Yachthafen', NULL); -- Marina +(2, 4, 'Dienstleister', NULL), +(2, 5, 'Segelmacher', NULL), +(2, 6, 'Yachthafen', NULL); INSERT INTO dropdown (ddid, ddval, ddtext, flags) VALUES (3, 3, 'Bilge', NULL), diff --git a/db/generic_en.sql b/db/generic_en.sql index 0b537c0..3eb4e77 100644 --- a/db/generic_en.sql +++ b/db/generic_en.sql @@ -12,6 +12,10 @@ INSERT INTO user (userid, login, pass, displayname, role) VALUES INSERT INTO vessel (vid, vesselname, model, loa, lwl, beam, draught, displacement, ballast) VALUES (1, 'Generic vessel', 'Generic model', 10.0, 9.5, 3.0, 1.8, 4000, 1200); +INSERT INTO settings (userid, sno, valint) VALUES +(2, 1, 1), -- Vessel 1 for helmsman +(3, 1, 1); -- Vessel 1 for sailor + INSERT INTO storage (sid, vid, sname, stype, x, y, z, remarks) VALUES (0, 1, 'An Bord', 0, 0, 0, 0, 'Alles wo der Ort nicht spezifiziert werden kann'); @@ -43,7 +47,7 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES (4, 2, 'Deck'), (4, 3, 'Rigging'), (4, 4, 'Sails'), -(4, 5, 'Eingine'), +(4, 5, 'Engine'), (4, 6, 'Electrical'), (4, 7, 'Electronics'), (4, 8, 'Navigation'), @@ -139,6 +143,17 @@ INSERT INTO dropdown (ddid, ddval, ddtext) VALUES (12, 15, 'Aircell 7'), (12, 16, 'Ecoflex 10'); +INSERT INTO dropdown (ddid, ddval, ddtext) VALUES +(13, 1, 'Ropes'), +(13, 2, 'Pantry'), +(13, 3, 'Tools'), +(13, 4, 'Deck'), +(13, 5, 'Safety'), +(13, 6, 'Electrical'), +(13, 7, 'Operating Supplies'), +(13, 8, 'Maintenance'), +(13, 9, 'Miscellaneous'); + INSERT INTO dropdown (ddid, ddval, ddtext) VALUES (15, 1, 'Measurement Data'), (15, 2, 'Rigging and Sails'), diff --git a/db/sample.sql b/db/sample.sql index ebd2b52..3e98680 100644 --- a/db/sample.sql +++ b/db/sample.sql @@ -1,147 +1,99 @@ /* Generic data suitable for all kind of boats * SPDX-License-Identifier: WTFPL + + Hinzufügen um das System kennenzulernen + Hängt von generic.sql ab + */ --- minimal vessel -INSERT INTO vessel (vid, vesselname) VALUES (1, 'Generic vessel'); +INSERT INTO storage (sid, sname, color) VALUES +(1, 'An Bord', 'F9F06B'), +(2, 'Vorpiek', 'F9F06B'), +(3, 'Achterpiek', 'F9F06B'), +(4, 'Salon BB', 'F9F06B'), +(5, 'Salon STB', 'F9F06B'), +(6, 'Pantry', 'F9F06B'), +(7, 'Ankerkasten', 'F9F06B'), +(8, 'An Deck', 'F9F06B'), +(9, 'Backskiste BB', 'F9F06B'), +(10, 'Backskiste STB', 'F9F06B'), +(11, 'Bilge', 'F9F06B'), +(12, 'Gaskasten', 'F9F06B'), +(13, 'Salonkoje BB', 'F9F06B'), +(14, 'Salonkoje STB ', 'F9F06B'); -INSERT INTO user (userid, login, pass, displayname, role) VALUES -(2, 'helmsman', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Helmsman', 'helmsman'), -(3, 'sailor', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Sailor', 'sailor'); +INSERT INTO box (boxid, label) VALUES +(1, 'Werkzeugkiste'), +(2, 'Kiste, klein'), +(3, 'Kiste, groß'); -INSERT INTO settings (userid, sno, valint) VALUES -(2, 1, 1), -- Vessel 1 for helmsman -(3, 1, 1); -- Vessel 1 for sailor +INSERT INTO equipment (eid, ename) VALUES +(1, 'Großsegel'), +(2, 'Fock'), +(3, 'Genua'), +(4, 'Spinnaker'), +(5, 'Vorstang'), +(6, 'Achterstan'), +(7, 'Oberwant BB'), +(8, 'Unterwant BB'), +(9, 'Oberwant STB'), +(10, 'Unterwant STB'), +(11, 'Motor'), +(12, 'Außenborder'), +(13, 'Schlauchboot'), +(14, 'AIS Transcsiver'), +(15, 'Funkgerät'), +(16, 'Kartenplotter'), +(17, 'Batterie'); -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(1, 1, 'Einrumpf'), -- Mono -(1, 2, 'Katamaran'), -(1, 3, 'Trimaran'); +INSERT INTO inventory (invid, invname, icat, conttype, sid, boxid, eid, number, + weight, price, purchdate, invcond, remarks, flags) VALUES +(1, 'Bootshaken', NULL, 'storage', 1, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(2, 'Fender', NULL, 'storage', 1, NULL, NULL, 4, NULL, NULL, NULL, 'unknown', NULL, NULL), +(3, 'Winschkurbel', NULL, 'storage', 1, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(4, 'Landanschlußkabel', NULL, 'storage', 1, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(5, 'Kochtopf', NULL, 'storage', 24, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(6, 'Pfanne', NULL, 'storage', 24, NULL, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(7, 'Kombizange', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(8, 'Hammer', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL), +(9, 'Rohrzange', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'good', NULL, NULL), +(10, 'Schraubenzieher, groß', NULL, 'box', NULL, 6, NULL, 1, NULL, NULL, NULL, 'unknown', NULL, NULL); -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(2, 4, 'Dienstleister'), -- Service -(2, 5, 'Segelmacher'), -- Sailmaker -(2, 6, 'Yachthafen'); -- Marina +INSERT INTO provisions (provname) VALUES +('Kaffee'), +('Zucker'), +('Salz'), +('Pfeffer'), +('Milch'), +('Müsliriegel'), +('Erbsensuppe'), +('Gulaschsuppe'), +('Kekse'); -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(3, 3, 'Bilge'), -(3, 4, 'Schwalbennest'); +INSERT INTO checklist (clid, title) VALUES +(1, 'Einwintern'), +(2, 'Auswintern'), +(3, 'Mast legen'); -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(4, 1, 'Rumpf'), -(4, 2, 'Deck'), -(4, 3, 'Rigg'), -(4, 4, 'Segel'), -(4, 5, 'Motor'), -(4, 6, 'Elektrik'), -(4, 7, 'Elektronik'), -(4, 8, 'Navigation'), -(4, 9, 'Pantry'), -(4, 10, 'Solar'), -(4, 11, 'Sicherheit'), -(4, 12, 'lfd. Gut'); +INSERT INTO checkitem (checkid, checkname) VALUES +(1, 'Bilge trocknen'), +(2, 'Frostschutz in Motor einfüllen'), +(3, 'Windpilot abbauen'), +(4, 'Plane über Boot'), +(5, 'Plane Vorschiff unterstützen'), +(5, 'Salinge unterstützen'), +(6, 'Polster ausräumen'), +(7, 'Gardinen abnehmen'), +(8, 'Kleiderschrank leeräumen'), +(9, 'Lebensmittel von Bord'); -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(5, 1, 'Allgemein'), -(5, 2, 'Getränke'), -(5, 3, 'Naschkram'), -(5, 4, 'Konserven'), -(5, 5, 'Frischware'), -(5, 6, 'Trockenware'), -(5, 7, 'Gefriergetrocknet'), -(5, 8, 'Snacks (salzig)'); - -INSERT INTO dropdown (ddid, ddval, ddtext, ddshort) VALUES -(6, 1, 'kg', 'kg'), -(6, 2, 'Liter', 'L'), -(6, 3, 'Stück', 'St'), -(6, 4, 'Packung', 'Pkg'), -(6, 5, 'Dose', 'Ds'), -(6, 6, 'Flasche', 'Fl'), -(6, 7, 'Tüte', 'Tue'), -(6, 8, 'Tafel', 'Ta'), -(6, 9, 'Glas', 'Gl'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(7, 1, 'ATO'), -(7, 2, 'Streifensicherung'), -(7, 3, 'Feinsicherung (GS)'), -(7, 4, 'Torpedosicherung'), -(7, 5, 'T-Sicherung'); - -INSERT INTO dropdown (ddid, ddval, ddshort, ddtext) VALUES -(8, 1, 'mm', 'Millimeter'), -(8, 2, 'cm', 'Zentimeter'), -(8, 3, 'g', 'Gramm'), -(8, 4, 'kg', 'Kilogramm'), -(8, 5, 'm', 'Meter'), -(8, 6, 'kW', 'Kilowatt'), -(8, 7, 'A', 'Ampere'), -(8, 8, 'l', 'Liter'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(9, 1, 'Plastikbox, klein'), -(9, 2, 'Plastikbox, groß'), -(9, 3, 'Sortimentskasten'), -(9, 4, 'Werkzeugkiste'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(10, 1, 'Kabel-Inline'), -(10, 2, 'BlueSea innen'), -(10, 3, 'Bluesea außen'), -(10, 4, 'Panel 1 (STV 103)'), -(10, 5, 'Panel 2 (STV 108)'), -(10, 6, 'Reihenklemme 1'), -(10, 7, 'Reihenklemme 2'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(11, 1, 'Einzelader'), -(11, 2, 'Steuerleitung'), -(11, 3, 'Datenkabel'), -(11, 4, 'Netzwerkkabel'), -(11, 5, 'Koaxialkabel'), -(11, 6, 'Antennenkabel'), -(11, 7, 'Lautsprecherkabel'), -(11, 8, 'Mikrofonkabel'), -(11, 9, 'Batteriekabel'), -(11, 10, 'Solarkabel'), -(11, 11, 'Gummileitung'), -(11, 12, 'Flachbandkabel'), -(11, 13, 'Telefonkabel'), -(11, 14, 'NMEA-Kabel'), -(11, 15, 'CAN-Bus-Kabel'), -(11, 16, 'USB-Kabel'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(12, 1, 'H05V-K'), -(12, 2, 'H07V-K'), -(12, 3, 'H05VV-F'), -(12, 4, 'H07RN-F'), -(12, 5, 'LiYY'), -(12, 6, 'LiYCY'), -(12, 7, 'LiYCY-TP'), -(12, 8, 'Cat 5e'), -(12, 9, 'Cat 6'), -(12, 10, 'RG-58'), -(12, 11, 'RG-213'), -(12, 12, 'RG-316'), -(12, 13, 'H-155'), -(12, 14, 'Aircell 5'), -(12, 15, 'Aircell 7'), -(12, 16, 'Ecoflex 10'); - -INSERT INTO storage (sid, vid, sname, stype, x, y, z, remarks) VALUES -(0, 1, 'An Bord', 0, 0, 0, 0, 'Alles wo der Ort nicht spezifiziert werden kann'); - -/* Eine Liste mit häufig verwendeten Herstellern - comptype=2 -*/ - -INSERT INTO company (comptype, compname) VALUES -(2, 'Garmin'), -(2, 'Watcheye'), -(2, 'Digital Yacht'), -(2, 'B&G'), -(2, 'Raymarine'), -(2, 'Harken'), -(2, 'Selden'); +INSERT INTO checkref (clid, checkid) VALUES +(1, 1), +(1, 2), +(1, 3), +(1, 4), +(1, 5), +(1, 6), +(1, 7), +(1, 8), +(1, 9); diff --git a/db/sample_en.sql b/db/sample_en.sql index 571ee03..9502045 100644 --- a/db/sample_en.sql +++ b/db/sample_en.sql @@ -1,116 +1,7 @@ -/* Generic data suitable for all kind of boats +/* Some sample data * SPDX-License-Identifier: WTFPL + + Add this to get to know the system + Depends on generic_en.sql + */ - --- minimal vessel -INSERT INTO vessel (vid, vesselname) VALUES (1, 'Generic vessel'); - -INSERT INTO user (userid, login, pass, displayname, role) VALUES -(2, 'helmsman', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Helmsman', 'helmsman'), -(3, 'sailor', '$2y$10$4keuVm.WD/JeRmAqp2h4MeSxxKITsKv2q07XZrxPUuT/V80CTPbje', 'Sailor', 'sailor'); - -INSERT INTO settings (userid, sno, valint) VALUES -(2, 1, 1), -- Vessel 1 for helmsman -(3, 1, 1); -- Vessel 1 for sailor - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(1, 1, 'Monohull'), -(1, 2, 'Catamaran'), -(1, 3, 'Trimaran'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(2, 4, 'Service'), -(2, 5, 'Sailmaker'), -(2, 6, 'Marina'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(3, 3, 'Bilge'), -(3, 4, 'Quarter Berth'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(4, 1, 'Hull'), -(4, 2, 'Deck'), -(4, 3, 'Rigging'), -(4, 4, 'Sails'), -(4, 5, 'Engine'), -(4, 6, 'Electrical'), -(4, 7, 'Electronics'), -(4, 8, 'Navigation'), -(4, 9, 'Galley'), -(4, 10, 'Solar'), -(4, 11, 'Safety'), -(4, 12, 'Running Rigging'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(5, 1, 'General'), -(5, 2, 'Drinks'), -(5, 3, 'Sweets'), -(5, 4, 'Tinned Food'), -(5, 5, 'Fresh Food'), -(5, 6, 'Dry Goods'), -(5, 7, 'Freeze-Dried Food'), -(5, 8, 'Savoury Snacks'); - -INSERT INTO dropdown (ddid, ddval, ddtext, ddshort) VALUES -(6, 1, 'kg', 'kg'), -(6, 2, 'Litre', 'L'), -(6, 3, 'Piece', 'pc'), -(6, 4, 'Pack', 'pk'), -(6, 5, 'Tin', 'tin'), -(6, 6, 'Bottle', 'btl'), -(6, 7, 'Bag', 'bag'), -(6, 8, 'Bar', 'bar'), -(6, 9, 'Jar', 'jar'); - -INSERT INTO dropdown (ddid, ddval, ddshort, ddtext) VALUES -(8, 1, 'mm', 'Millimetre'), -(8, 2, 'cm', 'Centimetre'), -(8, 3, 'g', 'Gram'), -(8, 4, 'kg', 'Kilogram'), -(8, 5, 'm', 'Metre'), -(8, 6, 'kW', 'Kilowatt'), -(8, 7, 'A', 'Ampere'), -(8, 8, 'L', 'Litre'); --- TODO add inch, feet, ... - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(9, 1, 'Small Plastic Box'), -(9, 2, 'Large Plastic Box'), -(9, 3, 'Parts Organiser'), -(9, 4, 'Toolbox'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(11, 1, 'Single-Core Cable'), -(11, 2, 'Control Cable'), -(11, 3, 'Data Cable'), -(11, 4, 'Network Cable'), -(11, 5, 'Coaxial Cable'), -(11, 6, 'Aerial Cable'), -(11, 7, 'Speaker Cable'), -(11, 8, 'Microphone Cable'), -(11, 9, 'Battery Cable'), -(11, 10, 'Solar Cable'), -(11, 11, 'Rubber Cable'), -(11, 12, 'Ribbon Cable'), -(11, 13, 'Telephone Cable'), -(11, 14, 'NMEA Cable'), -(11, 15, 'CAN Bus Cable'), -(11, 16, 'USB Cable'); - -INSERT INTO dropdown (ddid, ddval, ddtext) VALUES -(12, 1, 'H05V-K'), -(12, 2, 'H07V-K'), -(12, 3, 'H05VV-F'), -(12, 4, 'H07RN-F'), -(12, 5, 'LiYY'), -(12, 6, 'LiYCY'), -(12, 7, 'LiYCY-TP'), -(12, 8, 'Cat 5e'), -(12, 9, 'Cat 6'), -(12, 10, 'RG-58'), -(12, 11, 'RG-213'), -(12, 12, 'RG-316'), -(12, 13, 'H-155'), -(12, 14, 'Aircell 5'), -(12, 15, 'Aircell 7'), -(12, 16, 'Ecoflex 10'); diff --git a/locale/de.po b/locale/de.po index 0539e78..29771ec 100644 --- a/locale/de.po +++ b/locale/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: YMS 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2026-10-21 06:03+0200\n" +"POT-Creation-Date: 2026-10-24 19:13+0200\n" "PO-Revision-Date: 2026-10-21 06:27+0200\n" "Last-Translator: Thomas Hooge \n" "Language-Team: de \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 3.2.2\n" -#: ymsgui.py:233 +#: ymsgui.py:262 msgid "" "Configuration file '{}' not found.\n" "Default configuration has been created.\n" @@ -31,7 +31,7 @@ msgstr "" "\n" "Anschließend starten Sie dieses Programm neu." -#: ymsgui.py:261 +#: ymsgui.py:292 msgid "" "Database connection cannot be established.\n" "\n" @@ -49,40 +49,46 @@ msgstr "" msgid "Base Data" msgstr "Basisdaten" -#: yms/view/base.py:59 yms/view/base.py:85 yms/view/base.py:93 -#: yms/view/base.py:163 yms/view/boxes.py:31 yms/view/boxes.py:33 -#: yms/view/companies.py:22 yms/view/companies.py:24 yms/view/equipment.py:42 -#: yms/view/equipment.py:44 yms/view/equipment.py:46 yms/view/inventory.py:65 -#: yms/view/inventory.py:68 yms/view/inventory.py:71 yms/view/inventory.py:74 -#: yms/view/inventory.py:77 yms/view/storage.py:35 +#: yms/view/base.py:59 yms/view/base.py:85 yms/view/base.py:89 +#: yms/view/base.py:97 yms/view/base.py:166 yms/view/boxes.py:31 +#: yms/view/boxes.py:33 yms/view/cables.py:32 yms/view/cables.py:35 +#: yms/view/cables.py:38 yms/view/companies.py:22 yms/view/companies.py:24 +#: yms/view/equipment.py:36 yms/view/equipment.py:39 yms/view/equipment.py:42 +#: yms/view/fuses.py:47 yms/view/fuses.py:50 yms/view/inventory.py:43 +#: yms/view/inventory.py:46 yms/view/inventory.py:49 yms/view/inventory.py:52 +#: yms/view/inventory.py:55 yms/view/measurement.py:25 +#: yms/view/measurement.py:33 yms/view/measurement.py:37 +#: yms/view/provisions.py:24 yms/view/provisions.py:27 +#: yms/view/provisions.py:30 yms/view/provisions.py:33 yms/view/storage.py:35 +#: yms/view/tasks.py:47 msgid "─── none ───" msgstr "─── keine ───" -#: yms/view/base.py:129 yms/view/boxes.py:24 yms/view/cables.py:35 -#: yms/view/companies.py:32 yms/view/documents.py:32 yms/view/equipment.py:32 -#: yms/view/fuses.py:36 yms/view/inventory.py:51 yms/view/maintenance.py:29 -#: yms/view/measurement.py:51 yms/view/projects.py:38 yms/view/provisions.py:41 +#: yms/view/base.py:133 yms/view/boxes.py:24 yms/view/cables.py:22 +#: yms/view/companies.py:32 yms/view/documents.py:38 yms/view/equipment.py:25 +#: yms/view/fuses.py:36 yms/view/inventory.py:30 yms/view/maintenance.py:29 +#: yms/view/measurement.py:68 yms/view/projects.py:39 yms/view/provisions.py:38 #: yms/view/storage.py:25 yms/view/tasks.py:38 msgid "ID" msgstr "" -#: yms/view/base.py:130 +#: yms/view/base.py:134 #, fuzzy msgid "List" msgstr "Liste" -#: yms/view/base.py:131 +#: yms/view/base.py:135 msgid "Records" msgstr "Datensätze" -#: yms/view/base.py:298 +#: yms/view/base.py:301 msgid "" "Initialize USB-Stick\n" "All data on that device will be lost!\n" "Are you really sure?" msgstr "" -#: yms/view/base.py:333 +#: yms/view/base.py:336 msgid "" "Add new vessel.\n" "Are you sure?" @@ -90,7 +96,7 @@ msgstr "" "Neues Boot hinzufügen.\n" "Sind Sie sicher?" -#: yms/view/base.py:441 +#: yms/view/base.py:456 msgid "" "Delete user!\n" "Are you sure?" @@ -110,30 +116,30 @@ msgstr "" msgid "Content" msgstr "Inhalt" -#: yms/view/boxes.py:27 yms/view/companies.py:35 yms/view/equipment.py:38 -#: yms/view/inventory.py:56 yms/view/maintenance.py:32 yms/view/projects.py:43 -#: yms/view/storage.py:28 yms/ui/base.ui:388 yms/ui/base.ui:754 +#: yms/view/boxes.py:27 yms/view/companies.py:35 yms/view/equipment.py:31 +#: yms/view/inventory.py:35 yms/view/maintenance.py:32 yms/view/projects.py:44 +#: yms/view/storage.py:28 yms/ui/base.ui:513 yms/ui/base.ui:910 #: yms/ui/boxes.ui:285 yms/ui/boxes.ui:712 yms/ui/cables.ui:113 #: yms/ui/cables.ui:423 yms/ui/cables.ui:829 yms/ui/companies.ui:423 -#: yms/ui/companies.ui:903 yms/ui/documents.ui:525 yms/ui/documents.ui:719 -#: yms/ui/equipment.ui:455 yms/ui/equipment.ui:903 yms/ui/fuses.ui:98 +#: yms/ui/companies.ui:903 yms/ui/documents.ui:572 yms/ui/documents.ui:766 +#: yms/ui/equipment.ui:455 yms/ui/equipment.ui:929 yms/ui/fuses.ui:98 #: yms/ui/fuses.ui:353 yms/ui/fuses.ui:639 yms/ui/inventory.ui:378 #: yms/ui/inventory.ui:801 yms/ui/maintenance.ui:359 yms/ui/maintenance.ui:650 #: yms/ui/projects.ui:105 yms/ui/projects.ui:349 yms/ui/projects.ui:628 -#: yms/ui/provisions.ui:480 yms/ui/provisions.ui:903 yms/ui/storage.ui:419 +#: yms/ui/provisions.ui:495 yms/ui/provisions.ui:993 yms/ui/storage.ui:419 #: yms/ui/storage.ui:827 yms/ui/tasks.ui:507 yms/ui/tasks.ui:716 msgid "Remarks" msgstr "Bemerkungen" -#: yms/view/boxes.py:117 +#: yms/view/boxes.py:122 msgid "Add new Box" msgstr "Neue Kiste hinzufügen" -#: yms/view/boxes.py:123 yms/ui/boxes.ui:539 +#: yms/view/boxes.py:128 yms/ui/boxes.ui:539 msgid "Edit Box" msgstr "Kiste bearbeiten" -#: yms/view/boxes.py:157 +#: yms/view/boxes.py:159 msgid "" "Delete box!\n" "Are you sure?" @@ -145,27 +151,27 @@ msgstr "" msgid "Cables" msgstr "Kabel" -#: yms/view/cables.py:36 yms/view/companies.py:33 yms/view/equipment.py:33 -#: yms/view/fuses.py:37 yms/view/inventory.py:52 yms/view/projects.py:39 -#: yms/view/storage.py:26 yms/view/tasks.py:39 yms/ui/base.ui:567 +#: yms/view/cables.py:23 yms/view/companies.py:33 yms/view/equipment.py:26 +#: yms/view/fuses.py:37 yms/view/inventory.py:31 yms/view/projects.py:40 +#: yms/view/storage.py:26 yms/view/tasks.py:39 yms/ui/base.ui:723 #: yms/ui/boxes.ui:119 yms/ui/cables.ui:91 yms/ui/cables.ui:279 #: yms/ui/cables.ui:666 yms/ui/companies.ui:234 yms/ui/companies.ui:645 -#: yms/ui/equipment.ui:345 yms/ui/equipment.ui:733 yms/ui/fuses.ui:76 +#: yms/ui/equipment.ui:345 yms/ui/equipment.ui:756 yms/ui/fuses.ui:76 #: yms/ui/inventory.ui:268 yms/ui/inventory.ui:682 yms/ui/measurement.ui:247 -#: yms/ui/measurement.ui:579 yms/ui/projects.ui:83 yms/ui/projects.ui:272 -#: yms/ui/projects.ui:551 yms/ui/provisions.ui:260 yms/ui/provisions.ui:627 +#: yms/ui/measurement.ui:602 yms/ui/projects.ui:83 yms/ui/projects.ui:272 +#: yms/ui/projects.ui:551 yms/ui/provisions.ui:275 yms/ui/provisions.ui:717 #: yms/ui/storage.ui:257 yms/ui/storage.ui:544 yms/ui/tasks.ui:346 #: yms/ui/tasks.ui:677 msgid "Name" msgstr "" -#: yms/view/cables.py:37 yms/view/inventory.py:55 yms/ui/cables.ui:412 -#: yms/ui/cables.ui:818 yms/ui/inventory.ui:92 yms/ui/inventory.ui:367 -#: yms/ui/inventory.ui:790 +#: yms/view/cables.py:24 yms/view/inventory.py:34 yms/ui/cables.ui:412 +#: yms/ui/cables.ui:818 yms/ui/equipment.ui:624 yms/ui/equipment.ui:1004 +#: yms/ui/inventory.ui:92 yms/ui/inventory.ui:367 yms/ui/inventory.ui:790 msgid "Condition" msgstr "Zustand" -#: yms/view/cables.py:125 +#: yms/view/cables.py:142 msgid "" "Delete cable!\n" "Are you sure?" @@ -181,23 +187,23 @@ msgstr "Firmen" msgid "─── all ───" msgstr "─── alle ───" -#: yms/view/companies.py:34 yms/view/documents.py:33 yms/ui/boxes.ui:96 +#: yms/view/companies.py:34 yms/view/documents.py:39 yms/ui/boxes.ui:96 #: yms/ui/boxes.ui:332 yms/ui/boxes.ui:575 yms/ui/cables.ui:301 #: yms/ui/cables.ui:692 yms/ui/companies.ui:50 yms/ui/companies.ui:220 -#: yms/ui/companies.ui:656 yms/ui/documents.ui:178 yms/ui/fuses.ui:287 +#: yms/ui/companies.ui:656 yms/ui/documents.ui:225 yms/ui/fuses.ui:287 #: yms/ui/fuses.ui:578 yms/ui/inventory.ui:279 yms/ui/storage.ui:280 msgid "Type" msgstr "Typ" -#: yms/view/companies.py:119 +#: yms/view/companies.py:129 msgid "Add new Company" msgstr "Neue Firma hinzufügen" -#: yms/view/companies.py:130 +#: yms/view/companies.py:140 msgid "Edit Company" msgstr "Firma bearbeiten" -#: yms/view/companies.py:155 +#: yms/view/companies.py:165 msgid "" "Delete company!\n" "Are you sure?" @@ -209,23 +215,23 @@ msgstr "" msgid "Documents" msgstr "Dokumente" -#: yms/view/documents.py:34 yms/ui/documents.ui:387 yms/ui/documents.ui:708 +#: yms/view/documents.py:40 yms/ui/documents.ui:434 yms/ui/documents.ui:755 msgid "Filename" msgstr "Dateiname" -#: yms/view/documents.py:35 yms/ui/documents.ui:364 yms/ui/documents.ui:686 +#: yms/view/documents.py:41 yms/ui/documents.ui:411 yms/ui/documents.ui:733 msgid "Title" msgstr "Titel" -#: yms/view/documents.py:36 +#: yms/view/documents.py:42 msgid "References" msgstr "Referenzen" -#: yms/view/documents.py:117 +#: yms/view/documents.py:138 msgid "Add new Document" msgstr "Neues Dokument hinzufügen" -#: yms/view/documents.py:153 +#: yms/view/documents.py:174 msgid "" "Delete document!\n" "Are you sure?" @@ -233,42 +239,41 @@ msgstr "" "Lösche Dokument!\n" "Sind Sie sicher?" -#: yms/view/equipment.py:14 yms/view/maintenance.py:31 -#: yms/view/measurement.py:55 yms/ui/fuses.ui:320 yms/ui/fuses.ui:617 +#: yms/view/equipment.py:16 yms/view/maintenance.py:31 +#: yms/view/measurement.py:72 yms/ui/fuses.ui:320 yms/ui/fuses.ui:617 #: yms/ui/inventory.ui:312 yms/ui/inventory.ui:732 yms/ui/maintenance.ui:81 #: yms/ui/maintenance.ui:270 yms/ui/maintenance.ui:570 yms/ui/measurement.ui:81 -#: yms/ui/measurement.ui:270 yms/ui/measurement.ui:662 +#: yms/ui/measurement.ui:270 yms/ui/measurement.ui:685 msgid "Equipment" msgstr "Ausrüstung" -#: yms/view/equipment.py:34 yms/ui/cables.ui:401 yms/ui/cables.ui:807 -#: yms/ui/equipment.ui:87 yms/ui/equipment.ui:367 yms/ui/equipment.ui:775 +#: yms/view/equipment.py:27 yms/ui/cables.ui:401 yms/ui/cables.ui:807 +#: yms/ui/equipment.ui:87 yms/ui/equipment.ui:367 yms/ui/equipment.ui:801 msgid "Manufacturer" msgstr "Hersteller" -#: yms/view/equipment.py:35 yms/ui/base.ui:86 yms/ui/base.ui:596 -#: yms/ui/base.ui:1848 yms/ui/equipment.ui:378 yms/ui/equipment.ui:786 +#: yms/view/equipment.py:28 yms/ui/base.ui:91 yms/ui/base.ui:752 +#: yms/ui/base.ui:2004 yms/ui/equipment.ui:378 yms/ui/equipment.ui:812 msgid "Model" msgstr "Modell" -#: yms/view/equipment.py:36 yms/ui/base.ui:1815 -#, fuzzy +#: yms/view/equipment.py:29 yms/ui/base.ui:1971 msgid "Serial" msgstr "Seriennummer" -#: yms/view/equipment.py:37 +#: yms/view/equipment.py:30 msgid "Age" msgstr "Alter" -#: yms/view/equipment.py:108 +#: yms/view/equipment.py:148 msgid "Add new Equipment" msgstr "Neue Ausrüstung hinzufügen" -#: yms/view/equipment.py:118 yms/ui/equipment.ui:713 +#: yms/view/equipment.py:158 yms/ui/equipment.ui:736 msgid "Edit Equipment" msgstr "Ausrüstung bearbeiten" -#: yms/view/equipment.py:146 +#: yms/view/equipment.py:186 msgid "" "Convert equipment to inventory?\n" "Some properties will be lost!\n" @@ -280,7 +285,7 @@ msgstr "" "\n" "Sind Sie sicher?" -#: yms/view/equipment.py:156 +#: yms/view/equipment.py:196 msgid "" "Delete equipment!\n" "Are you sure?" @@ -296,20 +301,20 @@ msgstr "Sicherungen" msgid "Current" msgstr "Stromstärke" -#: yms/view/fuses.py:39 yms/view/provisions.py:42 yms/ui/fuses.ui:342 +#: yms/view/fuses.py:39 yms/view/provisions.py:39 yms/ui/fuses.ui:342 #: yms/ui/fuses.ui:564 msgid "Description" msgstr "Beschreibung" -#: yms/view/fuses.py:88 +#: yms/view/fuses.py:96 msgid "Add new Fuse" msgstr "Neue Sicherung hinzufügen" -#: yms/view/fuses.py:97 yms/ui/fuses.ui:528 +#: yms/view/fuses.py:105 yms/ui/fuses.ui:528 msgid "Edit Fuse" msgstr "Sicherung bearbeiten" -#: yms/view/fuses.py:125 +#: yms/view/fuses.py:133 msgid "" "Delete fuse!\n" "Are you sure?" @@ -317,25 +322,25 @@ msgstr "" "Lösche Sicherung!\n" "Sind Sie sicher?" -#: yms/view/inventory.py:38 +#: yms/view/inventory.py:17 msgid "Inventory" msgstr "Inventar" -#: yms/view/inventory.py:53 yms/ui/inventory.ui:696 +#: yms/view/inventory.py:32 yms/ui/inventory.ui:696 msgid "Container" msgstr "" -#: yms/view/inventory.py:54 yms/view/provisions.py:43 yms/ui/fuses.ui:276 +#: yms/view/inventory.py:33 yms/view/provisions.py:40 yms/ui/fuses.ui:276 #: yms/ui/fuses.ui:550 yms/ui/inventory.ui:323 yms/ui/inventory.ui:743 -#: yms/ui/provisions.ui:307 yms/ui/provisions.ui:707 +#: yms/ui/provisions.ui:322 yms/ui/provisions.ui:797 msgid "Number" msgstr "" -#: yms/view/inventory.py:186 +#: yms/view/inventory.py:166 msgid "Add new Inventory" msgstr "Neus Inventar hinzufügen" -#: yms/view/inventory.py:197 +#: yms/view/inventory.py:177 msgid "" "Record is locked!\n" "Edit prohibited." @@ -343,23 +348,23 @@ msgstr "" "Datensatz ist gesperrt!\n" "Bearbeiten nicht zulässig." -#: yms/view/inventory.py:203 +#: yms/view/inventory.py:183 msgid "Edit Inventory" msgstr "Inventar bearbeiten" -#: yms/view/inventory.py:231 +#: yms/view/inventory.py:211 msgid "" "Convert inventory to equipment?\n" "Some properties will be lost!\n" "\n" "Are you sure?" msgstr "" -"Ausrüstung in Inventar umwandeln?\n" +"Inventar in Ausrüstung umwandeln?\n" "Einige Eigenschaften werden verlorengehen!\n" "\n" "Sind Sie sicher?" -#: yms/view/inventory.py:241 +#: yms/view/inventory.py:239 msgid "" "Delete inventory!\n" "Are you sure?" @@ -392,33 +397,33 @@ msgstr "" msgid "Measurements" msgstr "Messungen" -#: yms/view/measurement.py:52 +#: yms/view/measurement.py:69 msgid "Measurement" msgstr "Messung" -#: yms/view/measurement.py:53 +#: yms/view/measurement.py:70 msgid "Value" msgstr "Wert" -#: yms/view/measurement.py:54 yms/ui/measurement.ui:348 -#: yms/ui/measurement.ui:640 +#: yms/view/measurement.py:71 yms/ui/measurement.ui:348 +#: yms/ui/measurement.ui:663 msgid "Accuracy" msgstr "Genauigkeit" -#: yms/view/measurement.py:56 yms/ui/measurement.ui:359 -#: yms/ui/measurement.ui:673 +#: yms/view/measurement.py:73 yms/ui/measurement.ui:359 +#: yms/ui/measurement.ui:696 msgid "Note" msgstr "Notiz" -#: yms/view/measurement.py:117 +#: yms/view/measurement.py:134 msgid "Add new Measurement" msgstr "Maß/Messung hinzufügen" -#: yms/view/measurement.py:123 yms/ui/measurement.ui:557 +#: yms/view/measurement.py:140 yms/ui/measurement.ui:580 msgid "Edit Measurement" msgstr "Maß/Messung bearbeiten" -#: yms/view/measurement.py:154 +#: yms/view/measurement.py:171 msgid "" "Delete measurement!\n" "Are you sure?" @@ -426,19 +431,19 @@ msgstr "" "Lösche Maß/Messung!\n" "Sind Sie sicher?" -#: yms/view/projects.py:13 +#: yms/view/projects.py:14 msgid "Projects" msgstr "Projekte" -#: yms/view/projects.py:40 +#: yms/view/projects.py:41 msgid "Start date" msgstr "Startdatum" -#: yms/view/projects.py:41 +#: yms/view/projects.py:42 msgid "Duration" msgstr "Dauer" -#: yms/view/projects.py:42 yms/view/status.py:14 yms/view/tasks.py:41 +#: yms/view/projects.py:43 yms/view/status.py:14 yms/view/tasks.py:41 #: yms/ui/cables.ui:102 yms/ui/fuses.ui:87 yms/ui/maintenance.ui:348 #: yms/ui/maintenance.ui:639 yms/ui/projects.ui:94 yms/ui/projects.ui:338 #: yms/ui/projects.ui:617 yms/ui/status.ui:14 yms/ui/tasks.ui:129 @@ -446,15 +451,15 @@ msgstr "Dauer" msgid "Status" msgstr "" -#: yms/view/projects.py:90 +#: yms/view/projects.py:96 msgid "Add new Project" msgstr "Projekt hinzufügen" -#: yms/view/projects.py:96 yms/ui/projects.ui:529 +#: yms/view/projects.py:102 yms/ui/projects.ui:529 msgid "Edit Project" msgstr "Projekt bearbeiten" -#: yms/view/projects.py:127 +#: yms/view/projects.py:133 msgid "" "Delete project!\n" "Are you sure?" @@ -462,32 +467,33 @@ msgstr "" "Lösche Projekt!\n" "Sind Sie sicher?" -#: yms/view/provisions.py:15 +#: yms/view/provisions.py:16 msgid "Provisions" msgstr "Verpflegung" -#: yms/view/provisions.py:44 yms/ui/measurement.ui:337 yms/ui/provisions.ui:343 -#: yms/ui/provisions.ui:740 yms/ui/storage.ui:868 +#: yms/view/provisions.py:41 yms/ui/measurement.ui:337 +#: yms/ui/measurement.ui:839 yms/ui/provisions.ui:358 yms/ui/provisions.ui:830 +#: yms/ui/storage.ui:868 msgid "Unit" msgstr "Einheit" -#: yms/view/provisions.py:45 +#: yms/view/provisions.py:42 msgid "Stored" msgstr "Gespeichert" -#: yms/view/provisions.py:46 +#: yms/view/provisions.py:43 msgid "Best before" msgstr "Haltbar bis" -#: yms/view/provisions.py:103 +#: yms/view/provisions.py:159 msgid "Add new Provision" msgstr "Verpflegung hinzufügen" -#: yms/view/provisions.py:109 +#: yms/view/provisions.py:165 msgid "Edit Provision" msgstr "Verpflegung bearbeiten" -#: yms/view/provisions.py:138 +#: yms/view/provisions.py:194 msgid "" "Delete provision!\n" "Are you sure?" @@ -497,7 +503,7 @@ msgstr "" #: yms/view/storage.py:14 yms/ui/boxes.ui:442 yms/ui/boxes.ui:864 #: yms/ui/inventory.ui:81 yms/ui/inventory.ui:290 yms/ui/inventory.ui:710 -#: yms/ui/provisions.ui:285 yms/ui/provisions.ui:649 +#: yms/ui/provisions.ui:300 yms/ui/provisions.ui:739 msgid "Storage" msgstr "Stauraum" @@ -505,15 +511,15 @@ msgstr "Stauraum" msgid "Position" msgstr "" -#: yms/view/storage.py:124 +#: yms/view/storage.py:134 msgid "Add new Storage" msgstr "Stauraum hinzufügen" -#: yms/view/storage.py:133 yms/ui/storage.ui:522 +#: yms/view/storage.py:143 yms/ui/storage.ui:522 msgid "Edit Storage" msgstr "Stauraum bearbeiten" -#: yms/view/storage.py:161 +#: yms/view/storage.py:171 msgid "" "Delete storage!\n" "Are you sure?" @@ -535,15 +541,15 @@ msgstr "Priorität" msgid "Responsible" msgstr "Verantwortlich" -#: yms/view/tasks.py:92 +#: yms/view/tasks.py:108 msgid "Add new Task" msgstr "Neue Aufgabe hinzufügen" -#: yms/view/tasks.py:98 yms/ui/tasks.ui:655 +#: yms/view/tasks.py:114 yms/ui/tasks.ui:655 msgid "Edit Task" msgstr "Aufgabe bearbeiten" -#: yms/view/tasks.py:128 +#: yms/view/tasks.py:144 msgid "" "Delete task!\n" "Are you sure?" @@ -551,356 +557,353 @@ msgstr "" "Lösche Aufgabe!\n" "Sind Sie sicher?" -#: yms/ui/base.ui:97 yms/ui/base.ui:816 +#: yms/ui/base.ui:105 yms/ui/base.ui:972 msgid "Year built" msgstr "Baujahr" -#: yms/ui/base.ui:108 yms/ui/base.ui:618 +#: yms/ui/base.ui:119 yms/ui/base.ui:774 msgid "LoA" msgstr "LüA" -#: yms/ui/base.ui:119 +#: yms/ui/base.ui:136 msgid "Draught min" msgstr "Tiefgang min" -#: yms/ui/base.ui:130 yms/ui/base.ui:640 +#: yms/ui/base.ui:153 yms/ui/base.ui:796 msgid "Draught" msgstr "Tiefgang" -#: yms/ui/base.ui:141 yms/ui/base.ui:976 +#: yms/ui/base.ui:170 yms/ui/base.ui:1132 msgid "Beam" msgstr "Breite" -#: yms/ui/base.ui:152 +#: yms/ui/base.ui:187 msgid "LwL" msgstr "" -#: yms/ui/base.ui:163 yms/ui/base.ui:721 +#: yms/ui/base.ui:204 yms/ui/base.ui:877 msgid "Ballast" msgstr "" -#: yms/ui/base.ui:285 yms/ui/base.ui:839 +#: yms/ui/base.ui:364 yms/ui/base.ui:995 msgid "Shipyard" msgstr "Werft" -#: yms/ui/base.ui:308 yms/ui/base.ui:710 +#: yms/ui/base.ui:397 yms/ui/base.ui:866 msgid "Displacement" msgstr "Verdrängung" -#: yms/ui/base.ui:331 +#: yms/ui/base.ui:430 msgid "Belt position, bow" msgstr "Gurtposition, vorne" -#: yms/ui/base.ui:342 yms/ui/base.ui:922 +#: yms/ui/base.ui:447 yms/ui/base.ui:1078 msgid "Belt position, aft" msgstr "Gurtposition, achtern" -#: yms/ui/base.ui:377 yms/ui/base.ui:861 +#: yms/ui/base.ui:496 yms/ui/base.ui:1017 msgid "Hull shape" msgstr "Rumpfform" -#: yms/ui/base.ui:426 yms/ui/base.ui:777 +#: yms/ui/base.ui:562 yms/ui/base.ui:933 msgid "Default Storage" msgstr "Standard-Stauraum" -#: yms/ui/base.ui:449 yms/ui/base.ui:933 +#: yms/ui/base.ui:595 yms/ui/base.ui:1089 msgid "Hull number" msgstr "Rumpfnummer" -#: yms/ui/base.ui:482 yms/ui/base.ui:1143 yms/ui/boxes.ui:474 -#: yms/ui/cables.ui:579 yms/ui/companies.ui:1041 yms/ui/documents.ui:598 -#: yms/ui/equipment.ui:634 yms/ui/fuses.ui:461 yms/ui/inventory.ui:580 -#: yms/ui/maintenance.ui:467 yms/ui/measurement.ui:490 yms/ui/projects.ui:462 -#: yms/ui/provisions.ui:939 yms/ui/storage.ui:455 yms/ui/tasks.ui:589 +#: yms/ui/base.ui:638 yms/ui/base.ui:1299 yms/ui/boxes.ui:474 +#: yms/ui/cables.ui:579 yms/ui/companies.ui:1041 yms/ui/documents.ui:645 +#: yms/ui/equipment.ui:657 yms/ui/fuses.ui:461 yms/ui/inventory.ui:580 +#: yms/ui/maintenance.ui:467 yms/ui/measurement.ui:513 yms/ui/projects.ui:462 +#: yms/ui/provisions.ui:1052 yms/ui/storage.ui:455 yms/ui/tasks.ui:589 msgid "Delete" msgstr "Löschen" -#: yms/ui/base.ui:497 +#: yms/ui/base.ui:653 msgid "Add" msgstr "Hinzufügen" -#: yms/ui/base.ui:511 yms/ui/base.ui:1474 yms/ui/boxes.ui:195 +#: yms/ui/base.ui:667 yms/ui/base.ui:1630 yms/ui/boxes.ui:195 #: yms/ui/boxes.ui:489 yms/ui/cables.ui:209 yms/ui/cables.ui:594 -#: yms/ui/companies.ui:147 yms/ui/companies.ui:1056 yms/ui/documents.ui:296 -#: yms/ui/documents.ui:613 yms/ui/equipment.ui:277 yms/ui/equipment.ui:649 +#: yms/ui/companies.ui:147 yms/ui/companies.ui:1056 yms/ui/documents.ui:343 +#: yms/ui/documents.ui:660 yms/ui/equipment.ui:277 yms/ui/equipment.ui:672 #: yms/ui/fuses.ui:194 yms/ui/fuses.ui:476 yms/ui/inventory.ui:200 #: yms/ui/inventory.ui:595 yms/ui/maintenance.ui:179 yms/ui/maintenance.ui:482 -#: yms/ui/measurement.ui:179 yms/ui/measurement.ui:505 yms/ui/projects.ui:203 -#: yms/ui/projects.ui:477 yms/ui/provisions.ui:190 yms/ui/provisions.ui:954 +#: yms/ui/measurement.ui:179 yms/ui/measurement.ui:528 yms/ui/projects.ui:203 +#: yms/ui/projects.ui:477 yms/ui/provisions.ui:205 yms/ui/provisions.ui:1067 #: yms/ui/storage.ui:189 yms/ui/storage.ui:470 yms/ui/tasks.ui:278 #: yms/ui/tasks.ui:604 msgid "Edit" msgstr "Bearbeiten" -#: yms/ui/base.ui:533 +#: yms/ui/base.ui:689 msgid "page_detail" msgstr "" -#: yms/ui/base.ui:546 +#: yms/ui/base.ui:702 msgid "Ghost" msgstr "" -#: yms/ui/base.ui:629 +#: yms/ui/base.ui:785 msgid "LWL" msgstr "" -#: yms/ui/base.ui:651 +#: yms/ui/base.ui:807 msgid "Draught, min" msgstr "Tiefgang, min" -#: yms/ui/base.ui:827 yms/ui/base.ui:883 yms/ui/base.ui:897 yms/ui/boxes.ui:647 -#: yms/ui/boxes.ui:662 yms/ui/boxes.ui:677 yms/ui/boxes.ui:788 -#: yms/ui/boxes.ui:801 yms/ui/boxes.ui:814 yms/ui/storage.ui:738 +#: yms/ui/base.ui:983 yms/ui/base.ui:1039 yms/ui/base.ui:1053 +#: yms/ui/boxes.ui:647 yms/ui/boxes.ui:662 yms/ui/boxes.ui:677 +#: yms/ui/boxes.ui:788 yms/ui/boxes.ui:801 yms/ui/boxes.ui:814 +#: yms/ui/provisions.ui:577 yms/ui/provisions.ui:601 yms/ui/storage.ui:738 #: yms/ui/storage.ui:753 yms/ui/storage.ui:768 msgid "0" msgstr "" -#: yms/ui/base.ui:911 +#: yms/ui/base.ui:1067 msgid "Belt position, front" msgstr "Gurtposition, vorne" -#: yms/ui/base.ui:954 +#: yms/ui/base.ui:1110 msgid "Hull type" msgstr "Rumpfform" -#: yms/ui/base.ui:987 +#: yms/ui/base.ui:1143 yms/ui/provisions.ui:625 msgid "0,00" msgstr "" -#: yms/ui/base.ui:1000 -#, fuzzy +#: yms/ui/base.ui:1156 msgid "Vessel type" -msgstr "Boot" +msgstr "Bootstyp" -#: yms/ui/base.ui:1039 yms/ui/base.ui:1387 yms/ui/base.ui:1662 +#: yms/ui/base.ui:1195 yms/ui/base.ui:1543 yms/ui/base.ui:1818 #: yms/ui/boxes.ui:938 yms/ui/cables.ui:1011 yms/ui/companies.ui:575 -#: yms/ui/documents.ui:792 yms/ui/equipment.ui:988 yms/ui/fuses.ui:756 -#: yms/ui/inventory.ui:1030 yms/ui/maintenance.ui:781 yms/ui/measurement.ui:826 -#: yms/ui/projects.ui:744 yms/ui/provisions.ui:558 yms/ui/storage.ui:961 +#: yms/ui/documents.ui:877 yms/ui/equipment.ui:1035 yms/ui/fuses.ui:756 +#: yms/ui/inventory.ui:1030 yms/ui/maintenance.ui:781 yms/ui/measurement.ui:870 +#: yms/ui/projects.ui:744 yms/ui/provisions.ui:648 yms/ui/storage.ui:970 #: yms/ui/tasks.ui:920 msgid "Save" msgstr "Speichern" -#: yms/ui/base.ui:1053 yms/ui/boxes.ui:952 yms/ui/cables.ui:1025 -#: yms/ui/companies.ui:589 yms/ui/documents.ui:806 yms/ui/equipment.ui:1002 +#: yms/ui/base.ui:1209 yms/ui/boxes.ui:952 yms/ui/cables.ui:1025 +#: yms/ui/companies.ui:589 yms/ui/documents.ui:891 yms/ui/equipment.ui:1049 #: yms/ui/fuses.ui:770 yms/ui/inventory.ui:1044 yms/ui/maintenance.ui:795 -#: yms/ui/measurement.ui:840 yms/ui/projects.ui:758 yms/ui/provisions.ui:572 -#: yms/ui/storage.ui:975 yms/ui/tasks.ui:934 +#: yms/ui/measurement.ui:884 yms/ui/projects.ui:758 yms/ui/provisions.ui:662 +#: yms/ui/storage.ui:984 yms/ui/tasks.ui:934 msgid "Cancel" msgstr "Abbruch" -#: yms/ui/base.ui:1075 +#: yms/ui/base.ui:1231 msgid "page_edit" msgstr "" -#: yms/ui/base.ui:1085 +#: yms/ui/base.ui:1241 msgid "Vessel" msgstr "Boot" -#: yms/ui/base.ui:1129 yms/ui/boxes.ui:181 yms/ui/cables.ui:195 -#: yms/ui/companies.ui:133 yms/ui/documents.ui:282 yms/ui/equipment.ui:263 +#: yms/ui/base.ui:1285 yms/ui/boxes.ui:181 yms/ui/cables.ui:195 +#: yms/ui/companies.ui:133 yms/ui/documents.ui:329 yms/ui/equipment.ui:263 #: yms/ui/fuses.ui:180 yms/ui/inventory.ui:186 yms/ui/maintenance.ui:165 -#: yms/ui/measurement.ui:165 yms/ui/projects.ui:188 yms/ui/provisions.ui:176 +#: yms/ui/measurement.ui:165 yms/ui/projects.ui:188 yms/ui/provisions.ui:191 #: yms/ui/storage.ui:175 yms/ui/tasks.ui:264 msgid "New" msgstr "Neu" -#: yms/ui/base.ui:1182 +#: yms/ui/base.ui:1338 msgid "Login" msgstr "Anmeldung" -#: yms/ui/base.ui:1193 +#: yms/ui/base.ui:1349 msgid "Displayname" msgstr "Anzeigename" -#: yms/ui/base.ui:1224 +#: yms/ui/base.ui:1380 msgid "Role" msgstr "Rolle" -#: yms/ui/base.ui:1235 +#: yms/ui/base.ui:1391 msgid "Language" msgstr "Sprache" -#: yms/ui/base.ui:1266 +#: yms/ui/base.ui:1422 msgid "Password" msgstr "Kennwort" -#: yms/ui/base.ui:1285 +#: yms/ui/base.ui:1441 msgid "Create" msgstr "Anlegen" -#: yms/ui/base.ui:1298 +#: yms/ui/base.ui:1454 msgid "Locked" msgstr "Gesperrt" -#: yms/ui/base.ui:1311 +#: yms/ui/base.ui:1467 msgid "Deleted" msgstr "Gelöscht" -#: yms/ui/base.ui:1421 +#: yms/ui/base.ui:1577 msgid "User" msgstr "Benutzer" -#: yms/ui/base.ui:1461 yms/ui/boxes.ui:209 yms/ui/cables.ui:223 -#: yms/ui/companies.ui:161 yms/ui/documents.ui:310 yms/ui/equipment.ui:291 +#: yms/ui/base.ui:1617 yms/ui/boxes.ui:209 yms/ui/cables.ui:223 +#: yms/ui/companies.ui:161 yms/ui/documents.ui:357 yms/ui/equipment.ui:291 #: yms/ui/fuses.ui:208 yms/ui/inventory.ui:214 yms/ui/maintenance.ui:193 -#: yms/ui/measurement.ui:193 yms/ui/projects.ui:218 yms/ui/provisions.ui:204 +#: yms/ui/measurement.ui:193 yms/ui/projects.ui:218 yms/ui/provisions.ui:219 #: yms/ui/storage.ui:203 yms/ui/tasks.ui:292 msgid "Details" msgstr "" -#: yms/ui/base.ui:1501 +#: yms/ui/base.ui:1657 msgid "Lists" msgstr "Listen" -#: yms/ui/base.ui:1517 +#: yms/ui/base.ui:1673 msgid "Global system settings" msgstr "" -#: yms/ui/base.ui:1537 +#: yms/ui/base.ui:1693 msgid "Currency symbol" msgstr "" -#: yms/ui/base.ui:1548 +#: yms/ui/base.ui:1704 msgid "Max image width" msgstr "" -#: yms/ui/base.ui:1559 +#: yms/ui/base.ui:1715 msgid "Max image height" msgstr "" -#: yms/ui/base.ui:1610 +#: yms/ui/base.ui:1766 msgid "User settings" msgstr "" -#: yms/ui/base.ui:1630 +#: yms/ui/base.ui:1786 msgid "Date format" msgstr "" -#: yms/ui/base.ui:1690 +#: yms/ui/base.ui:1846 msgid "Settings" msgstr "" -#: yms/ui/base.ui:1706 +#: yms/ui/base.ui:1862 msgid "Backup to USB stick" msgstr "" -#: yms/ui/base.ui:1723 +#: yms/ui/base.ui:1879 msgid "UUID" msgstr "" -#: yms/ui/base.ui:1734 +#: yms/ui/base.ui:1890 msgid "Device" msgstr "" -#: yms/ui/base.ui:1743 +#: yms/ui/base.ui:1899 msgid "Detect" msgstr "" -#: yms/ui/base.ui:1779 +#: yms/ui/base.ui:1935 msgid "Initialize" msgstr "" -#: yms/ui/base.ui:1793 +#: yms/ui/base.ui:1949 msgid "Last Backup" msgstr "" -#: yms/ui/base.ui:1837 +#: yms/ui/base.ui:1993 msgid "Vendor" msgstr "" -#: yms/ui/base.ui:1859 +#: yms/ui/base.ui:2015 msgid "Partition" msgstr "" -#: yms/ui/base.ui:1912 +#: yms/ui/base.ui:2068 msgid "Filesystem" msgstr "" -#: yms/ui/base.ui:1985 yms/ui/base.ui:2025 +#: yms/ui/base.ui:2141 yms/ui/base.ui:2181 msgid "Backup" msgstr "" -#: yms/ui/base.ui:1998 +#: yms/ui/base.ui:2154 msgid "Restore" msgstr "" #: yms/ui/boxes.ui:61 yms/ui/cables.ui:56 yms/ui/companies.ui:24 -#: yms/ui/documents.ui:143 yms/ui/equipment.ui:41 yms/ui/fuses.ui:41 +#: yms/ui/documents.ui:190 yms/ui/equipment.ui:41 yms/ui/fuses.ui:41 #: yms/ui/inventory.ui:46 yms/ui/maintenance.ui:46 yms/ui/measurement.ui:46 -#: yms/ui/projects.ui:46 yms/ui/provisions.ui:100 yms/ui/storage.ui:71 +#: yms/ui/projects.ui:46 yms/ui/provisions.ui:115 yms/ui/storage.ui:71 #: yms/ui/tasks.ui:31 msgid "Clear" msgstr "Löschen" #: yms/ui/boxes.ui:74 yms/ui/cables.ui:69 yms/ui/companies.ui:36 -#: yms/ui/documents.ui:156 yms/ui/equipment.ui:54 yms/ui/fuses.ui:54 +#: yms/ui/documents.ui:203 yms/ui/equipment.ui:54 yms/ui/fuses.ui:54 #: yms/ui/inventory.ui:59 yms/ui/maintenance.ui:59 yms/ui/measurement.ui:59 -#: yms/ui/projects.ui:60 yms/ui/provisions.ui:113 yms/ui/storage.ui:84 +#: yms/ui/projects.ui:60 yms/ui/provisions.ui:128 yms/ui/storage.ui:84 #: yms/ui/tasks.ui:44 msgid "Apply" msgstr "Anwenden" #: yms/ui/boxes.ui:142 -#, fuzzy msgid "Filter Box" -msgstr "Filter Projekte" +msgstr "Filter Kisten" #: yms/ui/boxes.ui:231 yms/ui/cables.ui:245 yms/ui/companies.ui:183 -#: yms/ui/documents.ui:332 yms/ui/equipment.ui:313 yms/ui/fuses.ui:230 +#: yms/ui/documents.ui:379 yms/ui/equipment.ui:313 yms/ui/fuses.ui:230 #: yms/ui/inventory.ui:236 yms/ui/maintenance.ui:215 yms/ui/measurement.ui:215 -#: yms/ui/projects.ui:240 yms/ui/provisions.ui:226 yms/ui/storage.ui:225 +#: yms/ui/projects.ui:240 yms/ui/provisions.ui:241 yms/ui/storage.ui:225 #: yms/ui/tasks.ui:314 msgid "page0" msgstr "" #: yms/ui/boxes.ui:243 msgid "Box Details" -msgstr "" +msgstr "Kistendetails" #: yms/ui/boxes.ui:343 yms/ui/boxes.ui:827 yms/ui/cables.ui:379 -#: yms/ui/cables.ui:785 yms/ui/storage.ui:395 yms/ui/storage.ui:890 +#: yms/ui/cables.ui:785 yms/ui/storage.ui:395 yms/ui/storage.ui:879 msgid "Color" msgstr "" #: yms/ui/boxes.ui:354 yms/ui/boxes.ui:701 yms/ui/cables.ui:368 #: yms/ui/cables.ui:774 yms/ui/equipment.ui:400 yms/ui/inventory.ui:334 -#: yms/ui/inventory.ui:757 yms/ui/provisions.ui:321 yms/ui/provisions.ui:718 -#, fuzzy +#: yms/ui/inventory.ui:757 yms/ui/provisions.ui:336 yms/ui/provisions.ui:808 msgid "Weight" -msgstr "Gewicht, kg" +msgstr "Gewicht" -#: yms/ui/boxes.ui:398 yms/ui/boxes.ui:742 yms/ui/provisions.ui:332 -#: yms/ui/provisions.ui:729 -#, fuzzy +#: yms/ui/boxes.ui:398 yms/ui/boxes.ui:742 yms/ui/provisions.ui:347 +#: yms/ui/provisions.ui:819 msgid "Weight net" -msgstr "Gewicht, kg" +msgstr "Nettogewicht" #: yms/ui/boxes.ui:420 yms/ui/boxes.ui:690 yms/ui/equipment.ui:411 -#: yms/ui/inventory.ui:345 yms/ui/inventory.ui:768 yms/ui/provisions.ui:857 -#, fuzzy +#: yms/ui/inventory.ui:345 yms/ui/inventory.ui:768 yms/ui/provisions.ui:613 +#: yms/ui/provisions.ui:947 msgid "Price" -msgstr "Preis, €" +msgstr "Preis" #: yms/ui/boxes.ui:503 yms/ui/cables.ui:608 yms/ui/companies.ui:1070 -#: yms/ui/documents.ui:45 yms/ui/documents.ui:627 yms/ui/equipment.ui:663 -#: yms/ui/fuses.ui:490 yms/ui/inventory.ui:609 yms/ui/maintenance.ui:496 -#: yms/ui/measurement.ui:519 yms/ui/projects.ui:491 yms/ui/provisions.ui:968 -#: yms/ui/storage.ui:484 yms/ui/tasks.ui:618 +#: yms/ui/documents.ui:49 yms/ui/documents.ui:139 yms/ui/documents.ui:674 +#: yms/ui/equipment.ui:686 yms/ui/fuses.ui:490 yms/ui/inventory.ui:609 +#: yms/ui/maintenance.ui:496 yms/ui/measurement.ui:542 yms/ui/projects.ui:491 +#: yms/ui/provisions.ui:1081 yms/ui/storage.ui:484 yms/ui/tasks.ui:618 msgid "Close" msgstr "Schließen" #: yms/ui/boxes.ui:525 yms/ui/cables.ui:630 yms/ui/companies.ui:612 -#: yms/ui/documents.ui:649 yms/ui/equipment.ui:700 yms/ui/fuses.ui:512 -#: yms/ui/inventory.ui:646 yms/ui/maintenance.ui:518 yms/ui/measurement.ui:541 -#: yms/ui/projects.ui:513 yms/ui/provisions.ui:594 yms/ui/storage.ui:506 +#: yms/ui/documents.ui:696 yms/ui/equipment.ui:723 yms/ui/fuses.ui:512 +#: yms/ui/inventory.ui:646 yms/ui/maintenance.ui:518 yms/ui/measurement.ui:564 +#: yms/ui/projects.ui:513 yms/ui/provisions.ui:684 yms/ui/storage.ui:506 #: yms/ui/tasks.ui:640 msgid "page1" msgstr "" #: yms/ui/boxes.ui:608 msgid "Dimensions (L x W x H)" -msgstr "" +msgstr "Abmessungen (L x B x H)" #: yms/ui/boxes.ui:621 yms/ui/boxes.ui:634 msgid "x" @@ -911,21 +914,20 @@ msgid "mm" msgstr "" #: yms/ui/boxes.ui:974 yms/ui/cables.ui:1047 yms/ui/companies.ui:1092 -#: yms/ui/documents.ui:858 yms/ui/equipment.ui:1025 yms/ui/fuses.ui:792 -#: yms/ui/inventory.ui:1066 yms/ui/maintenance.ui:817 yms/ui/measurement.ui:862 -#: yms/ui/projects.ui:780 yms/ui/provisions.ui:990 yms/ui/storage.ui:997 +#: yms/ui/documents.ui:943 yms/ui/equipment.ui:1072 yms/ui/fuses.ui:792 +#: yms/ui/inventory.ui:1066 yms/ui/maintenance.ui:817 yms/ui/measurement.ui:906 +#: yms/ui/projects.ui:780 yms/ui/provisions.ui:1103 yms/ui/storage.ui:1006 #: yms/ui/tasks.ui:956 msgid "page2" msgstr "" #: yms/ui/cables.ui:156 -#, fuzzy msgid "Filter Cables" -msgstr "Filter Projekte" +msgstr "Filter Kabel" #: yms/ui/cables.ui:257 msgid "Cable Details" -msgstr "" +msgstr "Kabeldetails" #: yms/ui/cables.ui:312 yms/ui/cables.ui:707 msgid "Tech.-name" @@ -933,51 +935,49 @@ msgstr "" #: yms/ui/cables.ui:324 yms/ui/cables.ui:718 msgid "Length" -msgstr "" +msgstr "Länge" #: yms/ui/cables.ui:335 yms/ui/cables.ui:733 -#, fuzzy msgid "Conductors" -msgstr "Zustand" +msgstr "Leiter" #: yms/ui/cables.ui:346 yms/ui/cables.ui:748 msgid "Diameter" -msgstr "" +msgstr "Durchmesser" #: yms/ui/cables.ui:357 yms/ui/cables.ui:759 msgid "Cross section" -msgstr "" +msgstr "Querschnitt" #: yms/ui/cables.ui:390 yms/ui/cables.ui:796 yms/ui/equipment.ui:98 -#: yms/ui/equipment.ui:433 yms/ui/equipment.ui:881 +#: yms/ui/equipment.ui:433 yms/ui/equipment.ui:907 msgid "Supplier" msgstr "Lieferant" #: yms/ui/cables.ui:644 msgid "Edit Cable" -msgstr "" +msgstr "Bearbeite Kabel" -#: yms/ui/companies.ui:61 yms/ui/documents.ui:200 yms/ui/equipment.ui:109 +#: yms/ui/companies.ui:61 yms/ui/documents.ui:247 yms/ui/equipment.ui:109 #: yms/ui/inventory.ui:103 yms/ui/maintenance.ui:92 yms/ui/measurement.ui:92 -#: yms/ui/provisions.ui:72 yms/ui/storage.ui:106 yms/ui/tasks.ui:88 +#: yms/ui/provisions.ui:87 yms/ui/storage.ui:106 yms/ui/tasks.ui:88 msgid "Text" msgstr "" #: yms/ui/companies.ui:94 -#, fuzzy msgid "Filter Companies" -msgstr "Firmen" +msgstr "Filter Firmen" #: yms/ui/companies.ui:198 msgid "Edit company" -msgstr "" +msgstr "Bearbeite Firma" #: yms/ui/companies.ui:260 msgid "Secondary type" -msgstr "" +msgstr "Sekundärer Typ" #: yms/ui/companies.ui:291 yms/ui/companies.ui:678 yms/ui/equipment.ui:356 -#: yms/ui/equipment.ui:744 +#: yms/ui/equipment.ui:770 msgid "Short name" msgstr "Kurzname" @@ -1022,9 +1022,8 @@ msgid "Contract no." msgstr "Kontraktnr." #: yms/ui/companies.ui:625 -#, fuzzy msgid "Company details" -msgstr "Firmen" +msgstr "Firmendetails" #: yms/ui/companies.ui:667 msgid "Type secondary" @@ -1035,61 +1034,66 @@ msgstr "" msgid "Flags" msgstr "" -#: yms/ui/documents.ui:19 +#: yms/ui/documents.ui:23 msgid "Preview" -msgstr "" +msgstr "Vorschau" -#: yms/ui/documents.ui:32 yms/ui/documents.ui:835 +#: yms/ui/documents.ui:36 yms/ui/documents.ui:920 msgid "Scan" msgstr "" -#: yms/ui/documents.ui:189 +#: yms/ui/documents.ui:236 msgid "Reference" msgstr "Referenz" -#: yms/ui/documents.ui:243 +#: yms/ui/documents.ui:290 msgid "Filter Documents" msgstr "Filter Dokumente" -#: yms/ui/documents.ui:344 +#: yms/ui/documents.ui:391 msgid "Document Details" msgstr "Dokumentdetails" -#: yms/ui/documents.ui:398 +#: yms/ui/documents.ui:445 msgid "Image extents" msgstr "Abmaße" -#: yms/ui/documents.ui:409 +#: yms/ui/documents.ui:456 msgid "Mimetype" msgstr "" -#: yms/ui/documents.ui:456 +#: yms/ui/documents.ui:503 msgid "File size" msgstr "Dateigröße" -#: yms/ui/documents.ui:467 +#: yms/ui/documents.ui:514 msgid "Upload date" -msgstr "" +msgstr "Uploaddatum" -#: yms/ui/documents.ui:478 yms/ui/documents.ui:760 +#: yms/ui/documents.ui:525 yms/ui/documents.ui:807 msgid "Document type" msgstr "Dokumentart" -#: yms/ui/documents.ui:551 +#: yms/ui/documents.ui:598 msgid "Role access" msgstr "" -#: yms/ui/documents.ui:664 +#: yms/ui/documents.ui:711 msgid "Edit Document" msgstr "Dokument bearbeiten" -#: yms/ui/documents.ui:820 +#: yms/ui/documents.ui:831 +msgid "Access level" +msgstr "Zugriffsebene" + +#: yms/ui/documents.ui:905 msgid "Upload" msgstr "" -#: yms/ui/equipment.ui:76 yms/ui/equipment.ui:444 yms/ui/equipment.ui:892 +#: yms/ui/equipment.ui:76 yms/ui/equipment.ui:444 yms/ui/equipment.ui:918 #: yms/ui/inventory.ui:524 yms/ui/inventory.ui:919 yms/ui/measurement.ui:457 -#: yms/ui/measurement.ui:794 yms/ui/provisions.ui:274 yms/ui/provisions.ui:638 +#: yms/ui/measurement.ui:817 yms/ui/provisions.ui:64 yms/ui/provisions.ui:289 +#: yms/ui/provisions.ui:728 msgid "Category" msgstr "Kategorie" @@ -1113,7 +1117,7 @@ msgstr "Filter Ausrüstung" msgid "Equipment details" msgstr "Ausrüstungsdetails" -#: yms/ui/equipment.ui:389 yms/ui/equipment.ui:797 +#: yms/ui/equipment.ui:389 yms/ui/equipment.ui:823 msgid "Serial no." msgstr "Seriennummer" @@ -1121,19 +1125,19 @@ msgstr "Seriennummer" msgid "Date purchase" msgstr "Kaufdatum" -#: yms/ui/equipment.ui:677 yms/ui/inventory.ui:623 +#: yms/ui/equipment.ui:700 yms/ui/inventory.ui:623 msgid "Convert" msgstr "Umwandeln" -#: yms/ui/equipment.ui:808 +#: yms/ui/equipment.ui:834 msgid "Weight, kg" msgstr "Gewicht, kg" -#: yms/ui/equipment.ui:819 +#: yms/ui/equipment.ui:845 msgid "Price, €" msgstr "Preis, €" -#: yms/ui/equipment.ui:830 +#: yms/ui/equipment.ui:856 msgid "Date puchase" msgstr "Kaufdatum" @@ -1161,8 +1165,8 @@ msgstr "Filter Inventar" msgid "Inventory details" msgstr "Inventardetails" -#: yms/ui/inventory.ui:301 yms/ui/inventory.ui:721 yms/ui/provisions.ui:296 -#: yms/ui/provisions.ui:696 +#: yms/ui/inventory.ui:301 yms/ui/inventory.ui:721 yms/ui/provisions.ui:311 +#: yms/ui/provisions.ui:786 msgid "Box" msgstr "Kiste" @@ -1178,10 +1182,6 @@ msgstr "Inventar bearbeiten" msgid "Puchase date" msgstr "Kaufdatum" -#: yms/ui/main.ui:7 -msgid "YMS" -msgstr "" - #: yms/ui/maintenance.ui:126 msgid "Filter Maintenance" msgstr "Filter Wartung" @@ -1222,26 +1222,32 @@ msgstr "Filter Maß/Messung" msgid "Measurement Details" msgstr "Maß/Messung-Details" -#: yms/ui/measurement.ui:293 yms/ui/measurement.ui:593 +#: yms/ui/measurement.ui:293 msgid "Dimensions" msgstr "Abmessungen" -#: yms/ui/measurement.ui:304 yms/ui/measurement.ui:607 +#: yms/ui/measurement.ui:304 yms/ui/measurement.ui:630 msgid "Value 1" msgstr "Wert 1" -#: yms/ui/measurement.ui:315 yms/ui/measurement.ui:618 +#: yms/ui/measurement.ui:315 yms/ui/measurement.ui:641 msgid "Value 2" msgstr "Wert 2" -#: yms/ui/measurement.ui:326 yms/ui/measurement.ui:629 +#: yms/ui/measurement.ui:326 yms/ui/measurement.ui:652 msgid "Value 3" msgstr "Wert 3" -#: yms/ui/measurement.ui:651 +#: yms/ui/measurement.ui:480 yms/ui/measurement.ui:674 msgid "Date" msgstr "Datum" +#. 1 to 3 dimensions +#: yms/ui/measurement.ui:616 +msgctxt "measurement" +msgid "Dimensions" +msgstr "Dimensionen" + #: yms/ui/projects.ui:149 msgid "Filter Projects" msgstr "Filter Projekte" @@ -1270,35 +1276,34 @@ msgstr "Tatsächliche Kosten" msgid "Duration days" msgstr "" -#: yms/ui/provisions.ui:49 -msgid "Kategorie" -msgstr "" - -#: yms/ui/provisions.ui:137 -#, fuzzy +#: yms/ui/provisions.ui:152 msgid "Filter Provisions" -msgstr "Verpflegung ansehen" +msgstr "Filter Verpflegung" -#: yms/ui/provisions.ui:238 +#: yms/ui/provisions.ui:253 msgid "Edit provision" msgstr "Verpflegung bearbeiten" -#: yms/ui/provisions.ui:354 yms/ui/provisions.ui:751 +#: yms/ui/provisions.ui:369 yms/ui/provisions.ui:841 msgid "Storedate" msgstr "Einlagerdatum" -#: yms/ui/provisions.ui:365 yms/ui/provisions.ui:762 +#: yms/ui/provisions.ui:380 yms/ui/provisions.ui:852 msgid "Shelflife" msgstr "Haltbarkeit" -#: yms/ui/provisions.ui:607 +#: yms/ui/provisions.ui:565 yms/ui/provisions.ui:970 +msgid "Target" +msgstr "Zielbestand" + +#: yms/ui/provisions.ui:589 yms/ui/provisions.ui:1019 +msgid "Calories" +msgstr "Kalorien" + +#: yms/ui/provisions.ui:697 msgid "View Provision" msgstr "Verpflegung ansehen" -#: yms/ui/provisions.ui:880 -msgid "Target" -msgstr "" - #: yms/ui/status.ui:50 msgid "" "This is an early release of YMS native GUI.\n" @@ -1321,10 +1326,6 @@ msgstr "Tabellen" msgid "Config" msgstr "Konfiguration" -#: yms/ui/status.ui:181 -msgid "YMS version x.x.x" -msgstr "" - #: yms/ui/storage.ui:136 msgid "Filter Storage" msgstr "Filter Stauraum" @@ -1357,36 +1358,12 @@ msgstr "Typ" msgid "Position, mm" msgstr "" -#: yms/ui/storage.ui:585 -msgid "X" -msgstr "" - -#: yms/ui/storage.ui:598 -msgid "Y" -msgstr "" - -#: yms/ui/storage.ui:611 -msgid "Z" -msgstr "" - #: yms/ui/storage.ui:686 msgid "Width, mm" msgstr "Breite, mm" -#: yms/ui/storage.ui:699 -msgid "WX" -msgstr "" - -#: yms/ui/storage.ui:712 -msgid "WY" -msgstr "" - -#: yms/ui/storage.ui:725 -msgid "WZ" -msgstr "" - -#: yms/ui/storage.ui:879 -msgid "Degrees" +#: yms/ui/storage.ui:916 +msgid "Deg" msgstr "Grad" #: yms/ui/tasks.ui:66 yms/ui/tasks.ui:777 @@ -1395,7 +1372,7 @@ msgstr "Projekt" #: yms/ui/tasks.ui:142 msgid "pending" -msgstr "" +msgstr "Ausstehend" #: yms/ui/tasks.ui:156 msgid "active" @@ -1459,7 +1436,7 @@ msgstr "Hervorragend" #: db/mariadb.sql:284 msgctxt "cable.cablecond" msgid "fair" -msgstr "" +msgstr "Normal" #: db/mariadb.sql:284 msgctxt "cable.cablecond" @@ -1481,32 +1458,32 @@ msgctxt "cable.cablecond" msgid "unknown" msgstr "Unbekannt" -#: db/mariadb.sql:528 +#: db/mariadb.sql:529 msgctxt "checkitem.checkresult" msgid "checked" msgstr "Markiert" -#: db/mariadb.sql:528 +#: db/mariadb.sql:529 msgctxt "checkitem.checkresult" msgid "unchecked" msgstr "Unmarkiert" -#: db/mariadb.sql:528 +#: db/mariadb.sql:529 msgctxt "checkitem.checkresult" msgid "unused" msgstr "Unbenutzt" -#: db/mariadb.sql:511 +#: db/mariadb.sql:512 msgctxt "checklist.clstate" msgid "closed" msgstr "Geschlossen" -#: db/mariadb.sql:511 +#: db/mariadb.sql:512 msgctxt "checklist.clstate" msgid "new" msgstr "Neu" -#: db/mariadb.sql:511 +#: db/mariadb.sql:512 msgctxt "checklist.clstate" msgid "open" msgstr "Offen" @@ -1589,22 +1566,22 @@ msgstr "Bild" #: db/mariadb.sql:390 msgctxt "document.roleaccess" msgid "captain" -msgstr "" +msgstr "Kapitän" #: db/mariadb.sql:390 msgctxt "document.roleaccess" msgid "helmsman" -msgstr "" +msgstr "Steuermann" #: db/mariadb.sql:390 msgctxt "document.roleaccess" msgid "sailor" -msgstr "" +msgstr "Seemann" #: db/mariadb.sql:390 msgctxt "document.roleaccess" msgid "unauth" -msgstr "" +msgstr "Unauthorisiert" #: db/mariadb.sql:67 msgctxt "dropdown.flags" @@ -1619,7 +1596,7 @@ msgstr "Gesperrt" #: db/mariadb.sql:217 msgctxt "equipment.econd" msgid "bad" -msgstr "schlecht" +msgstr "Schlecht" #: db/mariadb.sql:217 msgctxt "equipment.econd" @@ -1634,7 +1611,7 @@ msgstr "Exzellent" #: db/mariadb.sql:217 msgctxt "equipment.econd" msgid "fair" -msgstr "" +msgstr "Normal" #: db/mariadb.sql:217 msgctxt "equipment.econd" @@ -1726,26 +1703,56 @@ msgctxt "inventory.invcond" msgid "unknown" msgstr "Unbekannt" -#: db/mariadb.sql:423 +#: db/mariadb.sql:424 msgctxt "maintenance.maintstate" msgid "done" msgstr "Erledigt" -#: db/mariadb.sql:423 +#: db/mariadb.sql:424 +msgctxt "maintenance.maintstate" +msgid "missed" +msgstr "Verpaßt" + +#: db/mariadb.sql:424 msgctxt "maintenance.maintstate" msgid "new" msgstr "Neu" -#: db/mariadb.sql:423 +#: db/mariadb.sql:424 msgctxt "maintenance.maintstate" msgid "ongoing" msgstr "Laufend" -#: db/mariadb.sql:423 +#: db/mariadb.sql:424 msgctxt "maintenance.maintstate" msgid "plan" msgstr "Geplant" +#: db/mariadb.sql:424 +msgctxt "maintenance.maintstate" +msgid "skipped" +msgstr "Übersprungen" + +#: db/mariadb.sql:419 +msgctxt "maintenance.plan_precision" +msgid "day" +msgstr "Tag" + +#: db/mariadb.sql:419 +msgctxt "maintenance.plan_precision" +msgid "month" +msgstr "Monat" + +#: db/mariadb.sql:419 +msgctxt "maintenance.plan_precision" +msgid "quarter" +msgstr "Quartal" + +#: db/mariadb.sql:419 +msgctxt "maintenance.plan_precision" +msgid "week" +msgstr "Woche" + #: db/mariadb.sql:334 msgctxt "measurement.accuracy" msgid "estimated" @@ -1771,88 +1778,87 @@ msgctxt "measurement.accuracy" msgid "unknown" msgstr "Unbekannt" -#: db/mariadb.sql:484 +#: db/mariadb.sql:485 msgctxt "note.notetype" msgid "equip" msgstr "Ausrüstung" -#: db/mariadb.sql:484 +#: db/mariadb.sql:485 msgctxt "note.notetype" msgid "maint" msgstr "Wartung" -#: db/mariadb.sql:484 +#: db/mariadb.sql:485 msgctxt "note.notetype" msgid "task" msgstr "Aufgabe" -#: db/mariadb.sql:444 +#: db/mariadb.sql:445 msgctxt "project.projstate" msgid "finished" msgstr "Beendet" -#: db/mariadb.sql:444 +#: db/mariadb.sql:445 msgctxt "project.projstate" msgid "new" msgstr "Neu" -#: db/mariadb.sql:444 +#: db/mariadb.sql:445 msgctxt "project.projstate" msgid "ongoing" msgstr "Laufend" -#: db/mariadb.sql:444 +#: db/mariadb.sql:445 msgctxt "project.projstate" msgid "paused" msgstr "Pausiert" -#: db/mariadb.sql:444 +#: db/mariadb.sql:445 msgctxt "project.projstate" msgid "plan" msgstr "Geplant" -#: db/mariadb.sql:499 +#: db/mariadb.sql:500 msgctxt "property.objtype" msgid "equip" msgstr "Ausrüstung" -#: db/mariadb.sql:499 +#: db/mariadb.sql:500 msgctxt "property.objtype" msgid "inv" msgstr "Inventar" -#: db/mariadb.sql:499 +#: db/mariadb.sql:500 msgctxt "property.objtype" msgid "maint" msgstr "Wartung" -#: db/mariadb.sql:499 +#: db/mariadb.sql:500 msgctxt "property.objtype" msgid "proj" msgstr "Projekt" -#: db/mariadb.sql:499 +#: db/mariadb.sql:500 msgctxt "property.objtype" msgid "vessel" msgstr "Boot" -#: db/mariadb.sql:581 +#: db/mariadb.sql:582 msgctxt "revision.revtype" msgid "dropdown" -msgstr "" +msgstr "Dropdown" -#: db/mariadb.sql:581 -#, fuzzy +#: db/mariadb.sql:582 msgctxt "revision.revtype" msgid "table" -msgstr "Kabel" +msgstr "Tabelle" -#: db/mariadb.sql:552 +#: db/mariadb.sql:553 msgctxt "signalk.objtype" msgid "equipment" msgstr "Ausrüstung" -#: db/mariadb.sql:552 +#: db/mariadb.sql:553 msgctxt "signalk.objtype" msgid "storage" msgstr "Stauraum" @@ -1907,42 +1913,42 @@ msgctxt "tagref.objtype" msgid "task" msgstr "Aufgabe" -#: db/mariadb.sql:460 +#: db/mariadb.sql:461 msgctxt "task.priority" msgid "high" msgstr "Hoch" -#: db/mariadb.sql:460 +#: db/mariadb.sql:461 msgctxt "task.priority" msgid "low" msgstr "Niedrig" -#: db/mariadb.sql:460 +#: db/mariadb.sql:461 msgctxt "task.priority" msgid "medium" msgstr "Mittel" -#: db/mariadb.sql:461 +#: db/mariadb.sql:462 msgctxt "task.taskstate" msgid "active" msgstr "Aktiv" -#: db/mariadb.sql:461 +#: db/mariadb.sql:462 msgctxt "task.taskstate" msgid "completed" msgstr "Abgeschlossen" -#: db/mariadb.sql:461 +#: db/mariadb.sql:462 msgctxt "task.taskstate" msgid "deleted" msgstr "Gelöscht" -#: db/mariadb.sql:461 +#: db/mariadb.sql:462 msgctxt "task.taskstate" msgid "pending" msgstr "Ausstehend" -#: db/mariadb.sql:461 +#: db/mariadb.sql:462 msgctxt "task.taskstate" msgid "waiting" msgstr "Wartend" diff --git a/locale/de/LC_MESSAGES/ymsgui.mo b/locale/de/LC_MESSAGES/ymsgui.mo index 8434dfa..65e1b7a 100644 Binary files a/locale/de/LC_MESSAGES/ymsgui.mo and b/locale/de/LC_MESSAGES/ymsgui.mo differ diff --git a/yms/database.py b/yms/database.py index e1c2ed3..27c7c37 100644 --- a/yms/database.py +++ b/yms/database.py @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: WTFPL + import MySQLdb import secrets from gettext import pgettext @@ -50,6 +52,11 @@ class Database: def is_connected(self): return self.conn.open + def is_encrypted(self): + self.cur.execute("SHOW SESSION STATUS LIKE 'Ssl_cipher'") + row = self.cur.fetchone() + return (row and row[1]) + def get_timestamp(self): self.cur.execute("SELECT CURRENT_TIMESTAMP") return self.cur.fetchone()[0] @@ -64,13 +71,13 @@ class Database: def load_enum(self, table, column): """ - Load an enum directly from a database table and provide it as a + Load an enum or set directly from a database table and provide it as a dictionary for use in, for example, selection lists. """ sql = ( "SELECT TRIM(TRAILING ')' FROM SUBSTRING(column_type,6)) " "FROM information_schema.columns " - "WHERE table_schema=DATABASE() AND table_name=%s AND column_name=%s AND data_type='enum'" + "WHERE table_schema=DATABASE() AND table_name=%s AND column_name=%s AND data_type IN ('enum','set')" ) self.cur.execute(sql, (table, column)) row = self.cur.fetchone() diff --git a/yms/gtkutils.py b/yms/gtkutils.py index a6fa66a..11d757d 100644 --- a/yms/gtkutils.py +++ b/yms/gtkutils.py @@ -75,7 +75,8 @@ def get_text_contents(textview): Convenience function to get all contents from GtkTextView """ buf = textview.get_buffer() - return buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True) + contents = buf.get_text(buf.get_start_iter(), buf.get_end_iter(), True).strip() + return contents or None class TouchPopup(): """ diff --git a/yms/lookup.py b/yms/lookup.py index 4129a3e..e8684f4 100644 --- a/yms/lookup.py +++ b/yms/lookup.py @@ -16,7 +16,7 @@ Dropdowns, Database enums and Table numbers """ class Dropdown(IntEnum): - HULL_TYPE = 1 + VESSEL_TYPE = 1 COMPANY_TYPE = 2 STORAGE_TYPE = 3 EQUIPMENT_CATEGORY = 4 @@ -33,51 +33,51 @@ class Dropdown(IntEnum): MEASUREMENT_CATEGORY = 15 DropdownDeps = { - Dropdown.HULL_TYPE: ( - # unused + Dropdown.VESSEL_TYPE: ( + ('vessel', 'vtype') ), Dropdown.COMPANY_TYPE: ( ('company', 'comptype'), ('company', 'comptype2') ), Dropdown.STORAGE_TYPE: ( - ('storage', 'stype'), + ('storage', 'stype') ), Dropdown.EQUIPMENT_CATEGORY: ( - ('equipment', 'ecat'), + ('equipment', 'ecat') ), Dropdown.PROVISION_CATEGORY: ( - ('provisions', 'provcat'), + ('provisions', 'provcat') ), Dropdown.PROVISION_UNIT: ( - ('provisions', 'unit'), + ('provisions', 'unit') ), Dropdown.FUSE_TYPE: ( - ('fuse', 'ftype'), + ('fuse', 'ftype') ), Dropdown.UNIT: ( - ('measurement', 'unit'), + ('measurement', 'unit') ), Dropdown.BOX_TYPE: ( - ('box', 'boxtype'), + ('box', 'boxtype') ), Dropdown.FUSE_BLOCK: ( - ('fuse', 'location'), + ('fuse', 'location') ), Dropdown.CABLE_TYPE: ( - ('cable', 'cabletype'), + ('cable', 'cabletype') ), Dropdown.CABLE_TECHNAME: ( - ('cable', 'techname'), + ('cable', 'techname') ), Dropdown.INVENTORY_CATEGORY: ( - ('inventory', 'invcat'), + ('inventory', 'invcat') ), Dropdown.BBN_VESSELDATA: ( #unused ), Dropdown.MEASUREMENT_CATEGORY: ( - ('measurement', 'mcat'), + ('measurement', 'mcat') ) } @@ -88,7 +88,7 @@ class Table(IntEnum): STORAGE = (4, "storage") BOXES = (5, "boxes") EQUIPMENT = (6, "equipment") - #INVENTORY = (7, "inventory") + INVENTORY = (7, "inventory") PROJECTS = (8, "projects") CABLES = (9, "cables") FUSES = (10, "fuses") @@ -114,6 +114,7 @@ class Lookup: def _load_enums(self): """ + enums and sets translation via gettext from db schema """ db_enums = { @@ -223,7 +224,10 @@ class Lookup: ) self.db.cur.execute(sql, (vid,)) for row in self.db.cur.fetchall(): - storagelist[row[0]] = "{} ({}) - {}".format(row[1], row[2], row[3]) + if row[3]: + storagelist[row[0]] = "{} ({}) - {}".format(row[1], row[2], row[3]) + else: + storagelist[row[0]] = "{} ({})".format(row[1], row[2]) return storagelist def box(self, vid): @@ -236,7 +240,10 @@ class Lookup: ) self.db.cur.execute(sql, (vid,)) for row in self.db.cur.fetchall(): - boxlist[row[0]] = "{} - {}".format(row[1], row[2]) + if row[2]: + boxlist[row[0]] = "{} - {}".format(row[1], row[2]) + else: + boxlist[row[0]] = row[1] return boxlist def equipment(self, vid): diff --git a/yms/model/inventory.py b/yms/model/inventory.py index c5f6a06..01b1175 100644 --- a/yms/model/inventory.py +++ b/yms/model/inventory.py @@ -1,6 +1,7 @@ # SPDX-License-Identifier: WTFPL from .dbrecord import DbRecord +from yms.lookup import Table class Inventory(DbRecord): @@ -13,3 +14,8 @@ class Inventory(DbRecord): def __init__(self, db, invid=None): super().__init__(db, invid) self.title = _("Inventory({})") + + def save(self, commit=True): + super().save() + if commit: + self.conn.commit() diff --git a/yms/model/provision.py b/yms/model/provision.py index edb99d1..3ce660b 100644 --- a/yms/model/provision.py +++ b/yms/model/provision.py @@ -13,3 +13,8 @@ class Provision(DbRecord): def __init__(self, db, provid=None): super().__init__(db, provid) self.title = _("Provision({})") + + def save(self, commit=True): + super().save() + if commit: + self.conn.commit() diff --git a/yms/ui/base.ui b/yms/ui/base.ui index c71ecb4..f8734e3 100644 --- a/yms/ui/base.ui +++ b/yms/ui/base.ui @@ -73,17 +73,25 @@ True False + 4 + 4 vertical + 2 True False + 6 + 8 - + True False Model + 0 @@ -95,6 +103,9 @@ True False Year built + 0 @@ -106,6 +117,12 @@ True False LoA + + + + 0 @@ -117,6 +134,12 @@ True False Draught min + + + + 0 @@ -128,6 +151,12 @@ True False Draught + + + + 0 @@ -139,6 +168,12 @@ True False Beam + + + + 0 @@ -150,6 +185,12 @@ True False LwL + + + + 0 @@ -161,6 +202,12 @@ True False Ballast + + + + 0 @@ -173,6 +220,10 @@ False True True + 0 + 1 @@ -185,6 +236,10 @@ False True True + 0 + 1 @@ -197,6 +252,10 @@ False True True + 0 + 1 @@ -209,6 +268,10 @@ False True True + 0 + 1 @@ -221,6 +284,10 @@ False True True + 0 + 1 @@ -233,6 +300,10 @@ False True True + 0 + 1 @@ -245,6 +316,10 @@ False True True + 0 + 1 @@ -257,6 +332,10 @@ False True True + 0 + 1 @@ -283,6 +362,12 @@ True False Shipyard + + + + 0 @@ -295,6 +380,10 @@ False True True + 0 + 1 @@ -306,6 +395,12 @@ True False Displacement + + + + 0 @@ -318,6 +413,10 @@ False True True + 0 + 1 @@ -329,6 +428,12 @@ True False Belt position, bow + + + + 0 @@ -340,6 +445,12 @@ True False Belt position, aft + + + + 0 @@ -352,6 +463,10 @@ False True True + 0 + 1 @@ -364,6 +479,10 @@ False True True + 0 + 1 @@ -375,6 +494,12 @@ True False Hull shape + + + + 0 @@ -387,6 +512,9 @@ False Remarks 0 + 0 @@ -400,7 +528,11 @@ True True True + 0 0 + 1 @@ -413,6 +545,10 @@ False True True + 0 + 1 @@ -424,6 +560,12 @@ True False Default Storage + + + + 0 @@ -436,6 +578,10 @@ False True True + 0 + 1 @@ -447,6 +593,12 @@ True False Hull number + + + + 0 @@ -459,6 +611,10 @@ False True True + 0 + 1 diff --git a/yms/ui/boxes.ui b/yms/ui/boxes.ui index e305a86..2f8e9f8 100644 --- a/yms/ui/boxes.ui +++ b/yms/ui/boxes.ui @@ -236,6 +236,7 @@ True False vertical + 2 True @@ -256,11 +257,16 @@ True False + 6 + 8 True False Label + 0 @@ -272,6 +278,10 @@ True False True + 0 + 1 @@ -284,6 +294,9 @@ False Remarks 0 + 0 @@ -296,7 +309,11 @@ False True True + 0 0 + 1 @@ -308,6 +325,9 @@ True False Content + 0 @@ -319,6 +339,10 @@ True False True + 0 + 1 @@ -330,6 +354,9 @@ True False Type + 0 @@ -341,6 +368,9 @@ True False Color + 0 @@ -352,6 +382,9 @@ True False Weight + 0 @@ -363,6 +396,10 @@ True False True + 0 + 1 @@ -374,6 +411,10 @@ True False True + 0 + 1 @@ -385,6 +426,10 @@ True False True + 0 + 1 @@ -396,6 +441,9 @@ True False Weight net + 0 @@ -407,6 +455,10 @@ True False True + 0 + 1 @@ -418,6 +470,9 @@ True False Price + 0 @@ -429,6 +484,10 @@ True False True + 0 + 1 @@ -440,6 +499,9 @@ True False Storage + 0 @@ -451,6 +513,10 @@ True False True + 0 + 1 diff --git a/yms/ui/cables.ui b/yms/ui/cables.ui index 79472ab..23a5d34 100644 --- a/yms/ui/cables.ui +++ b/yms/ui/cables.ui @@ -250,6 +250,7 @@ True False vertical + 2 True @@ -267,16 +268,19 @@ - + True False - 4 - 4 + 6 + 8 True False Name + 0 @@ -288,6 +292,9 @@ True False True + 1 @@ -299,6 +306,9 @@ True False Type + 0 @@ -311,6 +321,9 @@ False Tech.-name 0 + 0 @@ -322,6 +335,9 @@ True False Length + 0 @@ -333,6 +349,9 @@ True False Conductors + 0 @@ -344,6 +363,9 @@ True False Diameter + 0 @@ -355,6 +377,9 @@ True False Cross section + 0 @@ -366,6 +391,9 @@ True False Weight + 0 @@ -377,6 +405,9 @@ True False Color + 0 @@ -388,6 +419,9 @@ True False Supplier + 0 @@ -399,6 +433,9 @@ True False Manufacturer + 0 @@ -410,6 +447,9 @@ True False Condition + 0 @@ -422,6 +462,9 @@ False Remarks 0 + 0 @@ -433,6 +476,9 @@ True False True + 1 @@ -444,6 +490,9 @@ True False True + 1 @@ -455,6 +504,9 @@ True False True + 1 @@ -466,6 +518,9 @@ True False True + 1 @@ -477,6 +532,9 @@ True False True + 1 @@ -488,6 +546,9 @@ True False False + 1 @@ -499,6 +560,9 @@ True False True + 1 @@ -510,6 +574,9 @@ True False True + 1 @@ -521,6 +588,9 @@ True False True + 1 @@ -532,6 +602,9 @@ True False True + 1 @@ -543,6 +616,9 @@ True False True + 1 @@ -556,6 +632,9 @@ True True 0 + 1 diff --git a/yms/ui/companies.ui b/yms/ui/companies.ui index d97540b..76c40ac 100644 --- a/yms/ui/companies.ui +++ b/yms/ui/companies.ui @@ -207,7 +207,7 @@ - + True False @@ -425,7 +425,7 @@ 0 - 14 + 15 @@ -553,6 +553,55 @@ + + 1 + 15 + + + + + True + False + Flags + + + 0 + 14 + + + + + True + False + + + historic + True + True + False + True + + + False + True + 0 + + + + + deleted + True + True + False + True + + + False + True + 1 + + + 1 14 @@ -618,6 +667,7 @@ True False vertical + 2 True @@ -638,6 +688,8 @@ True False + 6 + 8 True @@ -654,6 +706,9 @@ True False Type + 0 @@ -665,6 +720,9 @@ True False Type secondary + 0 @@ -676,6 +734,9 @@ True False Short name + 0 @@ -687,6 +748,9 @@ True False Street + 0 @@ -698,6 +762,9 @@ True False ZIP + 0 @@ -709,6 +776,9 @@ True False City + 0 @@ -720,6 +790,9 @@ True False Country + 0 @@ -733,6 +806,9 @@ True True 0 + 1 @@ -746,6 +822,9 @@ True True 0 + 1 @@ -759,6 +838,9 @@ True True 0 + 1 @@ -772,6 +854,9 @@ True True 0 + 1 @@ -785,6 +870,9 @@ True True 0 + 1 @@ -798,6 +886,9 @@ True True 0 + 1 @@ -811,6 +902,9 @@ True True 0 + 1 @@ -824,6 +918,9 @@ True True 0 + 1 @@ -835,6 +932,9 @@ True False Contact + 0 @@ -846,6 +946,9 @@ True False Phone + 0 @@ -857,6 +960,9 @@ True False Email + 0 @@ -868,6 +974,9 @@ True False Web + 0 @@ -879,6 +988,9 @@ True False Customer no. + 0 @@ -890,6 +1002,9 @@ True False Contract no. + 0 @@ -902,6 +1017,9 @@ False Remarks 0 + 0 @@ -915,6 +1033,9 @@ True True 0 + 1 @@ -928,6 +1049,9 @@ True True 0 + 1 @@ -941,6 +1065,9 @@ True True 0 + 1 @@ -954,6 +1081,9 @@ True True 0 + 1 @@ -967,6 +1097,9 @@ True True 0 + 1 @@ -980,6 +1113,9 @@ True True 0 + 1 @@ -993,7 +1129,11 @@ True True True + 0 0 + 1 @@ -1005,6 +1145,9 @@ True False Flags + 0 @@ -1018,6 +1161,9 @@ True True 0 + 1 diff --git a/yms/ui/documents.ui b/yms/ui/documents.ui index fa6dd16..50d365a 100644 --- a/yms/ui/documents.ui +++ b/yms/ui/documents.ui @@ -2,50 +2,12 @@ - - False - dialog - - - False - vertical - 2 - - - False - end - - - - - - Close - True - True - True - - - True - True - 1 - - - - - False - False - 0 - - - - - - - - False + True + True dialog + True False @@ -87,6 +49,7 @@ True True True + True @@ -155,6 +118,48 @@ + + False + dialog + + + False + vertical + 2 + + + False + end + + + + + + Close + True + True + True + + + + True + True + 1 + + + + + False + False + 0 + + + + + + + + True False @@ -403,6 +408,9 @@ True False Title + 0 @@ -415,6 +423,9 @@ False True True + 1 @@ -426,6 +437,9 @@ True False Filename + 0 @@ -437,6 +451,9 @@ True False Image extents + 0 @@ -448,6 +465,9 @@ True False Mimetype + 0 @@ -460,6 +480,9 @@ False True True + 1 @@ -472,6 +495,9 @@ False True True + 1 @@ -484,6 +510,9 @@ False True True + 1 @@ -495,6 +524,9 @@ True False File size + 0 @@ -506,6 +538,9 @@ True False Upload date + 0 @@ -517,6 +552,9 @@ True False Document type + 0 @@ -529,6 +567,9 @@ False True True + 1 @@ -541,6 +582,9 @@ False True True + 1 @@ -553,6 +597,9 @@ False True True + 1 @@ -565,6 +612,9 @@ False Remarks 0 + 0 @@ -579,6 +629,9 @@ True True 0 + 1 @@ -590,6 +643,9 @@ True False Role access + 0 @@ -602,6 +658,9 @@ False True True + 1 diff --git a/yms/ui/equipment.ui b/yms/ui/equipment.ui index ebe29b5..7fb842d 100644 --- a/yms/ui/equipment.ui +++ b/yms/ui/equipment.ui @@ -12,6 +12,11 @@ 1 10 + + True + False + x-office-calendar-symbolic + True False @@ -318,6 +323,7 @@ True False vertical + 2 True @@ -338,11 +344,16 @@ True False + 6 + 8 True False Name + 0 @@ -354,6 +365,9 @@ True False Short name + 0 @@ -365,6 +379,9 @@ True False Manufacturer + 0 @@ -376,6 +393,9 @@ True False Model + 0 @@ -387,6 +407,9 @@ True False Serial no. + 0 @@ -398,6 +421,9 @@ True False Weight + 0 @@ -409,6 +435,9 @@ True False Price + 0 @@ -420,6 +449,9 @@ True False Date purchase + 0 @@ -431,6 +463,9 @@ True False Supplier + 0 @@ -442,6 +477,9 @@ True False Category + 0 @@ -454,6 +492,9 @@ False Remarks 0 + 0 @@ -466,6 +507,10 @@ False True True + 0 + 1 @@ -478,6 +523,10 @@ False True True + 0 + 1 @@ -490,6 +539,10 @@ False True True + 0 + 1 @@ -502,6 +555,10 @@ False True True + 0 + 1 @@ -514,6 +571,10 @@ False False True + 0 + 1 @@ -526,6 +587,10 @@ False True True + 0 + 1 @@ -538,6 +603,10 @@ False True True + 0 + 1 @@ -550,6 +619,10 @@ False True True + 0 + 1 @@ -562,6 +635,10 @@ False True True + 0 + 1 @@ -574,6 +651,10 @@ False True True + 0 + 1 @@ -587,7 +668,11 @@ True True True + 0 0 + 1 @@ -599,6 +684,9 @@ True False Flags + 0 @@ -611,6 +699,10 @@ False True True + 0 + 1 @@ -622,6 +714,9 @@ True False Condition + 0 @@ -634,6 +729,10 @@ False True True + 0 + 1 @@ -890,16 +989,6 @@ 4 - - - True - True - - - 1 - 7 - - True @@ -1018,6 +1107,41 @@ 10 + + + True + False + + + True + True + + + False + True + 0 + + + + + True + True + True + img_calendar + True + + + False + True + 1 + + + + + 1 + 7 + + False diff --git a/yms/ui/fuses.ui b/yms/ui/fuses.ui index 9656e6b..f8a6288 100644 --- a/yms/ui/fuses.ui +++ b/yms/ui/fuses.ui @@ -235,6 +235,7 @@ True False vertical + 2 True @@ -255,14 +256,17 @@ True False - 4 - 4 + 6 + 8 True False True True + 1 @@ -274,6 +278,9 @@ True False Number + 0 @@ -285,6 +292,9 @@ True False Type + 0 @@ -296,6 +306,9 @@ True False Current + 0 @@ -307,6 +320,9 @@ True False Cable + 0 @@ -318,6 +334,9 @@ True False Equipment + 0 @@ -329,6 +348,9 @@ True False Location + 0 @@ -340,6 +362,9 @@ True False Description + 0 @@ -352,6 +377,9 @@ False Remarks 0 + 0 @@ -364,6 +392,9 @@ False True True + 1 @@ -376,6 +407,9 @@ False True True + 1 @@ -388,6 +422,9 @@ False True True + 1 @@ -402,6 +439,9 @@ True True 0 + 1 @@ -414,6 +454,9 @@ False True True + 1 @@ -426,6 +469,9 @@ False True True + 1 @@ -438,6 +484,9 @@ False True True + 1 diff --git a/yms/ui/inventory.ui b/yms/ui/inventory.ui index e8c9a21..7afdc4b 100644 --- a/yms/ui/inventory.ui +++ b/yms/ui/inventory.ui @@ -17,6 +17,11 @@ 1 10 + + True + False + x-office-calendar-symbolic + True False @@ -241,6 +246,7 @@ True False vertical + 2 True @@ -257,15 +263,20 @@ - + True False + 6 + 8 True False Name + 0 @@ -273,10 +284,13 @@ - + True False - Type + Container + 0 @@ -284,10 +298,13 @@ - + True False - Storage + Equipment + 0 @@ -295,10 +312,13 @@ - + True False - Box + Number + 0 @@ -306,10 +326,13 @@ - + True False - Equipment + Weight + 0 @@ -317,10 +340,13 @@ - + True False - Number + Price + 0 @@ -328,47 +354,31 @@ - + True False - Weight + Purchase Date + 0 6 - - - True - False - Price - - - 0 - 7 - - - - - True - False - Purchase Date - - - 0 - 8 - - True False Condition + 0 - 9 + 7 @@ -377,10 +387,13 @@ False Remarks 0 + 0 - 12 + 10 @@ -389,6 +402,10 @@ False True True + 0 + 1 @@ -401,46 +418,30 @@ False True True + 0 + 1 1 - - - True - False - True - True - - - 1 - 2 - - - - - True - False - True - True - - - 1 - 3 - - True False True True + 0 + 1 - 4 + 2 @@ -449,10 +450,14 @@ False True True + 0 + 1 - 5 + 3 @@ -461,10 +466,14 @@ False True True + 0 + 1 - 6 + 4 @@ -473,10 +482,14 @@ False True True + 0 + 1 - 7 + 5 @@ -485,10 +498,14 @@ False True True + 0 + 1 - 8 + 6 @@ -497,10 +514,14 @@ False True True + 0 + 1 - 9 + 7 @@ -511,10 +532,13 @@ True True 0 + 1 - 12 + 10 @@ -522,10 +546,13 @@ True False Category + 0 - 10 + 8 @@ -534,10 +561,14 @@ False True True + 0 + 1 - 10 + 8 @@ -545,10 +576,13 @@ True False Flags + 0 - 11 + 9 @@ -557,10 +591,14 @@ False True True + 0 + 1 - 11 + 9 @@ -867,16 +905,6 @@ 9 - - - True - True - - - 1 - 8 - - True @@ -1013,6 +1041,41 @@ 11 + + + True + False + + + True + True + + + False + True + 0 + + + + + True + True + True + img_calendar + True + + + False + True + 1 + + + + + 1 + 8 + + False diff --git a/yms/ui/maintenance.ui b/yms/ui/maintenance.ui index 2efb356..9daa3f4 100644 --- a/yms/ui/maintenance.ui +++ b/yms/ui/maintenance.ui @@ -17,6 +17,16 @@ 1 10 + + True + False + x-office-calendar-symbolic + + + True + False + x-office-calendar-symbolic + True False @@ -220,6 +230,7 @@ True False vertical + 2 True @@ -240,11 +251,16 @@ True False + 6 + 8 True False Activities + 0 @@ -257,6 +273,9 @@ False True True + 1 @@ -268,6 +287,9 @@ True False Equipment + 0 @@ -280,6 +302,9 @@ False True True + 1 @@ -291,6 +316,9 @@ True False Series + 0 @@ -302,6 +330,9 @@ True False Interval hours + 0 @@ -313,6 +344,9 @@ True False Last hours + 0 @@ -324,6 +358,9 @@ True False Plan date + 0 @@ -335,6 +372,9 @@ True False Completion date + 0 @@ -346,6 +386,9 @@ True False Status + 0 @@ -358,6 +401,9 @@ False Remarks 0 + 0 @@ -370,6 +416,9 @@ False True True + 1 @@ -382,6 +431,9 @@ False True True + 1 @@ -394,6 +446,9 @@ False True True + 1 @@ -406,6 +461,9 @@ False True True + 1 @@ -418,6 +476,9 @@ False True True + 1 @@ -430,6 +491,9 @@ False True True + 1 @@ -444,6 +508,9 @@ True True 0 + 1 @@ -712,28 +779,6 @@ 4 - - - True - True - True - - - 1 - 5 - - - - - True - True - True - - - 1 - 6 - - True @@ -764,6 +809,77 @@ 8 + + + True + False + + + True + True + True + + + False + True + 0 + + + + + True + True + True + img_plandate + True + + + False + True + 1 + + + + + 1 + 5 + + + + + True + False + + + True + True + True + + + False + True + 0 + + + + + True + True + True + img_completion + + + False + True + 1 + + + + + 1 + 6 + + True diff --git a/yms/ui/measurement.ui b/yms/ui/measurement.ui index 0efd067..1420539 100644 --- a/yms/ui/measurement.ui +++ b/yms/ui/measurement.ui @@ -17,6 +17,11 @@ 1 10 + + True + False + x-office-calendar-symbolic + True False @@ -220,6 +225,7 @@ True False vertical + 2 True @@ -240,11 +246,16 @@ True False + 6 + 8 True False Name + 0 @@ -257,6 +268,10 @@ False True True + 0 + 1 @@ -268,6 +283,9 @@ True False Equipment + 0 @@ -280,6 +298,10 @@ False True True + 0 + 1 @@ -291,6 +313,9 @@ True False Dimensions + 0 @@ -302,6 +327,9 @@ True False Value 1 + 0 @@ -313,6 +341,9 @@ True False Value 2 + 0 @@ -324,6 +355,9 @@ True False Value 3 + 0 @@ -335,6 +369,9 @@ True False Unit + 0 @@ -346,6 +383,9 @@ True False Accuracy + 0 @@ -358,6 +398,9 @@ False Note 0 + 0 @@ -370,6 +413,10 @@ False True True + 0 + 1 @@ -382,6 +429,10 @@ False True True + 0 + 1 @@ -394,6 +445,10 @@ False True True + 0 + 1 @@ -406,6 +461,10 @@ False True True + 0 + 1 @@ -418,6 +477,10 @@ False True True + 0 + 1 @@ -430,6 +493,10 @@ False True True + 0 + 1 @@ -443,7 +510,11 @@ True True True + 0 0 + 1 @@ -455,6 +526,9 @@ True False Category + 0 @@ -467,6 +541,10 @@ False True True + 0 + 1 @@ -478,6 +556,9 @@ True False Date + 0 @@ -490,6 +571,10 @@ False True True + 0 + 1 @@ -613,7 +698,7 @@ True False - Dimensions + Dimensions @@ -759,17 +844,6 @@ 4 - - - True - True - True - - - 1 - 7 - - True @@ -853,6 +927,42 @@ 6 + + + True + False + + + True + True + True + + + False + True + 0 + + + + + True + True + True + img_calendar + True + + + False + True + 1 + + + + + 1 + 7 + + True diff --git a/yms/ui/projects.ui b/yms/ui/projects.ui index 58f32f1..20d6642 100644 --- a/yms/ui/projects.ui +++ b/yms/ui/projects.ui @@ -245,6 +245,7 @@ True False vertical + 2 True @@ -265,11 +266,16 @@ True False + 6 + 8 True False Name + 0 @@ -281,6 +287,9 @@ True False Responsible + 0 @@ -292,6 +301,9 @@ True False Date start + 0 @@ -303,6 +315,9 @@ True False Duration, days + 0 @@ -314,6 +329,9 @@ True False Costs plan + 0 @@ -325,6 +343,9 @@ True False Costs final + 0 @@ -336,6 +357,9 @@ True False Status + 0 @@ -359,6 +383,10 @@ True False True + 0 + 1 @@ -370,6 +398,10 @@ True False True + 0 + 1 @@ -381,6 +413,10 @@ True False True + 0 + 1 @@ -392,6 +428,10 @@ True False True + 0 + 1 @@ -403,6 +443,10 @@ True False True + 0 + 1 @@ -414,6 +458,10 @@ True False True + 0 + 1 @@ -425,6 +473,10 @@ True False True + 0 + 1 @@ -439,6 +491,9 @@ True 0 0 + 1 @@ -654,17 +709,6 @@ 1 - - - True - True - True - - - 1 - 2 - - True @@ -727,6 +771,41 @@ 7 + + + True + False + + + True + True + True + + + False + True + 0 + + + + + button + True + True + True + + + False + True + 1 + + + + + 1 + 2 + + False diff --git a/yms/ui/provisions.ui b/yms/ui/provisions.ui index 40b5fef..cf401f1 100644 --- a/yms/ui/provisions.ui +++ b/yms/ui/provisions.ui @@ -2,11 +2,26 @@ + + 100 + 1 + 10 + 100 1 10 + + 100 + 1 + 10 + + + 100 + 1 + 10 + 100 1 @@ -17,7 +32,12 @@ 1 10 - + + True + False + x-office-calendar-symbolic + + True False x-office-calendar-symbolic @@ -46,7 +66,7 @@ True False - Kategorie + Category 0 @@ -247,7 +267,7 @@ - + True False @@ -322,7 +342,7 @@ 0 - 5 + 6 @@ -333,7 +353,7 @@ 0 - 6 + 7 @@ -344,7 +364,7 @@ 0 - 7 + 8 @@ -355,7 +375,7 @@ 0 - 8 + 11 @@ -366,7 +386,7 @@ 0 - 9 + 12 @@ -421,7 +441,7 @@ 1 - 7 + 8 @@ -446,7 +466,7 @@ 1 - 5 + 6 @@ -459,18 +479,7 @@ 1 - 6 - - - - - True - True - True - - - 1 - 9 + 7 @@ -482,13 +491,15 @@ 0 - 10 + 13 True True + 4 + 4 in @@ -499,7 +510,7 @@ 1 - 10 + 13 @@ -526,7 +537,7 @@ True True True - img_calendar + img_storedate True @@ -538,7 +549,116 @@ 1 - 8 + 11 + + + + + True + False + Target + + + 0 + 5 + + + + + True + True + True + 0 + adj_target + + + 1 + 5 + + + + + True + False + Calories + + + 0 + 9 + + + + + True + True + True + 0 + adj_calories + + + 1 + 9 + + + + + True + False + Price + + + 0 + 10 + + + + + True + True + True + 0,00 + adj_price + 2 + + + 1 + 10 + + + + + True + False + + + True + True + True + + + False + True + 0 + + + + + True + True + True + img_shelflife + True + + + False + True + 1 + + + + + 1 + 12 @@ -600,6 +720,7 @@ True False vertical + 2 True @@ -616,15 +737,20 @@ - + True False + 6 + 8 True False Name + 0 @@ -647,6 +773,9 @@ True False Storage + 0 @@ -659,6 +788,10 @@ False True True + 0 + 1 @@ -671,6 +804,10 @@ False True True + 0 + 1 @@ -683,6 +820,10 @@ False True True + 0 + 1 @@ -694,6 +835,9 @@ True False Box + 0 @@ -705,6 +849,9 @@ True False Number + 0 @@ -716,6 +863,9 @@ True False Weight + 0 @@ -727,6 +877,9 @@ True False Weight net + 0 @@ -738,6 +891,9 @@ True False Unit + 0 @@ -749,10 +905,13 @@ True False Storedate + 0 - 10 + 11 @@ -760,10 +919,13 @@ True False Shelflife + 0 - 11 + 12 @@ -772,6 +934,10 @@ False True True + 0 + 1 @@ -784,6 +950,10 @@ False True True + 0 + 1 @@ -796,6 +966,10 @@ False True True + 0 + 1 @@ -808,6 +982,10 @@ False True True + 0 + 1 @@ -820,6 +998,10 @@ False True True + 0 + 1 @@ -832,10 +1014,14 @@ False True True + 0 + 1 - 10 + 11 @@ -844,10 +1030,14 @@ False True True + 0 + 1 - 11 + 12 @@ -855,6 +1045,9 @@ True False Price + 0 @@ -867,6 +1060,10 @@ False True True + 0 + 1 @@ -878,6 +1075,9 @@ True False Target + 0 @@ -890,6 +1090,10 @@ False True True + 0 + 1 @@ -902,10 +1106,13 @@ False Remarks 0 + 0 - 12 + 13 @@ -915,11 +1122,45 @@ True True True + 0 0 + 1 - 12 + 13 + + + + + True + False + Calories + + + + 0 + 10 + + + + + True + False + True + True + 0 + + + + 1 + 10 diff --git a/yms/ui/status.ui b/yms/ui/status.ui index 5b81b4d..33c41ff 100644 --- a/yms/ui/status.ui +++ b/yms/ui/status.ui @@ -178,7 +178,7 @@ thread in "Segeln Forum" True False - YMS version x.x.x + YMS version x.x.x False diff --git a/yms/ui/storage.ui b/yms/ui/storage.ui index 8b2c8c4..b31583e 100644 --- a/yms/ui/storage.ui +++ b/yms/ui/storage.ui @@ -230,6 +230,7 @@ True False vertical + 2 True @@ -250,11 +251,16 @@ True False + 6 + 8 True False Name + 0 @@ -267,6 +273,10 @@ False True True + 0 + 1 @@ -278,6 +288,9 @@ True False Type + 0 @@ -289,6 +302,9 @@ True False Position (x, y, z) + 0 @@ -300,6 +316,9 @@ True False Dimension (x, y, z) + 0 @@ -311,6 +330,9 @@ True False Angle + 0 @@ -322,6 +344,9 @@ True False Capacity + 0 @@ -334,6 +359,10 @@ False True True + 0 + 1 @@ -346,6 +375,10 @@ False True True + 0 + 1 @@ -358,6 +391,10 @@ False True True + 0 + 1 @@ -370,6 +407,10 @@ False True True + 0 + 1 @@ -382,6 +423,10 @@ False True True + 0 + 1 @@ -393,6 +438,9 @@ True False Color + 0 @@ -406,6 +454,10 @@ True True True + 0 + 1 @@ -418,6 +470,9 @@ False Remarks 0 + 0 @@ -431,7 +486,11 @@ True True True + 0 0 + 1 @@ -582,7 +641,7 @@ False 4 4 - X + X 1 @@ -595,7 +654,7 @@ False 4 4 - Y + Y 3 @@ -608,7 +667,7 @@ False 4 4 - Z + Z 5 @@ -663,9 +722,9 @@ True - 1 + 2 0 - 6 + 5 @@ -674,9 +733,9 @@ False - 1 + 2 1 - 6 + 5 @@ -696,7 +755,7 @@ False 4 4 - WX + WX 1 @@ -709,7 +768,7 @@ False 4 4 - WY + WY 3 @@ -722,7 +781,7 @@ False 4 4 - WZ + WZ 5 @@ -845,9 +904,9 @@ - 1 + 2 7 - 6 + 5 @@ -872,17 +931,6 @@ 5 - - - True - False - Degrees - - - 4 - 4 - - True @@ -920,6 +968,26 @@ 6 + + + True + False + Deg + + + 1 + 4 + + + + + + + + + + + diff --git a/yms/ui/tasks.ui b/yms/ui/tasks.ui index 30d52cd..1a21589 100644 --- a/yms/ui/tasks.ui +++ b/yms/ui/tasks.ui @@ -2,6 +2,27 @@ + + True + False + 16 + stock_calendar + + + True + False + icons/appointment.svg + + + True + False + x-office-calendar-symbolic + + + True + False + icons/appointment.svg + True False @@ -319,6 +340,7 @@ True False vertical + 2 True @@ -339,11 +361,16 @@ True False + 6 + 8 True False Name + 0 @@ -356,6 +383,9 @@ False True True + 1 @@ -367,6 +397,9 @@ True False Priority + 0 @@ -378,6 +411,9 @@ True False Status + 0 @@ -389,6 +425,9 @@ True False Timestamp + 0 @@ -401,6 +440,9 @@ False True True + 1 @@ -413,6 +455,9 @@ False True True + 1 @@ -425,6 +470,9 @@ False True True + 1 @@ -436,6 +484,9 @@ True False Plan date + 0 @@ -447,6 +498,9 @@ True False Due date + 0 @@ -458,6 +512,9 @@ True False Started + 0 @@ -470,6 +527,9 @@ False True True + 1 @@ -482,6 +542,9 @@ False True True + 1 @@ -494,6 +557,9 @@ False True True + 1 @@ -506,6 +572,9 @@ False Remarks 0 + 0 @@ -520,6 +589,9 @@ True True 0 + 1 @@ -531,6 +603,9 @@ True False Finished + 0 @@ -543,6 +618,9 @@ False True True + 1 @@ -554,6 +632,9 @@ True False Responsible + 0 @@ -566,6 +647,9 @@ False True True + 1 @@ -750,16 +834,6 @@ 8 - - - True - True - - - 1 - 3 - - True @@ -827,16 +901,6 @@ 4 - - - True - True - - - 1 - 4 - - True @@ -884,9 +948,106 @@ - + True - True + False + + + True + True + + + False + True + 0 + + + + + True + True + True + img_plandate + True + + + + False + True + 1 + + + + + 1 + 3 + + + + + True + False + + + True + True + + + False + True + 0 + + + + + True + True + True + img_duedate + True + + + + False + True + 1 + + + + + 1 + 4 + + + + + True + False + + + True + True + + + False + True + 0 + + + + + True + True + True + img_started + + + + False + True + 1 + + 1 @@ -894,9 +1055,34 @@ - + True - True + False + + + True + True + + + False + True + 0 + + + + + True + True + True + img_finished + + + + False + True + 1 + + 1 diff --git a/yms/view/base.py b/yms/view/base.py index 4d329d6..bee457e 100644 --- a/yms/view/base.py +++ b/yms/view/base.py @@ -84,9 +84,13 @@ class BaseView(View): storages = self.context.lookup.storage(self.context.vessel.vid) combobox.load_from_dict(self.combo['storage'], {-1: _("─── none ───")} | storages) + # Vessel types + self.dd_vtype = self.context.lookup.dropdown(Dropdown.VESSEL_TYPE) + combobox.load_from_dict(self.combo['vtype'], {-1: _("─── none ───")} | self.dd_vtype, -1) + # Hull types self.dd_htype = self.context.lookup.enum('vessel.htype') - combobox.load_from_dict(self.combo['htype'], self.dd_htype) + combobox.load_from_dict(self.combo['htype'], self.dd_htype, 'mono') # List of available shapes for combobox selection shapes = self.load_shapes() @@ -150,7 +154,6 @@ class BaseView(View): #viewport.height = 240 #self._svg.render_document(ctx, viewport) - # WIP generic remarks handling self.text['vessel_remarks'].set_size_request(200, 70) @@ -350,7 +353,14 @@ class BaseView(View): vessel = self.context.vessel vessel.vesselname = self.entry['vesselname'].get_text() vessel.model = self.entry['model'].get_text() + vessel.vtype = combobox.get_list_value(self.combo['vtype']) + if vessel.vtype == -1: + vessel.vtype = None vessel.year_built = self.spin['year_built'].get_value_as_int() + vessel.hull_number = self.entry['hull_number'].get_text() + vessel.shipyard = combobox.get_list_value(self.combo['shipyard']) + if vessel.shipyard == -1: + vessel.shipyard = None vessel.loa = self.spin['loa'].get_value() vessel.lwl = self.spin['lwl'].get_value() vessel.beam = self.spin['beam'].get_value() @@ -360,7 +370,10 @@ class BaseView(View): vessel.ballast = self.spin['ballast'].get_value_as_int() vessel.beltpos_bow = self.spin['belt_bow'].get_value() vessel.beltpos_aft = self.spin['belt_aft'].get_value() + vessel.htype = combobox.get_list_value(self.combo['htype']) vessel.shapefile = combobox.get_list_value(self.combo['hull_shape']) + if vessel.shapefile == '-1': + vessel.shapefile = None vessel.remarks = gtkutils.get_text_contents(self.text['vessel_remarks']) vessel.save() self.stack['vessel'].set_visible_child(self.box['vessel']) @@ -399,7 +412,10 @@ class BaseView(View): def edit_vessel(self, vessel): self.entry['vesselname'].set_text(vessel.vesselname) self.entry['model'].set_text(vessel.model or '') + combobox.activate_row(self.combo['vtype'], vessel.vtype or -1) self.spin['year_built'].set_value(vessel.year_built or 0) + self.entry['hull_number'].set_text(vessel.hull_number or '') + combobox.activate_row(self.combo['shipyard'], vessel.shipyard or -1) self.spin['loa'].set_value(vessel.loa or 0) self.spin['lwl'].set_value(vessel.lwl or 0) self.spin['beam'].set_value(vessel.beam or 0) @@ -409,11 +425,11 @@ class BaseView(View): self.spin['ballast'].set_value(vessel.ballast or 0) self.spin['belt_bow'].set_value(vessel.beltpos_bow or 0) self.spin['belt_aft'].set_value(vessel.beltpos_aft or 0) - combobox.activate_row(self.combo['shipyard'], vessel.shipyard or -1) - self.entry['hull_number'].set_text(vessel.hull_number or '') + combobox.activate_row(self.combo['htype'], vessel.htype) combobox.activate_row(self.combo['hull_shape'], vessel.shapefile or "-1") combobox.activate_row(self.combo['storage'], vessel.sid_default or -1) self.text['vessel_remarks'].get_buffer().set_text(vessel.remarks or '') + self.entry['vesselname'].grab_focus() def display_user(self, user): self.entry['user_login'].set_text(user.login) diff --git a/yms/view/boxes.py b/yms/view/boxes.py index de70a2c..01f4d31 100644 --- a/yms/view/boxes.py +++ b/yms/view/boxes.py @@ -65,6 +65,7 @@ class BoxesView(View): self.spin['weight'].set_value(0) self.spin['weight_net'].set_value(0) self.text['remarks'].get_buffer().set_text('') + self.entry['label'].grab_focus() def display_record(self): self.label['label'].set_text(self.sbox.label) @@ -100,6 +101,7 @@ class BoxesView(View): self.spin['weight'].set_value(self.sbox.weight or 0) self.spin['weight_net'].set_value(self.sbox.weight_net or 0) self.text['remarks'].get_buffer().set_text(self.sbox.remarks or '') + self.entry['label'].grab_focus() def save_record(self): # fields must have been validated beforehand diff --git a/yms/view/cables.py b/yms/view/cables.py index 27c024e..7aa28b2 100644 --- a/yms/view/cables.py +++ b/yms/view/cables.py @@ -17,13 +17,38 @@ class CablesView(View): self.newrecord = False self.lst_cables = Gtk.ListStore(int, str, str) + self.load_list() + + treeview.add_column(self.tree['cables'], _('ID'), 0) + treeview.add_column(self.tree['cables'], _('Name'), 1) + treeview.add_column(self.tree['cables'], _('Condition'), 2) + self.tree['cables'].set_model(self.lst_cables) + + # Cable type + self.dd_type = self.context.lookup.dropdown(Dropdown.CABLE_TYPE) + combobox.load_from_dict(self.combo['type'], {-1: _("─── none ───")} | self.dd_type) + # Cable tech type + self.dd_tech = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME) + combobox.load_from_dict(self.combo['techname'], {-1: _("─── none ───")} | self.dd_tech) + # Supplier + self.dd_supplier = self.context.lookup.company(1) + combobox.load_from_dict(self.combo['supplier'], {-1: _("─── none ───")} | self.dd_supplier) + # Manufacturer + self.dd_manufacturer = self.context.lookup.company(2) + combobox.load_from_dict(self.combo['manufacturer'], {-1: _("─── none ───")} | self.dd_manufacturer) + # Condition + self.dd_condition = self.context.lookup.enum('cable.cablecond') + combobox.load_from_dict(self.combo['condition'], self.dd_condition, 'unknown') + + def load_list(self): + self.lst_cables.clear() sql = ( "SELECT cableid, cablename, cablecond " "FROM cable " "WHERE vid=%s " "ORDER BY cableid" ) - self.db.dcur.execute(sql, (context.vessel.vid,)) + self.db.dcur.execute(sql, (self.context.vessel.vid,)) for row in self.db.dcur.fetchall(): data = ( row['cableid'], @@ -32,17 +57,12 @@ class CablesView(View): ) self.lst_cables.append(data) - treeview.add_column(self.tree['cables'], _('ID'), 0) - treeview.add_column(self.tree['cables'], _('Name'), 1) - treeview.add_column(self.tree['cables'], _('Condition'), 2) - self.tree['cables'].set_model(self.lst_cables) - - self.dd_type = self.context.lookup.dropdown(Dropdown.CABLE_TYPE) - self.dd_tech = self.context.lookup.dropdown(Dropdown.CABLE_TECHNAME) - def display_record(self): - self.label['name'].set_text(self.cable.cablename) - self.label['type'].set_text(self.dd_type[self.cable.cabletype]) + self.label['name'].set_text(self.cable.cablename or '') + if self.cable.cabletype: + self.label['type'].set_text(self.dd_type[self.cable.cabletype]) + else: + self.label['type'].set_text('') if self.cable.techname: self.label['techname'].set_text(self.dd_tech[self.cable.techname]) else: @@ -64,8 +84,8 @@ class CablesView(View): def edit_record(self): # fill UI fields from database record self.entry['name'].set_text(self.cable.cablename) - combobox.activate_row(self.combo['type'], self.cable.cabletype) - combobox.activate_row(self.combo['techname'], self.cable.techname) + combobox.activate_row(self.combo['type'], self.cable.cabletype or -1) + combobox.activate_row(self.combo['techname'], self.cable.techname or -1) self.spin['length'].set_value(self.cable.length or 0) self.spin['consuctors'].set_value(self.cable.conductors or 0) self.spin['diameter'].set_value(self.cable.diameter or 0) @@ -75,10 +95,11 @@ class CablesView(View): rgba = Gdk.RGBA() rgba.parse('#' + self.cable.color) self.button['color'].set_rgba(rgba) - combobox.activate_row(self.combo['supplier'], self.cable.supplier) - combobox.activate_row(self.combo['manufacturer'], self.cable.manufacturer) - combobox.activate_row(self.combo['consition'], self.cable.cablecond) + combobox.activate_row(self.combo['supplier'], self.cable.supplier or -1) + combobox.activate_row(self.combo['manufacturer'], self.cable.manufacturer or -1) + combobox.activate_row(self.combo['consition'], self.cable.cablecond or 'unknown') self.text['remarks'].get_buffer().set_text(self.sbox.remarks or '') + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -95,6 +116,9 @@ class CablesView(View): # buttons on list page def on_but_new_clicked(self, widget): + self.newrecord = True + self.cable.clear() + self.edit_record() self.topwidget.set_visible_child(self.box['cable_edit']) def on_but_edit_clicked(self, widget): diff --git a/yms/view/companies.py b/yms/view/companies.py index 1e23bda..fda09e1 100644 --- a/yms/view/companies.py +++ b/yms/view/companies.py @@ -67,6 +67,7 @@ class CompaniesView(View): self.entry['contractno'].set_text('') combobox.activate_row(self.combo['comptype'], company.SUPPLIER) combobox.activate_row(self.combo['comptype2'], -1) + self.entry['compname'].grab_focus() def display_record(self): self.label['name'].set_text(self.comp.compname) @@ -77,20 +78,20 @@ class CompaniesView(View): self.label['zip'].set_text(self.comp.zip or '') self.label['city'].set_text(self.comp.city or '') self.label['country'].set_text(self.comp.country or '') + self.label['contact'].set_text(self.comp.contact or '') self.label['phone'].set_text(self.comp.phone or '') self.label['email'].set_text(self.comp.email or '') self.label['web'].set_text(self.comp.web or '') self.label['customerno'].set_text(self.comp.customerno or '') self.label['contractno'].set_text(self.comp.contractno or '') self.label['flags'].set_text(self.comp.flags or '') + # TODO translation self.label['remarks'].set_text(self.comp.remarks or '') def edit_record(self): self.entry['compname'].set_text(self.comp.compname) - # Type self.dd_comptype.get(self.comp.comptype, -1) - # Type2 self.dd_comptype.get(self.comp.comptype2, -1) combobox.activate_row(self.combo['comptype'], self.comp.comptype) - combobox.activate_row(self.combo['comptype2'], self.comp.comptype2) + combobox.activate_row(self.combo['comptype2'], self.comp.comptype2 or -1) self.entry['shortname'].set_text(self.comp.shortname or '') self.entry['street'].set_text(self.comp.street or '') self.entry['zip'].set_text(self.comp.zip or '') @@ -102,7 +103,11 @@ class CompaniesView(View): self.entry['web'].set_text(self.comp.web or '') self.entry['customerno'].set_text(self.comp.customerno or '') self.entry['contractno'].set_text(self.comp.contractno or '') + flags = (self.comp.flags or '').split(',') + for flag in self.dd_flags: + self.check[flag].set_active(flag in flags) self.text['remarks'].get_buffer().set_text(self.comp.remarks or '') + self.entry['compname'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -121,7 +126,8 @@ class CompaniesView(View): self.comp.email = self.entry['email'].get_text() self.comp.web = self.entry['web'].get_text() self.comp.customerno = self.entry['customerno'].get_text() - self.comp.conractno = self.entry['contractno'].get_text() + self.comp.contractno = self.entry['contractno'].get_text() + self.comp.flags = self.get_checks(('historic', 'ordered')) self.comp.remarks = gtkutils.get_text_contents(self.text['remarks']) # buttons on list page diff --git a/yms/view/documents.py b/yms/view/documents.py index f539e96..00d1e3b 100644 --- a/yms/view/documents.py +++ b/yms/view/documents.py @@ -19,8 +19,10 @@ class DocumentsView(View): self.newrecord = False self.scandialog = self.builder.get_object("dlg_scanner") - print(self.scandialog) - # TODO self.uploaddialog = self.builder.get_object("dlg_upload") + self.scandialog.set_title("Scan new document") + + self.uploaddialog = self.builder.get_object("dlg_upload") + self.uploaddialog.set_title("Upload new document") self.lst_documents = Gtk.ListStore(int, str, str, str, int) sql = ( @@ -54,6 +56,7 @@ class DocumentsView(View): self.entry['filename'].set_text('') combobox.activate_row(self.combo['accesslevel'], 'captain') self.text['remarks'].get_buffer().set_text('') + self.entry['title'].grab_focus() def pdf_to_pixbuf(self, filename, max_width=400, max_height=400): doc = fitz.open(filename) @@ -122,6 +125,7 @@ class DocumentsView(View): combobox.activate_row(self.combo['doctype'], self.doc.doctype) self.entry['title'].set_text(self.doc.title or '') self.entry['filename'].set_text(self.doc.filename or '') + self.entry['title'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -223,8 +227,19 @@ class DocumentsView(View): # sane.exit() pass + def on_but_scan_close_clicked(self, widget): + self.scandialog.response(Gtk.ResponseType.CLOSE) + def on_but_upload_clicked(self, widget): - pass + response = self.uploaddialog.run() + self.uploaddialog.hide() + if response == Gtk.ResponseType.OK: + print("Upload OK") + else: + print("Upload Not OK") + + def on_but_upload_close_clicked(self, widget): + self.uploaddialog.response(Gtk.ResponseType.CLOSE) def on_but_save_clicked(self, widget): print(self.doc) diff --git a/yms/view/equipment.py b/yms/view/equipment.py index 64b143b..04d62b7 100644 --- a/yms/view/equipment.py +++ b/yms/view/equipment.py @@ -3,6 +3,7 @@ import os from gi.repository import GLib, Gtk, Gdk from dateutil.parser import parse +from gettext import pgettext from .view import View from yms import gtkutils, combobox, treeview @@ -71,6 +72,7 @@ class EquipmentView(View): combobox.activate_row(self.combo['category'], -1) combobox.activate_row(self.combo['condition'], 'unknown') self.text['remarks'].get_buffer().set_text('') + self.entry['name'].grab_focus() def display_record(self): print(self.equip) @@ -94,6 +96,7 @@ class EquipmentView(View): else: self.label['category'].set_text('') self.label['flags'].set_text(self.equip.flags or '') + self.label['condition'].set_text(pgettext("equipment.econd", self.equip.econd)) self.label['remarks'].set_text(self.equip.remarks or '') def edit_record(self): @@ -110,8 +113,7 @@ class EquipmentView(View): combobox.activate_row(self.combo['category'], self.equip.ecat or -1) combobox.activate_row(self.combo['condition'], self.equip.econd or 'unknown') self.text['remarks'].get_buffer().set_text(self.equip.remarks or '') - print("Edit record") - print(self.equip) + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -125,12 +127,18 @@ class EquipmentView(View): self.equip.serial = self.entry['serial'].get_text() self.equip.weight = self.spin['weight'].get_value() self.equip.price = self.spin['price'].get_value() + try: + # TODO respect configured date format + self.equip.purchdate = parse(self.entry['purchdate'].get_text(), dayfirst=True) + except ValueError: + self.equip.purchdate = None self.equip.supplier = combobox.get_list_value(self.combo['supplier']) if self.equip.supplier < 0: self.equip.supplier = None self.equip.ecat = combobox.get_list_value(self.combo['category']) if self.equip.ecat < 0: self.equip.ecat = None + self.equip.econd = combobox.get_list_value(self.combo['condition']) self.equip.remarks = gtkutils.get_text_contents(self.text['remarks']) print(self.equip) diff --git a/yms/view/fuses.py b/yms/view/fuses.py index ad40ba0..9050479 100644 --- a/yms/view/fuses.py +++ b/yms/view/fuses.py @@ -59,6 +59,7 @@ class FusesView(View): combobox.activate_row(self.combo['equipment'], -1) self.entry['location'].set_text('') self.text['remarks'].get_buffer().set_text('') + self.spin['fnumber'].grab_focus() def display_record(self): self.label['fnumber'].set_text(f"F{self.fuse.fnumber}") @@ -79,6 +80,7 @@ class FusesView(View): combobox.activate_row(self.combo['equipment'], self.fuse.eid) self.entry['location'].set_text(self.fuse.location) self.text['remarks'].get_buffer().set_text(self.prov.remarks or '') + self.spin['fnumber'].grab_focus() def save_record(self): # fields must have been validated beforehand diff --git a/yms/view/inventory.py b/yms/view/inventory.py index e457a2e..7e9e9ee 100644 --- a/yms/view/inventory.py +++ b/yms/view/inventory.py @@ -1,10 +1,9 @@ # SPDX-License-Identifier: WTFPL - - import os from gi.repository import GLib, Gtk, Gdk from dateutil.parser import parse +from gettext import pgettext from .view import View from yms import gtkutils, combobox, treeview @@ -53,7 +52,7 @@ class InventoryView(View): combobox.load_from_dict(self.combo['equipment'], {-1: _("─── none ───")} | self.dd_equipment) # Condition self.dd_condition = self.context.lookup.enum('inventory.invcond') - combobox.load_from_dict(self.combo['condition'], {"-1": _("─── none ───")} | self.dd_condition) + combobox.load_from_dict(self.combo['condition'], self.dd_condition) def load_list(self): self.lst_inventory.clear() @@ -90,19 +89,22 @@ class InventoryView(View): combobox.activate_row(self.combo['condition'], 'unknown') combobox.activate_row(self.combo['category'], -1) self.text['remarks'].get_buffer().set_text('') + self.entry['name'].grab_focus() def display_record(self): # TODO nice formatting self.label['name'].set_text(self.inv.invname) - self.label['conttype'].set_text(self.inv.conttype) - self.label['storage'].set_text(str(self.inv.sid)) - self.label['box'].set_text(str(self.inv.boxid)) + container = pgettext("inventory.conttype", self.inv.conttype) + if self.inv.conttype == 'storage': + self.label['conttype'].set_text("{}: {}".format(container, self.dd_storage[self.inv.sid])) + else: + self.label['conttype'].set_text("{}: {}".format(container, self.dd_box[self.inv.boxid])) self.label['equipment'].set_text(str(self.inv.eid)) self.label['number'].set_text(self.format_int(self.inv.number)) self.label['weight'].set_text(self.format_float(self.inv.weight, suffix='kg')) self.label['price'].set_text(self.format_float(self.inv.price, suffix='€')) self.label['purchdate'].set_text(self.format_date(self.inv.purchdate)) - self.label['condition'].set_text(self.inv.invcond) + self.label['condition'].set_text(pgettext("inventory.invcond", self.inv.invcond)) if self.inv.icat is not None: self.label['category'].set_text(self.dd_category[self.inv.icat]) else: @@ -113,19 +115,20 @@ class InventoryView(View): def edit_record(self): self.entry['name'].set_text(self.inv.invname) combobox.activate_row(self.combo['conttype'], self.inv.conttype) - combobox.activate_row(self.combo['storage'], self.inv.sid) - combobox.activate_row(self.combo['box'], self.inv.boxid) - combobox.activate_row(self.combo['equipment'], self.inv.eid) + combobox.activate_row(self.combo['storage'], self.inv.sid or -1) + combobox.activate_row(self.combo['box'], self.inv.boxid or -1) + combobox.activate_row(self.combo['equipment'], self.inv.eid or -1) self.spin['number'].set_value(self.inv.number) self.spin['weight'].set_value(self.inv.weight or 0) self.spin['price'].set_value(self.inv.price or 0) - self.entry['purchdate'].set_text(self.inv.purchdate or '') + self.entry['purchdate'].set_text(self.format_date(self.inv.purchdate)) combobox.activate_row(self.combo['condition'], self.inv.invcond) - combobox.activate_row(self.combo['category'], self.inv.icat) + combobox.activate_row(self.combo['category'], self.inv.icat or -1) flags = self.inv.flags.split(',') for flag in self.context.lookup.enum('inventory.flags'): self.check[flag].set_active(flag in flags) self.text['remarks'].get_buffer().set_text(self.inv.remarks or '') + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -150,6 +153,8 @@ class InventoryView(View): self.inv.purchdate = None self.inv.invcond = combobox.get_list_value(self.combo['condition']) self.inv.icat = combobox.get_list_value(self.combo['category']) + if self.inv.icat == -1: + self.inv.icat = None # TODO this could be a generic function operating on a list # of check controls flags = [] @@ -251,7 +256,14 @@ class InventoryView(View): self.save_record() print(self.inv) self.inv.save() - self.context.db.conn.commit() + if self.newrecord: + self.load_list() + self.newrecord = False + else: + pass + # TODO aktuelle Listenzeile aktualisieren! + self.display_record() + self.topwidget.set_visible_child(self.box['inv_detail']) def on_but_cancel_clicked(self, widget): if not self.newrecord: diff --git a/yms/view/maintenance.py b/yms/view/maintenance.py index a1135f6..46622d1 100644 --- a/yms/view/maintenance.py +++ b/yms/view/maintenance.py @@ -43,6 +43,7 @@ class MaintenanceView(View): self.entry['completion'].set_text('') combobox.activate_row(self.combo['status'], 'new') self.text['remarks'].get_buffer().set_text('') + self.entry['activities'].grab_focus() def display_record(self): self.label['activities'].set_text(self.maint.activities) @@ -65,6 +66,7 @@ class MaintenanceView(View): self.entry['completion'].set_text(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 diff --git a/yms/view/measurement.py b/yms/view/measurement.py index b11d458..494efaf 100644 --- a/yms/view/measurement.py +++ b/yms/view/measurement.py @@ -26,7 +26,6 @@ class MeasurementView(View): # measurement units self.dd_unit = self.context.lookup.dropdown(Dropdown.UNIT) - print("Unit: {self.dd_unit}") combobox.load_from_dict(self.combo['unit'], self.dd_unit, 1) # equipment @@ -86,6 +85,7 @@ class MeasurementView(View): combobox.activate_row(self.combo['equipment'], -1) combobox.activate_row(self.combo['category'], -1) self.text['note'].get_buffer().set_text('') + self.entry['name'].grab_focus() def display_record(self): self.label['name'].set_text(self.measure.mname) @@ -115,14 +115,15 @@ class MeasurementView(View): combobox.activate_row(self.combo['equipment'], self.measure.eid) combobox.activate_row(self.combo['category'], self.measure.mcat) self.text['note'].get_buffer().set_text(self.task.note or '') + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand self.measure.mname = self.entry['name'].get_text() self.measure.nval = combobox.get_list_value(self.combo['dimensions']) - self.measure.val1 = int(self.spin['val1'].get_value()) - self.measure.val2 = int(self.spin['val2'].get_value()) - self.measure.val3 = int(self.spin['val3'].get_value()) + self.measure.val1 = self.spin['val1'].get_value_as_int() + self.measure.val2 = self.spin['val2'].get_value_as_int() + self.measure.val3 = self.spin['val3'].get_value_as_int() self.measure.accuracy = combobox.get_list_value(self.combo['accurace']) self.measure.mdate = self.entry['date'].get_text() self.measure.eid = combobox.get_list_value(self.combo['equipment']) @@ -185,6 +186,8 @@ class MeasurementView(View): self.save_record() print(self.measure) self.measure.save() + self.display_record() + self.topwidget.set_visible_child(self.box['measure_detail']) def on_but_cancel_clicked(self, widget): self.topwidget.set_visible_child(self.box['measurement']) diff --git a/yms/view/projects.py b/yms/view/projects.py index 0b666cb..d63beb8 100644 --- a/yms/view/projects.py +++ b/yms/view/projects.py @@ -2,6 +2,7 @@ import os from gi.repository import Gtk +from gettext import pgettext from .view import View from yms import gtkutils, combobox, treeview @@ -60,6 +61,7 @@ class ProjectsView(View): self.spin['costs_final'].set_value(0) combobox.activate_row(self.combo['status'], 'new') self.text['remarks'].get_buffer().set_text('') + self.entry['name'].grab_focus() def display_record(self): self.label['name'].set_text(self.project.projname) @@ -68,7 +70,7 @@ class ProjectsView(View): self.label['duration'].set_text(self.format_int(self.project.duration, suffix="Days")) self.label['costs_plan'].set_text(self.format_float(self.project.costs_plan, 2, suffix="€")) self.label['costs_final'].set_text(self.format_float(self.project.costs_final, 2, suffix="€")) - self.label['status'].set_text(self.project.projstate) + self.label['status'].set_text(pgettext("project.projstate", self.project.projstate)) self.label['remarks'].set_text(self.project.remarks or '') def edit_record(self): @@ -79,6 +81,7 @@ class ProjectsView(View): self.spin['costs_final'].set_value(self.project.costs_final) combobox.activate_row(self.combo['status'], self.project.projstate) self.text['remarks'].get_buffer().set_text(self.project.remarks or '') + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand diff --git a/yms/view/provisions.py b/yms/view/provisions.py index 499d00a..43fbd9d 100644 --- a/yms/view/provisions.py +++ b/yms/view/provisions.py @@ -8,6 +8,7 @@ from datetime import datetime from .view import View, DatePicker from yms import gtkutils, combobox, treeview from yms.model import provision +from yms.lookup import Dropdown class ProvisionsView(View): @@ -18,25 +19,21 @@ class ProvisionsView(View): self.prov = provision.Provision(context.db) # current record self.newrecord = False - self.load_dropdown() + # Category + self.dd_category = self.context.lookup.dropdown(Dropdown.PROVISION_CATEGORY) + combobox.load_from_dict(self.combo['category'], {-1: _("─── none ───")} | self.dd_category, -1) + # Storage + self.dd_storage = self.context.lookup.storage(context.vessel.vid) + combobox.load_from_dict(self.combo['storage'], {-1: _("─── none ───")} | self.dd_storage) + # Box + self.dd_box = self.context.lookup.box(context.vessel.vid) + combobox.load_from_dict(self.combo['box'], {-1: _("─── none ───")} | self.dd_box) + # Provision unit + self.dd_unit = self.context.lookup.dropdown(Dropdown.PROVISION_UNIT) + combobox.load_from_dict(self.combo['unit'], {-1: _("─── none ───")} | self.dd_unit, -1) self.lst_provisions = Gtk.ListStore(int, str, int, str, str, str) - sql = ( - "SELECT p.provid, p.provname, p.number, p.unit, p.storedate, p.shelflife " - "FROM provisions AS p LEFT OUTER JOIN storage AS s USING (sid) " - "WHERE s.vid=%s OR vid IS NULL" - ) - self.db.dcur.execute(sql, (context.vessel.vid,)) - for row in self.db.dcur.fetchall(): - data = ( - row['provid'], - row['provname'], - row['number'], - self.prov_unit[row['unit']], - self.format_date(row['storedate']), - self.format_date(row['shelflife']) - ) - self.lst_provisions.append(data) + self.load_list() treeview.add_column(self.tree['provisions'], _('ID'), 0) treeview.add_column(self.tree['provisions'], _('Description'), 1) @@ -49,54 +46,117 @@ class ProvisionsView(View): # TODO Date format self.entry['storedate'].set_placeholder_text("TT.MM.JJJJ") self.dt_storedate = DatePicker(self.entry['storedate'], self.button['storedate'], context.datefmt) + self.entry['shelflife'].set_placeholder_text("TT.MM.JJJJ") + self.dt_shelflife = DatePicker(self.entry['shelflife'], self.button['shelflife'], context.datefmt) + + def load_list(self): + selected_id = treeview.get_value(self.tree['provisions']) + self.lst_provisions.clear() + sql = ( + "SELECT p.provid, p.provname, p.number, p.unit, p.storedate, p.shelflife " + "FROM provisions AS p LEFT OUTER JOIN storage AS s USING (sid) " + "WHERE s.vid=%s OR vid IS NULL" + ) + self.db.dcur.execute(sql, (self.context.vessel.vid,)) + for row in self.db.dcur.fetchall(): + data = ( + row['provid'], + row['provname'], + row['number'], + self.dd_unit[row['unit']] if row['unit'] is not None else _("─── none ───"), + self.format_date(row['storedate']), + self.format_date(row['shelflife']) + ) + treeiter = self.lst_provisions.append(data) + if row['provid'] == selected_id: + # restore previous selected row + selection.select_iter(treeiter) def clear_record(self): self.prov.clear() - + self.entry['name'].set_text('') + combobox.activate_row(self.combo['category'], -1) + combobox.activate_row(self.combo['storage'], -1) + combobox.activate_row(self.combo['box'], -1) + self.spin['number'].set_value(1) + self.spin['target'].set_value(0) + combobox.activate_row(self.combo['unit'], -1) + self.spin['weight'].set_value(0) + self.spin['weight_net'].set_value(0) + self.spin['price'].set_value(0) + self.spin['calories'].set_value(0) + self.entry['storedate'].set_text('') + self.entry['shelflife'].set_text('') + self.text['remarks'].get_buffer().set_text( '') + self.entry['name'].grab_focus() + def display_record(self): self.label['name'].set_text(self.prov.provname) self.label['category'].set_text(str(self.prov.provcat)) self.label['storage'].set_text(str(self.prov.sid)) self.label['box'].set_text(str(self.prov.boxid)) self.label['number'].set_text(str(self.prov.number)) - self.label['unit'].set_text(str(self.prov.unit)) self.label['target'].set_text(str(self.prov.target)) + self.label['unit'].set_text(str(self.prov.unit)) self.label['weight'].set_text(self.format_float(self.prov.weight, 2, suffix='kg')) self.label['weight_net'].set_text(self.format_float(self.prov.weight_net, 2, suffix='kg')) self.label['price'].set_text(self.format_float(self.prov.price, 2, suffix='€')) + self.label['calories'].set_text(str(self.prov.calories)) + self.label['storedate'].set_text(self.prov.storedate or '') + self.label['shelflife'].set_text(self.prov.shelflife or '') self.label['remarks'].set_text(self.prov.remarks or '') def edit_record(self): self.entry['name'].set_text(self.prov.provname) - combobox.activate_row(self.combo['category'], self.prov.provcat) - combobox.activate_row(self.combo['storage'], self.prov.sid) - combobox.activate_row(self.combo['box'], self.prov.boxid) - self.spin['number'].set_value(self.prov.number) + combobox.activate_row(self.combo['category'], self.prov.provcat or -1) + combobox.activate_row(self.combo['storage'], self.prov.sid or -1) + combobox.activate_row(self.combo['box'], self.prov.boxid or -1) + self.spin['number'].set_value(self.prov.number or 1) + self.spin['target'].set_value(self.prov.target or 0) + combobox.activate_row(self.combo['unit'], self.prov.unit or -1) self.spin['weight'].set_value(self.prov.weight or 0) self.spin['weight_net'].set_value(self.prov.weight_net or 0) - combobox.activate_row(self.combo['unit'], self.prov.unit) + self.spin['price'].set_value(self.prov.price or 0) + self.spin['calories'].set_value(self.prov.calories or 0) self.entry['storedate'].set_text(self.prov.storedate or '') self.entry['shelflife'].set_text(self.prov.shelflife or '') + # self.dt_storedate.set_date + # self.dt_shelflife.set_date self.text['remarks'].get_buffer().set_text(self.prov.remarks or '') + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand self.prov.provname = self.entry['name'].get_text() self.prov.provcat = combobox.get_list_value(self.combo['category']) + if self.prov.provcat == -1: + self.prov.provcat = None self.prov.sid = combobox.get_list_value(self.combo['storage']) + if self.prov.sid == -1: + self.prov.sid = None self.prov.boxid = combobox.get_list_value(self.combo['box']) - self.prov.number = int(self.spin['number'].get_value()) + if self.prov.boxid == -1: + self.prov.boxid = None + self.prov.number = self.spin['number'].get_value_as_int() + self.prov.target = self.spin['target'].get_value_as_int() self.prov.weight = self.spin['weight'].get_value() - self.prov.weight_net = self.spin['wehigt_net'].get_value() + self.prov.weight_net = self.spin['weight_net'].get_value() self.prov.unit = combobox.get_list_value(self.combo['unit']) - self.prov.storedate = self.entry['storedate'].get_text() - self.prov.shelflife = self.entry['shelflife'].get_text() + if self.prov.unit == -1: + self.prov.unit = None + # TODO respect configured date format + # self.prov.storedate = self.dt_storedate.get_date() + # self.prov.shelflife = self.dt_shelflife.get_date() + try: + self.prov.storedate = parse(self.entry['storedate'].get_text(), dayfirst=True) + except ValueError: + self.prov.shelfstoredatelife = None + try: + self.prov.shelflife = parse(self.entry['shelflife'].get_text(), dayfirst=True) + except ValueError: + self.prov.shelflife = None self.prov.remarks = gtkutils.get_text_contents(self.text['remarks']) - def load_dropdown(self): - self.db.cur.execute("SELECT ddval, ddtext FROM dropdown WHERE ddid=6 ORDER BY ddval") - self.prov_unit = dict(self.db.cur.fetchall()) - # buttons on list page def on_but_new_clicked(self, widget): self.newrecord = True @@ -144,21 +204,39 @@ class ProvisionsView(View): # buttons on edit page def on_but_storedate_clicked(self, widget): - try: - curdate = parse(self.entry['storedate'].get_text()) - except: - curdate = datetime.date.today() - selected_date = self.calendar_dialog(None, self.entry['storedate'], curdate) - self.entry['storedate'].set_text(self.format_date(selected_date, curdate)) + #try: + # curdate = parse(self.entry['storedate'].get_text()) + #except: + # curdate = datetime.today() + #selected_date = self.calendar_dialog(None, self.entry['storedate'], curdate) + #self.entry['storedate'].set_text(self.format_date(selected_date, curdate)) + pass + + def on_but_shelflife_clicked(self, widget): + #try: + # curdate = parse(self.entry['shelflife'].get_text()) + #except: + # curdate = datetime.today() + #selected_date = self.calendar_dialog(None, self.entry['shelflife'], curdate) + #self.entry['shelflife'].set_text(self.format_date(selected_date, curdate)) + pass def on_but_save_clicked(self, widget): # check mandatory fields - if not self.entry['provname'].get_text().strip(): + if not self.entry['name'].get_text().strip(): # TODO error marker return self.save_record() print(self.prov) self.prov.save() + if self.newrecord: + self.load_list() + else: + pass + # TODO aktuelle Listenzeile aktualisieren! + self.newrecord = False + self.display_record() + self.topwidget.set_visible_child(self.box['prov_detail']) def on_but_cancel_clicked(self, widget): self.topwidget.set_visible_child(self.box['provisions']) diff --git a/yms/view/storage.py b/yms/view/storage.py index f46652f..998d517 100644 --- a/yms/view/storage.py +++ b/yms/view/storage.py @@ -76,6 +76,7 @@ class StorageView(View): combobox.activate_row(self.combo['type'], storage.GENERIC) combobox.activate_row(self.combo['unit'], "-1") self.text['remarks'].get_buffer().set_text('') + self.entry['sname'].grab_focus() def display_record(self): self.label['name'].set_text(self.storage.sname) @@ -108,6 +109,7 @@ class StorageView(View): rgba.parse('#' + (self.storage.color or '000000')) self.button['color'].set_rgba(rgba) self.text['remarks'].get_buffer().set_text(self.storage.remarks or '') + self.entry['sname'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -187,10 +189,10 @@ class StorageView(View): self.storage.save() if self.newrecord: self.load_list() + self.newrecord = False else: pass # TODO aktuelle Listenzeile aktualisieren! - self.newrecord = False self.display_record() self.topwidget.set_visible_child(self.box['stor_detail']) @@ -206,7 +208,7 @@ class StorageView(View): self.set_color_from_entry(entry) def on_ent_color_focus_out_event(self, entry, event): - self.set_color_from_entry(entry) + self.set_color_from_entry(entry, self.button['color']) return False def on_but_cancel_clicked(self, widget): diff --git a/yms/view/tasks.py b/yms/view/tasks.py index 1df5a45..9bf394b 100644 --- a/yms/view/tasks.py +++ b/yms/view/tasks.py @@ -17,23 +17,7 @@ class TasksView(View): self.newrecord = False self.lst_tasks = Gtk.ListStore(int, str, str, str, str) - sql = ( - "SELECT t.taskid, t.taskname, t.priority, t.taskstate, " - "u.displayname AS responsible " - "FROM task AS t JOIN user AS u ON (t.responsible=u.userid)" - "WHERE t.vid=%s " - "ORDER BY t.taskid" - ) - self.db.dcur.execute(sql, (context.vessel.vid,)) - for row in self.db.dcur.fetchall(): - data = ( - row['taskid'], - row['taskname'], - row['priority'], - row['taskstate'], - row['responsible'] - ) - self.lst_tasks.append(data) + self.load_list() treeview.add_column(self.tree['tasks'], _('ID'), 0) treeview.add_column(self.tree['tasks'], _('Name'), 1) @@ -58,6 +42,25 @@ class TasksView(View): self.dd_user = context.lookup.user() combobox.load_from_dict(self.combo['responsible'], self.dd_user) + def load_list(self): + sql = ( + "SELECT t.taskid, t.taskname, t.priority, t.taskstate, " + "u.displayname AS responsible " + "FROM task AS t JOIN user AS u ON (t.responsible=u.userid)" + "WHERE t.vid=%s " + "ORDER BY t.taskid" + ) + self.db.dcur.execute(sql, (self.context.vessel.vid,)) + for row in self.db.dcur.fetchall(): + data = ( + row['taskid'], + row['taskname'], + row['priority'], + row['taskstate'], + row['responsible'] + ) + self.lst_tasks.append(data) + def clear_record(self): self.task.clear() self.entry['name'].set_text('') @@ -70,6 +73,7 @@ class TasksView(View): combobox.activate_row(self.combo['status'], 'new') combobox.activate_row(self.combo['responsible'], 0) self.text['remarks'].get_buffer().set_text('') + self.entry['name'].grab_focus() def display_record(self): self.label['name'].set_text(self.task.taskname) @@ -88,6 +92,7 @@ class TasksView(View): combobox.activate_row(self.combo['taskstate'], self.task.taskstate) combobox.activate_row(self.combo['responsible'], self.task.responsible) self.text['remarks'].get_buffer().set_text(self.task.remarks or '') + self.entry['name'].grab_focus() def save_record(self): # fields must have been validated beforehand @@ -151,12 +156,32 @@ class TasksView(View): # buttons on edit page def on_but_save_clicked(self, widget): # check mandatory fields - if not self.entry['taskname'].get_text().strip(): + if not self.entry['name'].get_text().strip(): # TODO error marker return self.save_record() print(self.task) self.task.save() + if self.newrecord: + self.load_list() + self.newrecord = False + else: + pass + # TODO aktuelle Listenzeile aktualisieren! + self.display_record() + self.topwidget.set_visible_child(self.box['task_detail']) + + def on_but_plandate_clicked(self, widget): + pass + + def on_but_duedate_clicked(self, widget): + pass + + def on_but_started_clicked(self, widget): + pass + + def on_but_finished_clicked(self, widget): + pass def on_but_cancel_clicked(self, widget): self.topwidget.set_visible_child(self.box['tasks']) diff --git a/yms/view/view.py b/yms/view/view.py index 78d65db..76931a0 100644 --- a/yms/view/view.py +++ b/yms/view/view.py @@ -32,20 +32,6 @@ class View: self.topwidget = self.builder.get_object("topobject") gtkutils.init_named_controls(self, self.builder) - css = Gtk.CssProvider() - css.load_from_data(b""" - .invalid { - color: #cc0000; - background-color: #ffdddd; - } - """) - - Gtk.StyleContext.add_provider_for_screen( - Gdk.Screen.get_default(), - css, - Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION - ) - def format_int(self, ival, separator=True, suffix=None, default=''): if ival is None: return default @@ -133,16 +119,26 @@ class View: else: context.add_class("invalid") - def set_color_from_entry(self, entry): + def set_color_from_entry(self, entry, colorbutton): + # TODO this was a fast hack! text = entry.get_text().strip() rgba = Gdk.RGBA() if len(text) == 7 and rgba.parse(text): self.last_valid_rgb = text.lstrip('#') - self.entry['color'].set_text(text) - self.button['color'].set_rgba(rgba) - self.set_entry_valid(self.entry['color'], True) + self.entry.set_text(text) + colorbutton.set_rgba(rgba) + self.set_entry_valid(entry, True) else: - self.set_entry_valid(self.entry['color'], False) + self.set_entry_valid(entry, False) + + def get_checks(self, checkboxlist): + # checkbox helper function + # self.check[] from ui file + checks = [] + for c in checkboxlist: + if c in self.check and self.check[c].get_active(): + checks.append(c) + return ','.join(checks) class DatePicker: def __init__(self, entry, button, datefmt='"%d.%m.%Y"'): diff --git a/ymsgui.py b/ymsgui.py index 4140cd9..f715afc 100755 --- a/ymsgui.py +++ b/ymsgui.py @@ -15,6 +15,7 @@ Configuration file located at ~/.config/ymsgui.conf: [Documents] basepath = /var/local/lib/yms + scanner = off [Data] shapedir = /usr/local/share/yms/shapes @@ -69,7 +70,8 @@ class AppContext: 'db': 'yms', 'user': 'yms', 'docpath': '/var/local/lib/yms', - 'shapedir': '/usr/local/share/yms/shapes' + 'shapedir': '/usr/local/share/yms/shapes', + 'scanner': 'off' } # mapping between PHP and Python @@ -115,7 +117,7 @@ class AppContext: print(row[0]) except KeyError: # almost impossible case where db value is not in mapping - print("internal error: date format mapping missing") + print("internal error: date format mapping missing ({})".format(row[0])) else: # perhaps create missing record here? pass @@ -135,6 +137,15 @@ class Frontend: self.initializing = True self.context = context self.db = context.db + + css = Gtk.CssProvider() + css.load_from_path("yms/style.css") + Gtk.StyleContext.add_provider_for_screen( + Gdk.Screen.get_default(), + css, + Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + ) + builder = Gtk.Builder() builder.set_translation_domain(context.textdomain) ui_path = os.path.join(context.ui_path) @@ -228,7 +239,8 @@ def create_config(cfg, cfgfile): fh.write('user = {}\n'.format(cfg['user'])) fh.write('pass = changeme!\n\n') fh.write('[Documents]\n') - fh.write('basepath = {}\n\n'.format(cfg['docpath'])) + fh.write('basepath = {}\n'.format(cfg['docpath'])) + fh.write('scanner = {}\n\n'.format(cfg['scanner'])) fh.write('[Data]\n') fh.write('shapedir = {}\n'.format(cfg['shapedir'])) # secure configuration @@ -265,6 +277,8 @@ if __name__ == "__main__": context.cfg['pass'] = config.get('DB', 'pass') connected = db.connect(context.cfg['user'], context.cfg['pass']) if connected: + # TODO check database schema version + schema_required = 1 context.load() # check if shapedir exists context.cfg['shapedir'] = config.get('Data', 'shapedir')