diff --git a/db/mariadb.sql b/db/mariadb.sql index 508ff26..745bc2a 100644 --- a/db/mariadb.sql +++ b/db/mariadb.sql @@ -413,14 +413,15 @@ CREATE TABLE maintenance ( maintid int(10) NOT NULL AUTO_INCREMENT, vid smallint(6) NOT NULL DEFAULT 1, eid smallint(6) UNSIGNED DEFAULT NULL, - series smallint(6) DEFAULT NULL, + series smallint(6) UNSIGNED DEFAULT NULL, activities varchar(40) NOT NULL, plan_date DATE DEFAULT NULL, + plan_precision enum('day','week','month','quarter') NOT NULL DEFAULT 'day', completion_date DATE DEFAULT NULL, interval_hours smallint(6) DEFAULT NULL, last_hours int(10) DEFAULT NULL, remarks varchar(150) DEFAULT NULL, - maintstate enum('new','plan','ongoing','done') NOT NULL DEFAULT 'new', + maintstate enum('new','plan','ongoing','skipped','missed','done') NOT NULL DEFAULT 'new', PRIMARY KEY (maintid), FOREIGN KEY fk_maintenance_vessel (vid) REFERENCES vessel(vid) diff --git a/webgui/globals.inc b/webgui/globals.inc index 4b35947..7922226 100644 --- a/webgui/globals.inc +++ b/webgui/globals.inc @@ -197,6 +197,7 @@ $g_opt_all = array(-2 => _('― all ―')); $g_opt_none = array(-1 => _('― none ―')); $g_opt_empty = array('' => _('― none ―')); $g_opt_unknown = array(-1 => _('― unknown ―')); +$g_opt_new = array(-3 => _('― new ―')); // Initialize message system $g_message = new Message; @@ -557,6 +558,7 @@ function get_enum($enum) { 'completed' => _('Completed'), 'closed' => _('Closed'), 'company' => _('Company'), + 'day' => _('Day'), 'defect' => _('Defect'), 'deleted' => _('Deleted'), 'done' => _('Done'), @@ -577,7 +579,9 @@ function get_enum($enum) { 'low' => _('Low'), 'manual' => _('Manual'), 'medium' => _('Medium'), + 'missed' => _('Missed'), 'mono' => _('Monohull'), + 'month' => _('Month'), 'new' => _('New'), 'none' => _('None'), 'normal' => _('Normal'), @@ -590,16 +594,19 @@ function get_enum($enum) { 'plan' => _('Planned'), 'precise' => _('Precise'), 'project' => _('Project'), + 'quarter' => _('Quarter'), 'removed' => _('Removed'), 'repairable' => _('Repairable'), 'rough' => _('Rough'), + 'skipped' => _('Skipped'), 'storage' => _('Storage'), 'task' => _('Task'), 'tri' => _('Trimaran'), 'unknown' => _('Unknown'), 'user' => _('User'), 'vessel' => _('Vessel'), - 'waiting' => _('waiting') + 'waiting' => _('Waiting'), + 'week' => _('Week'), ); return $lookup[$enum] ?? $enum; } diff --git a/webgui/locale/de_DE.po b/webgui/locale/de_DE.po index 0b8b259..498f6d7 100644 --- a/webgui/locale/de_DE.po +++ b/webgui/locale/de_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-18 19:23+0200\n" +"POT-Creation-Date: 2026-10-22 21:20+0200\n" "PO-Revision-Date: 2024-03-15 13:50+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: LANGUAGE \n" @@ -16,35 +16,35 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: box.php:20 index.php:372 globals.inc:1436 +#: box.php:20 index.php:372 globals.inc:1471 msgid "Boxes" msgstr "Kisten" -#: box.php:77 checklist.php:60 maintenance.php:69 note.php:73 projects.php:102 -#: settings.php:60 storage.php:95 task.php:114 +#: box.php:77 checklist.php:60 maintenance.php:76 note.php:73 projects.php:102 +#: settings.php:60 storage.php:98 task.php:114 #, php-format msgid "Unknown function '%s'!" msgstr "Unbekannte Funktion '%s'!" -#: box.php:103 box.php:143 box.php:312 storage.php:172 +#: box.php:103 box.php:143 box.php:312 storage.php:175 msgid "Label" msgstr "Etikett" #: box.php:104 cable.php:181 cable.php:210 cable.php:244 company.php:207 #: company.php:278 documents.php:402 documents.php:632 fuse.php:157 -#: fuse.php:208 fuse.php:233 note.php:112 note.php:203 storage.php:213 -#: storage.php:328 +#: fuse.php:208 fuse.php:233 note.php:112 note.php:203 storage.php:217 +#: storage.php:331 msgid "Type" msgstr "Typ" #: box.php:105 box.php:192 box.php:321 cable.php:135 cable.php:217 #: cable.php:268 dropdown.php:45 dropdown.php:193 dropdown.php:241 -#: storage.php:124 storage.php:173 storage.php:240 storage.php:368 tag.php:121 +#: storage.php:127 storage.php:176 storage.php:243 storage.php:379 tag.php:121 #: tag.php:183 tag.php:267 msgid "Color" msgstr "Farbe" -#: box.php:106 box.php:157 box.php:191 box.php:317 storage.php:174 +#: box.php:106 box.php:157 box.php:191 box.php:317 storage.php:177 msgid "Content" msgstr "Inhalt" @@ -58,19 +58,19 @@ msgstr "Gewicht" #: company.php:218 company.php:312 documents.php:416 documents.php:643 #: documents.php:645 documents.php:647 dropdown.php:159 equipment.php:385 #: equipment.php:468 equipment.php:608 equipment.php:631 equipment.php:686 -#: fuse.php:168 inventory.php:291 maintenance.php:193 measurement.php:233 -#: note.php:123 projects.php:216 projects.php:264 projects.php:367 -#: provisions.php:201 storage.php:135 storage.php:182 storage.php:259 -#: storage.php:278 storage.php:300 tag.php:130 task.php:253 +#: fuse.php:168 inventory.php:291 maintenance.php:244 measurement.php:233 +#: note.php:123 projects.php:217 projects.php:265 projects.php:368 +#: provisions.php:201 storage.php:138 storage.php:185 storage.php:262 +#: storage.php:281 storage.php:303 tag.php:130 task.php:253 msgid "View" msgstr "Ansehen" #: box.php:124 cable.php:155 checklist.php:98 company.php:233 documents.php:424 #: dropdown.php:167 equipment.php:406 equipment.php:587 equipment_js.php:247 -#: fuse.php:177 index.php:337 inventory.php:303 maintenance.php:200 -#: maintenance.php:345 measurement.php:241 note.php:131 projects.php:225 -#: projects.php:270 projects.php:372 provisions.php:222 storage.php:148 -#: storage.php:189 tag.php:138 task.php:261 task.php:338 globals.inc:944 +#: fuse.php:177 index.php:337 inventory.php:303 maintenance.php:254 +#: maintenance.php:401 measurement.php:241 note.php:131 projects.php:226 +#: projects.php:271 projects.php:373 provisions.php:222 storage.php:151 +#: storage.php:192 tag.php:138 task.php:261 task.php:338 globals.inc:979 msgid "Edit" msgstr "Bearbeiten" @@ -80,8 +80,8 @@ msgstr "Kiste hinzufügen" #: box.php:147 box.php:198 box.php:356 inventory.php:225 inventory.php:332 #: inventory.php:339 inventory.php:393 inventory.php:461 provisions.php:263 -#: provisions.php:295 provisions.php:359 storage.php:13 storage.php:232 -#: globals.inc:596 globals.inc:1432 +#: provisions.php:295 provisions.php:359 storage.php:13 storage.php:235 +#: globals.inc:602 globals.inc:1467 msgid "Storage" msgstr "Stauraum" @@ -90,19 +90,19 @@ msgstr "Stauraum" #: documents.php:558 documents.php:798 equipment.php:367 equipment.php:438 #: equipment.php:480 equipment.php:781 equipment_js.php:69 fuse.php:238 #: fuse.php:278 index.php:491 index.php:614 inventory.php:280 inventory.php:408 -#: inventory.php:492 maintenance.php:183 maintenance.php:286 -#: maintenance.php:377 projects.php:182 projects.php:206 projects.php:296 -#: projects.php:323 projects.php:424 provisions.php:296 provisions.php:362 -#: storage.php:126 storage.php:241 storage.php:372 task.php:321 task.php:400 +#: inventory.php:492 maintenance.php:234 maintenance.php:341 +#: maintenance.php:463 projects.php:183 projects.php:207 projects.php:297 +#: projects.php:324 projects.php:425 provisions.php:296 provisions.php:362 +#: storage.php:129 storage.php:244 storage.php:380 task.php:321 task.php:400 msgid "Remarks" msgstr "Bemerkungen" #: box.php:165 company.php:257 company.php:429 documents.php:475 #: documents.php:801 equipment.php:442 equipment.php:788 equipment_js.php:116 -#: equipment_js.php:283 index.php:495 inventory.php:343 maintenance.php:241 -#: measurement.php:290 note.php:180 projects.php:299 projects.php:427 -#: provisions.php:265 settings.php:161 storage.php:215 storage.php:375 -#: task.php:291 globals.inc:954 globals.inc:961 +#: equipment_js.php:283 index.php:495 inventory.php:343 maintenance.php:295 +#: measurement.php:290 note.php:180 projects.php:300 projects.php:428 +#: provisions.php:265 settings.php:161 storage.php:219 storage.php:382 +#: task.php:291 globals.inc:989 globals.inc:996 msgid "Save" msgstr "Speichern" @@ -110,10 +110,10 @@ msgstr "Speichern" #: documents.php:476 documents.php:802 dropdown.php:220 dropdown.php:286 #: equipment.php:443 equipment.php:789 equipment_js.php:117 #: equipment_js.php:251 equipment_js.php:284 index.php:496 inventory.php:344 -#: maintenance.php:242 measurement.php:291 note.php:181 projects.php:300 -#: projects.php:428 provisions.php:266 provisions.php:407 search.php:37 -#: settings.php:162 storage.php:216 storage.php:376 task.php:292 -#: globals.inc:948 globals.inc:955 globals.inc:962 globals.inc:972 +#: maintenance.php:296 measurement.php:291 note.php:181 projects.php:301 +#: projects.php:429 provisions.php:266 provisions.php:407 search.php:37 +#: settings.php:162 storage.php:220 storage.php:383 task.php:292 +#: globals.inc:983 globals.inc:990 globals.inc:997 globals.inc:1007 msgid "Back" msgstr "Zurück" @@ -153,7 +153,7 @@ msgstr "Keine verknüpften Bilder" msgid "Inventory in box" msgstr "Inventar in der Kiste" -#: box.php:260 index.php:397 inventory.php:13 search.php:81 globals.inc:1400 +#: box.php:260 index.php:397 inventory.php:13 search.php:81 globals.inc:1435 msgid "Inventory" msgstr "Inventar" @@ -168,7 +168,7 @@ msgid "Box is empty" msgstr "Kiste ist leer" #: box.php:305 documents.php:365 inventory.php:20 inventory.php:211 -#: maintenance.php:90 measurement.php:180 globals.inc:197 globals.inc:198 +#: maintenance.php:97 measurement.php:180 globals.inc:197 globals.inc:198 msgid "― none ―" msgstr "― keine ―" @@ -211,19 +211,19 @@ msgstr "Preis, %s" #: box.php:372 cable.php:304 checklist.php:178 company.php:467 #: documents.php:835 dropdown.php:292 equipment.php:815 equipment_js.php:293 -#: fuse.php:307 index.php:625 inventory.php:520 maintenance.php:414 -#: measurement.php:377 note.php:251 projects.php:440 provisions.php:413 -#: settings.php:168 storage.php:402 tag.php:296 task.php:426 +#: fuse.php:307 index.php:625 inventory.php:520 maintenance.php:476 +#: measurement.php:377 note.php:251 projects.php:441 provisions.php:413 +#: settings.php:168 storage.php:409 tag.php:296 task.php:426 msgid "Unknown function call: Please report to system development!" msgstr "Unbekannter Funktionsaufruf: Bitte der Systementwickelung melden!" -#: cable.php:13 globals.inc:1440 +#: cable.php:13 globals.inc:1475 msgid "Cables" msgstr "Kabel" #: cable.php:74 company.php:77 documents.php:179 equipment.php:92 fuse.php:72 #: inventory.php:111 measurement.php:122 note.php:51 projects.php:92 -#: provisions.php:79 storage.php:63 tag.php:59 task.php:91 +#: provisions.php:79 storage.php:66 tag.php:59 task.php:91 msgid "Delete prohibited, invalid security token!" msgstr "Löschen verboten, ungültiger Sicherheitstoken!" @@ -235,30 +235,30 @@ msgid "Unknown function!" msgstr "Unbekannte Funktion!" #: cable.php:114 company.php:190 documents.php:385 equipment.php:346 -#: fuse.php:136 inventory.php:261 maintenance.php:117 measurement.php:193 -#: projects.php:187 provisions.php:170 tag.php:103 task.php:223 +#: fuse.php:136 inventory.php:261 maintenance.php:147 measurement.php:193 +#: projects.php:188 provisions.php:170 tag.php:103 task.php:223 msgid "Apply" msgstr "Anwenden" #: cable.php:114 company.php:190 documents.php:385 equipment.php:346 -#: fuse.php:136 inventory.php:261 maintenance.php:117 measurement.php:193 -#: projects.php:187 provisions.php:170 tag.php:103 task.php:223 +#: fuse.php:136 inventory.php:261 maintenance.php:147 measurement.php:193 +#: projects.php:188 provisions.php:170 tag.php:103 task.php:223 msgid "Go" msgstr "Start" #: cable.php:115 company.php:191 documents.php:386 equipment.php:347 -#: fuse.php:137 inventory.php:262 maintenance.php:118 measurement.php:194 -#: projects.php:188 provisions.php:171 tag.php:104 task.php:224 +#: fuse.php:137 inventory.php:262 maintenance.php:148 measurement.php:194 +#: projects.php:189 provisions.php:171 tag.php:104 task.php:224 msgid "Reset filter to defaults" msgstr "Filter auf Standard zurücksetzen" #: cable.php:115 company.php:191 documents.php:386 equipment.php:347 -#: fuse.php:137 inventory.php:262 maintenance.php:118 measurement.php:194 -#: projects.php:188 provisions.php:171 tag.php:104 task.php:224 +#: fuse.php:137 inventory.php:262 maintenance.php:148 measurement.php:194 +#: projects.php:189 provisions.php:171 tag.php:104 task.php:224 msgid "Clear" msgstr "Löschen" -#: cable.php:130 cable.php:209 fuse.php:236 fuse.php:274 globals.inc:555 +#: cable.php:130 cable.php:209 fuse.php:236 fuse.php:274 globals.inc:556 msgid "Cable" msgstr "Kabel" @@ -267,9 +267,9 @@ msgstr "Kabel" #: dropdown.php:239 equipment.php:426 equipment.php:734 equipment_js.php:101 #: equipment_js.php:268 index.php:483 inventory.php:276 inventory.php:322 #: inventory.php:447 measurement.php:262 measurement.php:309 -#: measurement.php:340 projects.php:175 projects.php:202 projects.php:251 -#: projects.php:289 projects.php:316 projects.php:398 provisions.php:247 -#: provisions.php:317 storage.php:123 storage.php:209 storage.php:324 +#: measurement.php:340 projects.php:176 projects.php:203 projects.php:252 +#: projects.php:290 projects.php:317 projects.php:399 provisions.php:247 +#: provisions.php:317 storage.php:126 storage.php:216 storage.php:327 #: tag.php:158 task.php:371 msgid "Name" msgstr "Name" @@ -335,7 +335,7 @@ msgstr "Kabel löschen" msgid "Tag is not used anywhere" msgstr "Unbenutzte Tags" -#: checklist.php:13 globals.inc:1448 +#: checklist.php:13 globals.inc:1483 msgid "Checklists" msgstr "Checklisten" @@ -344,8 +344,8 @@ msgstr "Checklisten" msgid "Title" msgstr "Titel" -#: checklist.php:83 checklist.php:134 checklist.php:165 maintenance.php:292 -#: projects.php:179 projects.php:205 projects.php:252 projects.php:322 +#: checklist.php:83 checklist.php:134 checklist.php:165 maintenance.php:348 +#: projects.php:180 projects.php:206 projects.php:253 projects.php:323 msgid "State" msgstr "Status" @@ -365,7 +365,7 @@ msgstr "Checkliste bearbeiten" msgid "Delete checklist" msgstr "Lösche Checkliste" -#: company.php:13 documents.php:702 globals.inc:559 +#: company.php:13 documents.php:702 globals.inc:560 msgid "Company" msgstr "Firma" @@ -375,7 +375,7 @@ msgid "Deleted company no. %d" msgstr "Firma Nr. %d gelöscht" #: company.php:163 documents.php:338 inventory.php:210 inventory.php:243 -#: maintenance.php:89 measurement.php:179 globals.inc:196 +#: maintenance.php:96 measurement.php:179 globals.inc:196 msgid "― all ―" msgstr "― alle ―" @@ -383,7 +383,7 @@ msgstr "― alle ―" msgid "Historic company" msgstr "Historische Firma" -#: company.php:225 equipment.php:392 globals.inc:561 +#: company.php:225 equipment.php:392 globals.inc:563 msgid "Deleted" msgstr "Gelöscht" @@ -481,7 +481,7 @@ msgid "Delete Company" msgstr "Firma löschen" #: company.php:443 documents.php:822 equipment.php:804 inventory.php:510 -#: note.php:242 storage.php:391 +#: note.php:242 storage.php:398 #, php-format msgid "Record no. %d" msgstr "Datensatz Nr. %d" @@ -506,7 +506,7 @@ msgstr "Neuer GD Imagestream kann nicht initialisiert werden" msgid "Resource not found!" msgstr "Resource nicht gefunden!" -#: documents.php:22 index.php:424 task.php:349 globals.inc:1416 +#: documents.php:22 index.php:424 task.php:349 globals.inc:1451 msgid "Documents" msgstr "Dokumente" @@ -611,7 +611,7 @@ msgstr "Dokumentenart" msgid "Preview" msgstr "Vorschau" -#: documents.php:535 globals.inc:563 +#: documents.php:535 globals.inc:565 msgid "Drawing" msgstr "Zeichnung" @@ -657,19 +657,19 @@ msgid "Add new reference" msgstr "Neue Referenz hinzufügen" #: documents.php:674 equipment.php:15 equipment_js.php:14 fuse.php:237 -#: fuse.php:275 index.php:380 inventory.php:489 maintenance.php:98 -#: maintenance.php:182 maintenance.php:228 maintenance.php:280 -#: maintenance.php:375 measurement.php:287 measurement.php:319 -#: measurement.php:366 search.php:53 globals.inc:564 globals.inc:1396 +#: fuse.php:275 index.php:380 inventory.php:489 maintenance.php:122 +#: maintenance.php:231 maintenance.php:282 maintenance.php:335 +#: maintenance.php:431 measurement.php:287 measurement.php:319 +#: measurement.php:366 search.php:53 globals.inc:566 globals.inc:1431 msgid "Equipment" msgstr "Ausrüstung" #: documents.php:720 inventory.php:333 inventory.php:340 inventory.php:462 -#: storage.php:160 globals.inc:554 +#: storage.php:163 globals.inc:555 msgid "Box" msgstr "Kiste" -#: documents.php:745 globals.inc:601 +#: documents.php:745 globals.inc:607 msgid "Vessel" msgstr "Yacht" @@ -677,15 +677,15 @@ msgstr "Yacht" msgid "Edit Document" msgstr "Dokument bearbeiten" -#: documents.php:787 globals.inc:571 +#: documents.php:787 globals.inc:573 msgid "Generic" msgstr "Allgemein" -#: documents.php:788 manual.php:10 globals.inc:578 +#: documents.php:788 manual.php:10 globals.inc:580 msgid "Manual" msgstr "Handbuch" -#: documents.php:789 globals.inc:575 +#: documents.php:789 globals.inc:577 msgid "Invoice" msgstr "Rechnung" @@ -735,7 +735,7 @@ msgstr "Gefahr! Nur anpassen wenn klar ist was für Auswirkungen das hat!" msgid "Adding values is usually not critical." msgstr "Hinzufügen von Werten ist normalerweise unkritisch." -#: dropdown.php:165 globals.inc:576 +#: dropdown.php:165 globals.inc:578 msgid "Locked" msgstr "Gesperrt" @@ -753,7 +753,7 @@ msgstr "Kurzbez." msgid "Edit List: %s" msgstr "Liste bearbeiten: %s" -#: dropdown.php:285 equipment_js.php:93 globals.inc:938 +#: dropdown.php:285 equipment_js.php:93 globals.inc:973 msgid "Add" msgstr "Hinzufügen" @@ -838,11 +838,11 @@ msgstr "" msgid "%dy" msgstr "" -#: equipment.php:389 globals.inc:586 +#: equipment.php:389 globals.inc:590 msgid "Ordered" msgstr "Bestellt" -#: equipment.php:395 globals.inc:593 +#: equipment.php:395 globals.inc:598 msgid "Removed" msgstr "Entfernt" @@ -854,7 +854,7 @@ msgstr "Ausrüstung hinzufügen" msgid "Purchase date" msgstr "Kaufdatum" -#: equipment.php:478 storage.php:237 +#: equipment.php:478 storage.php:240 msgid "Location (x, y, z)" msgstr "Position (x, y, z)" @@ -870,7 +870,7 @@ msgstr "Keine verknüpften Dokumente" msgid "Add Image" msgstr "Bild hinzufügen" -#: equipment.php:575 maintenance.php:333 search.php:125 task.php:326 +#: equipment.php:575 maintenance.php:389 search.php:125 task.php:326 msgid "Annotations" msgstr "Notizen" @@ -878,7 +878,7 @@ msgstr "Notizen" msgid "No annotations for this equipment" msgstr "Keine Notizen für diese Ausrüstung" -#: equipment.php:595 maintenance.php:353 task.php:346 +#: equipment.php:595 maintenance.php:409 task.php:346 msgid "Add note" msgstr "Notiz hinzufügen" @@ -922,7 +922,7 @@ msgstr "Keine Ersatzteile gefunden." msgid "Edit Equipment" msgstr "Ausrüstung bearbeiten" -#: equipment.php:767 storage.php:331 +#: equipment.php:767 storage.php:334 msgid "Position (x, y, z) in mm" msgstr "Position (x, y, z) in mm" @@ -948,11 +948,11 @@ msgstr "Marke" msgid "%d records" msgstr "%d Datensätze" -#: equipment_js.php:249 globals.inc:946 globals.inc:971 +#: equipment_js.php:249 globals.inc:981 globals.inc:1006 msgid "Delete" msgstr "Löschen" -#: fuse.php:13 globals.inc:1444 +#: fuse.php:13 globals.inc:1479 msgid "Fuses" msgstr "Sicherungen" @@ -985,7 +985,7 @@ msgstr "Stromstärke, Ampere" msgid "View fuse" msgstr "Sicherung ansehen" -#: fuse.php:231 globals.inc:570 +#: fuse.php:231 globals.inc:572 msgid "Fuse" msgstr "Sicherung" @@ -1027,7 +1027,7 @@ msgstr "Neues Boot %d ausgewählt" msgid "Yacht data" msgstr "Yachtdaten" -#: index.php:111 globals.inc:600 +#: index.php:111 globals.inc:606 msgid "User" msgstr "Benutzer" @@ -1106,7 +1106,7 @@ msgstr "Stauraumart" msgid "Count" msgstr "Anzahl" -#: index.php:418 provisions.php:13 globals.inc:1404 +#: index.php:418 provisions.php:13 globals.inc:1439 msgid "Provisions" msgstr "Proviant" @@ -1184,7 +1184,7 @@ msgstr "Inventar Nr. %d gelöscht" msgid "Container" msgstr "Behälter" -#: inventory.php:281 tag.php:13 globals.inc:979 globals.inc:1452 +#: inventory.php:281 tag.php:13 globals.inc:1014 globals.inc:1487 msgid "Tags" msgstr "" @@ -1242,7 +1242,7 @@ msgstr "Benutzername:" msgid "Password:" msgstr "Kennwort:" -#: login.php:68 globals.inc:278 +#: login.php:68 globals.inc:279 msgid "Error" msgstr "Fehler" @@ -1282,77 +1282,91 @@ msgstr "" msgid "New login" msgstr "Neue Anmeldung" -#: maintenance.php:13 globals.inc:1408 +#: maintenance.php:13 globals.inc:1443 msgid "Maintenance" msgstr "Wartung" -#: maintenance.php:181 maintenance.php:220 maintenance.php:279 -#: maintenance.php:372 -msgid "Activities" -msgstr "Aktivitäten" - -#: maintenance.php:216 -msgid "Add Maintenance" -msgstr "Wartung hinzufügen" - -#: maintenance.php:249 -msgid "View Maintenance" -msgstr "Wartung anzeigen" - -#: maintenance.php:269 globals.inc:551 -msgid "n/a" -msgstr "" - -#: maintenance.php:287 maintenance.php:381 +#: maintenance.php:136 maintenance.php:342 maintenance.php:439 msgid "Series" msgstr "Serie" -#: maintenance.php:288 -msgid "Interval" -msgstr "Intervall" - -#: maintenance.php:289 globals.inc:1290 globals.inc:1293 -msgid "Last" -msgstr "Letzter" - -#: maintenance.php:290 maintenance.php:393 task.php:315 task.php:380 -msgid "Plan date" -msgstr "Plandatum" - -#: maintenance.php:291 -msgid "Completion date" -msgstr "Fertigstellungsdatum" - -#: maintenance.php:324 -msgid "No documents found." -msgstr "Keine Dokumente gefunden." - -#: maintenance.php:349 -msgid "No annotations for this maintenance" -msgstr "Keine Notizen für diese Wartung" - -#: maintenance.php:366 -msgid "Edit Maintenance" -msgstr "Wartung bearbeiten" - -#: maintenance.php:385 -msgid "Interval hours" -msgstr "Intervall-Stunden" - -#: maintenance.php:389 -msgid "Last hours" -msgstr "Letzte Stunden" - -#: maintenance.php:397 -msgid "Completion date" -msgstr "Fertigstellungsdatum" - -#: maintenance.php:401 projects.php:421 task.php:219 task.php:241 task.php:319 -#: task.php:396 +#: maintenance.php:143 maintenance.php:233 maintenance.php:462 projects.php:422 +#: task.php:219 task.php:241 task.php:319 task.php:396 msgid "Status" msgstr "" -#: maintenance.php:409 +#: maintenance.php:230 maintenance.php:274 maintenance.php:334 +#: maintenance.php:428 +msgid "Activities" +msgstr "Aktivitäten" + +#: maintenance.php:232 +msgid "Upcoming" +msgstr "" + +#: maintenance.php:270 +msgid "Add Maintenance" +msgstr "Wartung hinzufügen" + +#: maintenance.php:303 +msgid "View Maintenance" +msgstr "Wartung anzeigen" + +#: maintenance.php:324 globals.inc:552 +msgid "n/a" +msgstr "" + +#: maintenance.php:343 +msgid "Interval" +msgstr "Intervall" + +#: maintenance.php:344 globals.inc:1325 globals.inc:1328 +msgid "Last" +msgstr "Letzter" + +#: maintenance.php:345 maintenance.php:451 task.php:315 task.php:380 +msgid "Plan date" +msgstr "Plandatum" + +#: maintenance.php:346 +#, fuzzy +msgid "Plan date precision" +msgstr "Plandatum" + +#: maintenance.php:347 +msgid "Completion date" +msgstr "Fertigstellungsdatum" + +#: maintenance.php:380 +msgid "No documents found." +msgstr "Keine Dokumente gefunden." + +#: maintenance.php:405 +msgid "No annotations for this maintenance" +msgstr "Keine Notizen für diese Wartung" + +#: maintenance.php:422 +msgid "Edit Maintenance" +msgstr "Wartung bearbeiten" + +#: maintenance.php:443 +msgid "Interval hours" +msgstr "Intervall-Stunden" + +#: maintenance.php:447 +msgid "Last hours" +msgstr "Letzte Stunden" + +#: maintenance.php:455 +#, fuzzy +msgid "Date plan precision" +msgstr "Plandatum" + +#: maintenance.php:458 +msgid "Completion date" +msgstr "Fertigstellungsdatum" + +#: maintenance.php:471 msgid "Delete Maintenance" msgstr "Wartung löschen" @@ -1372,7 +1386,7 @@ msgstr "" msgid "unassigned" msgstr "nicht zugeordnet" -#: measurement.php:220 measurement.php:306 globals.inc:1428 +#: measurement.php:220 measurement.php:306 globals.inc:1463 msgid "Measurement" msgstr "Messung" @@ -1479,78 +1493,78 @@ msgstr "" "Löschen einer Notiz ist endgültig. Es gibt keinen Weg zurück. Nur löschen " "wenn Sie sich absolut sicher sind." -#: projects.php:13 globals.inc:1412 +#: projects.php:13 globals.inc:1447 msgid "Projects" msgstr "Projekte" -#: projects.php:203 projects.php:318 +#: projects.php:204 projects.php:319 msgid "Start date" msgstr "Startdatum" -#: projects.php:204 projects.php:319 +#: projects.php:205 projects.php:320 msgid "Duration" msgstr "Dauer" -#: projects.php:238 +#: projects.php:239 msgid "Generic Tasks" msgstr "Allgemeine Aufgaben" -#: projects.php:239 +#: projects.php:240 msgid "Tasks not assigned to any project" msgstr "Aufgaben die keinem Projekt zugeordnet sind" -#: projects.php:285 +#: projects.php:286 msgid "Add Project" msgstr "Projekt hinzufügen" -#: projects.php:293 projects.php:317 projects.php:402 task.php:320 task.php:397 +#: projects.php:294 projects.php:318 projects.php:403 task.php:320 task.php:397 msgid "Responsible" msgstr "Verantwortlich" -#: projects.php:320 +#: projects.php:321 msgid "Costs plan" msgstr "Kosten, geplant" -#: projects.php:321 +#: projects.php:322 msgid "Costs final" msgstr "Kosten, endgültig" -#: projects.php:344 +#: projects.php:345 msgid "Assigned tasks" msgstr "Zugeordnete Aufgaben" -#: projects.php:351 +#: projects.php:352 msgid "No assigned tasks found." msgstr "Keine zugeordneten Aufgaben gefunden." -#: projects.php:358 task.php:13 task.php:238 task.php:287 task.php:312 -#: globals.inc:597 globals.inc:1424 +#: projects.php:359 task.php:13 task.php:238 task.php:287 task.php:312 +#: globals.inc:603 globals.inc:1459 msgid "Task" msgstr "Aufgabe" -#: projects.php:384 +#: projects.php:385 msgid "Edit Project" msgstr "Projekt bearbeiten" -#: projects.php:405 +#: projects.php:406 msgid "Startdate" msgstr "Startdatum" -#: projects.php:409 +#: projects.php:410 msgid "Duration, days" msgstr "Dauer, Tage" -#: projects.php:413 +#: projects.php:414 #, php-format msgid "Costs planned, %s" msgstr "Kosten geplant, %s" -#: projects.php:417 +#: projects.php:418 #, php-format msgid "Costs final, %s" msgstr "Kosten endgültig, %s" -#: projects.php:435 +#: projects.php:436 msgid "Delete Project" msgstr "Lösche Projekt" @@ -1606,7 +1620,7 @@ msgstr "Proviant löschen" msgid "Use" msgstr "Benutzen" -#: search.php:13 search.php:33 globals.inc:1223 +#: search.php:13 search.php:33 globals.inc:1258 msgid "Search" msgstr "Suche" @@ -1614,7 +1628,7 @@ msgstr "Suche" msgid "Tasks" msgstr "Aufgaben" -#: settings.php:13 globals.inc:1456 +#: settings.php:13 globals.inc:1491 msgid "Settings" msgstr "Einstellungen" @@ -1651,88 +1665,88 @@ msgstr "Maximale Bildbreite" msgid "Maximal image height" msgstr "Maximale Bildhöhe" -#: storage.php:73 +#: storage.php:76 msgid "Delete failed, assigned boxes detected!" msgstr "Löschen fehlgeschlagen, zugeordnete Kisten vorhanden!" -#: storage.php:81 +#: storage.php:84 msgid "Delete failed, assigned equipment detected!" msgstr "Löschen fehlgeschlagen, zugeordnete Ausrüstug vorhanden!" -#: storage.php:90 +#: storage.php:93 #, php-format msgid "Deleted storage no. %d (%s)" msgstr "Stauraum Nr. %d gelöscht" -#: storage.php:125 +#: storage.php:128 msgid "Position" msgstr "Position" -#: storage.php:203 +#: storage.php:206 msgid "Add Storage" msgstr "Stauraum hinzufügen" -#: storage.php:235 +#: storage.php:238 msgid "Typ" msgstr "Art" -#: storage.php:236 storage.php:363 +#: storage.php:239 storage.php:366 msgid "Capacity" msgstr "Kapazität" -#: storage.php:238 +#: storage.php:241 msgid "Width (wx, wy, wz)" msgstr "Maß (wx, wy, wz)" -#: storage.php:239 +#: storage.php:242 msgid "Angle" msgstr "Winkel" -#: storage.php:247 +#: storage.php:250 msgid "Boxes in storage" msgstr "Kisten im Stauraum" -#: storage.php:264 +#: storage.php:267 msgid "No boxes contained" msgstr "Keine Kisten enthalten" -#: storage.php:268 +#: storage.php:271 msgid "Inventory in storage" msgstr "Inventar im Stauraum" -#: storage.php:283 +#: storage.php:286 msgid "No inventory contained" msgstr "Kein Inventar enthalten" -#: storage.php:287 +#: storage.php:290 msgid "Provisions in storage" msgstr "Proviant im Stauraum" -#: storage.php:305 +#: storage.php:308 msgid "No provisions contained" msgstr "Kein Proviant enthalten" -#: storage.php:311 +#: storage.php:314 msgid "Edit Storage" msgstr "Stauraum bearbeiten" -#: storage.php:345 +#: storage.php:348 msgid "Width (x, y, z) in mm" msgstr "Maße (x, y, z) in mm" -#: storage.php:359 +#: storage.php:362 msgid "Angle, deg." msgstr "Winkel, Grad" -#: storage.php:366 +#: storage.php:370 msgid "Capacity Unit" msgstr "Kapazitätseinheit" -#: storage.php:389 +#: storage.php:396 msgid "Delete Storage" msgstr "Stauraum löschen" -#: storage.php:395 +#: storage.php:402 msgid "" "Deleting a storage is final. There is no way back. Only delete if you are " "absolute sure." @@ -1777,7 +1791,7 @@ msgid "Task deleted" msgstr "Aufgabe gelöscht" #: task.php:210 task.php:239 task.php:284 task.php:313 task.php:376 -#: globals.inc:592 +#: globals.inc:596 msgid "Project" msgstr "Projekt" @@ -1870,249 +1884,278 @@ msgstr "" msgid "― unknown ―" msgstr "― unbekannt ―" -#: globals.inc:217 +#: globals.inc:200 +#, fuzzy +msgid "― new ―" +msgstr "― keine ―" + +#: globals.inc:218 msgid "Information" msgstr "" -#: globals.inc:256 +#: globals.inc:257 msgid "Success" msgstr "Erfolg" -#: globals.inc:267 +#: globals.inc:268 msgid "Warning" msgstr "Warnung" -#: globals.inc:332 +#: globals.inc:333 msgid "Username or password was empty" msgstr "Benutzername oder Kennwort war leer" -#: globals.inc:343 +#: globals.inc:344 msgid "User account does not exist" msgstr "Benutzer existiert nicht" -#: globals.inc:352 +#: globals.inc:353 msgid "Username or password invalid" msgstr "Benutzername oder Kennwort ungültig" -#: globals.inc:375 +#: globals.inc:376 msgid "User not logged in" msgstr "Benutzer ist nicht angemeldet" -#: globals.inc:552 +#: globals.inc:553 msgid "Active" msgstr "Aktiv" -#: globals.inc:553 +#: globals.inc:554 msgid "Bad" msgstr "Schlecht" -#: globals.inc:556 +#: globals.inc:557 msgid "Catamaran" msgstr "Katamaran" -#: globals.inc:557 +#: globals.inc:558 msgid "Completed" msgstr "erledigt" -#: globals.inc:558 +#: globals.inc:559 msgid "Closed" msgstr "Geschlossen" -#: globals.inc:560 +#: globals.inc:561 +msgid "Day" +msgstr "Tag" + +#: globals.inc:562 msgid "Defect" msgstr "Defekt" -#: globals.inc:562 +#: globals.inc:564 msgid "Done" msgstr "Fertig" -#: globals.inc:565 +#: globals.inc:567 msgid "Estimated" msgstr "Geschätzt" -#: globals.inc:566 +#: globals.inc:568 msgid "Excellent" msgstr "Sehr gut" -#: globals.inc:567 +#: globals.inc:569 msgid "Fair" msgstr "Normal" -#: globals.inc:568 +#: globals.inc:570 msgid "Finished" msgstr "Fertig" -#: globals.inc:569 +#: globals.inc:571 msgid "Fixed" msgstr "Fixiert" -#: globals.inc:572 +#: globals.inc:574 msgid "Good" msgstr "Gut" -#: globals.inc:573 +#: globals.inc:575 msgid "High" msgstr "Hoch" -#: globals.inc:574 +#: globals.inc:576 msgid "Historic" msgstr "Historisch" -#: globals.inc:577 +#: globals.inc:579 msgid "Low" msgstr "Niedrig" -#: globals.inc:579 +#: globals.inc:581 msgid "Medium" msgstr "Mittel" -#: globals.inc:580 +#: globals.inc:582 +msgid "Missed" +msgstr "Verpaßt" + +#: globals.inc:583 msgid "Monohull" msgstr "" -#: globals.inc:581 +#: globals.inc:584 +msgid "Month" +msgstr "Monat" + +#: globals.inc:585 msgid "New" msgstr "Neu" -#: globals.inc:582 +#: globals.inc:586 msgid "None" msgstr "Keine" -#: globals.inc:583 +#: globals.inc:587 msgid "Normal" msgstr "Normal" -#: globals.inc:584 +#: globals.inc:588 msgid "Ongoing" msgstr "Laufend" -#: globals.inc:585 +#: globals.inc:589 msgid "Open" msgstr "Offen" -#: globals.inc:587 +#: globals.inc:591 msgid "Paused" msgstr "Pausiert" -#: globals.inc:588 +#: globals.inc:592 msgid "Pending" msgstr "Ausstehend" -#: globals.inc:589 +#: globals.inc:593 msgid "Picture" msgstr "Bild" -#: globals.inc:590 +#: globals.inc:594 msgid "Planned" msgstr "Geplant" -#: globals.inc:591 +#: globals.inc:595 msgid "Precise" msgstr "Präzise" -#: globals.inc:594 +#: globals.inc:597 +msgid "Quarter" +msgstr "Quartal" + +#: globals.inc:599 msgid "Repairable" msgstr "Reparierbar" -#: globals.inc:595 +#: globals.inc:600 msgid "Rough" msgstr "Grob" -#: globals.inc:598 +#: globals.inc:601 +msgid "Skipped" +msgstr "Übersprungen" + +#: globals.inc:604 msgid "Trimaran" msgstr "" -#: globals.inc:599 +#: globals.inc:605 msgid "Unknown" msgstr "Unbekannt" -#: globals.inc:602 -msgid "waiting" +#: globals.inc:608 +#, fuzzy +msgid "Waiting" msgstr "wartend" -#: globals.inc:789 +#: globals.inc:609 +msgid "Week" +msgstr "Woche" + +#: globals.inc:796 msgid "No default storage defined for current vessel" msgstr "Kein Standardstauraum für die aktuelle Yacht definiert" -#: globals.inc:804 +#: globals.inc:811 #, php-format msgid "Selected fallback storage '%s'" msgstr "Ausgewählter Stauraum als Fallback '%s'" -#: globals.inc:982 +#: globals.inc:1017 msgid "Tag assignment" msgstr "Tag-Zuordnung" -#: globals.inc:986 +#: globals.inc:1021 msgid "(Separate by comma)" msgstr "(Getrennt mit Komma)" -#: globals.inc:1095 +#: globals.inc:1130 #, php-format msgid "%d B" msgstr "" -#: globals.inc:1097 +#: globals.inc:1132 #, php-format msgid "%.1f kB" msgstr "" -#: globals.inc:1099 +#: globals.inc:1134 #, php-format msgid "%.1f MB" msgstr "" -#: globals.inc:1104 globals.inc:1113 +#: globals.inc:1139 globals.inc:1148 #, php-format msgid "%d Byte" msgstr "" -#: globals.inc:1106 +#: globals.inc:1141 #, php-format msgid "%.1f kByte" msgstr "" -#: globals.inc:1108 +#: globals.inc:1143 #, php-format msgid "%.1f MByte" msgstr "" -#: globals.inc:1115 +#: globals.inc:1150 #, php-format msgid "approx. %.1f kByte" msgstr "ca. %.1f kByte" -#: globals.inc:1117 +#: globals.inc:1152 #, php-format msgid "approx. %.1f MByte" msgstr "ca. %.1f MByte" -#: globals.inc:1251 globals.inc:1254 +#: globals.inc:1286 globals.inc:1289 msgid "First" msgstr "Erster" -#: globals.inc:1252 globals.inc:1255 +#: globals.inc:1287 globals.inc:1290 msgid "Previous" msgstr "Zurück" -#: globals.inc:1289 globals.inc:1292 +#: globals.inc:1324 globals.inc:1327 msgid "Next" msgstr "Vor" -#: globals.inc:1307 +#: globals.inc:1342 #, php-format msgid "Records %d to %d of %d" msgstr "Datensätze %d bis %d von %d" -#: globals.inc:1309 +#: globals.inc:1344 msgid "No records found" msgstr "Keine Datensätze gefunden." -#: globals.inc:1420 +#: globals.inc:1455 msgid "Companies" msgstr "Firmen" -#: globals.inc:1460 +#: globals.inc:1495 msgid "Selection lists" msgstr "Auswahllisten" - diff --git a/webgui/locale/de_DE/LC_MESSAGES/yms.mo b/webgui/locale/de_DE/LC_MESSAGES/yms.mo index 21210d8..fa67035 100644 Binary files a/webgui/locale/de_DE/LC_MESSAGES/yms.mo and b/webgui/locale/de_DE/LC_MESSAGES/yms.mo differ diff --git a/webgui/maintenance.php b/webgui/maintenance.php index 22fac4e..a2f80c9 100644 --- a/webgui/maintenance.php +++ b/webgui/maintenance.php @@ -16,6 +16,23 @@ $id = gpc_get_int($_REQUEST, 'id', 0); $opt_equipment = db_get_opt_equip($user->vid); $opt_state = db_load_enum('maintenance', 'maintstate', true, true); +$opt_planprec = db_load_enum('maintenance', 'plan_precision', true, true); + +// series definition is derived from first maintenance record by plan_date +$opt_series = array(); +$sql = "SELECT series, activities " + . "FROM (" + . "SELECT series, activities, " + . "ROW_NUMBER() OVER (PARTITION BY series ORDER BY plan_date ASC) AS n " + . "FROM maintenance " + . "WHERE series>0" + . ") AS ranked " + . "WHERE n=1"; +$sth = $pdo->query($sql); +$res = $sth->fetchAll(); +foreach ($res as $row) { + $opt_series[$row['series']] = $row['activities']; +} // ========== ACTIONS START =================================================== @@ -31,6 +48,7 @@ switch ($submit = form_get_action()) { case 'filter': $flt = array(); $flt['equip'] = gpc_get_int($_POST, 'flt_equip'); + $flt['series'] = gpc_get_int($_POST, 'flt_series'); $flt['txt'] = gpc_get_string($_POST, 'flt_txt'); $allowed = db_load_enum('maintenance', 'maintstate'); $flt['status'] = gpc_get_set($_POST, 'flt_status', $allowed); @@ -55,11 +73,33 @@ switch ($submit = form_get_action()) { $p[':maintid'] = $id; $p[':eid'] = gpc_get_int($_POST, 'eid'); $p[':activities'] = gpc_get_string($_POST, 'activities', 80); - $p[':remarks'] = gpc_get_string($_POST, 'remarks', 150); - $p[':series'] = gpc_get_int($_POST, 'series'); + $series = gpc_get_int($_POST, 'series'); + if ($series == -3) { + // new series number by automatic + // TODO generic db function to create a new int val in column + $sql = "SELECT MIN(n.series) AS next_series " + . "FROM (" + . "SELECT 1 AS series " + . "UNION ALL " + . "SELECT DISTINCT series + 1 " + . "FROM maintenance " + . "WHERE series > 0" + . ") AS n " + . "LEFT JOIN maintenance m ON m.series=n.series " + . "WHERE m.series IS NULL"; + $p[':series'] = $pdo->query($sql)->fetchColumn(); + } else if ($series <= 0) { + $p[':series'] = NULL; + } else { + $p[':series'] = $series; + } $p[':plan_date'] = gpc_get_date($_POST, 'plan_date'); + $p[':plan_precision'] = gpc_get_enum($_POST, 'plan_precision', array_keys($opt_planprec)); + $p[':interval_hours'] = gpc_get_int($_POST, 'interval_hours'); + $p[':last_hours'] = gpc_get_int($_POST, 'last_hours'); $p[':completion_date'] = gpc_get_date($_POST, 'completion_date'); $p[':maintstate'] = gpc_get_string($_POST, 'maintstate'); + $p[':remarks'] = gpc_get_string($_POST, 'remarks', 150); db_exec_update('maintenance', $p, 'maintid'); $action = ACT_VIEW; break; @@ -84,13 +124,14 @@ if ($action == ACT_DEFAULT): page_caption_search($pagetitle); // load filter from db -$flt = db_get_filter($user->id, 204, ['equip','txt']); +$flt = db_get_filter($user->id, 204, ['equip','series','txt']); // Filter $opt_special = array( -2 => _('― all ―'), -1 => _('― none ―') ); + ?>
@@ -110,6 +151,9 @@ foreach ($opt_special + $opt_equipment as $k => $v) { ?>
+series); +?>
@@ -140,13 +184,18 @@ if (isset($flt->equip) and ($flt->equip == -1 or $flt->equip == 0)) { $w[] = 'm.eid=:eid'; $p[':eid'] = $flt->equip; } +if (isset($flt->series) and ($flt->series == -1)) { + $w[] = 'm.series IS NULL'; +} elseif($flt->series > 0) { + $w[] = 'm.series=:series'; + $p[':series'] = $flt->series; +} if (strlen($flt->txt) > 1) { $w[] = '(m.activities LIKE :txt OR m.remarks LIKE :txt)'; $p[':txt'] = '%'.$flt->txt.'%'; } // condition for multiple flags is OR -// $parts = ["maintstate=''", 'maintstate IS NULL']; -$parts = []; +$parts = ['maintstate IS NULL']; // to get empty result foreach ($flt->status as $s) { $parts[] = "maintstate='$s'"; } @@ -182,7 +231,6 @@ $sql = "SELECT m.maintid, m.activities, m.plan_date, m.interval_hours, m.maintst $sql .= ' WHERE ' . $where; $sql .= $order; - // if pagination: $sql .= ' LIMIT ' . ($page - 1) * $rows_pp . ',' . $rows_pp; @@ -217,8 +265,8 @@ foreach ($res as $row) { echo "", h($row['activities']) ,"\n"; echo "", $row['ename'] ,"\n"; // next plan date or hours - echo "", $row['plan_date'], "\n"; - echo "", $row['maintstate'], "\n"; + echo "", format_date($row['plan_date']), "\n"; + echo "", get_enum($row['maintstate']), "\n"; echo "", h($row['remarks']) ,"\n"; echo ""; // Edit current record button @@ -275,7 +323,8 @@ echo '

', _('View Maintenance'), "

\n"; // load maintenance record $sql = "SELECT m.activities, m.eid, m.remarks, m.series, m.maintstate, e.ename, " - . "m.plan_date, m.completion_date, m.interval_hours, m.last_hours " + . "m.plan_date, m.plan_precision, m.completion_date, m.interval_hours, " + . "m.last_hours " . "FROM maintenance AS m LEFT OUTER JOIN equipment AS e USING (eid) " . "WHERE m.maintid=?"; $sth = $pdo->prepare($sql); @@ -313,6 +362,7 @@ echo '', _('Series'),"", $maint->series, "\n"; echo '', _('Interval'),"", $maint->interval_hours, " h\n"; echo '', _('Last'),"", $maint->last_hours, "\n"; echo '', _('Plan date'),"", format_date($maint->plan_date), "\n"; +echo '', _('Plan date precision'),"", get_enum($maint->plan_precision), "\n"; echo '', _('Completion date'),"", format_date($maint->completion_date), "\n"; echo '', _('State'),"", get_enum($maint->maintstate), "\n"; @@ -397,15 +447,10 @@ echo '

', _('Edit Maintenance'), "

\n";
-eid); ?> -
- - -
-
- - -
+eid); +form_create_select('series', _('Series'), $g_opt_none + $g_opt_new + $opt_series, $maint->series); +?>
@@ -418,12 +463,16 @@ echo '

', _('Edit Maintenance'), "

\n";
+plan_precision); +?>
maintstate); +form_create_textarea('remarks', _('Remarks'), 3, 150, $maint->remarks); form_edit_buttons($g_scriptname, $id); echo "
\n"; diff --git a/webgui/projects.php b/webgui/projects.php index 66c22ce..cfeb6b2 100644 --- a/webgui/projects.php +++ b/webgui/projects.php @@ -153,7 +153,8 @@ $lastpage = ceil($numrows/$rows_pp); // $grandtotal = $pdo->query("SELECT COUNT(*) FROM project WHERE " . $where)->fetchColumn(); -$sql = "SELECT projid, projname, startdate, duration, projstate, remarks " +$sql = "SELECT projid, projname, startdate, duration, projstate, " + . " IF(CHAR_LENGTH(remarks)>30, CONCAT(LEFT(remarks, 30), '\u{2026}'), remarks) AS remarks " . "FROM project"; $sql .= " WHERE " . $where; $sql .= $order;