From 02ca69c533344f91e9cddf0ea0a48b838eecf6f0 Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Wed, 24 Apr 2024 16:20:42 +0530 Subject: [PATCH] CHNAGE_MAKE_MODEL_MANUFACTURER_EDIT_FIX : AADHAVAN --- app/Config/Routes.php | 4 ++-- app/Controllers/Manufacturer.php | 28 +++++++++++++++++++++------- app/Controllers/Model.php | 28 ++++++++++++++++++++-------- app/Views/bike_model_list.php | 13 +++++++++++-- app/Views/make_list.php | 2 +- app/Views/manufacturer_list.php | 13 +++++++++++-- 6 files changed, 66 insertions(+), 22 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 770197b..19e682d 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -132,7 +132,7 @@ $routes->get('dashboard', 'Users::dashboard'); // Model // $routes->get('bike_model_index/(:any)', 'Model::index/$1'); - $routes->post('create_model', 'Model::create_model'); + $routes->post('create_model/(:any)', 'Model::create_model/$1'); $routes->post('status_model', 'Model::status_model'); // Model End's// @@ -148,7 +148,7 @@ $routes->get('dashboard', 'Users::dashboard'); //Spare manufacturer// $routes->get('spare_manufacturer_index', 'Manufacturer::index'); - $routes->post('create_manufacturer', 'Manufacturer::create_manufacturer'); + $routes->post('create_manufacturer/(:any)', 'Manufacturer::create_manufacturer/$1'); //Spare manufacturer End's// diff --git a/app/Controllers/Manufacturer.php b/app/Controllers/Manufacturer.php index c3ed2e2..5740902 100644 --- a/app/Controllers/Manufacturer.php +++ b/app/Controllers/Manufacturer.php @@ -32,7 +32,7 @@ class Manufacturer extends BaseController - public function create_manufacturer() + public function create_manufacturer($manufacturer_id) { if(!$this->session->has('logged_user')) { return redirect()->to(base_url()); } try { @@ -43,14 +43,28 @@ class Manufacturer extends BaseController 'manufacturer_name' => $manufacturer_name, 'quality' => $quality, ]; - $inserted = $ManufacturerModel->insert($data); - if ($inserted) { - $result = $data; - return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + + if (!$manufacturer_id) { + $inserted = $ManufacturerModel->insert($data); + if ($inserted) { + $result = $data; + return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + } else { + $result = "No Match's"; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + } } else { - $result = "No Match's"; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + $updated = $ManufacturerModel->update($manufacturer_id,$data); + if ($updated) { + $result = $data; + return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + } else { + $result = "No Match's"; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + } } + + } catch (\Exception $e) { return $this->respond(['status' => 'failed','code' => 500,'data' => $e],500); } diff --git a/app/Controllers/Model.php b/app/Controllers/Model.php index e5e6d5a..fff9b49 100644 --- a/app/Controllers/Model.php +++ b/app/Controllers/Model.php @@ -41,7 +41,7 @@ class Model extends BaseController } - public function create_model() + public function create_model($model_id) { try { $make_id = $this->request->getPost('make_id'); @@ -53,14 +53,26 @@ class Model extends BaseController 'model_name' => $model_name ]; - $inserted = $BikemodelsModel->insert($data); - if ($inserted) { - $result = $data; - return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); - } else { - $result = "No Match's"; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + if (!$model_id) { + $inserted = $BikemodelsModel->insert($data); + if ($inserted) { + $result = $data; + return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + } else { + $result = "No Match's"; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + } + }else{ + $updated = $BikemodelsModel->update($model_id ,$data); + if ($updated) { + $result = $data; + return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + } else { + $result = "No Match's"; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + } } + } catch (\Exception $exception) { return $this->respond(['status' => 'failed','code' => 500,'data' => $exception],500); } diff --git a/app/Views/bike_model_list.php b/app/Views/bike_model_list.php index 092a9d3..cc62271 100644 --- a/app/Views/bike_model_list.php +++ b/app/Views/bike_model_list.php @@ -41,7 +41,7 @@ - + @@ -73,6 +73,7 @@
+ @@ -103,9 +104,14 @@ modelname: $('#modelname').val() }; + var edit_model_id = $('#edit_model_id').val(); + + if (!edit_model_id) { + edit_model_id =0; + } $.ajax({ type: 'POST', - url: '', + url: ''+edit_model_id, data: formData, dataType: 'json', success: function(response) { @@ -184,6 +190,9 @@ function editModel(params) { + + $('#edit_model_id').val($(params).data('value')); + $('#form_add_edit').text('Edit Models'); var full_div = $(params).parent().parent()[0]; diff --git a/app/Views/make_list.php b/app/Views/make_list.php index a97348c..edda05b 100644 --- a/app/Views/make_list.php +++ b/app/Views/make_list.php @@ -127,7 +127,7 @@ function submitModel(params) { - console.log( $('#modelname').val()); + // console.log( $('#modelname').val()); var formData = { make_id: $('#make_id').val(), modelname: $('#modelname').val() diff --git a/app/Views/manufacturer_list.php b/app/Views/manufacturer_list.php index bbf028a..d588826 100644 --- a/app/Views/manufacturer_list.php +++ b/app/Views/manufacturer_list.php @@ -36,7 +36,7 @@ - + " class="view-list-button" title="Model List" style="margin-left: 16px;"> @@ -65,6 +65,7 @@
+
@@ -103,9 +104,15 @@ quality: $('#quality').val() }; + var edit_manufacturer_id = $('#manufacturer_id').val(); + + if (!edit_manufacturer_id) { + edit_manufacturer_id =0; + } + $.ajax({ type: 'POST', - url: '', + url: ''+edit_manufacturer_id, data: formData, dataType: 'json', success: function(response) { @@ -121,6 +128,8 @@ } function editManufacturer(params) { + + $('#manufacturer_id').val($(params).data('value')); $('#form_add_edit').text('Edit Manufacturer'); var full_div = $(params).parent().parent()[0];