From 0707e6da931666b2f63862adf69dc552864ebb46 Mon Sep 17 00:00:00 2001 From: kelvinsuen Date: Tue, 27 Aug 2024 14:33:51 +0800 Subject: [PATCH] add reopen project button --- .../ffii/tsms/modules/project/service/ProjectsService.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt index 01521fe..4b8db90 100644 --- a/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt +++ b/src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt @@ -229,9 +229,11 @@ open class ProjectsService( totalManhour = request.totalManhour ratePerManhour = request.ratePerManhour actualStart = request.projectActualStart - actualEnd = request.projectActualEnd + actualEnd = if (this.status == "Completed") null else request.projectActualEnd status = if (this.status == "Deleted" || this.deleted == true) "Deleted" - else if (this.actualStart != null && this.actualEnd != null) "Completed" + else if (this.actualStart != null && this.actualEnd != null) ( + if (this.status == "Completed") "On-going" else "Completed" + ) else if (this.actualStart != null) "On-going" else request.projectStatus ?: "Pending To Start" isClpProject = request.isClpProject