From 32ba40df89a407b504a69a1eb74243ca1544fb3e Mon Sep 17 00:00:00 2001 From: bitbucket Date: Tue, 19 Mar 2024 23:48:21 +0530 Subject: [PATCH] CHANGES-INDATE-CONVERTION:GWM --- app/Controllers/EmployeeRestController.php | 44 ++++++++++++++++++---- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index cdeca663..4c543e4a 100644 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -105,14 +105,20 @@ class EmployeeRestController extends AdminController try { $emp_code = $this->request->getGet('emp_code'); if ($emp_code) { - $employee = $this->employeeModel->where('emp_code', $emp_code) - ->findAll(); - - $result = $employee; - return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); + $employee = $this->employeeModel->where('emp_code', $emp_code)->findAll(); + $dateConverter = function($item) { + if ($item['dob'] !== '0000-00-00') { + $dateTime = \DateTime::createFromFormat('Y-m-d', $item['dob']); + $item['dob'] = $dateTime->format('d-m-Y'); + } + return $item; + }; + $employee = array_map($dateConverter, $employee); + return $this->respond(['status' => 'success','code' => 200,'data' => $employee],200); + } else { - $result = "No Match's"; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + + return $this->respond(['status' => 'failed','code' => 404,'data' => []],404); } } catch (\Throwable $th) { return $this->respond(['status' => 'failed','code' => 500,'data' => $th],500); @@ -129,6 +135,7 @@ class EmployeeRestController extends AdminController $updatedCount = 0; foreach ($data as $item) { $id = $item->id; + $item->dob = $this->convertDateFormat($item->dob); $employee = $this->employeeModel->update($id, (array)$item); if ($employee) { $updatedCount++; @@ -162,6 +169,7 @@ class EmployeeRestController extends AdminController //update old data $id = $item->id; $item->family_floater_key = $this->RelationshipMap($item->relationship); + $item->dob = $this->convertDateFormat($item->dob); $employee = $this->employeeModel->update($id, (array)$item); if ($employee) { $Count++; @@ -169,6 +177,7 @@ class EmployeeRestController extends AdminController }else{ //create new data $item->family_floater_key = $this->RelationshipMap($item->relationship); + $item->dob = $this->convertDateFormat($item->dob); $employee = $this->employeeModel->insert($item); if ($employee) { $Count++; @@ -204,6 +213,21 @@ class EmployeeRestController extends AdminController return 'spouse'; } } + + private function convertDateFormat($dateString) + { + // Attempt to create a DateTime object from the provided date string + $dateTime = \DateTime::createFromFormat('d-m-Y', $dateString); + + // Check if the conversion was successful and the date string is in the format dd-mm-yyyy + if ($dateTime instanceof \DateTime) { + // Format the date to yyyy-mm-dd + return $dateTime->format('Y-m-d'); + } else { + // If the date string is not in the format dd-mm-yyyy, return null + return null; + } + } public function deleteDependence() { try { @@ -283,7 +307,6 @@ class EmployeeRestController extends AdminController $empPolicy = $this->employeeModel->getEmployeePolicy($id); $empData = $this->employeeModel->where('emp_code',$emp_code)->findAll(); - // dd($empPolicy); if ($empPolicy) { $result = []; @@ -338,9 +361,14 @@ class EmployeeRestController extends AdminController if(count($empData)){ foreach ($empData as $key => $value) { if ($value['family_floater_key'] === $dependent) { + $employee_policy = $this->employeePolicyModel->where('employee_id',$value['id'])->where('client_policy_id',$array->ClientPolicyId)->get()->getRow(); $temp['family_floater_key'] = $familyFloatesValue; $temp['label'] = $value['relationship']; $temp['name'] = $value['name']; + $temp['employee_id'] = $value['id']; + $temp['basic_cover_si'] = isset($employee_policy->basic_cover_si) ? $employee_policy->basic_cover_si : null; + $temp['client_policy_id'] = $array->ClientPolicyId; + array_push($data,$temp); unset($empData[$key]); break;