diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 7b075eb5..94478251 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -463,16 +463,9 @@ $routes->post('updateDieselMachineDetails' , 'StockController::updateDieselMachi
 
 //power consumption details
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'powerConsumptionDetails', 'StockController::powerConsumptionDetails');
-$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditPowerConsumptionDetails', 'StockController::addOrEditPowerConsumptionDetails');
-
-
-//new power consumption details
-$routes->match(['GET','POST'] , 'newPowerConsumptionDetails' , 'StockController::newPowerConsumptionDetails');
 $routes->post('updatePowerConsumptionDetails','StockController::updatePowerConsumptionDetails');
 
 
-
-
 //incoming Silica Sand Detaails
 $routes->match(['GET', 'POST'], 'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails');
 $routes->post('updateIncomingSilicaSandDetails', 'StockController::updateIncomingSilicaSandDetails');
diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 456ce71b..553668ba 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -22,6 +22,7 @@ use App\Models\TrpProductionModel;
 use App\Models\TrpProductionMaintenanceModel;
 use App\Models\TrpProductionWasteModel;
 use App\Models\Employeedetails_model;
+use App\Models\PowerConsumptionSummaryModel;
 
 
 
@@ -36,6 +37,7 @@ class StockController extends BaseController
 
     protected $supplier_model;
     protected $powerConsumptionDetails_model;
+    protected $powerConsumptionSummary_model;
     protected $coatingMachineDetails_model;
     protected $drierMachineDetails_model;
     protected $factoryMachine_model;
@@ -109,6 +111,8 @@ class StockController extends BaseController
 
         $this->employeedetails_model = new Employeedetails_model();
 
+        $this->powerConsumptionSummary_model = new PowerConsumptionSummaryModel();
+
 
         $this->session = session();
         helper('form');
@@ -1702,12 +1706,6 @@ class StockController extends BaseController
         return $times;
     }
 
-
-
-
-
-
-
     
     public function drierMachineDetails()
     {
@@ -1892,131 +1890,281 @@ class StockController extends BaseController
         return $dateInput;
     }
 
