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

app/Controllers/StockController.php

@@ -130,19 +130,33 @@ class StockController extends BaseController
     {
 
         if ($this->request->getMethod() === 'POST') {
+            
             $month = $this->request->getPost('month');
 
             $date = DateTime::createFromFormat('M-Y', $month);
 
             $formattedDate = $date->format('Y-m');
 
-            $month = $formattedDate;
+            $month = $formattedDate;  
+            
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
         } else {
 
-            $filteredMonth = $this->request->getGet('month');
+            $session = session();
-            $month = $filteredMonth ?? date('Y-m');
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
+
         }
 
+        $data['month'] = $month ;
+
         $this->global['pageTitle'] = 'Coating Machine Details ';
 
 
@@ -171,7 +185,7 @@ class StockController extends BaseController
 
         $data['month'] = $formattedDate;
 
-        return $this->loadViews("CoatingMachineDetail", $this->global, $data, NULL);
+        return $this->loadViews("stock/CoatingMachineDetail", $this->global, $data, NULL);
     }
 
     public function addNewCoatingMachineDetails()
@@ -181,8 +195,6 @@ class StockController extends BaseController
         $message3 = '';
 
         $postData = $this->request->getPost();
-        $month = $this->request->getGet('month');
-        $month = DateTime::createFromFormat('M-Y', $month)->format('Y-m');
 
         $date = $postData['date'];
         $shift = $postData['shift'];
@@ -265,7 +277,7 @@ class StockController extends BaseController
 
 
             // Set flashdata for success message
-            return redirect()->to("/coatingMachineDetails?month=$month")
+            return redirect()->to("/coatingMachineDetails")
                 ->with('success', $message1 . " " . $message2 . " " . $message3);
         } catch (\Exception $error) {
             $this->db->transRollback();
@@ -284,8 +296,7 @@ class StockController extends BaseController
         $message3 = '';
 
         $putData = $this->request->getPost();
-        $month = $this->request->getGet('month');
+
-        $month = DateTime::createFromFormat('M-Y', $month)->format('Y-m');
 
         $id = $putData['editCoatingMachineDetailId'];
 
@@ -361,7 +372,7 @@ class StockController extends BaseController
 
 
                 // Set flashdata for success message
-                return redirect()->to("/coatingMachineDetails?month=$month")
+                return redirect()->to("/coatingMachineDetails")
                     ->with('success', $message1 . " " . $message2 . " " . $message3);
             } else {
                 throw new \Exception('Failed to update Coating machine details.');
@@ -443,10 +454,23 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
+
         } else {
             $remark = $this->request->getVar('remark');
 
-            $month = date('Y-m');
+            $session = session();
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
+
         }
 
         $data['month'] = $month;
@@ -489,7 +513,7 @@ class StockController extends BaseController
 
         $data['remark'] = $remark;
 
-        return $this->loadViews("incomingSilicaSandDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/incomingSilicaSandDetails", $this->global, $data, NULL);
     }
 
     public function updateIncomingSilicaSandDetails()
@@ -624,6 +648,47 @@ class StockController extends BaseController
 
 
     // Bag Stock details starts
+
+
+    //custom filterMaterialCode given by user
+
+    //two types of custom filter
+
+    //1) fliter for no data present in db - active and is active is not a concern ..!!(for current month)
+    //   +  adding new material in packing material category is not a concern ..!!
+    //   -  deleting existing material in packing material category is not a concern ..!!
+
+    //fetch all active material in bag stock then ,
+        // i) if no custom filter option given , all active material code going to be present in filterMaterialCode .
+        // ii)if    custom filter option given , what are all the materials active is going to be filtered among given filterMaterialCode.. 
+
+
+        //----------------1st part finished----//
+
+
+    //2) filter for data present in db -- active and is active is a concern ..!!
+    //  + adding new material category in packing material is a concern ..!!
+    //  - deleting existing material category in packing material is a concern ..!!
+
+    //for second case if already material present in db but deleted in material master means 
+        // i) we need to show the deleted one too for that month .
+        // ii)check If they add another material in packing material for current month, 
+        // we need to put dummy entry(empty string) and show that as well.
+
+    //wild scenario if user wants to add an new material and its entry in previous month 
+       //i) Hard code database entry after consultation can be entertained..!!
+
+       //-------------- 2nd part finished -----//
+
+
+    // Action 
+
+
+
+
+
+
+
     public function loadView_bagStockDetails()
     {
 
@@ -634,15 +699,23 @@ class StockController extends BaseController
 
             $formattedDate = $date->format('Y-m');
 
-            $month = $formattedDate;
+            $month = $formattedDate; 
 
-            //filterMaterialCode
+            $session = session ();
+
+            $session->set('stock_month',$month);
 
-            $filterMaterialCode = $this->request->getPost('filterMaterialCode');
 
         } else {
-            $month = date('Y-m');
+
-            $filterMaterialCode = ['601529'];
+            $session = session();
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
+        
         }
 
         $data = [];
