|
|
|
@@ -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 |
|
|
|
|
