Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

app/Config/Routes.php

@@ -332,6 +332,7 @@ $routes->post('updateGasShortage','Inwardgateregister::updateGasShortage');
 $routes->get('gasCylinderEntered','Inwardgateregister::gasCylinderEntered');
 $routes->get('gasCylinderPending','Inwardgateregister::gasCylinderPending');
 $routes->get('gasCylinderReturned','Inwardgateregister::gasCylinderReturned');
+$routes->post('gasCylindersByIgr','Inwardgateregister::gasCylindersByIgr');
 $routes->post('getGasShortageDetail',"Inwardgateregister::getGasShortageDetail");
 
 

app/Controllers/Configurationctrl.php

@@ -107,6 +107,7 @@ class Configurationctrl extends BaseController
 		$data['master'] = $this->configmodel->GetConfigCenterMaster($ConfigID);
 
 		$data['child'] = $this->configmodel->GetConfigCenterDetails($ConfigID,$isActiveFilter);
+		
 		$data['ConfigID'] = $ConfigID;
 		
 		$this->global['pageTitle'] = 'Edit Config';
@@ -252,8 +253,10 @@ class Configurationctrl extends BaseController
 		$configId = $data['ConfigID'];
 		$configValue = $data['ConfigValue'];
 		$key         = $data['key']??'';
+		$userId		 = $data['userId'];
 
-		$result = $this->configmodel->saveConfigValue($key,$configId, $configValue);
+
+		$result = $this->configmodel->saveConfigValue($key,$configId, $configValue,$userId);
 
 		if($result){
 			return $this->response->setJSON(['status'=>true]);

app/Controllers/Inwardgateregister.php

@@ -1696,6 +1696,26 @@ function updateIGRWeight(){
           ]);
       }
   }
