diff --git a/api_test.http b/api_test.http
index 00cf2d13..cef1449c 100644
--- a/api_test.http
+++ b/api_test.http
@@ -1,8 +1,13 @@
 
 
+ #  GET http://localhost/ci4/ria/dieselMachineDetails
+
+   GET http://localhost/ci4/ria/dieselMachineDetails
+
 //     $routes->match(['GET', 'POST'], 'trpProductionDetails', 'StockController::trpProductionDetails');
 
-   GET http://localhost/ci4/ria/trpProductionDetails
+   # GET http://localhost/ci4/ria/trpProductionDetails
+
 
 
 //    $routes->post('updateTrpProductionDetails', 'StockController::updateTrpProductionDetails');
@@ -1079,4 +1084,3 @@
 #     ]
 # }
 
-
diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index dcdbd56e..cc235356 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -457,13 +457,28 @@ $routes->get('deleteCoatingMachineDetails', 'StockController::deleteCoatingMachi
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'drierMachineDetails', 'StockController::drierMachineDetails');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditdrierMachineDetails', 'StockController::addOrEditdrierMachineDetails');
 
+//diesel machine details
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'factoryVehicleDieselDetails', 'StockController::factoryVehicleDieselDetails');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails');
 
+//power consumption details
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'powerConsumptionDetails', 'StockController::powerConsumptionDetails');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'addOrEditPowerConsumptionDetails', 'StockController::addOrEditPowerConsumptionDetails');
 
 
+
+//new diesel machine details
+$routes->match(['GET','POST'] , 'dieselMachineDetails' , 'StockController::dieselMachineStockDetails') ;
+$routes->post('updateDieselMachineDetails' , 'StockController::updateDieselMachineDetails');
+
+
+//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 789ffe79..8859cd74 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -2189,6 +2189,9 @@ class StockController extends BaseController
     }
 
 
+
+    
+
     public function powerConsumptionDetails()
     {
         $currentMonth = $this->request->getPost('month') ? $this->request->getPost('month') : date('M-Y');
@@ -2308,4 +2311,495 @@ class StockController extends BaseController
 
         echo "Data successfully saved.";
     }
