From c0b59d78364fd4b9072d34b2affb0aa5662d141a Mon Sep 17 00:00:00 2001
From: vadivelJ96 <jvadivel.1996@gmail.com>
Date: Thu, 17 Oct 2024 23:00:15 +0530
Subject: [PATCH] stock module dev 17/10 -vadivel J

---
 app/Controllers/StockController.php |    8 +-
 app/Views/CoatingMachineDetail.php  | 1078 ++++++++++++++++-----------
 app/Views/includes/new_header.php   |    3 -
 3 files changed, 654 insertions(+), 435 deletions(-)

diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 663a51a7..661376d9 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -51,6 +51,9 @@ class StockController extends BaseController
     public function addNewCoatingMachineDetails(){
 
         $postData=$this->request->getPost();
+
+        $postData['machineOnTime']=$postData['machineOnTime']. " " .$postData['machineOnTimeAmOrPm'];
+        $postData['machineOffTime']=$postData['machineOffTime']. " " .$postData['machineOffTimeAmOrPm'];
         
         $inserted= $this->coatingMachineDetails_model->insert($postData);
 
@@ -69,6 +72,9 @@ 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);
@@ -124,6 +130,6 @@ class StockController extends BaseController
 
     // --------------------------------------------gwm----------------------------------------------
 
-    
+
 
 }
diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php
index 27d82b56..3450cc32 100644
--- a/app/Views/CoatingMachineDetail.php
+++ b/app/Views/CoatingMachineDetail.php
@@ -74,9 +74,9 @@
         <div class="container-fluid">
             <!-- start page title -->
             <div>