+
+  public function gasCylindersByIgr(){
+
+    $IGRNO = $this->request->getPost('IGRNO');
+
+    $gasMaterialCodes = $this->rawMaterialDetails_model->getAllGasMaterialCode();
+
+    $gasMaterialCodes = array_column($gasMaterialCodes,'MaterialCode');
+    
+    $cylinderDetails = $this->inwardgateregister_model->gasCylindersByIgr($IGRNO , $gasMaterialCodes);
+
+    $response = [
+        'status' => 'success',
+        'message' => 'Gas cylinders retrieved successfully.',
+        'data' => $cylinderDetails
+    ];
+
+    return $this->response->setJSON($response);
+
+  }
   
   /*
   *********************************************************  sec_gas_shortage_ends  **************************************************************

app/Controllers/Rawmaterialdetails.php

@@ -289,7 +289,7 @@ class Rawmaterialdetails extends BaseController
         $data['assetcode'] = $this->rawmaterialdetails_model->getAssetcode();
         $data['avg_price'] = $this->rawmaterialdetails_model->getMaterialAvg($RawMaterialID);
         $data['materialRateHistory'] = $this->rawmaterialdetails_model->getMaterialRateHistory($RawMaterialID);
-        $data['materialListPage'] = $_GET['page'];
+        $data['materialListPage'] = $_GET['page']??1;
         
         //print_r($data['avg_price']);die();
         $this->global['pageTitle'] = 'Edit Material Master';
@@ -318,7 +318,7 @@ class Rawmaterialdetails extends BaseController
             $stock = $this->request->getPost('openstock');
             $reorder = $this->request->getPost('reorder');
             $stockdate = $this->request->getPost('Date');
-            $materialListPage = $this->request->getPost('materialListPage');
+            $materialListPage = $this->request->getPost('materialListPage') ?? 1;
             $stockdate = (empty($stockdate)) ? NULL : get_date_time_dynamical_format('d-m-Y','Y-m-d',"$stockdate");
             
             $chked =  $this->request->getPost('isactive');

app/Controllers/StockController.php

@@ -1344,21 +1344,6 @@ class StockController extends BaseController
                                 'machine_category' => "diesel",
                                 'machine_id' => $customisedMachineCode
                             ];
-                        
-
-                            //checking filtered material code  present in table , if not create dummy  one for whole month           
-                                $findMachineCode = $this->factoryVehicleDieselDetails_model
-                                ->where('date >=', $startDate)
-                                ->where('date <=', $endDate)
-                                ->where('machine_id',$customisedMachineCode)
-                                ->findAll();
-
-                            //check any material code is not present in stock table but applied in filter
-                            if(empty($findMachineCode)){
-        
-                                //create dummy entry for this
-                                $this->createDummyEntryForDieselMachine($customisedMachineCode,$startDate,$endDate);
-                            }
                             
                         }
 
@@ -1396,6 +1381,24 @@ class StockController extends BaseController
 
                 $machineCodeList = array_column($existingCustomMachineCodes, 'id');
 
+                foreach($machineCodeList as $index => $machineCode){
+                    
+                    //checking filtered  present in table , if not create dummy  one for whole month           
+                    $findMachineCode = $this->factoryVehicleDieselDetails_model
+                    ->where('date >=', $startDate)
+                    ->where('date <=', $endDate)
+                    ->where('machine_id',$machineCode)
+                    ->findAll();
+            
+    
+                    //check any material code is not present in stock table but applied in filter
+                    if(empty($findMachineCode)){
+                        //create dummy entry for this
+                        $this->createDummyEntryForDieselMachine($machineCode,$startDate,$endDate);
+                    }
+                    
+                }
+
                 $dieselMachines = $existingCustomMachineCodes;
 
                 $data['activeDieselMachines'] = $this->factoryMachine_model->getAllActiveDieselMachines();
@@ -1761,23 +1764,6 @@ class StockController extends BaseController
                                 'machine_category' => "electric",
                                 'machine_id' => $customisedMachineCode
                             ];
-                        
-
-                            //checking filtered material code  present in table , if not create dummy  one for whole month           
-                            $findMachineCode = $this->powerConsumptionDetails_model
-                            ->where('date >=', $startDate)
-                            ->where('date <=', $endDate)
-                            ->where('machine_id',$customisedMachineCode)
-                            ->findAll();
-                    
-
-                            //check any material code is not present in stock table but applied in filter
-                            if(empty($findMachineCode)){
-
-                            
-                                //create dummy entry for this
-                                $this->createDummyEntryForElectricMachine($customisedMachineCode,$startDate,$endDate);
-                            }
                             
                         }
 
@@ -1811,9 +1797,28 @@ class StockController extends BaseController
 
 
 
+
                 //this existingCustomMachineCodes gets its machine after visiting factory machine master table
                 $machineCodeList = array_column($existingCustomMachineCodes, 'id');
 
+                foreach($machineCodeList as $index => $machineCode){
+
+                    //checking filtered material code  present in table , if not create dummy  one for whole month           
+                    $findMachineCode = $this->powerConsumptionDetails_model
+                    ->where('date >=', $startDate)
+                    ->where('date <=', $endDate)
+                    ->where('machine_id',$machineCode)
+                    ->findAll();
+            
+
+                    //check any material code is not present in stock table but applied in filter
+                    if(empty($findMachineCode)){
+                        //create dummy entry for this
+                        $this->createDummyEntryForElectricMachine($machineCode,$startDate,$endDate);
+                    }
+                    
+                }
+
                 $electricMachines = $existingCustomMachineCodes;
 
                 $data['activeElectricMachines'] = $this->factoryMachine_model->getAllActiveElectricMachines();
@@ -2284,19 +2289,6 @@ class StockController extends BaseController
                                 'stock_category' => "resin",
                                 'materialCode' => $customisedMaterialCode
                             ];
-
-                            //checking filtered material code  present in table , if not create dummy  one for whole month
-                            $findMaterialCode = $this->resinStockDetails_model
-                            ->where('date >=', $startDate)
-                            ->where('date <=', $endDate)
-                            ->where('materialCode',$customisedMaterialCode)
-                            ->findAll();
-
-                            //check any material code is not present in stock table but applied in filter
-                            if(empty($findMaterialCode)){
-                                //create dummy entry for that
-                                $this->createDummyEntryForResin($customisedMaterialCode,$startDate,$endDate);
-                            }
                             
                         }
 
@@ -2329,6 +2321,25 @@ class StockController extends BaseController
 
                 $materialCodeList = array_column($existingCustomMaterialCodes, 'MaterialCode');
 
+                foreach($materialCodeList as $index => $materialCode){
+                
+
+                    //checking filtered material code  present in table , if not create dummy  one for whole month           
+                    $findMachineCode = $this->resinStockDetails_model
+                    ->where('date >=', $startDate)
+                    ->where('date <=', $endDate)
+                    ->where('materialCode',$materialCode)
+                    ->findAll();
+            
+
+                    //check any material code is not present in stock table but applied in filter
+                    if(empty($findMachineCode)){
+                        //create dummy entry for this
+                        $this->createDummyEntryForResin($materialCode,$startDate,$endDate);
+                    }
+                    
+                }
+
                 $resinMaterials = $existingCustomMaterialCodes ;
 
                 $data['activeResinMaterials'] = $this->rawmaterialdetails_model->getAllResinMaterialCode();
@@ -2663,19 +2674,6 @@ class StockController extends BaseController
                             'stock_category' => "packing_material",
                             'materialCode' => $customisedMaterialCode
                         ];
-
-                        //checking filtered material code  present in table , if not create dummy  one for whole month
-                        $findMaterialCode = $this->bagStockDetails_model
-                        ->where('date >=', $startDate)
-                        ->where('date <=', $endDate)
-                        ->where('materialCode',$customisedMaterialCode)
-                        ->findAll();
-
-                        //check any material code is not present in stock table but applied in filter
-                        if(empty($findMaterialCode)){
-                            //create dummy entry for that
-                            $this->createDummyEntryForBag($customisedMaterialCode,$startDate,$endDate);
-                        }
                         
                     }
 
@@ -2701,7 +2699,7 @@ class StockController extends BaseController
                 $existingCustomMaterialCodes = $this->rawmaterialdetails_model
                                                     ->getAllBagMaterialCode();
             }else{
-            //if filter present,get that material codes
+                //if filter present,get that material codes
                 $existingCustomMaterialCodes = $this->rawmaterialdetails_model
                                                     ->getSelectedBagMaterialCode(array_column($existingCustomMaterialCodes, 'materialCode'));
             }
@@ -2709,6 +2707,25 @@ class StockController extends BaseController
 
             $materialCodeList = array_column($existingCustomMaterialCodes, 'MaterialCode');
 
+            foreach($materialCodeList as $index => $materialCode){
+            
+
+                //checking filtered material code  present in table , if not create dummy  one for whole month           
+                $findMachineCode = $this->bagStockDetails_model
+                ->where('date >=', $startDate)
+                ->where('date <=', $endDate)
+                ->where('materialCode',$materialCode)
+                ->findAll();
+        
+
+                //check any material code is not present in stock table but applied in filter
+                if(empty($findMachineCode)){
+                    //create dummy entry for this
+                    $this->createDummyEntryForBag($materialCode,$startDate,$endDate);
+                }
+                
+            }
+
             $bagMaterials = $existingCustomMaterialCodes ;
 
             $data['activeBagMaterials'] = $this->rawmaterialdetails_model->getAllBagMaterialCode();

app/Models/Config_model.php

@@ -96,10 +96,25 @@ class Config_model extends Model
     {
         //echo $ConfigID ;die();
         $builder = $this->db->table('t_configmaster COM')
-            ->select('*')
+        ->select('COM.*,
-            ->join('t_configdetails con', 'con.Config_ID = COM.Config_ID', 'left')
+                 con.*,
-            ->where('COM.Config_ID', $ConfigID)
+                 creator_emp.FirstName AS created_by,
-            ->where('con.isActive', $isActiveFilter);
+                 updater_emp.FirstName AS updated_by
+                 ')
+        ->join('t_configdetails con', 'con.Config_ID = COM.Config_ID', 'left')
+        
+        // Join for Created By
+        ->join('tbl_users creator', 'creator.userId = con.created_by', 'left')
+        ->join('t_employee_details creator_emp', 'creator_emp.EmpID = creator.EmpID', 'left')
+        // Join for Updated By
+        ->join('tbl_users updater', 'updater.userId = con.updated_by', 'left')
+        ->join('t_employee_details updater_emp', 'updater_emp.EmpID = updater.EmpID', 'left')
+
+        ->where('COM.Config_ID', $ConfigID)
+        ->where('con.isActive', $isActiveFilter)
+        ->orderBy('con.Key', 'desc');
+    
+
         $query = $builder->get();
 
         return $query->getResult();
@@ -288,7 +303,7 @@ return $result;
     }
 
 
-    public function saveConfigValue($key,$configId, $configValue){
+    public function saveConfigValue($key,$configId, $configValue,$userId){
         
 
 
@@ -297,7 +312,8 @@ return $result;
             ->where('Config_ID', $configId)
             ->where('key',$key)
             ->update([
-                'ConfigValue'=> $configValue
+                'ConfigValue'=> $configValue,
+                'updated_by'     => $userId
             ]);
             $res = $this->db->affectedRows();
             return $res;
@@ -308,6 +324,7 @@ return $result;
                     [
                     'ConfigValue'=>$configValue,
                     'Config_ID'=>$configId,
+                    'created_by'=> $userId,
                     'isActive'=> 1]);
                 $res = $this->db->affectedRows();
                 return $res;

app/Models/Inwardgateregister_model.php

@@ -1515,4 +1515,41 @@ class Inwardgateregister_model extends Model
 
 		return $result;
 	}
+
+	public function gasCylindersByIgr($IGRNO, $gasMaterialCodes) {
+
+		$builder = $this->db->table('t_igr_master as t_igrm')
+			->select("
+				t_igrm.IGRNO,
+				tgsd.fullCylinderDate,
+				tgsd.cylinderNo,
+				tgsd.grossWeight,
+				tgsd.emptyCylinderDate,
+				tgsd.tareWeight,
+				tgsd.netWeight,
+				tgsd.actualWeight,
+				tgsd.shortage,
+				tgsd.invoiceNo,
+				t_igrm.DeliveryChellanDate,
+				t_igrm.DriverName,
+				t_igrm.VehicleNo
+				
+			")
+
+			->join('t_igr_details tigrd', 'tigrd.IGRNO = t_igrm.IGRNO')
+			->join('t_purchaseorder_master tpom', 'tpom.PONO = t_igrm.PONO', 'left')
+			->join('t_supplierdetailsn tsd', 'tsd.SupplierID = tpom.SupplierID')
+			->join('t_gasshortagedetails tgsd', 'tgsd.IGRNO = t_igrm.IGRNO', 'left')
+
+			->whereIn('tigrd.MaterialCode', $gasMaterialCodes)
+			->where("DATE(tigrd.CreatedDate) >= '2025-04-01'")
+			->where('tgsd.gas_cylinder_status', 'gas_returned')
+			->where('t_igrm.IGRNO', $IGRNO); // Direct where clause on IGRNO in master table
+	
+		$result = $builder->get()->getResultArray();
+
+		return $result;
+	}
+
+
 }

app/Views/attendance.php

@@ -256,16 +256,19 @@ $currentday = date('d');
 
                                     <div class="col-9 text-right d-flex" style="justify-content: end;" id="savebutton">
                            
-                                        <input type="text" id="searchInput" placeholder="Search..." style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc;border-radius: 5px;margin-right:15px;">
+                                        <input type="text" id="searchInput" placeholder="Search..." 
+                                        style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc;
+                                        cursor:pointer;
+                                        border-radius: 5px;margin-right:15px;">
 
                                      
                                     
                                     
-                                        <i id="exportButton" class="fas fa-download download-icon" style="margin-right: 15px;margin-top: 8px;font-size:25px;" title="Export Excel"></i>
+                                        <i id="exportButton" class="fas fa-download download-icon" style="margin-right: 15px;margin-top: 8px;font-size:25px; cursor:pointer;" title="Export Excel"></i>
 
-                                        <i class="fe-maximize noti-icon" onclick="toggleDivFullscreen()" style="margin-right: 15px;margin-top: 5px;font-size: 28px;" title="Full screen view"></i>
+                                        <i class="fe-maximize noti-icon" onclick="toggleDivFullscreen()" style="margin-right: 15px;margin-top: 5px;font-size: 28px; cursor:pointer;" title="Full screen view"></i>
 
-                                        <i class="fas fa-save"  id="c" style="margin-right: 15px;margin-top: 5px;font-size:28px;" title="Save"></i>
+                                        <i class="fas fa-save"  id="c" style="margin-right: 15px;margin-top: 5px;font-size:28px; cursor:pointer;" title="Save"></i>
 
                                     </div>
 
@@ -633,7 +636,6 @@ $currentday = date('d');
     });
 </script>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
 <script type="text/javascript">
 
 $(document).ready(function () {
@@ -670,25 +672,12 @@ $(document).ready(function () {
         function exportTableToExcel(tableId, filename = 'attendance.xlsx') {
             var table = document.getElementById(tableId);
             var rows = table.rows;
-            var data = [];
 
-            for (var i = 0; i < rows.length; i++) {
+            
-                var row = rows[i];
+            let ws = XLSX.utils.table_to_sheet(table); // Convert modified table to sheet
-                var cols = row.querySelectorAll('td, th');
+            let wb = XLSX.utils.book_new(); // Create a new workbook
-                var rowData = [];
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
-                
+            XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
-                for (var j = 0; j < cols.length; j++) {
-                    rowData.push(cols[j].innerText);
-                }
-                
-                data.push(rowData);
-            }
-
-            var wb = XLSX.utils.book_new();
-            var ws = XLSX.utils.aoa_to_sheet(data);
-
-            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
-            XLSX.writeFile(wb, filename);
         }
 
         // Add click event listener to the export button

app/Views/configlisting.php

@@ -146,9 +146,9 @@
                 </thead>
                 <tbody>
                   <?php
-                  if (!empty($userRecords)) {
+                      if (!empty($userRecords)) {
-                    foreach ($userRecords as $record) {
+                        foreach ($userRecords as $record) {
-                      ?>
+                  ?>
                       <tr 
                       class="<?php if ($record->isActive == 0) {
                         echo "deactivatedRow";

app/Views/editconfig.php

@@ -24,6 +24,8 @@ if (!empty($master)) {
 	}
 </style>
 
+
+
 <div class="content-page">
     <div class="content">
         <!-- Start Content-->
@@ -119,6 +121,8 @@ if (!empty($master)) {
                         <div>
                     </div>
 
+          
+
 
                             <div class="form-row" style="margin-top:10px">
                                 <div class="col-md-12">
@@ -129,6 +133,8 @@ if (!empty($master)) {
                                             <tr>
                                                 <th>S.NO</th>
                                                 <th>Configuration Value</th>
+                                                <th>Created By</th>
+                                                <th>Last Updated By</th>
                                                 <th>Action</th>
                                             </tr>
                                         </thead>
@@ -148,21 +154,31 @@ if (!empty($master)) {
                                                     <tr>
 
                                                         <td>
-                                                            <?php echo $index; ?></td>
+                                                            <?php echo $index; ?>
-                                                                <?php if($con->Config_ID === 'C023'){ ?>
+                                                        </td>
-                                                                    <td>
+                                                    <?php if($con->Config_ID === 'C023'){ ?>
-                                                                        <a 
+                                                        <td>
-                                                                            class="config-category" 
+                                                            <a 
-                                                                            data-value="<?php echo $con->ConfigValue;?>" 
+                                                                class="config-category" 
-                                                                            data-key="<?php echo $con->Key; ?>"
+                                                                data-value="<?php echo $con->ConfigValue;?>" 
-                                                                            style="cursor: pointer;">
+                                                                data-key="<?php echo $con->Key; ?>"
+                                                                style="cursor: pointer;">
+
+                                                                <?php echo $con->ConfigValue ?>
+                                                            </a>
+                                                        </td>
+                                                    <?php }else{ ?>
+                                                        <td><?php echo $con->ConfigValue; ?></td>
+                                                    <?php } ?>
+
+                                                        <td>
+                                                             <?php echo $con->created_by ?>
+                                                        </td>
+
+                                                        <td>
+                                                             <?php echo $con->updated_by ?>
+                                                        </td>
 
-                                                                            <?php echo $con->ConfigValue ?>
-                                                                        </a>
-                                                                    </td>
-                                                                <?php }else{ ?>
-                                                                    <td><?php echo $con->ConfigValue; ?></td>
-                                                                <?php } ?>
                                                         <td>
                                                             <?php if ($con->isActive == 0) { ?>
 
@@ -453,7 +469,9 @@ if (!empty($master)) {
                         url: "<?php echo base_url('configurationctrl/saveConfigValue'); ?>",
                         data: {
                             ConfigID: $('#ConfigId').val(),
-                            ConfigValue: $("#AddConfigValue").val()
+                            ConfigValue: $("#AddConfigValue").val(),
+                            userId     : "<?= $_SESSION['userId']?>",
+
                         },
                         method: 'POST',
                         success: function(response) {
@@ -513,7 +531,8 @@ if (!empty($master)) {
                         data: {
                             key :     $('#key').val(),
                             ConfigID: $('#Config_ID').val(),
-                            ConfigValue: $("#configValue").val()
+                            ConfigValue: $("#configValue").val(),
+                            userId     : "<?= $_SESSION['userId']?>"
                         },
                         method: 'POST',
                         success: function(response) {
@@ -594,7 +613,7 @@ if (!empty($master)) {
                                                 <td style="text-align:left; overflow: hidden;text-overflow: ellipsis; word-wrap: break-word !important; 
                                                                 white-space: normal !important; width: 100px !important; ">${item.MaterialName}</td>
                                                 <td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.MaterialType}</td>
-                                                <td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.IsActive?"Active":"InActive"}</td>
+                                                <td style="text-align:left; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;">${item.IsActive == 1 ?"Active":"InActive"}</td>
                                                 
                                             </tr>
                                         `;

app/Views/gasCylinderReturned.php

@@ -3,17 +3,15 @@
 <!-- Flatpickr JS -->
 <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
 <style>
-	
-
 	.num {
 		text-align: right;
 	}
 
-	#Inwardgateregistertable1 thead tr th{
+	#Inwardgateregistertable1 thead tr th {
 
-		width: 150px; 
+		width: 150px;
 		word-wrap: break-word;
-	    white-space: normal;
+		white-space: normal;
 	}
 
 	th {
@@ -75,27 +73,26 @@
 
 
 	.footer-textarea {
-	width: 100%;
+		width: 100%;
-	padding: 10px;
+		padding: 10px;
-	border-radius: 5px;
+		border-radius: 5px;
-	border: 1px solid #ccc;
+		border: 1px solid #ccc;
 	}
 
 	.send-btn {
-	padding: 10px 20px;
+		padding: 10px 20px;
-	background-color: #2ecc71; /* Green color */
+		background-color: #2ecc71;
-	color: white;
+		/* Green color */
-	border: none;
+		color: white;
-	border-radius: 5px;
+		border: none;
-	cursor: pointer;
+		border-radius: 5px;
+		cursor: pointer;
 	}
 
 	.send-btn:hover {
-	background-color: #27ae60; /* Darker green on hover */
+		background-color: #27ae60;
+		/* Darker green on hover */
 	}
