Gas stock details change vadivel J 26-11-2024

app/Controllers/StockController.php

@@ -91,7 +91,8 @@ public function index()
     }
 
     //Coating Machine Details  starts
-public function loadView_coatingMachineDetails(){
+    public function loadView_coatingMachineDetails()
+    {
 
         if ($this->request->getMethod() === 'POST') {
             $month = $this->request->getPost('month');
@@ -101,8 +102,7 @@ public function loadView_coatingMachineDetails(){
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
-    }
+        } else {
-    else{
 
             $filteredMonth = $this->request->getGet('month');
             $month = $filteredMonth ?? date('Y-m');
@@ -130,7 +130,8 @@ public function loadView_coatingMachineDetails(){
 
     }
 
-public function addNewCoatingMachineDetails(){
+    public function addNewCoatingMachineDetails()
+    {
 
         $postData = $this->request->getPost();
         $month = $this->request->getGet('month');
@@ -167,7 +168,8 @@ public function addNewCoatingMachineDetails(){
     }
 
 
-public function updateCoatingMachineDetails(){
+    public function updateCoatingMachineDetails()
+    {
 
         $putData = $this->request->getPost();
         $month = $this->request->getGet('month');
@@ -198,7 +200,8 @@ public function updateCoatingMachineDetails(){
 
     }
 
-public function deleteCoatingMachineDetails(){
+    public function deleteCoatingMachineDetails()
+    {
 
         $id = $this->request->getGet('id');
 
@@ -216,7 +219,8 @@ public function deleteCoatingMachineDetails(){
     }
 
     //incoming Silica Sand Details  starts
-public function loadView_incomingSilicaSandDetails(){
+    public function loadView_incomingSilicaSandDetails()
+    {
 
         if ($this->request->getMethod() === 'POST') {
             $month = $this->request->getPost('month');
@@ -226,8 +230,7 @@ public function loadView_incomingSilicaSandDetails(){
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
-    }
+        } else {
-    else{
             $month = date('Y-m');
         }
 
@@ -254,7 +257,8 @@ public function loadView_incomingSilicaSandDetails(){
 
     }
 
-public function updateIncomingSilicaSandDetails(){
+    public function updateIncomingSilicaSandDetails()
+    {
 
         $postData = $this->request->getPost();
 
@@ -326,7 +330,8 @@ public function updateIncomingSilicaSandDetails(){
 
 
     // Bag Stock details starts
-public function loadView_bagStockDetails(){
+    public function loadView_bagStockDetails()
+    {
 
         if ($this->request->getMethod() === 'POST') {
             $month = $this->request->getPost('month');
@@ -336,8 +341,7 @@ public function loadView_bagStockDetails(){
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
-        }
+        } else {
-        else{
             $month = date('Y-m');
         }
 
@@ -426,7 +430,8 @@ public function loadView_bagStockDetails(){
 
     }
 
-public function updateBagStockDetails(){
+    public function updateBagStockDetails()
+    {
 
         $postData = $this->request->getPost();
 
@@ -489,7 +494,8 @@ public function updateBagStockDetails(){
 
 
     //Dust And Rough Stock Details
-public function loadView_dustAndRoughStockDetails(){
+    public function loadView_dustAndRoughStockDetails()
+    {
 
         if ($this->request->getMethod() === 'POST') {
             $month = $this->request->getPost('month');
@@ -499,8 +505,7 @@ public function loadView_dustAndRoughStockDetails(){
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
-        }
+        } else {
-        else{
             $month = date('Y-m');
         }
 
@@ -528,7 +533,8 @@ public function loadView_dustAndRoughStockDetails(){
 
     }
 
-public function updateDustAndRoughStockDetails(){
+    public function updateDustAndRoughStockDetails()
+    {
 
         $postData = $this->request->getPost();
 
@@ -586,7 +592,8 @@ public function updateDustAndRoughStockDetails(){
 
 
     //Resin Stock Details
-public function loadView_resinStockDetails(){
+    public function loadView_resinStockDetails()
+    {
 
         if ($this->request->getMethod() === 'POST') {
 
@@ -597,8 +604,7 @@ public function loadView_resinStockDetails(){
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
-        }
+        } else {
-        else{
             $month = date('Y-m');
         }
 
@@ -685,7 +691,8 @@ public function loadView_resinStockDetails(){
 
     }
 
-public function updateResinStockDetails(){
+    public function updateResinStockDetails()
+    {
 
 
         $postData = $this->request->getPost();
@@ -750,7 +757,8 @@ public function updateResinStockDetails(){
 
 
     //Gas Stock Details
-public function loadView_gasStockDetails(){
+    public function loadView_gasStockDetails()
+    {
 
         if ($this->request->getMethod() === 'POST') {
 
@@ -761,8 +769,7 @@ public function loadView_gasStockDetails(){
             $formattedDate = $date->format('Y-m');
 
             $month = $formattedDate;
-        }
+        } else {
-        else{
             $month = date('Y-m');
         }
 
@@ -806,7 +813,8 @@ public function loadView_gasStockDetails(){
                 'coating_summary.date = t_gasStockDetails.date',
                 'left'
             )
-        ->join('t_drierMachineDetails', 
+            ->join(
+                't_drierMachineDetails',
                 't_drierMachineDetails.date = t_gasStockDetails.date 
                 AND t_drierMachineDetails.date >= ' . $this->db->escape($startDate) . ' 
                 AND t_drierMachineDetails.date <= ' . $this->db->escape($endDate),
@@ -825,7 +833,8 @@ public function loadView_gasStockDetails(){
         return $this->loadViews("gasStockDetails", $this->global, $data, NULL);
     }
 
-public function updateGasStockDetails(){
+    public function updateGasStockDetails()
+    {
 
         $postData = $this->request->getPost();
 
@@ -884,7 +893,8 @@ public function updateGasStockDetails(){
         echo "Data Saved Successfully";
     }
 
-private function updateGasStockConsumption($date , $consumption){
+    private function updateGasStockConsumption($date, $consumption)
+    {
 
         $resultExists = $this->gasStockDetails_model
             ->where('date', $date)
@@ -896,8 +906,7 @@ private function updateGasStockConsumption($date , $consumption){
             $resultExists['balanceStock'] = $resultExists['opening'] - $resultExists['consumption'];
             $this->gasStockDetails_model->update($resultExists['id'], $resultExists);
 
-        }
+        } else {
-        else{
 
 
 
@@ -974,7 +983,8 @@ private function updateGasStockConsumption($date , $consumption){
     // --------------------------------------------gwm----------------------------------------------
 
 
-public function getMonthDatesFromInput($monthYear) {
+    public function getMonthDatesFromInput($monthYear)
+    {
 
         $date = DateTime::createFromFormat('M-Y', $monthYear);
 
@@ -1001,7 +1011,8 @@ public function getMonthDatesFromInput($monthYear) {
         return $dates;
     }
 
-public function generateTimeOptions() {
+    public function generateTimeOptions()
+    {
         $times = [];
         $start = strtotime('00:00'); // Start at midnight (12:00 AM)
         $end = strtotime('23:45');   // End at 11:45 PM
@@ -1016,7 +1027,8 @@ public function generateTimeOptions() {
         return $times;
     }
 
-public function drierMachineDetails(){
+    public function drierMachineDetails()
+    {
 
 
         $currentMonth = $this->request->getPost('month') ? $this->request->getPost('month') : date('M-Y');
@@ -1029,8 +1041,7 @@ public function drierMachineDetails(){
         $data['supplierData'] = $this->supplier_model->supplierlisting();
 
         $data['drierDetails'] = $this->drierMachineDetails_model->where('date >=', $data['startDate'])->where('date <=', $data['endDate'])->findAll();
-        if(!count($data['drierDetails']))
+        if (!count($data['drierDetails'])) {
-        {
             //insert empty data 
             $tempInsert = [];
             foreach ($monthData as $key => $value) {
@@ -1050,7 +1061,8 @@ public function drierMachineDetails(){
         $this->loadViews("drierMachineDetails", $this->global, $data, NULL);
     }
 
-public function addOrEditdrierMachineDetails(){
+    public function addOrEditdrierMachineDetails()
+    {
         $drierData = json_decode($this->request->getPost('drierData'), true);
 
         if (empty($drierData)) {
@@ -1122,15 +1134,13 @@ public function factoryVehicleDieselDetails()
 
         //Machine Details
         $data['machineDetails'] = $this->factoryMachine_model->where('energy_type', 'diesel')->where('is_active', 1)->findAll();
-        if(!count([$data['machineDetails']]))
+        if (!count([$data['machineDetails']])) {
-        {
             return $this->response->setBody("<script>alert('No Machine data available');</script>");
         }
 
         //Diesel Stock Summary Details
         $data['summaryDetails'] = $this->factoryVehicleDieselStockSummary_model->select('date,opening_stock as opening_stock_0,purchase_diesel as purchase_diesel_0,total_filling_diesel as total_filling_diesel_0,balance_stock as balance_stock_0')->where('date >=', $data['startDate'])->where('date <=', $data['endDate'])->findAll();
-        if(!count($data['summaryDetails']))
+        if (!count($data['summaryDetails'])) {
-        {
             //insert empty data 
             $tempInsert = [];
             foreach ($monthData as $key => $value) {
@@ -1143,8 +1153,7 @@ public function factoryVehicleDieselDetails()
 
         //Diesel Consumption Details
         $data['dieselConsumptionDetails'] = $this->getDieselConsumptionPivot($data['machineDetails'], $data['startDate'], $data['endDate']);
-        if(!count($data['dieselConsumptionDetails']))
+        if (!count($data['dieselConsumptionDetails'])) {
-        {
             //insert empty data 
             $tempInsert = [];
             foreach ($monthData as $key => $value) {
@@ -1184,7 +1193,9 @@ public function getDieselConsumptionPivot($machineDetails , $startDate , $endDea
     {
         $machineIds = array_column($machineDetails, 'id');
 
-        if (empty($machineIds)) { return []; }
+        if (empty($machineIds)) {
+            return [];
+        }
 
         $fields = ['opening_reading', 'closing_reading', 'filling_diesel', 'consumption', 'running_hours', 'mileage'];
 
@@ -1217,7 +1228,9 @@ public function addOrEditfactoryVehicleDieselDetails()
 
             foreach ($entry as $key => $value) {
 
-                if ($key === 'date') { continue; }
+                if ($key === 'date') {
+                    continue;
+                }
 
                 preg_match('/(.*?)_(\d+)$/', $key, $matches);
 
@@ -1247,8 +1260,7 @@ public function addOrEditfactoryVehicleDieselDetails()
 
         foreach ($transformedData as $row) {
 
-            if($row['machine_id'] == 0)
+            if ($row['machine_id'] == 0) {
-            {
                 // Summary data: if machine_id is 0, it indicates summary data. This distinction is used because these records will be stored in a separate table.
                 $this->factoryVehicleDieselStockSummary_model->where('date', $row['date'])->set($row)->update();
 
@@ -1284,8 +1296,7 @@ public function powerConsumptionDetails()
 
         //Machine Details
         $data['machineDetails'] = $this->factoryMachine_model->where('energy_type', 'electric')->where('is_active', 1)->findAll();
-        if(!count([$data['machineDetails']]))
+        if (!count([$data['machineDetails']])) {
-        {
             return $this->response->setBody("<script>alert('No Machine data available');</script>");
         }
 
@@ -1293,8 +1304,7 @@ public function powerConsumptionDetails()
 
         //Diesel Consumption Details
         $data['powerConsumptionDetails'] = $this->getElectricConsumptionPivot($data['machineDetails'], $data['startDate'], $data['endDate']);
-        if(!count($data['powerConsumptionDetails']))
+        if (!count($data['powerConsumptionDetails'])) {
-        {
             //insert empty data 
             $tempInsert = [];
             foreach ($monthData as $key => $value) {
@@ -1315,10 +1325,13 @@ public function powerConsumptionDetails()
 
     }
 
-public function getElectricConsumptionPivot($machineDetails , $startDate , $endDeate) {
+    public function getElectricConsumptionPivot($machineDetails, $startDate, $endDeate)
+    {
         $machineIds = array_column($machineDetails, 'id');
 
-        if (empty($machineIds)) { return []; }
+        if (empty($machineIds)) {
+            return [];
+        }
 
         $fields = ['opening_units', 'closing_units', 'total_units'];
 
@@ -1341,7 +1354,8 @@ public function getElectricConsumptionPivot($machineDetails , $startDate , $endD
         return $result;
     }
 
-public function addOrEditPowerConsumptionDetails(){
+    public function addOrEditPowerConsumptionDetails()
+    {
         $electricMachineTableData = json_decode($this->request->getPost('electricMachineTableData'), true);
 
         $transformedData = [];
@@ -1350,7 +1364,9 @@ public function addOrEditPowerConsumptionDetails(){
 
             foreach ($entry as $key => $value) {
 
-                if ($key === 'date') { continue; }
+                if ($key === 'date') {
+                    continue;
+                }
 
                 preg_match('/(.*?)_(\d+)$/', $key, $matches);
 

app/Views/editImportAmendPO.php

@@ -2956,7 +2956,7 @@ if (!empty($RequistionDetails)) {
                             //$('#SpcialInstruction').val('');
                             //$('#txtDeliveryAddress').val('');
 
-                           // window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
+                            window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing";
                         } else {
                             alert("Error");
                         }