RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stock module dev 17/10 changes -vadivel J

Browse Source
This commit is contained in:
vadivelJ96 2024-10-20 23:38:41 +05:30
parent d14dee5b87
commit 3edca946c4
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Views/CoatingMachineDetail.php
View File

@ -232,7 +232,7 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="machineOnTimeHrId">Machine On Time</label> <label for="machineOnTimeHrId">Machine On Time</label>
<span class="badge mandatory">*</span> <span class="badge mandatory">*</span>
<select class="form-control" name="machineOnTime" id="machineOnTimeHrId"> <select class="form-control" name="machineOnTime" id="machineOnTimeHrId" required>
<option value="">Select Time</option> <option value="">Select Time</option>
<option value="12:00 AM" >12:00 AM</option> <option value="12:00 AM" >12:00 AM</option>
<option value="12:30 AM"> 12:30 AM</option> <option value="12:30 AM"> 12:30 AM</option>
@ -273,7 +273,7 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="machineOffTimeHrId">Machine Off Time</label> <label for="machineOffTimeHrId">Machine Off Time</label>
<span class="badge mandatory">*</span> <span class="badge mandatory">*</span>
<select class="form-control" name="machineOffTime" id="machineOffTimeHrId"> <select class="form-control" name="machineOffTime" id="machineOffTimeHrId" required>
<option value="">Select Time</option> <option value="">Select Time</option>
<option value="12:00 AM" > 12:00 AM</option> <option value="12:00 AM" > 12:00 AM</option>
<option value="12:30 AM"> 12:30 AM</option> <option value="12:30 AM"> 12:30 AM</option>
@ -293,7 +293,7 @@
<option value="12:30 PM"> 12:30 PM</option> <option value="12:30 PM"> 12:30 PM</option>
<?php <?php
// Loop through the hours 1 to 12 // Loop through the hours 1 to 12
for ($hour = 1; $hour < 12; $hour++) { for ($hour = 1; $hour <= 12; $hour++) {
// Display each hour with ":00" // Display each hour with ":00"
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT); $formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
echo '<option value="' . $formattedHour . ':00 PM"> ' . $formattedHour . ':00 PM</option>'; echo '<option value="' . $formattedHour . ':00 PM"> ' . $formattedHour . ':00 PM</option>';
@ -413,7 +413,7 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="editMachineOnTimeHrId">Machine On Time</label> <label for="editMachineOnTimeHrId">Machine On Time</label>
<span class="badge mandatory">*</span> <span class="badge mandatory">*</span>
<select class="form-control" name="machineOnTime" id="editMachineOnTimeHrId"> <select class="form-control" name="machineOnTime" id="editMachineOnTimeHrId" required>
<option value="">Select Time</option> <option value="">Select Time</option>
<option value="12:00 AM">12:00 AM</option> <option value="12:00 AM">12:00 AM</option>
<option value="12:30 AM">12:30 AM</option> <option value="12:30 AM">12:30 AM</option>
@ -434,7 +434,7 @@
<option value="12:30 PM">12:30 PM</option> <option value="12:30 PM">12:30 PM</option>
<?php <?php
// Loop through the hours 1 to 12 // Loop through the hours 1 to 12
for ($hour = 1; $hour < 12; $hour++) { for ($hour = 1; $hour <= 12; $hour++) {
// Display each hour with ":00" // Display each hour with ":00"
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT); $formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
@ -451,13 +451,13 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="editMachineOffTimeHrId">Machine Off Time</label> <label for="editMachineOffTimeHrId">Machine Off Time</label>
<span class="badge mandatory">*</span> <span class="badge mandatory">*</span>
<select class="form-control" name="machineOffTime" id="editMachineOffTimeHrId"> <select class="form-control" name="machineOffTime" id="editMachineOffTimeHrId" required>
<option value="">Select Time</option> <option value="">Select Time</option>
<option value="12:00 AM">12:00 AM</option> <option value="12:00 AM">12:00 AM</option>
<option value="12:30 AM">12:30 AM</option> <option value="12:30 AM">12:30 AM</option>
<?php <?php
// Loop through the hours 1 to 12 // Loop through the hours 1 to 12
for ($hour = 1; $hour < 12; $hour++) { for ($hour = 1; $hour <= 12; $hour++) {
// Display each hour with ":00" // Display each hour with ":00"
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT); $formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
@ -670,18 +670,18 @@
$(document).ready(function () { $(document).ready(function () {
$('#machineOnTimeHrId').change(function () { $('#machineOnTimeHrId , #dateId').change(function () {
let machineOnDate = $('#dateId').val(); let machineOnDate = $('#dateId').val();
if (machineOnDate == '') { if (machineOnDate == '') {
alert('Please Select Date before entering Machine On and Off Time ..!!'); alert('Please Select Date before entering Machine On and Off Time ..!!');
$('#machineOnTimeHrId').val(''); $('#machineOnTimeHrId').val("");
return false; return false;
} }
let machineOnTimeHr = $('#machineOnTimeHrId').val().split(' ')[0]; let machineOnTimeHr = $('#machineOnTimeHrId').val();
let machineOffTimeHr = $('#machineOffTimeHrId').val().split(' ')[0]; let machineOffTimeHr = $('#machineOffTimeHrId').val();
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOffTimeHr ); let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOffTimeHr );
@ -698,7 +698,7 @@
}); });
$('#machineOffTimeHrId').change(function () { $('#machineOffTimeHrId , #dateId').change(function () {
let machineOnDate = $('#dateId').val(); let machineOnDate = $('#dateId').val();
@ -708,8 +708,8 @@
return false; return false;
} }
let machineOffTimeHr = $('#machineOffTimeHrId').val().split(' ')[0]; let machineOffTimeHr = $('#machineOffTimeHrId').val();
let machineOnTimeHr = $('#machineOnTimeHrId').val().split(' ')[0]; let machineOnTimeHr = $('#machineOnTimeHrId').val();
@ -763,7 +763,7 @@
$(document).ready(function () { $(document).ready(function () {
$('#editMachineOnTimeHrId').change(function () { $('#editMachineOnTimeHrId , #editDateId').change(function () {
let machineOnDate = $('#editDateId').val(); let machineOnDate = $('#editDateId').val();
@ -773,8 +773,8 @@
return false; return false;
} }
let machineOnTimeHr = $('#editMachineOnTimeHrId').val().split(' ')[0]; let machineOnTimeHr = $('#editMachineOnTimeHrId').val();
let machineOffTimeHr = $('#editMachineOffTimeHrId').val().split(' ')[0]; let machineOffTimeHr = $('#editMachineOffTimeHrId').val();
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOffTimeHr); let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOffTimeHr);
@ -791,7 +791,7 @@
}); });
$('#editMachineOffTimeHrId').change(function () { $('#editMachineOffTimeHrId , #editDateId').change(function () {
let machineOnDate = $('#editDateId').val(); let machineOnDate = $('#editDateId').val();
@ -802,8 +802,8 @@
} }
let machineOnTimeHr = $('#editMachineOnTimeHrId').val().split(' ')[0]; let machineOnTimeHr = $('#editMachineOnTimeHrId').val();
let machineOffTimeHr = $('#editMachineOffTimeHrId').val().split(' ')[0]; let machineOffTimeHr = $('#editMachineOffTimeHrId').val();
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOffTimeHr); let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOffTimeHr);
@ -860,8 +860,8 @@
let machineOnTime24 = convertTo24Hr(machineOnTime12); let machineOnTime24 = convertTo24Hr(machineOnTime12);
let machineOffTime24 = convertTo24Hr(machineOffTime12); let machineOffTime24 = convertTo24Hr(machineOffTime12);
const startDate = new Date(`1970-01-01T${machineOnTime24}`); const startDate = new Date(`${machineOnDate}T${machineOnTime24}`);
const endDate = new Date(`1970-01-01T${machineOffTime24}`); const endDate = new Date(`${machineOnDate}T${machineOffTime24}`);
// Handle the case where end time is on the next day // Handle the case where end time is on the next day
if (endDate < startDate) { if (endDate < startDate) {
@ -896,7 +896,7 @@ function convertTo24Hr(time) {
} }
// Format hours and minutes to ensure two digits // Format hours and minutes to ensure two digits
return `${String(hours).padStart(2, '0')}:${minutes}`; return `${String(hours).padStart(2, '0')}:${minutes}:00`;
} }