drop2024 had uncommitted stuff
This commit is contained in:
parent
46c372ee8c
commit
98c94995d4
|
|
@ -88,8 +88,7 @@ function outputHelperInformation($HelferUeberschrift, $OldAliasHelferID, $dauer,
|
||||||
|
|
||||||
// Helferlevel holen, wir listen die Level nacheinander auf
|
// Helferlevel holen, wir listen die Level nacheinander auf
|
||||||
$alleHelferLevel = alleHelferLevel($db_link);
|
$alleHelferLevel = alleHelferLevel($db_link);
|
||||||
foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung)
|
foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung) {
|
||||||
{
|
|
||||||
echo "<tr class='header infoheader'><th colspan=3>($HelferLevelIteration) $HelferLevelBeschreibung</th></tr>";
|
echo "<tr class='header infoheader'><th colspan=3>($HelferLevelIteration) $HelferLevelBeschreibung</th></tr>";
|
||||||
$db_erg = AlleHelferSchichtenUebersicht($db_link, $HelferLevelIteration);
|
$db_erg = AlleHelferSchichtenUebersicht($db_link, $HelferLevelIteration);
|
||||||
$dauer = 0;
|
$dauer = 0;
|
||||||
|
|
@ -97,8 +96,8 @@ foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung)
|
||||||
$OldAliasHelferID = "-1";
|
$OldAliasHelferID = "-1";
|
||||||
$EinzelDienstStundenZeile = ""; // Tabellenzeile mit EinzelDienstStunden
|
$EinzelDienstStundenZeile = ""; // Tabellenzeile mit EinzelDienstStunden
|
||||||
$HelferUeberschrift = "";
|
$HelferUeberschrift = "";
|
||||||
|
|
||||||
|
|
||||||
echo "<tr class='header infoheader'><th>Accountdaten</th><th>Schichten</th><th>Schichten Ändern</th></tr>";
|
echo "<tr class='header infoheader'><th>Accountdaten</th><th>Schichten</th><th>Schichten Ändern</th></tr>";
|
||||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
$HelferName = $zeile["Name"];
|
$HelferName = $zeile["Name"];
|
||||||
|
|
@ -123,7 +122,6 @@ foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung)
|
||||||
if ($EinzelDienstStundenZeile != "") {
|
if ($EinzelDienstStundenZeile != "") {
|
||||||
outputHelperInformation($HelferUeberschrift, $OldAliasHelferID, $dauer, $EinzelDienstStundenZeile);
|
outputHelperInformation($HelferUeberschrift, $OldAliasHelferID, $dauer, $EinzelDienstStundenZeile);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@ $alleHelferLevel = alleHelferLevel($db_link);
|
||||||
foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung) {
|
foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung) {
|
||||||
$selected = ($HelferLevelIteration == $HelferLevel) ? "selected" : "";
|
$selected = ($HelferLevelIteration == $HelferLevel) ? "selected" : "";
|
||||||
echo "<option value='$HelferLevelIteration' $selected>$HelferLevelBeschreibung</option>";
|
echo "<option value='$HelferLevelIteration' $selected>$HelferLevelBeschreibung</option>";
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
</td>
|
</td>
|
||||||
|
|
|
||||||
|
|
@ -100,28 +100,31 @@ echo "<br><br><table class='commontable' style='page-break-before:always'>";
|
||||||
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>↩</b></button> <b>Übersicht Helfer und Ihre Schichten DAS 2023</b></th>
|
<th><button name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b>↩</b></button> <b>Übersicht Helfer und Ihre Schichten DAS 2023</b></th>
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
$db_erg = AlleHelferSchichtenUebersicht($db_link);
|
$alleHelferLevel = alleHelferLevel($db_link);
|
||||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
foreach ($alleHelferLevel as $HelferLevelIteration => $HelferLevelBeschreibung) {
|
||||||
$HelferName = $zeile["Name"];
|
echo "<tr class='header infoheader'><th colspan=3>$HelferLevelBeschreibung</th>";
|
||||||
|
$db_erg = AlleHelferSchichtenUebersicht($db_link, $HelferLevelIteration);
|
||||||
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
|
$HelferName = $zeile["Name"];
|
||||||
|
|
||||||
if ($HelferName != $OldHelferName) {
|
if ($HelferName != $OldHelferName) {
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
//echo '<table class="commontable" style="page-break-before:always">';
|
//echo '<table class="commontable" style="page-break-before:always">';
|
||||||
echo '<table class="commontable">';
|
echo '<table class="commontable">';
|
||||||
echo "<tr><th colspan=3>";
|
echo "<tr><th colspan=3>";
|
||||||
echo $HelferName;
|
echo $HelferName;
|
||||||
echo "</th></tr>";
|
echo "</th></tr>";
|
||||||
$OldHelferName = $HelferName;
|
$OldHelferName = $HelferName;
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "<tr><td style='width:100px'>";
|
||||||
|
echo (int)$zeile["Dauer"];
|
||||||
|
echo "</td><td>";
|
||||||
|
echo $zeile["Was"];
|
||||||
|
echo "</td></tr>";
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "<tr><td style='width:100px'>";
|
|
||||||
echo (int)$zeile["Dauer"];
|
|
||||||
echo "</td><td>";
|
|
||||||
echo $zeile["Was"];
|
|
||||||
echo "</td></tr>";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
10
html/SQL.php
10
html/SQL.php
|
|
@ -769,7 +769,7 @@ function DeleteSchicht($db_link, $SchichtID, $Rekursiv)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function AlleHelferSchichtenUebersicht($db_link,$HelferLevel)
|
function AlleHelferSchichtenUebersicht($db_link, $HelferLevel)
|
||||||
{
|
{
|
||||||
$sql = "
|
$sql = "
|
||||||
SELECT
|
SELECT
|
||||||
|
|
@ -840,14 +840,14 @@ function HelferLevel($db_link)
|
||||||
|
|
||||||
function alleHelferLevel($db_link)
|
function alleHelferLevel($db_link)
|
||||||
{
|
{
|
||||||
$alleHelferLevel = array();
|
$alleHelferLevel = array();
|
||||||
$db_erg=HelferLevel($db_link);
|
$db_erg = HelferLevel($db_link);
|
||||||
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
while ($zeile = mysqli_fetch_array($db_erg, MYSQLI_ASSOC)) {
|
||||||
$HelferLevel = $zeile['HelferLevel'];
|
$HelferLevel = $zeile['HelferLevel'];
|
||||||
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
$HelferLevelBeschreibung = $zeile['HelferLevelBeschreibung'];
|
||||||
$alleHelferLevel[$HelferLevel] = $HelferLevelBeschreibung;
|
$alleHelferLevel[$HelferLevel] = $HelferLevelBeschreibung;
|
||||||
};
|
};
|
||||||
return $alleHelferLevel;
|
return $alleHelferLevel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue