stufflog3/stufflog3
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix project progress being rounded down.

Browse Source
This commit is contained in:
gisle
2022-07-04 18:11:51 +02:00
parent 795d49a942
commit 22885734c7
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
usecases/projects/result.go
+9 -9
View File
@@ -36,9 +36,9 @@ type Result struct {
entities.Project
OwnerName string `json:"ownerName"`
StatusName string `json:"statusName"`
TotalAcquired int `json:"totalAcquired"`
TotalRequired int `json:"totalRequired"`
TotalPlanned int `json:"totalPlanned"`
TotalAcquired float64 `json:"totalAcquired"`
TotalRequired float64 `json:"totalRequired"`
TotalPlanned float64 `json:"totalPlanned"`
Requirements []RequirementResult `json:"requirements"`
}
@@ -58,9 +58,9 @@ type RequirementResult struct {
Description string `json:"description"`
Status models.Status `json:"status"`
StatusName string `json:"statusName"`
TotalAcquired int `json:"totalAcquired"`
TotalRequired int `json:"totalRequired"`
TotalPlanned int `json:"totalPlanned"`
TotalAcquired float64 `json:"totalAcquired"`
TotalRequired float64 `json:"totalRequired"`
TotalPlanned float64 `json:"totalPlanned"`
IsCoarse bool `json:"isCoarse"`
Stats []RequirementResultStat `json:"stats"`
Items []items.Result `json:"items"`
@@ -243,9 +243,9 @@ func generateRequirementResult(req entities.Requirement, scope scopes.Result, re
totalPlanned += math.Min(float64(stat.Planned), float64(stat.Required)) * stat.Weight
}
}
resReq.TotalRequired += int(totalRequired)
resReq.TotalAcquired += int(math.Min(totalAcquired, totalRequired))
resReq.TotalPlanned += int(math.Min(totalPlanned, totalRequired))
resReq.TotalRequired += totalRequired
resReq.TotalAcquired += math.Min(totalAcquired, totalRequired)
resReq.TotalPlanned += math.Min(totalPlanned, totalRequired)
return resReq
}