-             
-            <!-- flash message is removed -->
-            <!-- <?php
+
+                <!-- flash message is removed -->
+                <!-- <?php
                 helper('form');
                 $error = session()->getFlashdata('error');
                 if ($error) {
@@ -92,18 +92,19 @@
                 <div class="row">
                     <div class="col-12">
                         <div class="page-title-box page-title-box-alt">
-                        <div class="page-title-right">
+                            <div class="page-title-right">
                                 <ol class="breadcrumb m-0">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Stock</a></li>
                                     <li class="breadcrumb-item active">
-                                    <h4 class="page-title"> <?= trim(explode(":", $pageTitle)[1]) ?>  </h4>
+                                        <h4 class="page-title"> <?= trim(explode(":", $pageTitle)[1]) ?> </h4>
                                     </li>
                                 </ol>
                             </div>
-                   
-                            <button type="button" class="btn btn-success" data-target="#coatingMachineDetailModal" data-toggle="modal" > 
-                                Add New Record 
-                            </button>                                                                             
+
+                            <button type="button" class="btn btn-success" data-target="#coatingMachineDetailModal"
+                                data-toggle="modal">
+                                Add New Record
+                            </button>
                         </div>
                     </div>
                 </div>
@@ -112,78 +113,80 @@
                 <div class="row">
                     <div class="col-12">
                         <div class="card">
-                        
+
                             <div class="card-body">
-                              
-                            <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;">
-                            
-                            <thead>
-                                <tr>
-                                    
-                                    <th style="text-align:center !important;">Date</th>
-                                    <th style="text-align:center !important;">Shift</th>
-                                    <th style="text-align:center !important;">Machine On Time</th>
-                                    <th style="text-align:center !important;">Machine Off Time</th>
-                                    <th style="text-align:center !important;">Machine Running (hr)</th>
-                                    <th style="text-align:center !important;">Total Coating</th>
-                                    <th style="text-align:center !important;">Total Coating Sand (kg)</th>
-                                    <th style="text-align:center !important;">Total Gas Consumption</th>
-                                    <th style="text-align:center !important;">Per Hour Gas Consumption</th>
-                                    <th style="text-align:center !important;">Per Hour Coating Sand QTY (kg)</th>
-                                    <th style="text-align:center !important;">Customer Name</th>       
-                                    <th style="text-align:center !important;">Action</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <?php
-                                
-                                if (!empty($coatingMachineDetails)) {
-                                    
-                                    foreach ($coatingMachineDetails as $record) {
-                                ?>
-                                        <tr data-id="<?php echo $record['id']; ?>">
-                                            
-                                            <td align="center"><?php echo $record['date'] ?></td>
-                                            <td align="center"><?php echo $record['shift'] ?></td>
-                                            <td align="center"><?php echo $record['machineOnTime'] ?></td>
-                                            <td align="center"><?php echo $record['machineOffTime'] ?></td>
-                                            <td align="center"><?php echo $record['machineRunningInHrs']??'' ?></td>
-                                            <td align="center"><?php echo $record['totalCoating'] ?></td>
-                                            <td align="center"><?php echo $record['totalCoatingSandInKg'] ?></td>
-                                            <td align="center"><?php echo $record['totalGasConsumption'] ?></td>
-                                            <td align="center"><?php echo $record['perHourGasConsumption']??'' ?></td>
-                                            <td align="center"><?php echo $record['perHourCoatingSandQTY']??'' ?></td>
-                                            <td align="center"><?php echo $record['customerName']; ?></td>
-                                            <td align="center">
-                                            <a data-toggle="tooltip" class="edit-btn" data-target="editCoatingMachineDetailModal" data-toggle="modal"
-                                                style="cursor:pointer">
-                                                <i class="fa fa-pencil-alt" data-toggle="tooltip" 
-                                                title="Click here to Edit "></i>
-                                                                &nbsp;&nbsp;&nbsp;
-                                                </a>
 
-                                               
+                                <table id="datatable" class="table table-hover table-bordered"
+                                    style="background-color:#fff;">
 
-                                                <a data-toggle="tooltip"  onclick="confirmDelete(event)"
-                                                href="<?php echo base_url(); ?>deleteCoatingMachineDetails?id=<?php echo $record['id'] ?>"
-                                                >
-                                                <i class="fa fa-trash" data-toggle="tooltip" 
-                                                title="Click here to Delete "></i>
-                                                                &nbsp;&nbsp;&nbsp;
-                                                </a>
+                                    <thead>
+                                        <tr>
 
-                                                
-
-                                               
-                                            </td>   
+                                            <th style="text-align:center !important;">Date</th>
+                                            <th style="text-align:center !important;">Shift</th>
+                                            <th style="text-align:center !important;">Machine On Time</th>
+                                            <th style="text-align:center !important;">Machine Off Time</th>
+                                            <th style="text-align:center !important;">Machine Running (hr)</th>
+                                            <th style="text-align:center !important;">Total Coating</th>
+                                            <th style="text-align:center !important;">Total Coating Sand (kg)</th>
+                                            <th style="text-align:center !important;">Total Gas Consumption</th>
+                                            <th style="text-align:center !important;">Per Hour Gas Consumption</th>
+                                            <th style="text-align:center !important;">Per Hour Coating Sand QTY (kg)
+                                            </th>
+                                            <th style="text-align:center !important;">Customer Name</th>
+                                            <th style="text-align:center !important;">Action</th>
                                         </tr>
-                                <?php
-                                    }
-                                }
-                                ?>
-                                
-                            </tbody>
-                        </table>
+                                    </thead>
+                                    <tbody>
+                                        <?php
+
+                                        if (!empty($coatingMachineDetails)) {
+
+                                            foreach ($coatingMachineDetails as $record) {
+                                                ?>
+                                                <tr data-id="<?php echo $record['id']; ?>">
+
+                                                    <td align="center"><?php echo $record['date'] ?></td>
+                                                    <td align="center"><?php echo $record['shift'] ?></td>
+                                                    <td align="center"><?php echo $record['machineOnTime'] ?></td>
+                                                    <td align="center"><?php echo $record['machineOffTime'] ?></td>
+                                                    <td align="center"><?php echo $record['machineRunningInHrs'] ?? '' ?></td>
+                                                    <td align="center"><?php echo $record['totalCoating'] ?></td>
+                                                    <td align="center"><?php echo $record['totalCoatingSandInKg'] ?></td>
+                                                    <td align="center"><?php echo $record['totalGasConsumption'] ?></td>
+                                                    <td align="center"><?php echo $record['perHourGasConsumption'] ?? '' ?></td>
+                                                    <td align="center"><?php echo $record['perHourCoatingSandQTY'] ?? '' ?></td>
+                                                    <td align="center"><?php echo $record['customerName']; ?></td>
+                                                    <td align="center">
+                                                        <a data-toggle="tooltip" class="edit-btn"
+                                                            data-target="editCoatingMachineDetailModal" data-toggle="modal"
+                                                            style="cursor:pointer">
+                                                            <i class="fa fa-pencil-alt" data-toggle="tooltip"
+                                                                title="Click here to Edit "></i>
+                                                            &nbsp;&nbsp;&nbsp;
+                                                        </a>
+
+
+
+                                                        <a data-toggle="tooltip" onclick="confirmDelete(event)"
+                                                            href="<?php echo base_url(); ?>deleteCoatingMachineDetails?id=<?php echo $record['id'] ?>">
+                                                            <i class="fa fa-trash" data-toggle="tooltip"
+                                                                title="Click here to Delete "></i>
+                                                            &nbsp;&nbsp;&nbsp;
+                                                        </a>
+
+
+
+
+                                                    </td>
+                                                </tr>
+                                                <?php
+                                            }
+                                        }
+                                        ?>
+
+                                    </tbody>
+                                </table>
                             </div> <!-- end card body-->
                         </div> <!-- end card -->
                     </div><!-- end col-->
@@ -196,217 +199,321 @@
 
 
 <!-- Modal -->
-<div class="modal fade" id="coatingMachineDetailModal" tabindex="-1" role="dialog" aria-labelledby="coatingMachineDetailModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-xl" style="width:1060px !important ;" role="document">
-    <div class="modal-content" >
-      <div class="modal-header">
+<div class="modal fade" id="coatingMachineDetailModal" tabindex="-1" role="dialog"
+    aria-labelledby="coatingMachineDetailModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl" style="width:1060px !important ;" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
 
-        <h5 class="modal-title" id="coatingMachineDetailModalLabel">
-            Add New Coating Machine Detail</h5>
+                <h5 class="modal-title" id="coatingMachineDetailModalLabel">
+                    Add New Coating Machine Detail</h5>
 
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
 
-      <!-- form  -->
-      <form method="post" action="<?php echo base_url(); ?>addNewCoatingMachineDetails">
-        <div class="modal-body">
+            <!-- form  -->
+            <form method="post" action="<?php echo base_url(); ?>addNewCoatingMachineDetails">
+                <div class="modal-body">
 
-        <div class="form-row">
-            <div class="form-group col-md-3">
-                <label for="dateId">Date</label>
-                <span class="badge mandatory">*</span>
-                <input type="date" class="form-control" id="dateId" 
-                 name="date" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="shiftId">Shift</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="shiftId" 
-                name="shift" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="machineOnTimeId">Machine On Time</label>
-                <span class="badge mandatory">*</span>
-                <input type="datetime-local" class="form-control" id="machineOnTimeId" 
-                name="machineOnTime" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="machineOffTimeId">Machine Off Time</label>
-                <span class="badge mandatory">*</span>
-                <input type="datetime-local" class="form-control" id="machineOffTimeId" 
-                name="machineOffTime" value="" required>
-             
-            </div>
+                    <div class="form-row">
+                        <div class="form-group col-md-3">
+                            <label for="dateId">Date</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="date" class="form-control" id="dateId" name="date" value="" required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="shiftId">Shift</label>
+                            <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">
+                            <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="12:30"> 12:30</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 . ':30">' . $formattedHour . ':30</option>';
+
+                                }
+                                ?>
+                            </select>
+
+                        </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">
+                            <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="12:30"> 12:30</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 . ':30">' . $formattedHour . ':30</option>';
+
+                                }
+                                ?>
+                            </select>
+
+                        </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">
+                        <div class="form-group col-md-3">
+                            <label for="customerNameId">Customer Name</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="customerNameId" name="customerName" value=""
+                                required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="totalCoatingId">Total Coating</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="totalCoatingId" name="totalCoating" value=""
+                                required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="totalCoatingSandId">Total Coating Sand (in Kg)</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="totalCoatingSandId" name="totalCoatingSandInKg"
+                                value="" required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="totalGasConsumptionId">Total Gas Consumption</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="totalGasConsumptionId"
+                                name="totalGasConsumption" value="" required>
+
+                        </div>
+
+
+
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md-3">
+                            <label for="machineRunningInHrsId"> Machine Running In Hrs</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="machineRunningInHrsId"
+                                name="machineRunningInHrs" required>
+
+                        </div>
+
+                        <div class="form-group col-md-3">
+                            <label for="perHourGasConsumptionId">Per Hour Gas Consumption </label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="perHourGasConsumptionId"
+                                name="perHourGasConsumption" required>
+
+                        </div>
+
+                        <div class="form-group col-md-3">
+                            <label for="perHourCoatingSandQTY">Per Hour Coating Sand QTY</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="perHourCoatingSandQTYId"
+                                name="perHourCoatingSandQTY" required>
+
+                        </div>
+
+                    </div>
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Save </button>
+                </div>
+            </form>
         </div>
