diff --git a/db/mariadb.sql b/db/mariadb.sql index 745bc2a..88b3acf 100644 --- a/db/mariadb.sql +++ b/db/mariadb.sql @@ -349,7 +349,7 @@ CREATE TABLE provisions ( provname varchar(40) NOT NULL, provcat tinyint(3) DEFAULT NULL, sid smallint(6) UNSIGNED DEFAULT NULL, - boxid smallint(6) UNSIGNED NOT NULL DEFAULT 1, + boxid smallint(6) UNSIGNED DEFAULT NULL, number smallint(6) UNSIGNED NOT NULL DEFAULT 1, target smallint(6) UNSIGNED DEFAULT NULL, -- for shopping list weight float(5,2) UNSIGNED DEFAULT NULL, diff --git a/webgui/cable.php b/webgui/cable.php index 9354e28..813f2a2 100644 --- a/webgui/cable.php +++ b/webgui/cable.php @@ -95,7 +95,17 @@ if ($action == ACT_DEFAULT): // ========== VARIANT: default behavior ======================================= // load filter from db -$flt = db_get_filter($user->id, 211); +$flt = db_get_filter($user->id, 211, ['txt']); + +$w = array('vid=:vid'); +$p = array(':vid' => $user->vid); + +if (strlen($flt->txt) > 1) { + $w[] = 'cablename LIKE :txt OR remarks LIKE :txt'; + $p[':txt'] = '%'.$flt->txt.'%'; +} +$where = join(' AND ', $w); +$order = ' ORDER BY cablename'; echo "

$pagetitle

\n"; @@ -119,10 +129,14 @@ echo "

$pagetitle

\n"; query($sql); + . "FROM cable "; +$sql .= ' WHERE ' . $where; +$sql .= $order; + +$sth = $pdo->prepare($sql); +$sth->execute($p); $res = $sth->fetchAll(); + echo '', "\n"; echo "\n"; echo "\n"; diff --git a/webgui/company.php b/webgui/company.php index 53e1b96..c6e9b2a 100644 --- a/webgui/company.php +++ b/webgui/company.php @@ -30,12 +30,17 @@ switch ($submit = form_get_action()) { $flt = array(); $flt['type'] = gpc_get_int($_POST, 'flt_type'); $flt['txt'] = gpc_get_string($_POST, 'flt_txt'); + $allowed = db_load_enum('company', 'flags'); + $flt['flags'] = gpc_get_set($_POST, 'flt_flags', $allowed); db_save_filter($flt, 208); $action = ACT_DEFAULT; break; case 'freset': - db_clear_filter(208); + //db_clear_filter(208); + // set status checkboxes to useful defaults + $flt = array('flags' => ['historic']); + db_save_filter($flt, 208); $action = ACT_DEFAULT; break; @@ -103,7 +108,7 @@ if ($action == ACT_DEFAULT): page_caption_search($pagetitle); // load filter from db -$flt = db_get_filter($user->id, 208, ['type','txt']); +$flt = db_get_filter($user->id, 208, ['type','txt','flags']); $w = array(); $p = array(); @@ -115,6 +120,19 @@ if (strlen($flt->txt) > 1) { $w[] = '(compname LIKE :txt OR remarks LIKE :txt)'; $p[':txt'] = '%'.$flt->txt.'%'; } +// condition for multiple flags is OR +$parts = ["flags=''", 'flags IS NULL']; +foreach ($flt->flags as $f) { + $parts[] = "FIND_IN_SET('$f', flags)"; +} +if (!empty($parts)) { + if (count($parts) > 1) { + $w[] = '(' . join(' OR ', $parts) . ')'; + } else { + $w[] = $parts[0]; + } +} + $where = join(' AND ', $w); $order = ' ORDER BY comptype, compname'; @@ -159,32 +177,17 @@ try { $res = $sth->fetchAll(); // Filter -$opt_special = array( - -2 => _('― all ―'), -); ?> - +
Filter
-
- - -
-
- - -
\n"; + echo "\n"; } function form_add_button($script, $id=NULL, $idname='id') { @@ -1025,6 +1028,20 @@ function form_tag_assignment($script, $id, $tags) { echo "
"; } +function filter_create_text($fieldname, $label, $value, $size=NULL, $maxlength=NULL) { + echo '
', "\n"; + echo '', "\n"; + echo '', "\n"; + echo "
\n"; +} + function filter_create_select($fieldname, $label, $optlist, $selval=NULL, $multiple=FALSE) { // - Wenn multiple gesetzt ist, muß selval ein array sein // ansonsten ein einfacher String @@ -1032,7 +1049,7 @@ function filter_create_select($fieldname, $label, $optlist, $selval=NULL, $multi if (!is_array($selval)) { } } */ - echo '
', "\n"; + echo '
', "\n"; echo '', "\n"; echo '\n"; - echo "
"; + echo "
\n"; } function filter_create_checks($fieldname, $label, $optlist, $selected = []) { // TODO WIP - echo '
'; + echo '
', "\n"; echo '', $label, "\n"; - echo '
'; + echo '
', "\n"; foreach ($optlist as $k => $v) { - echo '
'; + echo '
', "\n"; $checked = in_array($k, $selected, true) ? ' checked' : ''; - echo ''; - echo '
'; + echo '\n"; + echo "
\n"; } - echo '
'; - echo '
'; + echo "\n"; + echo "
\n"; } // ========== FORMAT FUNCTIONS ================================================ @@ -1179,6 +1196,9 @@ function format_measurement($n, $unit, $v1, $v2, $v3) { function h($value, $br=false) { // escape value coming from db for safe html output // optional convert line breaks to
tags + if (!isset($value)) { + return ''; + } $value = htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); return $br ? nl2br($value) : $value; } diff --git a/webgui/inventory.php b/webgui/inventory.php index c5846e0..ba933e9 100644 --- a/webgui/inventory.php +++ b/webgui/inventory.php @@ -220,47 +220,16 @@ $opt_special = array( // - selection for storage // - selection for box // page specific filter end + +filter_create_select('flt_stor', _('Storage'), $g_opt_all + $g_opt_none + $opt_storage, $flt->stor); +filter_create_select('flt_cond', _('Condition'), $g_opt_all + $opt_invcond, $flt->cond); +filter_create_text('flt_text', _('Text'), $flt->txt, 15, 30); ?> -
- -
-
- - -
-
- - -
- - + diff --git a/webgui/locale/de_DE.po b/webgui/locale/de_DE.po index 498f6d7..0ca40d5 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-22 21:20+0200\n" +"POT-Creation-Date: 2026-10-24 08:24+0200\n" "PO-Revision-Date: 2024-03-15 13:50+0100\n" "Last-Translator: Thomas Hooge \n" "Language-Team: LANGUAGE \n" @@ -16,61 +16,61 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: box.php:20 index.php:372 globals.inc:1471 +#: box.php:20 index.php:372 globals.inc:1474 msgid "Boxes" msgstr "Kisten" -#: box.php:77 checklist.php:60 maintenance.php:76 note.php:73 projects.php:102 -#: settings.php:60 storage.php:98 task.php:114 +#: box.php:77 checklist.php:60 maintenance.php:113 note.php:73 projects.php:102 +#: settings.php:60 storage.php:95 task.php:114 #, php-format msgid "Unknown function '%s'!" msgstr "Unbekannte Funktion '%s'!" -#: box.php:103 box.php:143 box.php:312 storage.php:175 +#: box.php:103 box.php:143 box.php:312 storage.php:172 msgid "Label" msgstr "Etikett" -#: box.php:104 cable.php:181 cable.php:210 cable.php:244 company.php:207 +#: box.php:104 cable.php:195 cable.php:224 cable.php:258 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:217 -#: storage.php:331 +#: fuse.php:208 fuse.php:233 note.php:112 note.php:203 storage.php:214 +#: storage.php:328 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:127 storage.php:176 storage.php:243 storage.php:379 tag.php:121 +#: box.php:105 box.php:192 box.php:321 cable.php:149 cable.php:231 +#: cable.php:282 dropdown.php:45 dropdown.php:193 dropdown.php:241 +#: storage.php:124 storage.php:173 storage.php:240 storage.php:376 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:177 +#: box.php:106 box.php:157 box.php:191 box.php:317 storage.php:174 msgid "Content" msgstr "Inhalt" -#: box.php:107 box.php:195 box.php:262 cable.php:216 equipment.php:472 +#: box.php:107 box.php:195 box.php:262 cable.php:230 equipment.php:475 #: index.php:382 index.php:399 index.php:420 inventory.php:403 #: provisions.php:287 msgid "Weight" msgstr "Gewicht" -#: box.php:115 box.php:199 box.php:269 cable.php:145 checklist.php:91 +#: box.php:115 box.php:199 box.php:269 cable.php:159 checklist.php:91 #: 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:244 measurement.php:233 +#: documents.php:645 documents.php:647 dropdown.php:159 equipment.php:388 +#: equipment.php:471 equipment.php:611 equipment.php:634 equipment.php:689 +#: fuse.php:168 inventory.php:291 maintenance.php:265 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 +#: provisions.php:201 storage.php:135 storage.php:182 storage.php:259 +#: storage.php:278 storage.php:300 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: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 +#: box.php:124 cable.php:169 checklist.php:98 company.php:233 documents.php:424 +#: dropdown.php:167 equipment.php:409 equipment.php:590 equipment_js.php:247 +#: fuse.php:177 index.php:337 inventory.php:303 maintenance.php:275 +#: maintenance.php:422 measurement.php:241 note.php:131 projects.php:226 +#: projects.php:271 projects.php:373 provisions.php:222 storage.php:148 +#: storage.php:189 tag.php:138 task.php:261 task.php:338 globals.inc:982 msgid "Edit" msgstr "Bearbeiten" @@ -80,40 +80,40 @@ 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:235 -#: globals.inc:602 globals.inc:1467 +#: provisions.php:295 provisions.php:359 storage.php:13 storage.php:232 +#: globals.inc:605 globals.inc:1470 msgid "Storage" msgstr "Stauraum" -#: box.php:161 box.php:201 box.php:358 cable.php:219 cable.php:275 +#: box.php:161 box.php:201 box.php:358 cable.php:233 cable.php:289 #: company.php:208 company.php:297 company.php:422 documents.php:447 -#: 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 +#: documents.php:558 documents.php:798 equipment.php:370 equipment.php:441 +#: equipment.php:483 equipment.php:784 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:234 maintenance.php:341 -#: maintenance.php:463 projects.php:183 projects.php:207 projects.php:297 +#: inventory.php:492 maintenance.php:255 maintenance.php:362 +#: maintenance.php:477 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 +#: storage.php:126 storage.php:241 storage.php:377 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:295 +#: documents.php:801 equipment.php:445 equipment.php:791 equipment_js.php:116 +#: equipment_js.php:283 index.php:495 inventory.php:343 maintenance.php:316 #: 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 +#: provisions.php:265 settings.php:161 storage.php:216 storage.php:379 +#: task.php:291 globals.inc:992 globals.inc:999 msgid "Save" msgstr "Speichern" #: box.php:166 company.php:258 company.php:430 company.php:456 #: documents.php:476 documents.php:802 dropdown.php:220 dropdown.php:286 -#: equipment.php:443 equipment.php:789 equipment_js.php:117 +#: equipment.php:446 equipment.php:792 equipment_js.php:117 #: equipment_js.php:251 equipment_js.php:284 index.php:496 inventory.php:344 -#: maintenance.php:296 measurement.php:291 note.php:181 projects.php:301 +#: maintenance.php:317 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 +#: settings.php:162 storage.php:217 storage.php:380 task.php:292 +#: globals.inc:986 globals.inc:993 globals.inc:1000 globals.inc:1010 msgid "Back" msgstr "Zurück" @@ -129,7 +129,7 @@ msgstr "Dimensionen" msgid "Empty Weight" msgstr "" -#: box.php:197 equipment.php:473 inventory.php:404 provisions.php:294 +#: box.php:197 equipment.php:476 inventory.php:404 provisions.php:294 msgid "Price" msgstr "Preis" @@ -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:1435 +#: box.php:260 index.php:397 inventory.php:13 search.php:81 globals.inc:1438 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:97 measurement.php:180 globals.inc:197 globals.inc:198 +#: maintenance.php:134 measurement.php:180 globals.inc:200 globals.inc:201 msgid "― none ―" msgstr "― keine ―" @@ -180,7 +180,7 @@ msgstr "Kiste bearbeiten" msgid "Dimensions (L × W × H)" msgstr "" -#: box.php:329 cable.php:133 cable.php:212 +#: box.php:329 cable.php:147 cable.php:226 msgid "Length" msgstr "Länge" @@ -196,7 +196,7 @@ msgstr "Höhe" msgid "Length × Width × Height" msgstr "Länge x Breite x Höhe" -#: box.php:345 equipment.php:751 inventory.php:455 provisions.php:329 +#: box.php:345 equipment.php:754 inventory.php:455 provisions.php:329 msgid "Weight, kg" msgstr "Gewicht, kg" @@ -204,138 +204,138 @@ msgstr "Gewicht, kg" msgid "Weight net, kg" msgstr "Nettogewicht, kg" -#: box.php:353 equipment.php:755 inventory.php:465 provisions.php:355 +#: box.php:353 equipment.php:758 inventory.php:465 provisions.php:355 #, php-format msgid "Price, %s" 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:476 +#: box.php:372 cable.php:318 checklist.php:178 company.php:467 +#: documents.php:835 dropdown.php:292 equipment.php:818 equipment_js.php:293 +#: fuse.php:307 index.php:625 inventory.php:520 maintenance.php:490 #: measurement.php:377 note.php:251 projects.php:441 provisions.php:413 -#: settings.php:168 storage.php:409 tag.php:296 task.php:426 +#: settings.php:168 storage.php:406 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:1475 +#: cable.php:13 globals.inc:1478 msgid "Cables" msgstr "Kabel" -#: cable.php:74 company.php:77 documents.php:179 equipment.php:92 fuse.php:72 +#: cable.php:74 company.php:77 documents.php:179 equipment.php:95 fuse.php:72 #: inventory.php:111 measurement.php:122 note.php:51 projects.php:92 -#: provisions.php:79 storage.php:66 tag.php:59 task.php:91 +#: provisions.php:79 storage.php:63 tag.php:59 task.php:91 msgid "Delete prohibited, invalid security token!" msgstr "Löschen verboten, ungültiger Sicherheitstoken!" #: cable.php:83 company.php:89 documents.php:244 dropdown.php:116 -#: equipment.php:228 fuse.php:83 index.php:95 inventory.php:123 +#: equipment.php:231 fuse.php:83 index.php:95 inventory.php:123 #: measurement.php:131 provisions.php:88 tag.php:70 #, php-format 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:147 measurement.php:193 +#: cable.php:124 company.php:190 documents.php:385 equipment.php:349 +#: fuse.php:136 inventory.php:261 maintenance.php:168 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:147 measurement.php:193 +#: cable.php:124 company.php:190 documents.php:385 equipment.php:349 +#: fuse.php:136 inventory.php:261 maintenance.php:168 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:148 measurement.php:194 +#: cable.php:125 company.php:191 documents.php:386 equipment.php:350 +#: fuse.php:137 inventory.php:262 maintenance.php:169 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:148 measurement.php:194 +#: cable.php:125 company.php:191 documents.php:386 equipment.php:350 +#: fuse.php:137 inventory.php:262 maintenance.php:169 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:556 +#: cable.php:144 cable.php:223 fuse.php:236 fuse.php:274 globals.inc:559 msgid "Cable" msgstr "Kabel" -#: cable.php:131 cable.php:173 cable.php:240 checklist.php:161 company.php:206 +#: cable.php:145 cable.php:187 cable.php:254 checklist.php:161 company.php:206 #: company.php:253 company.php:276 company.php:357 dropdown.php:191 -#: dropdown.php:239 equipment.php:426 equipment.php:734 equipment_js.php:101 +#: dropdown.php:239 equipment.php:429 equipment.php:737 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: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 +#: provisions.php:317 storage.php:123 storage.php:213 storage.php:324 #: tag.php:158 task.php:371 msgid "Name" msgstr "Name" -#: cable.php:132 cable.php:213 +#: cable.php:146 cable.php:227 msgid "Conductors" msgstr "Leiter" -#: cable.php:134 cable.php:215 +#: cable.php:148 cable.php:229 msgid "Cross section" msgstr "Querschnitt" -#: cable.php:136 cable.php:218 cable.php:272 inventory.php:239 +#: cable.php:150 cable.php:232 cable.php:286 inventory.php:239 #: inventory.php:279 inventory.php:406 inventory.php:473 msgid "Condition" msgstr "Zustand" -#: cable.php:168 +#: cable.php:182 msgid "Add Cable" msgstr "Kabel hinzufügen" -#: cable.php:177 cable.php:248 +#: cable.php:191 cable.php:262 msgid "Length, m" msgstr "Länge, m" -#: cable.php:184 cable.php:252 +#: cable.php:198 cable.php:266 msgid "Number of conductors" msgstr "Anzahl der Leiter" -#: cable.php:188 cable.php:260 +#: cable.php:202 cable.php:274 msgid "Cross section, mm²" msgstr "Querschnitt, mm²" -#: cable.php:206 +#: cable.php:220 msgid "View cable" msgstr "Kabel anzeigen" -#: cable.php:211 cable.php:245 +#: cable.php:225 cable.php:259 msgid "Techname" msgstr "Tech.-Name" -#: cable.php:214 +#: cable.php:228 msgid "Diameter" msgstr "Durchmesser" -#: cable.php:235 +#: cable.php:249 msgid "Edit cable" msgstr "Kabel bearbeiten" -#: cable.php:256 +#: cable.php:270 msgid "Diameter, mm" msgstr "Durchmesser, mm" -#: cable.php:264 +#: cable.php:278 msgid "Weight, kg/m" msgstr "Gewicht, kg/m" -#: cable.php:286 +#: cable.php:300 msgid "Delete cable" msgstr "Kabel löschen" -#: cable.php:296 tag.php:237 tag.php:288 +#: cable.php:310 tag.php:237 tag.php:288 msgid "Tag is not used anywhere" msgstr "Unbenutzte Tags" -#: checklist.php:13 globals.inc:1483 +#: checklist.php:13 globals.inc:1486 msgid "Checklists" msgstr "Checklisten" @@ -344,7 +344,7 @@ msgstr "Checklisten" msgid "Title" msgstr "Titel" -#: checklist.php:83 checklist.php:134 checklist.php:165 maintenance.php:348 +#: checklist.php:83 checklist.php:134 checklist.php:165 maintenance.php:369 #: 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:560 +#: company.php:13 documents.php:702 globals.inc:563 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:96 measurement.php:179 globals.inc:196 +#: maintenance.php:133 measurement.php:179 globals.inc:199 msgid "― all ―" msgstr "― alle ―" @@ -383,7 +383,7 @@ msgstr "― alle ―" msgid "Historic company" msgstr "Historische Firma" -#: company.php:225 equipment.php:392 globals.inc:563 +#: company.php:225 equipment.php:395 globals.inc:566 msgid "Deleted" msgstr "Gelöscht" @@ -395,7 +395,7 @@ msgstr "Firma hinzufügen" msgid "Company type" msgstr "Firmenart" -#: company.php:277 company.php:361 equipment.php:466 equipment.php:738 +#: company.php:277 company.php:361 equipment.php:469 equipment.php:741 msgid "Short name" msgstr "Kurzbezeichnung" @@ -439,8 +439,8 @@ msgstr "Kundennr." msgid "Contract no." msgstr "Kontraktnr." -#: company.php:298 company.php:427 dropdown.php:195 equipment.php:340 -#: equipment.php:481 equipment.php:786 +#: company.php:298 company.php:427 dropdown.php:195 equipment.php:484 +#: equipment.php:789 msgid "Flags" msgstr "" @@ -480,8 +480,8 @@ msgstr "Stadt" msgid "Delete Company" msgstr "Firma löschen" -#: company.php:443 documents.php:822 equipment.php:804 inventory.php:510 -#: note.php:242 storage.php:398 +#: company.php:443 documents.php:822 equipment.php:807 inventory.php:510 +#: note.php:242 storage.php:395 #, 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:1451 +#: documents.php:22 index.php:424 task.php:349 globals.inc:1454 msgid "Documents" msgstr "Dokumente" @@ -524,7 +524,7 @@ msgstr "" "Keine Datei für den Upload angegeben. Beim nächsten Versuch zuerst Datei " "auswählen." -#: documents.php:85 equipment.php:135 +#: documents.php:85 equipment.php:138 #, php-format msgid "Mimetype '%s' not allowed for upload." msgstr "Dateityp '%s' nicht zum Hochladen zugelassen." @@ -543,7 +543,7 @@ msgstr "Das Bild ist nicht herunterskaliert worden" msgid "Document already exists!" msgstr "Dokument existiert bereits!" -#: documents.php:125 equipment.php:143 +#: documents.php:125 equipment.php:146 #, php-format msgid "File to big: %s.%s" msgstr "Datei zu groß: %s.%s" @@ -611,7 +611,7 @@ msgstr "Dokumentenart" msgid "Preview" msgstr "Vorschau" -#: documents.php:535 globals.inc:565 +#: documents.php:535 globals.inc:568 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: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 +#: fuse.php:275 index.php:380 inventory.php:489 maintenance.php:143 +#: maintenance.php:252 maintenance.php:303 maintenance.php:356 +#: maintenance.php:453 measurement.php:287 measurement.php:319 +#: measurement.php:366 search.php:53 globals.inc:569 globals.inc:1434 msgid "Equipment" msgstr "Ausrüstung" #: documents.php:720 inventory.php:333 inventory.php:340 inventory.php:462 -#: storage.php:163 globals.inc:555 +#: storage.php:160 globals.inc:558 msgid "Box" msgstr "Kiste" -#: documents.php:745 globals.inc:607 +#: documents.php:745 globals.inc:610 msgid "Vessel" msgstr "Yacht" @@ -677,15 +677,15 @@ msgstr "Yacht" msgid "Edit Document" msgstr "Dokument bearbeiten" -#: documents.php:787 globals.inc:573 +#: documents.php:787 globals.inc:576 msgid "Generic" msgstr "Allgemein" -#: documents.php:788 manual.php:10 globals.inc:580 +#: documents.php:788 manual.php:10 globals.inc:583 msgid "Manual" msgstr "Handbuch" -#: documents.php:789 globals.inc:577 +#: documents.php:789 globals.inc:580 msgid "Invoice" msgstr "Rechnung" @@ -705,7 +705,7 @@ msgstr "" msgid "Lists" msgstr "Listen" -#: dropdown.php:32 dropdown.php:152 equipment.php:362 equipment_js.php:65 +#: dropdown.php:32 dropdown.php:152 equipment.php:365 equipment_js.php:65 #: fuse.php:131 fuse.php:160 fuse.php:205 fuse.php:232 fuse.php:265 #: provisions.php:185 tag.php:120 tag.php:162 tag.php:184 tag.php:263 msgid "Description" @@ -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:578 +#: dropdown.php:165 globals.inc:581 msgid "Locked" msgstr "Gesperrt" @@ -753,184 +753,188 @@ msgstr "Kurzbez." msgid "Edit List: %s" msgstr "Liste bearbeiten: %s" -#: dropdown.php:285 equipment_js.php:93 globals.inc:973 +#: dropdown.php:285 equipment_js.php:93 globals.inc:976 msgid "Add" msgstr "Hinzufügen" -#: equipment.php:110 +#: equipment.php:113 #, php-format msgid "Deleted equipment no. %d" msgstr "Lösche Ausrüstung Nr. %d" -#: equipment.php:112 +#: equipment.php:115 #, php-format msgid "%d document links were removed" msgstr "%d Dokumentverknüpfungen wurden entfernt." -#: equipment.php:120 +#: equipment.php:123 msgid "No files for upload submitted" msgstr "Keine Dateien zum Hochladen angegeben" -#: equipment.php:139 +#: equipment.php:142 msgid "Filetype not allowed for upload:" msgstr "Dateityp nicht zum Hochladen zugelassen:" -#: equipment.php:157 lib/fileutils.inc:105 +#: equipment.php:160 lib/fileutils.inc:105 #, php-format msgid "Image scaled down to %dx%d" msgstr "Bild herunterskaliert auf %dx%d" -#: equipment.php:175 lib/fileutils.inc:102 +#: equipment.php:178 lib/fileutils.inc:102 #, php-format msgid "Internal error: Unknown mimetype %s!" msgstr "Interner Fehler: Unbekannter Mimetype %s!" -#: equipment.php:183 +#: equipment.php:186 msgid "Storage limit exceeded. Image not uploaded!" msgstr "Speicherlimit überschritten. Bild wurde nicht hochgeladen!" -#: equipment.php:322 +#: equipment.php:325 msgctxt "male" msgid "― none ―" msgstr "― keiner ―" -#: equipment.php:329 equipment.php:430 equipment.php:476 equipment.php:764 +#: equipment.php:332 equipment.php:433 equipment.php:479 equipment.php:767 #: inventory.php:407 inventory.php:488 measurement.php:318 measurement.php:365 #: provisions.php:162 provisions.php:291 provisions.php:344 msgid "Category" msgstr "Kategorie" -#: equipment.php:330 equipment.php:363 equipment.php:431 equipment.php:467 -#: equipment.php:741 +#: equipment.php:333 equipment.php:366 equipment.php:434 equipment.php:470 +#: equipment.php:744 msgid "Manufacturer" msgstr "Hersteller" -#: equipment.php:331 equipment.php:475 equipment.php:763 +#: equipment.php:334 equipment.php:478 equipment.php:766 msgid "Supplier" msgstr "Lieferant" -#: equipment.php:334 +#: equipment.php:337 msgid "Text" msgstr "" -#: equipment.php:364 equipment.php:434 equipment.php:470 equipment.php:743 +#: equipment.php:343 +msgid "Also show " +msgstr "Zusätzlich anzeigen" + +#: equipment.php:367 equipment.php:437 equipment.php:473 equipment.php:746 #: equipment_js.php:67 equipment_js.php:109 equipment_js.php:138 #: equipment_js.php:276 index.php:487 index.php:551 msgid "Model" msgstr "Modell" -#: equipment.php:365 equipment.php:471 equipment.php:747 equipment_js.php:68 +#: equipment.php:368 equipment.php:474 equipment.php:750 equipment_js.php:68 #: equipment_js.php:113 equipment_js.php:139 equipment_js.php:280 msgid "Serial" msgstr "Seriennummer" -#: equipment.php:366 +#: equipment.php:369 msgid "Age" msgstr "Alter" -#: equipment.php:378 +#: equipment.php:381 #, php-format msgid "%dm" msgstr "" -#: equipment.php:380 +#: equipment.php:383 #, php-format msgid "%dy" msgstr "" -#: equipment.php:389 globals.inc:590 +#: equipment.php:392 globals.inc:593 msgid "Ordered" msgstr "Bestellt" -#: equipment.php:395 globals.inc:598 +#: equipment.php:398 globals.inc:601 msgid "Removed" msgstr "Entfernt" -#: equipment.php:423 equipment_js.php:98 +#: equipment.php:426 equipment_js.php:98 msgid "Add Equipment" msgstr "Ausrüstung hinzufügen" -#: equipment.php:474 equipment.php:759 inventory.php:405 inventory.php:469 +#: equipment.php:477 equipment.php:762 inventory.php:405 inventory.php:469 msgid "Purchase date" msgstr "Kaufdatum" -#: equipment.php:478 storage.php:240 +#: equipment.php:481 storage.php:237 msgid "Location (x, y, z)" msgstr "Position (x, y, z)" -#: equipment.php:503 +#: equipment.php:506 msgid "Images and documents" msgstr "Bilder und Dokumente" -#: equipment.php:551 +#: equipment.php:554 msgid "No referenced documents" msgstr "Keine verknüpften Dokumente" -#: equipment.php:559 +#: equipment.php:562 msgid "Add Image" msgstr "Bild hinzufügen" -#: equipment.php:575 maintenance.php:389 search.php:125 task.php:326 +#: equipment.php:578 maintenance.php:410 search.php:125 task.php:326 msgid "Annotations" msgstr "Notizen" -#: equipment.php:591 +#: equipment.php:594 msgid "No annotations for this equipment" msgstr "Keine Notizen für diese Ausrüstung" -#: equipment.php:595 maintenance.php:409 task.php:346 +#: equipment.php:598 maintenance.php:430 task.php:346 msgid "Add note" msgstr "Notiz hinzufügen" -#: equipment.php:599 +#: equipment.php:602 msgid "Maintenances" msgstr "Wartungen" -#: equipment.php:613 +#: equipment.php:616 msgid "No maintenance records found." msgstr "Keine Wartungsdatensätze gefunden." -#: equipment.php:617 +#: equipment.php:620 msgid "Add maintenance" msgstr "Wartung hinzufügen" -#: equipment.php:621 measurement.php:24 +#: equipment.php:624 measurement.php:24 msgid "Measurements" msgstr "Maße/Messungen" -#: equipment.php:636 +#: equipment.php:639 msgid "No measurement records found." msgstr "Keine Maße/Messungen gefunden." -#: equipment.php:640 measurement.php:257 +#: equipment.php:643 measurement.php:257 msgid "Add measurement" msgstr "Messung/Maß hinzufügen" -#: equipment.php:663 +#: equipment.php:666 msgid "Signal K data" msgstr "" -#: equipment.php:677 +#: equipment.php:680 msgid "Spare parts" msgstr "Ersatzteile" -#: equipment.php:691 +#: equipment.php:694 msgid "No spare parts found." msgstr "Keine Ersatzteile gefunden." -#: equipment.php:730 equipment_js.php:265 +#: equipment.php:733 equipment_js.php:265 msgid "Edit Equipment" msgstr "Ausrüstung bearbeiten" -#: equipment.php:767 storage.php:334 +#: equipment.php:770 storage.php:331 msgid "Position (x, y, z) in mm" msgstr "Position (x, y, z) in mm" -#: equipment.php:802 +#: equipment.php:805 msgid "Delete equipment" msgstr "Ausrüstung löschen" -#: equipment.php:808 +#: equipment.php:811 msgid "" "Deleting an equipment item is final. There is no way back. Only delete if " "you are absolute sure." @@ -948,11 +952,11 @@ msgstr "Marke" msgid "%d records" msgstr "%d Datensätze" -#: equipment_js.php:249 globals.inc:981 globals.inc:1006 +#: equipment_js.php:249 globals.inc:984 globals.inc:1009 msgid "Delete" msgstr "Löschen" -#: fuse.php:13 globals.inc:1479 +#: fuse.php:13 globals.inc:1482 msgid "Fuses" msgstr "Sicherungen" @@ -985,7 +989,7 @@ msgstr "Stromstärke, Ampere" msgid "View fuse" msgstr "Sicherung ansehen" -#: fuse.php:231 globals.inc:572 +#: fuse.php:231 globals.inc:575 msgid "Fuse" msgstr "Sicherung" @@ -1027,7 +1031,7 @@ msgstr "Neues Boot %d ausgewählt" msgid "Yacht data" msgstr "Yachtdaten" -#: index.php:111 globals.inc:606 +#: index.php:111 globals.inc:609 msgid "User" msgstr "Benutzer" @@ -1106,7 +1110,7 @@ msgstr "Stauraumart" msgid "Count" msgstr "Anzahl" -#: index.php:418 provisions.php:13 globals.inc:1439 +#: index.php:418 provisions.php:13 globals.inc:1442 msgid "Provisions" msgstr "Proviant" @@ -1184,7 +1188,7 @@ msgstr "Inventar Nr. %d gelöscht" msgid "Container" msgstr "Behälter" -#: inventory.php:281 tag.php:13 globals.inc:1014 globals.inc:1487 +#: inventory.php:281 tag.php:13 globals.inc:1017 globals.inc:1490 msgid "Tags" msgstr "" @@ -1242,7 +1246,7 @@ msgstr "Benutzername:" msgid "Password:" msgstr "Kennwort:" -#: login.php:68 globals.inc:279 +#: login.php:68 globals.inc:282 msgid "Error" msgstr "Fehler" @@ -1282,91 +1286,91 @@ msgstr "" msgid "New login" msgstr "Neue Anmeldung" -#: maintenance.php:13 globals.inc:1443 +#: maintenance.php:13 globals.inc:1446 msgid "Maintenance" msgstr "Wartung" -#: maintenance.php:136 maintenance.php:342 maintenance.php:439 +#: maintenance.php:157 maintenance.php:363 maintenance.php:454 msgid "Series" msgstr "Serie" -#: maintenance.php:143 maintenance.php:233 maintenance.php:462 projects.php:422 +#: maintenance.php:164 maintenance.php:254 maintenance.php:476 projects.php:422 #: task.php:219 task.php:241 task.php:319 task.php:396 msgid "Status" msgstr "" -#: maintenance.php:230 maintenance.php:274 maintenance.php:334 -#: maintenance.php:428 +#: maintenance.php:251 maintenance.php:295 maintenance.php:355 +#: maintenance.php:449 msgid "Activities" msgstr "Aktivitäten" -#: maintenance.php:232 +#: maintenance.php:253 msgid "Upcoming" msgstr "" -#: maintenance.php:270 +#: maintenance.php:291 msgid "Add Maintenance" msgstr "Wartung hinzufügen" -#: maintenance.php:303 +#: maintenance.php:324 msgid "View Maintenance" msgstr "Wartung anzeigen" -#: maintenance.php:324 globals.inc:552 +#: maintenance.php:345 globals.inc:555 msgid "n/a" msgstr "" -#: maintenance.php:343 +#: maintenance.php:364 msgid "Interval" msgstr "Intervall" -#: maintenance.php:344 globals.inc:1325 globals.inc:1328 +#: maintenance.php:365 globals.inc:1328 globals.inc:1331 msgid "Last" msgstr "Letzter" -#: maintenance.php:345 maintenance.php:451 task.php:315 task.php:380 +#: maintenance.php:366 maintenance.php:465 task.php:315 task.php:380 msgid "Plan date" msgstr "Plandatum" -#: maintenance.php:346 +#: maintenance.php:367 #, fuzzy msgid "Plan date precision" msgstr "Plandatum" -#: maintenance.php:347 +#: maintenance.php:368 msgid "Completion date" msgstr "Fertigstellungsdatum" -#: maintenance.php:380 +#: maintenance.php:401 msgid "No documents found." msgstr "Keine Dokumente gefunden." -#: maintenance.php:405 +#: maintenance.php:426 msgid "No annotations for this maintenance" msgstr "Keine Notizen für diese Wartung" -#: maintenance.php:422 +#: maintenance.php:443 msgid "Edit Maintenance" msgstr "Wartung bearbeiten" -#: maintenance.php:443 +#: maintenance.php:457 msgid "Interval hours" msgstr "Intervall-Stunden" -#: maintenance.php:447 +#: maintenance.php:461 msgid "Last hours" msgstr "Letzte Stunden" -#: maintenance.php:455 +#: maintenance.php:469 #, fuzzy msgid "Date plan precision" msgstr "Plandatum" -#: maintenance.php:458 +#: maintenance.php:472 msgid "Completion date" msgstr "Fertigstellungsdatum" -#: maintenance.php:471 +#: maintenance.php:485 msgid "Delete Maintenance" msgstr "Wartung löschen" @@ -1386,7 +1390,7 @@ msgstr "" msgid "unassigned" msgstr "nicht zugeordnet" -#: measurement.php:220 measurement.php:306 globals.inc:1463 +#: measurement.php:220 measurement.php:306 globals.inc:1466 msgid "Measurement" msgstr "Messung" @@ -1493,7 +1497,7 @@ 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:1447 +#: projects.php:13 globals.inc:1450 msgid "Projects" msgstr "Projekte" @@ -1538,7 +1542,7 @@ msgid "No assigned tasks found." msgstr "Keine zugeordneten Aufgaben gefunden." #: projects.php:359 task.php:13 task.php:238 task.php:287 task.php:312 -#: globals.inc:603 globals.inc:1459 +#: globals.inc:606 globals.inc:1462 msgid "Task" msgstr "Aufgabe" @@ -1620,7 +1624,7 @@ msgstr "Proviant löschen" msgid "Use" msgstr "Benutzen" -#: search.php:13 search.php:33 globals.inc:1258 +#: search.php:13 search.php:33 globals.inc:1261 msgid "Search" msgstr "Suche" @@ -1628,7 +1632,7 @@ msgstr "Suche" msgid "Tasks" msgstr "Aufgaben" -#: settings.php:13 globals.inc:1491 +#: settings.php:13 globals.inc:1494 msgid "Settings" msgstr "Einstellungen" @@ -1665,88 +1669,88 @@ msgstr "Maximale Bildbreite" msgid "Maximal image height" msgstr "Maximale Bildhöhe" -#: storage.php:76 +#: storage.php:73 msgid "Delete failed, assigned boxes detected!" msgstr "Löschen fehlgeschlagen, zugeordnete Kisten vorhanden!" -#: storage.php:84 +#: storage.php:81 msgid "Delete failed, assigned equipment detected!" msgstr "Löschen fehlgeschlagen, zugeordnete Ausrüstug vorhanden!" -#: storage.php:93 +#: storage.php:90 #, php-format msgid "Deleted storage no. %d (%s)" msgstr "Stauraum Nr. %d gelöscht" -#: storage.php:128 +#: storage.php:125 msgid "Position" msgstr "Position" -#: storage.php:206 +#: storage.php:203 msgid "Add Storage" msgstr "Stauraum hinzufügen" -#: storage.php:238 +#: storage.php:235 msgid "Typ" msgstr "Art" -#: storage.php:239 storage.php:366 +#: storage.php:236 storage.php:363 msgid "Capacity" msgstr "Kapazität" -#: storage.php:241 +#: storage.php:238 msgid "Width (wx, wy, wz)" msgstr "Maß (wx, wy, wz)" -#: storage.php:242 +#: storage.php:239 msgid "Angle" msgstr "Winkel" -#: storage.php:250 +#: storage.php:247 msgid "Boxes in storage" msgstr "Kisten im Stauraum" -#: storage.php:267 +#: storage.php:264 msgid "No boxes contained" msgstr "Keine Kisten enthalten" -#: storage.php:271 +#: storage.php:268 msgid "Inventory in storage" msgstr "Inventar im Stauraum" -#: storage.php:286 +#: storage.php:283 msgid "No inventory contained" msgstr "Kein Inventar enthalten" -#: storage.php:290 +#: storage.php:287 msgid "Provisions in storage" msgstr "Proviant im Stauraum" -#: storage.php:308 +#: storage.php:305 msgid "No provisions contained" msgstr "Kein Proviant enthalten" -#: storage.php:314 +#: storage.php:311 msgid "Edit Storage" msgstr "Stauraum bearbeiten" -#: storage.php:348 +#: storage.php:345 msgid "Width (x, y, z) in mm" msgstr "Maße (x, y, z) in mm" -#: storage.php:362 +#: storage.php:359 msgid "Angle, deg." msgstr "Winkel, Grad" -#: storage.php:370 +#: storage.php:367 msgid "Capacity Unit" msgstr "Kapazitätseinheit" -#: storage.php:396 +#: storage.php:393 msgid "Delete Storage" msgstr "Stauraum löschen" -#: storage.php:402 +#: storage.php:399 msgid "" "Deleting a storage is final. There is no way back. Only delete if you are " "absolute sure." @@ -1791,7 +1795,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:596 +#: globals.inc:599 msgid "Project" msgstr "Projekt" @@ -1848,314 +1852,314 @@ msgstr "" "Löschen einer Aufgabe ist endgültig. Es gibt keinen Weg zurück. Nur löschen " "wenn Sie sich absolut sicher sind." -#: globals.inc:172 +#: globals.inc:175 msgid "YYYY-MM-DD" msgstr "" -#: globals.inc:173 +#: globals.inc:176 msgid "DD.MM.YYYY" msgstr "" -#: globals.inc:174 +#: globals.inc:177 msgid "DD/MM/YYYY" msgstr "" -#: globals.inc:175 +#: globals.inc:178 msgid "DD-MM-YYYY" msgstr "" -#: globals.inc:176 +#: globals.inc:179 msgid "DD Mon YYYY" msgstr "" -#: globals.inc:177 +#: globals.inc:180 msgid "MM.DD.YYYY" msgstr "" -#: globals.inc:178 +#: globals.inc:181 msgid "MM/DD/YYYY" msgstr "" -#: globals.inc:179 +#: globals.inc:182 msgid "YYYY/MM/DD" msgstr "" -#: globals.inc:199 +#: globals.inc:202 msgid "― unknown ―" msgstr "― unbekannt ―" -#: globals.inc:200 +#: globals.inc:203 #, fuzzy msgid "― new ―" msgstr "― keine ―" -#: globals.inc:218 +#: globals.inc:221 msgid "Information" msgstr "" -#: globals.inc:257 +#: globals.inc:260 msgid "Success" msgstr "Erfolg" -#: globals.inc:268 +#: globals.inc:271 msgid "Warning" msgstr "Warnung" -#: globals.inc:333 +#: globals.inc:336 msgid "Username or password was empty" msgstr "Benutzername oder Kennwort war leer" -#: globals.inc:344 +#: globals.inc:347 msgid "User account does not exist" msgstr "Benutzer existiert nicht" -#: globals.inc:353 +#: globals.inc:356 msgid "Username or password invalid" msgstr "Benutzername oder Kennwort ungültig" -#: globals.inc:376 +#: globals.inc:379 msgid "User not logged in" msgstr "Benutzer ist nicht angemeldet" -#: globals.inc:553 +#: globals.inc:556 msgid "Active" msgstr "Aktiv" -#: globals.inc:554 +#: globals.inc:557 msgid "Bad" msgstr "Schlecht" -#: globals.inc:557 +#: globals.inc:560 msgid "Catamaran" msgstr "Katamaran" -#: globals.inc:558 +#: globals.inc:561 msgid "Completed" msgstr "erledigt" -#: globals.inc:559 +#: globals.inc:562 msgid "Closed" msgstr "Geschlossen" -#: globals.inc:561 +#: globals.inc:564 msgid "Day" msgstr "Tag" -#: globals.inc:562 +#: globals.inc:565 msgid "Defect" msgstr "Defekt" -#: globals.inc:564 +#: globals.inc:567 msgid "Done" msgstr "Fertig" -#: globals.inc:567 +#: globals.inc:570 msgid "Estimated" msgstr "Geschätzt" -#: globals.inc:568 +#: globals.inc:571 msgid "Excellent" msgstr "Sehr gut" -#: globals.inc:569 +#: globals.inc:572 msgid "Fair" msgstr "Normal" -#: globals.inc:570 +#: globals.inc:573 msgid "Finished" msgstr "Fertig" -#: globals.inc:571 +#: globals.inc:574 msgid "Fixed" msgstr "Fixiert" -#: globals.inc:574 +#: globals.inc:577 msgid "Good" msgstr "Gut" -#: globals.inc:575 +#: globals.inc:578 msgid "High" msgstr "Hoch" -#: globals.inc:576 +#: globals.inc:579 msgid "Historic" msgstr "Historisch" -#: globals.inc:579 +#: globals.inc:582 msgid "Low" msgstr "Niedrig" -#: globals.inc:581 +#: globals.inc:584 msgid "Medium" msgstr "Mittel" -#: globals.inc:582 +#: globals.inc:585 msgid "Missed" msgstr "Verpaßt" -#: globals.inc:583 +#: globals.inc:586 msgid "Monohull" msgstr "" -#: globals.inc:584 +#: globals.inc:587 msgid "Month" msgstr "Monat" -#: globals.inc:585 +#: globals.inc:588 msgid "New" msgstr "Neu" -#: globals.inc:586 +#: globals.inc:589 msgid "None" msgstr "Keine" -#: globals.inc:587 +#: globals.inc:590 msgid "Normal" msgstr "Normal" -#: globals.inc:588 +#: globals.inc:591 msgid "Ongoing" msgstr "Laufend" -#: globals.inc:589 +#: globals.inc:592 msgid "Open" msgstr "Offen" -#: globals.inc:591 +#: globals.inc:594 msgid "Paused" msgstr "Pausiert" -#: globals.inc:592 +#: globals.inc:595 msgid "Pending" msgstr "Ausstehend" -#: globals.inc:593 +#: globals.inc:596 msgid "Picture" msgstr "Bild" -#: globals.inc:594 +#: globals.inc:597 msgid "Planned" msgstr "Geplant" -#: globals.inc:595 +#: globals.inc:598 msgid "Precise" msgstr "Präzise" -#: globals.inc:597 +#: globals.inc:600 msgid "Quarter" msgstr "Quartal" -#: globals.inc:599 +#: globals.inc:602 msgid "Repairable" msgstr "Reparierbar" -#: globals.inc:600 +#: globals.inc:603 msgid "Rough" msgstr "Grob" -#: globals.inc:601 +#: globals.inc:604 msgid "Skipped" msgstr "Übersprungen" -#: globals.inc:604 +#: globals.inc:607 msgid "Trimaran" msgstr "" -#: globals.inc:605 +#: globals.inc:608 msgid "Unknown" msgstr "Unbekannt" -#: globals.inc:608 +#: globals.inc:611 #, fuzzy msgid "Waiting" msgstr "wartend" -#: globals.inc:609 +#: globals.inc:612 msgid "Week" msgstr "Woche" -#: globals.inc:796 +#: globals.inc:799 msgid "No default storage defined for current vessel" msgstr "Kein Standardstauraum für die aktuelle Yacht definiert" -#: globals.inc:811 +#: globals.inc:814 #, php-format msgid "Selected fallback storage '%s'" msgstr "Ausgewählter Stauraum als Fallback '%s'" -#: globals.inc:1017 +#: globals.inc:1020 msgid "Tag assignment" msgstr "Tag-Zuordnung" -#: globals.inc:1021 +#: globals.inc:1024 msgid "(Separate by comma)" msgstr "(Getrennt mit Komma)" -#: globals.inc:1130 +#: globals.inc:1133 #, php-format msgid "%d B" msgstr "" -#: globals.inc:1132 +#: globals.inc:1135 #, php-format msgid "%.1f kB" msgstr "" -#: globals.inc:1134 +#: globals.inc:1137 #, php-format msgid "%.1f MB" msgstr "" -#: globals.inc:1139 globals.inc:1148 +#: globals.inc:1142 globals.inc:1151 #, php-format msgid "%d Byte" msgstr "" -#: globals.inc:1141 +#: globals.inc:1144 #, php-format msgid "%.1f kByte" msgstr "" -#: globals.inc:1143 +#: globals.inc:1146 #, php-format msgid "%.1f MByte" msgstr "" -#: globals.inc:1150 +#: globals.inc:1153 #, php-format msgid "approx. %.1f kByte" msgstr "ca. %.1f kByte" -#: globals.inc:1152 +#: globals.inc:1155 #, php-format msgid "approx. %.1f MByte" msgstr "ca. %.1f MByte" -#: globals.inc:1286 globals.inc:1289 +#: globals.inc:1289 globals.inc:1292 msgid "First" msgstr "Erster" -#: globals.inc:1287 globals.inc:1290 +#: globals.inc:1290 globals.inc:1293 msgid "Previous" msgstr "Zurück" -#: globals.inc:1324 globals.inc:1327 +#: globals.inc:1327 globals.inc:1330 msgid "Next" msgstr "Vor" -#: globals.inc:1342 +#: globals.inc:1345 #, php-format msgid "Records %d to %d of %d" msgstr "Datensätze %d bis %d von %d" -#: globals.inc:1344 +#: globals.inc:1347 msgid "No records found" msgstr "Keine Datensätze gefunden." -#: globals.inc:1455 +#: globals.inc:1458 msgid "Companies" msgstr "Firmen" -#: globals.inc:1495 +#: globals.inc:1498 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 fa67035..4ca4703 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 a2f80c9..1531e93 100644 --- a/webgui/maintenance.php +++ b/webgui/maintenance.php @@ -57,7 +57,9 @@ switch ($submit = form_get_action()) { break; case 'freset': - db_clear_filter(204); + // set status checkboxes to useful defaults + $flt = array('status' => ['new','plan','ongoing']); + db_save_filter($flt, 204); $action = ACT_DEFAULT; break; diff --git a/webgui/measurement.php b/webgui/measurement.php index 504950c..2b20015 100644 --- a/webgui/measurement.php +++ b/webgui/measurement.php @@ -53,8 +53,9 @@ switch ($submit = form_get_action()) { case 'filter': $flt = array(); - $flt['precision'] = gpc_get_string($_POST, 'flt_precision'); $flt['txt'] = gpc_get_string($_POST, 'flt_txt'); + $flt['cat'] = gpc_get_string($_POST, 'flt_cat'); + $flt['acc'] = gpc_get_string($_POST, 'flt_acc'); db_save_filter($flt, 207); $action = ACT_DEFAULT; break; @@ -145,7 +146,7 @@ if ($action == ACT_DEFAULT): page_caption_search($pagetitle); // load filter from db -$flt = db_get_filter($user->id, 207, ['txt']); +$flt = db_get_filter($user->id, 207, ['txt', 'cat', 'acc']); $w = array('(vid=:vid OR vid IS NULL)'); $p = array(':vid' => $user->vid); @@ -153,9 +154,20 @@ $p = array(':vid' => $user->vid); // TODO precision additionally as filter if (strlen($flt->txt) > 1) { - $w[] = 'mname LIKE :txt'; + $w[] = 'mname LIKE :txt OR note LIKE :txt'; $p[':txt'] = '%'.$flt->txt.'%'; } +if ($flt->cat > 0) { + $w[] = 'mcat=:mcat'; + $p[':mcat'] = $flt->cat; +} elseif ($flt->mcat == -1) { + $w[] = 'mcat IS NULL'; +} +if ($flt->acc > 0) { + $w[] = 'accuracy=:accuracy'; + $p[':accuracy'] = $flt->acc; +} + $where = join(' AND ', $w); $order = ' ORDER BY mname'; @@ -180,14 +192,15 @@ $opt_special = array( -1 => _('― none ―') ); ?> -
+
Filter
-
- - -
+txt, 30, 45); +filter_create_select('flt_cat', _('Category'), $g_opt_all + $g_opt_none + $opt_category, $flt->cat); +filter_create_select('flt_acc', _('Accuracy'), $g_opt_all + $opt_accuracy, $flt->acc); +?>