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

Show hours/day that defines compliance on Statistics screen. Update Welcome message to show usage in red if hours less than profile setting (was less than 4).

Browse Source
This commit is contained in:
Seeker4 2019-06-02 17:48:27 -07:00
parent 269daffaac
commit 8dd04397cc
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/statistics.cpp
View File

@ -509,7 +509,7 @@ Statistics::Statistics(QObject *parent) :
rows.push_back(StatisticsRow("", SC_COLUMNHEADERS, MT_CPAP)); rows.push_back(StatisticsRow("", SC_COLUMNHEADERS, MT_CPAP));
rows.push_back(StatisticsRow(tr("CPAP Usage"), SC_SUBHEADING, MT_CPAP)); rows.push_back(StatisticsRow(tr("CPAP Usage"), SC_SUBHEADING, MT_CPAP));
rows.push_back(StatisticsRow(tr("Average Hours per Night"), SC_HOURS, MT_CPAP)); rows.push_back(StatisticsRow(tr("Average Hours per Night"), SC_HOURS, MT_CPAP));
rows.push_back(StatisticsRow(tr("Compliance"), SC_COMPLIANCE, MT_CPAP)); rows.push_back(StatisticsRow(tr("Compliance (%1 hrs/day)"), SC_COMPLIANCE, MT_CPAP));
rows.push_back(StatisticsRow(tr("Therapy Efficacy"), SC_SUBHEADING, MT_CPAP)); rows.push_back(StatisticsRow(tr("Therapy Efficacy"), SC_SUBHEADING, MT_CPAP));
rows.push_back(StatisticsRow("AHI", SC_AHI, MT_CPAP)); rows.push_back(StatisticsRow("AHI", SC_AHI, MT_CPAP));
@ -1100,8 +1100,10 @@ QString Statistics::GenerateHTML()
if (row.calc == SC_AHI) { if (row.calc == SC_AHI) {
name = ahitxt; name = ahitxt;
} else if ((row.calc == SC_HOURS) || (row.calc == SC_COMPLIANCE)) { } else if (row.calc == SC_HOURS) {
name = row.src; name = row.src;
} else if (row.calc == SC_COMPLIANCE) {
name = QString(row.src).arg(p_profile->cpap->m_complianceHours);
} else if (row.calc == SC_COLUMNHEADERS) { } else if (row.calc == SC_COLUMNHEADERS) {
html += QString("<tr><td><b>%1</b></td>\n").arg(tr("Details")); html += QString("<tr><td><b>%1</b></td>\n").arg(tr("Details"));
for (int j=0; j < periods.size(); j++) { for (int j=0; j < periods.size(); j++) {

2
oscar/welcome.cpp
View File

@ -170,7 +170,7 @@ QString Welcome::GenerateCPAPHTML()
int hour = hours; int hour = hours;
QString timestr = tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds); QString timestr = tr("%1 hours, %2 minutes and %3 seconds").arg(hour).arg(minutes).arg(seconds);
const EventDataType compliance_min = 4.0; const EventDataType compliance_min = p_profile->cpap->m_complianceHours; // 4.0;
if (hours > compliance_min) html += tr("Your machine was on for %1.").arg(timestr)+"<br/>"; if (hours > compliance_min) html += tr("Your machine was on for %1.").arg(timestr)+"<br/>";
else html += tr("<font color = red>You only had the mask on for %1.</font>").arg(timestr)+"<br/>"; else html += tr("<font color = red>You only had the mask on for %1.</font>").arg(timestr)+"<br/>";