-
-        <div class="form-row">
-             <div class="form-group col-md-3">
-               <label for="customerNameId">Customer Name</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="customerNameId" 
-                name="customerName" value="" required>         
-            </div>
-            <div class="form-group col-md-3">
-                <label for="totalCoatingId">Total Coating</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="totalCoatingId" 
-                name="totalCoating" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="totalCoatingSandId">Total Coating Sand (in Kg)</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="totalCoatingSandId" 
-                name="totalCoatingSandInKg" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-              <label for="totalGasConsumptionId">Total Gas Consumption</label>
-                <span class="badge mandatory">*</span>
-                 <input type="text" class="form-control" id="totalGasConsumptionId" 
-                 name="totalGasConsumption" value="" required>
-               
-            </div>
-
-            <div class="form-group col-md-3">
-              <label for="machineRunningInHrsId"> Machine Running In Hrs</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="machineRunningInHrsId" name="machineRunningInHrs" required>
-                
-            </div>
-
-            <div class="form-group col-md-3">
-              <label for="perHourGasConsumptionId">Per Hour Gas Consumption </label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="perHourGasConsumptionId" name="perHourGasConsumption" required>
-               
-            </div>
-
-            <div class="form-group col-md-3">
-              <label for="perHourCoatingSandQTY">Per Hour Coating Sand QTY</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="perHourCoatingSandQTYId" name="perHourCoatingSandQTY" required>
-               
-            </div>
-            
-        </div>
-        
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-            <button type="submit" class="btn btn-primary">Save </button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
 
 
 <!-- editCoatingMachineDetailModal -->
-<div class="modal fade" id="editCoatingMachineDetailModal" tabindex="-1" role="dialog" aria-labelledby="editCoatingMachineDetailModalLabel" aria-hidden="true">
-  <div class="modal-dialog modal-xl" style="width:1060px !important ;" role="document">
-    <div class="modal-content" >
-      <div class="modal-header">
+<div class="modal fade" id="editCoatingMachineDetailModal" tabindex="-1" role="dialog"
+    aria-labelledby="editCoatingMachineDetailModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl" style="width:1060px !important ;" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
 