+    public function powerConsumptionDetails(){
 
-    
-    
+         
+        if ($this->request->getMethod() === 'POST') {
 
-    public function powerConsumptionDetails()
-    {
-        $currentMonth = $this->request->getPost('month') ? $this->request->getPost('month') : date('M-Y');
+            $month = $this->request->getPost('month');
 
-        $monthData = $this->getMonthDatesFromInput($currentMonth);
+            $date = DateTime::createFromFormat('M-Y', $month);
 
-        $data['startDate'] = $monthData[0]['database'];
-        $data['endDate'] = $monthData[count($monthData) - 1]['database'];
-        $data['datefordropdown'] = $currentMonth;
+            $formattedDate = $date->format('Y-m');
 
-        //Machine Details
-        $data['machineDetails'] = $this->factoryMachine_model->where('energy_type', 'electric')->where('is_active', 1)->findAll();
-        if (!count([$data['machineDetails']])) {
-            return $this->response->setBody("<script>alert('No Machine data available');</script>");
+            $month = $formattedDate;
+        } else {
+
+           // $month = '2024-12';
+
+            $month = date('Y-m');
         }
 
+        $data = [];
+
+        $data['month'] = $month;
+
+        $this->global['pageTitle'] = 'Power Consumption Stock Details';
 
 
-        //Diesel Consumption Details
-        $data['powerConsumptionDetails'] = $this->getElectricConsumptionPivot($data['machineDetails'], $data['startDate'], $data['endDate']);
-        if (!count($data['powerConsumptionDetails'])) {
-            //insert empty data 
-            $tempInsert = [];
-            foreach ($monthData as $key => $value) {
-                array_push($tempInsert, ['date' => $value['database'], 'machine_id' => $data['machineDetails'][0]['id']]);
+        // Get the previous month's last date power consumption stock details for next month updation
+
+        $previousMonth = DateTime::createFromFormat('Y-m', $month)->modify('-1 month')->format('Y-m');
+        $previousMonthStartDate = "$previousMonth-01";
+        $previousMonthEndDate = date("Y-m-t", strtotime($previousMonthStartDate));
+
+        $data['previousMonthPowerConsumptionStockDetails'] = $this->powerConsumptionDetails_model
+            ->select(['machine_id', 'date', 'closing_units'])
+            ->distinct()
+            ->where('date =', $previousMonthEndDate)
+            ->groupBy(['machine_id', 'date'])
+            ->orderBy('date', 'desc')
+            ->orderBy('machine_id', 'asc')
+            ->findAll();
+
+        $data['previousMonthTotalPowerMachineStockDetails'] = $this->powerConsumptionSummary_model
+            ->select(['id', 'date', 'final_reading'])
+            ->distinct()
+            ->where('date =', $previousMonthEndDate)        
+            ->groupBy(['id', 'date'])
+            ->orderBy('date', 'desc')
+            ->findAll();
+
+
+
+        // checking in database if the data is available for the month
+
+        $startDate = "$month-01";
+        $endDate = date("Y-m-t", strtotime($startDate));
+
+        $data['powerConsumptionStockDetails'] = $this->powerConsumptionDetails_model
+            ->where('date >=', $startDate)
+            ->where('date <=', $endDate)
+            ->groupBy(['machine_id', 'date'])
+            ->orderBy('date', 'asc')
+            ->orderBy('machine_id', 'asc')
+            ->findAll();
+
+        $data['totalPower'] = $this->powerConsumptionSummary_model       
+            ->where('date >=', $startDate)
+            ->where('date <=', $endDate)
+            ->orderBy('date', 'asc')
+            ->findAll();
+
+        // Initialize an empty array to hold the grouped data
+        $data['groupedPowerConsumptionStockDetails'] = [];
+
+        // Temporary array to store grouped data by date
+        $groupedByDate = [];
+
+        // Group by 'date'
+        foreach ($data['powerConsumptionStockDetails'] as $detail) {
+            $date = $detail['date'];
+
+            // Initialize the outer array for this date if it doesn't exist
+            if (!isset($groupedByDate[$date])) {
+                $groupedByDate[$date] = [];
             }
-            $this->powerConsumptionDetails_model->insertBatch($tempInsert);
 
-            $data['powerConsumptionDetails'] = $this->getElectricConsumptionPivot($data['machineDetails'], $data['startDate'], $data['endDate']);
+            /*******************************************************************************************************************
+             creating an sub array (inner array) for date wise and append the detail into an array as sub-array 
+
+             $groupedByDate[] outer array
+
+             $groupedByDate[$date]
+             will look like [[material1],[material2],[material3],[material4],[material5]] inner array
+
+             the above process is done for single row (date wise) and the same process is repeated for all the rows
+            *******************************************************************************************************************/
+
+            $groupedByDate[$date][] = $detail;
+        }
+
+        // Reset the structure to have indexed arrays without the date keys
+        $data['groupedPowerConsumptionStockDetails'] = array_values($groupedByDate);
+
+
+        // getting electric machines for creating table headers
+        // checking already existing  stock if yes then get the electric machines id from the existing stock
+        // if not get all the electric machines from the factory Machine master  table
+
+        if (!empty($data['groupedPowerConsumptionStockDetails'])) {
+           
+            $result = $groupedByDate[$date];
+
+            $distinctMachineId = [];
+
+            foreach ($result as $index => $eachResult) {
+                $distinctMachineId[] = $result[$index]['machine_id'];
+            }
+
+            $electricMachines = $this->factoryMachine_model
+            ->whereIn('id', $distinctMachineId) 
+            ->orderBy('id', 'asc')
+            ->get()
+            ->getResultArray();
+
+      
+        } else {
+
+            $electricMachines = $this->factoryMachine_model
+            ->where('is_active', 1)
+            ->where('energy_type', 'Electric')
+            ->orderBy('id', 'asc') 
+            ->get()
+            ->getResultArray();
+
         }
 
 
 
+        $electricMachinesCount = count($electricMachines);
 
-        $data['machineName'] = array_column($data['machineDetails'], 'machine_name');
+        $data['electricMachinesCount'] = $electricMachinesCount;
+        $data['electricMachines']     = $electricMachines;
+
+        $date = DateTime::createFromFormat('Y-m', $month);
+
+        $formattedDate = $date->format('M-Y');
+
+        $data['month'] = $formattedDate;
+
+       // return  $this->response->setJSON(['status' =>'success' ,'message' => $data['electricMachines']]);
+
+        return $this->loadViews("powerConsumptionDetails", $this->global, $data, NULL);   
 
-        $this->global['pageTitle'] = 'Power Consumption Details';
-        $this->loadViews("powerConsumptionDetails", $this->global, $data, NULL);
     }
 
-    public function getElectricConsumptionPivot($machineDetails, $startDate, $endDeate)
-    {
-        $machineIds = array_column($machineDetails, 'id');
+    public function updatePowerConsumptionDetails(){
 
-        if (empty($machineIds)) {
-            return [];
-        }
+        //pm stands for power machine
+        
+        
+        $postData = $this->request->getPost();
 
-        $fields = ['opening_units', 'closing_units', 'total_units'];
+        $updatePowerConsumptionDetailsData = json_decode($postData['updatePowerConsumptionDetails'], true);
 
-        $pivotColumns = [];
-        foreach ($machineIds as $machineId) {
-            foreach ($fields as $field) {
-                $pivotColumns[] = "MAX(CASE WHEN machine_id = $machineId THEN $field ELSE 0 END) AS {$field}_{$machineId}";
-            }
-        }
+        $updateTotalPmDetailsData = $updatePowerConsumptionDetailsData[0];
+        $updatePmDetailsData      = $updatePowerConsumptionDetailsData[1];
+        
+        //PmR stands for power machine readings 
 
-        $pivotColumnString = implode(", ", $pivotColumns);
+        $updatesPmR = [];
+        $insertsPmR = [];
 
-        $sql = "SELECT `date`, $pivotColumnString FROM `t_powerConsumptionDetails`
-                WHERE machine_id IN (" . implode(",", $machineIds) . ") AND `date` >= ? AND `date` <= ?
-                GROUP BY `date`";
+        $updatesTotalPmR  = []; 
+        $insertsTotalPmR = [];
 
-        $query = $this->db->query($sql, [$startDate, $endDeate]);
-        $result = $query->getResultArray();
-
-        return $result;
-    }
-
-    public function addOrEditPowerConsumptionDetails()
-    {
-        $electricMachineTableData = json_decode($this->request->getPost('electricMachineTableData'), true);
-
-        $transformedData = [];
-        foreach ($electricMachineTableData as $entry) {
-            $date = $entry['date'];
-
-            foreach ($entry as $key => $value) {
-
-                if ($key === 'date') {
-                    continue;
+                // Fetch existing records in bulk for power machine details
+                $dates = array_column($updatePmDetailsData, 'date');
+                $machineIds = array_column($updatePmDetailsData, 'machine_id');
+                $existingPmRecords = $this->powerConsumptionDetails_model
+                    ->whereIn('date', $dates)
+                    ->whereIn('machine_id', $machineIds)
+                    ->findAll();
+            
+                $existingPmMap = [];
+                foreach ($existingPmRecords as $record) {
+                    $existingPmMap[$record['date']][$record['machine_id']] = $record;
                 }
-
-                preg_match('/(.*?)_(\d+)$/', $key, $matches);
-
-                if (count($matches) === 3) {
-                    $field = $matches[1];
-                    $machineId = $matches[2];
-
-                    $insertKey = "{$date}_{$machineId}";
-                    if (!isset($transformedData[$insertKey])) {
-                        $transformedData[$insertKey] = [
-                            'date' => DateTime::createFromFormat('d-m-Y', $date)->format('Y-m-d'),
-                            'machine_id' => $machineId,
-                            'opening_units' => 0.00,
-                            'closing_units' => 0.00,
-                            'total_units' => 0.00
-                        ];
+            
+                foreach ($updatePmDetailsData as $data) {
+                    $date = $data['date'];
+                    $machineId = $data['machine_id'];
+            
+                    $dbData = [
+                        'date' => $data['date'],
+                        'machine_id' => $data['machine_id'],
+                        'opening_units' => $data['opening_units'],
+                        'closing_units' => $data['closing_units'],
+                        'total_units' => $data['total_units'],
+                    ];
+            
+                    if (isset($existingPmMap[$date][$machineId])) {
+                        $dbData['id'] = $existingPmMap[$date][$machineId]['id'];
+                        $updatesPmR[] = $dbData;
+                    } else {
+                        $insertsPmR[] = $dbData;
                     }
-
-                    $transformedData[$insertKey][$field] = (float) $value;
                 }
-            }
-        }
+            
+                // Fetch existing records in bulk for power stock summary
+                $dates = array_column($updateTotalPmDetailsData, 'date');
+                $existingTotalPmRecords = $this->powerConsumptionSummary_model
+                    ->whereIn('date', $dates)
+                    ->findAll();
+            
+                $existingTotalPmMap = [];
+                foreach ($existingTotalPmRecords as $record) {
+                    $existingTotalPmMap[$record['date']] = $record;
+                }
+            
+                foreach ($updateTotalPmDetailsData as $data) {
+                    $date = $data['date'];
+            
+                    $dbData = [
+                        'date' => $data['date'],
+                        'opening_reading' => $data['opening_reading'],
+                        'final_reading'   => $data['final_reading'],
+                        'total_reading'   => $data['total_reading'],
+                        'total_units'     => $data['total_units'],
+                        'average_pf'      => $data['average_pf'],
+                        'present_pf'      => $data['present_pf'],
+                        'md'              => $data['md'],
+                        'mf'              => $data['mf']
+                    ];
+            
+                    if (isset($existingTotalPmMap[$date])) {
+                        $dbData['id'] = $existingTotalPmMap[$date]['id'];
+                        $updatesTotalPmR[] = $dbData;
+                    } else {
+                        $insertsTotalPmR[] = $dbData;
+                    }
+                }
+            
+                // Start the transaction
+                $this->db->transBegin();
+            
+                try {
+                    if (!empty($insertsPmR)) {
+                        $this->powerConsumptionDetails_model->insertBatch($insertsPmR);
+                    }
+            
+                    if (!empty($updatesPmR)) {
+                        $this->powerConsumptionDetails_model->updateBatch($updatesPmR, 'id');
+                    }
+            
+                    if (!empty($insertsTotalPmR)) {
+                        $this->powerConsumptionSummary_model->insertBatch($insertsTotalPmR);
+                    }
+            
+                    if (!empty($updatesTotalPmR)) {
+                        $this->powerConsumptionSummary_model->updateBatch($updatesTotalPmR, 'id');
+                    }
+            
+                    // Commit the transaction if all operations are successful
+                    $this->db->transCommit();
+                    echo "Data Saved Successfully";
+            
+                } catch (\Exception $error) {
+                    // Rollback the transaction in case of any errors
+                    $this->db->transRollback();
+                    echo "An error occurred: " . $error->getMessage();
+                }
 
-
-        foreach ($transformedData as $row) {
-
-            $existingRow = $this->powerConsumptionDetails_model->where('date', $row['date'])->where('machine_id', $row['machine_id'])->first();
-            if ($existingRow) {
-                $this->powerConsumptionDetails_model->update($existingRow['id'], $row);
-            } else {
-                $this->powerConsumptionDetails_model->insert($row);
-            }
-        }
-
-
-        echo "Data successfully saved.";
     }
 
 
+
     public function dieselMachineStockDetails(){
 
         
@@ -2290,208 +2438,7 @@ class StockController extends BaseController
         }
     }
 
-    public function newPowerConsumptionDetails(){
-
-         
-        if ($this->request->getMethod() === 'POST') {
-
-            $month = $this->request->getPost('month');
-
-            $date = DateTime::createFromFormat('M-Y', $month);
-
-            $formattedDate = $date->format('Y-m');
-
-            $month = $formattedDate;
-        } else {
-
-           // $month = '2024-12';
-
-            $month = date('Y-m');
-        }
-
-        $data = [];
-
-        $data['month'] = $month;
-
-        $this->global['pageTitle'] = 'Power Consumption Stock Details';
-
-
-        // Get the previous month's last date power consumption stock details for next month updation
-
-        $previousMonth = DateTime::createFromFormat('Y-m', $month)->modify('-1 month')->format('Y-m');
-        $previousMonthStartDate = "$previousMonth-01";
-        $previousMonthEndDate = date("Y-m-t", strtotime($previousMonthStartDate));
-
-        $data['previousMonthPowerConsumptionStockDetails'] = $this->powerConsumptionDetails_model
-            ->select(['machine_id', 'date', 'closing_units'])
-            ->distinct()
-            ->where('date =', $previousMonthEndDate)
-            ->groupBy(['machine_id', 'date'])
-            ->orderBy('date', 'desc')
-            ->orderBy('machine_id', 'asc')
-            ->findAll();
-
-
-
-        // checking in database if the data is available for the month
-
-        $startDate = "$month-01";
-        $endDate = date("Y-m-t", strtotime($startDate));
-
-        $data['powerConsumptionStockDetails'] = $this->powerConsumptionDetails_model
-            ->where('date >=', $startDate)
-            ->where('date <=', $endDate)
-            ->groupBy(['machine_id', 'date'])
-            ->orderBy('date', 'asc')
-            ->orderBy('machine_id', 'asc')
-            ->findAll();
-
-        // Initialize an empty array to hold the grouped data
-        $data['groupedPowerConsumptionStockDetails'] = [];
-
-        // Temporary array to store grouped data by date
-        $groupedByDate = [];
-
-        // Group by 'date'
-        foreach ($data['powerConsumptionStockDetails'] as $detail) {
-            $date = $detail['date'];
-
-            // Initialize the outer array for this date if it doesn't exist
-            if (!isset($groupedByDate[$date])) {
-                $groupedByDate[$date] = [];
-            }
-
-            /*******************************************************************************************************************
-             creating an sub array (inner array) for date wise and append the detail into an array as sub-array 
-
-             $groupedByDate[] outer array
-
-             $groupedByDate[$date]
-             will look like [[material1],[material2],[material3],[material4],[material5]] inner array
-
-             the above process is done for single row (date wise) and the same process is repeated for all the rows
-            *******************************************************************************************************************/
-
-            $groupedByDate[$date][] = $detail;
-        }
-
-        // Reset the structure to have indexed arrays without the date keys
-        $data['groupedPowerConsumptionStockDetails'] = array_values($groupedByDate);
-
-
-        // getting electric machines for creating table headers
-        // checking already existing  stock if yes then get the electric machines id from the existing stock
-        // if not get all the electric machines from the factory Machine master  table
-
-        if (!empty($data['groupedPowerConsumptionStockDetails'])) {
-           
-            $result = $groupedByDate[$date];
-
-            $distinctMachineId = [];
-
-            foreach ($result as $index => $eachResult) {
-                $distinctMachineId[] = $result[$index]['machine_id'];
-            }
-
-            $electricMachines = $this->factoryMachine_model
-            ->whereIn('id', $distinctMachineId) 
-            ->orderBy('id', 'asc')
-            ->get()
-            ->getResultArray();
-
-      
-        } else {
-
-            $electricMachines = $this->factoryMachine_model
-            ->where('is_active', 1)
-            ->where('energy_type', 'Diesel')
-            ->orderBy('id', 'asc') 
-            ->get()
-            ->getResultArray();
-
-        }
-
-
-
-        $electricMachinesCount = count($electricMachines);
-
-        $data['electricMachinesCount'] = $electricMachinesCount;
-        $data['electricMachines']     = $electricMachines;
-
-        $date = DateTime::createFromFormat('Y-m', $month);
-
-        $formattedDate = $date->format('M-Y');
-
-        $data['month'] = $formattedDate;
-
-        return  $this->response->setJSON(['status' =>'success' ,'message' => $data['electricMachines']]);
-
-      //  return $this->loadViews("powerConsumptionStockDetails", $this->global, $data, NULL);   
-
-    }
-
-    public function updatePowerConsumptionDetails(){
-        
-        
-        $postData = $this->request->getPost();
-
-        $updatePowerConsumptionDetailsData = json_decode($postData['updatePowerConsumptionDetails'], true);
-
-        $updates = [];
-
-        $inserts = [];
-
-        foreach ($updatePowerConsumptionDetailsData as $data) {
-
-            $date = $data['date'];
-            $machineId = $data['machine_id'];
-
-
-            $dbData = [
-                'date' => $data['date'],
-                'machine_id' => $data['machine_id'],
-                'opening_units' => $data['opening'],
-                'closing_units' => $data['receipt'],
-                'total_units' => $data['used'] 
-            ];
-
-            $resultExists = $this->factoryVehicleDieselDetails_model
-                ->where('date', $date)
-                ->where('machine_id', $machineId)
-                ->first();
-
-
-            if (empty($resultExists)) {
-                $inserts[] = $dbData;
-            } else {
-                $dbData['id'] = $resultExists['id'];
-                $updates[] = $dbData;
-            }
-        }
-
-
-        if (!empty($inserts)) {
-            $this->factoryVehicleDieselDetails_model->insertBatch($inserts);
-        }
-
-        if (!empty($updates)) {
-
-            $updateResult = $this->factoryVehicleDieselDetails_model->updateBatch($updates, 'id');
-
-            if ($updateResult === FALSE) {
-                echo "Error during update";
-            } else {
-                echo "Data Updated Successfully";
-                return;
-            }
-        }
-
-        echo "Data Saved Successfully";
-
-
-
-    }
-
+ 
 
 
     
diff --git a/app/Models/PowerConsumptionSummaryModel.Php b/app/Models/PowerConsumptionSummaryModel.Php
new file mode 100644
index 00000000..80aff61d
--- /dev/null
+++ b/app/Models/PowerConsumptionSummaryModel.Php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class PowerConsumptionSummaryModel extends Model
+{
+    protected $table = 't_powerConsumptionSummary';  
+    protected $primaryKey = 'id';                        
+
+    protected $allowedFields = [
+        'date',
+        'machine_id',
+        'opening_reading',
+        'final_reading',
+        'total_reading',
+        'total_units',
+        'present_pf',
+        'average_pf',
+        'md',
+        'mf'
+    ];
+
+    protected $useTimestamps = true; 
+    protected $createdField = 'created_at';
+    protected $updatedField = 'updated_at';
+
+   
+}
diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php
index 842805a5..8f64d404 100644
--- a/app/Views/CoatingMachineDetail.php
+++ b/app/Views/CoatingMachineDetail.php
@@ -1441,7 +1441,7 @@
 
         document.getElementById('coatingMachineDetailsExport').addEventListener('click',function(){
 
-        exportTableToExcel(tableId,'coatingMachineDetails.xlsx');
+        exportTableToExcel(tableId,'coatingMachineDetails_<?=$month?>.xlsx');
 
     })
 
diff --git a/app/Views/bagStockDetails.php b/app/Views/bagStockDetails.php
index 06a27484..ae0a1a0a 100644
--- a/app/Views/bagStockDetails.php
+++ b/app/Views/bagStockDetails.php
@@ -97,29 +97,7 @@
         padding-bottom: 8px;
         padding-top: 8px;
         width: 100%;
-    }
-
-
-    .celda_encabezado_general {
-        background-color: #00a65a;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;;
-        text-align: center;
-    }
-
-    
-    .celda_encabezado_total {
-        background-color:#ffffff;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;
-        ;
-        text-align: center;
-    }
-    
+    }    
 
     ._Separador {
         background-color: #fff;
@@ -133,14 +111,6 @@
         width: 4px;
     }
 
-    .celda_normal {
-        /*background-color: #fff;*/
-        /* <!-- ad9271 into ffffff brown-light to green-light --> */
-        text-align: center;
-        border: 1px solid #ccc;
-        padding: 2px 4px;
-    }
-
     /*style excel*/
     .excel_cell {
         border: 1px solid #CCC;
@@ -167,37 +137,82 @@
         height: 20px;
     }
 
-    #bagStockDetailsTableId th:nth-child(1),
-    #bagStockDetailsTableId td:nth-child(1) {
-        position: sticky;
-        left: 0;
+
+
+    .celda_encabezado_general {
         background-color: #00a65a;
-        z-index: 2;
-        border-right: 2px solid #ddd;
+        border: 1px solid #ccc;
         color: #ffffff;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
     }
 
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
     
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
+    }
 
-    #bagStockDetailsTableSummaryId th:nth-child(1),
-    #bagStockDetailsTableSummaryId td:nth-child(1) {
+
+    /* Make entire thead sticky */
+    .fht-table thead {
+        position: sticky;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
+    }
+
+    .dropdown-menu   {
+        z-index :25 ;
+    }
+
+
+
+    /* Ensure each <th> in thead stays sticky */
+    .fht-table thead th {
+        position: sticky;
+        top: 0;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
         background-color: #00a65a;
-        z-index: 2;
+        z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
     }
 
-
-
+    /* Table Wrapper for Scrolling */
     .table-responsive {
-        overflow-y: auto;
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
     }
 
-    .fht-table thead th {
-        top: 0;
-        z-index: 5!important;
+    td{
+        min-width:  100px;
+        max-width:  100px;
     }
 
 
@@ -395,7 +410,7 @@
                                                             contenteditable="true" 
                                                           <?php endif; ?>
 
-                                                          ><?= $bagStock['opening']?>
+                                                          ><?= $bagStock['opening'] ?? " " ?>
                                                         </td>
 
                                                         <td class="celda_normal receiptStock"
@@ -403,7 +418,7 @@
                                                           oninput="receiptStockChange(this)"
                                                             contenteditable="true"
                                                             >                                                          
-                                                          <?= $bagStock['receipt']?>
+                                                          <?= $bagStock['receipt'] ?? " " ?>
                                                         </td>
 
                                                         <td class="celda_normal usedStock" 
@@ -412,12 +427,12 @@
                                                           contenteditable="true"
                                                            
                                                           >
-                                                          <?= $bagStock['used']?>
+                                                          <?= $bagStock['used'] ?? " " ?>
                                                         </td>
 
                                                         <td class="celda_normal balanceStock"
                                                           data-id="<?=$bagStock['date']?> <?=$bagStock['materialCode']?>">
-                                                          <?= $bagStock['balanceStock']?>
+                                                          <?= $bagStock['balanceStock'] ?? " " ?>
                                                         </td> 
 
                                                     <?php 
@@ -439,10 +454,10 @@
  
                                                      // Sum values for the material
                                                      
-                                                     $summary[$materialCode]['opening']         = "-" ;
-                                                     $summary[$materialCode]['receipt']        += $bagStock['receipt'] == '-' ? 0 : $bagStock['receipt'] ;
-                                                     $summary[$materialCode]['used']           += $bagStock['used'] == '-' ? 0 :    $bagStock['used'] ;
-                                                     $summary[$materialCode]['balanceStock']    = $bagStock['balanceStock'] == '-' ? 0 : $bagStock['balanceStock'] ; 
+                                                     $summary[$materialCode]['opening']         = "-" ; 
+                                                     $summary[$materialCode]['receipt']        += is_numeric( $bagStock['receipt']) ? $bagStock['receipt'] : 0 ;
+                                                     $summary[$materialCode]['used']           += is_numeric( $bagStock['used']) ? $bagStock['used'] : 0 ;
+                                                     $summary[$materialCode]['balanceStock']    = is_numeric( $bagStock['balanceStock']) ? $bagStock['balanceStock'] : 0 ;
  
                                                 
                                                 } ?>
@@ -461,7 +476,7 @@
                                                     <th class="celda_encabezado_total">Receipt</th>
                                                     <th class="celda_encabezado_total">Used</th>
                                                     <th class="celda_encabezado_total">Balance Stock</th>
-                                                    <?php } ?>
+                                                  <?php } ?>    
                                                 </thead>
                                              
                                                 <tbody>
@@ -540,20 +555,20 @@
                                                             contenteditable="true"
 
                                                             <?php }?>
-                                                                ><?= $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock']??'-' ?></td>
+                                                                ><?= $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' ' ?></td>
 
                                                             <td class="celda_normal receiptStock"
                                                             data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
                                                                     oninput="receiptStockChange(this)"
-                                                            contenteditable="true"> - </td>
+                                                            contenteditable="true"> <?= " " ?> </td>
 
                                                             <td class="celda_normal usedStock"  
                                                             data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
-                                                                    oninput="usedStockChange(this)" contenteditable="true"> - </td>
+                                                                    oninput="usedStockChange(this)" contenteditable="true"> <?= " " ?> </td>
 
                                                             <td class="celda_normal balanceStock"
                                                             data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
-                                                                ><?= $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock']??'-' ?></td>
+                                                                ><?= $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' ' ?></td>
                                                         <?php } ?>
                                                     </tr>
                                                 <?php } ?>
