From 0d50b646d6abe07d503be59401188470e711d6e5 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Fri, 18 Oct 2024 14:35:27 +0530 Subject: [PATCH] changes added in the stock module --- app/Controllers/StockController.php | 5 - app/Views/CoatingMachineDetail.php | 193 +++++++++++++++------------- 2 files changed, 107 insertions(+), 91 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 661376d9..6f1f2c49 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -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); diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php index efea5984..af5ab65d 100644 --- a/app/Views/CoatingMachineDetail.php +++ b/app/Views/CoatingMachineDetail.php @@ -228,22 +228,38 @@ * -
+
* - - - - -
+ -
+
* - - - -
-
@@ -394,64 +409,81 @@ *
-
+
*
-
- - -
-
+ +
*
-
- - -
+
@@ -576,7 +608,7 @@ $('#machineOnTimeHrId ').select2(); $('#machineOffTimeHrId ').select2(); $('#editMachineOnTimeHrId ').select2(); - $('#editMachineOnTimeHrId ').select2(); + $('#editMachineOffTimeHrId ').select2(); }); @@ -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);