-        <h5 class="modal-title" id="editCoatingMachineDetailModalLabel">
-            Edit Coating Machine Detail</h5>
+                <h5 class="modal-title" id="editCoatingMachineDetailModalLabel">
+                    Edit Coating Machine Detail</h5>
 
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
 
-      <!-- form  -->
-      <form method="post" id="editCoatingMachineDetailModalFormId" action="<?php echo base_url(); ?>updateCoatingMachineDetails">
-        <div class="modal-body">
+            <!-- form  -->
+            <form method="post" id="editCoatingMachineDetailModalFormId"
+                action="<?php echo base_url(); ?>updateCoatingMachineDetails">
+                <div class="modal-body">
 
-        <div class="form-row">
-            <div class="form-group col-md-3">
-                <label for="editDateId">Date</label>
-                <span class="badge mandatory">*</span>
-                <input type="date" class="form-control" id="editDateId" 
-                 name="date" value="" required>
-                 <input type="hidden" name="editCoatingMachineDetailId" id="editCoatingMachineDetailId">
-            </div>
-            <div class="form-group col-md-3">
-                <label for="editShiftId">Shift</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editShiftId" 
-                name="shift" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="editMachineOnTimeId">Machine On Time</label>
-                <span class="badge mandatory">*</span>
-                <input type="datetime-local" class="form-control" id="editMachineOnTimeId" 
-                name="machineOnTime" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="editMachineOffTimeId">Machine Off Time</label>
-                <span class="badge mandatory">*</span>
-                <input type="datetime-local" class="form-control" id="editMachineOffTimeId" 
-                name="machineOffTime" value="" required>
-             
-            </div>
+                    <div class="form-row">
+                        <div class="form-group col-md-3">
+                            <label for="editDateId">Date</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="date" class="form-control" id="editDateId" name="date" value="" required>
+                            <input type="hidden" name="editCoatingMachineDetailId" id="editCoatingMachineDetailId">
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="editShiftId">Shift</label>
+                            <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">
+                            <label for="editMachineOnTimeHrId">Machine On Time</label>
+                            <span class="badge mandatory">*</span>
+                            <select class="form-control" name="machineOnTime" id="editMachineOnTimeHrId">
+                                <option value="12:00"> 12:00</option>
+                                <option value="12:30"> 12:30</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 . ':30">' . $formattedHour . ':30</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">
+                            <label for="editMachineOffTimeHrId">Machine Off Time</label>
+                            <span class="badge mandatory">*</span>
+                            <select class="form-control" name="machineOffTime" id="editMachineOffTimeHrId">
+                                <option value="12:00"> 12:00</option>
+                                <option value="12:30"> 12:30</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 . ':30">' . $formattedHour . ':30</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">
+                        <div class="form-group col-md-3">
+                            <label for="editCustomerNameId">Customer Name</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editCustomerNameId" name="customerName" value=""
+                                required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="editTotalCoatingId">Total Coating</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editTotalCoatingId" name="totalCoating" value=""
+                                required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="editTotalCoatingSandId">Total Coating Sand (in Kg)</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editTotalCoatingSandId"
+                                name="totalCoatingSandInKg" value="" required>
+                        </div>
+                        <div class="form-group col-md-3">
+                            <label for="editTotalGasConsumptionId">Total Gas Consumption</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editTotalGasConsumptionId"
+                                name="totalGasConsumption" value="" required>
+                        </div>
+
+
+
+                    </div>
+
+                    <div class="form-row">
+
+                        <div class="form-group col-md-3">
+                            <label for="editMachineRunningInHrsId"> Machine Running In Hrs</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editMachineRunningInHrsId"
+                                name="machineRunningInHrs" required>
+
+                        </div>
+
+                        <div class="form-group col-md-3">
+                            <label for="editPerHourGasConsumptionId">Per Hour Gas Consumption </label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editPerHourGasConsumptionId"
+                                name="perHourGasConsumption" required>
+
+                        </div>
+
+                        <div class="form-group col-md-3">
+                            <label for="editPerHourCoatingSandQTYId">Per Hour Coating Sand QTY</label>
+                            <span class="badge mandatory">*</span>
+                            <input type="text" class="form-control" id="editPerHourCoatingSandQTYId"
+                                name="perHourCoatingSandQTY" required>
+
+                        </div>
+                    </div>
+
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+                    <button type="submit" class="btn btn-primary">Save </button>
+                </div>
+            </form>
         </div>
