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

fix statistics standard mode display for display less than 6 months.

Browse Source
This commit is contained in:
LoudSnorer 2023-06-12 16:19:14 -04:00
parent e8bed919ce
commit f149988211
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
oscar/statistics.cpp
View File

@ -986,24 +986,29 @@ struct Period {
end=copy.end; end=copy.end;
header=copy.header; header=copy.header;
} }
Period(QDate first,QDate last, int advance , bool month,QString name) { Period(QDate first,QDate last,bool& finished, int advance , bool month,QString name) {
if (finished) return;
// adds date range to header. // adds date range to header.
// replaces the following // replaces the following
// periods.push_back(Period(qMax(last.addDays(-6), first), last, tr("Last Week"))); // periods.push_back(Period(qMax(last.addDays(-6), first), last, tr("Last Week")));
QDate next;
if (month) { if (month) {
// note add days or addmonths returns the start of the next day or the next month. // note add days or addmonths returns the start of the next day or the next month.
// must subtract one day for Month. // must shorten one day for Month.
first = qMax(last.addMonths(advance).addDays(+1),first);; next = last.addMonths(advance).addDays(+1);
} else { } else {
first = qMax(last.addDays(advance),first); next = last.addDays(advance);
} }
name = name + "<br>" + first.toString(Qt::SystemLocaleShortDate) ; if (next<=first) {
finished = true;
next = first;
}
name = name + "<br>" + next.toString(Qt::SystemLocaleShortDate) ;
if (advance!=0) { if (advance!=0) {
name = name + " - " + last.toString(Qt::SystemLocaleShortDate); name = name + " - " + last.toString(Qt::SystemLocaleShortDate);
} }
DEBUGFW Q(first) Q(last) Q(month) Q(first.daysTo(last)) Q(advance) O(name);
this->header = name; this->header = name;
this->start = first ; this->start = next ;
this->end = last ; this->end = last ;
} }
Period& operator=(const Period&) = default; Period& operator=(const Period&) = default;
@ -1293,12 +1298,13 @@ QString Statistics::GenerateCPAPUsage()
periods.clear(); periods.clear();
if (p_profile->general->statReportMode() == STAT_MODE_STANDARD) { if (p_profile->general->statReportMode() == STAT_MODE_STANDARD) {
// note add days or addmonths returns the start of the next day or the next month. // note add days or addmonths returns the start of the next day or the next month.
// must subtract one day for each. Month executed in Period method // must shorten one day for each. Month executed in Period method
periods.push_back(Period(first,last, 0, false ,tr("Most Recent"))); bool finished = false; // used to detect end of data - when less than a year of data.
periods.push_back(Period(first,last, -6, false ,tr("Last Week"))); periods.push_back(Period(first,last,finished, 0, false ,tr("Most Recent")));
periods.push_back(Period(first,last, -29,false, tr("Last 30 Days"))); periods.push_back(Period(first,last,finished, -6, false ,tr("Last Week")));
periods.push_back(Period(first,last, -6,true, tr("Last 6 Months"))); periods.push_back(Period(first,last,finished, -29,false, tr("Last 30 Days")));
periods.push_back(Period(first,last, -12,true,tr("Last Year"))); periods.push_back(Period(first,last,finished, -3,true, tr("Last 3 Months")));
periods.push_back(Period(first,last,finished, -12,true,tr("Last Year")));
} else if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) { } else if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
QDate l=last,s=last; QDate l=last,s=last;
@ -1400,12 +1406,15 @@ QString Statistics::GenerateCPAPUsage()
} }
name = calcnames[row.calc].arg(schema::channel[id].fullname()); name = calcnames[row.calc].arg(schema::channel[id].fullname());
} }
// Defined percentages for columns for diffent modes.
QString line; QString line;
int np = periods.size(); int np = periods.size();
int width; int width;
// both create header column and 5 data columns for a total of 100
int dataWidth = 14; int dataWidth = 14;
int headerWidth = 30; int headerWidth = 30;
if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) { if (p_profile->general->statReportMode() == STAT_MODE_MONTHLY) {
// both create header column and 13 data columns for a total of 100
dataWidth = 6; dataWidth = 6;
headerWidth = 22; headerWidth = 22;
} }