From 10445cf4c2d02914fc4f5bf07acf89efdfa71e7c Mon Sep 17 00:00:00 2001 From: Smart Date: Tue, 22 Oct 2024 08:38:45 +0530 Subject: [PATCH 1/3] factoryVehicle : gwm --- app/Config/Routes.php | 4 +++ app/Controllers/StockController.php | 19 +++++++++++++ .../FactoryVehicleDieselDetailsModel.php | 28 +++++++++++++++++++ .../FactoryVehicleDieselStockSummaryModel.php | 25 +++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 app/Models/FactoryVehicleDieselDetailsModel.php create mode 100644 app/Models/FactoryVehicleDieselStockSummaryModel.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index e7814a96..2c7bf9ce 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -430,3 +430,7 @@ $routes->get('deleteCoatingMachineDetails' , 'StockController::deleteCoatingMach $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'drierMachineDetails', 'StockController::drierMachineDetails'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditdrierMachineDetails', 'StockController::addOrEditdrierMachineDetails'); + +$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'factoryVehicleDieselDetails', 'StockController::factoryVehicleDieselDetails'); +$routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails'); + diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 7e175641..257cfb3e 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -5,6 +5,9 @@ namespace App\Controllers; use App\Controllers\BaseController; use App\Models\CoatingMachineDetailsModel; use App\Models\DrierMachineDetailsModel; +use App\Models\FactoryMachineModel; +use App\Models\FactoryVehicleDieselDetailsModel; +use App\Models\FactoryVehicleDieselStockSummaryModel; use CodeIgniter\HTTP\ResponseInterface; use DateTime; @@ -13,6 +16,9 @@ class StockController extends BaseController protected $coatingMachineDetails_model; protected $drierMachineDetails_model; + protected $factoryMachine_model; + protected $factoryVehicleDieselDetails_model; + protected $factoryVehicleDieselStockSummary_model; protected $session; /** @@ -23,6 +29,9 @@ class StockController extends BaseController parent::__construct(); $this->coatingMachineDetails_model = new CoatingMachineDetailsModel(); $this->drierMachineDetails_model = new DrierMachineDetailsModel(); + $this->factoryMachine_model = new FactoryMachineModel(); + $this->factoryVehicleDieselDetails_model = new FactoryVehicleDieselDetailsModel(); + $this->factoryVehicleDieselStockSummary_model = new FactoryVehicleDieselStockSummaryModel(); $this->session = session(); helper('form'); @@ -275,4 +284,14 @@ class StockController extends BaseController echo "Data successfully saved."; } + + public function factoryVehicleDieselDetails() + { + + $machine = $this->factoryMachine_model->where('energy_type', 'diesel')->where('is_active', 1)->findAll(); + + dd($machine); + + } + } diff --git a/app/Models/FactoryVehicleDieselDetailsModel.php b/app/Models/FactoryVehicleDieselDetailsModel.php new file mode 100644 index 00000000..7a441358 --- /dev/null +++ b/app/Models/FactoryVehicleDieselDetailsModel.php @@ -0,0 +1,28 @@ + Date: Tue, 22 Oct 2024 09:03:12 +0530 Subject: [PATCH 2/3] Merge : GWM --- app/Controllers/StockController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 0afd4edf..a66bdda6 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -26,7 +26,6 @@ class StockController extends BaseController protected $incomingSilicaSandDetails_model; protected $inwardGateRegister_model; protected $rawmaterialdetails_model; - protected $session; /** * This is default constructor of the class From b993986afadc8a5605c351cc672c3cbf8e70eb44 Mon Sep 17 00:00:00 2001 From: Smart Date: Tue, 22 Oct 2024 11:13:06 +0530 Subject: [PATCH 3/3] GWM : live hr module feebback --- app/Controllers/Employeedetails.php | 8 ------ app/Views/addEmployeenew.php | 33 +++++------------------- app/Views/editEmployeenew.php | 39 +++-------------------------- 3 files changed, 10 insertions(+), 70 deletions(-) diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index b6c0d291..4a150801 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -224,7 +224,6 @@ class Employeedetails extends BaseController $ContactNumber = $this->request->getPost('ContactNumber'); $Gender = $this->request->getPost('gender'); $MartialStatus = $this->request->getPost('MartialStatus'); - $BloodGroup = $this->request->getPost('bloodgroup'); $CurrentAddress = $this->request->getPost('currentaddress'); $permanentaddress = $this->request->getPost('permanentaddress'); $desigination = $this->request->getPost('desigination'); @@ -296,7 +295,6 @@ class Employeedetails extends BaseController 'Gender' => $Gender, 'DateofBirth' => $DOB, 'ContactNumber' => $ContactNumber, - 'BloodGroup' => $BloodGroup, 'MartialStatus' => $MartialStatus, 'DateofJoining' => $DOJ, 'PreviousYearsOfExp' => $Previousexperience, @@ -411,7 +409,6 @@ class Employeedetails extends BaseController $MartialConfigID = 'C012'; $QualificationConfigID = 'C014'; $DesignationConfigID = 'C010'; - $BloodGroupConfigID = 'C011'; $LocationConfigID = 'C031'; $data['Gender'] = $this->employeedetails_model->getConfigValue($GenderConfigID); @@ -419,7 +416,6 @@ class Employeedetails extends BaseController $data['bankdetails'] = $this->employeedetails_model->getBankDetails(); $data['Qualification'] = $this->employeedetails_model->getConfigValue($QualificationConfigID); $data['Designation'] = $this->employeedetails_model->getConfigValue($DesignationConfigID); - $data['BloodGroup'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); $data['Location'] = $this->employeedetails_model->getConfigValue($LocationConfigID); $data['Department'] = $this->employeedetails_model->getDepartment(); $data['hra_rate'] = $this->appConfig->where('config_key', 1)->get()->getRow()->config_value; @@ -582,7 +578,6 @@ class Employeedetails extends BaseController $MartialConfigID = 'C012'; $QualificationConfigID = 'C014'; $DesignationConfigID = 'C010'; - $BloodGroupConfigID = 'C011'; $LocationConfigID = 'C031'; //print_r('hai'); @@ -590,7 +585,6 @@ class Employeedetails extends BaseController $data['MartialList'] = $this->employeedetails_model->getConfigValue($MartialConfigID); $data['QualificationList'] = $this->employeedetails_model->getConfigValue($QualificationConfigID); $data['DesignationList'] = $this->employeedetails_model->getConfigValue($DesignationConfigID); - $data['BloodGroupList'] = $this->employeedetails_model->getConfigValue($BloodGroupConfigID); $data['bankdetails'] = $this->employeedetails_model->getBankDetails(); $data['Location'] = $this->employeedetails_model->getConfigValue($LocationConfigID); $data['DepartmentList'] = $this->employeedetails_model->getDepartment(); @@ -693,7 +687,6 @@ class Employeedetails extends BaseController $Gender = $this->request->getPost('gender'); $MartialStatus = $this->request->getPost('MartialStatus'); - $BloodGroup = $this->request->getPost('bloodgroup'); $CurrentAddress = $this->request->getPost('currentaddress'); $permanentaddress = $this->request->getPost('permanentaddress'); $desigination = $this->request->getPost('desigination'); @@ -786,7 +779,6 @@ class Employeedetails extends BaseController 'Gender' => $Gender, 'DateofBirth' => $DOB, 'ContactNumber' => $ContactNumber, - 'BloodGroup' => $BloodGroup, 'MartialStatus' => $MartialStatus, 'DateofJoining' => $DOJ, 'PreviousYearsOfExp' => $Previousexperience, diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 95b555e0..e7f19309 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -10,7 +10,6 @@