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

Correct error in calculating number of periods in monthly report.

Browse Source
This commit is contained in:
Seeker4 2019-06-11 06:28:34 -07:00
parent d3c10ca745
commit 610c935191
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oscar/statistics.cpp
View File

@ -1011,13 +1011,14 @@ QString Statistics::GenerateHTML()
// Compute number of monthly periods for a monthly rather than standard time distribution // Compute number of monthly periods for a monthly rather than standard time distribution
int number_periods = 0; int number_periods = 0;
if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) { if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
QDate beginDate = qMax(firstcpap, lastcpap.addYears(-1)); int firstMonth = firstcpap.month();
int beginMonth = beginDate.month();
int lastMonth = lastcpap.month(); int lastMonth = lastcpap.month();
if (lastMonth < beginMonth) lastMonth += 12; // handle time extending to next year if (lastMonth <= firstMonth && firstcpap.year() != lastcpap.year())
number_periods = lastMonth - beginMonth + 1; lastMonth += 12; // handle time extending to next year
number_periods = lastMonth - firstMonth + 1;
if (number_periods < 1) { if (number_periods < 1) {
qDebug() << "*** Begin" << beginDate << "beginMonth" << beginMonth << "lastMonth" << lastMonth << "periods" << number_periods; qDebug() << "*** Begin" << firstcpap << "beginMonth" << firstMonth << "lastMonth" << lastMonth << "periods" << number_periods;
number_periods = 1; number_periods = 1;
} }
// But not more than one year // But not more than one year