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

Add number of years times 12 to lastmonth - then trim to 12 max

Browse Source
This commit is contained in:
Phil Olynyk 2019-07-18 21:16:05 -04:00
parent 4ad282768c
commit 6fcc4e9af1
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/statistics.cpp
View File

@ -1068,14 +1068,16 @@ QString Statistics::GenerateCPAPUsage()
if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
int firstMonth = firstcpap.month();
int lastMonth = lastcpap.month();
if (lastMonth <= firstMonth && firstcpap.year() != lastcpap.year())
lastMonth += 12; // handle time extending to next year
int years = lastcpap.year() - firstcpap.year();
if (lastMonth <= firstMonth)
lastMonth += (12 * years); // handle time extending to next year
number_periods = lastMonth - firstMonth + 1;
if (number_periods < 1) {
qDebug() << "*** Begin" << firstcpap << "beginMonth" << firstMonth << "lastMonth" << lastMonth << "periods" << number_periods;
number_periods = 1;
}
qDebug() << "Number of months for stats (trim to 12 max)" << number_periods;
// But not more than one year
if (number_periods > 12) {
number_periods = 12;