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

statistics: rightsideBar Records pane. Updated cpap usaged. add info to make item clearer.

Browse Source
This commit is contained in:
LoudSnorer 2023-06-11 18:15:46 -04:00
parent 812c0dd8fd
commit e8bed919ce
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
oscar/statistics.cpp
View File

@ -990,22 +990,20 @@ struct Period {
// 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 start;
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 subtract one day for Month.
start = qMax(last.addMonths(advance).addDays(-1),first);; first = qMax(last.addMonths(advance).addDays(+1),first);;
} else { } else {
start = qMax(last.addDays(advance),first); first = qMax(last.addDays(advance),first);
} }
name = name + "<br>" + start.toString(Qt::SystemLocaleShortDate) ; name = name + "<br>" + first.toString(Qt::SystemLocaleShortDate) ;
//name = name + "<br>" + start.toString(Qt::RFC2822Date) ;
if (advance!=0) { if (advance!=0) {
//name = name + " - " + last.toString(Qt::RFC2822Date);
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 = start ; this->start = first ;
this->end = last ; this->end = last ;
} }
Period& operator=(const Period&) = default; Period& operator=(const Period&) = default;
@ -1289,6 +1287,7 @@ QString Statistics::GenerateCPAPUsage()
if (row.calc == SC_HEADING) { // All sections begin with a heading if (row.calc == SC_HEADING) { // All sections begin with a heading
last = p_profile->LastGoodDay(row.type); last = p_profile->LastGoodDay(row.type);
first = p_profile->FirstGoodDay(row.type); first = p_profile->FirstGoodDay(row.type);
//last = p_profile->general->statReportStart();
// Clear the periods (columns) // Clear the periods (columns)
periods.clear(); periods.clear();
@ -1534,14 +1533,25 @@ QString Statistics::UpdateRecordsBox()
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
/// Compliance and usage information /// Compliance and usage information
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
int realTotal = 1+first.daysTo(last);
int totaldays = p_profile->countDays(MT_CPAP, first, last); int totaldays = p_profile->countDays(MT_CPAP, first, last);
int compliant = p_profile->countCompliantDays(MT_CPAP, first, last); int compliant = p_profile->countCompliantDays(MT_CPAP, first, last);
int lowUsed = totaldays - compliant;
int daysSkipped = realTotal -(compliant+lowUsed);
float comperc = (100.0 / float(totaldays)) * float(compliant); //float comperc = (100.0 / float(totaldays)) * float(compliant);
float comperc = (100.0 / float(realTotal)) * float(compliant);
html += "<b>"+tr("Period:")+"</b> ";
html += first.toString(Qt::SystemLocaleShortDate) + " - " + last.toString(Qt::SystemLocaleShortDate) + "<br><br>";
html += "<b>"+tr("CPAP Usage")+"</b><br>"; html += "<b>"+tr("CPAP Usage")+"</b><br>";
if (realTotal != totaldays) {
html += tr("Total Days: %1").arg(realTotal) + "<br>";
html += tr("No Data Days: %1").arg(daysSkipped) + "<br>";
}
html += tr("Days Used: %1").arg(totaldays) + "<br>"; html += tr("Days Used: %1").arg(totaldays) + "<br>";
html += tr("Low Use Days: %1").arg(totaldays - compliant) + "<br>"; html += tr("Low Use Days: %1").arg(lowUsed) + "<br>";
//html += tr("compliant Days: %1").arg(compliant) + "<br>";
html += tr("Compliance: %1%").arg(comperc, 0, 'f', 1) + "<br>"; html += tr("Compliance: %1%").arg(comperc, 0, 'f', 1) + "<br>";
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////