From ebe5cbe797a69a889c4bb35bf742ec4780641d0f Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 28 Apr 2020 16:35:17 +0200 Subject: [PATCH] Added Dauerampel to CIS GUI Dauerampeln do not have Faelligkeitsdatum and do not have Bestaetigen-button. They are dismissed automatically when the benutzer_select-condition is not valid anymore. --- cis/private/tools/ampelverwaltung.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/cis/private/tools/ampelverwaltung.php b/cis/private/tools/ampelverwaltung.php index 96a92d2bb..54587ba3b 100644 --- a/cis/private/tools/ampelverwaltung.php +++ b/cis/private/tools/ampelverwaltung.php @@ -219,7 +219,8 @@ function getUserAmpelData($user) 'verfallszeit' => $row->verfallszeit, 'beschreibung' => $row->beschreibung, 'abgelaufen' => $abgelaufen, - 'active' => $active); + 'active' => $active, + 'dauerampel' => $row->dauerampel); } return array($user_ampel_arr, $cnt_ueberfaellig); @@ -458,8 +459,10 @@ function typeWrite(span){ - >t('global/faelligAm') . ' '; echo date('d.m.Y', strtotime($user_ampel['deadline'])) ?> - + + >t('global/faelligAm') . ' '; echo date('d.m.Y', strtotime($user_ampel['deadline'])) ?> + +
@@ -489,11 +492,13 @@ function typeWrite(span){


+
+