ProxyModelSud filter date

kleiner-brauhelfer · Apr 1, 2024 · 0f9ddeb · 0f9ddeb
1 parent b4640d2
commit 0f9ddeb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 26 deletions.
diff --git a/kleiner-brauhelfer-core/proxymodelsud.cpp b/kleiner-brauhelfer-core/proxymodelsud.cpp
@@ -5,6 +5,7 @@
 ProxyModelSud::ProxyModelSud(QObject *parent) :
     ProxyModel(parent),
     mFilterMerkliste(false),
+    mFilterDate(false),
     mFilterStatus(Alle),
     mMinDate(QDateTime()),
     mMaxDate(QDateTime()),
@@ -40,6 +41,20 @@ void ProxyModelSud::setFilterStatus(FilterStatus status)
     }
 }
 
+bool ProxyModelSud::filterDate() const
+{
+    return mFilterDate;
+}
+
+void ProxyModelSud::setFilterDate(bool value)
+{
+    if (mFilterDate != value)
+    {
+        mFilterDate = value;
+        invalidate();
+    }
+}
+
 QDateTime ProxyModelSud::filterMinimumDate() const
 {
     return mMinDate;
@@ -68,13 +83,6 @@ void ProxyModelSud::setFilterMaximumDate(const QDateTime &dt)
     }
 }
 
-void ProxyModelSud::setFilterDate(const QDateTime &min, const QDateTime &max)
-{
-    mMinDate = min;
-    mMaxDate = max;
-    invalidateRowsFilter();
-}
-
 QString ProxyModelSud::filterText() const
 {
     return mFilterText;
@@ -122,7 +130,7 @@ bool ProxyModelSud::filterAcceptsRow(int source_row, const QModelIndex &source_p
             }
         }
     }
-    if (accept && (mMinDate.isValid() || mMaxDate.isValid()))
+    if (accept && mFilterDate)
     {
         idx = sourceModel()->index(source_row, ModelSud::ColBraudatum, source_parent);
         if (idx.isValid())

diff --git a/kleiner-brauhelfer-core/proxymodelsud.h b/kleiner-brauhelfer-core/proxymodelsud.h
@@ -40,13 +40,14 @@ class LIB_EXPORT ProxyModelSud : public ProxyModel
     FilterStatus filterStatus() const;
     void setFilterStatus(FilterStatus status);
 
+    bool filterDate() const;
+    void setFilterDate(bool value);
+
     QDateTime filterMinimumDate() const;
-    void setFilterMinimumDate(const QDateTime &dt = QDateTime());
+    void setFilterMinimumDate(const QDateTime &dt);
 
     QDateTime filterMaximumDate() const;
-    void setFilterMaximumDate(const QDateTime &dt = QDateTime());
-
-    void setFilterDate(const QDateTime &min = QDateTime(), const QDateTime &max = QDateTime());
+    void setFilterMaximumDate(const QDateTime &dt);
 
     QString filterText() const;
     void setFilterText(const QString& text);
@@ -59,6 +60,7 @@ class LIB_EXPORT ProxyModelSud : public ProxyModel
 
 private:
     bool mFilterMerkliste;
+    bool mFilterDate;
     FilterStatus mFilterStatus;
     QDateTime mMinDate;
     QDateTime mMaxDate;

diff --git a/kleiner-brauhelfer/dialogs/dlgbrauuebersicht.cpp b/kleiner-brauhelfer/dialogs/dlgbrauuebersicht.cpp
@@ -308,14 +308,10 @@ void DlgBrauUebersicht::setFilterDate()
     ProxyModelSud *model = static_cast<ProxyModelSud*>(ui->tableView->model());
     if (notAll)
     {
-        QDateTime min = QDateTime(ui->tbDatumVon->date(), QTime(0,0,0));
-        QDateTime max = QDateTime(ui->tbDatumBis->date(), QTime(23,59,59));
-        model->setFilterDate(min, max);
-    }
-    else
-    {
-        model->setFilterDate();
+        model->setFilterMinimumDate(QDateTime(ui->tbDatumVon->date(), QTime(0,0,0)));
+        model->setFilterMaximumDate(QDateTime(ui->tbDatumBis->date(), QTime(23,59,59)));
     }
+    model->setFilterDate(notAll);
     ui->tbDatumVon->setEnabled(notAll);
     ui->tbDatumBis->setEnabled(notAll);
     updateDiagram();

diff --git a/kleiner-brauhelfer/tabsudauswahl.cpp b/kleiner-brauhelfer/tabsudauswahl.cpp
@@ -263,14 +263,10 @@ void TabSudAuswahl::setFilterDate()
     ProxyModelSud *model = static_cast<ProxyModelSud*>(ui->tableSudauswahl->model());
     if (notAll)
     {
-        QDateTime min = QDateTime(ui->tbDatumVon->date(), QTime(0,0,0));
-        QDateTime max = QDateTime(ui->tbDatumBis->date(), QTime(23,59,59));
-        model->setFilterDate(min, max);
-    }
-    else
-    {
-        model->setFilterDate();
+        model->setFilterMinimumDate(QDateTime(ui->tbDatumVon->date(), QTime(0,0,0)));
+        model->setFilterMaximumDate(QDateTime(ui->tbDatumBis->date(), QTime(23,59,59)));
     }
+    model->setFilterDate(notAll);
     ui->tbDatumVon->setEnabled(notAll);
     ui->tbDatumBis->setEnabled(notAll);
 }