From 6c0d334bbc3562e7d077780ba6572c4be232c960 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Thu, 7 Nov 2024 16:28:05 +0100 Subject: [PATCH 1/4] WIP tmp --- .../default/AddressDB/Statusupdateimport.php | 81 + Layout/default/ConstructionConsent/Form.php | 107 + Layout/default/ConstructionConsent/Index.php | 153 + Layout/default/Preorder/Index.php | 40 +- .../Preorder/include/preorder-detail.php | 7 +- Layout/default/Preordercampaign/Index.php | 65 +- Layout/default/header.php | 1 + Layout/default/menu.php | 3 +- application/ADBWohneinheit/ADBWohneinheit.php | 8 +- application/Billing/BillingModel.php | 6 +- .../ConstructionConsent.php | 259 + .../ConstructionConsentController.php | 91 + application/RimoWorkorder/RimoWorkorder.php | 7 + .../RimoWorkorder/RimoWorkorderController.php | 43 + .../RimoWorkorder/RimoWorkorderModel.php | 4 +- composer.json | 3 +- ...1022114654_create_construction_consent.php | 52 + lang/de.php | 3 + lib/Rimoapi/Rimoapi.php | 13 + public/bundler.php | 2 +- public/css/fonts.css | 29 + public/css/fonts/OfficinaSansStd-Bold.otf | Bin 0 -> 35440 bytes .../css/fonts/OfficinaSansStd-BoldItalic.otf | Bin 0 -> 37136 bytes public/css/fonts/OfficinaSansStd-Book.otf | Bin 0 -> 36796 bytes .../css/fonts/OfficinaSansStd-BookItalic.otf | Bin 0 -> 36780 bytes scripts/contract/list-upgrades.php | 27 + scripts/delete-oaid.php | 12 +- .../fibu-check/files/NTCS_Bankeinzug DT.xml | 156517 +++++++++++++++ ...tt-rech-export-bmd-2024-07-09_19-42-04.csv | 4687 + scripts/fix-multiple-oaids.php | 37 + .../ofaa-oaid/ofaa-oaids-estmk_1-10000.csv | 10001 + scripts/stomp-test.php | 45 + scripts/test.php | 11 +- 33 files changed, 172284 insertions(+), 30 deletions(-) create mode 100644 Layout/default/AddressDB/Statusupdateimport.php create mode 100644 Layout/default/ConstructionConsent/Form.php create mode 100644 Layout/default/ConstructionConsent/Index.php create mode 100644 application/ConstructionConsent/ConstructionConsent.php create mode 100644 application/ConstructionConsent/ConstructionConsentController.php create mode 100644 application/RimoWorkorder/RimoWorkorderController.php create mode 100644 db/migrations/20241022114654_create_construction_consent.php create mode 100644 public/css/fonts/OfficinaSansStd-Bold.otf create mode 100644 public/css/fonts/OfficinaSansStd-BoldItalic.otf create mode 100644 public/css/fonts/OfficinaSansStd-Book.otf create mode 100644 public/css/fonts/OfficinaSansStd-BookItalic.otf create mode 100644 scripts/contract/list-upgrades.php create mode 100644 scripts/fibu-check/files/NTCS_Bankeinzug DT.xml create mode 100644 scripts/fibu-check/files/tt-rech-export-bmd-2024-07-09_19-42-04.csv create mode 100644 scripts/fix-multiple-oaids.php create mode 100644 scripts/preorder/ofaa-oaid/ofaa-oaids-estmk_1-10000.csv create mode 100644 scripts/stomp-test.php diff --git a/Layout/default/AddressDB/Statusupdateimport.php b/Layout/default/AddressDB/Statusupdateimport.php new file mode 100644 index 000000000..50a74e686 --- /dev/null +++ b/Layout/default/AddressDB/Statusupdateimport.php @@ -0,0 +1,81 @@ + + + +
+
+
+
+
    +
  1. ">
    2. +
  2. ">AddressDB
    3. +
  3. Statusupdateimport
    4. +
+
+

Statusupdates importieren

+
+
+
+ + +
+
+ +
+
+
+

+ Werden Statusflags importiert, muss die Überschrift im CSV-File vorhanden sein!
+ Statusflags können in beliebiger Reihenfolge angegeben werden, die Positionen müssen aber in Kopfzeile und Datenzeilen übereinstimmen.
+ Nur zu ändernde Statusflags müssen angeführt werden.
+ Statusflags können 1 (=gesetzt), 0 (=nicht gesetzt) oder leer sein. Ist das Feld leer, wird der Wert des Flags nicht verändert. +

