bugs: conflicts with bugs from dev_wfh rebase fixed

e-tayfw · Oct 15, 2024 · f4d3670 · f4d3670
1 parent 3394427
commit f4d3670
Show file tree

Hide file tree

Showing 3 changed files with 171 additions and 191 deletions.
diff --git a/backend-api/app/Http/Controllers/ScheduleController.php b/backend-api/app/Http/Controllers/ScheduleController.php
@@ -97,7 +97,6 @@ public function generateTeamSchedule($staff_id)
         }
 
         // Step 2: Get all team members who belong to the same department and report to the same manager
-        $teamMembers = Employee::where('Reporting_Manager', $employee->Reporting_Manager)
         $teamMembers = Employee::where('Reporting_Manager', $employee->Reporting_Manager)
             ->where('Staff_ID', '!=', $staff_id) // Exclude the employee themselves
             ->pluck('Staff_ID'); // Retrieve only team member IDs

diff --git a/src/components/schedule/index.tsx b/src/components/schedule/index.tsx
@@ -1,7 +1,6 @@
 import { Display } from "@/components/TextStyles";
 import { WFHCalendar } from "@/components/schedule/Calendar";
 import { TeamCalendar } from "@/components/schedule/TeamCalendar";
-import { TeamCalendar } from "@/components/schedule/TeamCalendar";
 import { useRouter } from "next/router";
 import { useSelector } from "react-redux";
 import { RootState } from "@/redux/store";