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");