+
+

Statusupdates importieren

+ +
" enctype="multipart/form-data"> +
+
+ +
+ +
+ + + Format: addressdb_id;Neuer Status Code;[flag;...]
+ Beispiel:
+ + addressdb_id;new_code;141;145;150;200;242
+ 1788231;200;1;0;;; + + + +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+
+
+
+
+
+ + + diff --git a/Layout/default/ConstructionConsent/Form.php b/Layout/default/ConstructionConsent/Form.php new file mode 100644 index 000000000..270f2a8f9 --- /dev/null +++ b/Layout/default/ConstructionConsent/Form.php @@ -0,0 +1,107 @@ + + +
+
+
+
+
    +
  1. ">
    2. +
  2. ">Zustimmungserklärungen
    3. +
    4. +
+
+

Zustimmungserklärung

+
+
+
+ + +
+
+ +
+
+

+ Zustimmungserklärung +

+ +
"> + "/> + +
+
+ +
+ +
+ +
+
+ + + + + + + +
+ +
+ +
+
+ +
+
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/Layout/default/ConstructionConsent/Index.php b/Layout/default/ConstructionConsent/Index.php new file mode 100644 index 000000000..841c8d0e0 --- /dev/null +++ b/Layout/default/ConstructionConsent/Index.php @@ -0,0 +1,153 @@ +getUrl($Mod,"Index"); +$pagination_baseurl_params = ["filter" => $filter]; +$pagination_entity_name = "Zustimmungserklärungen"; +?> + + + + +
+
+
+
+
    +
  1. ">
    2. +
  2. Zustimmmungserklärungen
    3. +
+
+

Zustimmmungserklärungen

+
+
+
+ + +
+
+ +
+
+

Filter

+ +
"> +
+
+ + +
+ +
+ + " /> +
+ +
+ + +
+
+ + 1])?>"> Filter zurücksetzen +
+
+
+ +
+
+ + +
+
+
+
+
+

Liste aller Zustimmmungserklärungen

+
+
+ "> Neue Zustimmungserklärung anlegen +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ObjekttypObjektadresseGST-Nr.EZBesitzerBesitzer AdresseBesitzer KontaktAnfragestatusAnfrageresultat
object_type)?> + object_type == "street"): ?> + adb_strasse->name?> + adb_strasse->gemeinde->name?> + + adb_hausnummer->strasse->name?> + adb_hausnummer->hausnummer?>adb_hausnummer->stiege) ? "/".$item->adb_hausnummer->stiege : ""?>
+ adb_hausnummer->plz->plz?> + adb_hausnummer->ortschaft->name?>
+ adb_hausnummer->strasse->gemeinde->name?> + + 		adb_hausnummer->grund_nr?>ez?>owner_name?> + owner_street?>
+ owner_zip?> owner_city?>
+ 		+ phone): ?> + Tel: phone?>
+ + fax): ?> + Fax: fax?>
+ + email): ?> + Email: email?> + + 		status?>result?> + $item->id])?>"> + result): ?> + $item->id])?>"> + + status == "new"): ?> + $item->id])?>" onclick="if(!confirm('Zustimmungserklärung wirklich löschen?')) return false;" class="text-danger" title="Löschen"> + + + + +
+ + + + + +
+
+ +
+
+ + diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index dd23119ea..e8fe14fdc 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -725,14 +725,16 @@ if(trenches) { trenches.forEach((trench) => { var trench_line = L.polyline(trench, { - color: "limegreen" + color: "maroon", + weight: 7 }).addTo(map); }); } if(home_trench) { var home_line = L.polyline(home_trench, { - color: "aqua" + color: "blue", + weight: 7 }).addTo(map); } @@ -936,5 +938,39 @@ return false; } + + function downloadWorkorderAh(workorder_id) { + if(!workorder_id) return false; + + var filename; + + fetch('') + .then(resp => { + const header = resp.headers.get("Content-disposition"); + let matches = header.match(/filename=['"]?([^'"]+)/i); + filename = matches[1]; + if(!filename) { + window.notify("error", "Fehler beim Download des AH-Blatts"); + return false; + } + resp.blob() + }) + .then(blob => { + const url = window.URL.createObjectURL(blob); + const a = document.createElement('a'); + a.style.display = 'none'; + a.href = url; + // the filename you want + a.download = filename; + document.body.appendChild(a); + a.click(); + window.URL.revokeObjectURL(url); + window.notify("success", "Download gestartet..."); + //alert('your file has downloaded!'); // or you know, something with better UX... + }) + .catch(() => window.notify("Fehler beim Download des AH-Blatts")); + + + } diff --git a/Layout/default/Preorder/include/preorder-detail.php b/Layout/default/Preorder/include/preorder-detail.php index 99a9bb384..efc1f5418 100644 --- a/Layout/default/Preorder/include/preorder-detail.php +++ b/Layout/default/Preorder/include/preorder-detail.php @@ -397,9 +397,12 @@

Workorder

- adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)): ?> + adb_wohneinheit_id && is_array($preorder->adb_wohneinheit->rimo_workorders) && count($preorder->adb_wohneinheit->rimo_workorders)): ?> adb_wohneinheit->rimo_workorders as $wo): ?> -

rimo_name?>

+

+ rimo_name?> + $wo->id])?>" onclick="event.preventDefault(); downloadWorkorderAh(id?>);"> AH Blatt +

