From c2c3229f45facbf352c00da90512ee5bb1f508a8 Mon Sep 17 00:00:00 2001 From: velz Date: Thu, 25 Apr 2024 19:17:12 +0530 Subject: [PATCH 1/4] FIX_SELF_ORDERED_AS_FIRST_IN_FAMILIY_ARRAY --- app/Helpers/excel_util_helper.php | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php index 44ddf180..84ed0c24 100644 --- a/app/Helpers/excel_util_helper.php +++ b/app/Helpers/excel_util_helper.php @@ -247,22 +247,33 @@ if (!function_exists('data_group_by_family')) function data_group_by_family($emp_data,$data_source = 'excel') { $result = []; + // dd($emp_data); foreach ($emp_data as $rkey => $row) { if($data_source == 'excel') { if(!check_row_is_empty_or_null($row)) { - $result[$row[1]][] = $row; + if(strtolower($row[5]) == 'self' && isset($result[$row[1]])) + { + array_unshift($result[$row[1]],$row); + }else + { + $result[$row[1]][] = $row; + } } - }else if($data_source = 'db') { - $result[$row['emp_code']][] = $row; + if(strtolower($row['relationship']) == 'self' && isset($result[$row['emp_code']])) + { + array_unshift($result[$row['emp_code']],$row); + }else + { + $result[$row['emp_code']][] = $row; + } } } - return $result; } } From d835f39f7a3ca681fa180b4fd3938a5f74e3643d Mon Sep 17 00:00:00 2001 From: aadhavan valli Date: Fri, 26 Apr 2024 09:29:26 +0530 Subject: [PATCH 2/4] CHANGE_TICKETING_SYSTEM : AADHAVAN --- app/Config/Routes.php | 6 ++++++ app/Controllers/DashboardController.php | 3 +++ app/Views/layout/header.php | 9 ++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index f516c231..0e2fea4b 100644 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -267,3 +267,9 @@ $routes->group("employeeRest", ["filter" => "authJWT"], function($routes){ $routes->post("sendEmail", "EmployeeRestController::send_email"); + + + +// Ticketing System + +// Ticketing System End's diff --git a/app/Controllers/DashboardController.php b/app/Controllers/DashboardController.php index 6e9e957c..ccd39f50 100644 --- a/app/Controllers/DashboardController.php +++ b/app/Controllers/DashboardController.php @@ -21,4 +21,7 @@ class DashboardController extends AdminController echo view('DashBoard'); echo view('layout/footer'); } + + + } diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index e5690d70..dc06d7c0 100644 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -602,7 +602,14 @@
  • - + $sessionData]); + ?> + Tickets From 3091fe31546709dbb0a1bf5211af672d5693416a Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 26 Apr 2024 10:45:34 +0530 Subject: [PATCH 3/4] CHANGE_ added error message in login apis : GWM --- app/Controllers/RestAuthenticationController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index 4b14a8bd..f663f9cc 100644 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -81,7 +81,7 @@ class RestAuthenticationController extends AdminController return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); } else { $result = ['user_verification' => false]; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + return $this->respond(['status' => 'failed','code' => 404,'data' => "User not found"],200); } } catch (\Throwable $th) { @@ -118,7 +118,7 @@ class RestAuthenticationController extends AdminController $result = JWTToken::encode($employeeData); return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); } else { - return $this->respond(['status' => 'failed','code' => 404,'data' => "No data"],404); + return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200); } } catch (\Exception $e) { return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500); @@ -140,7 +140,7 @@ class RestAuthenticationController extends AdminController return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); } else { $result = ['user_verification' => false]; - return $this->respond(['status' => 'failed','code' => 404,'data' => $result],404); + return $this->respond(['status' => 'failed','code' => 404,'data' => "User not found"],200); } } catch (\Throwable $th) { @@ -180,7 +180,7 @@ class RestAuthenticationController extends AdminController $result = JWTToken::encode($hrData['0']); return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); } else { - return $this->respond(['status' => 'failed','code' => 404,'data' => "No data"],404); + return $this->respond(['status' => 'failed','code' => 404,'data' => "Invalid OTP"],200); } } catch (\Exception $e) { return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()],500); From 42b1f2b934eebe4fe27843aba0d0f1d39375f69c Mon Sep 17 00:00:00 2001 From: bitbucket Date: Fri, 26 Apr 2024 11:10:42 +0530 Subject: [PATCH 4/4] CHANGE_ added error message in login apis : GWM --- app/Controllers/RestAuthenticationController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Controllers/RestAuthenticationController.php b/app/Controllers/RestAuthenticationController.php index f663f9cc..1aa3adab 100644 --- a/app/Controllers/RestAuthenticationController.php +++ b/app/Controllers/RestAuthenticationController.php @@ -80,8 +80,8 @@ class RestAuthenticationController extends AdminController $result = ['user_verification' => true , 'otp'=>$randomNumber]; return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); } else { - $result = ['user_verification' => false]; - return $this->respond(['status' => 'failed','code' => 404,'data' => "User not found"],200); + $result = ['user_verification' => false , 'message' => "User not found"]; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200); } } catch (\Throwable $th) { @@ -139,8 +139,8 @@ class RestAuthenticationController extends AdminController $result = ['user_verification' => true , 'otp'=>$randomNumber]; return $this->respond(['status' => 'success','code' => 200,'data' => $result],200); } else { - $result = ['user_verification' => false]; - return $this->respond(['status' => 'failed','code' => 404,'data' => "User not found"],200); + $result = ['user_verification' => false , 'message' => "User not found"]; + return $this->respond(['status' => 'failed','code' => 404,'data' => $result],200); } } catch (\Throwable $th) {