+
+
+    public function dieselMachineStockDetails(){
+
+        
+        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 = '2025-02';
+
+            $month = date('Y-m');
+        }
+
+        $data = [];
+
+        $data['month'] = $month;
+
+        $this->global['pageTitle'] = 'Diesel Machine Stock Details';
+
+
+        // Get the previous month's last date resin 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['previousMonthDieselMachineStockDetails'] = $this->factoryVehicleDieselDetails_model
+            ->select(['machine_id', 'date', 'closing_reading'])
+            ->distinct()
+            ->where('date =', $previousMonthEndDate)
+            ->groupBy(['machine_id', 'date'])
+            ->orderBy('date', 'desc')
+            ->orderBy('machine_id', 'asc')
+            ->findAll();
+
+
+        $data['previousMonthTotalDieselMachineStockDetails'] = $this->factoryVehicleDieselStockSummary_model
+            ->select(['id', 'date', 'balance_stock'])
+            ->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['dieselMachineStockDetails'] = $this->factoryVehicleDieselDetails_model
+            ->where('date >=', $startDate)
+            ->where('date <=', $endDate)
+            ->groupBy(['machine_id', 'date'])
+            ->orderBy('date', 'asc')
+            ->orderBy('machine_id', 'asc')
+            ->findAll();
+
+
+        $data['totalDiesel'] = $this->factoryVehicleDieselStockSummary_model 
+        ->where('date >=', $startDate)
+        ->where('date <=', $endDate)
+        ->orderBy('date', 'asc')
+        ->findAll();
+
+        // Initialize an empty array to hold the grouped data
+        $data['groupedDieselMachineStockDetails'] = [];
+
+        // Temporary array to store grouped data by date
+        $groupedByDate = [];
+
+        // Group by 'date'
+        foreach ($data['dieselMachineStockDetails'] 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['groupedDieselMachineStockDetails'] = array_values($groupedByDate);
+
+
+
+        // getting diesel machines for creating table headers
+        // checking already existing  stock if yes then get the diesel machines id from the existing stock
+        // if not get all the diesel machines from the factory Machine master  table
+
+        if (!empty($data['groupedDieselMachineStockDetails'])) {
+           
+            $result = $groupedByDate[$date];
+
+            $distinctMachineId = [];
+
+            foreach ($result as $index => $eachResult) {
+                $distinctMachineId[] = $result[$index]['machine_id'];
+            }
+
+            $dieselMachines = $this->factoryMachine_model
+            ->whereIn('id', $distinctMachineId) 
+            ->orderBy('id', 'asc')
+            ->get()
+            ->getResultArray();
+
+      
+        } else {
+
+            $dieselMachines = $this->factoryMachine_model
+            ->where('is_active', 1)
+            ->where('energy_type', 'Diesel')
+            ->orderBy('id', 'asc') 
+            ->get()
+            ->getResultArray();
+
+        }
+
+
+      
+
+
+
+        $dieselMachinesCount = count($dieselMachines);
+
+        $data['dieselMachinesCount'] = $dieselMachinesCount;
+        $data['dieselMachines']     =  $dieselMachines;
+
+        $date = DateTime::createFromFormat('Y-m', $month);
+
+        $formattedDate = $date->format('M-Y');
+
+        $data['month'] = $formattedDate ;
+
+      //  return  $this->response->setJSON(['status' =>'success' ,'message' => $data['dieselMachines']]);
+
+        return $this->loadViews("dieselStockDetails", $this->global, $data, NULL);    
+
+
+
+
+    }
+
+    public function updateDieselMachineDetails() {
+        
+        $postData = $this->request->getPost();
+        $updateDmDetailsData = json_decode($postData['updateDieselMachineDetails'], true);
+    
+        $updateTotalDmDetailsData = $updateDmDetailsData[0];
+        $updateDmDetailsData = $updateDmDetailsData[1];
+    
+        $updatesDmR = [];
+        $insertsDmR = [];
+        $updatesTotalDmR = [];
+        $insertsTotalDmR = [];
+    
+        // Fetch existing records in bulk for diesel machine details
+        $dates = array_column($updateDmDetailsData, 'date');
+        $machineIds = array_column($updateDmDetailsData, 'machine_id');
+        $existingDmRecords = $this->factoryVehicleDieselDetails_model
+            ->whereIn('date', $dates)
+            ->whereIn('machine_id', $machineIds)
+            ->findAll();
+    
+        $existingDmMap = [];
+        foreach ($existingDmRecords as $record) {
+            $existingDmMap[$record['date']][$record['machine_id']] = $record;
+        }
+    
+        foreach ($updateDmDetailsData as $data) {
+            $date = $data['date'];
+            $machineId = $data['machine_id'];
+    
+            $dbData = [
+                'date' => $data['date'],
+                'machine_id' => $data['machine_id'],
+                'opening_reading' => $data['opening_reading'],
+                'closing_reading' => $data['closing_reading'],
+                'filling_diesel' => $data['filling_diesel'],
+                'consumption' => $data['consumption'],
+                'running_hours' => $data['running_hours'],
+                'mileage' => $data['mileage']
+            ];
+    
+            if (isset($existingDmMap[$date][$machineId])) {
+                $dbData['id'] = $existingDmMap[$date][$machineId]['id'];
+                $updatesDmR[] = $dbData;
+            } else {
+                $insertsDmR[] = $dbData;
+            }
+        }
+    
+        // Fetch existing records in bulk for diesel stock summary
+        $dates = array_column($updateTotalDmDetailsData, 'date');
+        $existingTotalDmRecords = $this->factoryVehicleDieselStockSummary_model
+            ->whereIn('date', $dates)
+            ->findAll();
+    
+        $existingTotalDmMap = [];
+        foreach ($existingTotalDmRecords as $record) {
+            $existingTotalDmMap[$record['date']] = $record;
+        }
+    
+        foreach ($updateTotalDmDetailsData as $data) {
+            $date = $data['date'];
+    
+            $dbData = [
+                'date' => $data['date'],
+                'opening_stock' => $data['opening_stock'],
+                'purchase_diesel' => $data['purchase_diesel'],
+                'total_filling_diesel' => $data['total_filling_diesel'],
+                'balance_stock' => $data['balance_stock']
+            ];
+    
+            if (isset($existingTotalDmMap[$date])) {
+                $dbData['id'] = $existingTotalDmMap[$date]['id'];
+                $updatesTotalDmR[] = $dbData;
+            } else {
+                $insertsTotalDmR[] = $dbData;
+            }
+        }
+    
+        // Start the transaction
+        $this->db->transBegin();
+    
+        try {
+            if (!empty($insertsDmR)) {
+                $this->factoryVehicleDieselDetails_model->insertBatch($insertsDmR);
+            }
+    
+            if (!empty($updatesDmR)) {
+                $this->factoryVehicleDieselDetails_model->updateBatch($updatesDmR, 'id');
+            }
+    
+            if (!empty($insertsTotalDmR)) {
+                $this->factoryVehicleDieselStockSummary_model->insertBatch($insertsTotalDmR);
+            }
+    
+            if (!empty($updatesTotalDmR)) {
+                $this->factoryVehicleDieselStockSummary_model->updateBatch($updatesTotalDmR, '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();
+        }
+    }
+
+    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/Views/dieselStockDetails.php b/app/Views/dieselStockDetails.php
new file mode 100644
index 00000000..4dc84772
--- /dev/null
+++ b/app/Views/dieselStockDetails.php
@@ -0,0 +1,1116 @@
+<style type="text/css">
+    .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%;
+    }
+
+
+    .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;
+        height: 12px;
+        border-left: 1px solid #ccc;
+        border-right: 1px solid #ccc;
+        width: 7px;
+    }
+
+    ._Separador div {
+        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;
+        color: #222;
+        text-align: center;
+        font-size: 13px;
+        font-weight: normal;
+        padding: 4px;
+        white-space: pre-line;
+        empty-cells: show;
+    }
+
+    ._cell_header {
+        background-color: #EEE;
+    }
+
+    ._cell_Default {
+        background-color: #FFF;
+        text-align: left;
+    }
+
+    .excel_cell div {
+        width: 30px;
+        height: 20px;
+    }
+
+    #dieselStockDetailsTableId th:nth-child(1),
+    #dieselStockDetailsTableId td:nth-child(1) {
+        position: sticky;
+        left: 0;
+        background-color: #00a65a;
+        z-index: 2;
+        border-right: 2px solid #ddd;
+        color: #ffffff;
+    }
+
+    .modal {
+        padding-right: 30% ! important;
+    }
+</style>
+
+
+
+<?php
+
+$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');
+
+$datesInMonth = [];
+
+
+$period = new DatePeriod(
+    new DateTime($startDate),
+    new DateInterval('P1D'),
+    (new DateTime($endDate))->modify('+1 day')
+);
+
+foreach ($period as $day) {
+    $datesInMonth[] = $day->format('Y-m-d');
+}
+
+?>
+
+
+
+<div class="content-page">
+    <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+            <!-- start page title -->
+            <div>
+                <div class="row">
+                    <div class="col-6">
+                        <div class="page-title-box page-title-box-alt">
+                            <div class="page-title-right">
+                                <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">Diesel Machine Stock Details </h4>
+                                    </li>
+                                </ol>
+                            </div>
+
+                        </div>
+                    </div>
+                    <div class="col-6 text-right">
+                        <!-- Right-aligned buttons or links can be added here -->
+                    </div>
+                </div>
+
+
+
+                <div class="row">
+                    <div class="col-12">
+                        <div class="card">
+                            <div class="card-body">
+
+
+                                <form action="<?= base_url('dieselMachineDetails'); ?>" method="post">
+                                    <div class="row">
+
+                                        <div class="col-3">
+                                            <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
+                                                class="form-control mt-2" data-provide="datepicker"
+                                                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>
+                                </form>
+
+
+
+                                <div class="table-responsive">
+                                    <table id="dieselStockDetailsTableId" class="fht-table  table-striped">
+
+                                        <thead class="celda_encabezado_general" style="padding: 10px;">
+
+                                            <tr>
+
+                                                <th class="celda_encabezado_general" colspan="1"> machine </th>
+
+                                                   <th class="celda_encabezado_general" colspan="4">
+                                                        Total Diesel
+                                                    </th>
+
+
+                                                <?php foreach ($dieselMachines as $dieselMachine) { ?>
+                                                    <!-- this will loop till machines present  -->
+                                                    <th class="celda_encabezado_general" colspan="6">
+                                                        <?= $dieselMachine['machine_name'] ?>
+                                                    </th>
+                                                <?php } ?>
+                                            </tr>
+
+
+
+                                            <tr>
+                                                    <th class="celda_encabezado_general" colspan="1">Date </th>
+                                                    <th class="celda_encabezado_general">Opening </th>
+                                                    <th class="celda_encabezado_general">Purchase Diesel</th>
+                                                    <th class="celda_encabezado_general">Filling Diesel</th>
+                                                    <th class="celda_encabezado_general">Balance Stock</th>
+
+
+                                                <?php foreach ($dieselMachines as $dieselMachine) { ?>
+                                                    <!-- 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 Reading</th>
+                                                    <th class="celda_encabezado_general">Closing Reading</th>
+                                                    <th class="celda_encabezado_general">Filling Diesel</th>
+                                                    <th class="celda_encabezado_general">Consumption</th>
+                                                    <th class="celda_encabezado_general">Running Hours</th>
+                                                    <th class="celda_encabezado_general">Mileage</th>
+                                                <?php } ?>
+                                            </tr>
+
+
+                                        </thead>
+
+                                        <tbody style="background-color: #fff;">
+
+                                            <?php if (!empty($groupedDieselMachineStockDetails)) {
+
+                                                foreach ($groupedDieselMachineStockDetails as $groupedDieselMachineStockDetailsIndex => $dieselStockDetails) {
+                                                 
+                                            ?>
+                                                    <tr
+
+                                                        <?php
+
+                                                        $currentDate = date('d-m-Y');
+                                                        $dateInMonthDmYFormat = DateTime::createFromFormat('Y-m-d', $dieselStockDetails[0]['date'])->format('d-m-Y');
+                                                        if ($dateInMonthDmYFormat === $currentDate) {
+                                                            echo 'style="background: #cef0ad;"';
+                                                        }
+                                                        ?>>
+
+
+                                                                <?php
+                                                                $startDate = DateTime::createFromFormat('Y-m-d', $totalDiesel[$groupedDieselMachineStockDetailsIndex]['date'])->format('d-m-Y');
+                                                                ?>
+
+                                                                <td class="celda_normal">
+                                                                    <?= $startDate ?>
+                                                                </td>
+
+
+                                                                <td class="celda_normal openingTD"
+                                                                data-id="<?=$totalDiesel[$groupedDieselMachineStockDetailsIndex]['date']?>"
+
+                                                                
+
+                                                                <?php if ($groupedDieselMachineStockDetailsIndex == 0): ?>
+                                                                oninput="openingTDStockChange(this)"
+                                                                contenteditable="true"
+                                                                <?php endif; ?>
+                                                                
+                                                                ><?= $totalDiesel[$groupedDieselMachineStockDetailsIndex]['opening_stock'] ?></td>
+
+
+                                                                <td class="celda_normal purchaseTD"
+                                                                data-id="<?=$totalDiesel[$groupedDieselMachineStockDetailsIndex]['date']?>"
+
+                                                                oninput="purchaseTDStockChange(this)"
+                                                                contenteditable="true">
+
+                                                                <?= $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal fillingTD"
+                                                                data-id="<?=$totalDiesel[$groupedDieselMachineStockDetailsIndex]['date']?>" >
+
+                                                                <?= $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] ?>
+
+                                                                </td>
+
+                                                                <td class="celda_normal balanceTD"
+                                                                data-id="<?=$totalDiesel[$groupedDieselMachineStockDetailsIndex]['date']?>"
+                                                                >
+
+                                                                <?= $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] ?>
+
+                                                                </td>
+
+
+
+
+                                                        <?php foreach ($dieselStockDetails as $dieselStockIndex => $dieselStock) {  ?>                                      
+
+                                                            <td style="display:none">
+                                                                <?= $dieselStock['date'] ?>
+                                                            </td>
+
+                                                            <td style="display:none"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>"
+                                                                class="machine_id">
+                                                                
+                                                                <?= $dieselStock['machine_id'] ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal openingReading"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>"
+
+                                                                <?php if ($groupedDieselMachineStockDetailsIndex == 0): ?>
+                                                                oninput="openingReadingChange(this)"
+                                                                contenteditable="true"
+                                                                <?php endif; ?>>
+                                                                
+                                                                <?= $dieselStock['opening_reading'] ?>
+
+
+                                                            </td>
+
+                                                            <td class="celda_normal closingReading"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>"
+
+                                                                oninput="closingReadingChange(this)"
+                                                                contenteditable="true">
+
+                                                                <?= $dieselStock['closing_reading'] ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal fillingDiesel"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>"
+                                                                oninput="fillingReadingChange(this)"
+                                                                contenteditable="true">
+
+                                                                <?= $dieselStock['filling_diesel'] ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal consumption"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>"
+                                                                oninput="consumptionChange(this)"
+                                                                contenteditable="true">
+
+                                                                <?= $dieselStock['consumption'] ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal runningHours"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>"
+                                                            >
+
+                                                                <?= $dieselStock['running_hours'] ?>
+
+                                                            </td>
+
+                                                            <td class="celda_normal mileage"
+                                                                data-id="<?= $dieselStock['date'] ?> <?= $dieselStock['machine_id'] ?>">
+                                                                
+                                                                <?= $dieselStock['mileage'] ?>
+
+                                                            </td>
+
+                                                        <?php } ?>
+                                                    </tr>
+
+                                                <?php } ?>
+
+                                                <!-- this else condition work if groupedBagStockDetails 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 openingTD"
+                                                                data-id="<?= $dateInMonth?>"
+
+                                                                <?php if ($datesInMonthIndex == 0) { ?>
+
+                                                                oninput="openingTDStockChange(this)"
+                                                                contenteditable="true"
+
+                                                                <?php } ?> 
+
+                                                                ><?= $previousMonthTotalDieselMachineStockDetails[0]['balance_stock'] ?? 0 ?></td>
+                                                                
+
+
+                                                                <td class="celda_normal purchaseTD"
+                                                                data-id="<?= $dateInMonth ?>"
+
+                                                                oninput="purchaseTDStockChange(this)"
+                                                                contenteditable="true">0</td>
+
+                                                                <td class="celda_normal fillingTD"
+                                                                data-id="<?= $dateInMonth ?>">0</td>
+
+                                                                <td class="celda_normal balanceTD"
+                                                                data-id="<?= $dateInMonth ?>"
+                                                                
+                                                                ><?= $previousMonthTotalDieselMachineStockDetails[0]['balance_stock'] ?? 0 ?></td>
+
+
+
+                                                        <?php
+                                                        foreach ($dieselMachines as $dieselMachineIndex => $dieselMachine) { 
+                                                            ?>
+                                                            <!-- 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 ?> <?= $dieselMachine['id'] ?>">
+                                                                <?= $dieselMachine['id'] ?>
+                                                            </td>
+
+                                                            <td class="celda_normal openingReading"
+                                                                data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
+
+                                                                <?php if ($datesInMonthIndex == 0) { ?>
+
+                                                                oninput="openingReadingChange(this)"
+                                                                contenteditable="true"
+
+                                                                <?php } ?>
+                                                                
+                                                                ><?= $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ?? '0' ?>
+                                                            </td>
+
+                                                            <td class="celda_normal closingReading"
+                                                                data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
+                                                                oninput="closingReadingChange(this)"
+                                                                contenteditable="true"><?= $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading'] ?? '0' ?>
+                                                            </td>
+
+                                                            <td class="celda_normal fillingDiesel"
+                                                                data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
+                                                                oninput="fillingReadingChange(this)"
+                                                                contenteditable="true">0</td>
+
+                                                                <td class="celda_normal consumption"
+                                                                data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>"
+                                                                oninput="consumptionChange(this)"
+                                                                contenteditable="true">0</td>
+
+                                                                <td class="celda_normal runningHours"
+                                                                data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>">0</td>
+
+                                                                <td class="celda_normal mileage"
+                                                                data-id="<?= $dateInMonth ?> <?= $dieselMachine['id'] ?>">0</td>
+                                                        <?php } ?>
+                                                    </tr>
+                                                <?php } ?>
+                                            <?php } ?>
+
+
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <div class="row">
+                                    <div class="col-md-12 text-right">
+                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                    </div>
+                                </div>
+
+                            </div>
+
+                        </div> <!-- End card-body -->
+                    </div> <!-- End card -->
+                </div> <!-- End col -->
+            </div> <!-- End row -->
+        </div>
+    </div> <!-- End container-fluid -->
+</div>
+</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="dieselDropdown">Select Bag</label>
+                                <select id="dieselDropdown" class="form-control">
+                                    <option value="">Select Diesel</option>
+                                    <?php foreach ($dieselMachines as $dieselMachine): ?>
+                                        <option value="  <?= $dieselMachine['machine_name'] ?>">
+                                            <?= $dieselMachine['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="navigateToDiesel()">Navigate</button>
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+</div>
+
+
+
+
+<script>
+    function navigateToDiesel() {
+        $('.close').click();
+        const dieselDropdown = document.getElementById('dieselDropdown');
+        const dateDropdown = document.getElementById('dateDropdown');
+        const selectedDiesel = dieselDropdown.value;
+        const selectedDate = dateDropdown.value;
+
+        const table = document.getElementById('dieselStockDetailsTableId');
+        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()) === selectedDiesel.trim()) {
+                targetColumnIndex = index;
+                return;
+            }
+        });
+
+        if (targetColumnIndex === -1) {
+            console.log("Diesel 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;
+        }
+
+        console.log(targetColumnIndex);
+        console.log(targetRow);
+
+
+
+        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 updateDieselMachineDetails = tableToJson();
+
+
+            alert('Updation may take a while, And we appreciate your patience..!!');
+
+            $('#loader').show();
+            $.ajax({
+                data: {
+                    updateDieselMachineDetails
+                },
+                type: "POST",
+                url: "<?php echo base_url() ?>updateDieselMachineDetails",
+
+                success: function(data) {
+                    if (data) {
+                        $('#loader').hide();
+                        console.log(data);
+                        alert(data);
+                    }
+
+                },
+                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 tableToJson() {
+        const table = $('#dieselStockDetailsTableId');
+        const summaryRowPart = [] ;
+        const readingsRowPart = [];
+        const allRow = [] ;
+
+        //this table to json is customized for bagstock not for all
+
+        table.find('tbody tr').each(function(index) {
+
+            const rowCells = $(this).find('td');
+            console.log(rowCells.length);
+            const date = rowCells.eq(0).text().trim();
+
+            const formattedDate = `${date.split('-')[2]}-${date.split('-')[1]}-${date.split('-')[0]}`;
+
+
+                const summaryRowData = {
+                    date: formattedDate,
+                    opening_stock: rowCells.eq(1).text().trim(),
+                    purchase_diesel: rowCells.eq(2).text().trim(),
+                    total_filling_diesel: rowCells.eq(3).text().trim(),
+                    balance_stock: rowCells.eq(4).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 = 5 ; i < rowCells.length; i += 8) {
+                const readingsRowData = {
+                    date: rowCells.eq(i).text().trim(),
+                    machine_id: rowCells.eq(i + 1).text().trim(),
+                    opening_reading: rowCells.eq(i + 2).text().trim(),
+                    closing_reading: rowCells.eq(i + 3).text().trim(),
+                    filling_diesel: rowCells.eq(i + 4).text().trim(),
+                    consumption: rowCells.eq(i + 5).text().trim(),
+                    running_hours: rowCells.eq(i + 6).text().trim(),
+                    mileage: rowCells.eq(i + 7).text().trim()
+                };
+
+                readingsRowPart.push(readingsRowData);
+
+            }
+
+           
+
+        });
+
+
+        allRow.push(summaryRowPart ,readingsRowPart )
+
+        return JSON.stringify(allRow, null, 2);
+    }
+</script>
+
+<script>
+
+
+
+    function openingReadingChange(tdElement) {
+
+        try {
+            let dataId = tdElement.getAttribute('data-id');
+            let [date, machine_id] = tdElement.getAttribute('data-id').split(' ');
+            let openingReading = validateInput(tdElement.innerText); 
+            let closingReading = validateInput(document.querySelector(`td.closingReading[data-id="${dataId}"]`).innerText);
+            let consumption    = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText); 
+            let runningHours =   Math.abs(Number(closingReading) -  Number(openingReading));
+            let mileage      = consumption == 0 || runningHours == 0 ? 0 : (Number(consumption) / Number(runningHours)).toFixed(2) ;
+
+            document.querySelector(`td.runningHours[data-id="${dataId}"]`).innerText = runningHours;
+            document.querySelector(`td.mileage[data-id="${dataId}"]`).innerText = mileage;
+           
+
+            updateStockValue(date,machine_id,closingReading)
+
+
+        } catch (error) {
+
+            console.error("There is an error updating stock ..!!" + error);
+
+        }
+    }
+
+    function closingReadingChange(tdElement) {
+
+        try {
+            let dataId = tdElement.getAttribute('data-id');
+            let [date, machine_id] = tdElement.getAttribute('data-id').split(' ');
+            let closingReading = validateInput(tdElement.innerText);
+            let openingReading = validateInput(document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText);
+            let consumption    = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);
+            let runningHours =   Math.abs(Number(closingReading) -  Number(openingReading));
+            let mileage      = consumption == 0 || runningHours == 0 ? 0 : (Number(consumption) / Number(runningHours)).toFixed(2) ;
+
+            document.querySelector(`td.runningHours[data-id="${dataId}"]`).innerText = runningHours;
+            document.querySelector(`td.mileage[data-id="${dataId}"]`).innerText = mileage;
+
+            updateStockValue(date, machine_id, closingReading)
+
+
+        } catch (error) {
+
+            console.error("There is an error updating stock ..!!" + error);
+
+        }
+    }
+  
+
+    function consumptionChange(tdElement) {
+
+        try {
+            let dataId = tdElement.getAttribute('data-id');
+            let [date, machine_id] = tdElement.getAttribute('data-id').split(' ');
+            let closingReading = validateInput(document.querySelector(`td.closingReading[data-id="${dataId}"]`).innerText);
+            let openingReading = validateInput(document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText);
+            let consumption    = validateInput(tdElement.innerText);
+            let runningHours =  Math.abs(Number(closingReading) -  Number(openingReading));
+            let mileage      =  consumption == 0 || runningHours == 0 ? 0 : (Number(consumption) / Number(runningHours)).toFixed(2) ;
+
+            document.querySelector(`td.runningHours[data-id="${dataId}"]`).innerText = runningHours;
+            document.querySelector(`td.mileage[data-id="${dataId}"]`).innerText = mileage;
+
+            updateStockValue(date, machine_id, closingReading)
+
+        } catch (error) {
+
+    console.error("There is an error updating stock ..!!" + error);
+
+}
+}
+
+
+    function fillingReadingChange(tdElement) {
+
+    try {
+
+        let dataId = tdElement.getAttribute('data-id');
+        let [date,machine_id]  = tdElement.getAttribute('data-id').split(" ");
+        
+
+        let fillingDiesel = tdElement.innerText;
+
+        let totalFillingDiesel = 0 ;
+
+        let machines = <?= json_encode($dieselMachines) ?> ;
+
+
+
+        machines.forEach((each)=>{
+        totalFillingDiesel += Number(document.querySelector(`td.fillingDiesel[data-id="${date} ${each.id}"]`).innerText
+        )});
+        
+
+        document.querySelector(`td.fillingTD[data-id="${date}"]`).innerText = totalFillingDiesel;
+
+        let openingTD = validateInput(document.querySelector(`td.openingTD[data-id="${date}"]`).innerText);
+
+        let purchaseTD = validateInput(document.querySelector(`td.purchaseTD[data-id="${date}"]`).innerText);
+
+        let balanceTD = (Number(openingTD) + Number(purchaseTD)) - Number(totalFillingDiesel) ;
+
+        document.querySelector(`td.balanceTD[data-id="${date}"]`).innerText = balanceTD ;
+
+        updateTotalStockValue(date, balanceTD) ;
+
+
+
+    } catch (error) {
+
+        console.error("There is an error updating stock ..!!" + error);
+
+    }
+    }
+
+
+
+
+
+    function openingTDStockChange(tdElement){
+
+        try {
+        
+            let dataId = tdElement.getAttribute('data-id');
+
+            let openingTD  = validateInput(tdElement.innerText);
+            let purchaseTD = validateInput(document.querySelector(`td.purchaseTD[data-id="${dataId}"]`).innerText);
+            let fillingTD  = validateInput(document.querySelector(`td.fillingTD[data-id="${dataId}"]`).innerText);
+
+
+            let balanceTD    = (Number(openingTD) + Number(purchaseTD)) - Number(fillingTD) ;
+
+            document.querySelector(`td.balanceTD[data-id="${dataId}"]`).innerText =  balanceTD ;
+ 
+            updateTotalStockValue(dataId , balanceTD)
+
+
+        } catch (error) {
+
+            console.error("There is an error updating stock ..!!" + error);
+
+        }
+
+    }
+
+    function purchaseTDStockChange(tdElement){
+
+    try {
+        let dataId = tdElement.getAttribute('data-id');
+        let purchaseTD = validateInput(tdElement.innerText);
+        let openingTD = validateInput(document.querySelector(`td.openingTD[data-id="${dataId}"]`).innerText);
+        let fillingTD = validateInput(document.querySelector(`td.fillingTD[data-id="${dataId}"]`).innerText);
+        let balanceTD    = validateInput(document.querySelector(`td.balanceTD[data-id="${dataId}"]`).innerText);
+
+            balanceTD    = (Number(openingTD) + Number(purchaseTD)) - Number(fillingTD) ;
+
+        document.querySelector(`td.balanceTD[data-id="${dataId}"]`).innerText =  balanceTD ;
+
+        updateTotalStockValue(dataId, balanceTD) ;
+
+
+    } 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;
+    }
+
+
+
+
+
+</script>
+
+<script>
+
+
+    function updateStockValue(date, machine_id, closingReading) {
+
+        const table = $('#dieselStockDetailsTableId');
+        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)) { 
+                
+                //other records present after it
+
+                /**this data-id ,openingStock  ,used stock ,  current Balance Stock
+                 is for changing subsequent dates not the earlier one **/
+
+                let dataId = `${otherDate} ${machine_id}`;
+
+                document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText = closingReading;
+
+                let openingReading = validateInput(document.querySelector(`td.openingReading[data-id="${dataId}"]`).innerText);
+
+                let runningHours = validateInput(document.querySelector(`td.runningHours[data-id="${dataId}"]`).innerText);
+
+                closingReading = Math.abs(Number(openingReading) +  Number(runningHours));
+
+                let consumption = validateInput(document.querySelector(`td.consumption[data-id="${dataId}"]`).innerText);       
+
+                 runningHours      =  Math.abs(Number(closingReading) -  Number(openingReading));
+
+                let mileage        = consumption == 0 || runningHours == 0 ? 0 : (Number(consumption) / Number(runningHours)).toFixed(2) ;
+
+                document.querySelector(`td.runningHours[data-id="${dataId}"]`).innerText = runningHours ;
+
+                document.querySelector(`td.mileage[data-id="${dataId}"]`).innerText = mileage ;
+
+                document.querySelector(`td.closingReading[data-id="${dataId}"]`).innerText = closingReading ;
+
+
+            }
+        })
+    }
+
+
+
+
+    function  updateTotalStockValue(date, balanceTD){
+
+        const table = $('#dieselStockDetailsTableId');
+        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)) { //other records present after it
+
+                /**this data-id ,openingStock  ,used stock ,  current Balance Stock
+                 is for changing subsequent dates not the earlier one **/
+
+                let dataId = `${otherDate}`;
+
+
+                document.querySelector(`td.openingTD[data-id="${dataId}"]`).innerText = balanceTD;
+
+                let openingTD = document.querySelector(`td.openingTD[data-id="${dataId}"]`).innerText;
+
+
+                let purchaseTD = document.querySelector(`td.purchaseTD[data-id="${dataId}"]`).innerText ;
+
+
+                let fillingTD  = document.querySelector(`td.fillingTD[data-id="${dataId}"]`).innerText ;
+
+
+                balanceTD = (Number(openingTD) + Number(purchaseTD)) - Number(fillingTD) ; 
+
+                document.querySelector(`td.balanceTD[data-id="${dataId}"]`).innerText = balanceTD ;
+
+
+            }
+        })
+
+    }
+
+</script>
\ No newline at end of file
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index 57e30454..90226e6d 100755
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -881,6 +881,8 @@
 
                                         <a href="<?php echo base_url(); ?>factoryVehicleDieselDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Diesel - Factory Vehicle </a>
 
+                                        <a href="<?php echo base_url(); ?>dieselMachineDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i> New Diesel - Factory Vehicle </a>
+
                                         <a href="<?php echo base_url(); ?>powerConsumptionDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Power Consumption </a>
 
                                         <a href="<?php echo base_url(); ?>dustAndRoughStockDetails" class="dropdown-item"><i class="ri-file-info-line align-middle mr-1"></i>Dust And Rough Stock Details</a>
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php
index 02e359d6..6a8632fc 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/incomingSilicaSandDetails.php
@@ -1393,7 +1393,7 @@ $(document).ready(function() {
          },
          success: function(data){
             alert("Data Saved Successfully..!!");       
-          //  window.location.reload();
+            window.location.reload();
          },
          error : function(xhr, status, error){
             alert("An error occurred while processing the request. Please try again.");