5balls
/
Bengelsystem
mirror of https://github.com/iridos/Bengelsystem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GetSchichtenEinesHelfers / German setting for db

This commit is contained in:
Florian Pesth 2024-02-08 19:52:47 +01:00
parent 821048d5f8
commit bdada8a2d5
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
html/SQL.php
View File

@ -21,6 +21,9 @@ class DB {
{
if(self::$instance == null){
self::$instance = new DB();
// Set database to german (FIXME should be configurable)
self::prepare(__METHOD__,"SET lc_time_names = 'de_DE'");
self::execute(__METHOD__);
}
return self::$instance;
}
@ -629,10 +632,11 @@ function GetSchichtenEinesDienstes($DienstID)
{
//$sql = "SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon FROM Schicht where DienstID=".$DienstID;
$db = DB::getInstance();
$db->prepare(__METHOD__,"SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis FROM Schicht where DienstID=:id");
$db->prepare(__METHOD__,"SELECT SchichtID,Von,Bis,Soll,DATE_FORMAT(Von,'%a %H:%i') AS TagVon, DATE_FORMAT(Von,'%H:%i') AS ZeitVon, DATE_FORMAT(Bis,'%H:%i') AS ZeitBis, DATE_FORMAT(Dauer,'%H:%i') AS Dauer FROM Schicht where DienstID=:id");
$db_erg = $db->execute(__METHOD__,['id' => $DienstID]);
$db->onErrorDie(__METHOD__);
return $db_erg;
$schichten = $db->fetchAll(__METHOD__);
return $schichten;
}
function ChangeSchicht($SchichtID, $Von, $Bis, $Soll)
@ -650,6 +654,7 @@ function ChangeSchicht($SchichtID, $Von, $Bis, $Soll)
$db->onErrorDie(__METHOD__);
}
// ok
function NewSchicht($DienstID, $Von, $Bis, $Soll, $Dauer)
{

4
html/SQL_old.php
View File

@ -673,7 +673,9 @@ function GetSchichtenEinesDienstes($db_link, $DienstID)
echo $sql;
die('Ungueltige Abfrage: ' . mysqli_error($db_link));
}
return $db_erg;
while($zeilen[] = mysqli_fetch_array($db_erg, MYSQLI_ASSOC));
array_pop($zeilen);
return $zeilen;
}
function ChangeSchicht($db_link, $SchichtID, $Von, $Bis, $Soll, $Dauer)

8
html/testPDO.php
View File

@ -406,14 +406,15 @@ function TestGetSchichtenForDienstForDay(){
}
function TestGetSchichtenEinesDienstes(){
$dienste = GetDienste();
$dbl = old\ConnectDB();
$erg_old = old\GetSchichtenEinesDienstes($dbl, $DienstID);
$erg_new = GetSchichtenEinesDienstes($DienstID);
$erg_old = old\GetSchichtenEinesDienstes($dbl, $dienste[0]["DienstID"]);
$erg_new = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
if((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)){
echo "Old GetSchichtenEinesDienstes returns".var_export($erg_old, true)."\n";
echo "New GetSchichtenEinesDienstes returns '".var_export($erg_new, true)."'\n";
}
else echo "GetSchichtenEinesDienstes ok";
else echo "GetSchichtenEinesDienstes ok\n";
}
function TestChangeSchicht(){
@ -519,4 +520,5 @@ TestNewDienst();
TestChangeDienst();
TestGetDiensteChilds();
TestNewSchicht();
TestGetSchichtenEinesDienstes();
?>