@@ -812,7 +827,7 @@
 
             let currentBalanceStock = (Number(openingStock) + Number(receiptStock)) - Number(usedStock);
 
-            document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText=currentBalanceStock;
+            document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock == 0 ? " " : currentBalanceStock;
 
             updateStockValue( date,materialCode,currentBalanceStock )
 
@@ -839,7 +854,7 @@
 
             let currentBalanceStock = (Number(openingStock) + Number(receiptStock)) - Number(usedStock);
 
-            document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText=currentBalanceStock;
+            document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = ccurrentBalanceStock == 0 ? " " : currentBalanceStock ;
     
             updateStockValue( date,materialCode,currentBalanceStock )
     
@@ -869,7 +884,7 @@
 
             let currentBalanceStock = ( Number(openingStock) + Number(receiptStock) ) - Number(usedStock);
 
-            document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText=currentBalanceStock;
+            document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock == 0 ? " " : currentBalanceStock ;
         
             updateStockValue( date,materialCode,currentBalanceStock )
 
@@ -901,7 +916,7 @@
 
                 let dataId = `${otherDate} ${materialCode}`;
 
-                document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText=currentBalanceStock;
+                document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText = currentBalanceStock == 0 ? " " : currentBalanceStock;
 
                 let usedStock = validateInput(document.querySelector(`td.usedStock[data-id="${dataId}"]`).innerText);
 
@@ -909,10 +924,8 @@
 
                 currentBalanceStock = (Number(currentBalanceStock) + Number(receiptStock)) - Number(usedStock);
                 
-                document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText=currentBalanceStock;
+                document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock == 0 ? " " : currentBalanceStock;
 
-                // console.log( 'other date' , new Date(otherDate));
-                // console.log('new balance stock' , currentBalanceStock)
                 
             }
         })
diff --git a/app/Views/dieselStockDetails.php b/app/Views/dieselStockDetails.php
index 9632fba0..0a0baea1 100644
--- a/app/Views/dieselStockDetails.php
+++ b/app/Views/dieselStockDetails.php
@@ -100,25 +100,6 @@
     }
 
 
-    .celda_encabezado_general {
-        background-color: #00a65a;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;
-        text-align: center;
-    }
-
-    .celda_encabezado_total {
-        background-color:#ffffff !important;
-        border: 1px solid #ffffff;
-        color: #ffffff !important;
-        font-weight: bold;
-        padding: 6px 10px;
-        text-align: center;
-    }
-
-
     ._Separador {
         background-color: #fff;
         height: 12px;
@@ -131,13 +112,7 @@
         width: 4px;
     }
 
-    .celda_normal {
-        /*background-color: #fff;*/
-        /* <!-- ad9271 into ffffff brown-light to green-light --> */
-        text-align: center;
-        border: 1px solid #ccc;
-        padding: 10px 6px;
-    }
+
 
     /*style excel*/
     .excel_cell {
@@ -166,54 +141,81 @@
     }
 
 
-/* Make entire thead sticky */
-.fht-table thead {
-    position: sticky;
-    top: 0;
-    z-index: 20; /* Ensure the entire header stays above table rows */
-    background-color: #00a65a; /* Header background color */
-}
+    .celda_encabezado_general {
+        background-color: #00a65a;
+        border: 1px solid #ccc;
+        color: #ffffff;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
 
-.dropdown-menu   {
-    z-index :25 ;
-}
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
+    
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
+    }
+
+
+    /* Make entire thead sticky */
+    .fht-table thead {
+        position: sticky;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
+    }
+
+    .dropdown-menu   {
+        z-index :25 ;
+    }
 
 
 
-/* Ensure each <th> in thead stays sticky */
-.fht-table thead th {
-    position: sticky;
-    top: 0;
-    z-index: 11; /* Higher than table rows but lower than first column */
-    background-color: #00a65a; /* Green background */
-    color: #ffffff;
-    border: 1px solid #ddd;
-    padding: 10px;
-}
+    /* Ensure each <th> in thead stays sticky */
+    .fht-table thead th {
+        position: sticky;
+        top: 0;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
 
-/* Sticky First Column */
-.fht-table th:nth-child(1),
-.fht-table td:nth-child(1) {
-    position: sticky;
-    left: 0;
-    background-color: #00a65a;
-    z-index: 15; /* Ensures it stays above other cells */
-    border-right: 2px solid #ddd;
-    color: #ffffff;
-}
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 15; /* Ensures it stays above other cells */
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
 
-/* Table Wrapper for Scrolling */
-.table-responsive {
-    overflow-x: auto;
-    overflow-y: auto; 
-    max-height: 450px; /* Adjust as needed */
-    position: relative;
-}
+    /* Table Wrapper for Scrolling */
+    .table-responsive {
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
+    }
 
-td{
-    min-width:  100px;
-    max-width:  100px;
-}
+    td{
+        min-width:  100px;
+        max-width:  100px;
+    }
 
 
 
@@ -303,7 +305,7 @@ foreach ($period as $day) {
                                                 </a>
                                                 <div class="dropdown-menu dropdown-menu-right">
                                                     <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
-                                                    <a class="dropdown-item" href="#">Export</a>
+                                                    <a class="dropdown-item" id="dieselMachineStockDetailsExport" href="#">Export</a>
                                                 </div>
                                             </div>
                                         </div>
@@ -661,7 +663,7 @@ foreach ($period as $day) {
 
                                                                 <?php } ?> 
 
-                                                                ><?= $previousMonthTotalDieselMachineStockDetails[0]['balance_stock'] !=0 ?? " " ?></td>
+                                                                ><?= $previousMonthTotalDieselMachineStockDetails[0]['balance_stock']  ?></td>
                                                                 
 
 
@@ -677,7 +679,7 @@ foreach ($period as $day) {
                                                                 <td class="celda_normal balanceTD"
                                                                 data-id="<?= $dateInMonth ?>"
                                                                 
-                                                                ><?= $previousMonthTotalDieselMachineStockDetails[0]['balance_stock'] !=0 ?? " " ?></td>
+                                                                ><?= $previousMonthTotalDieselMachineStockDetails[0]['balance_stock']  ?></td>
 
 
 
@@ -707,13 +709,13 @@ foreach ($period as $day) {
 
                                                                 <?php } ?>
                                                                 
-                                                                ><?= $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ?? ' ' ?>
+                                                                ><?= $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ?>
                                                             </td>
 
                                                             <td class="celda_normal closingReading"
                                                                 data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
                                                                 oninput="closingReadingChange(this)"
-                                                                contenteditable="true"><?= $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ?? ' ' ?>
+                                                                contenteditable="true"><?= $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ?>
                                                             </td>
 
                                                             <td class="celda_normal fillingDiesel"
@@ -1286,4 +1288,32 @@ foreach ($period as $day) {
 
     }
 
+</script>
+
+
+<script>
+
+    $(document).ready(function(){
+
+        function exportTableToExcel(tableID, filename = '') {
+            let table = document.getElementById(tableID);
+            let ws = XLSX.utils.table_to_sheet(table); // Convert table to worksheet
+            let wb = XLSX.utils.book_new(); // Create a new workbook
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
+            XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
+        }
+
+        let tableId = 'dieselStockDetailsTableId';
+
+        document.getElementById('dieselMachineStockDetailsExport').addEventListener('click',function(){
+
+        exportTableToExcel(tableId,'Diesel_Machine_Stock_<?=$month?>.xlsx');
+
+    })
+
+
+    })
+
+
+
 </script>
\ No newline at end of file
diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php
index eccfebc6..b21eada8 100644
--- a/app/Views/drierMachineDetails.php
+++ b/app/Views/drierMachineDetails.php
@@ -187,57 +187,75 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
 
 
-    #drierTable th:nth-child(1),
-    #drierTable td:nth-child(1) {
-    position: sticky;
-    left: 0;
-    background-color: #00a65a;
-    z-index: 2;
-    border-right: 2px solid #ddd;
-    color: #ffffff;
-}
-
-
-    #drierTableSummaryId td:nth-child(1) {
-    position: sticky;
-    left: 0;
-    background-color: #ffffff;
-    z-index: 2;
-    border-right: 2px solid #ddd;
-    color: #ffffff;
-   }
-
-   .fht-table th:nth-child(1)
-    {
-        position: sticky;
-        left: 0;
-        top: 0;
-        background-color: #00a65a; 
-        z-index: 7!important;
-        border-right: 2px solid #ddd; 
-        color: #ffffff;
-    }
-
-
-    .fht-table td:nth-child(1)
-    {
-        position: sticky;
-        left: 0;
+    .celda_encabezado_general {
         background-color: #00a65a;
-        z-index: 2;
-        border-right: 2px solid #ddd; 
+        border: 1px solid #ccc;
         color: #ffffff;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
     }
 
-    .table-responsive {
-        overflow-y: auto;
-        max-height: 450px;
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
+    
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
     }
 
+
+    /* Make entire thead sticky */
+    .fht-table thead {
+        position: sticky;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
+    }
+
+    .dropdown-menu   {
+        z-index :25 ;
+    }
+
+
+
+    /* Ensure each <th> in thead stays sticky */
     .fht-table thead th {
         position: sticky;
         top: 0;
-        z-index: 5!important;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 15; /* Ensures it stays above other cells */
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
+
+    /* Table Wrapper for Scrolling */
+    .table-responsive {
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
     }
 
 
@@ -828,7 +846,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
         document.getElementById('drierMachineDetailsExport').addEventListener('click',function(){
 
-        exportTableToExcel(tableId,'drierMachineDetails.xlsx');
+        exportTableToExcel(tableId,'drierMachineDetails_<?=$datefordropdown?>.xlsx');
 
     })
 
@@ -885,6 +903,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
                         $('#loader').hide();
                         alert(data);
+                        window.location.reload();
 
                     }
 
diff --git a/app/Views/dustAndRoughStockDetails.php b/app/Views/dustAndRoughStockDetails.php
index 395ac55e..9fbd1d66 100644
--- a/app/Views/dustAndRoughStockDetails.php
+++ b/app/Views/dustAndRoughStockDetails.php
@@ -98,17 +98,7 @@
         padding-top: 8px;
         width: 100%;
     }
-
-
-    .celda_encabezado_general {
-        background-color: #00a65a;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;;
-        text-align: center;
-    }
-    
+       
 
     ._Separador {
         background-color: #fff;
@@ -122,13 +112,7 @@
         width: 4px;
     }
 
-    .celda_normal {
-        /*background-color: #fff;*/
-        /* <!-- ad9271 into ffffff brown-light to green-light --> */
-        text-align: center;
-        border: 1px solid #ccc;
-        padding: 2px 4px;
-    }
+
 
     /*style excel*/
     .excel_cell {
@@ -156,18 +140,11 @@
         height: 20px;
     }
 
-    #dustAndRoughStockDetailsTableId th:nth-child(1),
-    #dustAndRoughStockDetailsTableId td:nth-child(1) {
-        position: sticky;
-        left: 0;
-        background-color: #00a65a;
-        z-index: 2;
-        border-right: 2px solid #ddd;
-        color: #ffffff;
-    }
+ 
 
-    .celda_encabezado_total {
-        background-color:#ffffff;
+    
+    .celda_encabezado_general {
+        background-color: #00a65a;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -175,9 +152,79 @@
         text-align: center;
     }
 
-    .modal {
-        padding-right: 30% ! important;
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
     }
+    
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
+    }
+
+
+    /* Make entire thead sticky */
+    .fht-table thead {
+        position: sticky;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
+    }
+
+    .dropdown-menu   {
+        z-index :25 ;
+    }
+
+
+
+    /* Ensure each <th> in thead stays sticky */
+    .fht-table thead th {
+        position: sticky;
+        top: 0;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 15; /* Ensures it stays above other cells */
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
+
+    /* Table Wrapper for Scrolling */
+    .table-responsive {
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
+    }
+
+    td{
+        min-width:  150px;
+        max-width:  150px;
+    }
+   
+
+
+
+
+
+
 </style>
 <div class="content-page">
     <div class="content">
@@ -223,6 +270,18 @@
                                         <div class="form-group col-md-2">
                                             <button type="submit" class="btn btn-success"> Change Month </button>
                                         </div>
+                                        <div class="col-md-1"></div>
+                                        <div class="col-6">
+                                            <div class="dropdown float-right">
+                                                <a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
+                                                    aria-expanded="false">
+                                                    <i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
+                                                </a>
+                                                <div class="dropdown-menu dropdown-menu-right">
+                                                    <a class="dropdown-item" id="dustAndRoughStockExport" href="#">Export</a>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
                                 </form>
 
@@ -277,17 +336,17 @@
                                         data-id="<?= $dustAndRoughStockDetail['date'] ?>"
                                         oninput="finalRoughStockChange(this)"
                                         contenteditable="true"
-                                        ><?= $dustAndRoughStockDetail['finalRough'] ?></td>
+                                        ><?= $dustAndRoughStockDetail['finalRough'] ?? ' ' ?></td>
 
                                         <td class="celda_normal dust"
                                         data-id="<?= $dustAndRoughStockDetail['date'] ?>"
                                         oninput="dustStockChange(this)"
                                         contenteditable="true"
-                                        ><?= $dustAndRoughStockDetail['dust'] ?></td>
+                                        ><?= $dustAndRoughStockDetail['dust'] ?? ' ' ?></td>
 
                                         <td class="celda_normal total"
                                          data-id="<?= $dustAndRoughStockDetail['date'] ?>"
-                                        ><?= $dustAndRoughStockDetail['total'] ?></td>
+                                        ><?= $dustAndRoughStockDetail['total'] ?? ' ' ?></td>
                                         </tr>
 
                                         <div class="table-responsive" style="width: 700px;">
@@ -308,7 +367,7 @@
 
                                         $summary['finalRough'] +=  $dustAndRoughStockDetail['finalRough'] == "-" ? 0 : (float) $dustAndRoughStockDetail['finalRough'] ;
                                         $summary['dust']       +=  $dustAndRoughStockDetail['dust']       == "-" ? 0 : (float) $dustAndRoughStockDetail['dust'] ;
-                                        $summary['total']      +=  $dustAndRoughStockDetail['total']      == "-" ? 0 :(float) $dustAndRoughStockDetail['total'] ;
+                                        $summary['total']      +=  $dustAndRoughStockDetail['total']      == "-" ? 0 : (float) $dustAndRoughStockDetail['total'] ;
                                            
                                            } ?>
 