-
-
-	
 </style>
 <script>
 	$(function() {
@@ -117,22 +114,25 @@
 		/* background-color: darkgrey; */
 		outline: 1px solid slategrey;
 	}
-	.igr-remarks{
+
+	.igr-remarks {
 		position: relative;
 	}
-	.igr-remarks i{ 
+
+	.igr-remarks i {
 		font-size: 14px;
 	}
-	.igr-remarks span{
+
+	.igr-remarks span {
 		position: absolute;
 		top: -5px;
 		right: -6px;
 		background-color: transparent;
-		border-radius: 50px!important;
+		border-radius: 50px !important;
 		font-weight: 600;
 		width: 14px;
-		box-shadow: 0 0 20px 0 rgba(0,0,0,0.2);
+		box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2);
-		color:#35462c;
+		color: #35462c;
 	}
 </style>
 <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/Autocomplete/jquery.autocomplete.js"></script>
@@ -148,14 +148,14 @@
 				<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">
+								<ol class="breadcrumb m-0">
-                                    <li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
+									<li class="breadcrumb-item"><a href="javascript: void(0);">Inward</a></li>
-                                    <li class="breadcrumb-item active">
+									<li class="breadcrumb-item active">
-                                    <h4 class="page-title">Gas Cylinder Returned </h4>
+										<h4 class="page-title">Gas Cylinder Returned </h4>
-                                    </li>
+									</li>
-                                </ol>
+								</ol>
-                            </div>
+							</div>
 						</div>
 					</div>
 
@@ -171,30 +171,30 @@
 						<div class="card">
 							<div class="row">
 								<div class="col-md-8">
-								<form class="Date-filter-form"  style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;" method="post" action="<?= base_url('ViewIGR'); ?>">
+									<form class="Date-filter-form" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;" method="post" action="<?= base_url('ViewIGR'); ?>">
-                               
-							   <label for="fromDate">From:</label>
-							   <input class="form-control date_range form-date-search" 
-							   value=""
-							   id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
 
-							   <label for="toDate">To:</label>
+										<label for="fromDate">From:</label>
-							   <input class="form-control date_range to-date-search"
+										<input class="form-control date_range form-date-search"
-							   value=""
+											value=""
-							   id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
+											id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
 
-							   <button type="submit" class="range_search_button"   >
+										<label for="toDate">To:</label>
-								   <i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i>
+										<input class="form-control date_range to-date-search"
-							   </button>
+											value=""
-							   
+											id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
-							   <i class="fe-rotate-cw range_reset_button" 
+
-							   style="cursor:pointer;"
+										<button type="submit" class="range_search_button">
-							   aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
+											<i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i>
-							   
+										</button>
-							   
+
-							   <div class="error" id="error"></div>
+										<i class="fe-rotate-cw range_reset_button"
-						   </form>
+											style="cursor:pointer;"
-								</div>	
+											aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
+
+
+										<div class="error" id="error"></div>
+									</form>
+								</div>
 								<!-- <div class="col-md-4">
 									<button id="downloadExcel" class="btn btn-primary" style="margin-top: 14px;margin-bottom: -11px;margin-right: 25px;float: right;">Download Excel</button>
 								</div> -->
@@ -203,76 +203,92 @@
 								<table id="view_inward_gate_register" class="table table-bordered table-hover">
 									<thead>
 										<tr>
-										<!-- basic details -->
+											<!-- basic details -->
-                                            <th>Full Cylinder Date</th>
+											<th>Full Cylinder Date</th>
 											<th>IGR No</th>
-                                            <th>Supplier</th>
+											<th>Supplier</th>
 											<th>Bill/Invoice No</th>
 											<th>Cylinder Name</th>
 
-										<!-- cylinderdetails -->
+											<!-- cylinderdetails -->
 
 											<th>Gross Weight</th>
 											<th>Empty Cylinder Date</th>
-											<th>Tare  Weight</th>
+											<th>Tare Weight</th>
-											<th>Net   Weight</th>
+											<th>Net Weight</th>
 											<th>Actual Weight</th>
 											<th>Shortage</th>
+											<th>Cylinder Count</th>
 											<th>Cylinder Pending</th>
 
 
-										<!-- least details -->
+											<!-- least details -->
 											<th>Bill Date</th>
 											<th>Driver Name</th>
 											<th>Vehicle No</th>
+											<th>Download</th>
 										</tr>
 									</thead>
 									<tbody>
 
-									<?php if(empty($gasCylinderReturnedList)){?>
+										<?php if (empty($gasCylinderReturnedList)) { ?>
-										<p align="center" > No Gas Cylinder Returned in the Given Dates..!!</p>
+											<p align="center"> No Gas Cylinder Returned in the Given Dates..!!</p>
-									<?php }else{ ?>
+										<?php } else { ?>
 
-										<?php foreach($gasCylinderReturnedList as $index => $gasCylinder): 
+											<?php foreach ($gasCylinderReturnedList as $index => $gasCylinder):
-											$gasCylinder['MaterialRcvdDate'] 	= date('d-m-Y',strtotime($gasCylinder['MaterialRcvdDate']));
+												$gasCylinder['MaterialRcvdDate'] 	= date('d-m-Y', strtotime($gasCylinder['MaterialRcvdDate']));
-											$gasCylinder['DeliveryChellanDate'] = date('d-m-Y',strtotime($gasCylinder['DeliveryChellanDate']));
+												$gasCylinder['DeliveryChellanDate'] = date('d-m-Y', strtotime($gasCylinder['DeliveryChellanDate']));
-											$gasCylinder['emptyCylinderDate'] 	= date('d-m-Y',strtotime($gasCylinder['emptyCylinderDate']));
+												$gasCylinder['emptyCylinderDate'] 	= date('d-m-Y', strtotime($gasCylinder['emptyCylinderDate']));
-										?>
+											?>
 
-											<tr>
+												<tr>
-											
-											<!-- basic details -->
-												<td><?=$gasCylinder['MaterialRcvdDate']?></td>
-												<td><?=$gasCylinder['IGRNO-']?></td>
-												<td><?=$gasCylinder['SupplierName']?></td>
-												<td><?=$gasCylinder['DeliveryChellanOrInvoiceNo']?></td>
-												<td><?=$gasCylinder['MaterialName']?></td>
-											
-											<!-- cylinderdetails -->
-												<td><?=$gasCylinder['grossWeight']?></td>
-												<td><?=$gasCylinder['emptyCylinderDate']?></td>
-												<td><?=$gasCylinder['tareWeight']?></td>
-												<td><?=$gasCylinder['netWeight']?></td>
-												<td><?=$gasCylinder['actualWeight']?></td>
-												<td><?=$gasCylinder['shortage']?></td>
-												<td><?=$gasCylinder['gasCylinderPendingCount']?></td>
 
-												
+													<!-- basic details -->
+													<td><?= $gasCylinder['MaterialRcvdDate'] ?></td>
+													<td><?= $gasCylinder['IGRNO-'] ?></td>
+													<td><?= $gasCylinder['SupplierName'] ?></td>
+													<td><?= $gasCylinder['DeliveryChellanOrInvoiceNo'] ?></td>
+													<td><?= $gasCylinder['MaterialName'] ?></td>
 
-											<!-- least details -->
+													<!-- cylinderdetails -->
-												<td><?=$gasCylinder['DeliveryChellanDate']?></td>
+													<td><?= $gasCylinder['grossWeight'] ?></td>
-												<td><?=$gasCylinder['DriverName']?></td>
+													<td><?= $gasCylinder['emptyCylinderDate'] ?></td>
-												<td><?=$gasCylinder['VehicleNo']?></td>	
+													<td><?= $gasCylinder['tareWeight'] ?></td>
+													<td><?= $gasCylinder['netWeight'] ?></td>
+													<td><?= $gasCylinder['actualWeight'] ?></td>
+													<td><?= $gasCylinder['shortage'] ?></td>
+													<td><?= $gasCylinder['gasCylinderCount'] ?></td>
+													<td><?= $gasCylinder['gasCylinderPendingCount'] ?></td>
 
-											</tr>
 
-										<?php endforeach ?>
+
-                                        
+													<!-- least details -->
-									<?php } ?>
+													<td><?= $gasCylinder['DeliveryChellanDate'] ?></td>
-											
+													<td><?= $gasCylinder['DriverName'] ?></td>
+													<td><?= $gasCylinder['VehicleNo'] ?></td>
+													<td style="text-align: center;">
+														<i class="fa fa-download"
+															onclick="downloadExcel(this)"
+															title="Download" aria-hidden="true"
+															style="font-size:large;
+															cursor:pointer;
+															color:rgb(23, 162, 162);">
+														</i>
+													</td>
+
+												</tr>
+
+											<?php endforeach ?>
+
+										<?php } ?>
+
 									</tbody>
 								</table>
 
+								<div>
+									<div style="display: none;" id="excelTableDiv"></div>
+								</div>
+
 
 							</div> <!-- end card body-->
 						</div> <!-- end card -->
@@ -304,31 +320,41 @@
 			console.log("Received date string:", dateString);
 
 			// Split the date string into date and time components
-			var dateTimeParts = dateString.split(' ');
+			var dateTimeParts = dateString?.split(' ');
-			var dateParts = dateTimeParts[0].split('-');
+			var dateParts = dateTimeParts[0]?.split('-');
-			var timeParts = dateTimeParts[1].split(':');
+			var timeParts = dateTimeParts[1]?.split(':');
 
 			// Extract individual components
 			var year = parseInt(dateParts[0], 10);
 			var month = parseInt(dateParts[1], 10) - 1; // Months are zero-based in JavaScript
 			var day = parseInt(dateParts[2], 10);
 
-			var hours = parseInt(timeParts[0], 10);
+			var hours 	= 0;
-			var minutes = parseInt(timeParts[1], 10);
+			var minutes = 0;
-			var seconds = parseInt(timeParts[2], 10);
+			var seconds = 0;
+			
+
+			if(timeParts){
+				// Extract time components
+				 hours = parseInt(timeParts[0], 10);
+				 minutes = parseInt(timeParts[1], 10);
+				 seconds = parseInt(timeParts[2], 10);
+			}
+
 
 			// Create a new Date object
 			var date = new Date(year, month, day, hours, minutes, seconds);
 
 			// Extract date components
-			var day = date.getDate().toString().padStart(2, '0');
+			 day = date.getDate().toString().padStart(2, '0');
-			var month = (date.getMonth() + 1).toString().padStart(2, '0'); // Months are zero-based
+			 month = (date.getMonth() + 1).toString().padStart(2, '0'); // Months are zero-based
-			var year = date.getFullYear();
+			 year = date.getFullYear();
 
 			// Extract time components
-			var hours = date.getHours().toString().padStart(2, '0');
+			 hours = date.getHours().toString().padStart(2, '0');
-			var minutes = date.getMinutes().toString().padStart(2, '0');
+			 minutes = date.getMinutes().toString().padStart(2, '0');
-			var seconds = date.getSeconds().toString().padStart(2, '0');
+			 seconds = date.getSeconds().toString().padStart(2, '0');
+
 			var formattedDate = '';
 			// Format the date and time in DD-MM-YYYY HH:MM:SS format
 			if (flag == 1) {
@@ -355,9 +381,8 @@
 
 <!-- data table related initialization -->
 <script>
-
 	$(document).ready(function() {
-        // this code for table date filed ordering
+		// this code for table date filed ordering
 		$.fn.dataTable.ext.type.order['date-dd-mm-yyyy-pre'] = function(date) {
 			if (!date) return 0;
 
@@ -367,27 +392,29 @@
 
 		var orderColumnIndex = <?php echo (session()->get('roleText') == 'Auditor') ? 6 : 0; ?>;
 		table = $('#view_inward_gate_register').DataTable({
-			dom: 'Blfrtip', 
+			dom: 'Blfrtip',
-            buttons: [
+			buttons: [{
-                {
+				extend: 'excel',
-					extend: 'excel',
+				text: 'Excel',
-					text: 'Excel',
+				exportOptions: {
-					exportOptions: {
+					columns: ':not(:last-child)' // Exclude the last column
-						columns: ':not(:last-child)' // Exclude the last column
-					}
 				}
-            ],
+			}],
 			pageLength: 10,
 			lengthMenu: [
 				[10, 20, 30, 50, -1],
 				[10, 20, 30, 50, "All"]
-			], 
-			responsive: false, 
-			ordering: true,
-			columnDefs: [
-				{ targets: parseInt(orderColumnIndex), type: 'date-dd-mm-yyyy' } // Apply custom sorting
 			],
-			order: [[parseInt(orderColumnIndex), 'desc']],
+			responsive: false,
+			ordering: true,
+			columnDefs: [{
+					targets: parseInt(orderColumnIndex),
+					type: 'date-dd-mm-yyyy'
+				} // Apply custom sorting
+			],
+			order: [
+				[parseInt(orderColumnIndex), 'desc']
+			],
 			language: {
 				paginate: {
 					next: '<i class="fas fa-angle-right"></i>', // Next button icon
@@ -400,7 +427,7 @@
 		$("#resetButton").click(function() {
 			$("#fromDate").val('');
 			$("#toDate").val('');
-			window.location="gasCylinderReturned"
+			window.location = "gasCylinderReturned"
 		});
 
 		// Automatically focus and open the To Date picker when From Date is selected
@@ -422,198 +449,192 @@
 
 <!--  data table related date filter -->
 <script>
-      $(document).ready(function() {
+	$(document).ready(function() {
-        $('#fromDate , #toDate').change(function() {
+		$('#fromDate , #toDate').change(function() {
-          
-        let fromDate = $('#fromDate').val(); 
-        let toDate = $('#toDate').val();
 
-        let fromDateObj = new Date(fromDate.split('-').reverse().join('-')); 
+			let fromDate = $('#fromDate').val();
-        let toDateObj = new Date(toDate.split('-').reverse().join('-'));
+			let toDate = $('#toDate').val();
-        if (fromDateObj > toDateObj) {
-            alert('Incorrect Date Applied For Filter..!!');
-            $('#toDate').attr('min', fromDate);
-            $('#toDate').val('');
-          
-        }
-    });
-    });
-	
 
-   
+			let fromDateObj = new Date(fromDate.split('-').reverse().join('-'));
-</script>
+			let toDateObj = new Date(toDate.split('-').reverse().join('-'));
+			if (fromDateObj > toDateObj) {
+				alert('Incorrect Date Applied For Filter..!!');
+				$('#toDate').attr('min', fromDate);
+				$('#toDate').val('');
 
-
+			}
-
-<!-- while Opening gasEnteredDetails modal -->
-	<script>
-
-			$(document).on('click', '.gas-entered-details', function() {
-
-			
-				let row = $(this).closest("tr");
-
-				let fullCylinderDate = row.find("td:eq(0)").text().trim();
-				let igrNo			 = row.find("td:eq(1)").text().trim();
-				let supplierName	 = row.find("td:eq(2)").text().trim();
-				let invoiceNo		 = row.find("td:eq(3)").text().trim();
-				let billDate		 = row.find("td:eq(4)").text().trim();
-				let driverName		 = row.find("td:eq(5)").text().trim();
-				let vehicleNo		 = row.find("td:eq(6)").text().trim();
-				let cylinderName	 = row.find("td:eq(7)").text().trim();
-				let cylinderCount	 = parseInt(row.find("td:eq(8)").text().trim(), 10);
-
-				// Convert fullCylinderDate to YYYY-MM-DD
-				if (fullCylinderDate) {
-					let dateParts = fullCylinderDate.split("-");
-					fullCylinderDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`;
-				}
-
-				// Convert billDate to YYYY-MM-DD
-				if (billDate) {
-					let dateParts = billDate.split("-");
-					billDate = `${dateParts[2]}-${dateParts[1]}-${dateParts[0]}`;
-				}
-
-				// Assign values to modal inputs
-				$('#fullCylinderDate').val(fullCylinderDate);
-				$('#IGRNO').val(igrNo);
-				$('#supplierName').val(supplierName);
-				$('#invoiceNo').val(invoiceNo);
-				$('#billDate').val(billDate);
-				$('#driverName').val(driverName);
-				$('#vehicleNo').val(vehicleNo);
-				$('#cylinderName').val(cylinderName);
-				$('#cylinderCount').val(cylinderCount);
-
-				// Clear previous cylinder inputs
-				$('#cylinderDiv').html("");
-
-				// Generate cylinder input fields dynamically
-				if (cylinderCount > 0) {
-					let inputFields = `
-
-						<div class="form-group row">
-						<div class="col-md-4"><label>Cylinder Number</label> <span class="text-danger">*</span> </div>
-						<div class="col-md-4"><label>Gross Weight</label>    <span class="text-danger">*</span> </div>
-						<div class="col-md-4"><label>Actual Weight</label>   <span class="text-danger">*</span> </div>
-					</div>`;
-
-					for (let i = 1; i <= cylinderCount; i++) {
-						inputFields += `
-							<div class="form-group row dynamicField">
-								<div class="col-md-4">
-									<input type="text" class="form-control" name="cylinderNumber[]" placeholder="Cylinder ${i}" required>
-								</div>
-								<div class="col-md-4">
-									<input type="number" class="form-control" name="grossWeight[]" placeholder="Gross Weight ${i}" required>
-								</div>
-								<div class="col-md-4">
-									<input type="number" class="form-control" name="actualWeight[]" placeholder="Actual Weight ${i}" required>
-								</div>
-							</div>`;
-					}
-					$('#cylinderDiv').html(inputFields);
-				}
-
-				// Show the modal
-				$('#gasEnteredDetails').modal('show');
-			});
-	</script>
-
-
-
-<!-- while closing gasEnteredDetails modal -->
-<script>
-	$(document).ready(function(){
-		$('#gasEnteredDetails').on("hide.bs.modal", function(e){ 
-
-			$('#fullCylinderDate').val(" "); 
-			$('#IGRNO').val(" ");
-			$('#supplierName').val(" ");
-			$('#invoiceNo').val(" ");
-			$('#billDate').val(" ");
-			$('#driverName').val(" ");
-			$('#vehicleNo').val(" ");
-			$('#cylinderName').val(" ");
-			$('#cylinderCount').val(" ");
-			$('#cylinderDiv').html("");  
 		});
 	});
 </script>
 
-<!-- end of add gas shortage calculator -->
 
 
 
-
-
-
-
-<!-- ajax call for gas Shortage -->
 <script>
+	function downloadExcel(clickedElement) {
 
-$(document).ready(function () {
+		var row = $(clickedElement).closest("tr");
-    $("#gasEnteredDetails form").submit(function (event) {
+		var igrNo = row.find("td:eq(1)").text().trim();
-        event.preventDefault(); // Prevent form reload
+		var cylinderPendingCount = row.find("td:eq(12)").text().trim();
 
-        let method = $("#gasEnteredDetails").data("form"); // Get form type
+		cylinderPendingCount = parseInt(cylinderPendingCount, 10);
 
-        // Collecting form data
+		if (cylinderPendingCount > 0) {
-        let formData = {
+			alert("Please clear the " + cylinderPendingCount + " pending cylinders before downloading the Excel file.");
-            fullCylinderDate: $("#fullCylinderDate").val(),
+			return false;
-            IGRNO:			  $("#IGRNO").val(),
+		}
-            supplierName:	  $("#supplierName").val(),
-            invoiceNo:	 	  $("#invoiceNo").val(),
-            billDate:		  $("#billDate").val(),
-            driverName:		  $("#driverName").val(),
-            vehicleNo: 		  $("#vehicleNo").val(),
-			cylinderName:     $('#cylinderName').val(),
-            cylinderCount: 	  $("#cylinderCount").val(),
-            cylinders: [] // Array to store cylinder details
-        };
-
-        // Loop through dynamically generated cylinder inputs
-        $("#cylinderDiv .form-group.row.dynamicField").each(function () {
-            let cylinderData = {
-                cylinderNo  : $(this).find("input[name='cylinderNumber[]']").val(),
-                grossWeight : $(this).find("input[name='grossWeight[]']").val(),
-                actualWeight: $(this).find("input[name='actualWeight[]']").val(),
-            };
-            formData.cylinders.push(cylinderData);
-        });
-
-        console.log(formData); // Debugging - Check if data is correct
-
-        $('#loader').show(); // Show loader
-
-        $.ajax({
-            type: "POST",
-            url: "<?php echo base_url()?>/updateGasShortage", // Adjust endpoint as needed
-            data: JSON.stringify(formData), // Send data as JSON
-            contentType: "application/json",
-            dataType: "json",
-            success: function (response) {
-                if (response.status === "success") {
-                    alert("Gas Shortage Data Saved Successfully!");
-                    $('#gasEnteredDetails').modal('hide'); // Close modal
-                } else {
-                    alert("Error: " + response.message);
-                }
-            },
-            error: function (xhr, status, error) {
-                console.log(xhr.responseText);
-                alert("Something went wrong! Please try again.");
-            },
-            complete: function () {
-                console.log("AJAX request completed.");
-                $('#loader').hide();
-            }
-        });
-    });
-});
-
-</script>
 
 
+		$("#loader").show();
 
+		$.ajax({
+			type: "POST",
+			url: "<?php echo base_url() ?>gasCylindersByIgr",
+			data: {
+				IGRNO: igrNo
+			},
+			success: function(response) {
+				$("#loader").hide();
+				if (response.status === "success") {
+					console.log(response.data); // Debugging - Check if data is correct
+
+					let tableHTML = `
+							<table border="1" id="excelTable" >
+								<thead>
+								<tr>
+									<th>IGRNO</th>
+									<th>Full Cylinder Date</th>
+									<th>Cylinder No</th>
+									<th>Gross Weight</th>
+									<th>Empty Cylinder Return Date</th>
+									<th>Tare Weight</th>
+									<th>Net Weight</th>
+									<th>Actual Weight</th>
+									<th>Shortage</th>
+									<th>Bill No</th>
+									<th>Bill Date</th>
+									<th>Driver Name</th>
+									<th>Vehicle No</th>
+									
+								</tr>
+								</thead>
+								<tbody>
+							`;
+
+					let totalShortage = 0;
+					let totalNetWeight = 0;
+					let totalActualWeight = 0;
+
+					response.data.forEach(item => {
+
+						totalShortage += Number(item.shortage);
+
+						totalNetWeight += Number(item.netWeight);
+
+						totalActualWeight += Number(item.actualWeight);
+
+						item.fullCylinderDate    = formatDateTime(item.fullCylinderDate, 1);
+						item.emptyCylinderDate   = formatDateTime(item.emptyCylinderDate, 1);
+						item.DeliveryChellanDate = formatDateTime(item.DeliveryChellanDate, 1);
+
+						tableHTML += `
+						
+								<tr>
+								<td>${item.IGRNO}</td>
+								<td>${item.fullCylinderDate}</td>
+								<td>${item.cylinderNo}</td>
+								<td>${item.grossWeight}</td>
+								<td>${item.emptyCylinderDate}</td>
+								<td>${item.tareWeight}</td>
+								<td>${item.netWeight}</td>
+								<td>${item.actualWeight}</td>
+								<td>${item.shortage}</td>
+								<td>${item.invoiceNo}</td>
+								<td>${item.DeliveryChellanDate}</td>
+								<td>${item.DriverName}</td>
+								<td>${item.VehicleNo}</td>
+								</tr>
+
+									`;
+					});
+
+					tableHTML += `
+								</tbody>
+								 <tfoot>
+								<tr class="empty-row">
+									<td colspan="13">&nbsp;</td>
+								</tr>
+									<tr>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td> Weight</td>
+										<td>${totalNetWeight}</td>
+										<td>${totalActualWeight}</td>
+										<td>${totalShortage}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td></td>
+									</tr>
+								 </tfoot>
+							</table>
+							`;
+
+					$("#excelTableDiv").html(tableHTML);
+
+					let table = document.getElementById('excelTable');
+
+					let filename = "GasCylinderReturned_" + igrNo + ".xlsx";
+
+					let rows = [];
+
+					// Extract table data row-by-row
+					$(table).find('tr').each(function(rowIndex) {
+						let rowData = [];
+
+						$(this).find('th, td').each(function(colIndex) {
+							// Skip hidden columns
+							if ($(this).css('display') === 'none') return;
+							let cellText = $(this).text().trim();
+							rowData.push(cellText);
+						});
+
+						// Add the cleaned row only if it has data
+						if (rowData.length > 0) {
+							rows.push(rowData);
+						}
+					});
+
+					// Create a worksheet from array (no DOM needed!)
+					let ws = XLSX.utils.aoa_to_sheet(rows);
+
+					// Define column widths (in character units)
+					const columnWidth = 15; // Set your desired width here
+					const wscols = [];
+					for (let i = 0; i < Object.keys(response.data[0]).length; i++) {
+						wscols.push({
+							wch: columnWidth
+						});
+					}
+					ws['!cols'] = wscols;
+
+					let wb = XLSX.utils.book_new();
+					XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
+					XLSX.writeFile(wb, filename || 'export.xlsx');
+				}
+			},
+
+			error: function(xhr, status, error) {
+				console.log(xhr.responseText);
+				alert("Something went wrong! Please try again.");
+			},
+			complete: function() {
+				console.log("AJAX request completed.");
+				$("#loader").hide(); // Hide loader
+			}
+		});
+	}
+</script>

app/Views/monthlypayinputs.php

@@ -198,7 +198,9 @@
                              </div>
                              <div class="col-9 text-right d-flex" style="justify-content: end;" id="savebutton">
                            
-                                <input type="text" id="searchInput" placeholder="Search..." style="padding: 8px;margin-bottom: 10px;width: 250px;border: 1px solid #ccc;border-radius: 5px;margin-right:15px;">
+                                <input type="text" id="searchInput" placeholder="Search..." style="padding: 8px;margin-bottom: 10px;width: 250px;
+                                cursor:pointer;
+                                border: 1px solid #ccc;border-radius: 5px;margin-right:15px;">
                              
                                 <!-- <input type="button" id="submit" value="Save" class="btn btn-success" onclick="getAllData();" style="margin-top:0px;"> -->
                                 <a href="<?php echo base_url("exportMonthlyPayInputs/".$dropdownvalue); ?>" 
@@ -208,11 +210,11 @@
                                         </i>
                                 </a>
                                 
-                                <i id="exportButton" class="fas fa-download download-icon" style="margin-right: 15px;margin-top: 8px;font-size:25px;" title="Export Excel"></i>
+                                <i id="exportButton" class="fas fa-download download-icon" style="margin-right: 15px;margin-top: 8px;font-size:25px;cursor:pointer;" title="Export Excel"></i>
 
-                                <i class="fe-maximize noti-icon" onclick="toggleDivFullscreen()" style="margin-right: 15px;margin-top: 5px;font-size: 28px;" title="Full screen view"></i>
+                                <i class="fe-maximize noti-icon" onclick="toggleDivFullscreen()" style="margin-right: 15px;margin-top: 5px;font-size: 28px;cursor:pointer;" title="Full screen view"></i>
 
-                                <i class="fas fa-save"  onclick="getAllData();" style="margin-right: 15px;margin-top: 5px;font-size:28px;" title="Save"></i>
+                                <i class="fas fa-save"  onclick="getAllData();" style="margin-right: 15px;margin-top: 5px;font-size:28px;cursor:pointer;" title="Save"></i>
    
                              </div>
                          </div>
@@ -776,7 +778,7 @@
 
 
  <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
+
  <script type="text/javascript">
 
 
@@ -814,25 +816,11 @@ $(document).ready(function () {
         function exportTableToExcel(tableId, filename = 'monthlypay.xlsx') {
             var table = document.getElementById(tableId);
             var rows = table.rows;
-            var data = [];
+            
-
+            let ws = XLSX.utils.table_to_sheet(table); // Convert modified table to sheet
-            for (var i = 0; i < rows.length; i++) {
+            let wb = XLSX.utils.book_new(); // Create a new workbook
-                var row = rows[i];
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
-                var cols = row.querySelectorAll('td, th');
+            XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
-                var rowData = [];
-                
-                for (var j = 0; j < cols.length; j++) {
-                    rowData.push(cols[j].innerText);
-                }
-                
-                data.push(rowData);
-            }
-
-            var wb = XLSX.utils.book_new();
-            var ws = XLSX.utils.aoa_to_sheet(data);
-
-            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1');
-            XLSX.writeFile(wb, filename);
         }
 
         // Add click event listener to the export button

app/Views/stock/CoatingMachineDetail.php

@@ -393,7 +393,7 @@
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)" 
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/bagStockDetails.php

@@ -384,7 +384,7 @@ foreach ($period as $day) {
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/dieselStockDetails.php

@@ -373,7 +373,7 @@ foreach ($period as $day) {
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/drierMachineDetails.php

@@ -359,7 +359,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 
@@ -471,12 +471,13 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                     <div class="row">
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryDateId">Date</label>
+                                                            <span class="text-danger">*</span>
                                                             <input type="date" class="form-control" id="additionalEntryDateId" name="date" value="<?= $calendarCurrentDate ?>"
                                                                 min="<?= $calendarStartDate ?>" max="<?= $calendarEndDate ?>" required>
                                                         </div>
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryDrierOnTimeId">Drier On Time</label>
-
+                                                            <span class="text-danger">*</span>
                                                             <select onchange="calculateMachineRunningHrs()" required
                                                                 class="timeDropdown select2" style="width: 100px;"
                                                                 id="additionalEntryDrierOnTimeId" name="drier_on_time">
@@ -488,7 +489,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         </div>
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryDrierOffTimeId">Drier Off Time</label>
-
+                                                            <span class="text-danger">*</span>
                                                             <select onchange="calculateMachineRunningHrs()" required
                                                                 class="timeDropdown select2" style="width: 100px;"
                                                                 id="additionalEntryDrierOffTimeId" name="drier_off_time">
@@ -512,6 +513,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- supplier name -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntrySupplierNameId">Supplier Name</label>
+                                                            <span class="text-danger">*</span>
                                                             <select class="timeDropdown supplier_name select2" style="width: 300px;" required
                                                                 id="additionalEntrySupplierNameId" name="supplier_name">
                                                                 <option value="">Select</option>
@@ -523,7 +525,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
                                                         <!-- input sand qty -->
                                                         <div class="col-md-3">
-                                                            <label class="form" for="additionalEntryInputSandQtyId">Input sand Quantity (Metric Ton)</label>
+                                                            <label class="form" for="additionalEntryInputSandQtyId">Input Sand Quantity (Metric Ton)</label>
+                                                            <span class="text-danger">*</span>
                                                             <input onchange="additionalEntryGasPerTon(); additionalEntryMoistureLossQty(); additionalEntryQtyPerHrs(); "
                                                                 type="text" class="form-control" id="additionalEntryInputSandQtyId" name="input_sand_qty" value="" required>
                                                         </div>
@@ -531,6 +534,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- input sand moisture -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryInputSandMoistureId">Input Sand Moisture (%)</label>
+                                                            <span class="text-danger">*</span>
                                                             <input type="text" class="form-control" id="additionalEntryInputSandMoistureId" name="input_sand_moisture" value="" required>
                                                         </div>
 
@@ -539,6 +543,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- sand dried qty -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntrySandDriedQtyId">Sand Dried Qty (Metric Ton)</label>
+                                                            <span class="text-danger">*</span>
                                                             <input onchange="additionalEntryGasPerTon(); additionalEntryMoistureLossQty(); additionalEntryQtyPerHrs(); "
                                                                 type="text" class="form-control" id="additionalEntrySandDriedQtyId" name="sand_dried_qty" value="" required>
                                                         </div>
@@ -552,13 +557,14 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- total gas consumption -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryTotalGasConsumptionId">Total Gas Consumption</label>
+                                                            <span class="text-danger">*</span>
                                                             <input onchange="additionalEntryGasPerTon(); additionalEntryMoistureLossQty(); additionalEntryQtyPerHrs(); "
                                                                 type="text" class="form-control" id="additionalEntryTotalGasConsumptionId" name="total_gas_consumption" value="" required>
                                                         </div>
 
                                                         <!-- gas per ton -->
                                                         <div class="col-md-3">
-                                                            <label class="form" for="additionalEntryGasPerTonId">Gas per Ton</label>
+                                                            <label class="form" for="additionalEntryGasPerTonId">Gas / Ton</label>
                                                             <input type="text" class="form-control" id="additionalEntryGasPerTonId" name="gas_per_ton" value="" required
                                                                 readonly>
                                                         </div>
@@ -566,7 +572,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
                                                         <!-- qty per hours -->
                                                         <div class="col-md-3">
-                                                            <label class="form" for="additionalEntryQtyPerHoursId">Qty per Hours</label>
+                                                            <label class="form" for="additionalEntryQtyPerHoursId">Qty / Hours</label>
                                                             <input type="text" class="form-control" id="additionalEntryQtyPerHoursId" name="qty_per_hours" value="" required
                                                                 readonly>
                                                         </div>
@@ -587,6 +593,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- dust qty -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryDustQtyId">Dust Qty (Metric Ton)</label>
+                                                            <span class="text-danger">*</span>
                                                             <input type="text" class="form-control" id="additionalEntryDustQtyId" name="dust_qty" value="" required>
                                                         </div>
 
@@ -594,6 +601,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- customer name -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="additionalEntryCustomerNameId">Customer Name</label>
+                                                            <span class="text-danger">*</span>
                                                             <input type="text" class="form-control" id="additionalEntryCustomerNameId" name="customer_name" value="" required>
                                                         </div>
 
@@ -627,13 +635,14 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                     <div class="row">
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryDateId">Date</label>
+                                                            <span class="text-danger">*</span>
                                                             <input type="date" class="form-control" id="editEntryDateId" name="date" value=""
                                                                 required readonly>
                                                         </div>
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryDrierOnTimeId">Drier On Time</label>
-
+                                                            <span class="text-danger">*</span>
-                                                            <select onchange="editEntryCalculateMachineRunningHrs()"
+                                                            <select onchange="editEntryCalculateMachineRunningHrs()" required
                                                                 class="timeDropdown select2" style="width: 100px;"
                                                                 id="editEntryDrierOnTimeId" name="drier_on_time">
                                                                 <option value="">Select</option>
@@ -644,8 +653,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         </div>
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryDrierOffTimeId">Drier Off Time</label>
-
+                                                            <span class="text-danger">*</span>
-                                                            <select onchange="editEntryCalculateMachineRunningHrs()"
+                                                            <select onchange="editEntryCalculateMachineRunningHrs()" required
                                                                 class="timeDropdown select2" style="width: 100px;"
                                                                 id="editEntryDrierOffTimeId" name="drier_off_time">
                                                                 <option value="">Select</option>
@@ -668,7 +677,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- supplier name -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntrySupplierNameId">Supplier Name</label>
-                                                            <select class="timeDropdown supplier_name select2" style="width: 300px;"
+                                                            <span class="text-danger">*</span>
+                                                            <select class="timeDropdown supplier_name select2" style="width: 300px;" required
                                                                 id="editEntrySupplierNameId" name="supplier_name" value="">
                                                                 <option value="">Select</option>
                                                                 <?php foreach ($supplierData as $key => $value) { ?>
@@ -679,15 +689,17 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
                                                         <!-- input sand qty -->
                                                         <div class="col-md-3">
-                                                            <label class="form" for="editEntryInputSandQtyId">Input sand Quantity (Metric Ton)</label>
+                                                            <label class="form" for="editEntryInputSandQtyId">Input Sand Quantity (Metric Ton)</label>
+                                                            <span class="text-danger">*</span>
                                                             <input onchange="editEntryGasPerTon(); editEntryMoistureLossQty(); editEntryQtyPerHrs(); "
-                                                                type="text" class="form-control" id="editEntryInputSandQtyId" name="input_sand_qty" value="">
+                                                                type="text" class="form-control" id="editEntryInputSandQtyId" name="input_sand_qty" value="" required>
                                                         </div>
 
                                                         <!-- input sand moisture -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryInputSandMoistureId">Input Sand Moisture (%)</label>
-                                                            <input type="text" class="form-control" id="editEntryInputSandMoistureId" name="input_sand_moisture" value="">
+                                                            <span class="text-danger">*</span>
+                                                            <input type="text" class="form-control" id="editEntryInputSandMoistureId" name="input_sand_moisture" value="" required>
                                                         </div>
 
 
@@ -695,8 +707,9 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- sand dried qty -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntrySandDriedQtyId">Sand Dried Qty (Metric Ton)</label>
+                                                            <span class="text-danger">*</span>
                                                             <input onchange="editEntryGasPerTon(); editEntryMoistureLossQty(); editEntryQtyPerHrs(); "
-                                                                type="text" class="form-control" id="editEntrySandDriedQtyId" name="sand_dried_qty" value="">
+                                                                type="text" class="form-control" id="editEntrySandDriedQtyId" name="sand_dried_qty" value="" required>
                                                         </div>
 
 
@@ -708,21 +721,22 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- total gas consumption -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryTotalGasConsumptionId">Total Gas Consumption</label>
+                                                            <span class="text-danger">*</span>
                                                             <input onchange="editEntryGasPerTon(); editEntryMoistureLossQty(); editEntryQtyPerHrs(); "
-                                                                type="text" class="form-control" id="editEntryTotalGasConsumptionId" name="total_gas_consumption" value="">
+                                                                type="text" class="form-control" id="editEntryTotalGasConsumptionId" name="total_gas_consumption" value="" required>
                                                         </div>
 
                                                         <!-- gas per ton -->
                                                         <div class="col-md-3">
-                                                            <label class="form" for="editEntryGasPerTonId">Gas per Ton</label>
+                                                            <label class="form" for="editEntryGasPerTonId">Gas / Ton</label>
-                                                            <input type="text" class="form-control" id="editEntryGasPerTonId" name="gas_per_ton" value=""
+                                                            <input type="text" class="form-control" id="editEntryGasPerTonId" name="gas_per_ton" value="" 
                                                                 readonly>
                                                         </div>
 
 
                                                         <!-- qty per hours -->
                                                         <div class="col-md-3">
-                                                            <label class="form" for="editEntryQtyPerHoursId">Qty per Hours</label>
+                                                            <label class="form" for="editEntryQtyPerHoursId">Qty / Hours</label>
                                                             <input type="text" class="form-control" id="editEntryQtyPerHoursId" name="qty_per_hours" value=""
                                                                 readonly>
                                                         </div>
@@ -731,7 +745,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- moisture loss qty -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryMoistureLossQtyId">Moisture Loss Qty (Metric Ton)</label>
-                                                            <input type="text" class="form-control" id="editEntryMoistureLossQtyId" name="moisture_loss_qty" value=""
+                                                            <input type="text" class="form-control" id="editEntryMoistureLossQtyId" name="moisture_loss_qty" value="" 
                                                                 readonly>
                                                         </div>
                                                     </div>
@@ -743,14 +757,16 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                                         <!-- dust qty -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryDustQtyId">Dust Qty (Metric Ton)</label>
-                                                            <input type="text" class="form-control" id="editEntryDustQtyId" name="dust_qty" value="">
+                                                            <span class="text-danger">*</span>
+                                                            <input type="text" class="form-control" id="editEntryDustQtyId" name="dust_qty" value="" required>
                                                         </div>
 
 
                                                         <!-- customer name -->
                                                         <div class="col-md-3">
                                                             <label class="form" for="editEntryCustomerNameId">Customer Name</label>
-                                                            <input type="text" class="form-control" id="editEntryCustomerNameId" name="customer_name" value="">
+                                                            <span class="text-danger">*</span>
+                                                            <input type="text" class="form-control" id="editEntryCustomerNameId" name="customer_name" value="" required>
                                                         </div>
 
                                                     </div>

app/Views/stock/dustAndRoughStockDetails.php

@@ -379,7 +379,7 @@
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer;  color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/gasStockDetails.php

@@ -355,7 +355,7 @@
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/incomingSilicaSandDetails.php

@@ -353,7 +353,7 @@
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/powerConsumptionDetails.php

@@ -379,7 +379,7 @@ foreach ($period as $day) {
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/resinStockDetails.php

@@ -379,7 +379,7 @@ foreach ($period as $day) {
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/trpProductionStockDetails.php

@@ -436,7 +436,7 @@ $timeOtions[] = "12:00 AM";
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>
 

app/Views/stock/trpSandUseStockDetails.php

@@ -365,7 +365,7 @@
 
                                             <i class="fe-maximize noti-icon btn-lg mt-2"
                                                 title="Full Screen"
-                                                style="font-size: x-large; cursor:pointer; color:rgb(230, 184, 35)"
+                                                style="font-size: x-large; cursor:pointer; color:rgb(241, 9, 136)"
                                                 onclick="toggleDivFullscreen()">
                                             </i>