@@ -672,7 +745,13 @@ class StockController extends BaseController
 
         $startDate = "$month-01";
         $endDate = date("Y-m-t", strtotime($startDate));
-        $data['bagStockDetails'] = $this->bagStockDetails_model->getBagStockForGivenMonth($startDate , $endDate ,$filterMaterialCode);
+        $data['bagStockDetails'] = $this->bagStockDetails_model
+            ->where('date >=', $startDate)
+            ->where('date <=', $endDate)
+            ->groupBy(['materialCode', 'date'])
+            ->orderBy('date', 'asc')
+            ->orderBy('materialCode', 'asc')
+            ->findAll();
 
         // Initialize an empty array to hold the grouped data
         $data['groupedBagStockDetails'] = [];
@@ -717,15 +796,20 @@ class StockController extends BaseController
         // if not get all the material codes from the raw material details table
 
         if (!empty($data['groupedBagStockDetails'])) {
+            $result = $groupedByDate[$date];
 
-            $bagMaterials = $this->rawmaterialdetails_model->getSelectedBagMaterialCode($filterMaterialCode);
+            $distinctMaterialCodes = [];
+
+            foreach ($result as $index => $eachResult) {
+                $distinctMaterialCodes[] = $result[$index]['materialCode'];
+            }
+
+            $bagMaterials = $this->rawmaterialdetails_model->getSelectedBagMaterialCode($distinctMaterialCodes);
+      
         } else {
-            $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode($filterMaterialCode);
+            $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode();
         }
 
-
-
-
         
         // getting customer for creating table headers
         // checking already existing  stock if yes then get customer from the existing stock
@@ -752,7 +836,7 @@ class StockController extends BaseController
 
         $data['month'] = $formattedDate;
 
-        return $this->loadViews("bagStockDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/bagStockDetails", $this->global, $data, NULL);
     }
 
     public function updateBagStockDetails()
@@ -826,8 +910,19 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
         } else {
-            $month = date('Y-m');
+            $session = session();
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
         }
 
         $data = [];
@@ -850,7 +945,7 @@ class StockController extends BaseController
 
         $data['month'] = $formattedDate;
 
-        return $this->loadViews("dustAndRoughStockDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/dustAndRoughStockDetails", $this->global, $data, NULL);
     }
 
     public function updateDustAndRoughStockDetails()
@@ -922,8 +1017,19 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
         } else {
-            $month = date('Y-m');
+            $session = session();
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
         }
 
         $data = [];
@@ -1043,7 +1149,7 @@ class StockController extends BaseController
 
         $data['month'] = $formattedDate;
 
-        return $this->loadViews("resinStockDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/resinStockDetails", $this->global, $data, NULL);
     }
 
     public function updateResinStockDetails()
@@ -1122,8 +1228,19 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
         } else {
-            $month = date('Y-m');
+            $session = session();
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
         }
 
         $data = [];
@@ -1189,7 +1306,7 @@ class StockController extends BaseController
 
         $data['month'] = DateTime::createFromFormat('Y-m', $month)->format('M-Y');
 
-        return $this->loadViews("gasStockDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/gasStockDetails", $this->global, $data, NULL);
     }
 
     public function updateGasStockDetails()
@@ -1393,7 +1510,13 @@ class StockController extends BaseController
 
             $month = $formattedDate;
         } else {
-            $month = date('Y-m');
+            $session = session();
+
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
         }
 
         $data = [];
