|
|
@@ -3708,10 +3708,11 @@ open class ReportService( |
|
|
|
it.staff.id == ts.staff!!.id |
|
|
|
&& it.startDate <= ts.recordDate && (it.endDate >= ts.recordDate || it.endDate == null) |
|
|
|
} |
|
|
|
val hourlyRate = (thisSE?.salary?.hourlyRate ?: ts.staff!!.salary.hourlyRate).toDouble() |
|
|
|
val normalHour = ts.normalConsumed ?: 0.0 |
|
|
|
val otHour = ts.otConsumed ?: 0.0 |
|
|
|
val normalCost = normalHour.times(thisSE!!.salary.hourlyRate.toDouble()) |
|
|
|
val otCost = otHour.times(thisSE.salary.hourlyRate.toDouble()).times(otMultiplier) |
|
|
|
val normalCost = normalHour.times(hourlyRate) |
|
|
|
val otCost = otHour.times(hourlyRate).times(otMultiplier) |
|
|
|
//assigning data |
|
|
|
val projectTeam = ts.project!!.teamLead!!.team.code |
|
|
|
val staffTeam = ts.staff!!.team.code |
|
|
|