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

Fix formatting errors

This commit is contained in:
Florian Pesth 2024-03-22 17:05:23 +01:00
parent 8abc400ef6
commit 9e9f346fda
10 changed files with 558 additions and 499 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/ReadLog.php
View File

@ -30,7 +30,7 @@ require '_login.php';
$AdminID = $_SESSION["AdminID"]; $AdminID = $_SESSION["AdminID"];
$zeilen = Helferdaten($HelferID); $zeilen = Helferdaten($HelferID);
foreach ($zeilen as $zeile)) { foreach ($zeilen as $zeile) {
$HelferName = $zeile['Name']; $HelferName = $zeile['Name'];
$HelferIsAdmin = $zeile['Admin']; $HelferIsAdmin = $zeile['Admin'];
} }

6
html/SQL.php
View File

@ -2,7 +2,8 @@
require_once 'konfiguration.php'; require_once 'konfiguration.php';
class DB { class DB
{
private static $instance = null; private static $instance = null;
private static $pdo = null; private static $pdo = null;
private static $stmts = array(); private static $stmts = array();
@ -317,8 +318,7 @@ function AlleSchichtenImZeitbereich($Von, $Bis, $HelferLevel = 1)
], 'helferlevel_not_set'); ], 'helferlevel_not_set');
$db->onErrorDie(__METHOD__, 'helferlevel_not_set'); $db->onErrorDie(__METHOD__, 'helferlevel_not_set');
$zeilen = $db->fetchAll(__METHOD__, 'helferlevel_not_set'); $zeilen = $db->fetchAll(__METHOD__, 'helferlevel_not_set');
} } else {
else {
$db_erg = $db->execute(__METHOD__, [ $db_erg = $db->execute(__METHOD__, [
"von" => $Von, "von" => $Von,
"bis" => $Bis, "bis" => $Bis,

1
html/SQL_old.php
View File

@ -1,4 +1,5 @@
<?php <?php
namespace old; namespace old;
require_once 'konfiguration.php'; require_once 'konfiguration.php';

10
html/Setup.php
View File

@ -67,8 +67,7 @@ $wizard->addCode('createdatabase',function($storedvariables){
require_once("SQL.php"); require_once("SQL.php");
try { try {
$db = DB::getInstance(); $db = DB::getInstance();
} } catch (PDOException $exception) {
catch( PDOException $exception ) {
echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"" . $exception->getMessage() . "\"</p>"; echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"" . $exception->getMessage() . "\"</p>";
} }
if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') { if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') {
@ -83,8 +82,7 @@ $wizard->addCode('createdatabasetables',function($storedvariables){
require_once("SQL.php"); require_once("SQL.php");
try { try {
$db = DB::getInstance(); $db = DB::getInstance();
} } catch (PDOException $exception) {
catch( PDOException $exception ) {
echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"" . $exception->getMessage() . "\"</p>"; echo "<p>Fehler beim Verbindungsversuch mit der Datenbank: \"" . $exception->getMessage() . "\"</p>";
} }
if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') { if (!is_null($db->pdoErrorCode()) && $db->pdoErrorCode() != '00000') {
@ -105,10 +103,6 @@ $wizard->addCode('createdatabasetables',function($storedvariables){
} else { } else {
echo "<p>Datenbanktabellen wurden erfolgreich angelegt!</p>"; echo "<p>Datenbanktabellen wurden erfolgreich angelegt!</p>";
} }
}); });
$wizard->renderPHP(); $wizard->renderPHP();
?>

2
html/Userdaten.php
View File

@ -67,7 +67,7 @@ if (isset($_POST['change'])) {
$zeilen = Helferdaten($HelferID); $zeilen = Helferdaten($HelferID);
foreach ($zeilen as $zeile)) { foreach ($zeilen as $zeile) {
$HelferName = $zeile['Name']; $HelferName = $zeile['Name'];
$HelferEmail = $zeile['Email']; $HelferEmail = $zeile['Email'];
$HelferHandy = $zeile['Handy']; $HelferHandy = $zeile['Handy'];

31
html/Wizard.php
View File

@ -1,11 +1,13 @@
<?php <?php
class WizardStep { class WizardStep
{
public $page = ""; public $page = "";
public array $redirects = array(); public array $redirects = array();
public string $warning = ""; public string $warning = "";
public $code = null; public $code = null;
public function __construct($step){ public function __construct($step)
{
if (isset($step['page'])) { if (isset($step['page'])) {
$this->page = $step['page']; $this->page = $step['page'];
} }
@ -13,7 +15,8 @@ class WizardStep {
$this->redirects = $step['redirects']; $this->redirects = $step['redirects'];
} }
} }
public function setCurrentStep(){ public function setCurrentStep()
{
if (!empty($this->redirects)) { if (!empty($this->redirects)) {
foreach ($this->redirects as $redirect) { foreach ($this->redirects as $redirect) {
if (isset($redirect['==']) && isset($redirect['id'])) { if (isset($redirect['==']) && isset($redirect['id'])) {
@ -85,18 +88,21 @@ class WizardStep {
} }
} }
} }
public function setCode(callable $function){ public function setCode(callable $function)
{
$this->code = $function; $this->code = $function;
} }
} }
class Wizard { class Wizard
{
private string $header = ""; private string $header = "";
private string $firststep = ""; private string $firststep = "";
private array $steps = array(); private array $steps = array();
private string $footer = ""; private string $footer = "";
private array $storedvariables = array(); private array $storedvariables = array();
public function __construct($json_file = '../wizard.json'){ public function __construct($json_file = '../wizard.json')
{
$stepsArray = json_decode(file_get_contents($json_file), true); $stepsArray = json_decode(file_get_contents($json_file), true);
$this->header = $stepsArray['header']; $this->header = $stepsArray['header'];
$this->firststep = $stepsArray['firststep']; $this->firststep = $stepsArray['firststep'];
@ -108,7 +114,8 @@ class Wizard {
$this->storedvariables = json_decode($_POST['storedvariables'], JSON_FORCE_OBJECT); $this->storedvariables = json_decode($_POST['storedvariables'], JSON_FORCE_OBJECT);
} }
} }
public function renderPHP(){ public function renderPHP()
{
echo $this->header; echo $this->header;
if (isset($_POST['stepfrom'])) { if (isset($_POST['stepfrom'])) {
$this->steps[$_POST['stepfrom']]->setCurrentStep(); $this->steps[$_POST['stepfrom']]->setCurrentStep();
@ -131,8 +138,7 @@ class Wizard {
foreach ($pagepart as $element => $content) { foreach ($pagepart as $element => $content) {
if ($element == 'text') { if ($element == 'text') {
$page .= $content; $page .= $content;
} } elseif ($element == 'variable') {
elseif($element == 'variable'){
$tmpcontent = $this->storedvariables; $tmpcontent = $this->storedvariables;
foreach (explode('/', $content) as $pathpart) { foreach (explode('/', $content) as $pathpart) {
$tmpcontent = $tmpcontent[$pathpart]; $tmpcontent = $tmpcontent[$pathpart];
@ -141,8 +147,7 @@ class Wizard {
} }
} }
} }
} } else {
else{
$page = "\xEF\xBB\xBF" . $pageval; $page = "\xEF\xBB\xBF" . $pageval;
} }
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
@ -161,8 +166,8 @@ class Wizard {
echo $pagedom->saveHTML(); echo $pagedom->saveHTML();
echo $this->footer; echo $this->footer;
} }
public function addCode($stepid, $function){ public function addCode($stepid, $function)
{
$this->steps[$stepid]->setCode($function); $this->steps[$stepid]->setCode($function);
} }
} }
?>

4
html/index.php
View File

@ -66,7 +66,9 @@ $iCount = 0;
foreach ($schichten as $zeile) { foreach ($schichten as $zeile) {
echo "<li>" . $zeile['Ab'] . " " . $zeile['Was'] . "</li>"; echo "<li>" . $zeile['Ab'] . " " . $zeile['Was'] . "</li>";
$iCount++; $iCount++;
if(iCount>2) break; if (iCount > 2) {
break;
}
} }
?> ?>

241
html/testPDO.php
View File

@ -1,34 +1,40 @@
<?php <?php
session_start(); session_start();
require_once 'SQL_old.php'; require_once 'SQL_old.php';
require_once 'SQL.php'; require_once 'SQL.php';
// ok // ok
function TestCreateHelfer(){ function TestCreateHelfer()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\CreateHelfer($dbl, "Max Mustermann", "max@example.com", "+49123-45", "hola234"); $erg_old = old\CreateHelfer($dbl, "Max Mustermann", "max@example.com", "+49123-45", "hola234");
$erg_new = CreateHelfer("Max Mustermann", "max2@example.com", "+49123-45", "hola234"); $erg_new = CreateHelfer("Max Mustermann", "max2@example.com", "+49123-45", "hola234");
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old CreateHelfer returns '" . var_export($erg_old, true) . "'"; echo "Old CreateHelfer returns '" . var_export($erg_old, true) . "'";
echo "New CreateHelfer returns '" . var_export($erg_new, true) . "'"; echo "New CreateHelfer returns '" . var_export($erg_new, true) . "'";
} else {
echo "CreateHelfer ok\n";
} }
else echo "CreateHelfer ok\n";
} }
// ok // ok
function TestHelferIstVorhanden(){ function TestHelferIstVorhanden()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferIstVorhanden($dbl, "max@example.com"); $erg_old = old\HelferIstVorhanden($dbl, "max@example.com");
$erg_new = HelferIstVorhanden("max@example.com"); $erg_new = HelferIstVorhanden("max@example.com");
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferIstVorhanden returns '" . var_export($erg_old, true) . "'"; echo "Old HelferIstVorhanden returns '" . var_export($erg_old, true) . "'";
echo "New HelferIstVorhanden returns '" . var_export($erg_new, true) . "'"; echo "New HelferIstVorhanden returns '" . var_export($erg_new, true) . "'";
} else {
echo "HelferIstVorhanden ok\n";
} }
else echo "HelferIstVorhanden ok\n";
} }
// ok // ok
function TestHelferLogin(){ function TestHelferLogin()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferLogin($dbl, "max@example.com", "hola234", 0); $erg_old = old\HelferLogin($dbl, "max@example.com", "hola234", 0);
$erg_old_session = $_SESSION; $erg_old_session = $_SESSION;
@ -44,36 +50,37 @@ function TestHelferLogin(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferLogin returns '" . var_export($erg_old, true) . "'"; echo "Old HelferLogin returns '" . var_export($erg_old, true) . "'";
echo "New HelferLogin returns '" . var_export($erg_new, true) . "'"; echo "New HelferLogin returns '" . var_export($erg_new, true) . "'";
} } elseif ((gettype($erg_old_session) != gettype($erg_new_session)) || ($erg_old_session != $erg_new_session)) {
else if((gettype($erg_old_session) != gettype($erg_new_session)) || ($erg_old_session != $erg_new_session)){
echo "Old HelferLogin session returns '" . var_export($erg_old_session, true) . "'"; echo "Old HelferLogin session returns '" . var_export($erg_old_session, true) . "'";
echo "New HelferLogin session returns '" . var_export($erg_new_session, true) . "'"; echo "New HelferLogin session returns '" . var_export($erg_new_session, true) . "'";
} } elseif ((gettype($erg_old_wrong) != gettype($erg_new_wrong)) || ($erg_old_wrong != $erg_new_wrong)) {
else if((gettype($erg_old_wrong) != gettype($erg_new_wrong)) || ($erg_old_wrong != $erg_new_wrong)){
echo "Old HelferLogin wrong returns '" . var_export($erg_old_wrong, true) . "'"; echo "Old HelferLogin wrong returns '" . var_export($erg_old_wrong, true) . "'";
echo "New HelferLogin wrong returns '" . var_export($erg_new_wrong, true) . "'"; echo "New HelferLogin wrong returns '" . var_export($erg_new_wrong, true) . "'";
} } elseif ((gettype($erg_old_session_wrong) != gettype($erg_new_session_wrong)) || ($erg_old_session_wrong != $erg_new_session_wrong)) {
else if((gettype($erg_old_session_wrong) != gettype($erg_new_session_wrong)) || ($erg_old_session_wrong != $erg_new_session_wrong)){
echo "Old HelferLogin session wrong returns '" . var_export($erg_old_session_wrong, true) . "'"; echo "Old HelferLogin session wrong returns '" . var_export($erg_old_session_wrong, true) . "'";
echo "New HelferLogin session wrong returns '" . var_export($erg_new_session_wrong, true) . "'"; echo "New HelferLogin session wrong returns '" . var_export($erg_new_session_wrong, true) . "'";
} else {
echo "HelferLogin ok\n";
} }
else echo "HelferLogin ok\n";
} }
// ok // ok
function TestHelferListe(){ function TestHelferListe()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferListe($dbl); $erg_old = old\HelferListe($dbl);
$erg_new = HelferListe(); $erg_new = HelferListe();
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferListe returns '" . var_export($erg_old, true) . "'"; echo "Old HelferListe returns '" . var_export($erg_old, true) . "'";
echo "New HelferListe returns '" . var_export($erg_new, true) . "'"; echo "New HelferListe returns '" . var_export($erg_new, true) . "'";
} else {
echo "HelferListe ok\n";
} }
else echo "HelferListe ok\n";
} }
// ok // ok
function TestHelferdaten(){ function TestHelferdaten()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max@example.com", "hola234", 0); HelferLogin("max@example.com", "hola234", 0);
$erg_old = old\Helferdaten($dbl, $_SESSION["HelferID"]); $erg_old = old\Helferdaten($dbl, $_SESSION["HelferID"]);
@ -81,12 +88,14 @@ function TestHelferdaten(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old Helferdaten returns '" . var_export($erg_old, true) . "'"; echo "Old Helferdaten returns '" . var_export($erg_old, true) . "'";
echo "New Helferdaten returns '" . var_export($erg_new, true) . "'"; echo "New Helferdaten returns '" . var_export($erg_new, true) . "'";
} else {
echo "Helferdaten ok\n";
} }
else echo "Helferdaten ok\n";
} }
// ok // ok
function TestHelferdatenAendern(){ function TestHelferdatenAendern()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max@example.com", "hola234", 0); HelferLogin("max@example.com", "hola234", 0);
$cases = array( $cases = array(
@ -148,54 +157,60 @@ function TestHelferdatenAendern(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferdatenAendern case number " . $casenumber . " returns '" . var_export($erg_old, true) . "'\n"; echo "Old HelferdatenAendern case number " . $casenumber . " returns '" . var_export($erg_old, true) . "'\n";
echo "New HelferdatenAendern case number " . $casenumber . " returns '" . var_export($erg_new, true) . "'\n"; echo "New HelferdatenAendern case number " . $casenumber . " returns '" . var_export($erg_new, true) . "'\n";
} } elseif ($erg_ob_old != $erg_ob_new) {
else if($erg_ob_old != $erg_ob_new){
echo "Old HelferdatenAendern case number " . $casenumber . " ob returns '" . $erg_ob_old . "'\n"; echo "Old HelferdatenAendern case number " . $casenumber . " ob returns '" . $erg_ob_old . "'\n";
echo "New HelferdatenAendern case number " . $casenumber . " ob returns '" . $erg_ob_new . "'\n"; echo "New HelferdatenAendern case number " . $casenumber . " ob returns '" . $erg_ob_new . "'\n";
} else {
echo "HelferdatenAendern case number " . $casenumber . " ok\n";
} }
else echo "HelferdatenAendern case number ".$casenumber." ok\n";
} }
} }
// ok // ok
function TestAlleSchichten(){ function TestAlleSchichten()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleSchichten($dbl, 1, 2); $erg_old = old\AlleSchichten($dbl, 1, 2);
$erg_new = AlleSchichten(1, 2); $erg_new = AlleSchichten(1, 2);
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichten returns" . var_export($erg_old, true) . "\n"; echo "Old AlleSchichten returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichten returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleSchichten returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichten ok\n";
} }
else echo "AlleSchichten ok\n";
} }
// ok // ok
function TestAlleSchichtenCount(){ function TestAlleSchichtenCount()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleSchichtenCount($dbl, 2); $erg_old = old\AlleSchichtenCount($dbl, 2);
$erg_new = AlleSchichtenCount(2); $erg_new = AlleSchichtenCount(2);
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenCount returns" . var_export($erg_old, true) . "\n"; echo "Old AlleSchichtenCount returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenCount returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleSchichtenCount returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenCount ok\n";
} }
else echo "AlleSchichtenCount ok\n";
} }
// ok // ok
function TestAlleBelegteSchichtenCount(){ function TestAlleBelegteSchichtenCount()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleBelegteSchichtenCount($dbl, 2); $erg_old = old\AlleBelegteSchichtenCount($dbl, 2);
$erg_new = AlleBelegteSchichtenCount(2); $erg_new = AlleBelegteSchichtenCount(2);
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleBelegteSchichtenCount returns" . var_export($erg_old, true) . "\n"; echo "Old AlleBelegteSchichtenCount returns" . var_export($erg_old, true) . "\n";
echo "New AlleBelegteSchichtenCount returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleBelegteSchichtenCount returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleBelegteSchichtenCount ok\n";
} }
else echo "AlleBelegteSchichtenCount ok\n";
} }
// ok // ok
function TestAlleSchichtenImZeitbereich(){ function TestAlleSchichtenImZeitbereich()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleSchichtenImZeitbereich($dbl, "2024-02-01", "2024-03-01", 2); $erg_old = old\AlleSchichtenImZeitbereich($dbl, "2024-02-01", "2024-03-01", 2);
$erg_new = AlleSchichtenImZeitbereich("2024-02-01", "2024-03-01", 2); $erg_new = AlleSchichtenImZeitbereich("2024-02-01", "2024-03-01", 2);
@ -208,13 +223,14 @@ function TestAlleSchichtenImZeitbereich(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenImZeitbereich returns" . var_export($erg_old, true) . "\n"; echo "Old AlleSchichtenImZeitbereich returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenImZeitbereich returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleSchichtenImZeitbereich returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenImZeitbereich ok\n";
} }
else echo "AlleSchichtenImZeitbereich ok\n";
} }
// ok // ok
function TestAlleSchichtenEinesHelfers(){ function TestAlleSchichtenEinesHelfers()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -223,12 +239,14 @@ function TestAlleSchichtenEinesHelfers(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenEinesHelfers returns" . var_export($erg_old, true) . "\n"; echo "Old AlleSchichtenEinesHelfers returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenEinesHelfers returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleSchichtenEinesHelfers returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenEinesHelfers ok\n";
} }
else echo "AlleSchichtenEinesHelfers ok\n";
} }
// ok // ok
function TestHelferLoeschen(){ function TestHelferLoeschen()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
@ -238,13 +256,11 @@ function TestHelferLoeschen(){
$erg_old1 = old\HelferLoeschen($dbl, $helfer1['HelferID'], 0); $erg_old1 = old\HelferLoeschen($dbl, $helfer1['HelferID'], 0);
$erg_new1 = HelferLoeschen($helfer2['HelferID'], 0); $erg_new1 = HelferLoeschen($helfer2['HelferID'], 0);
$schichten = AlleSchichtenEinesHelfers($helfer1['HelferID']); $schichten = AlleSchichtenEinesHelfers($helfer1['HelferID']);
foreach($schichten as $schicht) foreach ($schichten as $schicht) {
{
HelferVonSchichtLoeschen($helfer1['HelferID'], $schicht['EinzelSchichtID']); HelferVonSchichtLoeschen($helfer1['HelferID'], $schicht['EinzelSchichtID']);
} }
$schichten = AlleSchichtenEinesHelfers($helfer2['HelferID']); $schichten = AlleSchichtenEinesHelfers($helfer2['HelferID']);
foreach($schichten as $schicht) foreach ($schichten as $schicht) {
{
HelferVonSchichtLoeschen($helfer2['HelferID'], $schicht['EinzelSchichtID']); HelferVonSchichtLoeschen($helfer2['HelferID'], $schicht['EinzelSchichtID']);
} }
$erg_old2 = old\HelferLoeschen($dbl, $helfer1['HelferID'], 0); $erg_old2 = old\HelferLoeschen($dbl, $helfer1['HelferID'], 0);
@ -253,16 +269,17 @@ function TestHelferLoeschen(){
if ((gettype($erg_old1) != gettype($erg_new1)) || ($erg_old1 != $erg_new1)) { if ((gettype($erg_old1) != gettype($erg_new1)) || ($erg_old1 != $erg_new1)) {
echo "Old HelferLoeschen returns" . var_export($erg_old1, true) . "\n"; echo "Old HelferLoeschen returns" . var_export($erg_old1, true) . "\n";
echo "New HelferLoeschen returns '" . var_export($erg_new1, true) . "'\n"; echo "New HelferLoeschen returns '" . var_export($erg_new1, true) . "'\n";
} } elseif ((gettype($erg_old2) != gettype($erg_new2)) || ($erg_old2 != $erg_new2)) {
else if((gettype($erg_old2) != gettype($erg_new2)) || ($erg_old2 != $erg_new2)){
echo "Old HelferLoeschen returns" . var_export($erg_old2, true) . "\n"; echo "Old HelferLoeschen returns" . var_export($erg_old2, true) . "\n";
echo "New HelferLoeschen returns '" . var_export($erg_new2, true) . "'\n"; echo "New HelferLoeschen returns '" . var_export($erg_new2, true) . "'\n";
} else {
echo "HelferLoeschen ok\n";
} }
else echo "HelferLoeschen ok\n";
} }
// ok // ok
function TestSchichtIdArrayEinesHelfers(){ function TestSchichtIdArrayEinesHelfers()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -271,12 +288,14 @@ function TestSchichtIdArrayEinesHelfers(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old SchichtIdArrayEinesHelfers returns" . var_export($erg_old, true) . "\n"; echo "Old SchichtIdArrayEinesHelfers returns" . var_export($erg_old, true) . "\n";
echo "New SchichtIdArrayEinesHelfers returns '" . var_export($erg_new, true) . "'\n"; echo "New SchichtIdArrayEinesHelfers returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "SchichtIdArrayEinesHelfers ok\n";
} }
else echo "SchichtIdArrayEinesHelfers ok\n";
} }
// ok // ok
function TestAlleSchichtenEinesHelfersVonJetzt(){ function TestAlleSchichtenEinesHelfersVonJetzt()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -289,12 +308,14 @@ function TestAlleSchichtenEinesHelfersVonJetzt(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleSchichtenEinesHelfersVonJetzt returns" . var_export($erg_old, true) . "\n"; echo "Old AlleSchichtenEinesHelfersVonJetzt returns" . var_export($erg_old, true) . "\n";
echo "New AlleSchichtenEinesHelfersVonJetzt returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleSchichtenEinesHelfersVonJetzt returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleSchichtenEinesHelfersVonJetzt ok\n";
} }
else echo "AlleSchichtenEinesHelfersVonJetzt ok\n";
} }
// ok // ok
function TestSchichtenSummeEinesHelfers(){ function TestSchichtenSummeEinesHelfers()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -303,12 +324,14 @@ function TestSchichtenSummeEinesHelfers(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old SchichtenSummeEinesHelfers returns" . var_export($erg_old, true) . "\n"; echo "Old SchichtenSummeEinesHelfers returns" . var_export($erg_old, true) . "\n";
echo "New SchichtenSummeEinesHelfers returns '" . var_export($erg_new, true) . "'\n"; echo "New SchichtenSummeEinesHelfers returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "SchichtenSummeEinesHelfers ok\n";
} }
else echo "SchichtenSummeEinesHelfers ok\n";
} }
// ok (looked at log file afterwards) // ok (looked at log file afterwards)
function TestLogSchichtEingabe(){ function TestLogSchichtEingabe()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -320,7 +343,8 @@ function TestLogSchichtEingabe(){
} }
// ok // ok
function TestHelferSchichtZuweisen(){ function TestHelferSchichtZuweisen()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
@ -333,12 +357,14 @@ function TestHelferSchichtZuweisen(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferSchichtZuweisen returns" . var_export($erg_old, true) . "\n"; echo "Old HelferSchichtZuweisen returns" . var_export($erg_old, true) . "\n";
echo "New HelferSchichtZuweisen returns '" . var_export($erg_new, true) . "'\n"; echo "New HelferSchichtZuweisen returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferSchichtZuweisen ok\n";
} }
else echo "HelferSchichtZuweisen ok\n";
} }
// ok // ok
function TestHelferVonSchichtLoeschen(){ function TestHelferVonSchichtLoeschen()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer1 = $_SESSION; $helfer1 = $_SESSION;
@ -351,12 +377,14 @@ function TestHelferVonSchichtLoeschen(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferVonSchichtLoeschen returns" . var_export($erg_old, true) . "\n"; echo "Old HelferVonSchichtLoeschen returns" . var_export($erg_old, true) . "\n";
echo "New HelferVonSchichtLoeschen returns '" . var_export($erg_new, true) . "'\n"; echo "New HelferVonSchichtLoeschen returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferVonSchichtLoeschen ok\n";
} }
else echo "HelferVonSchichtLoeschen ok\n";
} }
// ok // ok
function TestHelferVonSchichtLoeschen_SchichtID(){ function TestHelferVonSchichtLoeschen_SchichtID()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$schichten = AlleSchichten(1, 2); $schichten = AlleSchichten(1, 2);
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
@ -370,12 +398,14 @@ function TestHelferVonSchichtLoeschen_SchichtID(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferVonSchichtLoeschen_SchichtID returns" . var_export($erg_old, true) . "\n"; echo "Old HelferVonSchichtLoeschen_SchichtID returns" . var_export($erg_old, true) . "\n";
echo "New HelferVonSchichtLoeschen_SchichtID returns '" . var_export($erg_new, true) . "'\n"; echo "New HelferVonSchichtLoeschen_SchichtID returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferVonSchichtLoeschen_SchichtID ok\n";
} }
else echo "HelferVonSchichtLoeschen_SchichtID ok\n";
} }
// ok // ok
function TestDetailSchicht(){ function TestDetailSchicht()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -385,12 +415,14 @@ function TestDetailSchicht(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old DetailSchicht returns" . var_export($erg_old, true) . "\n"; echo "Old DetailSchicht returns" . var_export($erg_old, true) . "\n";
echo "New DetailSchicht returns '" . var_export($erg_new, true) . "'\n"; echo "New DetailSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "DetailSchicht ok\n";
} }
else echo "DetailSchicht ok\n";
} }
// ok // ok
function TestBeteiligteHelfer(){ function TestBeteiligteHelfer()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max2@example.com", "hola234", 0); HelferLogin("max2@example.com", "hola234", 0);
$helfer = $_SESSION; $helfer = $_SESSION;
@ -400,24 +432,28 @@ function TestBeteiligteHelfer(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old BeteiligteHelfer returns" . var_export($erg_old, true) . "\n"; echo "Old BeteiligteHelfer returns" . var_export($erg_old, true) . "\n";
echo "New BeteiligteHelfer returns '" . var_export($erg_new, true) . "'\n"; echo "New BeteiligteHelfer returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "BeteiligteHelfer ok\n";
} }
else echo "BeteiligteHelfer ok\n";
} }
// ok // ok
function TestGetDienste(){ function TestGetDienste()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\GetDienste($dbl); $erg_old = old\GetDienste($dbl);
$erg_new = GetDienste(); $erg_new = GetDienste();
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old GetDienste returns" . var_export($erg_old, true) . "\n"; echo "Old GetDienste returns" . var_export($erg_old, true) . "\n";
echo "New GetDienste returns '" . var_export($erg_new, true) . "'\n"; echo "New GetDienste returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "GetDienste ok\n";
} }
else echo "GetDienste ok\n";
} }
// ok // ok
function TestGetDiensteChilds(){ function TestGetDiensteChilds()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old_empty = old\GetDiensteChilds($dbl, $dienste[1]["DienstID"]); $erg_old_empty = old\GetDiensteChilds($dbl, $dienste[1]["DienstID"]);
@ -427,16 +463,17 @@ function TestGetDiensteChilds(){
if ((gettype($erg_old_empty) != gettype($erg_new_empty)) || ($erg_old_empty != $erg_new_empty)) { if ((gettype($erg_old_empty) != gettype($erg_new_empty)) || ($erg_old_empty != $erg_new_empty)) {
echo "Old GetDiensteChilds empty returns" . var_export($erg_old_empty, true) . "\n"; echo "Old GetDiensteChilds empty returns" . var_export($erg_old_empty, true) . "\n";
echo "New GetDiensteChilds empty returns '" . var_export($erg_new_empty, true) . "'\n"; echo "New GetDiensteChilds empty returns '" . var_export($erg_new_empty, true) . "'\n";
} } elseif ((gettype($erg_old_child) != gettype($erg_new_child)) || ($erg_old_child != $erg_new_child)) {
else if((gettype($erg_old_child) != gettype($erg_new_child)) || ($erg_old_child != $erg_new_child)){
echo "Old GetDiensteChilds child returns" . var_export($erg_old_child, true) . "\n"; echo "Old GetDiensteChilds child returns" . var_export($erg_old_child, true) . "\n";
echo "New GetDiensteChilds child returns '" . var_export($erg_new_child, true) . "'\n"; echo "New GetDiensteChilds child returns '" . var_export($erg_new_child, true) . "'\n";
} else {
echo "GetDiensteChilds ok\n";
} }
else echo "GetDiensteChilds ok\n";
} }
// ok // ok
function TestChangeDienst(){ function TestChangeDienst()
{
$dienste = GetDienste(); $dienste = GetDienste();
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
@ -445,12 +482,14 @@ function TestChangeDienst(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old ChangeDienst returns" . var_export($erg_old, true) . "\n"; echo "Old ChangeDienst returns" . var_export($erg_old, true) . "\n";
echo "New ChangeDienst returns '" . var_export($erg_new, true) . "'\n"; echo "New ChangeDienst returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "ChangeDienst ok\n";
} }
else echo "ChangeDienst ok\n";
} }
// ok // ok
function TestNewDienst(){ function TestNewDienst()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
HelferLogin("max3@example.com", "hola531", 0); HelferLogin("max3@example.com", "hola531", 0);
$erg_old = old\NewDienst($dbl, "egal", "Badgekontrolle", "Turnhalle", "Nur Jongleure mit Badge durchlassen", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]); $erg_old = old\NewDienst($dbl, "egal", "Badgekontrolle", "Turnhalle", "Nur Jongleure mit Badge durchlassen", $_SESSION["HelferID"], 0, $_SESSION["HelferLevel"]);
@ -458,12 +497,14 @@ function TestNewDienst(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old NewDienst returns" . var_export($erg_old, true) . "\n"; echo "Old NewDienst returns" . var_export($erg_old, true) . "\n";
echo "New NewDienst returns '" . var_export($erg_new, true) . "'\n"; echo "New NewDienst returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "NewDienst ok\n";
} }
else echo "NewDienst ok\n";
} }
// ok // ok
function TestDeleteDienst(){ function TestDeleteDienst()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$dienste = GetDienste(); $dienste = GetDienste();
$erg_old = old\DeleteDienst($dbl, $dienste[0]["DienstID"], false); $erg_old = old\DeleteDienst($dbl, $dienste[0]["DienstID"], false);
@ -471,24 +512,28 @@ function TestDeleteDienst(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old DeleteDienst returns" . var_export($erg_old, true) . "\n"; echo "Old DeleteDienst returns" . var_export($erg_old, true) . "\n";
echo "New DeleteDienst returns '" . var_export($erg_new, true) . "'\n"; echo "New DeleteDienst returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "DeleteDienst ok\n";
} }
else echo "DeleteDienst ok\n";
} }
// ok // ok
function TestGetDiensteForDay(){ function TestGetDiensteForDay()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\GetDiensteForDay($dbl, 2, "2024-02-16"); $erg_old = old\GetDiensteForDay($dbl, 2, "2024-02-16");
$erg_new = GetDiensteForDay(2, "2024-02-16"); $erg_new = GetDiensteForDay(2, "2024-02-16");
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old GetDiensteForDay returns" . var_export($erg_old, true) . "\n"; echo "Old GetDiensteForDay returns" . var_export($erg_old, true) . "\n";
echo "New GetDiensteForDay returns '" . var_export($erg_new, true) . "'\n"; echo "New GetDiensteForDay returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "GetDiensteForDay ok\n";
} }
else echo "GetDiensteForDay ok\n";
} }
// ok // ok
function TestGetSchichtenForDienstForDay(){ function TestGetSchichtenForDienstForDay()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old_good = old\GetSchichtenForDienstForDay($dbl, $dienste[0]["DienstID"], "2024-02-16"); $erg_old_good = old\GetSchichtenForDienstForDay($dbl, $dienste[0]["DienstID"], "2024-02-16");
@ -498,16 +543,17 @@ function TestGetSchichtenForDienstForDay(){
if ((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)) { if ((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)) {
echo "Old GetSchichtenForDienstForDay returns" . var_export($erg_old_good, true) . "\n"; echo "Old GetSchichtenForDienstForDay returns" . var_export($erg_old_good, true) . "\n";
echo "New GetSchichtenForDienstForDay returns '" . var_export($erg_new_good, true) . "'\n"; echo "New GetSchichtenForDienstForDay returns '" . var_export($erg_new_good, true) . "'\n";
} } elseif ((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)) {
else if((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)){
echo "Old GetSchichtenForDienstForDay returns" . var_export($erg_old_bad, true) . "\n"; echo "Old GetSchichtenForDienstForDay returns" . var_export($erg_old_bad, true) . "\n";
echo "New GetSchichtenForDienstForDay returns '" . var_export($erg_new_bad, true) . "'\n"; echo "New GetSchichtenForDienstForDay returns '" . var_export($erg_new_bad, true) . "'\n";
} else {
echo "GetSchichtenForDienstForDay ok\n";
} }
else echo "GetSchichtenForDienstForDay ok\n";
} }
// ok // ok
function TestGetSchichtenEinesDienstes(){ function TestGetSchichtenEinesDienstes()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old_good = old\GetSchichtenEinesDienstes($dbl, $dienste[0]["DienstID"]); $erg_old_good = old\GetSchichtenEinesDienstes($dbl, $dienste[0]["DienstID"]);
@ -517,16 +563,17 @@ function TestGetSchichtenEinesDienstes(){
if ((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)) { if ((gettype($erg_old_good) != gettype($erg_new_good)) || ($erg_old_good != $erg_new_good)) {
echo "Old GetSchichtenEinesDienstes returns" . var_export($erg_old_good, true) . "\n"; echo "Old GetSchichtenEinesDienstes returns" . var_export($erg_old_good, true) . "\n";
echo "New GetSchichtenEinesDienstes returns '" . var_export($erg_new_good, true) . "'\n"; echo "New GetSchichtenEinesDienstes returns '" . var_export($erg_new_good, true) . "'\n";
} } elseif ((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)) {
else if((gettype($erg_old_bad) != gettype($erg_new_bad)) || ($erg_old_bad != $erg_new_bad)){
echo "Old GetSchichtenEinesDienstes returns" . var_export($erg_old_bad, true) . "\n"; echo "Old GetSchichtenEinesDienstes returns" . var_export($erg_old_bad, true) . "\n";
echo "New GetSchichtenEinesDienstes returns '" . var_export($erg_new_bad, true) . "'\n"; echo "New GetSchichtenEinesDienstes returns '" . var_export($erg_new_bad, true) . "'\n";
} else {
echo "GetSchichtenEinesDienstes ok\n";
} }
else echo "GetSchichtenEinesDienstes ok\n";
} }
// ok // ok
function TestChangeSchicht(){ function TestChangeSchicht()
{
$dienste = GetDienste(); $dienste = GetDienste();
$schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]); $schichten = GetSchichtenEinesDienstes($dienste[0]["DienstID"]);
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
@ -535,12 +582,14 @@ function TestChangeSchicht(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old ChangeSchicht returns" . var_export($erg_old, true) . "\n"; echo "Old ChangeSchicht returns" . var_export($erg_old, true) . "\n";
echo "New ChangeSchicht returns '" . var_export($erg_new, true) . "'\n"; echo "New ChangeSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "ChangeSchicht ok\n";
} }
else echo "ChangeSchicht ok\n";
} }
// ok // ok
function TestNewSchicht(){ function TestNewSchicht()
{
$dienste = GetDienste(); $dienste = GetDienste();
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-15T09:00", "2024-02-15T10:30", 2, "01:30"); $erg_old = old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-15T09:00", "2024-02-15T10:30", 2, "01:30");
@ -548,12 +597,14 @@ function TestNewSchicht(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old NewSchicht returns" . var_export($erg_old, true) . "\n"; echo "Old NewSchicht returns" . var_export($erg_old, true) . "\n";
echo "New NewSchicht returns '" . var_export($erg_new, true) . "'\n"; echo "New NewSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "NewSchicht ok\n";
} }
else echo "NewSchicht ok\n";
} }
// ok // ok
function TestDeleteSchicht(){ function TestDeleteSchicht()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$dienste = GetDienste(); $dienste = GetDienste();
NewSchicht($dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30"); NewSchicht($dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30");
@ -564,24 +615,28 @@ function TestDeleteSchicht(){
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old DeleteSchicht returns" . var_export($erg_old, true) . "\n"; echo "Old DeleteSchicht returns" . var_export($erg_old, true) . "\n";
echo "New DeleteSchicht returns '" . var_export($erg_new, true) . "'\n"; echo "New DeleteSchicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "DeleteSchicht ok\n";
} }
else echo "DeleteSchicht ok\n";
} }
// ok // ok
function TestAlleHelferSchichtenUebersicht(){ function TestAlleHelferSchichtenUebersicht()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\AlleHelferSchichtenUebersicht($dbl); $erg_old = old\AlleHelferSchichtenUebersicht($dbl);
$erg_new = AlleHelferSchichtenUebersicht(); $erg_new = AlleHelferSchichtenUebersicht();
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old AlleHelferSchichtenUebersicht returns" . var_export($erg_old, true) . "\n"; echo "Old AlleHelferSchichtenUebersicht returns" . var_export($erg_old, true) . "\n";
echo "New AlleHelferSchichtenUebersicht returns '" . var_export($erg_new, true) . "'\n"; echo "New AlleHelferSchichtenUebersicht returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "AlleHelferSchichtenUebersicht ok\n";
} }
else echo "AlleHelferSchichtenUebersicht ok\n";
} }
// ok // ok
function TestDatenbankAufDeutsch(){ function TestDatenbankAufDeutsch()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
old\DatenbankAufDeutsch($dbl); old\DatenbankAufDeutsch($dbl);
DatenbankAufDeutsch(); DatenbankAufDeutsch();
@ -589,7 +644,8 @@ function TestDatenbankAufDeutsch(){
} }
// ok, checked by hand (will be different for both connections) // ok, checked by hand (will be different for both connections)
function TestLastInsertId(){ function TestLastInsertId()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$dienste = GetDienste(); $dienste = GetDienste();
Old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30"); Old\NewSchicht($dbl, $dienste[0]["DienstID"], "2024-02-17T10:30", "2024-02-17T12:00", 2, "01:30");
@ -599,15 +655,17 @@ function TestLastInsertId(){
} }
// ok // ok
function TestHelferLevel(){ function TestHelferLevel()
{
$dbl = old\ConnectDB(); $dbl = old\ConnectDB();
$erg_old = old\HelferLevel($dbl); $erg_old = old\HelferLevel($dbl);
$erg_new = HelferLevel(); $erg_new = HelferLevel();
if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) { if ((gettype($erg_old) != gettype($erg_new)) || ($erg_old != $erg_new)) {
echo "Old HelferLevel returns" . var_export($erg_old, true) . "\n"; echo "Old HelferLevel returns" . var_export($erg_old, true) . "\n";
echo "New HelferLevel returns '" . var_export($erg_new, true) . "'\n"; echo "New HelferLevel returns '" . var_export($erg_new, true) . "'\n";
} else {
echo "HelferLevel ok\n";
} }
else echo "HelferLevel ok\n";
} }
TestCreateHelfer(); TestCreateHelfer();
@ -648,4 +706,3 @@ TestHelferLevel();
TestHelferVonSchichtLoeschen_SchichtID(); TestHelferVonSchichtLoeschen_SchichtID();
TestDeleteSchicht(); TestDeleteSchicht();
TestHelferLoeschen(); TestHelferLoeschen();
?>