@@ -1416,7 +1539,7 @@ class StockController extends BaseController
 
         $data['month'] = $formattedDate;
 
-        return $this->loadViews("trpSandUseStockDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/trpSandUseStockDetails", $this->global, $data, NULL);
        
 
     }
@@ -1490,12 +1613,21 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
+
         } else {
            
-            // $month = new DateTime('2024-10-01');
+            $session = session();
-            // $month = $month->format('Y-m');    
 
-            $month = date('Y-m');
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
           
         }       
 
@@ -1545,7 +1677,7 @@ class StockController extends BaseController
        // return $this->response->setJSON($data);
 
 
-        return $this->loadViews("trpProductionStockDetails", $this->global, $data, NULL);
+        return $this->loadViews("stock/trpProductionStockDetails", $this->global, $data, NULL);
        
 
 
@@ -1856,7 +1988,7 @@ class StockController extends BaseController
         $data['datefordropdown'] = $currentMonth;
 
         $this->global['pageTitle'] = 'Drier Details';
-        $this->loadViews("drierMachineDetails", $this->global, $data, NULL);
+        $this->loadViews("stock/drierMachineDetails", $this->global, $data, NULL);
 
 
     }
@@ -2008,11 +2140,21 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
+
         } else {
 
-           // $month = '2024-12';
+            $session = session();
 
-            $month = date('Y-m');
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
         }
 
         $data = [];
@@ -2146,7 +2288,7 @@ class StockController extends BaseController
 
        // return  $this->response->setJSON(['status' =>'success' ,'message' => $data['electricMachines']]);
 
-        return $this->loadViews("powerConsumptionDetails", $this->global, $data, NULL);   
+        return $this->loadViews("stock/powerConsumptionDetails", $this->global, $data, NULL);   
 
     }
 
@@ -2283,11 +2425,20 @@ class StockController extends BaseController
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
+
+            $session = session ();
+
+            $session->set('stock_month',$month);
+
         } else {
 
-          //  $month = '2025-02';
+            $session = session();
 
-            $month = date('Y-m');
+            $month = $session->get('stock_month');
+
+            if (empty($month)) {
+                $month = date('Y-m'); // Default to the current month
+            }
         }
 
         $data = [];
@@ -2427,7 +2578,7 @@ class StockController extends BaseController
 
       //  return  $this->response->setJSON(['status' =>'success' ,'message' => $data['dieselMachines']]);
 
-        return $this->loadViews("dieselStockDetails", $this->global, $data, NULL);    
+        return $this->loadViews("stock/dieselStockDetails", $this->global, $data, NULL);    
 
 
 

app/Models/Rawmaterialdetails_model.php

@@ -164,35 +164,27 @@ class Rawmaterialdetails_model extends Model
        return  array_column($materialResults, 'MaterialCode');
     }
 
-    function getAllBagMaterialCode($filterMaterialCode)
+    function getAllBagMaterialCode()
     {
+        //when no data present for current month we are showing only active materials with filter option 
         $builder = $this->db->table('t_materialmaster')
             ->select('MaterialCode, MaterialName')
             ->where('Category', 'Packing Material')
-            ->where('IsActive', 1);
+            ->where('IsActive', 1)
-           
+            ->orderBy('MaterialCode', 'asc');
-    
-        if (!empty($filterMaterialCode)) {
-            $builder->whereIn('MaterialCode', $filterMaterialCode);
-        }
-
-        $builder->orderBy('MaterialCode', 'asc');
         $query = $builder->get();
         return $query->getResultArray();
 
     }
     
-    function getSelectedBagMaterialCode($filterMaterialCode)
+    function getSelectedBagMaterialCode($distinctMaterialCodes)
     {
+        //when data present with whether material is active or not we have to show them with filter option
         $builder = $this->db->table('t_materialmaster')
             ->select('MaterialCode, MaterialName')
-            ->where('Category', 'Packing Material');
+            ->where('Category', 'Packing Material')
-
+            ->whereIn('MaterialCode', $distinctMaterialCodes)
-        if (!empty($filterMaterialCode)) {
+            ->orderBy('MaterialCode', 'asc'); 
-            $builder->whereIn('MaterialCode', $filterMaterialCode);
-        }
-
-        $builder->orderBy('MaterialCode', 'asc'); 
         $query = $builder->get();
         return $query->getResultArray();
     }

app/Views/driverListing.php

@@ -63,8 +63,8 @@
                                                     <i class="fa fa-trash"></i>&nbsp;&nbsp;&nbsp;
                                                 </a>
                                                 <?php $today = date('M-Y'); ?>
-                                                <a style="cursor:pointer;" href="<?= base_url() . 'loadDriverAttendance?gobal_driver_id=' . $record['driver_id'].'&month_year='.$today; ?>">
+                                                <a title="Trip Details" style="cursor:pointer;" href="<?= base_url() . 'loadDriverAttendance?gobal_driver_id=' . $record['driver_id'].'&month_year='.$today; ?>">
-                                                    <i class="fas fa-user-clock"></i>&nbsp;&nbsp;&nbsp;
+                                                    <i class="fa fa-truck"></i>&nbsp;&nbsp;&nbsp;
                                                 </a>
                                             <?php } ?>
                                           </td>

app/Views/stock/CoatingMachineDetail.php

@@ -16,6 +16,17 @@
     }
 
 
+    input[type="date"]::-webkit-calendar-picker-indicator {
+        transform: scale(2.0); 
+        cursor: pointer;
+    }
+
+    input[type="date"] {
+        cursor: pointer;
+    }
+
+
+
 
     .fht-table,
     .fht-table thead,
@@ -32,7 +43,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -215,7 +226,7 @@
 
     .table-responsive {
         overflow-y: auto;
-        max-height: 450px;
+        max-height: 500px;
     }
 
     .fht-table thead th {
@@ -1493,6 +1504,10 @@
         let machineOnTime12 = machineOnTimeHr;
         let machineOffTime12 = machineOffTimeHr;
 
+        if(machineOnTime12 == machineOffTime12){
+            return `24.00`;
+        }
+
         let machineOnTime24 = convertTo24Hr(machineOnTime12);
         let machineOffTime24 = convertTo24Hr(machineOffTime12);
 

app/Views/stock/bagStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -140,7 +140,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -171,7 +171,7 @@
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -185,7 +185,7 @@
         position: sticky;
         top: 0;
         z-index: 11; /* Higher than table rows but lower than first column */
-        background-color: #00a65a; /* Green background */
+        background-color: #50bbd9; /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
@@ -196,7 +196,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
@@ -206,7 +206,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -507,7 +507,9 @@
 
                                           <!-- this else condition work if groupedBagStockDetails is empty and creating new records 
                                            with initial values 0 for entire month -->
-                                        <?php } else {   ?> 
+                                        <?php } else {  
+                                         //   dd($bagMaterials);
+                                         //   dd($previousMonthBagStockDetails); ?> 
 
                                                 <?php foreach($datesInMonth as $datesInMonthIndex => $dateInMonth){ ?>
                                                     <tr 
@@ -561,10 +563,7 @@
                                                                 
                                                                 <?php
                                                                 
-                                                            echo isset($previousMonthBagStockDetails[$bagMaterialIndex]) &&
+                                                            echo  $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' ';
-                                                                $previousMonthBagStockDetails[$bagMaterialIndex]['materialCode'] == $bagMaterial['MaterialCode'] 
-                                                               ? $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock']  
-                                                               : ' ';
                                                            
                                                                
 
@@ -585,10 +584,7 @@
                                                             data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
                                                                 >
                                                                 <?php
-                                                            echo isset($previousMonthBagStockDetails[$bagMaterialIndex]) &&
+                                                            echo  $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' ';
-                                                            $previousMonthBagStockDetails[$bagMaterialIndex]['materialCode'] == $bagMaterial['MaterialCode'] 
-                                                           ? $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock']  
-                                                           : ' ';
                                                                  ?>
                                                             </td>
                                                         <?php } ?>
@@ -601,9 +597,11 @@
                                     </table>
                                 </div>
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 
@@ -775,6 +773,7 @@
                         $('#loader').hide();
                         console.log(data);
                         alert(data);
+                        window.location.reload();
                     }
 
                 },

app/Views/stock/dieselStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -142,7 +142,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -173,7 +173,7 @@
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -187,7 +187,7 @@
         position: sticky;
         top: 0;
         z-index: 11; /* Higher than table rows but lower than first column */
-        background-color: #00a65a; /* Green background */
+        background-color: #50bbd9; /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
@@ -198,7 +198,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
@@ -208,7 +208,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -759,9 +759,11 @@ foreach ($period as $day) {
                                     </table>
                                 </div>
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 

app/Views/stock/drierMachineDetails.php

@@ -23,7 +23,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -107,7 +107,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
 
     th.celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -188,7 +188,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -218,7 +218,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -259,7 +259,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -604,8 +604,8 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
                                 <br>
 
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success btn-md px-3" id="save" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="save" value="save">
                                     </div>
                                 </div>
 

app/Views/stock/dustAndRoughStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -144,7 +144,7 @@
 
     
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -175,7 +175,7 @@
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -189,7 +189,7 @@
         position: sticky;
         top: 0;
         z-index: 11; /* Higher than table rows but lower than first column */
-        background-color: #00a65a; /* Green background */
+        background-color: #50bbd9; /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
@@ -200,7 +200,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
@@ -210,7 +210,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -459,9 +459,11 @@
                                     </table>
                                 </div>
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 

app/Views/stock/gasStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -99,15 +99,6 @@
         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 +113,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,17 +141,84 @@
         height: 20px;
     }
 
-    #gasStockDetailsTableId th:nth-child(1),
+    .celda_encabezado_general {
-    #gasStockDetailsTableId td:nth-child(1)
+        background-color: #50bbd9;
-     {
+        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: #50bbd9; /* 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: #50bbd9; /* 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;
+        background-color: #50bbd9;
-        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-x: auto;
+        overflow-y: auto; 
+        max-height: 500px; /* Adjust as needed */
+        position: relative;
+    }
+
+    td{
+        min-width:  100px;
+        max-width:  100px;
+    }
+
+
+
    
 </style>
 <div class="content-page">
@@ -440,10 +492,13 @@
                                         </tbody>
                                     </table>
                                 </div>
+                                <br>
+
+                                <br>
 
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 

app/Views/stock/incomingSilicaSandDetails.php

@@ -24,7 +24,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -107,7 +107,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -115,6 +115,7 @@
         text-align: center;
         min-width: 120px;
         max-width: 120px;
+        
     }
 
     .celda_encabezado_total {
@@ -187,7 +188,7 @@
         position: sticky;
         left: 0;
         top: 0;
-        background-color: #00a65a; 
+        background-color: #50bbd9; 
         z-index: 7!important;
         border-right: 2px solid #ddd; 
         color: #ffffff;
@@ -198,7 +199,7 @@
     {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 2;
         border-right: 2px solid #ddd; 
         color: #ffffff;
@@ -206,7 +207,7 @@
 
     .table-responsive {
         overflow-y: auto;
-        max-height: 450px;
+        max-height: 500px;
     }
 
     .fht-table thead th {
@@ -565,12 +566,12 @@
 
                                             <!-- 'td:eq(30)' -->
                                                 <td class="celda_normal">
-                                                    <?php echo $record['moistureLossQty'] ?? ' '; ?>
+                                                    <?php echo (int)$record['moistureLossQty'] == 0 ? ' ' : (int)$record['moistureLossQty'] ; ?>
                                                 </td>
 
                                             <!-- 'td:eq(31)' -->
                                                 <td class="celda_normal">
-                                                    <?php echo $record['sieveLossQty'] ?? ' '; ?>
+                                                    <?php echo (int)$record['sieveLossQty'] == 0 ? ' ' : (int)$record['sieveLossQty']; ?>
                                                 </td>
 
                                             <!-- 'td:eq(32)' -->
@@ -742,9 +743,11 @@
                                     </h5>
                             <?php }?>
 
+                            <br>
+
                             <div class="row">
-                                <div class="col-md-12 text-right">
+                                <div class="col-md-12 text-center">
-                                    <input type="button" class="btn btn-success" id="save" value="save">
+                                    <input type="button" class="btn btn-success px-4" id="save" value="save">
                                 </div>
                             </div>
 

app/Views/stock/powerConsumptionDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -142,7 +142,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -173,7 +173,7 @@
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -187,7 +187,7 @@
         position: sticky;
         top: 0;
         z-index: 11; /* Higher than table rows but lower than first column */
-        background-color: #00a65a; /* Green background */
+        background-color: #50bbd9; /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
@@ -198,7 +198,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
@@ -208,7 +208,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -814,9 +814,11 @@ foreach ($period as $day) {
                                     </table>
                                 </div>
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 

app/Views/stock/resinStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -141,7 +141,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -172,7 +172,7 @@
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -186,7 +186,7 @@
         position: sticky;
         top: 0;
         z-index: 11; /* Higher than table rows but lower than first column */
-        background-color: #00a65a; /* Green background */
+        background-color: #50bbd9; /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
@@ -197,7 +197,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
@@ -207,7 +207,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -564,9 +564,11 @@ foreach ($period as $day) {
                                     </table>
                                 </div>
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 
@@ -730,6 +732,7 @@ foreach ($period as $day) {
                         $('#loader').hide();
                         console.log(data);
                         alert(data);
+                        window.location.reload();
                     }
 
                 },

app/Views/stock/trpProductionStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -143,7 +143,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -175,7 +175,7 @@
         top: 0;
         z-index: 20;
         /* Ensure the entire header stays above table rows */
-        background-color: #00a65a;
+        background-color: #50bbd9;
         /* Header background color */
     }
 
@@ -191,11 +191,14 @@
         top: 0;
         z-index: 11;
         /* Higher than table rows but lower than first column */
-        background-color: #00a65a;
+        background-color: #50bbd9;
         /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
+        white-space: normal; /* Allows text to wrap */
+        word-wrap: break-word; /* Breaks long words if needed */
+        text-align: center; /* Centers text for better alignment */
     }
 
     /* Sticky First Column */
@@ -203,7 +206,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15;
         /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
@@ -214,7 +217,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto;
-        max-height: 450px;
+        max-height: 500px;
         /* Adjust as needed */
         position: relative;
     }