-
-        <div class="form-row">
-             <div class="form-group col-md-3">
-               <label for="editCustomerNameId">Customer Name</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editCustomerNameId" 
-                name="customerName" value="" required>         
-            </div>
-            <div class="form-group col-md-3">
-                <label for="editTotalCoatingId">Total Coating</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editTotalCoatingId" 
-                name="totalCoating" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-                <label for="editTotalCoatingSandId">Total Coating Sand (in Kg)</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editTotalCoatingSandId" 
-                name="totalCoatingSandInKg" value="" required>
-            </div>
-            <div class="form-group col-md-3">
-              <label for="editTotalGasConsumptionId">Total Gas Consumption</label>
-                <span class="badge mandatory">*</span>
-                 <input type="text" class="form-control" id="editTotalGasConsumptionId" 
-                 name="totalGasConsumption" value="" required>
-               
-            </div>
-
-            <div class="form-group col-md-3">
-              <label for="editMachineRunningInHrsId"> Machine Running In Hrs</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editMachineRunningInHrsId" name="machineRunningInHrs" required>
-                
-            </div>
-
-            <div class="form-group col-md-3">
-              <label for="editPerHourGasConsumptionId">Per Hour Gas Consumption </label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editPerHourGasConsumptionId" name="perHourGasConsumption" required>
-               
-            </div>
-
-            <div class="form-group col-md-3">
-              <label for="editPerHourCoatingSandQTYId">Per Hour Coating Sand QTY</label>
-                <span class="badge mandatory">*</span>
-                <input type="text" class="form-control" id="editPerHourCoatingSandQTYId" name="perHourCoatingSandQTY" required>
-               
-            </div>
-     
-        </div>
-        
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
-            <button type="submit" class="btn btn-primary">Save </button>
-        </div>
-      </form>
     </div>
-  </div>
 </div>
 
 
@@ -415,20 +522,20 @@
 
 
 <script>
