From 66c3026cf537ce964312b5e207dda62803da02f9 Mon Sep 17 00:00:00 2001
From: Xavier Valls <xaviervallspla@gmail.com>
Date: Sat, 22 May 2021 19:16:47 +0200
Subject: [PATCH] Add a checkbox to health report allowing to exclude expired
 entries (#6534)

* Fixes #5032
---
 src/gui/reports/ReportsWidgetHealthcheck.cpp | 4 +++-
 src/gui/reports/ReportsWidgetHealthcheck.ui  | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/gui/reports/ReportsWidgetHealthcheck.cpp b/src/gui/reports/ReportsWidgetHealthcheck.cpp
index 2f7b962c0..ad88cdc35 100644
--- a/src/gui/reports/ReportsWidgetHealthcheck.cpp
+++ b/src/gui/reports/ReportsWidgetHealthcheck.cpp
@@ -156,6 +156,7 @@ ReportsWidgetHealthcheck::ReportsWidgetHealthcheck(QWidget* parent)
     connect(m_ui->healthcheckTableView, SIGNAL(customContextMenuRequested(QPoint)), SLOT(customMenuRequested(QPoint)));
     connect(m_ui->healthcheckTableView, SIGNAL(doubleClicked(QModelIndex)), SLOT(emitEntryActivated(QModelIndex)));
     connect(m_ui->showKnownBadCheckBox, SIGNAL(stateChanged(int)), this, SLOT(calculateHealth()));
+    connect(m_ui->excludeExpired, SIGNAL(stateChanged(int)), this, SLOT(calculateHealth()));
 }
 
 ReportsWidgetHealthcheck::~ReportsWidgetHealthcheck()
@@ -263,7 +264,8 @@ void ReportsWidgetHealthcheck::calculateHealth()
     // Display the entries
     m_rowToEntry.clear();
     for (const auto& item : health->items()) {
-        if (item->exclude && !showExcluded) {
+        auto excluded = item->exclude || (item->entry->isExpired() && m_ui->excludeExpired->isChecked());
+        if (excluded && !showExcluded) {
             // Exclude this entry from the report
             continue;
         }
diff --git a/src/gui/reports/ReportsWidgetHealthcheck.ui b/src/gui/reports/ReportsWidgetHealthcheck.ui
index 72e4fc328..b9f27c4c3 100644
--- a/src/gui/reports/ReportsWidgetHealthcheck.ui
+++ b/src/gui/reports/ReportsWidgetHealthcheck.ui
@@ -51,6 +51,13 @@
      </attribute>
     </widget>
    </item>
+   <item>
+    <widget class="QCheckBox" name="excludeExpired">
+     <property name="text">
+      <string>Exclude expired entries from the report</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QCheckBox" name="showKnownBadCheckBox">
      <property name="text">