Add employType

src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt

@@ -102,6 +102,7 @@ open class StaffsService(
 
         val sql = StringBuilder("select " +
                 " s.id as id, " +
+                " s.employType as employType, " +
                 " t.id as teamId, " +
                 " case when t.teamLead = s.id then true else false end as isTeamLead " +
                 " from staff s " +

src/main/java/com/ffii/tsms/modules/timesheet/service/LeaveService.kt

@@ -110,7 +110,8 @@ open class LeaveService(
                     TeamMemberLeaveEntries(
                         staffId = member.staffId,
                         name = member.name,
-                        leaveEntries = transformToLeaveEntryMap(leaveRepository.findAllByStaff(member))
+                        leaveEntries = transformToLeaveEntryMap(leaveRepository.findAllByStaff(member)),
+                        employType = member.employType
                     )
                 )
             }

src/main/java/com/ffii/tsms/modules/timesheet/service/TimesheetsService.kt

@@ -136,7 +136,8 @@ open class TimesheetsService(
                     TeamMemberTimeEntries(
                         staffId = member.staffId,
                         name = member.name,
-                        timeEntries = transformToTimeEntryMap(timesheetRepository.findAllByStaff(member))
+                        timeEntries = transformToTimeEntryMap(timesheetRepository.findAllByStaff(member)),
+                        employType = member.employType
                     )
                 )
             }

src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberLeaveEntries.kt

@@ -4,4 +4,5 @@ data class TeamMemberLeaveEntries(
     val leaveEntries: Map<String, List<LeaveEntry>>,
     val staffId: String?,
     val name: String?,
+    val employType: String?,
 )

src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberTimeEntries.kt

@@ -4,4 +4,5 @@ data class TeamMemberTimeEntries(
     val timeEntries: Map<String, List<TimeEntry>>,
     val staffId: String?,
     val name: String?,
+    val employType: String?,
 )