@@ -377,17 +436,17 @@
                                             data-id="<?= $dateInMonth ?>"
                                             oninput="finalRoughStockChange(this)"
                                             contenteditable="true"
-                                            ><?= 0 ?></td>
+                                            ><?= ' ' ?></td>
 
                                             <td class="celda_normal dust"
                                             data-id="<?= $dateInMonth ?>"
                                             oninput="dustStockChange(this)"
                                             contenteditable="true"
-                                            ><?= 0 ?></td>
+                                            ><?= ' ' ?></td>
 
                                             <td class="celda_normal total"
                                              data-id="<?= $dateInMonth ?>"
-                                            ><?= 0 ?></td>
+                                            ><?= ' ' ?></td>
                                         </tr>
                                         <?php
                                          } 
@@ -509,8 +568,8 @@
 
         try { 
             let dataId = tdElement.getAttribute('data-id')
-            let finalRoughStock = tdElement.innerText;
-            let dustStock = document.querySelector(`td.dust[data-id="${dataId}"]`).innerText;
+            let finalRoughStock = validateInput(tdElement.innerText);
+            let dustStock = validateInput(document.querySelector(`td.dust[data-id="${dataId}"]`).innerText);
             let total = (Number(finalRoughStock) + Number(dustStock)) ;
             document.querySelector(`td.total[data-id="${dataId}"]`).innerText=total;
 
@@ -522,8 +581,8 @@
     function dustStockChange(tdElement) { 
         try{ 
             let dataId = tdElement.getAttribute('data-id')
-            let finalRoughStock = document.querySelector(`td.finalRough[data-id="${dataId}"]`).innerText;
-            let dustStock = tdElement.innerText;
+            let finalRoughStock = validateInput(document.querySelector(`td.finalRough[data-id="${dataId}"]`).innerText);
+            let dustStock = validateInput(tdElement.innerText);
             let total = (Number(finalRoughStock) + Number(dustStock)) ;
             document.querySelector(`td.total[data-id="${dataId}"]`).innerText = total;
 
@@ -536,6 +595,58 @@
         }
 
 
+        
+    function validateInput(input) {
+
+
+        if (input == '' || input == ' ' || input == '-') {
+            return 0;
+        }
+
+        if (typeof input === 'string' && input.split('').map(char => char.charCodeAt(0))[0] == 10) {
+            return 0;
+        }
+
+        // Validate against the regex
+        const isValid = /^-?\d*\.?\d*$/.test(input);
+        if (!isValid) {
+            alert('Invalid input! Please enter a valid number.');
+            return 0;
+        }
+
+        return input;
+     }
+
+
+
+
 </script>
 
 
+<script>
+
+    $(document).ready(function(){
+
+        function exportTableToExcel(tableID, filename = '') {
+            let table = document.getElementById(tableID);
+            let ws = XLSX.utils.table_to_sheet(table); // Convert table to worksheet
+            let wb = XLSX.utils.book_new(); // Create a new workbook
+            XLSX.utils.book_append_sheet(wb, ws, 'Sheet1'); // Append sheet to workbook
+            XLSX.writeFile(wb, filename || 'export.xlsx'); // Save the file
+        }
+
+        let tableId = 'dustAndRoughStockDetailsTableId';
+
+        document.getElementById('dustAndRoughStockExport').addEventListener('click',function(){
+
+        exportTableToExcel(tableId ,'dustAndRoughStockDetails.xlsx');
+
+    })
+
+
+    })
+
+
+
+</script>
+
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index c90d89c7..f276108b 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -1729,7 +1729,7 @@ $(document).ready(function() {
 
              document.getElementById('incomingSilicaSandDetailsExport').addEventListener('click',function(){
 
-             exportTableToExcel(tableId,'incomingSilicaSandDetails.xlsx');
+             exportTableToExcel(tableId,'incomingSilicaSandDetails_<?=$month?>.xlsx');
 
        })
 
diff --git a/app/Views/powerConsumptionDetails.php b/app/Views/powerConsumptionDetails.php
index b025b041..ecfec6d9 100644
--- a/app/Views/powerConsumptionDetails.php
+++ b/app/Views/powerConsumptionDetails.php
@@ -1,179 +1,235 @@
-<?php
-$datefordropdown = format_date($datefordropdown, 0, 'M-Y');
-?>
 <style type="text/css">
-.num {
-    text-align: right;
-}
+    .num {
+        text-align: right;
+    }
+
+    .fht-table,
+    .fht-table thead,
+    .fht-table tfoot,
+    .fht-table tbody,
+    .fht-table tr,
+    .fht-table th,
+    .fht-table td {
+        margin: 0;
+    }
+
+    .fht-table td {
+        text-align: center;
+    }
+
+    .fht-table td:hover {
+        background-color: #00a65a;
+        color: #ffffff;
+    }
+
+    .fht-table {
+        border: 0 none;
+        height: auto;
+        width: auto;
+        border-collapse: collapse;
+        border-spacing: 0;
+        /*table-layout: fixed;  Algoritmo de distribucion fijo */
+        white-space: nowrap;
+    }
+
+    .fht-table th,
+    .fht-table td {
+        overflow: hidden;
+    }
+
+    .fht-table-wrapper,
+    .fht-table-wrapper .fht-thead,
+    .fht-table-wrapper .fht-tfoot,
+    .fht-table-wrapper .fht-fixed-column .fht-tbody,
+    .fht-table-wrapper .fht-fixed-body .fht-tbody,
+    .fht-table-wrapper .fht-tbody {
+        overflow: hidden;
+        position: relative;
+    }
+
+    .fht-table-wrapper .fht-fixed-body .fht-tbody,
+    .fht-table-wrapper .fht-tbody {
+        overflow: auto;
+    }
+
+    .fht-table-wrapper .fht-table .fht-cell {
+        overflow: hidden;
+        height: 1px;
+    }
+
+    .fht-table-wrapper .fht-fixed-column,
+    .fht-table-wrapper .fht-fixed-body {
+        top: 0;
+        left: 0;
+        position: absolute;
+    }
+
+    .fht-table-wrapper .fht-fixed-column {
+        z-index: 1;
+    }
+
+    .fht-fixed-body .fht-thead table {
+        margin-right: 20px;
+        border: 0 none;
+    }
+
+    /*For Examples*/
+
+    .ContenedorTabla {
+        height: 500px;
+        margin: 0 auto;
+        overflow: auto;
+        width: auto;
+        position: relative;
+    }
+
+    .header,
+    .main {
+        display: inline-block;
+        height: auto;
+        width: 100%;
+    }
+
+    .titulosHeader {
+        border-bottom: 1px solid #e8bb25;
+        height: auto;
+        margin-bottom: 10px;
+        padding-bottom: 8px;
+        padding-top: 8px;
+        width: 100%;
+    }
 
 
-.fht-table,
-.fht-table thead,
-.fht-table tfoot,
-.fht-table tbody,
-.fht-table tr,
-.fht-table th,
-.fht-table td {
-    margin: 0;
-}
+    ._Separador {
+        background-color: #fff;
+        height: 12px;
+        border-left: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        width: 7px;
+    }
 
-.fht-table td {
-    text-align: center;
-}
-
-.fht-table td:hover {
-    background-color: #41a1c8;
-    color: #ffffff;
-}
-
-.fht-table {
-    border: 0 none;
-    height: auto;
-    width: auto;
-    border-collapse: collapse;
-    border-spacing: 0;
-    /*table-layout: fixed;  Algoritmo de distribucion fijo */
-    white-space: nowrap;
-}
-
-.fht-table th,
-.fht-table td {
-    overflow: hidden;
-}
-
-.fht-table-wrapper,
-.fht-table-wrapper .fht-thead,
-.fht-table-wrapper .fht-tfoot,
-.fht-table-wrapper .fht-fixed-column .fht-tbody,
-.fht-table-wrapper .fht-fixed-body .fht-tbody,
-.fht-table-wrapper .fht-tbody {
-    overflow: hidden;
-    position: relative;
-}
-
-.fht-table-wrapper .fht-fixed-body .fht-tbody,
-.fht-table-wrapper .fht-tbody {
-    overflow: auto;
-}
-
-.fht-table-wrapper .fht-table .fht-cell {
-    overflow: hidden;
-    height: 1px;
-}
-
-.fht-table-wrapper .fht-fixed-column,
-.fht-table-wrapper .fht-fixed-body {
-    top: 0;
-    left: 0;
-    position: absolute;
-}
-
-.fht-table-wrapper .fht-fixed-column {
-    z-index: 1;
-}
-
-.fht-fixed-body .fht-thead table {
-    margin-right: 20px;
-    border: 0 none;
-}
-
-/*For Examples*/
-
-.ContenedorTabla {
-    height: 500px;
-    margin: 0 auto;
-    overflow: auto;
-    width: auto;
-    position: relative;
-}
-
-.header,
-.main {
-    display: inline-block;
-    height: auto;
-    width: 100%;
-}
-
-.titulosHeader {
-    border-bottom: 1px solid #e8bb25;
-    height: auto;
-    margin-bottom: 10px;
-    padding-bottom: 8px;
-    padding-top: 8px;
-    width: 100%;
-}
+    ._Separador div {
+        width: 4px;
+    }
 
 
-.celda_encabezado_general {
-    background-color: #00a65a;
-    border: 1px solid #ccc;
-    color: #ffffff;
-    font-weight: bold;
-    padding: 2px 4px;
-    text-align: center;
-}
 
-._Separador {
-    background-color: #fff;
-    height: 12px;
-    border-left: 1px solid #ccc;
-    border-right: 1px solid #ccc;
-    width: 7px;
-}
+    /*style excel*/
+    .excel_cell {
+        border: 1px solid #CCC;
+        color: #222;
+        text-align: center;
+        font-size: 13px;
+        font-weight: normal;
+        padding: 4px;
+        white-space: pre-line;
+        empty-cells: show;
+    }
 
-._Separador div {
-    width: 4px;
-}
+    ._cell_header {
+        background-color: #EEE;
+    }
 
-.celda_normal {
-    border: 1px solid #ccc;
-    padding: 2px 4px;
-}
+    ._cell_Default {
+        background-color: #FFF;
+        text-align: left;
+    }
 
-/*style excel*/
-.excel_cell {
-    border: 1px solid #CCC;
-    color: #222;
-    text-align: center;
-    font-size: 13px;
-    font-weight: normal;
-    padding: 4px;
-    white-space: pre-line;
-    empty-cells: show;
-}
+    .excel_cell div {
+        width: 30px;
+        height: 20px;
+    }
+
+
+    .celda_encabezado_general {
+        background-color: #00a65a;
+        border: 1px solid #ccc;
+        color: #ffffff;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
+
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
+    
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
+    }
+
+
+    /* Make entire thead sticky */
+    .fht-table thead {
+        position: sticky;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
+    }
+
+    .dropdown-menu   {
+        z-index :25 ;
+    }
+
+
+
+    /* Ensure each <th> in thead stays sticky */
+    .fht-table thead th {
+        position: sticky;
+        top: 0;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 15; /* Ensures it stays above other cells */
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
+
+    /* Table Wrapper for Scrolling */
+    .table-responsive {
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
+    }
+
+    td{
+        min-width:  100px;
+        max-width:  100px;
+    }
 
-._cell_header {
-    background-color: #EEE;
-}
 
-._cell_Default {
-    background-color: #FFF;
-    text-align: left;
-}
 
-.excel_cell div {
-    width: 30px;
-    height: 20px;
-}
 
 
 
 
-#electricMachineTable th:nth-child(1),
-#electricMachineTable td:nth-child(1) {
-    position: sticky;
-    left: 0;
-    background-color: #00a65a;
-    z-index: 2;
-    border-right: 2px solid #ddd;
-    color: #ffffff;
-}
 </style>
 
 
+
 <?php
 
-$date = DateTime::createFromFormat('M-Y', $datefordropdown);
+$date = DateTime::createFromFormat('M-Y', $month);
 
 $startDate = $date->modify('first day of this month')->format('Y-m-d');
 $endDate =   $date->modify('last day of this month')->format('Y-m-d');
@@ -184,7 +240,7 @@ $datesInMonth = [];
 $period = new DatePeriod(
     new DateTime($startDate),
     new DateInterval('P1D'),
-    (new DateTime($endDate))->modify('+1 day') 
+    (new DateTime($endDate))->modify('+1 day')
 );
 
 foreach ($period as $day) {
@@ -195,55 +251,6 @@ foreach ($period as $day) {
 
 
 
-<div class="modal fade" id="bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-lg">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="myLargeModalLabel">Navigation Options</h4>
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
-            </div>
-            <div class="modal-body">
-                <div class="row">
-                    <!-- Machine Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="machineDropdown">Select Machine</label>
-                            <select id="machineDropdown" class="form-control">
-                                <option value="">Select Machine</option>
-                                <?php foreach ($machineName as $name): ?>
-                                    <option value="<?= $name; ?>"><?= $name; ?></option>
-                                <?php endforeach; ?>
-                            </select>
-                        </div>
-                    </div>
-
-                    <!-- Date Dropdown -->
-                    <div class="col-md-6">
-                        <div class="form-group">
-                            <label for="dateDropdown">Select Date</label>
-                            <select id="dateDropdown" class="form-control">
-                            
-                            <?php foreach($datesInMonth as $selectDate): ?>
-                                <?php  $selectDate=DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
-                                  <option value="<?=$selectDate?>"><?=$selectDate?></option>
-                            <?php endforeach; ?>
-       
-                            </select>
-                        </div>
-                    </div>
-                </div>
-                <button class="btn btn-primary float-right" onclick="navigateToMachine()">Navigate</button>
-            </div>
-        </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
-
-
-
-
-
-
-
 <div class="content-page">
     <div class="content">
         <!-- Start Content-->
@@ -257,7 +264,7 @@ foreach ($period as $day) {
                                 <ol class="breadcrumb m-0">
                                     <li class="breadcrumb-item"><a href="javascript: void(0);">Stocks</a></li>
                                     <li class="breadcrumb-item active">
-                                        <h4 class="page-title">Power Consumption Details</h4>
+                                        <h4 class="page-title">Power Consumption Stock Details </h4>
                                     </li>
                                 </ol>
                             </div>
@@ -274,136 +281,527 @@ foreach ($period as $day) {
                 <div class="row">
                     <div class="col-12">
                         <div class="card">
+                            <div class="card-body">
 
 
-                            <div class="card-body" >
+                                <form action="<?= base_url('powerConsumptionDetails'); ?>" method="post">
+                                    <div class="row">
 
-
-                            <form action="<?= base_url('factoryVehicleDieselDetails'); ?>" method="post">
-                                <div class="row">
-
-                                    <div class="col-2">
-                                        <?php $today = date('M-Y'); ?>
-                                        <input type="text" name="month" id="month"
-                                            value="<?php echo $datefordropdown; ?>" class="form-control"
-                                            data-provide="datepicker" data-date-format="M-yyyy"
-                                            data-date-min-view-mode="1">
-
-                                    </div>
-                                    <div class="col-2">
-                                        <input type="submit" value="Change Month" class="btn btn-success"
-                                            style="margin-top:0px;">
-                                    </div>
-
-                                    <div class="col-2">
-                                       
-                                    </div>
-
-                                    <div class="col-6">
-                                        <div class="dropdown float-right">
-                                            <a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
-                                                aria-expanded="false">
-                                                <i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
-                                            </a>
-                                            <div class="dropdown-menu dropdown-menu-right">
-                                                <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
-                                                <a class="dropdown-item" href="#">Export</a>
+                                        <div class="col-3">
+                                            <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
+                                                class="form-control mt-2" data-provide="datepicker"
+                                                style="z-index:30;"
+                                                data-date-format="M-yyyy" data-date-min-view-mode="1">
+                                        </div>
+                                        <div class="form-group col-md-2">
+                                            <button type="submit" class="btn btn-success"> Change Month </button>
+                                        </div>
+                                        <div class="col-md-1"></div>
+                                        <div class="col-6">
+                                            <div class="dropdown float-right">
+                                                <a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
+                                                    aria-expanded="false">
+                                                    <i class="mdi mdi-dots-vertical m-0 text-muted h3"></i>
+                                                </a>
+                                                <div class="dropdown-menu dropdown-menu-right">
+                                                    <a class="dropdown-item" data-toggle="modal" data-target="#bs-example-modal-lg">Navigation</a>
+                                                    <a class="dropdown-item" href="#">Export</a>
+                                                </div>
                                             </div>
-                                        </div> 
-                                    </div> 
-
-                                </div>
-                            </form>
+                                        </div>
+                                    </div>
+                                </form>
 
 
 
-
-                               
-
-
-
-
-
-
-                                <!-- Add table-responsive for horizontal scroll -->
                                 <div class="table-responsive">
-                                    <?php
-                                    $columns = array_keys($powerConsumptionDetails[0]);
+                                    <table id="powerStockDetailsTableId" class="fht-table  table-striped">
 
-                                    function formatHeader($key) 
-                                    {
-                                        $parts = explode('_', $key);
-                                        if (is_numeric(end($parts))) { array_pop($parts); }
-                                        return ucwords(implode(' ', $parts));
-                                        
-                                    }
-                                ?>
+                                        <thead class="celda_encabezado_general" style="padding: 10px;">
 
-
-                                    <table id="electricMachineTable" class="fht-table  table-striped"
-                                        style="font-size: small;">
-
-                                        <thead>
                                             <tr>
-                                                <th class="celda_encabezado_general" style="padding: 10px;"></th>
-                                                <?php foreach ($machineName as $name): ?>
-                                                <th class="celda_encabezado_general" colspan="3" data-id="<?= $name; ?>"
-                                                    style="padding: 10px;"><?= $name; ?></th>
-                                                <?php endforeach; ?>
+
+                                                <th class="celda_encabezado_general" colspan="1"> Machine </th>
+
+                                                   <th class="celda_encabezado_general" colspan="8">
+                                                        150 KW Power
+                                                    </th>
+
+
+                                                <?php foreach ($electricMachines as $electricMachine) { ?>
+                                                    <!-- this will loop till machines present  -->  
+                                                    <th class="celda_encabezado_general" colspan="3">
+                                                        <?= $electricMachine['machine_name'] ?>
+                                                    </th>
+                                                <?php } ?>
+
+
                                             </tr>
+
+
+
+                                            <tr>
+                                                    <th class="celda_encabezado_general" colspan="1">Date </th>
+                                                    <th class="celda_encabezado_general">Opening Reading </th>
+                                                    <th class="celda_encabezado_general">Final Reading</th>
+                                                    <th class="celda_encabezado_general">Total Reading</th>
+                                                    <th class="celda_encabezado_general">Total Units </th>
+                                                    <th class="celda_encabezado_general">Average PF</th>
+                                                    <th class="celda_encabezado_general">Present PF</th>
+                                                    <th class="celda_encabezado_general">MD </th>
+                                                    <th class="celda_encabezado_general">MF *60</th>
+
+                                                <?php foreach ($electricMachines as $powerMachine) { ?>
+                                                    <!-- this will loop till machines present -->
+                                                    <th class="celda_encabezado_general" style="display:none">Date</th>
+                                                    <th class="celda_encabezado_general" style="display:none"> Machine Id</th>
+                                                    <th class="celda_encabezado_general">Opening Units</th>
+                                                    <th class="celda_encabezado_general">Final Units</th>
+                                                    <th class="celda_encabezado_general">Total Units</th>
+                                                <?php } ?>
+
+                                                    
+                                            </tr>
+
+
                                         </thead>
 
-                                        <thead>
-                                            <tr>
-                                                <?php foreach ($columns as $column): ?>
-                                                <th class="celda_encabezado_general" style="padding: 10px;"
-                                                    id="<?= $column ?>"><?= formatHeader($column) ?></th>
-                                                <?php endforeach; ?>
-                                            </tr>
-                                        </thead>
+                                        <tbody style="background-color: #fff;">
 
-                                        <tbody >
-                                            <?php   foreach ($powerConsumptionDetails as $key => $row):  ?>
-
-                        
-                                                <?php
-                                                 $styleValue='';
-                                                 $currentDate = date('Y-m-d');
-                                                 $dateInMonthYMDFormat=date("Y-m-d", strtotime($powerConsumptionDetails[$key]['date'])); 
-                                                 if ($dateInMonthYMDFormat === $currentDate) { $styleValue="background: #cef0ad;"; }
+                                            <?php if (!empty($groupedPowerConsumptionStockDetails)) {
                                                  
+                                                 $summary = [];
+
+                                                foreach ($groupedPowerConsumptionStockDetails as $groupedIndex => $powerStockDetails) {
+
+                                                   
+                                                 
+                                            ?>
+                                                    <tr
+
+                                                        <?php
+
+                                                        $currentDate = date('d-m-Y');
+                                                        $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $powerStockDetails[0]['date'])->format('d-m-Y');
+                                                        if ($dateInMonthDmYFormat === $currentDate) {
+                                                            echo 'style="background: #cef0ad;"';
+                                                        }
+                                                        ?>>
+
+
+                                                                <?php
+                                                                $startDate = DateTime::createFromFormat('Y-m-d', $totalPower[$groupedIndex]['date'])->format('d-m-Y');
+                                                                ?>
+
+                                                                <td class="celda_normal">
+                                                                    <?= $startDate ?>
+                                                                </td>
+
+
+                                                                <td class="celda_normal openingTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+
+                                                                
+
+                                                                <?php if ($groupedIndex == 0): ?>
+                                                                oninput="openingTPStockChange(this)"
+                                                                contenteditable="true"
+                                                                <?php endif; ?>
+                                                                
+                                                                ><?= $totalPower[$groupedIndex]['opening_reading'] ?? ' ' ?></td>
+
+
+                                                                <td class="celda_normal finalTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+
+                                                                oninput="finalTPStockChange(this)"
+                                                                contenteditable="true"> 
+
+                                                                <?= $totalPower[$groupedIndex]['final_reading'] ?? ' ' ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal totalReadingTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>" >
+
+                                                                <?= $totalPower[$groupedIndex]['total_reading'] ?? ' ' ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal totalUnitsTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+                                                                >
+
+                                                                <?= $totalPower[$groupedIndex]['total_units'] ?? ' ' ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal averagePfTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+                                                                >
+
+                                                                <?= $totalPower[$groupedIndex]['average_pf'] ?? ' ' ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal presentPfTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+                                                                >
+
+                                                                <?= $totalPower[$groupedIndex]['present_pf'] ?? ' ' ?>
+
+                                                                </td>
+                                                             
+                                                                <td class="celda_normal mdTP"
+                                                                oninput="mdTPStockChange(this)" 
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+                                                                >
+
+                                                                <?= $totalPower[$groupedIndex]['md'] ?? ' ' ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal mfTP"
+                                                                data-id="<?=$totalPower[$groupedIndex]['date']?>"
+                                                                >
+
+                                                                <?= $totalPower[$groupedIndex]['mf'] ?? ' ' ?>
+
+                                                                </td>
+
+                                                <?php 
+                                                                
+                                                                
+                                                    //before closing outer loop
+
+                                                    if (!isset($summary['openingReading'])) {
+                                                        $summary['openingReading'] = 0 ;
+                                                        $summary['finalReading']   = 0 ;
+                                                        $summary['totalReading']   = 0 ;
+                                                        $summary['totalUnits']     = 0 ;
+                                                        $summary['averagePf']      = 0 ;
+                                                        $summary['presentPf']      = 0 ;
+                                                        $summary['md']             = 0 ;
+                                                        $summary['mf']             = 0 ;
+                                                    }
+
+                                                  
+
+                                                   $summary['openingReading'] = " " ;
+                                                   $summary['finalReading']   = is_numeric($totalPower[$groupedIndex]['final_reading']) ? $totalPower[$groupedIndex]['final_reading'] : 0 ;
+                                                   $summary['totalReading']   += is_numeric($totalPower[$groupedIndex]['total_reading']) ? $totalPower[$groupedIndex]['total_reading'] : 0 ;
+                                                   $summary['totalUnits']     += is_numeric($totalPower[$groupedIndex]['total_units']) ? $totalPower[$groupedIndex]['total_units'] : 0 ;
+                                                   $summary['averagePf']      = " " ;
+                                                   $summary['presentPf']      = " ";
+                                                   $summary['md']             = " " ;
+                                                   $summary['mf']             = " " ;
+
+
+                                         
+                                                                
                                                 ?>
+
+
+
+
+                                                        <?php foreach ($powerStockDetails as $powerStockDetailIndex => $powerStock) {  ?>                                      
+
+                                                            <td style="display:none">
+                                                                <?= $powerStock['date'] ?>
+                                                            </td>
+
+                                                            <td style="display:none"
+                                                                data-id="<?= $powerStock['date'] ?> <?= $powerStock['machine_id'] ?>"
+                                                                class="machine_id">
+                                                                
+                                                                <?= $powerStock['machine_id'] ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal openingUnits"
+                                                                data-id="<?= $powerStock['date'] ?> <?= $powerStock['machine_id'] ?>"
+
+                                                                <?php if ($groupedIndex == 0): ?>
+                                                                oninput="openingUnitsChange(this)"
+                                                                contenteditable="true"
+                                                                <?php endif; ?>>
+                                                                
+                                                                <?= $powerStock['opening_units'] ?? " " ?>
+
+
+                                                            </td>
+
+                                                            <td class="celda_normal closingUnits"
+                                                                data-id="<?= $powerStock['date'] ?> <?= $powerStock['machine_id'] ?>"
+
+                                                                oninput="closingUnitsChange(this)"
+                                                                contenteditable="true">
+
+                                                                <?= $powerStock['closing_units'] ?? " " ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal totalUnits"
+                                                                data-id="<?= $powerStock['date'] ?> <?= $powerStock['machine_id'] ?>"
+                                                                oninput="totalUnitsChange(this)"
+                                                                contenteditable="true">
+
+                                                                <?= $powerStock['total_units'] ?? " " ?>
+
+                                                            </td>
+
+                                                          
+
+                                            <?php 
                                                 
-                                            <tr id="<?php echo $key + 1; ?>"
-                                                style="<?=$styleValue?>"
-                                            >
-                                                <?php  foreach ($columns as $index => $column): ?>
-
-                                                <?php if($index == 0) : ?>
-                                                <td class="celda_normal" style="padding: 5px;">
-                                                    <?php echo DateTime::createFromFormat('Y-m-d', $row[$column])->format('d-m-Y'); ?>
-                                                </td>
-                                                <?php elseif(formatHeader($column) == 'Opening Units'): ?>
-                                                <td class="celda_normal" <?= ($key == 0) ? 'contenteditable="true"' : ''; ?> style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
-                                                <?php elseif(formatHeader($column) == 'Closing Units'): ?>
-                                                <td class="celda_normal" contenteditable="true" onkeyup="calculateTotalUnits(this.parentNode.id,this.textContent);" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
-                                                <?php else : ?>
-                                                <td class="celda_normal" style="padding: 5px;"><?= $row[$column] ?? 'N/A' ?></td>
-                                                <?php endif; ?>
-
-                                                <?php endforeach; ?>
-                                            </tr>
-                                            <?php endforeach; ?>
-                                        </tbody>
+                                                //before closing inner loop we just adding the total values inside it
                                                
+                                                $machineId = $powerStock['machine_id']; // Unique identifier
+
+
+                                                // Initialize the material entry if it doesn't exist
+                                                if (!isset($summary["machineId_$machineId"])) {
+                                                    $summary["machineId_$machineId"] = [
+                                                        'opening_units' => "-" ,          
+                                                        'closing_units' => 0 ,
+                                                        'total_units'  => 0 ,
+                                                    ];
+                                                }
+
+                                                // Sum values for the material 
+                                                
+                                                $summary["machineId_$machineId"]['opening_units']      = " " ;
+                                                $summary["machineId_$machineId"]['closing_units']      = " " ;
+                                                $summary["machineId_$machineId"]['total_units']        += is_numeric($powerStock['total_units'])  ?  $powerStock['total_units']  : 0 ;
+                                                       
+
+                                                
+                                                
+                                                
+                                               
+                                           
+                                           } ?>
+                                                        
+                                                    </tr>
+
+                                                <?php
+                                                  }
+                                                ?>
+
+                                                <div class="table-responsive">
+                                                <table id="powerStockDetailsTableSummaryId" class="fht-table  table-striped">
+
+                                                <thead >
+                                                
+                                                <tr>
+                                                    <th class="celda_encabezado_total" colspan="1">Date </th>
+                                                    <th class="celda_encabezado_total">Opening Reading </th>
+                                                    <th class="celda_encabezado_total">Final Reading</th>
+                                                    <th class="celda_encabezado_total">Total Reading</th>
+                                                    <th class="celda_encabezado_total">Total Units </th>
+                                                    <th class="celda_encabezado_total">Average PF</th>
+                                                    <th class="celda_encabezado_total">Present PF</th>
+                                                    <th class="celda_encabezado_total">MD </th>
+                                                    <th class="celda_encabezado_total">MF *60</th>
+
+                                                <?php foreach ($electricMachines as $powerMachine) { ?>
+                                                    <!-- this will loop till machines present -->
+                                                    <th class="celda_encabezado_total" style="display:none">Date</th>
+                                                    <th class="celda_encabezado_total" style="display:none"> Machine Id</th>
+                                                    <th class="celda_encabezado_total">Opening Units</th>
+                                                    <th class="celda_encabezado_total">Final Units</th>
+                                                    <th class="celda_encabezado_total">Total Units</th>
+                                                <?php } ?>
+
+                                                </tr>
+
+                                                </thead>
+                                             
+                                                <tbody>
+
+                                                <tr>
+
+                                                <td style="background-color:rgb(189, 9, 6); color:#ffff;">   
+                                                  <b> Total </b> 
+                                                </td>
+
+                                                <td><?= $summary['openingReading'] ?></td>
+                                                <td><?= $summary['finalReading'] ?></td>
+                                                <td><?= $summary['totalReading'] ?></td>
+                                                <td><?= $summary['totalUnits'] ?></td>
+                                                <td><?= $summary['averagePf'] ?></td>
+                                                <td><?= $summary['presentPf'] ?></td>
+                                                <td><?= $summary['md'] ?></td>
+                                                <td><?= $summary['mf'] ?></td>
+
+                                                <?php foreach($summary as $each){
+                                                    if(is_array($each)){
+                                                    ?>
+
+                                                    <td class="celda_normal "><?=$each['opening_units']?> </td> 
+                                                    <td class="celda_normal "><?=$each['closing_units']?></td>
+                                                    <td class="celda_normal "><?=$each['total_units']?></td>
+
+                                                    <?php 
+                                                    }
+                                                 } 
+                                                 ?>
+
+                                                </tr>
+                                                   
+
+                                                </tbody>
+                                                </table>
+                                          </div>
+
+                                                <!-- this else condition work if groupedpowerStockDetails is empty and creating new records 
+                                           with initial values 0 for entire month -->
+                                            <?php } else { ?>
+
+
+                                                <?php foreach ($datesInMonth as $datesInMonthIndex => $dateInMonth) { ?>
+                                                    <tr
+
+                                                        <?php
+
+                                                        $currentDate = date('d-m-Y');
+                                                        $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y');
+                                                        if ($dateInMonthDmYFormat === $currentDate) {
+                                                            echo 'style="background: #cef0ad;"';
+                                                        }
+                                                        ?> >
+
+                                                            <?php
+                                                                 $startDate = DateTime::createFromFormat('Y-m-d', $dateInMonth)->format('d-m-Y');
+                                                            
+                                                             ?>
+
+                                                                <td class="celda_normal">
+                                                                    <?= $startDate ?>
+                                                                </td>
+
+
+                                                                <td class="celda_normal openingTP"
+                                                                data-id="<?= $dateInMonth?>"
+
+                                                                <?php if ($datesInMonthIndex == 0) { ?>
+
+                                                                oninput="openingTPStockChange(this)"
+                                                                contenteditable="true"
+
+                                                                <?php } ?> 
+
+                                                                ><?php 
+                                                                if(empty( $previousMonthTotalPowerMachineStockDetails)){
+                                                                    echo " " ;
+                                                                }else{
+                                                                   echo $previousMonthTotalPowerMachineStockDetails[0]['final_reading'] ;
+                                                                }
+                                                                 
+                                                                 ?>
+                                                                 </td>
+                                                                
+
+
+                                                                <td class="celda_normal finalTP"
+                                                                data-id="<?= $dateInMonth ?>"
+
+                                                                oninput="finalTPStockChange(this)"
+                                                                contenteditable="true">
+                                                               
+                                                                <?php 
+                                                                if(empty( $previousMonthTotalPowerMachineStockDetails)){
+                                                                    echo " " ;
+                                                                }else{
+                                                                   echo $previousMonthTotalPowerMachineStockDetails[0]['final_reading'] ;
+                                                                }
+                                                                 
+                                                                 ?>
+                                                                
+                                                               </td>
+
+                                                                <td class="celda_normal totalReadingTP"
+                                                                data-id="<?= $dateInMonth ?>"> </td>
+
+                                                                <td class="celda_normal totalUnitsTP"
+                                                                data-id="<?= $dateInMonth ?>"
+                                                                
+                                                                > </td>
+
+                                                                <td class="celda_normal averagePfTP" contenteditable="true"
+                                                                data-id="<?= $dateInMonth ?>"
+                                                                
+                                                                > </td>
+                                                                <td class="celda_normal presentPfTP" contenteditable="true"
+                                                                data-id="<?= $dateInMonth ?>"
+                                                                
+                                                                > </td>
+
+                                                                <td class="celda_normal mdTP"        contenteditable="true"
+                                                                oninput="mdTPStockChange(this)"
+                                                                data-id="<?= $dateInMonth ?>"
+                                                                
+                                                                > </td>
+
+                                                                <td class="celda_normal mfTP" 
+                                                                data-id="<?= $dateInMonth ?>"
+                                                                
+                                                                > </td> 
+
+
+
+                                                        <?php
+                                                        foreach ($electricMachines as $powerMachineIndex => $powerMachine) { 
+                                                            ?>
+                                                            <!-- this will loop till machines present -->
+
+                                                            
+
+                                                            <td class="celda_normal" style="display:none">
+                                                                <?= $dateInMonth ?>
+                                                            </td>
+
+                                                            <td class="celda_normal" style="display:none"
+                                                                data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>">
+                                                                <?= $powerMachine['id'] ?>
+                                                            </td>
+
+                                                            <td class="celda_normal openingUnits"
+                                                                data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
+
+                                                                <?php if ($datesInMonthIndex == 0) { ?>
+
+                                                                oninput="openingUnitsChange(this)"
+                                                                contenteditable="true"
+
+                                                                <?php } ?>
+                                                                
+                                                                ><?= $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units'] ?>
+                                                            </td>
+
+                                                            <td class="celda_normal closingUnits"
+                                                                data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
+                                                                oninput="closingUnitsChange(this)"
+                                                                contenteditable="true"><?= $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']  ?>
+                                                            </td>
+
+                                                            <td class="celda_normal totalUnits"
+                                                                data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"
+                                                                contenteditable="true"> </td>
+
+                                                        <?php } ?>
+                                                    </tr>
+                                                <?php } ?>
+                                            <?php } ?>
+
+
+                                        </tbody>
                                     </table>
-
-
-                                </div><!-- End table-responsive -->
+                                </div>
 
                                 <div class="row">
                                     <div class="col-md-12 text-right">
-                                        <input type="button" class="btn btn-success" id="save" value="save">
+                                        <input type="button" class="btn btn-success" id="saveId" value="save">
                                     </div>
                                 </div>
 
@@ -419,157 +817,471 @@ foreach ($period as $day) {
 </div>
 
 
+<div>
+    <div class="modal fade" id="bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="myLargeModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myLargeModalLabel">Navigation Options</h4>
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+                </div>
+                <div class="modal-body">
+                    <div class="row">
+                        <!-- bag Dropdown -->
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                <label for="powerDropdown">Select Bag</label>
+                                <select id="powerDropdown" class="form-control">
+                                    <option value="">Select Electric Machines</option>
+                                    <?php foreach ($electricMachines as $powerMachine): ?>
+                                        <option value="  <?= $powerMachine['machine_name'] ?>">
+                                            <?= $powerMachine['machine_name'] ?>
+                                        </option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+                        </div>
 
 
 
 
+                        <!-- Date Dropdown -->
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                <label for="dateDropdown">Select Date</label>
+                                <select id="dateDropdown" class="form-control">
+                                    <?php foreach ($datesInMonth as $selectDate): ?>
+                                        <?php $selectDate = DateTime::createFromFormat('Y-m-d', $selectDate)->format('d-m-Y'); ?>
+                                        <option value="<?= $selectDate ?>"><?= $selectDate ?></option>
+                                    <?php endforeach; ?>
+                                </select>
+                            </div>
+                        </div>
+                    </div>
+                    <button class="btn btn-primary float-right" onclick="navigateToPower()">Navigate</button>
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+</div>
 
 
-<script type="text/javascript">
-$(document).ready(function() {
-    $('#save').click(function() {
-
-        // Get headers from the second <thead> as keys
-        var headers = [];
-        $("#electricMachineTable thead:nth-child(2) th").each(function() {
-            headers.push($(this).attr("id"));
-        });
-
-        // Convert table to JSON using custom headers as keys
-        var tableData = [];
-        $("#electricMachineTable tbody tr").each(function() {
-            var rowData = {};
-            $(this).find("td").each(function(index) {
-                var key = headers[index] || `column_${index}`;
-                rowData[key] = $(this).text().trim();
-            });
-            tableData.push(rowData);
-        });
-
-        var jsonData = JSON.stringify(tableData);
 
 
-        $('#loader').show();
-        $.ajax({
-            data: {
-                electricMachineTableData: jsonData,
-            },
-            type: "POST",
-            url: "<?php echo base_url() ?>/addOrEditPowerConsumptionDetails",
+<script>
+    function navigateToPower() {
+        $('.close').click();
+        const powerDropdown = document.getElementById('powerDropdown');
+        const dateDropdown = document.getElementById('dateDropdown');
+        const selectedPower = powerDropdown.value;
+        const selectedDate = dateDropdown.value;
 
-            success: function(data) {
-                if (data) {
-
-                    $('#loader').hide();
-                    alert(data);
-
-                }
+        const table = document.getElementById('powerStockDetailsTableId');
+        const headerCells = table.querySelectorAll('thead tr:nth-child(1) th');
+        const rows = table.querySelectorAll('tbody tr');
 
+        let targetColumnIndex = -1;
+        headerCells.forEach((header, index) => {
+            if ((header.innerText.trim()) === selectedPower.trim()) {
+                targetColumnIndex = index;
+                return;
             }
         });
 
+        if (targetColumnIndex === -1) {
+            console.log("power column not found.");
+            return;
+        }
+
+
+
+        let targetRow = null;
+        rows.forEach(row => {
+            const dateCell = row.querySelector('td:first-child');
+            if (dateCell && dateCell.textContent.trim() === selectedDate) {
+
+                targetRow = row;
+            }
+        });
+
+        if (!targetRow) {
+            console.log("Date row not found.");
+            return;
+        }
+
+
+
+
+
+        targetColumnIndex = targetColumnIndex * 7;
+
+        targetRow.cells[targetColumnIndex].scrollIntoView({
+            behavior: 'smooth',
+            inline: 'center',
+            block: 'center'
+        });
+
+        const highlightDuration = 10000;
+        for (let i = targetColumnIndex - 4; i <= targetColumnIndex; i++) {
+            const cell = targetRow.cells[i];
+            if (cell) {
+
+                cell.style.transition = "background-color 0.5s";
+                cell.style.backgroundColor = "#df9675";
+
+                setTimeout(() => {
+                    cell.style.backgroundColor = "";
+                }, highlightDuration);
+            }
+        }
+
+
+    }
+</script>
+
+<script type="text/javascript">
+    $(document).ready(function() {
+
+        $('#saveId').click(function() {
+
+            //table to json function
+
+            var updatePowerConsumptionDetails = tableToJson();
+
+
+            alert('Updation may take a while, And we appreciate your patience..!!');
+
+            $('#loader').show();
+            $.ajax({
+                data: {
+                    updatePowerConsumptionDetails
+                },
+                type: "POST",
+                url: "<?php echo base_url() ?>updatePowerConsumptionDetails",
+
+                success: function(data) {
+                    if (data) {
+                        $('#loader').hide();
+                        alert(data);
+                        window.location.reload();   
+                    }
+
+                },
+                error: function(xhr, status, error) {
+
+                    alert("An error occurred while processing the request. Please try again.");
+                    console.error("Error Code:", xhr.status);
+                    console.error("Error Message:", error);
+                    console.error("Response Text:", xhr.responseText);
+                },
+                complete: function() {
+                    $('#loader').hide();
+                }
+            });
+
+
+        });
 
     });
-});
 </script>
 
 <script>
-function openingReading(parentId, textContent) {
+    function tableToJson() {
+        const table = $('#powerStockDetailsTableId');
+        const summaryRowPart = [] ;
+        const readingsRowPart = [];
+        const allRow = [] ;
+
+        //this table to json is customized for powerStock not for all
+
+        table.find('tbody tr').each(function(index) {
+
+            const rowCells = $(this).find('td');
+            const date = rowCells.eq(0).text().trim();
+
+            const formattedDate = `${date.split('-')[2]}-${date.split('-')[1]}-${date.split('-')[0]}`;
+
+           
+                const summaryRowData = {
+                    date: formattedDate,    
+                    opening_reading: rowCells.eq(1).text().trim(),
+                    final_reading  : rowCells.eq(2).text().trim(),
+                    total_reading  : rowCells.eq(3).text().trim(),
+                    total_units    : rowCells.eq(4).text().trim(),
+                    average_pf     : rowCells.eq(5).text().trim(),
+                    present_pf     : rowCells.eq(6).text().trim(),
+                    md             : rowCells.eq(7).text().trim(),
+                    mf             : rowCells.eq(8).text().trim()
+                };
+
+                summaryRowPart.push(summaryRowData);
+            
+
+
+            /** we get  eight entries against a machines so we loop from 1 to 8  and so on
+             in a single row **/
+            for (let i = 9 ; i < rowCells.length; i += 5 ) {
+                const readingsRowData = {
+                    date: rowCells.eq(i).text().trim(),
+                    machine_id: rowCells.eq(i + 1).text().trim(),
+                    opening_units: rowCells.eq(i + 2).text().trim(),
+                    closing_units: rowCells.eq(i + 3).text().trim(),
+                    total_units  : rowCells.eq(i + 4).text().trim(),
+                };
+
+                readingsRowPart.push(readingsRowData);
+
+            }
+
+           
+
+        });
+
+
+        allRow.push(summaryRowPart ,readingsRowPart )
+
+        return JSON.stringify(allRow, null, 2);
+    }
+</script>
+
+<script>
 
 
 
-}
+    function openingUnitsChange(tdElement) {
+
+        try {
+            let dataId = tdElement.getAttribute('data-id');
+            let [date, machine_id] = tdElement.getAttribute('data-id').split(' ');
+            let openingUnits = validateInput(tdElement.innerText); 
+            let closingUnits = validateInput(document.querySelector(`td.closingUnits[data-id="${dataId}"]`).innerText);
+
+            let totalUnits = parseFloat(closingUnits) - parseFloat(openingUnits) ;
+
+            document.querySelector(`td.totalUnits[data-id="${dataId}"]`).innerText = (totalUnits).toFixed(2);
+           
+
+            updateStockValue(date,machine_id,closingUnits)
 
 
-function calculateTotalUnits(parentId, textContent) {
+        } catch (error) {
 
-    var tr = $('#' + parentId);
-    var currentTd = $(event.target);
-    var tdIndex = currentTd.index();
+            console.error("There is an error updating stock ..!!" + error);
 
-    // Total Units calculation
-    closingUnits = currentTd.text();
-    openingUnits = tr.find('td:eq(' + (tdIndex - 1) + ')').text();
-    totalUnits = closingUnits - openingUnits;
-    if (totalUnits != NaN && totalUnits != Infinity)
-        tr.find('td:eq(' + (tdIndex + 1) + ')').text(totalUnits.toFixed(2));
-
-    
-
-    //next opening reading
-    nextTrIndex = parseInt(parentId, 10) + 1
-    var nexttr = $('#' + nextTrIndex);
-    nexttr.find('td:eq(' + (tdIndex - 1) + ')').text(textContent);
-
-
-
-}
-
-
-function navigateToMachine() {
-    $('.close').click();
-    const machineDropdown = document.getElementById('machineDropdown');
-    const dateDropdown = document.getElementById('dateDropdown');
-    const selectedMachine = machineDropdown.value;
-    const selectedDate = dateDropdown.value;
-
-    const table = document.getElementById('electricMachineTable');
-    const headerCells = table.querySelectorAll('thead tr:nth-child(1) th');
-    const rows = table.querySelectorAll('tbody tr');
-
-    let targetColumnIndex = -1;
-    headerCells.forEach((header, index) => {
-        if (header.getAttribute('data-id') === selectedMachine) {
-            targetColumnIndex = index;
         }
-    });
+    }
 
-    if (targetColumnIndex === -1) {
-        console.log("Machine column not found.");
-        return;
+    function closingUnitsChange(tdElement) {
+
+        try {
+            let dataId = tdElement.getAttribute('data-id');
+            let [date, machine_id] = tdElement.getAttribute('data-id').split(' ');
+            let openingUnits = validateInput(document.querySelector(`td.openingUnits[data-id="${dataId}"]`).innerText);
+            let closingUnits =  validateInput(tdElement.innerText);
+
+            let totalUnits = parseFloat(closingUnits) - parseFloat(openingUnits) ;
+
+            document.querySelector(`td.totalUnits[data-id="${dataId}"]`).innerText = (totalUnits).toFixed(2);
+           
+
+            updateStockValue(date,machine_id,closingUnits)
+
+
+        } catch (error) {
+
+            console.error("There is an error updating stock ..!!" + error);
+
+        }
+    }
+  
+
+    function openingTPStockChange(tdElement){
+
+        try {
+        
+            let dataId = tdElement.getAttribute('data-id') ; 
+
+            let openingTP  = validateInput(tdElement.innerText) ;
+            let finalTP    = validateInput(document.querySelector(`td.finalTP[data-id="${dataId}"]`).innerText) ;
+
+            let totalReadingTP    = (Number(finalTP) - Number(openingTP)) ;
+
+            let totalUnitsTP      = totalReadingTP * 60 ;
+
+            document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText =  totalReadingTP ;
+
+            document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText =  totalUnitsTP ;
+ 
+            updateTotalStockValue(dataId , finalTP) ;
+
+
+        } catch (error) {
+
+            console.error("There is an error updating stock ..!!" + error);
+
+        }
+
+    }
+
+    function finalTPStockChange(tdElement){
+
+        try {
+        
+        let dataId = tdElement.getAttribute('data-id'); 
+
+        let openingTP  = validateInput(document.querySelector(`td.openingTP[data-id="${dataId}"]`).innerText);
+        let finalTP    = validateInput(tdElement.innerText);
+
+        let totalReadingTP    = (Number(finalTP) - Number(openingTP)) ;
+
+        let totalUnitsTP      = totalReadingTP * 60 ;
+
+        document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText =  totalReadingTP ;
+
+        document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText =  totalUnitsTP ;
+
+        updateTotalStockValue(dataId , finalTP)
+
+
+    } catch (error) {
+
+        console.error("There is an error updating stock ..!!" + error);
+
+    }
+
+    }
+
+    function mdTPStockChange(tdElement){
+
+        try {
+            
+            let dataId = tdElement.getAttribute('data-id'); 
+
+            let mdTP    = validateInput(tdElement.innerText);
+
+            document.querySelector(`td.mfTP[data-id="${dataId}"]`).innerText =  (mdTP * 60).toFixed(2) ;
+
+        } catch (error) {
+
+            console.error("There is an error updating stock ..!!" + error) ;
+
+        }
+
+    }
+
+
+    function validateInput(input) {
+
+
+        if (input == '' || input == ' ' || input == '-') {
+            return 0;
+        }
+
+        if (typeof input === 'string' && input.split('').map(char => char.charCodeAt(0))[0] == 10) {
+            return 0;
+        }
+
+        // Validate against the regex
+        const isValid = /^-?\d*\.?\d*$/.test(input);
+        if (!isValid) {
+            alert('Invalid input! Please enter a valid number.');
+            return 0;
+        }
+
+        return input;
     }
 
 
 
-    let targetRow = null;
-    rows.forEach(row => {
-        const dateCell = row.querySelector('td:first-child');
-        if (dateCell && dateCell.textContent.trim() === selectedDate) {
-            targetRow = row;
-        }
-    });
 
-    if (!targetRow) {
-        console.log("Date row not found.");
-        return;
-    }
 
-   
+</script>
 
-    targetColumnIndex = targetColumnIndex - 1;
-    targetColumnIndex = targetColumnIndex * 3;
-    targetColumnIndex = targetColumnIndex + 1;
+<script>
 
-    targetRow.cells[targetColumnIndex].scrollIntoView({
-        behavior: 'smooth',
-        inline: 'center',
-        block: 'center'
-    });
 
-    const highlightDuration = 10000;
-    for (let i = targetColumnIndex; i < targetColumnIndex + 3; i++) {
-        const cell = targetRow.cells[i];
-        if (cell) {
+    function updateStockValue(date, machine_id, closingUnits) {
 
-            cell.style.transition = "background-color 0.5s";
-            cell.style.backgroundColor = "#df9675";
+        const table = $('#powerStockDetailsTableId');
+        const rows = [];
 
-            setTimeout(() => {
-                cell.style.backgroundColor = "";
-            }, highlightDuration);
-        }
+        table.find('tbody tr').each(function() {
+            const rowCells = $(this).find('td');
+            let otherDate = rowCells.eq(0).text().trim();
+
+            otherDate = `${otherDate.split('-')[2]}-${otherDate.split('-')[1]}-${otherDate.split('-')[0]}`;
+
+
+
+            if (new Date(otherDate) > new Date(date)) { 
+
+                
+
+                let dataId = `${otherDate} ${machine_id}`;
+
+                document.querySelector(`td.openingUnits[data-id="${dataId}"]`).innerText = closingUnits == 0 ? " " : closingUnits ;
+
+                let openingUnits = validateInput(document.querySelector(`td.openingUnits[data-id="${dataId}"]`).innerText);
+
+                let totalUnits   = validateInput(document.querySelector(`td.totalUnits[data-id="${dataId}"]`).innerText); 
+
+                closingUnits = Math.abs(Number(openingUnits) +  Number(totalUnits));   
+
+                document.querySelector(`td.closingUnits[data-id="${dataId}"]`).innerText = closingUnits == 0 ? " " : closingUnits ;
+
+
+            }
+        })
     }
 
 
-}
-</script>
\ No newline at end of file
+
+
+    function  updateTotalStockValue(date, finalTP){
+
+
+        const table = $('#powerStockDetailsTableId');
+        const rows = [];
+
+        table.find('tbody tr').each(function() {
+            const rowCells = $(this).find('td');
+             let  otherDate = rowCells.eq(0).text().trim();
+
+
+             otherDate = `${otherDate.split('-')[2]}-${otherDate.split('-')[1]}-${otherDate.split('-')[0]}`;
+
+
+
+            if (new Date(otherDate) > new Date(date)) { 
+
+                    
+                let dataId = `${otherDate}`;
+
+
+                document.querySelector(`td.openingTP[data-id="${dataId}"]`).innerText = finalTP == 0 ? " " : finalTP ;
+
+                let openingTP = validateInput(document.querySelector(`td.openingTP[data-id="${dataId}"]`).innerText) ;
+
+                let totalReadingTP = validateInput(document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText) ;
+
+              
+                 finalTP = Number(openingTP) + Number(totalReadingTP) ;
+
+             
+
+                let totalUnitsTP      = Number(totalReadingTP * 60 );
+                
+
+
+                document.querySelector(`td.finalTP[data-id="${dataId}"]`).innerText = finalTP == 0 ? " " : finalTP;
+                document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText = totalReadingTP == 0 ? " " : totalReadingTP ;
+                document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText   = totalUnitsTP   == 0 ? " " : totalUnitsTP;
+
+
+
+            }
+        })
+
+    }
+
+</script>   
\ No newline at end of file
diff --git a/app/Views/resinStockDetails.php b/app/Views/resinStockDetails.php
index 9a2da2d6..71e07a48 100644
--- a/app/Views/resinStockDetails.php
+++ b/app/Views/resinStockDetails.php
@@ -100,26 +100,6 @@
     }
 
 
-    .celda_encabezado_general {
-        background-color: #00a65a;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;
-        ;
-        text-align: center;
-    }
-
-    .celda_encabezado_total {
-        background-color:#ffffff;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;
-        ;
-        text-align: center;
-    }
-
 
     ._Separador {
         background-color: #fff;
@@ -133,14 +113,6 @@
         width: 4px;
     }
 
-    .celda_normal {
-        /*background-color: #fff;*/
-        /* <!-- ad9271 into ffffff brown-light to green-light --> */
-        text-align: center;
-        border: 1px solid #ccc;
-        padding: 2px 4px;
-    }
-
     /*style excel*/
     .excel_cell {
         border: 1px solid #CCC;
@@ -167,36 +139,81 @@
         height: 20px;
     }
 
-    #resinStockDetailsTableId th:nth-child(1),
-    #resinStockDetailsTableId td:nth-child(1) {
-        position: sticky;
-        left: 0;
+
+    .celda_encabezado_general {
         background-color: #00a65a;
-        z-index: 2;
-        border-right: 2px solid #ddd;
+        border: 1px solid #ccc;
         color: #ffffff;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
     }
 
-   
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
+    }
+    
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
+    }
 
-    #resinStockDetailsTableSummaryId th:nth-child(1),
-    #resinStockDetailsTableSummaryId td:nth-child(1) {
+
+    /* Make entire thead sticky */
+    .fht-table thead {
         position: sticky;
-        left: 0;
-        background-color: #00a65a;
-        z-index: 2;
-        border-right: 2px solid #ddd;
-        color: #ffffff;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
     }
 
-    .table-responsive {
-        overflow-y: auto;
+    .dropdown-menu   {
+        z-index :25 ;
     }
 
+
+
+    /* Ensure each <th> in thead stays sticky */
     .fht-table thead th {
         position: sticky;
         top: 0;
-        z-index: 5!important;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 15; /* Ensures it stays above other cells */
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
+
+    /* Table Wrapper for Scrolling */
+    .table-responsive {
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
+    }
+
+    td{
+        min-width:  100px;
+        max-width:  100px;
     }
     
 
@@ -365,13 +382,14 @@ foreach ($period as $day) {
                                                             </td>
                                                             <td style="display:none"
                                                                 data-id="<?= $resinStock['date'] ?> <?= $resinStock['materialCode'] ?>"
-                                                                class="materialCode"><?= $resinStock['materialCode'] ?>
+                                                                class="materialCode">
+                                                                <?= $resinStock['materialCode'] ?? ' ' ?>
                                                             </td>
 
                                                             <td style="display:none" class="celda_normal customer"
                                                                 data-materialCode="<?= $resinStock['materialCode'] ?>"
                                                                 data-id="<?= $resinStock['date'] ?> <?= $resinStock['materialCode'] ?>">
-                                                                <?= $resinStock['customer'] ?>
+                                                                <?= $resinStock['customer'] ?? ' ' ?>
                                                             </td>
 
                                                             <td class="celda_normal openingStock"
@@ -380,25 +398,25 @@ foreach ($period as $day) {
                                                                 <?php if ($groupedResinStockDetailsIndex == 0): ?>
                                                                 oninput="openingStockChange(this)"
                                                                 contenteditable="true"
-                                                                <?php endif; ?>><?= $resinStock['opening'] ?>
+                                                                <?php endif; ?>><?= $resinStock['opening'] ?? ' ' ?>
                                                             </td>
 
                                                             <td class="celda_normal receiptStock"
                                                                 data-id="<?= $resinStock['date'] ?> <?= $resinStock['materialCode'] ?>"
                                                                 oninput="receiptStockChange(this)"
                                                                 contenteditable="true">
-                                                                <?= $resinStock['receipt'] ?>
+                                                                <?= $resinStock['receipt'] ?? ' ' ?>
                                                             </td>
 
                                                             <td class="celda_normal usedStock"
                                                                 data-id="<?= $resinStock['date'] ?> <?= $resinStock['materialCode'] ?>"
                                                                 oninput="usedStockChange(this)"
-                                                                contenteditable="true"><?= $resinStock['used'] ?>
+                                                                contenteditable="true"><?= $resinStock['used'] ?? ' ' ?>
                                                             </td>
 
                                                             <td class="celda_normal balanceStock"
                                                                 data-id="<?= $resinStock['date'] ?> <?= $resinStock['materialCode'] ?>">
-                                                                <?= $resinStock['balanceStock'] ?>
+                                                                <?= $resinStock['balanceStock'] ?? ' ' ?>
                                                             </td>
 
                                                            
@@ -421,10 +439,10 @@ foreach ($period as $day) {
 
                                                     // Sum values for the material
                                                     ;
-                                                    $summary[$materialCode]['opening']        = "-" ;
-                                                    $summary[$materialCode]['receipt']       += $resinStock['receipt'] == '-' ? 0 :$resinStock['receipt'] ;
-                                                    $summary[$materialCode]['used']          +=  $resinStock['used'] == '-' ? 0 :$resinStock['used'] ;
-                                                    $summary[$materialCode]['balanceStock']   = $resinStock['balanceStock'] == '-' ? 0 :$resinStock['balanceStock'] ; 
+                                                    $summary[$materialCode]['opening']        = "-" ; 
+                                                    $summary[$materialCode]['receipt']       +=  is_numeric($resinStock['receipt']) ? $resinStock['receipt'] : 0;
+                                                    $summary[$materialCode]['used']          +=  is_numeric($resinStock['used']) ? $resinStock['used'] : 0;
+                                                    $summary[$materialCode]['balanceStock']   =  is_numeric($resinStock['balanceStock']) ? $resinStock['balanceStock'] : 0; 
 
                                                     } ?>
 
@@ -522,20 +540,20 @@ foreach ($period as $day) {
                                                                 oninput="openingStockChange(this)"
                                                                 contenteditable="true"
 
-                                                                <?php } ?>><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? '-' ?></td>
+                                                                <?php } ?>><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?></td>
 
                                                             <td class="celda_normal receiptStock"
                                                                 data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"
                                                                 oninput="receiptStockChange(this)"
-                                                                contenteditable="true">-</td>
+                                                                contenteditable="true"> <?= ' ' ?> </td>
 
                                                             <td class="celda_normal usedStock"
                                                                 data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"
                                                                 oninput="usedStockChange(this)"
-                                                                contenteditable="true">-</td>
+                                                                contenteditable="true"> <?= ' ' ?> </td>
 
                                                             <td class="celda_normal balanceStock"
-                                                                data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? '-' ?></td>
+                                                                data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?></td>
                                                         <?php } ?>
                                                     </tr>
                                                 <?php } ?>
@@ -816,9 +834,9 @@ foreach ($period as $day) {
         try {
             let dataId = tdElement.getAttribute('data-id');
             let [date, materialCode] = tdElement.getAttribute('data-id').split(' ');
-            let openingStock = document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText;
-            let receiptStock = document.querySelector(`td.receiptStock[data-id="${dataId}"]`).innerText;
-            let usedStock = tdElement.innerText;
+            let openingStock = validateInput(document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText);
+            let receiptStock = validateInput(document.querySelector(`td.receiptStock[data-id="${dataId}"]`).innerText);
+            let usedStock    = validateInput(tdElement.innerText);
             let currentBalanceStock = (Number(openingStock) + Number(receiptStock)) - Number(usedStock);
             document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock;
 
@@ -876,7 +894,7 @@ foreach ($period as $day) {
 
                 let dataId = `${otherDate} ${materialCode}`;
 
-                document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText = currentBalanceStock;
+                document.querySelector(`td.openingStock[data-id="${dataId}"]`).innerText = currentBalanceStock == 0 ? " " : currentBalanceStock;
 
                 let usedStock = validateInput(document.querySelector(`td.usedStock[data-id="${dataId}"]`).innerText);
 
@@ -884,8 +902,7 @@ foreach ($period as $day) {
 
                 currentBalanceStock = (Number(currentBalanceStock) + Number(receiptStock)) - Number(usedStock);
 
-                document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock;
-
+                document.querySelector(`td.balanceStock[data-id="${dataId}"]`).innerText = currentBalanceStock == 0 ? " " : currentBalanceStock;
 
             }
         })
diff --git a/app/Views/trpSandUseStockDetails.php b/app/Views/trpSandUseStockDetails.php
index f80b7894..7f60fcc4 100644
--- a/app/Views/trpSandUseStockDetails.php
+++ b/app/Views/trpSandUseStockDetails.php
@@ -98,16 +98,6 @@
         padding-top: 8px;
         width: 100%;
     }
-
-
-    .celda_encabezado_general {
-        background-color: #00a65a;
-        border: 1px solid #ccc;
-        color: #ffffff;
-        font-weight: bold;
-        padding: 6px 10px;;
-        text-align: center;
-    }
     
 
     ._Separador {
@@ -122,13 +112,7 @@
         width: 4px;
     }
 
-    .celda_normal {
-        /*background-color: #fff;*/
-        /* <!-- ad9271 into ffffff brown-light to green-light --> */
-        text-align: center;
-        border: 1px solid #ccc;
-        padding: 2px 4px;
-    }
+
 
     /*style excel*/
     .excel_cell {
@@ -156,18 +140,10 @@
         height: 20px;
     }
 
-    #trpSandUseStockDetailsTableId th:nth-child(1),
-    #trpSandUseStockDetailsTableId td:nth-child(1) {
-        position: sticky;
-        left: 0;
-        background-color: #00a65a;
-        z-index: 2;
-        border-right: 2px solid #ddd;
-        color: #ffffff;
-    }
 
-    .celda_encabezado_total {
-        background-color:#ffffff;
+
+    .celda_encabezado_general {
+        background-color: #00a65a;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -175,9 +151,77 @@
         text-align: center;
     }
 
-    .modal {
-        padding-right: 30% ! important;
+    .celda_encabezado_total {
+        background-color:#ffffff !important;
+        border: 1px solid #ffffff;
+        color: #ffffff !important;
+        font-weight: bold;
+        padding: 6px 10px;
+        text-align: center;
     }
+    
+    .celda_normal {
+        /*background-color: #fff;*/
+        /* <!-- ad9271 into ffffff brown-light to green-light --> */
+        text-align: center;
+        border: 1px solid #ccc;
+        padding: 10px 6px;
+    }
+
+
+    /* Make entire thead sticky */
+    .fht-table thead {
+        position: sticky;
+        top: 0;
+        z-index: 20; /* Ensure the entire header stays above table rows */
+        background-color: #00a65a; /* Header background color */
+    }
+
+    .dropdown-menu   {
+        z-index :25 ;
+    }
+
+
+
+    /* Ensure each <th> in thead stays sticky */
+    .fht-table thead th {
+        position: sticky;
+        top: 0;
+        z-index: 11; /* Higher than table rows but lower than first column */
+        background-color: #00a65a; /* Green background */
+        color: #ffffff;
+        border: 1px solid #ddd;
+        padding: 10px;
+    }
+
+    /* Sticky First Column */
+    .fht-table th:nth-child(1),
+    .fht-table td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 15; /* Ensures it stays above other cells */
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
+
+    /* Table Wrapper for Scrolling */
+    .table-responsive {
+        overflow-x: auto;
+        overflow-y: auto; 
+        max-height: 450px; /* Adjust as needed */
+        position: relative;
+    }
+
+    td{
+        min-width:  150px;
+        max-width:  150px;
+    }
+
+
+
+
+
 </style>
 
 
@@ -234,7 +278,7 @@
                                 <div class="table-responsive">
                                     <table style="width: 700px;" id="trpSandUseStockDetailsTableId" class="fht-table  table-striped">
 
-                                        <thead class="celda_encabezado_general" style="padding: 10px;">
+                                        <thead class="celda_encabezado_general" >
                                            
                                             <tr>     
                                             <th class="celda_encabezado_general" colspan="5" >Trp Sand To Use Coating Sand </th>  
@@ -281,26 +325,26 @@
                                         data-id="<?= $trpSandUseStockDetail['date'] ?>"
                                         oninput="roughStockChange(this)"
                                         contenteditable="true"
-                                        ><?= $trpSandUseStockDetail['rough_kgs'] ?></td>
+                                        ><?= $trpSandUseStockDetail['rough_kgs'] ?? " " ?></td>
 
                                         <td class="celda_normal fine"
                                         data-id="<?= $trpSandUseStockDetail['date'] ?>"
                                         oninput="fineStockChange(this)"
                                         contenteditable="true"
-                                        ><?= $trpSandUseStockDetail['fine_kgs'] ?></td>
+                                        ><?= $trpSandUseStockDetail['fine_kgs'] ?? " " ?></td>
 
                                         <td class="celda_normal total"
                                          data-id="<?= $trpSandUseStockDetail['date'] ?>"
-                                        ><?= $trpSandUseStockDetail['total_kgs'] ?></td>
+                                        ><?= $trpSandUseStockDetail['total_kgs'] ?? " " ?></td>
 
                                         <td class="celda_normal customerName"
                                          data-id="<?= $trpSandUseStockDetail['date'] ?>"
                                          contenteditable="true"
-                                        ><?= $trpSandUseStockDetail['customer_name'] ?></td>
+                                        ><?= $trpSandUseStockDetail['customer_name'] ?? " " ?></td>
 
                                         <td style="display:none"
                                          data-id="<?= $trpSandUseStockDetail['date'] ?>"
-                                        ><?= $trpSandUseStockDetail['id'] ?></td>
+                                        ><?= $trpSandUseStockDetail['id'] ?? " " ?></td>
 
                                         </tr>
 
@@ -318,17 +362,18 @@
                                         $summary['rough_kgs'] += $trpSandUseStockDetail['rough_kgs'] == "-" ? 0 : (float) $trpSandUseStockDetail['rough_kgs'] ;
                                         $summary['fine_kgs']  +=  $trpSandUseStockDetail['fine_kgs'] == "-" ? 0 : (float) $trpSandUseStockDetail['fine_kgs'] ;
                                         $summary['total_kgs'] +=  $trpSandUseStockDetail['total_kgs'] == "-" ? 0 :(float) $trpSandUseStockDetail['total_kgs'] ;
-                                            } ?>
+                                            
+                                        } ?>
 
                                         <div class="table-responsive" style="width: 700px;">
 
                                             <table id="trpSandUseStockDetailsTableSummaryId" class="fht-table  table-striped">
 
                                             <thead >
-                                                <th class="celda_encabezado_total"  style="width: 100px;">Total </th>
-                                                <th class="celda_encabezado_total"  style="width: 150px;">Rough Kgs </th>
-                                                <th class="celda_encabezado_total"  style="width: 120px;">Fine  Kgs </th>
-                                                <th class="celda_encabezado_total"  style="width: 130px;">Total Kgs </th>
+                                                <th class="celda_encabezado_total"  >Total </th>
+                                                <th class="celda_encabezado_total"  >Rough Kgs </th>
+                                                <th class="celda_encabezado_total"  >Fine  Kgs </th>
+                                                <th class="celda_encabezado_total"  >Total Kgs </th>
                                             </thead>
                                          
                                             <tbody>
@@ -394,31 +439,31 @@
                                             data-id="<?= $dateInMonth ?>"
                                             oninput="roughStockChange(this)"
                                             contenteditable="true"
-                                            ><?= 0 ?></td>
+                                            ><?= " " ?></td>
 
                                             <!-- td:eq(2) -->
                                             <td class="celda_normal fine"
                                             data-id="<?= $dateInMonth ?>"
                                             oninput="fineStockChange(this)"
                                             contenteditable="true"
-                                            ><?= 0 ?></td>
+                                            ><?= " " ?></td>
 
                                             <!-- td:eq(3) -->
                                             <td class="celda_normal total"
                                              data-id="<?= $dateInMonth ?>"
-                                            ><?= 0 ?></td>
+                                            ><?= " " ?></td>
 
                                             <!-- td:eq(4) -->
                                             <td class="celda_normal customer"
                                              data-id="<?= $dateInMonth ?>"
                                              contenteditable="true"
-                                            ><?= "  " ?></td>
+                                            ><?= " " ?></td>
 
                                               <!-- td:eq(5) -->
                                               <td style="display:none"
                                              data-id="<?= $dateInMonth ?>"
                                              contenteditable="true"
-                                             ><?= "  " ?></td>
+                                             ><?= " " ?></td>
 
                                         </tr>
                                         <?php
@@ -537,10 +582,10 @@
             console.log("just an alert from RoughStockChange..!!")
             console.log(tdElement.innerText)
             let dataId = tdElement.getAttribute('data-id')
-            let roughStock = tdElement.innerText;
-            let fineStock = document.querySelector(`td.fine[data-id="${dataId}"]`).innerText;
+            let roughStock = validateInput(tdElement.innerText);
+            let fineStock = validateInput(document.querySelector(`td.fine[data-id="${dataId}"]`).innerText);
             let total = (Number(roughStock) + Number(fineStock)) ;
-            document.querySelector(`td.total[data-id="${dataId}"]`).innerText=total;
+            document.querySelector(`td.total[data-id="${dataId}"]`).innerText = total == 0 ? " " : total;
 
         
             } catch(error){
@@ -554,10 +599,10 @@
             console.log("just an alert from fineStockChange..!!")
             console.log(tdElement.innerText)
             let dataId = tdElement.getAttribute('data-id')
-            let roughStock = document.querySelector(`td.rough[data-id="${dataId}"]`).innerText;
-            let fineStock = tdElement.innerText;
+            let roughStock = validateInput(document.querySelector(`td.rough[data-id="${dataId}"]`).innerText);
+            let fineStock  = validateInput(tdElement.innerText) ;
             let total = (Number(roughStock) + Number(fineStock)) ;
-            document.querySelector(`td.total[data-id="${dataId}"]`).innerText = total;
+            document.querySelector(`td.total[data-id="${dataId}"]`).innerText = total == 0 ? " " : total ;
         
             } catch(error){
             
@@ -567,6 +612,33 @@
         }
 
 
+        
+        
+    function validateInput(input) {
+
+
+        if (input == '' || input == ' ' || input == '-') {
+            return 0;
+        }
+
+        if (typeof input === 'string' && input.split('').map(char => char.charCodeAt(0))[0] == 10) {
+            return 0;
+        }
+
+        // Validate against the regex
+        const isValid = /^-?\d*\.?\d*$/.test(input);
+        if (!isValid) {
+            alert('Invalid input! Please enter a valid number.');
+            return 0;
+        }
+
+        return input;
+
+    }
+
+
+
+
 </script>