diff --git a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt b/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt index 059013f..d575011 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/StaffsService.kt +++ b/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 " + 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 5a0f7f5..02291b6 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 @@ -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 ) ) } 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 1b4e2c2..72b3a2a 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 @@ -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 ) ) } diff --git a/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberLeaveEntries.kt b/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberLeaveEntries.kt index 8a6b95b..1f84027 100644 --- a/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberLeaveEntries.kt +++ b/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberLeaveEntries.kt @@ -4,4 +4,5 @@ data class TeamMemberLeaveEntries( val leaveEntries: Map>, val staffId: String?, val name: String?, + val employType: String?, ) diff --git a/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberTimeEntries.kt b/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberTimeEntries.kt index 084440d..86bfafa 100644 --- a/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberTimeEntries.kt +++ b/src/main/java/com/ffii/tsms/modules/timesheet/web/models/TeamMemberTimeEntries.kt @@ -4,4 +4,5 @@ data class TeamMemberTimeEntries( val timeEntries: Map>, val staffId: String?, val name: String?, + val employType: String?, )