From 2f2a5ea6f776ed1186b93ae1e14dce01676276d2 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 28 Apr 2020 16:13:01 +0200
Subject: [PATCH] Optimized VILESCI GUI for Ampeln

. Added links to display active or all ampeln (default: active)
. Added column 'dauerampel' in ampel overview
---
 vilesci/stammdaten/ampel_uebersicht.php | 36 +++++++++++++++++++------
 1 file changed, 28 insertions(+), 8 deletions(-)
diff --git a/vilesci/stammdaten/ampel_uebersicht.php b/vilesci/stammdaten/ampel_uebersicht.php
index d7b8889da..1d89f865d 100644
--- a/vilesci/stammdaten/ampel_uebersicht.php
+++ b/vilesci/stammdaten/ampel_uebersicht.php
@@ -41,11 +41,11 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<link rel="stylesheet" href="../../skin/tablesort.css" type="text/css"/>
 	<link rel="stylesheet" href="../../skin/fhcomplete.css" type="text/css">
 	<link rel="stylesheet" href="../../skin/vilesci.css" type="text/css">
-	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
-<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
-<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
+	<link rel="stylesheet" type="text/css" href="../../skin/jquery-ui-1.9.2.custom.min.css">
+<script type="text/javascript" src="../../vendor/jquery/jqueryV1/jquery-1.12.4.min.js"></script>
+<script type="text/javascript" src="../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+<script type="text/javascript" src="../../vendor/components/jqueryui/jquery-ui.min.js"></script>
+<script type="text/javascript" src="../../include/js/jquery.ui.datepicker.translation.js"></script>
 <script type="text/javascript" src="../../vendor/jquery/sizzle/sizzle.js"></script> 
 	<script type="text/javascript">
 	
@@ -67,9 +67,13 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 </head>
 <body>
 <h2>Ampel &Uuml;bersicht</h2>
-<div style="text-align:right">
+<div>
+	<a href="ampel_uebersicht.php?action=active" target="">Nur aktive | </a>
+	<a href="ampel_uebersicht.php?action=all" target="">Alle | </a>
 	<a href="ampel_details.php?action=new" target="detail_ampel">Neu</a>
 </div>';
+
+
 if(isset($_GET['action']) && $_GET['action']=='delete')
 {
 	if(!$rechte->isBerechtigt('basis/ampel', null, 'suid'))
@@ -87,14 +91,29 @@ if(isset($_GET['action']) && $_GET['action']=='delete')
 
 $ampel = new ampel();
 
-if(!$ampel->getAll())
-	die($ampel->errormsg);
+// nur bei Auswahl 'Alle' alle Ampeln zeigen
+if (isset($_GET['action']) &&  $_GET['action'] == 'all')
+{
+	if(!$ampel->getAll())
+	{
+		die($ampel->errormsg);
+	}
+}
+// default: nur aktive Ampeln zeigen
+else
+{
+	if(!$ampel->getAll(true))
+	{
+		die($ampel->errormsg);
+	}
+}
 
 echo '<table class="tablesorter" id="myTable">
 	<thead>
 		<tr>
 			<th>ID</th>
 			<th>Kurzbz</th>
+			<th>Dauerampel</th>
 			<th>Deadline</th>
 			<th>Vorlaufzeit</th>
 			<th>Verfallszeit</th>
@@ -109,6 +128,7 @@ foreach($ampel->result as $row)
 	echo '<tr>';
 	echo '<td><a href="ampel_details.php?action=update&ampel_id=',$row->ampel_id,' " target="detail_ampel">',$row->ampel_id,'</a></td>';
 	echo '<td>',$row->kurzbz,'</td>';
+	echo '<td>',($row->dauerampel == 't' ? 'Ja' : 'Nein'),'</td>';
 	echo '<td>',$datum_obj->formatDatum($row->deadline,'d.m.Y'),'</td>';
 	echo '<td>',$row->vorlaufzeit,'</td>';
 	echo '<td>',$row->verfallszeit,'</td>';