-    $(document).ready(function() {
-        $.fn.dataTable.ext.type.order['date-eu-pre'] = function(date) {
+    $(document).ready(function () {
+        $.fn.dataTable.ext.type.order['date-eu-pre'] = function (date) {
             var dateSplit = date.split('-');
             return (dateSplit[2] + dateSplit[1] + dateSplit[0]) * 1;
         };
         // Initialize the DataTable
-        
+
         var table = $('#datatable').DataTable({
             dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
             buttons: [
                 'csv', 'excel', 'pdf' // Export buttons
             ],
             pageLength: 10, // Default rows per page
-            lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
+            lengthMenu: [[10, 20, 30, 50, -1], [10, 20, 30, 50, "All"]], // Rows per page options
             // responsive: true, // Responsive table
             order: [], // Default ordering (column index 0, descending)
             language: {
@@ -441,7 +548,7 @@
 
 
         // Handle form submission
-        $("#DateRangeFilter").submit(function(e) {
+        $("#DateRangeFilter").submit(function (e) {
             e.preventDefault();
             table.draw();
         });
@@ -449,17 +556,17 @@
 </script>
 
 <script>
-       function confirmDelete(event){
-        
-        let result= confirm(` Do you Confirm to Delete the Coating Machine Detail?`);
-        if(result){return result; }else{event.preventDefault();}
-     }
-  
+    function confirmDelete(event) {
+
+        let result = confirm(` Do you Confirm to Delete the Coating Machine Detail?`);
+        if (result) { return result; } else { event.preventDefault(); }
+    }
+
 
 </script>
 
 <script>
-$(document).ready(function() {
+    $(document).ready(function () {
         $('#exampleSelect2').select2();
     });
 </script>
@@ -468,128 +575,146 @@ $(document).ready(function() {
 <!-- appending values in the edit coating machine detail modal from the table -->
 
 <script>
-    $(document).ready(function() {
-    
-    $('#datatable tbody').on('click', '.edit-btn', function() {
-        
-        var row = $(this).closest('tr');
+    $(document).ready(function () {
 
-        // Get values from the row
-        
-        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 machineRunningInHrs=   row.find('td:eq(4)').text();
-        var totalCoating =         row.find('td:eq(5)').text();
-        var totalCoatingSandInKg = row.find('td:eq(6)').text();
-        var totalGasConsumption  = row.find('td:eq(7)').text();
-        var perHourGasConsumption =row.find('td:eq(8)').text();
-        var perHourCoatingSandQTY =row.find('td:eq(9)').text();
-        var customerName =         row.find('td:eq(10)').text();
+        $('#datatable tbody').on('click', '.edit-btn', function () {
+
+            var row = $(this).closest('tr');
+
+            // Get values from the row
+
+            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 machineRunningInHrs = row.find('td:eq(4)').text();
+            var totalCoating = row.find('td:eq(5)').text();
+            var totalCoatingSandInKg = row.find('td:eq(6)').text();
+            var totalGasConsumption = row.find('td:eq(7)').text();
+            var perHourGasConsumption = row.find('td:eq(8)').text();
+            var perHourCoatingSandQTY = row.find('td:eq(9)').text();
+            var customerName = row.find('td:eq(10)').text();
 
 
 
-        // Fill the modal fields with the values
+            // Fill the modal fields with the values
+
+            $('#editCoatingMachineDetailId').val(row.data('id'));
+            $('#editCustomerNameId').val(customerName);
+            $('#editDateId').val(date);
+            $('#editShiftId').val(shift);
+            $('#editMachineOnTimeId').val(machineOnTime);
+            $('#editMachineOffTimeId').val(machineOffTime);
+            $('#editTotalCoatingId').val(totalCoating);
+            $('#editTotalCoatingSandId').val(totalCoatingSandInKg);
+            $('#editTotalGasConsumptionId').val(totalGasConsumption);
+            $('#editMachineRunningInHrsId').val(machineRunningInHrs);
+            $('#editPerHourGasConsumptionId').val(perHourGasConsumption);
+            $('#editPerHourCoatingSandQTYId').val(perHourCoatingSandQTY);
+
+            // Show the modal
+            $('#editCoatingMachineDetailModal').modal('show');
+        });
 
-        $('#editCoatingMachineDetailId').val(row.data('id'));
-        $('#editCustomerNameId').val(customerName);
-        $('#editDateId').val(date); 
-        $('#editShiftId').val(shift);
-        $('#editMachineOnTimeId').val(machineOnTime);
-        $('#editMachineOffTimeId').val(machineOffTime);
-        $('#editTotalCoatingId').val(totalCoating);
-        $('#editTotalCoatingSandId').val(totalCoatingSandInKg);
-        $('#editTotalGasConsumptionId').val(totalGasConsumption);
-        $('#editMachineRunningInHrsId').val(machineRunningInHrs);
-        $('#editPerHourGasConsumptionId').val(perHourGasConsumption);
-        $('#editPerHourCoatingSandQTYId').val(perHourCoatingSandQTY);
 
-        // Show the modal
-        $('#editCoatingMachineDetailModal').modal('show');
     });
 
-   
-});
-
 </script>
 
 <!-- calculations for some fields needed in onChange while adding coating machine details  -->
 
 <script>
 
-    $(document).ready(function(){
-
-        
-        $('#machineOnTimeId').change(function(){
-          let machineOnTime = $(this).val();
-          let machineOffTime =$('#machineOffTimeId').val();
+    $(document).ready(function () {
 
 
-          if( machineOnTime && machineOffTime){
-         
-            let machineRunningInHrs= calculateMachineRunInHrs(machineOnTime , machineOffTime );
-          
-            if(!machineRunningInHrs){
-                $(this).val('');
+        $('#machineOnTimeHrId , #machineOnTimeAmOrPmId').change(function () {
+
+            let machineOnDate = $('#dateId').val();
+
+            if (machineOnDate == '') {
+                alert('Please Select Date before entering Machine On and Off Time ..!!');
+                $('#machineOnTimeHrId').val('');
+                return false;
+            }
+
+            let machineOnTimeHr = $('#machineOnTimeHrId').val();
+            let machineOnTimeAmOrPm = $('#machineOnTimeAmOrPmId').val();
+            let machineOffTimeHr = $('#machineOffTimeHrId').val(); 
+            let machineOffTimeAmOrPm = $('#machineOffTimeAmOrPmId').val();
+
+
+            let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
+
+            if (!machineRunningInHrs) {
+                $('machineOnTimeHrId').val('');
                 return
             }
             $('#machineRunningInHrsId').val(machineRunningInHrs);
             $('#totalCoatingSandId').trigger('change');
             $('#totalGasConsumptionId').trigger('change');
-           
-          }
+
+
 
 
         });
 
-        $('#machineOffTimeId').change(function(){
+        $('#machineOffTimeHrId , #machineOffTimeAmOrPmId').change(function () {
 
-            let machineOffTime = $(this).val();
-            let machineOnTime =$('#machineOnTimeId').val();
+            let machineOnDate = $('#dateId').val();
 
-
-            if( machineOnTime && machineOffTime ){
-         
-                let machineRunningInHrs= calculateMachineRunInHrs(machineOnTime , machineOffTime );
-                if(!machineRunningInHrs){
-                 
-                    $(this).val('');
-                    return
-                }
-                $('#machineRunningInHrsId').val(machineRunningInHrs);
-                $('#totalCoatingSandId').trigger('change');
-                $('#totalGasConsumptionId').trigger('change');
-                
+            if (machineOnDate == '') {
+                alert('Please Select Date before entering Machine On and Off Time ..!!');
+                $('#machineOffTimeHrId').val('');
+                return false;
             }
 
+            let machineOffTimeHr = $('#machineOffTimeHrId').val();
+            let machineOffTimeAmOrPm = $('#machineOffTimeAmOrPmId').val();
+            let machineOnTimeHr = $('#machineOnTimeHrId').val();
+            let machineOnTimeAmOrPm = $('#machineOnTimeAmOrPmId').val();
+
+
+            let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
+
+            if (!machineRunningInHrs) {
+
+                $('#machineOffTimeHrId').val('');
+                return
+            }
+            $('#machineRunningInHrsId').val(machineRunningInHrs);
+            $('#totalCoatingSandId').trigger('change');
+            $('#totalGasConsumptionId').trigger('change');
+
+
+
         })
-     
-        $('#totalCoatingSandId').change(function(){
 
-            let totalCoatingSandValue= $(this).val();
-            let machineRunningInHrsValue= $('#machineRunningInHrsId').val();
+        $('#totalCoatingSandId').change(function () {
 
-            if(totalCoatingSandValue && machineRunningInHrsValue){
-                let perHourCoatingSandQTYValue= (totalCoatingSandValue / machineRunningInHrsValue).toFixed(2);
+            let totalCoatingSandValue = $(this).val();
+            let machineRunningInHrsValue = $('#machineRunningInHrsId').val();
+
+            if (totalCoatingSandValue && machineRunningInHrsValue) {
+                let perHourCoatingSandQTYValue = (totalCoatingSandValue / machineRunningInHrsValue).toFixed(2);
                 $('#perHourCoatingSandQTYId').val(perHourCoatingSandQTYValue);
-            } 
-           
+            }
+
 
         })
 
-        $('#totalGasConsumptionId').change(function(){
+        $('#totalGasConsumptionId').change(function () {
 
-            let totalGasConsumptionValue=$(this).val();
-            let machineRunningInHrsValue= $('#machineRunningInHrsId').val();
-            if(totalGasConsumptionValue && machineRunningInHrsValue){
-                let perHourGasConsumptionValue= (totalGasConsumptionValue / machineRunningInHrsValue).toFixed(2);
+            let totalGasConsumptionValue = $(this).val();
+            let machineRunningInHrsValue = $('#machineRunningInHrsId').val();
+            if (totalGasConsumptionValue && machineRunningInHrsValue) {
+                let perHourGasConsumptionValue = (totalGasConsumptionValue / machineRunningInHrsValue).toFixed(2);
                 $('#perHourGasConsumptionId').val(perHourGasConsumptionValue);
 
             }
 
         })
-            
+
     })
 
 </script>
@@ -597,78 +722,95 @@ $(document).ready(function() {
 <!-- calculations for some fields needed in onChange while editing coating machine details  -->
 
 <script>
-    $(document).ready(function(){
-       
-
-        $('#editMachineOnTimeId').change(function(){
-          let machineOnTime = $(this).val();
-          let machineOffTime =$('#editMachineOffTimeId').val();
+    $(document).ready(function () {
 
 
-          if( machineOnTime && machineOffTime){
-         
-            let machineRunningInHrs= calculateMachineRunInHrs(machineOnTime , machineOffTime );
-     
-            if(!machineRunningInHrs){
-                $(this).val('');
+        $('#editMachineOnTimeHrId , #editMachineOnTimeAmOrPm').change(function () {
+
+            let machineOnDate = $('#editDateId').val();
+
+            if (machineOnDate == '') {
+                alert('Please Select Date before entering Machine On and Off Time ..!!');
+                $('#editMachineOnTimeHrId').val('');
+                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 machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
+
+            if (!machineRunningInHrs) {
+                $('#editMachineOnTimeHrId').val('');
                 return
             }
             $('#editMachineRunningInHrsId').val(machineRunningInHrs);
             $('#editTotalCoatingSandId').trigger('change');
             $('#editTotalGasConsumptionId').trigger('change');
-           
-          }
+
+
 
 
         });
 
-        $('#editMachineOffTimeId').change(function(){
+        $('#editMachineOffTimeHrId , #editMachineOffTimeAmOrPm ').change(function () {
 
-            let machineOffTime = $(this).val();
-            let machineOnTime =$('#editMachineOnTimeId').val();
+            let machineOnDate = $('#editDateId').val();
 
-
-            if( machineOnTime && machineOffTime ){
-
-                let machineRunningInHrs= calculateMachineRunInHrs(machineOnTime , machineOffTime );
-                if(!machineRunningInHrs){
-                
-                    $(this).val('');
-                    return
-                }
-                $('#editMachineRunningInHrsId').val(machineRunningInHrs);
-                $('#editTotalCoatingSandId').trigger('change');
-                $('#editTotalGasConsumptionId').trigger('change');
-                
+            if (machineOnDate == '') {
+                alert('Please Select Date before entering Machine On and Off Time ..!!');
+                $('#editMachineOnTimeHrId').val('');
+                return false;
             }
 
-            })
 
-        $('#editTotalCoatingSandId').change(function(){
+            let machineOnTimeHr = $('#editMachineOnTimeHrId').val();
+            let machineOnTimeAmOrPm = $('#editMachineOnTimeAmOrPm').val();
+            let machineOffTimeHr = $('#editMachineOffTimeHrId').val();
+            let machineOffTimeAmOrPm = $('#editMachineOffTimeAmOrPm').val();
 
-            let totalCoatingSandValue= $(this).val();
-            let machineRunningInHrsValue= $('#editMachineRunningInHrsId').val();
+            let machineRunningInHrs = calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm);
 
-            if(totalCoatingSandValue && machineRunningInHrsValue){
-                let perHourCoatingSandQTYValue= (totalCoatingSandValue / machineRunningInHrsValue).toFixed(2);
+            if (!machineRunningInHrs) {
+
+                $('#editMachineOffTimeHrId').val('');
+                return
+            }
+            $('#editMachineRunningInHrsId').val(machineRunningInHrs);
+            $('#editTotalCoatingSandId').trigger('change');
+            $('#editTotalGasConsumptionId').trigger('change');
+
+
+
+        })
+
+        $('#editTotalCoatingSandId').change(function () {
+
+            let totalCoatingSandValue = $(this).val();
+            let machineRunningInHrsValue = $('#editMachineRunningInHrsId').val();
+
+            if (totalCoatingSandValue && machineRunningInHrsValue) {
+                let perHourCoatingSandQTYValue = (totalCoatingSandValue / machineRunningInHrsValue).toFixed(2);
                 $('#editPerHourCoatingSandQTYId').val(perHourCoatingSandQTYValue);
-            } 
+            }
 
 
-            })
+        })
 
-        $('#editTotalGasConsumptionId').change(function(){
+        $('#editTotalGasConsumptionId').change(function () {
 
-            let totalGasConsumptionValue=$(this).val();
-            let machineRunningInHrsValue= $('#editMachineRunningInHrsId').val();
-            if(totalGasConsumptionValue && machineRunningInHrsValue){
-                let perHourGasConsumptionValue= (totalGasConsumptionValue / machineRunningInHrsValue).toFixed(2);
+            let totalGasConsumptionValue = $(this).val();
+            let machineRunningInHrsValue = $('#editMachineRunningInHrsId').val();
+            if (totalGasConsumptionValue && machineRunningInHrsValue) {
+                let perHourGasConsumptionValue = (totalGasConsumptionValue / machineRunningInHrsValue).toFixed(2);
                 $('#editPerHourGasConsumptionId').val(perHourGasConsumptionValue);
 
             }
 
-            })
-       
+        })
+
     })
 </script>
 
@@ -676,30 +818,104 @@ $(document).ready(function() {
 
 
 <script>
-  function calculateMachineRunInHrs(machineOnTime , machineOffTime ){
-   
-    let startTime = new Date(machineOnTime);
-    let endTime = new Date(machineOffTime);
+    function calculateMachineRunInHrs(machineOnDate, machineOnTimeHr, machineOnTimeAmOrPm, machineOffTimeHr, machineOffTimeAmOrPm) {
 
-    let startDate = startTime.toISOString().split('T')[0]; 
-    let endDate = endTime.toISOString().split('T')[0];
+        console.log(machineOnTimeHr);
+        console.log(machineOnTimeAmOrPm);
+        console.log(machineOffTimeHr);
+        console.log(machineOffTimeAmOrPm);
 
-    if (startDate === endDate && startTime.getTime() >= endTime.getTime()) {
-      alert(" Machine On time cannot be greater than or equal to Machine Off time on the same day." );
-      return false; 
+        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;
+
+        if (machineOnTimeAmOrPm == 'PM' && machineOffTimeAmOrPm == 'AM') {
+            machineOnDateAndTime = machineOnDate + "T" + machineOnTime24;
+            machineOffDateAndTime = getNextDay(machineOnDate) + "T" + machineOffTime24;
+        } else {
+            machineOnDateAndTime = machineOnDate + "T" + machineOnTime24;
+            machineOffDateAndTime = machineOnDate + "T" + machineOffTime24;
+
+        }
+
+        console.log(machineOnDateAndTime);
+        console.log(machineOffDateAndTime);
+
+        let startTime = new Date(machineOnDateAndTime);
+        let endTime = new Date(machineOffDateAndTime);
+
+        console.log(startTime); //Thu Oct 17 2024 01:00:00 GMT+0530 (India Standard Time)
+
+        console.log(endTime); //Thu Oct 17 2024 05:30:00 GMT+0530 (India Standard Time)
+
+        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; 
+
+       
+        let timeDifferenceInMinutes = Math.floor(timeDifferenceInMs / (1000 * 60)); 
+        let hours = Math.floor(timeDifferenceInMinutes / 60);
+        let minutes = timeDifferenceInMinutes % 60; 
+
+        let timeDifferenceFormatted = `${hours}.${minutes >= 30 ? 5 : 0}`;
+  
+        return Math.abs(timeDifferenceFormatted).toFixed(1);
     }
-
-    if (startTime > endTime) {
-     alert( "Start date cannot be greater than end date");
-      return false
-    }
-
-    let timeDifferenceInMs = endTime - startTime;
-
-    // Convert the time difference from milliseconds to hours
-    let timeDifferenceInHours = timeDifferenceInMs / (1000 * 60 * 60);
-
-    // Display the result in hours
-    return Math.abs(timeDifferenceInHours).toFixed(2) ;
-  }
 </script>
+
+<script>
+
+    function convertTo24HrFormat(timeStr) {
+        const [time, modifier] = timeStr.split(' ');
+        let [hours, minutes] = time.split(':');
+        if (hours === '12') {
+            hours = '00';
+        }
+        if (modifier === 'PM') {
+            hours = parseInt(hours, 10) + 12;
+        }
+        return `${hours}:${minutes}`;
+    }
+
+    function getNextDay(givenDate) {
+        // Given date in 'YYYY-MM-DD' format
+        let date = new Date(givenDate);
+
+        // Increment the date by 1 day
+        date.setDate(date.getDate() + 1);
+
+        // Output the updated date
+        return date.toISOString().split('T')[0];
+
+    }
+
+</script>
\ No newline at end of file
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index a5d3c749..e3b8003e 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -70,9 +70,6 @@
 
     <link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
   
-    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/timepicker/1.3.5/jquery.timepicker.min.css">
-    <script src="//cdnjs.cloudflare.com/ajax/libs/timepicker/1.3.5/jquery.timepicker.min.js"></script>
-
     <style>
         .mce-edit-area.mce-container.mce-panel.mce-first.mce-last.mce-stack-layout-item {
             border-width: 0px 0px 0px !important;