blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 12:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Query getAll in Ampel Class

Browse Source 
Query was not retrieving correctly active Ampeln.
Adapted time conditions.
This commit is contained in:
Cris
2020-04-28 16:24:30 +02:00
parent a37b81c57a
commit 9f42beaeb3
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ampel.class.php
+6 -2
View File
@@ -129,8 +129,12 @@ class ampel extends basis_db
$qry = "SELECT *,".$beschreibung.", ".$buttontext." FROM public.tbl_ampel";
if($aktiv)
{
$qry .= " WHERE (NOW()>(deadline-(vorlaufzeit || ' days')::interval)::date)";
$qry .= " AND (NOW()<(deadline+(verfallszeit || ' days')::interval)::date)";
// (ab sofort ODER innerhalb der Vorlaufzeit)
$qry .= " WHERE (vorlaufzeit IS NULL OR (NOW()>(deadline -(vorlaufzeit || ' days')::interval)::date))";
// UND (nicht abgelaufen...
$qry .= " AND ((NOW()<(deadline+(verfallszeit || ' days')::interval)::date)";
// ...ODER ohne Verfallszeit)
$qry .= " OR verfallszeit IS NULL)";
}
$qry .= " ORDER BY deadline";