bug fixes

This commit is contained in:
Karsten Siegmund 2024-01-23 01:02:50 +01:00
parent 7abd8f46c4
commit 4f8364d695
3 changed files with 23 additions and 23 deletions

View File

@ -22,7 +22,7 @@ if ($AdminStatus != 1) {
<script src="js/helferdb.js" type="text/javascript"></script> <script src="js/helferdb.js" type="text/javascript"></script>
<meta name="viewport" content="width=480" /> <meta name="viewport" content="width=480" />
</head> </head>
<body> <body onload="setEndDate();">
<div style="width: 100%;"> <div style="width: 100%;">
<?php <?php
@ -114,7 +114,7 @@ if (isset($_POST['NewSchicht'])) {
$Temp = $Temp->add($Temp2); $Temp = $Temp->add($Temp2);
$Bis = $Temp->format('Y-m-d H:i:s'); $Bis = $Temp->format('Y-m-d H:i:s');
} }
NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll, $Dauer); NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll, $Dauer, $HelferName);
$SchichtID = LastInsertId($db_link); $SchichtID = LastInsertId($db_link);
//echo "+".$SchichtID."+"; //echo "+".$SchichtID."+";
} }
@ -272,8 +272,11 @@ if( !isset($DienstID))
</td></tr> </td></tr>
</table> </table>
<p><button name="ChangeDienst" value="1">Ändern</button><button name="NewDienst" value="1">Schicht anlegen</button><button name='DeleteDienst' value='1'>Löschen</button></p> <p>
<button name="NewDienst" value="1">Dienst anlegen</button>
<button name="ChangeDienst" value="1">Ändern</button>
<button name='DeleteDienst' value='1'>Löschen</button>
</p>
</form> </form>
@ -324,12 +327,12 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
<table border="0" class='commontable'"> <table border="0" class='commontable'">
<tr> <tr>
<td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Von</td></tr><tr><td style="border: 0px solid black;">
<input id="Schicht-Von" name="Schicht-Von" type="datetime-local" value="<?php echo htmlspecialchars($Von ?? '')?>" required> <input id="Schicht-Von" name="Schicht-Von" type="datetime-local" onKeyUp="setEndDate()" value="<?php echo htmlspecialchars($Von ?? '')?>" required>
</td> </td>
<tr> <tr>
<tr> <tr>
<td style="border: 0px solid black;">Dauer</td></tr><tr><td style="border: 0px solid black;"> <td style="border: 0px solid black;">Dauer</td></tr><tr><td style="border: 0px solid black;">
<input id="Schicht-Dauer" name="Schicht-Dauer" type="time" onKeyUp="setEndDate()" value="<?php echo htmlspecialchars($Dauer ?? '01:00')?>" required> <input id="Schicht-Dauer" name="Schicht-Dauer" type="time" onChange="setEndDate()" value="<?php echo htmlspecialchars($Dauer ?? '01:00')?>" required>
</td> </td>
<tr> <tr>
</tr> </tr>
@ -347,22 +350,18 @@ echo "<p><noscript><button name='ShowSchicht' value='1'>Schicht Anzeigen</button
</tr> </tr>
</table> </table>
<?php if ($AutomaticBis) { ?> <input style="width:unset" width=20 id="Schicht-Automatic-Bis" name="Schicht-Automatic-Bis" type="checkbox" onclick="setEndDate()" <?php
<input style="width:unset" width = 20 "Schicht-Automatic-Bis" name="Schicht-Automatic-Bis" type="checkbox" onclick="setEndDate()" checked > Endzeit von Dauer<br> if ($AutomaticBis) { echo "checked";}
<?php } else { ?> ?> > Endzeit von Dauer<br>
<input style="width:unset" width = 20 id="Schicht-Automatic-Bis" name="Schicht-Automatic-Bis" type="checkbox" onclick="setEndDate()"> Endzeit von Dauer<br>
<?php }?>
<?php if ($Anschlussschicht) { ?>
<input style="width:unset" width = 20 name="Schicht-Anschlussschicht" type="checkbox" checked > Anschlussschicht vorbereiten<br>
<?php } else { ?>
<input style="width:unset" width = 20 name="Schicht-Anschlussschicht" type="checkbox" > Anschlussschicht vorbereiten<br>
<?php }?>
<p><button name="NewSchicht" value="1">Neue</button><br>
<button name="ChangeSchicht" value="1">Ändern</button><button name='DeleteSchicht' value='1'>Löschen</button></p>
<input style="width:unset" width=20 id="Schicht-Anschlussschicht" name="Schicht-Anschlussschicht" type="checkbox" <?php
if ($Anschlussschicht) { echo "checked"; }
?> > Anschlussschicht vorbereiten<br>
<p>
<button name="NewSchicht" value="1">Schicht anlegen</button>
<button name="ChangeSchicht" value="1">Ändern</button>
<button name='DeleteSchicht' value='1'>Löschen</button>
</p>
</form> </form>
<button class=back name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b><b>&larrhk;</b></b></button> <button class=back name="BackHelferdaten" value="1" onclick="window.location.href = 'Admin.php';"><b><b>&larrhk;</b></b></button>

View File

@ -686,7 +686,7 @@ function ChangeSchicht($db_link, $SchichtID, $Von, $Bis, $Soll, $Dauer)
} }
} }
function NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll, $Dauer) function NewSchicht($db_link, $DienstID, $Von, $Bis, $Soll, $Dauer, $HelferName)
{ {
$DienstID = mysqli_real_escape_string($db_link, $DienstID); $DienstID = mysqli_real_escape_string($db_link, $DienstID);

View File

@ -25,8 +25,9 @@ function setEndDate()
var end = new Date(start); var end = new Date(start);
var endHours=start.getHours()+delta.getHours(); var endHours=start.getHours()+delta.getHours();
end.setHours(endHours); end.setHours(endHours);
console.log("Schicht-Von: "+document.getElementById("Schicht-Von").value+'Z'+" Schicht-Dauer: "+"0000-01-01T"+ document.getElementById("Schicht-Dauer").value + "Schicht-Bis: " + end.toISOString().replace(/.000Z/,""));
end.setMinutes(start.getMinutes()+delta.getMinutes()); end.setMinutes(start.getMinutes()+delta.getMinutes());
document.getElementById("Schicht-Bis").value=end.toISOString().replace(/.000Z/,"");; document.getElementById("Schicht-Bis").value=end.toISOString().replace(/.000Z/,"");
} }
} }