chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-22 13:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Calculate compliance as number of compliant days / total number of days (instead of days used) so statistics matches overview calculation.

Browse Source
This commit is contained in:
Seeker4 2019-05-29 19:35:19 -07:00
parent c438ef3872
commit 76e6f44991
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
oscar/statistics.cpp
View File

@ -1492,7 +1492,9 @@ QString StatisticsRow::value(QDate start, QDate end)
value = QString("%1").arg(formatTime(p_profile->calcHours(type, start, end) / days)); value = QString("%1").arg(formatTime(p_profile->calcHours(type, start, end) / days));
} else if (calc == SC_COMPLIANCE) { } else if (calc == SC_COMPLIANCE) {
float c = p_profile->countCompliantDays(type, start, end); float c = p_profile->countCompliantDays(type, start, end);
float p = (100.0 / days) * c; // float p = (100.0 / days) * c;
float realDays = qAbs(start.daysTo(end)) + 1;
float p = (100.0 / realDays) * c;
value = QString("%1%").arg(p, 0, 'f', 0); value = QString("%1%").arg(p, 0, 'f', 0);
} else if (calc == SC_DAYS) { } else if (calc == SC_DAYS) {
value = QString("%1").arg(p_profile->countDays(type, start, end)); value = QString("%1").arg(p_profile->countDays(type, start, end));