@@ -1515,9 +1518,11 @@ $timeOtions[] = "12:00 AM";
 
                               
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>
 

app/Views/stock/trpSandUseStockDetails.php

@@ -18,7 +18,7 @@
     }
 
     .fht-table td:hover {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         color: #ffffff;
     }
 
@@ -143,7 +143,7 @@
 
 
     .celda_encabezado_general {
-        background-color: #00a65a;
+        background-color: #50bbd9;
         border: 1px solid #ccc;
         color: #ffffff;
         font-weight: bold;
@@ -174,7 +174,7 @@
         position: sticky;
         top: 0;
         z-index: 20; /* Ensure the entire header stays above table rows */
-        background-color: #00a65a; /* Header background color */
+        background-color: #50bbd9; /* Header background color */
     }
 
     .dropdown-menu   {
@@ -188,10 +188,13 @@
         position: sticky;
         top: 0;
         z-index: 11; /* Higher than table rows but lower than first column */
-        background-color: #00a65a; /* Green background */
+        background-color: #50bbd9; /* Green background */
         color: #ffffff;
         border: 1px solid #ddd;
         padding: 10px;
+        white-space: normal; /* Allows text to wrap */
+        word-wrap: break-word; /* Breaks long words if needed */
+        text-align: center; /* Centers text for better alignment */
     }
 
     /* Sticky First Column */
@@ -199,7 +202,7 @@
     .fht-table td:nth-child(1) {
         position: sticky;
         left: 0;
-        background-color: #00a65a;
+        background-color: #50bbd9;
         z-index: 15; /* Ensures it stays above other cells */
         border-right: 2px solid #ddd;
         color: #ffffff;
@@ -209,7 +212,7 @@
     .table-responsive {
         overflow-x: auto;
         overflow-y: auto; 
-        max-height: 450px; /* Adjust as needed */
+        max-height: 500px; /* Adjust as needed */
         position: relative;
     }
 
@@ -488,9 +491,11 @@
                                     </table>
                                 </div>
 
+                                <br>
+
                                 <div class="row">
-                                    <div class="col-md-12 text-right">
+                                    <div class="col-md-12 text-center">
-                                        <input type="button" class="btn btn-success" id="saveId" value="save">
+                                        <input type="button" class="btn btn-success px-4" id="saveId" value="save">
                                     </div>
                                 </div>