From 4809a5d6f1d76d7ec6fc7de2342ee71d828bb4d3 Mon Sep 17 00:00:00 2001 From: Frank Schubert Date: Tue, 14 Sep 2021 20:42:12 +0200 Subject: [PATCH] Added pagination to Pipework and Linework --- Layout/default/Linework/Index.php | 65 ++++++++++++++- Layout/default/Pipework/Index.php | 34 +++++++- Layout/default/Workflow/form.php | 2 +- application/Building/BuildingModel.php | 34 +++++++- application/Linework/LineworkController.php | 84 +++++++++++--------- application/Pipework/PipeworkController.php | 73 ++++++++++------- application/Termination/TerminationModel.php | 30 ++++++- public/assets/css/thetool.css | 26 ++++-- 8 files changed, 264 insertions(+), 84 deletions(-) diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php index 68e218959..97ccc54c2 100644 --- a/Layout/default/Linework/Index.php +++ b/Layout/default/Linework/Index.php @@ -1,3 +1,6 @@ + @@ -98,14 +101,42 @@
-

Auftragsliste nach Netzgebiet

+

Auftragsliste nach Netzgebiet

+ $pagination['count']): ?> + + + $terminations): ?>

- +
+ + $pagination['count']): ?> + + + + Keine Bauaufträge gefunden diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php index b46a859ed..9e9249b4f 100644 --- a/Layout/default/Pipework/Index.php +++ b/Layout/default/Pipework/Index.php @@ -100,6 +100,34 @@

Auftragsliste nach Netzgebiet

+ $pagination['count']): ?> + + + $buildings): ?> @@ -140,13 +168,13 @@ workflowitems as $item): ?> type == "delimiter"): ?> - label?> + label?> type == "delimiter"): ?> - label?> + label?> @@ -158,7 +186,7 @@ - +
Dokumente
files as $file): ?> diff --git a/Layout/default/Workflow/form.php b/Layout/default/Workflow/form.php index 2c9c89462..07d4116b8 100644 --- a/Layout/default/Workflow/form.php +++ b/Layout/default/Workflow/form.php @@ -1,4 +1,4 @@ -
width > 1) ? "colspan='".$item->width."'" : ""?> style="width: commaToDot(round(100 / $termination_wf_colspan, 2) * $item->width)?>%"> + width > 1) ? "colspan='".$item->width."'" : ""?> style="width: commaToDot(round(100 / $wfColspan, 2) * $item->width)?>%"> type != "gps"): ?>