Skip to content

Commit

Permalink
ZenHub #1379 - Show Past Employees in Employee Record Page
Browse files Browse the repository at this point in the history 
ZenHub #1379 - Show Past Employees in Employee Record Page
  • Loading branch information
@telusdcinco
telusdcinco committed Dec 9, 2024
1 parent becf6a1 commit 064e59d
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions app/Http/Controllers/SysAdmin/SysadminStatisticsReportController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2246,7 +2246,7 @@ public function fileReports(Request $request)
$join->on('employee_demo.employee_id', '=', 'users.employee_id');
})
->whereNull('goals.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('status','=','active')
->where(function($query) use($request) {
Expand All @@ -2272,7 +2272,7 @@ public function fileReports(Request $request)
$join->on('employee_demo.employee_id', '=', 'users.employee_id');
})
->whereNull('goals.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('status','<>','active')
->where(function($query) use($request) {
Expand Down Expand Up @@ -2313,7 +2313,7 @@ public function fileReports(Request $request)
});
})
->whereNull('conversations.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('conversation_participants.role', '=', 'emp')
->where('employee_demo.employee_id', '=', $request->employee_id)
Expand Down Expand Up @@ -2350,7 +2350,7 @@ public function fileReports(Request $request)
});
})
->whereNull('conversations.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('conversation_participants.role', '=', 'emp')
->where('employee_demo.employee_id', '=', $request->employee_id)
Expand Down Expand Up @@ -2392,7 +2392,7 @@ public function fileReportsExport(Request $request)
$join->on('employee_demo.employee_id', '=', 'users.employee_id');
})
->whereNull('goals.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('status','=','active')
->where(function($query) use($request) {
Expand Down Expand Up @@ -2470,7 +2470,7 @@ public function fileReportsExport(Request $request)
$join->on('employee_demo.employee_id', '=', 'users.employee_id');
})
->whereNull('goals.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('status','<>','active')
->where(function($query) use($request) {
Expand Down Expand Up @@ -2564,7 +2564,7 @@ public function fileReportsExport(Request $request)
});
})
->whereNull('conversations.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('conversation_participants.role', '=', 'emp')
->where('employee_demo.employee_id', '=', $request->employee_id)
Expand Down Expand Up @@ -2655,7 +2655,7 @@ public function fileReportsExport(Request $request)
});
})
->whereNull('conversations.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('conversation_participants.role', '=', 'emp')
->where('employee_demo.employee_id', '=', $request->employee_id)
Expand All @@ -2681,7 +2681,7 @@ public function fileReportsExport(Request $request)
->leftJoin('users as employee', 'employee.id', '=', 'conversations.signoff_user_id')
->where('conversation_participants.role','=','emp')
->where('conversations.id','=',$conversation_id)
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->get();

Expand Down Expand Up @@ -2728,7 +2728,7 @@ public function fileReportsExport(Request $request)
$join->on('employee_demo.employee_id', '=', 'users.employee_id');
})
->whereNull('goals.deleted_at')
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->where('goals.id','=',$goal_id)
->get();
Expand Down Expand Up @@ -2799,7 +2799,7 @@ public function fileReportsExport(Request $request)
->leftJoin('users as employee', 'employee.id', '=', 'conversations.signoff_user_id')
->where('conversation_participants.role','=','emp')
->where('conversations.id','=',$conversation_id)
->whereNull('employee_demo.date_deleted')
// ->whereNull('employee_demo.date_deleted')
->whereRaw('employee_demo.pdp_excluded = 0')
->get();

Expand Down

0 comments on commit 064e59d

Please sign in to comment.