1. Project - Add auto calculation for total manhour

src/main/java/com/ffii/tsms/modules/project/entity/Project.kt

@@ -69,6 +69,9 @@ open class Project : BaseEntity<Long>() {
     @Column(name = "totalManhour")
     open var totalManhour: Double? = null
 
+    @Column(name = "ratePerManhour")
+    open var ratePerManhour: Double? = null
+
     @OneToMany(mappedBy = "project", cascade = [CascadeType.ALL], orphanRemoval = true)
     open var gradeAllocations: MutableSet<GradeAllocation> = mutableSetOf()
 

src/main/java/com/ffii/tsms/modules/project/service/ProjectsService.kt

@@ -227,6 +227,7 @@ open class ProjectsService(
             expectedTotalFee = request.expectedProjectFee
             subContractFee = request.subContractFee
             totalManhour = request.totalManhour
+            ratePerManhour = request.ratePerManhour
             actualStart = request.projectActualStart
             actualEnd = request.projectActualEnd
             status = if (this.status == "Deleted" || this.deleted == true) "Deleted"
@@ -729,6 +730,7 @@ open class ProjectsService(
                         expectedProjectFee = row.getCell(9).numericCellValue,
                         subContractFee = null,
                         totalManhour = row.getCell(11).numericCellValue,
+                        ratePerManhour = 250.0,
                         locationId = 1, // HK
                         buildingTypeIds = mutableListOf(buildingType!!.id!!),
                         workNatureIds = mutableListOf(workNature!!.id!!),

src/main/java/com/ffii/tsms/modules/project/web/models/NewProjectRequest.kt

@@ -41,6 +41,7 @@ data class NewProjectRequest(
     val manhourPercentageByGrade: Map<Long, Double>,
     val taskGroups: Map<Long, TaskGroupAllocation>,
     val allocatedStaffIds: List<Long>,
+    val ratePerManhour: Double,
 
     // Milestones
     val milestones: Map<Long, Milestone>,

src/main/resources/db/changelog/changes/20240815_01_cyril/01_update_project.sql

@@ -0,0 +1,5 @@
+-- liquibase formatted sql
+-- changeset cyril:project
+
+ALTER TABLE `project`
+    ADD COLUMN `ratePerManhour` DOUBLE NULL DEFAULT NULL AFTER `totalManhour`;