diff --git a/app/Http/Controllers/SysAdmin/SysadminStatisticsReportController.php b/app/Http/Controllers/SysAdmin/SysadminStatisticsReportController.php index e001e3f70..bea37eb53 100644 --- a/app/Http/Controllers/SysAdmin/SysadminStatisticsReportController.php +++ b/app/Http/Controllers/SysAdmin/SysadminStatisticsReportController.php @@ -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) { @@ -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) { @@ -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) @@ -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) @@ -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) { @@ -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) { @@ -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) @@ -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) @@ -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(); @@ -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(); @@ -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();