From dfb6ae03a8b2b3cf91343ea1fd178933d5a2541c Mon Sep 17 00:00:00 2001
From: telusdcinco <86343751+telusdcinco@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:58:46 -0800
Subject: [PATCH] ZenHub #1379 - Show Past Employees in Employee Record Page

ZenHub #1379 - Show Past Employees in Employee Record Page
---
 .../SysadminStatisticsReportController.php    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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