ZenHub #986 - Update Search Filter for My Organization

bcgov · Jul 11, 2023 · 1036afd · 1036afd
1 parent 9ddb13f
commit 1036afd
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/app/Http/Controllers/HRAdmin/MyOrganizationController.php b/app/Http/Controllers/HRAdmin/MyOrganizationController.php
@@ -67,13 +67,8 @@ public function getList(Request $request) {
  ->when($request->dd_level2, function($q) use($request) { return $q->where('u.level2_key', $request->dd_level2); })
  ->when($request->dd_level3, function($q) use($request) { return $q->where('u.level3_key', $request->dd_level3); })
  ->when($request->dd_level4, function($q) use($request) { return $q->where('u.level4_key', $request->dd_level4); })
-
-
- ->when($request->search_text && $request->criteria != 'all' && $request->criteria == 'u.employee_name', function($q) use ($request) { return $q->whereRaw("(u.employee_name LIKE '%{$request->search_text}%' OR u.user_name LIKE '%{$request->search_text}%')"); })
-
-
- ->when($request->search_text && $request->criteria != 'all' && $request->criteria != 'u.employee_name', function($q) use($request) { return $q->whereRaw("{$request->criteria} like '%{$request->search_text}%'"); })
- ->when($request->search_text && $request->criteria == 'all', function($q) use($request) { return $q->whereRaw("(u.employee_id LIKE '%{$request->search_text}%' OR u.employee_name LIKE '%{$request->search_text}%' OR u.user_name LIKE '%{$request->search_text}%' OR u.jobcode_desc LIKE '%{$request->search_text}%' OR u.deptid LIKE '%{$request->search_text}%')"); })
+ ->when($request->search_text && $request->criteria == 'u.employee_name', function($q) use ($request) { return $q->whereRaw("(u.employee_name LIKE '%{$request->search_text}%' OR u.user_name LIKE '%{$request->search_text}%')"); })
+ ->when($request->search_text && $request->criteria != 'u.employee_name', function($q) use ($request) { return $q->whereRaw("{$request->criteria} LIKE '%{$request->search_text}%'"); })
  ->selectRaw ("
  user_id,
  u.user_name,
@@ -113,11 +108,14 @@ public function getList(Request $request) {
 
  protected function search_criteria_list() {
  return [
- 'all' => 'All',
+ 'u.employee_name'=> 'Name',
  'u.employee_id' => 'Employee ID', 
- 'u.employee_name'=> 'Employee Name',
- 'u.jobcode_desc' => 'Classification', 
- 'u.deptid' => 'Department ID'
+ 'u.employee_email' => 'Email', 
+ 'u.position_number' => 'Position #',
+ 'u.reporting_to_name' => 'Reports To Name',
+ 'u.supervisor_position_number' => 'Reports to Position #',
+ 'u.jobcode_desc' => 'Classification',
+ 'u.deptid' => 'Dept ID'
  ];
  }