diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php
index 36356168..3dc91d30 100644
--- a/app/Controllers/StockController.php
+++ b/app/Controllers/StockController.php
@@ -185,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()
@@ -513,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()
@@ -836,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()
@@ -945,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()
@@ -1149,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()
@@ -1306,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()
@@ -1539,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);
}
@@ -1677,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);
@@ -1988,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);
}
@@ -2288,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);
}
@@ -2578,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);
diff --git a/app/Views/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php
similarity index 99%
rename from app/Views/CoatingMachineDetail.php
rename to app/Views/stock/CoatingMachineDetail.php
index 8ee561ec..f9e667b6 100644
--- a/app/Views/CoatingMachineDetail.php
+++ b/app/Views/stock/CoatingMachineDetail.php
@@ -226,7 +226,7 @@
.table-responsive {
overflow-y: auto;
- max-height: 450px;
+ max-height: 500px;
}
.fht-table thead th {
diff --git a/app/Views/bagStockDetails.php b/app/Views/stock/bagStockDetails.php
similarity index 99%
rename from app/Views/bagStockDetails.php
rename to app/Views/stock/bagStockDetails.php
index 7954f9fa..37ded70e 100644
--- a/app/Views/bagStockDetails.php
+++ b/app/Views/stock/bagStockDetails.php
@@ -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;
}
@@ -597,9 +597,11 @@
+
+
-
diff --git a/app/Views/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php
similarity index 99%
rename from app/Views/dieselStockDetails.php
rename to app/Views/stock/dieselStockDetails.php
index 002fc9e8..5723bb21 100644
--- a/app/Views/dieselStockDetails.php
+++ b/app/Views/stock/dieselStockDetails.php
@@ -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) {
+
+
-
diff --git a/app/Views/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php
similarity index 99%
rename from app/Views/drierMachineDetails.php
rename to app/Views/stock/drierMachineDetails.php
index dd0ef391..c3832415 100644
--- a/app/Views/drierMachineDetails.php
+++ b/app/Views/stock/drierMachineDetails.php
@@ -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');
-
diff --git a/app/Views/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php
similarity index 99%
rename from app/Views/dustAndRoughStockDetails.php
rename to app/Views/stock/dustAndRoughStockDetails.php
index 333b025a..5f643495 100644
--- a/app/Views/dustAndRoughStockDetails.php
+++ b/app/Views/stock/dustAndRoughStockDetails.php
@@ -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 @@
+
+
-
diff --git a/app/Views/gasStockDetails.php b/app/Views/stock/gasStockDetails.php
similarity index 95%
rename from app/Views/gasStockDetails.php
rename to app/Views/stock/gasStockDetails.php
index c5fe15ab..cb2accc2 100644
--- a/app/Views/gasStockDetails.php
+++ b/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;*/
- /* */
- 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),
- #gasStockDetailsTableId td:nth-child(1)
- {
+ .celda_encabezado_general {
+ 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;*/
+ /* */
+ 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
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;
- z-index: 2;
+ background-color: #50bbd9;
+ 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;
+ }
+
+
+
@@ -440,10 +492,13 @@
+
+
+
-
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php
similarity index 99%
rename from app/Views/incomingSilicaSandDetails.php
rename to app/Views/stock/incomingSilicaSandDetails.php
index c536ff4e..0526be34 100644
--- a/app/Views/incomingSilicaSandDetails.php
+++ b/app/Views/stock/incomingSilicaSandDetails.php
@@ -115,6 +115,7 @@
text-align: center;
min-width: 120px;
max-width: 120px;
+
}
.celda_encabezado_total {
@@ -206,7 +207,7 @@
.table-responsive {
overflow-y: auto;
- max-height: 450px;
+ max-height: 500px;
}
.fht-table thead th {
@@ -742,9 +743,11 @@
+
+
-
diff --git a/app/Views/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php
similarity index 99%
rename from app/Views/powerConsumptionDetails.php
rename to app/Views/stock/powerConsumptionDetails.php
index 3306d3ad..c4967b95 100644
--- a/app/Views/powerConsumptionDetails.php
+++ b/app/Views/stock/powerConsumptionDetails.php
@@ -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) {
+
+
-
diff --git a/app/Views/resinStockDetails.php b/app/Views/stock/resinStockDetails.php
similarity index 99%
rename from app/Views/resinStockDetails.php
rename to app/Views/stock/resinStockDetails.php
index 6f31e9fe..da4ea4dd 100644
--- a/app/Views/resinStockDetails.php
+++ b/app/Views/stock/resinStockDetails.php
@@ -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) {
+
+
-
diff --git a/app/Views/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php
similarity index 99%
rename from app/Views/trpProductionStockDetails.php
rename to app/Views/stock/trpProductionStockDetails.php
index 41ea3197..8ce8c37c 100644
--- a/app/Views/trpProductionStockDetails.php
+++ b/app/Views/stock/trpProductionStockDetails.php
@@ -217,7 +217,7 @@
.table-responsive {
overflow-x: auto;
overflow-y: auto;
- max-height: 450px;
+ max-height: 500px;
/* Adjust as needed */
position: relative;
}
@@ -1518,9 +1518,11 @@ $timeOtions[] = "12:00 AM";
+
+
-
diff --git a/app/Views/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php
similarity index 99%
rename from app/Views/trpSandUseStockDetails.php
rename to app/Views/stock/trpSandUseStockDetails.php
index 247d7dbe..dd204086 100644
--- a/app/Views/trpSandUseStockDetails.php
+++ b/app/Views/stock/trpSandUseStockDetails.php
@@ -212,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;
}
@@ -491,9 +491,11 @@
+
+
|