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

coating machine details changes -vadivel J

Browse Source
This commit is contained in:
vadivel J 2024-10-18 09:39:16 +05:30
parent c0b59d7836
commit 6554612dea
1 changed files with 23 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/Views/CoatingMachineDetail.php
View File

@ -232,7 +232,8 @@
<label for="machineOnTimeHrId">Machine On Time</label>
<span class="badge mandatory">*</span>
<select class="form-control" name="machineOnTime" id="machineOnTimeHrId">
<option value="12:00" selected> 12:00</option>
<option value="">Select Time</option>
<option value="12:00" > 12:00</option>
<option value="12:30"> 12:30</option>
<?php
// Loop through the hours 1 to 12
@ -253,6 +254,7 @@
<div class="form-group col-md-1">
<label for="machineOnTimeAmOrPmId">am / pm</label>
<select class="form-control" name="machineOnTimeAmOrPm" id="machineOnTimeAmOrPmId">
<option value="AM" selected>AM</option>
<option value="PM">PM</option>
</select>
@ -262,7 +264,8 @@
<label for="machineOffTimeHrId">Machine Off Time</label>
<span class="badge mandatory">*</span>
<select class="form-control" name="machineOffTime" id="machineOffTimeHrId">
<option value="12:00" selected> 12:00</option>
<option value="">Select Time</option>
<option value="12:00" > 12:00</option>
<option value="12:30"> 12:30</option>
<?php
// Loop through the hours 1 to 12
@ -395,6 +398,7 @@
<label for="editMachineOnTimeHrId">Machine On Time</label>
<span class="badge mandatory">*</span>
<select class="form-control" name="machineOnTime" id="editMachineOnTimeHrId">
<option value="">Select Time</option>
<option value="12:00"> 12:00</option>
<option value="12:30"> 12:30</option>
<?php
@ -423,6 +427,7 @@
<label for="editMachineOffTimeHrId">Machine Off Time</label>
<span class="badge mandatory">*</span>
<select class="form-control" name="machineOffTime" id="editMachineOffTimeHrId">
<option value="">Select Time</option>
<option value="12:00"> 12:00</option>
<option value="12:30"> 12:30</option>
<?php
@ -567,7 +572,12 @@
<script>
$(document).ready(function () {
$('#exampleSelect2').select2();
$('#exampleSelect2 ').select2();
$('#machineOnTimeHrId ').select2();
$('#machineOffTimeHrId ').select2();
$('#editMachineOnTimeHrId ').select2();
$('#editMachineOnTimeHrId ').select2();
});
</script>
@ -595,7 +605,13 @@
var perHourCoatingSandQTY = row.find('td:eq(9)').text();
var customerName = row.find('td:eq(10)').text();
machineOnTimeHr=machineOnTime.split(" ")[0];
var machineOnTimeAmOrPmId=machineOnTime.split(" ")[1];
machineOffTimeHr=machineOffTime.split(" ")[0];
var machineOffTimeAmOrPmId=machineOffTime.split(" ")[1];
// Fill the modal fields with the values
@ -603,8 +619,10 @@
$('#editCustomerNameId').val(customerName);
$('#editDateId').val(date);
$('#editShiftId').val(shift);
$('#editMachineOnTimeId').val(machineOnTime);
$('#editMachineOffTimeId').val(machineOffTime);
$('#editMachineOnTimeHrId').val(machineOnTimeHr);
$('#editMachineOnTimeAmOrPmId').val(machineOnTimeAmOrPmId);
$('#editMachineOffTimeHrId').val(machineOffTimeHr);
$('#editMachineOffTimeAmOrPmId').val(machineOffTimeAmOrPmId);
$('#editTotalCoatingId').val(totalCoating);
$('#editTotalCoatingSandId').val(totalCoatingSandInKg);
$('#editTotalGasConsumptionId').val(totalGasConsumption);
@ -820,22 +838,12 @@
<script>
function calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm) {
console.log(machineOnTimeHr);
console.log(machineOnTimeAmOrPm);
console.log(machineOffTimeHr);
console.log(machineOffTimeAmOrPm);
let machineOnTime12 = machineOnTimeHr + " " + machineOnTimeAmOrPm; //07:00 PM
let machineOffTime12 = machineOffTimeHr + " " + machineOffTimeAmOrPm; //03:00 PM
console.log(machineOnTime12);
console.log(machineOffTime12);
let machineOnTime24 = convertTo24HrFormat(machineOnTime12) + ":00"; //19:00:00
let machineOffTime24 = convertTo24HrFormat(machineOffTime12) + ":00"; //15:00:00
console.log(machineOnTime24);
console.log(machineOffTime24);
let machineOnDateAndTime;
let machineOffDateAndTime;
@ -862,23 +870,6 @@
let startDate = machineOnDateAndTime.split('T')[0];
let endDate = machineOffDateAndTime.split('T')[0];
console.log(startDate); //2024-10-17
console.log(endDate); //2024-10-17
if (startDate === endDate && startTime.getTime() >= endTime.getTime()) {
alert("incorrect machine on or off time..!");
$('#machineOnTimeHrId').val('');
$('#machineOffTimeHrId').val('');
return false;
}
if (startTime > endTime) {
alert("Start date cannot be greater than end date");
$('#machineOnTimeHrId').val('');
$('#machineOffTimeHrId').val('');
return false
}
let timeDifferenceInMs = endTime - startTime;