From 3ef083e787282db28dc2897982cd07c5d629431f Mon Sep 17 00:00:00 2001 From: Florian Pesth Date: Tue, 16 Jan 2024 20:04:38 +0100 Subject: [PATCH] Fix formatting --- html/SQL.php | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/html/SQL.php b/html/SQL.php index c026435..b2ae398 100644 --- a/html/SQL.php +++ b/html/SQL.php @@ -622,31 +622,29 @@ function DeleteDienst($db_link, $DienstID, $Rekursiv) } -function GetDiensteForDay($db_link,$helferlevel,$datestring) +function GetDiensteForDay($db_link, $helferlevel, $datestring) { $unixtime = strtotime($datestring); - $date1 = date('Y-m-d',$unixtime+24*60*60); - $date2 = date('Y-m-d',$unixtime); - $sql = "SELECT DienstId, Was, Wo, Info FROM Dienst INNER JOIN Schicht USING (DienstID) WHERE HelferLevel=".$helferlevel." GROUP BY DienstId HAVING MIN(Von)<'".$date1."' AND MAX(Bis)>'".$date2."' ORDER BY MIN(Von) ASC;"; - $db_erg = mysqli_query( $db_link, $sql ); - if ( ! $db_erg ) - { - echo "GetDienste ungueltige Abfrage"; + $date1 = date('Y-m-d', $unixtime + 24 * 60 * 60); + $date2 = date('Y-m-d', $unixtime); + $sql = "SELECT DienstId, Was, Wo, Info FROM Dienst INNER JOIN Schicht USING (DienstID) WHERE HelferLevel=" . $helferlevel . " GROUP BY DienstId HAVING MIN(Von)<'" . $date1 . "' AND MAX(Bis)>'" . $date2 . "' ORDER BY MIN(Von) ASC;"; + $db_erg = mysqli_query($db_link, $sql); + if (! $db_erg) { + echo "GetDienste ungueltige Abfrage"; die('Ungueltige Abfrage: ' . mysqli_error($db_link)); } return $db_erg; } -function GetSchichtenForDienstForDay($db_link,$DienstID,$datestring) +function GetSchichtenForDienstForDay($db_link, $DienstID, $datestring) { $unixtime = strtotime($datestring); - $date1 = date('Y-m-d',$unixtime+24*60*60); - $date2 = date('Y-m-d',$unixtime); - $sql = "select Von, Bis, Soll, Name, Handy from Schicht left join EinzelSchicht using (SchichtId) left join Helfer using (HelferId) where DienstId=".$DienstID." and Von<'".$date1."' and Bis>'".$date2."' order by Von;"; - $db_erg = mysqli_query( $db_link, $sql ); - if ( ! $db_erg ) - { - echo "GetDienste ungueltige Abfrage"; + $date1 = date('Y-m-d', $unixtime + 24 * 60 * 60); + $date2 = date('Y-m-d', $unixtime); + $sql = "select Von, Bis, Soll, Name, Handy from Schicht left join EinzelSchicht using (SchichtId) left join Helfer using (HelferId) where DienstId=" . $DienstID . " and Von<'" . $date1 . "' and Bis>'" . $date2 . "' order by Von;"; + $db_erg = mysqli_query($db_link, $sql); + if (! $db_erg) { + echo "GetDienste ungueltige Abfrage"; die('Ungueltige Abfrage: ' . mysqli_error($db_link)); } return $db_erg;