via ~/phpcbf.phar autoformat
This commit is contained in:
parent
7c88c14d57
commit
fc1a21fff9
|
|
@ -28,15 +28,13 @@ include '_login.php';
|
||||||
|
|
||||||
/// Detailinformation zu ausgewaehlten Schicht Holen
|
/// Detailinformation zu ausgewaehlten Schicht Holen
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if(isset($_POST['CloseInfo']))
|
if (isset($_POST['CloseInfo'])) {
|
||||||
{
|
unset($InfoMeineSchichtID);
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
UNSET($InfoAlleSchichtID);
|
|
||||||
}
|
}
|
||||||
if(isset($_POST['InfoMeineSchichtID']))
|
if (isset($_POST['InfoMeineSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
$InfoMeineSchichtID = $_POST['InfoMeineSchichtID'];
|
||||||
UNSET($InfoAlleSchichtID);
|
unset($InfoAlleSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoMeineSchichtID);
|
||||||
|
|
@ -48,14 +46,12 @@ if(isset($_POST['InfoMeineSchichtID']))
|
||||||
$LeiterHandy = $zeile['Handy'];
|
$LeiterHandy = $zeile['Handy'];
|
||||||
$LeiterEmail = $zeile['Email'];
|
$LeiterEmail = $zeile['Email'];
|
||||||
$Info = $zeile['Info'];
|
$Info = $zeile['Info'];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if(isset($_GET['InfoAlleSchichtID']))
|
if (isset($_GET['InfoAlleSchichtID'])) {
|
||||||
{
|
|
||||||
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
$InfoAlleSchichtID = $_GET['InfoAlleSchichtID'];
|
||||||
UNSET($InfoMeineSchichtID);
|
unset($InfoMeineSchichtID);
|
||||||
//echo "<b>". $SchichtID . "</b><br>";
|
//echo "<b>". $SchichtID . "</b><br>";
|
||||||
|
|
||||||
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
$zeile = DetailSchicht($db_link, $InfoAlleSchichtID);
|
||||||
|
|
@ -76,23 +72,17 @@ if(isset($_GET['InfoAlleSchichtID']))
|
||||||
|
|
||||||
$x = 0;
|
$x = 0;
|
||||||
|
|
||||||
while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC))
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
{
|
|
||||||
$MitHelferID[$x] = $zeile['HelferID'];
|
$MitHelferID[$x] = $zeile['HelferID'];
|
||||||
$MitHelfer[$x] = $zeile['Name'];
|
$MitHelfer[$x] = $zeile['Name'];
|
||||||
$MitHelferHandy[$x] = $zeile['Handy'];
|
$MitHelferHandy[$x] = $zeile['Handy'];
|
||||||
$x++;
|
$x++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_GET['ZeitBereich']))
|
if (isset($_GET['ZeitBereich'])) {
|
||||||
{
|
|
||||||
$ZeitBereich = $_GET['ZeitBereich'];
|
$ZeitBereich = $_GET['ZeitBereich'];
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
$ZeitBereich = 0;
|
$ZeitBereich = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -112,7 +102,6 @@ else
|
||||||
// Neu Schicht fuer Helfer Eintragen
|
// Neu Schicht fuer Helfer Eintragen
|
||||||
///////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////
|
||||||
if (isset($_POST['plusschicht'])) {
|
if (isset($_POST['plusschicht'])) {
|
||||||
|
|
||||||
$messages = [];
|
$messages = [];
|
||||||
$SchichtId = $_POST['plusschicht'];
|
$SchichtId = $_POST['plusschicht'];
|
||||||
|
|
||||||
|
|
@ -123,8 +112,7 @@ if(isset($_POST['plusschicht'])) {
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
|
||||||
if(empty($messages))
|
if (empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer Schicht zuweisen
|
// Helfer Schicht zuweisen
|
||||||
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
$db_erg = HelferSchichtZuweisen($db_link, $HelferID, $SchichtId);
|
||||||
|
|
||||||
|
|
@ -133,19 +121,14 @@ if(isset($_POST['plusschicht'])) {
|
||||||
$HelferEmail = '';
|
$HelferEmail = '';
|
||||||
$HelferHandy = '';
|
$HelferHandy = '';
|
||||||
//die('<div class="Helfer wurde angelegt.</div>');
|
//die('<div class="Helfer wurde angelegt.</div>');
|
||||||
}
|
} else {
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach ($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isset($_POST['minusschicht'])) {
|
if (isset($_POST['minusschicht'])) {
|
||||||
|
|
@ -154,25 +137,17 @@ if(isset($_POST['minusschicht'])) {
|
||||||
|
|
||||||
$SchichtID = $_POST['minusschicht'];
|
$SchichtID = $_POST['minusschicht'];
|
||||||
|
|
||||||
if(empty($messages))
|
if (empty($messages)) {
|
||||||
{
|
|
||||||
// Helfer aus Schicht entfernen
|
// Helfer aus Schicht entfernen
|
||||||
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID);
|
$db_erg = HelferVonSchichtLoeschen_SchichtID($db_link, $HelferID, $SchichtID);
|
||||||
|
} else {
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// Fehlermeldungen ausgeben:
|
// Fehlermeldungen ausgeben:
|
||||||
echo '<div class="error"><ul>';
|
echo '<div class="error"><ul>';
|
||||||
foreach($messages as $message)
|
foreach ($messages as $message) {
|
||||||
{
|
|
||||||
echo '<li>' . htmlspecialchars($message) . '</li>';
|
echo '<li>' . htmlspecialchars($message) . '</li>';
|
||||||
}
|
}
|
||||||
echo '</ul></div>';
|
echo '</ul></div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Ausgabe auf Deutsch umstellen
|
/// Ausgabe auf Deutsch umstellen
|
||||||
|
|
@ -187,8 +162,7 @@ if(isset($_POST['minusschicht'])) {
|
||||||
|
|
||||||
/// Schichten Auswahl
|
/// Schichten Auswahl
|
||||||
////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////
|
||||||
if($addschicht=='0')
|
if ($addschicht == '0') {
|
||||||
{
|
|
||||||
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
echo "<p><b>Schichten Hinzufügen geordnet nach</b>";
|
||||||
echo "<button name='addschicht' value='1'>Tage</button>";
|
echo "<button name='addschicht' value='1'>Tage</button>";
|
||||||
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
echo "<button name='addschicht' value='2'>Dienste</button></p>";
|
||||||
|
|
@ -227,25 +201,33 @@ foreach($ZeitBereichWerte as &$EinZeitBereich) {
|
||||||
$Text = "$Wochentag (Tag{$EinZeitBereich})";
|
$Text = "$Wochentag (Tag{$EinZeitBereich})";
|
||||||
$Von = date_format($day, $format) . " 00:00:00";
|
$Von = date_format($day, $format) . " 00:00:00";
|
||||||
$Bis = date_format($day, $format) . " 23:59:59";
|
$Bis = date_format($day, $format) . " 23:59:59";
|
||||||
}
|
} elseif ($EinZeitBereich == -1) {
|
||||||
elseif($EinZeitBereich == -1) { $Text = 'Davor'; $Von="2000-01-01 00:00:00"; $Bis=date_format($start_date, $format). " 00:00:00";}
|
$Text = 'Davor';
|
||||||
elseif($EinZeitBereich == 0 ) { $Text = 'Alle' ; $Von="2000-01-01 00:00:00"; $Bis="3000-01-01 00:00:00";}
|
$Von = "2000-01-01 00:00:00";
|
||||||
elseif($EinZeitBereich == 1000) { $Text = 'Danach';
|
$Bis = date_format($start_date, $format) . " 00:00:00";
|
||||||
|
} elseif ($EinZeitBereich == 0) {
|
||||||
|
$Text = 'Alle' ;
|
||||||
|
$Von = "2000-01-01 00:00:00";
|
||||||
|
$Bis = "3000-01-01 00:00:00";
|
||||||
|
} elseif ($EinZeitBereich == 1000) {
|
||||||
|
$Text = 'Danach';
|
||||||
$tage_dauer = TAGE_DAUER;
|
$tage_dauer = TAGE_DAUER;
|
||||||
$day = $start_date->add(new DateInterval("P{$tage_dauer}D")); $Von=date_format($day, $format). " 00:00:00"; $Bis="3000-01-01 00:00:00";
|
$day = $start_date->add(new DateInterval("P{$tage_dauer}D"));
|
||||||
|
$Von = date_format($day, $format) . " 00:00:00";
|
||||||
|
$Bis = "3000-01-01 00:00:00";
|
||||||
}
|
}
|
||||||
// highlight the selected time range
|
// highlight the selected time range
|
||||||
if ($EinZeitBereich == $ZeitBereich) {
|
if ($EinZeitBereich == $ZeitBereich) {
|
||||||
$color = 'background-color:#0000FF; ' ;
|
$color = 'background-color:#0000FF; ' ;
|
||||||
$MeinVon = $Von;
|
$MeinVon = $Von;
|
||||||
$MeinBis = $Bis;
|
$MeinBis = $Bis;
|
||||||
|
} else {
|
||||||
|
$color = '';
|
||||||
}
|
}
|
||||||
else { $color = '';}
|
|
||||||
//$Text="$Text <br>$MeinVon $MeinBis"; // debug time strings
|
//$Text="$Text <br>$MeinVon $MeinBis"; // debug time strings
|
||||||
|
|
||||||
// write the field for each day
|
// write the field for each day
|
||||||
echo "<th style='width:{$ZeitBereichFeldBreite}%; $color' onclick='window.location.href=\"AlleSchichtenAusdruck.php?ZeitBereich={$EinZeitBereich}\";'>" . "$Text" . "</th>\n";
|
echo "<th style='width:{$ZeitBereichFeldBreite}%; $color' onclick='window.location.href=\"AlleSchichtenAusdruck.php?ZeitBereich={$EinZeitBereich}\";'>" . "$Text" . "</th>\n";
|
||||||
|
|
||||||
}
|
}
|
||||||
echo "</tr>"; //Zeitbereich tr
|
echo "</tr>"; //Zeitbereich tr
|
||||||
|
|
||||||
|
|
@ -280,7 +262,9 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
||||||
$Soll = $zeile['Soll'];
|
$Soll = $zeile['Soll'];
|
||||||
$Was = $zeile['Was'];
|
$Was = $zeile['Was'];
|
||||||
$TagKurz = substr($Tag, 0, 2);
|
$TagKurz = substr($Tag, 0, 2);
|
||||||
if ( substr($Ab,0,2) == substr($Bis,0,2)) { $Bis = substr($Bis,2); } // if start and end time are on the same day, we only print the end time
|
if (substr($Ab, 0, 2) == substr($Bis, 0, 2)) {
|
||||||
|
$Bis = substr($Bis, 2);
|
||||||
|
} // if start and end time are on the same day, we only print the end time
|
||||||
if ($Was != $OldWas) {
|
if ($Was != $OldWas) {
|
||||||
echo "<tr class='header'>";
|
echo "<tr class='header'>";
|
||||||
echo "<th colspan=5 style='text-align:center'>$Was ($TagKurz)</th></tr>\n";
|
echo "<th colspan=5 style='text-align:center'>$Was ($TagKurz)</th></tr>\n";
|
||||||
|
|
@ -290,14 +274,22 @@ while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)) {
|
||||||
while ($Soll > 0) {
|
while ($Soll > 0) {
|
||||||
$Soll = $Soll - 1;
|
$Soll = $Soll - 1;
|
||||||
$HelferZeile = mysqli_fetch_array($db_erg_helfer, MYSQLI_ASSOC);
|
$HelferZeile = mysqli_fetch_array($db_erg_helfer, MYSQLI_ASSOC);
|
||||||
if(isset($HelferZeile['Name'])) { $Helfername = $HelferZeile['Name']; } else { $Helfername = ''; }
|
if (isset($HelferZeile['Name'])) {
|
||||||
|
$Helfername = $HelferZeile['Name'];
|
||||||
|
} else {
|
||||||
|
$Helfername = '';
|
||||||
|
}
|
||||||
echo "<tr><td>$Was <br>$Ab - $Bis </td>";
|
echo "<tr><td>$Was <br>$Ab - $Bis </td>";
|
||||||
echo "<td>$Helfername</td>";
|
echo "<td>$Helfername</td>";
|
||||||
echo "<td>$Was <br>$Ab-$Bis</td>";
|
echo "<td>$Was <br>$Ab-$Bis</td>";
|
||||||
if ($Soll > 0) { // zweite Spalte nur ausgeben, wenn noch eine Schicht offen ist
|
if ($Soll > 0) { // zweite Spalte nur ausgeben, wenn noch eine Schicht offen ist
|
||||||
$Soll = $Soll - 1;
|
$Soll = $Soll - 1;
|
||||||
$HelferZeile = mysqli_fetch_array($db_erg_helfer, MYSQLI_ASSOC); // get the next person
|
$HelferZeile = mysqli_fetch_array($db_erg_helfer, MYSQLI_ASSOC); // get the next person
|
||||||
if(isset($HelferZeile['Name'])) { $Helfername = $HelferZeile['Name']; } else { $Helfername = ''; }
|
if (isset($HelferZeile['Name'])) {
|
||||||
|
$Helfername = $HelferZeile['Name'];
|
||||||
|
} else {
|
||||||
|
$Helfername = '';
|
||||||
|
}
|
||||||
echo "<td>$Helfername</td>";
|
echo "<td>$Helfername</td>";
|
||||||
echo "<td>$Was <br>$Ab-$Bis</td><tr>";
|
echo "<td>$Was <br>$Ab-$Bis</td><tr>";
|
||||||
} else {//if there is no more shift to fill in, we fill the rest of the row with empty fields
|
} else {//if there is no more shift to fill in, we fill the rest of the row with empty fields
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue