From c8c837b50fa3ecc096b451cea45962fc5bef4a92 Mon Sep 17 00:00:00 2001
From: Seeker4 <guy.oscar@moxis.com>
Date: Mon, 16 Sep 2019 11:56:40 -0700
Subject: [PATCH] Sort machines in machine list by first date of use, adjust
 footer message

---
 oscar/statistics.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/oscar/statistics.cpp b/oscar/statistics.cpp
index 2bcf02cd..afede063 100644
--- a/oscar/statistics.cpp
+++ b/oscar/statistics.cpp
@@ -707,7 +707,7 @@ QString Statistics::generateFooter(bool showinfo)
     if (showinfo) {
         html += "<hr><div align=center><font size='-1'><i>";
         QDateTime timestamp = QDateTime::currentDateTime();
-        html += tr("This report was generated on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
+        html += tr("This report was prepared on %1 by OSCAR v%2").arg(timestamp.toString(MedDateFormat + " hh:mm"))
                                                                      .arg(ReleaseStatus == "r" ? ShortVersionString : VersionString + " (" + gitRevision() + ")")
                 + "<br/>"
                 + tr("OSCAR is free open-source CPAP report software");
@@ -858,15 +858,25 @@ const QString heading_color="#ffffff";
 const QString subheading_color="#e0e0e0";
 //const int rxthresh = 5;
 
+// Sort machines by first day of use
+bool machineCompareFirstDay(Machine* left, Machine *right) {
+  return left->FirstDay() > right->FirstDay();
+}
+
+
 QString Statistics::GenerateMachineList()
 {
     QList<Machine *> cpap_machines = p_profile->GetMachines(MT_CPAP);
     QList<Machine *> oximeters = p_profile->GetMachines(MT_OXIMETER);
     QList<Machine *> mach;
 
+    std::sort(cpap_machines.begin(), cpap_machines.end(), machineCompareFirstDay);
+    std::sort(oximeters.begin(), oximeters.end(), machineCompareFirstDay);
+
     mach.append(cpap_machines);
     mach.append(oximeters);
 
+
     QString html;
     if (mach.size() > 0) {
         html += "<div align=center><br/>";