diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index 7effb98c..e2f5681a 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/app/Controllers/Rawmaterialdetails.php @@ -368,7 +368,7 @@ class Rawmaterialdetails extends BaseController } - $insertResult=$this->materialCategories_model->insert($data); + $insertResult=$this->materialCategories_model->insert($data); if ($insertResult) { // Send a success response as JSON diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index bacb93b4..a864263f 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -635,8 +635,14 @@ class StockController extends BaseController $formattedDate = $date->format('Y-m'); $month = $formattedDate; + + //filterMaterialCode + + $filterMaterialCode = $this->request->getPost('filterMaterialCode'); + } else { $month = date('Y-m'); + $filterMaterialCode = ['601529']; } $data = []; @@ -666,13 +672,7 @@ class StockController extends BaseController $startDate = "$month-01"; $endDate = date("Y-m-t", strtotime($startDate)); - $data['bagStockDetails'] = $this->bagStockDetails_model - ->where('date >=', $startDate) - ->where('date <=', $endDate) - ->groupBy(['materialCode', 'date']) - ->orderBy('date', 'asc') - ->orderBy('materialCode', 'asc') - ->findAll(); + $data['bagStockDetails'] = $this->bagStockDetails_model->getBagStockForGivenMonth($startDate , $endDate ,$filterMaterialCode); // Initialize an empty array to hold the grouped data $data['groupedBagStockDetails'] = []; @@ -718,15 +718,9 @@ class StockController extends BaseController if (!empty($data['groupedBagStockDetails'])) { - $result = $groupedByDate[$date]; - - $distinctMaterialCodes = []; - foreach ($result as $index => $eachResult) { - $distinctMaterialCodes[] = $result[$index]['materialCode']; - } - $bagMaterials = $this->rawmaterialdetails_model->getSelectedBagMaterialCode($distinctMaterialCodes); + $bagMaterials = $this->rawmaterialdetails_model->getSelectedBagMaterialCode($filterMaterialCode); } else { - $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode(); + $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode($filterMaterialCode); } diff --git a/app/Models/BagStockDetailsModel.php b/app/Models/BagStockDetailsModel.php index bb287b8c..cca80f66 100644 --- a/app/Models/BagStockDetailsModel.php +++ b/app/Models/BagStockDetailsModel.php @@ -6,7 +6,7 @@ use CodeIgniter\Model; class BagStockDetailsModel extends Model { - protected $table = 't_bagStockDetails'; + protected $table = 't_bagstockdetails'; protected $returnType = 'array'; protected $useSoftDeletes = false; protected $protectFields = true; @@ -33,4 +33,26 @@ class BagStockDetailsModel extends Model * @return bool */ + public function getBagStockForGivenMonth($startDate, $endDate, $filterMaterialCode) + { + $builder = $this->db->table('t_bagstockdetails') + ->select('t_bagstockdetails.*') + ->where('date >=', $startDate) + ->where('date <=', $endDate); + + if (!empty($filterMaterialCode)) { + $builder->whereIn('materialCode', $filterMaterialCode); + } + + $builder->groupBy(['materialCode', 'date']) + ->orderBy('date', 'asc') + ->orderBy('materialCode', 'asc'); + + // Execute the query and store the result + $result = $builder->get()->getResultArray(); + + return $result; + } + + } diff --git a/app/Models/Rawmaterialdetails_model.php b/app/Models/Rawmaterialdetails_model.php index 794744ae..b118ac55 100755 --- a/app/Models/Rawmaterialdetails_model.php +++ b/app/Models/Rawmaterialdetails_model.php @@ -164,34 +164,40 @@ class Rawmaterialdetails_model extends Model return array_column($materialResults, 'MaterialCode'); } - function getAllBagMaterialCode(){ - - $builder = $this->db->table('t_materialmaster') - ->select('MaterialCode , MaterialName') - ->where('IsActive', 1) - ->where('Category', 'Packing Material') - ->orderBy('MaterialCode', 'asc'); - $query = $builder->get(); - $materialResults = $query->getResultArray(); - - return $materialResults; - - } - - - function getSelectedBagMaterialCode($distinctMaterialCodes) + function getAllBagMaterialCode($filterMaterialCode) { $builder = $this->db->table('t_materialmaster') - ->select('MaterialCode, MaterialName') - ->whereIn('MaterialCode', $distinctMaterialCodes) // Matches MaterialCode with the array - ->orderBy('MaterialCode', 'asc'); - - $query = $builder->get(); - $materialResults = $query->getResultArray(); + ->select('MaterialCode, MaterialName') + ->where('Category', 'Packing Material') + ->where('IsActive', 1); + - return $materialResults; + if (!empty($filterMaterialCode)) { + $builder->whereIn('MaterialCode', $filterMaterialCode); + } + + $builder->orderBy('MaterialCode', 'asc'); + $query = $builder->get(); + return $query->getResultArray(); + } + function getSelectedBagMaterialCode($filterMaterialCode) + { + $builder = $this->db->table('t_materialmaster') + ->select('MaterialCode, MaterialName') + ->where('Category', 'Packing Material'); + + if (!empty($filterMaterialCode)) { + $builder->whereIn('MaterialCode', $filterMaterialCode); + } + + $builder->orderBy('MaterialCode', 'asc'); + $query = $builder->get(); + return $query->getResultArray(); + } + + function getAllResinMaterialCode(){ diff --git a/app/Views/bagStockDetails.php b/app/Views/bagStockDetails.php index 7be1c39a..697be538 100644 --- a/app/Views/bagStockDetails.php +++ b/app/Views/bagStockDetails.php @@ -507,7 +507,7 @@ - + $dateInMonth){ ?> format('d-m-Y'); if ($dateInMonthDmYFormat === $currentDate) { echo 'style="background: #cef0ad;"';} + ?> > - > + + > + + + + + > + + diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index bb9afa64..1468c6ed 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -316,7 +316,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
diff --git a/app/Views/powerConsumptionDetails.php b/app/Views/powerConsumptionDetails.php index 33c349d6..607ed077 100644 --- a/app/Views/powerConsumptionDetails.php +++ b/app/Views/powerConsumptionDetails.php @@ -1123,9 +1123,9 @@ foreach ($period as $day) { let totalUnitsTP = totalReadingTP * 60 ; - document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText = totalReadingTP ; + document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText = (totalReadingTP).toFixed(2) ; - document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText = totalUnitsTP ; + document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText = (totalUnitsTP).toFixed(2) ; updateTotalStockValue(dataId , finalTP) ; @@ -1151,9 +1151,9 @@ foreach ($period as $day) { let totalUnitsTP = totalReadingTP * 60 ; - document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText = totalReadingTP ; + document.querySelector(`td.totalReadingTP[data-id="${dataId}"]`).innerText = (totalReadingTP).toFixed(2) ; - document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText = totalUnitsTP ; + document.querySelector(`td.totalUnitsTP[data-id="${dataId}"]`).innerText = (totalUnitsTP).toFixed(2) ; updateTotalStockValue(dataId , finalTP)