Fix formatting

This commit is contained in:
Florian Pesth 2024-01-16 20:04:38 +01:00
parent 0242efe9f0
commit 3ef083e787
1 changed files with 14 additions and 16 deletions

View File

@ -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); $unixtime = strtotime($datestring);
$date1 = date('Y-m-d',$unixtime+24*60*60); $date1 = date('Y-m-d', $unixtime + 24 * 60 * 60);
$date2 = date('Y-m-d',$unixtime); $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;"; $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 ); $db_erg = mysqli_query($db_link, $sql);
if ( ! $db_erg ) if (! $db_erg) {
{ echo "GetDienste ungueltige Abfrage";
echo "GetDienste ungueltige Abfrage";
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
return $db_erg; return $db_erg;
} }
function GetSchichtenForDienstForDay($db_link,$DienstID,$datestring) function GetSchichtenForDienstForDay($db_link, $DienstID, $datestring)
{ {
$unixtime = strtotime($datestring); $unixtime = strtotime($datestring);
$date1 = date('Y-m-d',$unixtime+24*60*60); $date1 = date('Y-m-d', $unixtime + 24 * 60 * 60);
$date2 = date('Y-m-d',$unixtime); $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;"; $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 ); $db_erg = mysqli_query($db_link, $sql);
if ( ! $db_erg ) if (! $db_erg) {
{ echo "GetDienste ungueltige Abfrage";
echo "GetDienste ungueltige Abfrage";
die('Ungueltige Abfrage: ' . mysqli_error($db_link)); die('Ungueltige Abfrage: ' . mysqli_error($db_link));
} }
return $db_erg; return $db_erg;