Workorder löschen diff --git a/Layout/default/Preordercampaign/Index.php b/Layout/default/Preordercampaign/Index.php index 49db23276..f218bfffb 100644 --- a/Layout/default/Preordercampaign/Index.php +++ b/Layout/default/Preordercampaign/Index.php @@ -109,8 +109,8 @@ - + @@ -130,16 +130,63 @@ - + diff --git a/Layout/default/header.php b/Layout/default/header.php index 6f1b03592..9be621afb 100644 --- a/Layout/default/header.php +++ b/Layout/default/header.php @@ -10,6 +10,7 @@ + diff --git a/Layout/default/menu.php b/Layout/default/menu.php index f4d22bff1..ecbbc57d2 100644 --- a/Layout/default/menu.php +++ b/Layout/default/menu.php @@ -107,10 +107,11 @@
Netzgebiete NameGebiet VorbestellungenWorkorders Start Ende network->name?> name?>area?> - ["preordercampaign_id" => $camp->id]])?>"> - active_preorder_count?> - homes_total): // manual value ?> - / homes_total?> (active_preorder_count / $camp->homes_total) * 100, 2))?> %) - total_homes): // automatic value from AdressDB ?> - / total_homes?> (active_preorder_count / $camp->total_homes) * 100, 2))?> %) + +
+
+ ["preordercampaign_id" => $camp->id]])?>"> +
+
+ + + total_homes_sd): // automatic value from AdressDB ?> + + + + + + + + total_homes_md): // automatic value from AdressdB ?> + + + + + + + + + + + + +
EFH:active_preorder_count_sd?> /total_homes_sd?>(active_preorder_count_sd / $camp->total_homes_sd) * 100, 2))?> %)
MPH:active_preorder_count_md?> /total_homes_md?>(active_preorder_count_md / $camp->total_homes_md) * 100, 2))?> %)
Gesamt:active_preorder_count?> / + homes_total): // manual value ?> + homes_total?> + total_homes): // automatic value from AdressDB ?> + total_homes?> + + + homes_total): // manual value ?> + (active_preorder_count / $camp->homes_total) * 100, 2))?> %) + total_homes): // automatic value from AdressDB ?> + (active_preorder_count / $camp->total_homes) * 100, 2))?> %) + +
+
+ +
+ + + + 		+ workorder_count): ?> + workorder_count?> + + 0 - + / active_preorder_count?> from)?> to)?>
diff --git a/application/Api/v1/PreorderApicontroller.php b/application/Api/v1/PreorderApicontroller.php index 113c0cd87..36995fddc 100644 --- a/application/Api/v1/PreorderApicontroller.php +++ b/application/Api/v1/PreorderApicontroller.php @@ -251,7 +251,6 @@ class PreorderApicontroller extends mfBaseApicontroller { "deleted" => 0 ]; - $preorder_search = []; if($this->me->is("preorderaddressreporting")) { $user_networks_json = $this->me->getFlag("preorder_networks"); $user_networks = json_decode($user_networks_json); diff --git a/application/OpenAccessId/OpenAccessId.php b/application/OpenAccessId/OpenAccessId.php index cd158d2a2..97795c5ab 100644 --- a/application/OpenAccessId/OpenAccessId.php +++ b/application/OpenAccessId/OpenAccessId.php @@ -48,7 +48,7 @@ class OpenAccessId extends mfBaseModel { public function exportToRimoAndAssignFtu() { - $rimo = new OpenAccessId_Helper_Rimo($this->oaid); + //$rimo = new OpenAccessId_Helper_Rimo($this->oaid); // XXX for now only support ADB Addresses if(!$this->adb_wohneinheit_id) { @@ -91,7 +91,7 @@ class OpenAccessId extends mfBaseModel { } if($fetch_ftu) { - $resp_data = $rimo->getFtuData($wohneinheit->extref); + $resp_data = Rimoapi::getFtuData($this->oaid, $wohneinheit->extref); if(!is_array($resp_data->ftus->item) || !count($resp_data->ftus->item)) { $this->log->warning(__METHOD__.": Homes ftus object has no items ".$this->oaid); @@ -120,7 +120,7 @@ class OpenAccessId extends mfBaseModel { $existing_rimo_export_data = $this->getExportData("rimo"); //if(!is_object($existing_rimo_export_data) || (!isset($existing_rimo_export_data->oaid_id) || !$existing_rimo_export_data->oaid_id) || (!isset($existing_rimo_export_data->name) || !$existing_rimo_export_data->name)) { - $oaid_data = $rimo->getOaid(); + $oaid_data = Rimoapi::getOaid($this->oaid); // try to create, if it fails, it already exists if(!$oaid_data) { $this->createInRimo(); @@ -135,12 +135,12 @@ class OpenAccessId extends mfBaseModel { $ftu_data = $wohneinheit->ftu_data; if($ftu_data['id'] && $ftu_data['name']) { - $resp_data = $rimo->getOaid(); + $resp_data = Rimoapi::getOaid($this->oaid); if(!$resp_data) { // oaid was not found in rimo, try creating it $this->createInRimo(); - $resp_data = $rimo->getOaid(); + $resp_data = Rimoapi::getOaid($this->oaid); } $assign_oaid = false; @@ -150,7 +150,7 @@ class OpenAccessId extends mfBaseModel { $old_ftu_id = $resp_data->terminiationUnit->id; // unassign oaid from FTU - $resp_data = $rimo->unassignOaid($old_ftu_id); + $resp_data = Rimoapi::unassignOaid($this->oaid, $old_ftu_id); $assign_oaid = true; } @@ -160,7 +160,7 @@ class OpenAccessId extends mfBaseModel { if ($assign_oaid) { // assign oaid to Wohneinheit FTU - $resp_data = $rimo->assignOaid($ftu_data['id']); + $resp_data = Rimoapi::assignOaid($this->oaid, $ftu_data['id']); // update OAID export data $exp_data_update = json_decode($this->export_data); @@ -212,9 +212,9 @@ class OpenAccessId extends mfBaseModel { } public function createInRimo() { - $rimo = new OpenAccessId_Helper_Rimo($this->oaid); + //$rimo = new OpenAccessId_Helper_Rimo($this->oaid); - $resp_data = $rimo->createOaid(); + $resp_data = Rimoapi::createOaid($this->oaid); if(!$resp_data) { return false; } diff --git a/application/OpenAccessId/OpenAccessIdController.php b/application/OpenAccessId/OpenAccessIdController.php index 25ea9d685..83d249819 100644 --- a/application/OpenAccessId/OpenAccessIdController.php +++ b/application/OpenAccessId/OpenAccessIdController.php @@ -126,7 +126,7 @@ class OpenAccessIdController extends mfBaseController { $old_preorder->save(); } - $rimo = new OpenAccessId_Helper_Rimo($oaid->oaid); + //$rimo = new OpenAccessId_Helper_Rimo($oaid->oaid); // unassign oaid from rimo ftu //$rimo->unassignOaid($oaid) diff --git a/application/RimoWorkorder/RimoWorkorder.php b/application/RimoWorkorder/RimoWorkorder.php index 1040e21c0..212ce9d6a 100644 --- a/application/RimoWorkorder/RimoWorkorder.php +++ b/application/RimoWorkorder/RimoWorkorder.php @@ -25,10 +25,10 @@ class RimoWorkorder extends mfBaseModel { } } - public function downloadAh() { + public function getAha() { if(!$this->id) return false; - $ah = Rimoapi::getWorkorderAhReport($this->rimo_id); + $ah = Rimoapi::getWorkorderAhaReport($this->rimo_id); return $ah; diff --git a/application/RimoWorkorder/RimoWorkorderController.php b/application/RimoWorkorder/RimoWorkorderController.php index 131f5e694..1038575c0 100644 --- a/application/RimoWorkorder/RimoWorkorderController.php +++ b/application/RimoWorkorder/RimoWorkorderController.php @@ -11,7 +11,7 @@ class RimoWorkorderController extends mfBaseController { } - protected function downloadAhAction() { + protected function downloadAhaAction() { $workorder_id = $this->request->id; if(!$workorder_id || $workorder_id < 1) { @@ -27,7 +27,7 @@ class RimoWorkorderController extends mfBaseController { exit; } - $return = $workorder->downloadAh(); + $return = $workorder->getAha(); if($return === false) { header("HTTP/1.1 500 Not Found"); echo "Fehler beim Herunterladen des AHA-Reports aus Rimo."; @@ -35,7 +35,7 @@ class RimoWorkorderController extends mfBaseController { } header("Content-type: text/pdf"); - header("Content-disposition: attachment; filename=".$workorder->name."_AHA.pdf"); + header('Content-disposition: attachment; filename="'.$workorder->rimo_name.'_AHA.pdf"'); echo $return; exit; } diff --git a/lib/Rimoapi/Rimoapi.php b/lib/Rimoapi/Rimoapi.php index 4154724cb..8c1d3300b 100644 --- a/lib/Rimoapi/Rimoapi.php +++ b/lib/Rimoapi/Rimoapi.php @@ -239,7 +239,7 @@ class Rimoapi { return $resp_data; } - public static function getWorkorderAhReport($rimo_id) { + public static function getWorkorderAhaReport($rimo_id) { $log = mfLoghandler::singleton(); if(!$rimo_id) { @@ -293,31 +293,58 @@ class Rimoapi { if(!$response) return false; - /* remove boundary from rimo response + // rimo returns multipart download + // check if multipart boundary exists - header: + if(strpos($response, "\n--") !== false) { + // file begins with \n--, so boundary exists + $boundary_to_pos = strpos($response, "\r\n\r\n"); - --uuid:b0b72203-db4d-4a85-9d26-b01cd08338c1 - Content-Type: application/octet-stream - Content-Transfer-Encoding: binary - Content-ID: <101DCY_AHA.pdf> + if($boundary_to_pos === false) { + $log->warn(__METHOD__.": Cannot find end of boundary"); + return false; + } + $new_resp = substr($response, $boundary_to_pos + 4); // including \r\n\r\n - footer: - - --uuid:b0b72203-db4d-4a85-9d26-b01cd08338c1-- - */ + // get boundary label + $m = []; + if(!preg_match("/\n(--[^\r\n]+)\r?\n/", $response, $m)) { + $log->warn(__METHOD__.": Cannot find boundary label beginning"); + return false; + } + if(!array_key_exists(1, $m)) { + $log->warn(__METHOD__.": Cannot find boundary label"); + return false; + } + $boundary_label = trim($m[1]); + if(!$boundary_label) { + $log->warn(__METHOD__.": boundary label empty"); + return false; + } + + $boundary_end = $boundary_label."--"; + + $boundary_end_pos = strrpos($new_resp, "\r\n".$boundary_end); + //echo "$boundary_end $boundary_end_pos\n";exit; + + $filecontent = substr($new_resp, 0, $boundary_end_pos); + //echo "$filecontent";exit; + + } else { + $filecontent = $response; + } $finfo = new Finfo(FILEINFO_MIME); - $mimetype = $finfo->buffer($response); + $mimetype = $finfo->buffer($filecontent); - var_dump($mimetype);exit; + //var_dump($mimetype);exit; if(!stripos($mimetype, "pdf")) { return false; } - return $response; + return $filecontent; } public static function getFilenames($rimo_id) { From bddc73ce796b7c5eeb781986e5cf6a2a4d505e6d Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Fri, 8 Nov 2024 16:56:31 +0100 Subject: [PATCH 4/4] Cleanup of old dev stuff --- Layout/default/Preorder/Index.php | 2 - Layout/default/Preordercampaign/Index-new.php | 215 ++++++++++++++++++ Layout/default/Preordercampaign/Index.php | 212 ++++++++++------- Layout/default/header.php | 1 - Layout/default/menu.php | 2 +- public/bundler.php | 2 +- 6 files changed, 353 insertions(+), 81 deletions(-) create mode 100644 Layout/default/Preordercampaign/Index-new.php diff --git a/Layout/default/Preorder/Index.php b/Layout/default/Preorder/Index.php index eb830534d..ba3aab50d 100644 --- a/Layout/default/Preorder/Index.php +++ b/Layout/default/Preorder/Index.php @@ -960,13 +960,11 @@ const a = document.createElement('a'); a.style.display = 'none'; a.href = url; - // the filename you want a.download = filename; document.body.appendChild(a); a.click(); window.URL.revokeObjectURL(url); window.notify("success", "Download gestartet..."); - //alert('your file has downloaded!'); // or you know, something with better UX... }) .catch(() => { window.notify("error", "Fehler beim Download des AH-Blatts"); diff --git a/Layout/default/Preordercampaign/Index-new.php b/Layout/default/Preordercampaign/Index-new.php new file mode 100644 index 000000000..f218bfffb --- /dev/null +++ b/Layout/default/Preordercampaign/Index-new.php @@ -0,0 +1,215 @@ +getUrl($Mod,"Index"); + $pagination_baseurl_params = ["filter" => $filter]; + $pagination_entity_name = "Vorbestellkampagnen"; +?> + + + +
+
+
+
+
    +
  1. ">
    2. +
  2. Vorbestellung
    3. +
+
+

Vorbestellkampagnen

+
+
+
+ + +
+
+ +
+
+

Filter

+ +
"> +
+ +
+ + +
+ + is("Admin")): ?> +
+ + +
+ + +
+ + " /> +
+ +
+ + " /> +
+ +
+
+
+ + ">Filter zurücksetzen +
+
+ + +
+
+ + + address_id == 1 || $me->address_id == 4807): // xinon, rml ?> +
+
+ "> Gutscheincodes importieren + "> Statusupdates importieren +
+
+ + +
+
+
+

Liste aller Vorbestellkampagnen

+
+
+ is("Admin")): ?> + "> Neue Vorbestellkampagne anlegen + +
+ +
+
+ + +
+
+ +
+ + + + + + + + + + + + + = $camp->from && date('U') <= $camp->to) ? "class='active'" : ""?>> + + + + + + + + + + + +
NetzgebieteNameVorbestellungenWorkordersStartEnde
+ = $camp->from && date('U') <= $camp->to): ?> + + + + + + + $camp->id])?>"> + network->name?>name?> + +
+
+ ["preordercampaign_id" => $camp->id]])?>"> +
+
+ + + total_homes_sd): // automatic value from AdressDB ?> + + + + + + + + total_homes_md): // automatic value from AdressdB ?> + + + + + + + + + + + + +
EFH:active_preorder_count_sd?> /total_homes_sd?>(active_preorder_count_sd / $camp->total_homes_sd) * 100, 2))?> %)
MPH:active_preorder_count_md?> /total_homes_md?>(active_preorder_count_md / $camp->total_homes_md) * 100, 2))?> %)
Gesamt:active_preorder_count?> / + homes_total): // manual value ?> + homes_total?> + total_homes): // automatic value from AdressDB ?> + total_homes?> + + + homes_total): // manual value ?> + (active_preorder_count / $camp->homes_total) * 100, 2))?> %) + total_homes): // automatic value from AdressDB ?> + (active_preorder_count / $camp->total_homes) * 100, 2))?> %) + +
+
+ +
+ + + + 		+ workorder_count): ?> + workorder_count?> + + 0 + + / active_preorder_count?> + from)?>to)?> + $camp->id])?>" title="Bestellte Zusatzdienste exportieren"> + ["preordercampaign_id" => $camp->id]])?>" title="Email Aussendungen"> + is("Admin")): ?> + $camp->id])?>"> + $camp->id])?>"> + $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"> + +
+ + + + +
+ + + + + + diff --git a/Layout/default/Preordercampaign/Index.php b/Layout/default/Preordercampaign/Index.php index f218bfffb..01c5256e4 100644 --- a/Layout/default/Preordercampaign/Index.php +++ b/Layout/default/Preordercampaign/Index.php @@ -3,8 +3,111 @@ $pagination_baseurl_params = ["filter" => $filter]; $pagination_entity_name = "Vorbestellkampagnen"; ?> + + + + + +
@@ -31,7 +134,7 @@
">
-
+
@@ -53,23 +156,23 @@
-
+
" />
-
+
" />
-
-
- - ">Filter zurücksetzen +
+
+ + ">Filter zurücksetzen +
-
@@ -78,7 +181,7 @@ address_id == 1 || $me->address_id == 4807): // xinon, rml ?>
-
+
"> Gutscheincodes importieren "> Statusupdates importieren
@@ -87,14 +190,13 @@
-
-

