From 47c8ece3330b630e3fddee4ba961e8057e05cc74 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Mon, 6 Jul 2020 11:51:09 -0700 Subject: [PATCH] Exclude Journal in calculating last day of Overview graph This deals with notes that may be entered for future dates and which should not affect the Overview graphs. --- oscar/SleepLib/profiles.cpp | 2 +- oscar/overview.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/oscar/SleepLib/profiles.cpp b/oscar/SleepLib/profiles.cpp index e0d855fd..d767ba9a 100644 --- a/oscar/SleepLib/profiles.cpp +++ b/oscar/SleepLib/profiles.cpp @@ -1868,7 +1868,7 @@ QDate Profile::FirstDay(MachineType mt) return m_last; } -// Lookup last day record of the specified machine type, or return the first day overall if MT_UNKNOWN +// Lookup last day record of the specified machine type, or return the last day overall if MT_UNKNOWN QDate Profile::LastDay(MachineType mt) { if ((mt == MT_UNKNOWN) || (!m_last.isValid()) || (!m_first.isValid())) { diff --git a/oscar/overview.cpp b/oscar/overview.cpp index 9dc2d8e9..af59d931 100644 --- a/oscar/overview.cpp +++ b/oscar/overview.cpp @@ -467,7 +467,11 @@ void Overview::on_rangeCombo_activated(int index) ui->dateStart->setMinimumDate(p_profile->FirstDay()); // first and last dates for ANY machine type ui->dateEnd->setMaximumDate(p_profile->LastDay()); - QDate end = p_profile->LastDay(); + // Exclude Journal in calculating the last day + QDate end = p_profile->LastDay(MT_CPAP); + end = max(end, p_profile->LastDay(MT_OXIMETER)); + end = max(end, p_profile->LastDay(MT_POSITION)); + end = max(end, p_profile->LastDay(MT_SLEEPSTAGE)); QDate start; if (index == 8) { // Custom