changes added in the stock module
This commit is contained in:
vadivel J
parent
6554612dea
commit
0d50b646d6
@ -52,8 +52,6 @@ class StockController extends BaseController
|
||||
|
||||
$postData=$this->request->getPost();
|
||||
|
||||
$postData['machineOnTime']=$postData['machineOnTime']. " " .$postData['machineOnTimeAmOrPm'];
|
||||
$postData['machineOffTime']=$postData['machineOffTime']. " " .$postData['machineOffTimeAmOrPm'];
|
||||
|
||||
$inserted= $this->coatingMachineDetails_model->insert($postData);
|
||||
|
||||
@ -72,9 +70,6 @@ class StockController extends BaseController
|
||||
|
||||
$putData=$this->request->getPost();
|
||||
|
||||
$putData['machineOnTime']=$putData['machineOnTime']. " " .$putData['machineOnTimeAmOrPm'];
|
||||
$putData['machineOffTime']=$putData['machineOffTime']. " " .$putData['machineOffTimeAmOrPm'];
|
||||
|
||||
$id = $putData['editCoatingMachineDetailId'];
|
||||
|
||||
$updated= $this->coatingMachineDetails_model->update($id,$putData);
|
||||
|
||||
@ -228,22 +228,38 @@
|
||||
<span class="badge mandatory">*</span>
|
||||
<input type="text" class="form-control" id="shiftId" name="shift" value="" required>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="machineOnTimeHrId">Machine On Time</label>
|
||||
<span class="badge mandatory">*</span>
|
||||
<select class="form-control" name="machineOnTime" id="machineOnTimeHrId">
|
||||
<option value="">Select Time</option>
|
||||
<option value="12:00" > 12:00</option>
|
||||
<option value="12:30"> 12:30</option>
|
||||
<option value="12:00 AM" > 12:00 AM</option>
|
||||
<option value="12:30 AM"> 12:30 AM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
|
||||
echo '<option value="' . $formattedHour . ':00"> ' . $formattedHour . ':00</option>';
|
||||
echo '<option value="' . $formattedHour . ':00 AM"> ' . $formattedHour . ':00 AM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30">' . $formattedHour . ':30</option>';
|
||||
echo '<option value="' . $formattedHour . ':30 AM">' . $formattedHour . ':30 AM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
<option value="12:00 PM" > 12:00 PM</option>
|
||||
<option value="12:30 PM"> 12:30 PM</option>
|
||||
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
|
||||
echo '<option value="' . $formattedHour . ':00 PM"> ' . $formattedHour . ':00 PM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30 PM">' . $formattedHour . ':30 PM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
@ -251,30 +267,37 @@
|
||||
|
||||
</div>
|
||||
|
||||
<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>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-3">
|
||||
<label for="machineOffTimeHrId">Machine Off Time</label>
|
||||
<span class="badge mandatory">*</span>
|
||||
<select class="form-control" name="machineOffTime" id="machineOffTimeHrId">
|
||||
<option value="">Select Time</option>
|
||||
<option value="12:00" > 12:00</option>
|
||||
<option value="12:30"> 12:30</option>
|
||||
<option value="12:00 AM" > 12:00 AM</option>
|
||||
<option value="12:30 AM"> 12:30 AM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
echo '<option value="' . $formattedHour . ':00"> ' . $formattedHour . ':00</option>';
|
||||
echo '<option value="' . $formattedHour . ':00 AM"> ' . $formattedHour . ':00 AM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30">' . $formattedHour . ':30</option>';
|
||||
echo '<option value="' . $formattedHour . ':30 AM">' . $formattedHour . ':30 AM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
<option value="12:00 PM" > 12:00 PM</option>
|
||||
<option value="12:30 PM"> 12:30 PM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
echo '<option value="' . $formattedHour . ':00 PM"> ' . $formattedHour . ':00 PM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30 PM">' . $formattedHour . ':30 PM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
@ -282,14 +305,6 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-1">
|
||||
<label for="machineOffTimeAmOrPmId">am / pm</label>
|
||||
<select class="form-control" name="machineOffTimeAmOrPm" id="machineOffTimeAmOrPmId">
|
||||
<option value="AM" selected>AM</option>
|
||||
<option value="PM">PM</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
@ -394,64 +409,81 @@
|
||||
<span class="badge mandatory">*</span>
|
||||
<input type="text" class="form-control" id="editShiftId" name="shift" value="" required>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
<div class="form-group col-md-3">
|
||||
<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>
|
||||
<option value="12:00 AM"> 12:00 AM</option>
|
||||
<option value="12:30 AM"> 12:30 AM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
|
||||
echo '<option value="' . $formattedHour . ':00"> ' . $formattedHour . ':00</option>';
|
||||
echo '<option value="' . $formattedHour . ':00 AM"> ' . $formattedHour . ':00 AM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30">' . $formattedHour . ':30</option>';
|
||||
echo '<option value="' . $formattedHour . ':30 AM">' . $formattedHour . ':30 AM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
|
||||
<option value="12:00 PM"> 12:00 PM</option>
|
||||
<option value="12:30 PM"> 12:30 PM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
|
||||
echo '<option value="' . $formattedHour . ':00 PM"> ' . $formattedHour . ':00 PM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30 PM">' . $formattedHour . ':30 PM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-1">
|
||||
<label for="editMachineOnTimeAmOrPmId">am / pm</label>
|
||||
<select class="form-control" name="machineOnTimeAmOrPm" id="editMachineOnTimeAmOrPmId">
|
||||
<option value="AM" selected>AM</option>
|
||||
<option value="PM">PM</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-group col-md-2">
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<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>
|
||||
<option value="12:00 AM"> 12:00 AM</option>
|
||||
<option value="12:30 AM"> 12:30 AM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
|
||||
echo '<option value="' . $formattedHour . ':00"> ' . $formattedHour . ':00</option>';
|
||||
echo '<option value="' . $formattedHour . ':00 AM"> ' . $formattedHour . ':00 AM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30">' . $formattedHour . ':30</option>';
|
||||
echo '<option value="' . $formattedHour . ':30 AM">' . $formattedHour . ':30 AM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
<option value="12:00 PM"> 12:00 PM</option>
|
||||
<option value="12:30 PM"> 12:30 PM</option>
|
||||
<?php
|
||||
// Loop through the hours 1 to 12
|
||||
for ($hour = 1; $hour < 12; $hour++) {
|
||||
// Display each hour with ":00"
|
||||
$formattedHour = str_pad($hour, 2, '0', STR_PAD_LEFT);
|
||||
|
||||
echo '<option value="' . $formattedHour . ':00 PM"> ' . $formattedHour . ':00 PM</option>';
|
||||
|
||||
echo '<option value="' . $formattedHour . ':30 PM">' . $formattedHour . ':30 PM</option>';
|
||||
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
|
||||
</div>
|
||||
<div class="form-group col-md-1">
|
||||
<label for="editMachineOffTimeAmOrPmId">am / pm</label>
|
||||
<select class="form-control" name="machineOffTimeAmOrPm" id="editMachineOffTimeAmOrPmId">
|
||||
<option value="AM" selected>AM</option>
|
||||
<option value="PM">PM</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
@ -576,7 +608,7 @@
|
||||
$('#machineOnTimeHrId ').select2();
|
||||
$('#machineOffTimeHrId ').select2();
|
||||
$('#editMachineOnTimeHrId ').select2();
|
||||
$('#editMachineOnTimeHrId ').select2();
|
||||
$('#editMachineOffTimeHrId ').select2();
|
||||
|
||||
});
|
||||
</script>
|
||||
@ -595,8 +627,8 @@
|
||||
|
||||
var date = row.find('td:eq(0)').text();
|
||||
var shift = row.find('td:eq(1)').text();
|
||||
var machineOnTime = row.find('td:eq(2)').text();
|
||||
var machineOffTime = row.find('td:eq(3)').text();
|
||||
var machineOnTimeHr = row.find('td:eq(2)').text();
|
||||
var machineOffTimeHr = row.find('td:eq(3)').text();
|
||||
var machineRunningInHrs = row.find('td:eq(4)').text();
|
||||
var totalCoating = row.find('td:eq(5)').text();
|
||||
var totalCoatingSandInKg = row.find('td:eq(6)').text();
|
||||
@ -605,13 +637,6 @@
|
||||
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
|
||||
|
||||
@ -619,10 +644,8 @@
|
||||
$('#editCustomerNameId').val(customerName);
|
||||
$('#editDateId').val(date);
|
||||
$('#editShiftId').val(shift);
|
||||
$('#editMachineOnTimeHrId').val(machineOnTimeHr);
|
||||
$('#editMachineOnTimeAmOrPmId').val(machineOnTimeAmOrPmId);
|
||||
$('#editMachineOffTimeHrId').val(machineOffTimeHr);
|
||||
$('#editMachineOffTimeAmOrPmId').val(machineOffTimeAmOrPmId);
|
||||
$('#editMachineOnTimeHrId').val(machineOnTimeHr).change();
|
||||
$('#editMachineOffTimeHrId').val(machineOffTimeHr).change();
|
||||
$('#editTotalCoatingId').val(totalCoating);
|
||||
$('#editTotalCoatingSandId').val(totalCoatingSandInKg);
|
||||
$('#editTotalGasConsumptionId').val(totalGasConsumption);
|
||||
@ -646,7 +669,7 @@
|
||||
$(document).ready(function () {
|
||||
|
||||
|
||||
$('#machineOnTimeHrId , #machineOnTimeAmOrPmId').change(function () {
|
||||
$('#machineOnTimeHrId').change(function () {
|
||||
|
||||
let machineOnDate = $('#dateId').val();
|
||||
|
||||
@ -656,10 +679,10 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
let machineOnTimeHr = $('#machineOnTimeHrId').val();
|
||||
let machineOnTimeAmOrPm = $('#machineOnTimeAmOrPmId').val();
|
||||
let machineOffTimeHr = $('#machineOffTimeHrId').val();
|
||||
let machineOffTimeAmOrPm = $('#machineOffTimeAmOrPmId').val();
|
||||
let machineOnTimeHr = $('#machineOnTimeHrId').val().split(' ')[0];
|
||||
let machineOnTimeAmOrPm = $('#machineOnTimeHrId').val().split(' ')[1];
|
||||
let machineOffTimeHr = $('#machineOffTimeHrId').val().split(' ')[0];
|
||||
let machineOffTimeAmOrPm = $('#machineOffTimeHrId').val().split(' ')[1];
|
||||
|
||||
|
||||
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
|
||||
@ -677,7 +700,7 @@
|
||||
|
||||
});
|
||||
|
||||
$('#machineOffTimeHrId , #machineOffTimeAmOrPmId').change(function () {
|
||||
$('#machineOffTimeHrId').change(function () {
|
||||
|
||||
let machineOnDate = $('#dateId').val();
|
||||
|
||||
@ -687,10 +710,10 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
let machineOffTimeHr = $('#machineOffTimeHrId').val();
|
||||
let machineOffTimeAmOrPm = $('#machineOffTimeAmOrPmId').val();
|
||||
let machineOnTimeHr = $('#machineOnTimeHrId').val();
|
||||
let machineOnTimeAmOrPm = $('#machineOnTimeAmOrPmId').val();
|
||||
let machineOffTimeHr = $('#machineOffTimeHrId').val().split(' ')[0];
|
||||
let machineOffTimeAmOrPm = $('#machineOffTimeHrId').val().split(' ')[1];
|
||||
let machineOnTimeHr = $('#machineOnTimeHrId').val().split(' ')[0];
|
||||
let machineOnTimeAmOrPm = $('#machineOnTimeHrId').val().split(' ')[1];
|
||||
|
||||
|
||||
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
|
||||
@ -743,7 +766,7 @@
|
||||
$(document).ready(function () {
|
||||
|
||||
|
||||
$('#editMachineOnTimeHrId , #editMachineOnTimeAmOrPm').change(function () {
|
||||
$('#editMachineOnTimeHrId').change(function () {
|
||||
|
||||
let machineOnDate = $('#editDateId').val();
|
||||
|
||||
@ -753,10 +776,10 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
let machineOnTimeHr = $('#editMachineOnTimeHrId').val(); //07:00
|
||||
let machineOnTimeAmOrPm = $('#editMachineOnTimeAmOrPm').val(); //PM
|
||||
let machineOffTimeHr = $('#editMachineOffTimeHrId').val(); //03:00
|
||||
let machineOffTimeAmOrPm = $('#editMachineOffTimeAmOrPm').val(); //PM
|
||||
let machineOnTimeHr = $('#editMachineOnTimeHrId').val().split(' ')[0];
|
||||
let machineOnTimeAmOrPm = $('#editMachineOnTimeHrId').val().split(' ')[1];
|
||||
let machineOffTimeHr = $('#editMachineOffTimeHrId').val().split(' ')[0];
|
||||
let machineOffTimeAmOrPm = $('#editMachineOffTimeHrId').val().split(' ')[1];
|
||||
|
||||
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
|
||||
|
||||
@ -773,7 +796,7 @@
|
||||
|
||||
});
|
||||
|
||||
$('#editMachineOffTimeHrId , #editMachineOffTimeAmOrPm ').change(function () {
|
||||
$('#editMachineOffTimeHrId').change(function () {
|
||||
|
||||
let machineOnDate = $('#editDateId').val();
|
||||
|
||||
@ -784,10 +807,10 @@
|
||||
}
|
||||
|
||||
|
||||
let machineOnTimeHr = $('#editMachineOnTimeHrId').val();
|
||||
let machineOnTimeAmOrPm = $('#editMachineOnTimeAmOrPm').val();
|
||||
let machineOffTimeHr = $('#editMachineOffTimeHrId').val();
|
||||
let machineOffTimeAmOrPm = $('#editMachineOffTimeAmOrPm').val();
|
||||
let machineOnTimeHr = $('#editMachineOnTimeHrId').val().split(' ')[0];
|
||||
let machineOnTimeAmOrPm = $('#editMachineOnTimeHrId').val().split(' ')[1];
|
||||
let machineOffTimeHr = $('#editMachineOffTimeHrId').val().split(' ')[0];
|
||||
let machineOffTimeAmOrPm = $('#editMachineOffTimeHrId').val().split(' ')[1];
|
||||
|
||||
let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
|
||||
|
||||
@ -857,8 +880,6 @@
|
||||
|
||||
}
|
||||
|
||||
console.log(machineOnDateAndTime);
|
||||
console.log(machineOffDateAndTime);
|
||||
|
||||
let startTime = new Date(machineOnDateAndTime);
|
||||
let endTime = new Date(machineOffDateAndTime);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user