From e1ed694ca22551cd2c04317476115afcae27ca15 Mon Sep 17 00:00:00 2001
From: "MSI\\derek" <abc@gmail.com>
Date: Mon, 21 Oct 2024 14:13:08 +0800
Subject: [PATCH] filter departed staffs

---
 .../com/ffii/tsms/modules/timesheet/service/LeaveService.kt    | 3 ++-
 .../ffii/tsms/modules/timesheet/service/TimesheetsService.kt   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt b/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt
index 99100a9..0d3232d 100644
--- a/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt
+++ b/src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt
@@ -111,7 +111,8 @@ open class LeaveService(
             } else {
                 staffsService.findAll().getOrDefault(emptyList())
             }
-            return teamMembers.associate { member ->
+
+            return teamMembers.filter { it.departDate == null }.associate { member ->
                 Pair(
                     member.id!!,
                     TeamMemberLeaveEntries(
diff --git a/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt b/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt
index bc17333..4028151 100644
--- a/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt
+++ b/src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt
@@ -140,7 +140,7 @@ open class TimesheetsService(
                 staffsService.findAll().getOrDefault(emptyList())
             }
 
-            return teamMembers.associate { member ->
+            return teamMembers.filter { it.departDate == null }.associate { member ->
                 Pair(
                     member.id!!,
                     TeamMemberTimeEntries(