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

Break monolithic statistics page html into separable components.

Browse Source
This commit is contained in:
Seeker4 2019-06-11 11:34:00 -07:00
parent 564d6a4784
commit a4abb7d5d6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
oscar/statistics.cpp
View File

@ -17,6 +17,13 @@
extern MainWindow *mainwin; extern MainWindow *mainwin;
// HTML components that make up Statistics page and printed report
QString htmlPageHeader = ""; // Page header
QString htmlUsage = ""; // CPAP and Oximetry
QString htmlMachineSettings = ""; // Machine (formerly Rx) changes
QString htmlMachines = ""; // Machines used in this profile
QString htmlReportFooter = ""; // Page footer
QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) { QString resizeHTMLPixmap(QPixmap &pixmap, int width, int height) {
QByteArray byteArray; QByteArray byteArray;
QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray QBuffer buffer(&byteArray); // use buffer to store pixmap into byteArray
@ -976,13 +983,14 @@ QString Statistics::GenerateHTML()
} }
// Create HTML header and <body> statement // Create HTML header and <body> statement
QString html = htmlHeader(havedata); htmlPageHeader = htmlHeader(havedata);
QString html = "";
// If we don't have any data, return HTML that says that and we are done // If we don't have any data, return HTML that says that and we are done
if (!havedata) { if (!havedata) {
html += htmlNoData(); html += htmlNoData();
html += htmlFooter(havedata); html += htmlFooter(havedata);
return html; return htmlPageHeader + html;
} }
// Find first and last days with valid CPAP data // Find first and last days with valid CPAP data
@ -1175,18 +1183,19 @@ QString Statistics::GenerateHTML()
html += "</table>"; html += "</table>";
html += "</div>"; html += "</div>";
htmlUsage = html;
html += GenerateRXChanges(); htmlMachineSettings = GenerateRXChanges();
html += GenerateMachineList(); htmlMachines = GenerateMachineList();
UpdateRecordsBox(); UpdateRecordsBox();
html += "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>"; QString htmlScript = "<script type='text/javascript' language='javascript' src='qrc:/docs/script.js'></script>";
//updateFavourites(); //updateFavourites();
html += htmlFooter(); // html += htmlFooter();
return html; return htmlPageHeader + htmlUsage + htmlMachineSettings + htmlMachines + htmlScript + htmlReportFooter;
} }
void Statistics::UpdateRecordsBox() void Statistics::UpdateRecordsBox()