Liste aller Vorbestellkampagnen

-
-
- is("Admin")): ?> - "> Neue Vorbestellkampagne anlegen - -
+
+

Liste aller Vorbestellkampagnen

+ is("Admin")): ?> + "> Neue + Vorbestellkampagne anlegen + +
@@ -102,15 +204,16 @@
- - +
+ +
+ - @@ -130,67 +233,21 @@ + -
Netzgebiete NameGebiet VorbestellungenWorkorders Start Ende network->name?> name?>area?> - -
-
- ["preordercampaign_id" => $camp->id]])?>"> -
-
- - - total_homes_sd): // automatic value from AdressDB ?> - - - - - - - - total_homes_md): // automatic value from AdressdB ?> - - - - - - - - - - - - -
EFH:active_preorder_count_sd?> /total_homes_sd?>(active_preorder_count_sd / $camp->total_homes_sd) * 100, 2))?> %)
MPH:active_preorder_count_md?> /total_homes_md?>(active_preorder_count_md / $camp->total_homes_md) * 100, 2))?> %)
Gesamt:active_preorder_count?> / - homes_total): // manual value ?> - homes_total?> - total_homes): // automatic value from AdressDB ?> - total_homes?> - - - homes_total): // manual value ?> - (active_preorder_count / $camp->homes_total) * 100, 2))?> %) - total_homes): // automatic value from AdressDB ?> - (active_preorder_count / $camp->total_homes) * 100, 2))?> %) - -
-
- -
- - - - 		- workorder_count): ?> - workorder_count?> - - 0 + ["preordercampaign_id" => $camp->id]])?>"> + active_preorder_count?> + homes_total): // manual value ?> + / homes_total?> (active_preorder_count / $camp->homes_total) * 100, 2))?> %) + total_homes): // automatic value from AdressDB ?> + / total_homes?> (active_preorder_count / $camp->total_homes) * 100, 2))?> %) - / active_preorder_count?> + from)?> to)?> +
$camp->id])?>" title="Bestellte Zusatzdienste exportieren"> ["preordercampaign_id" => $camp->id]])?>" title="Email Aussendungen"> is("Admin")): ?> @@ -198,10 +255,12 @@ $camp->id])?>"> $camp->id])?>" class="text-danger" onclick="if(!confirm('Vorbestellkampagne wirklich löschen?')) return false;" title="Vorbestellkampagne Löschen"> +
+
@@ -213,3 +272,4 @@
+ diff --git a/Layout/default/header.php b/Layout/default/header.php index 9be621afb..6f1b03592 100644 --- a/Layout/default/header.php +++ b/Layout/default/header.php @@ -10,7 +10,6 @@ - diff --git a/Layout/default/menu.php b/Layout/default/menu.php index ecbbc57d2..7297b23b2 100644 --- a/Layout/default/menu.php +++ b/Layout/default/menu.php @@ -107,7 +107,7 @@
    is(["Admin","netowner","pipeplanner"]) && $me->can("Building")): ?>
  • "> Objekte & Anschlüsse
    • - is(["Admin"])): ?>
  • "> Zustimmungserklärungen
    • + is(["Admin","netowner","pipeplanner","pipeworker","lineplanner","lineworker"]) && $me->can("Pipework")): ?>
  • "> Tiefbau
    • is(["Admin","netowner","lineplanner","lineworker"]) && $me->can("Linework")): ?>
  • "> Leitungsbau
    • is(["Admin","netowner","netoperator","lineworker"]) && $me->can("Patching")): ?>
  • "> Patchungen
    • diff --git a/public/bundler.php b/public/bundler.php index 5b2e2c0e6..25b2a0777 100644 --- a/public/bundler.php +++ b/public/bundler.php @@ -13,7 +13,7 @@ function combineAndMinifyJS($files) { if (file_exists($file)) { $content = file_get_contents($file); // Minify using JSShrink - //$content = \JShrink\Minifier::minify($content); + $content = \JShrink\Minifier::minify($content); $combinedContent .= $content . "\n"; } else { header("HTTP/1.1 404 Not Found");