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 16, 2024
1 parent fee9e2a commit c77e935
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 @@ -2324,7 +2324,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 @@ -2350,7 +2350,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 @@ -2391,7 +2391,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 @@ -2428,7 +2428,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 @@ -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 @@ -2548,7 +2548,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 @@ -2642,7 +2642,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 @@ -2733,7 +2733,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 @@ -2759,7 +2759,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 @@ -2806,7 +2806,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 @@ -2877,7 +2877,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 c77e935

Please sign in to comment.