Filter button for Sudauswahl

kleiner-brauhelfer-core/kleiner-brauhelfer-core.pro

@@ -9,7 +9,7 @@ VER_MAJ = 2
 # Datenbankversion
 VER_MIN = 9
 # Patchversion
-VER_PAT = 4
+VER_PAT = 5
 
 VERSION = $$sprintf("%1.%2.%3", $$VER_MAJ, $$VER_MIN, $$VER_PAT)
 DEFINES += VER_MAJ=\"$$VER_MAJ\" VER_MIN=\"$$VER_MIN\" VER_PAT=\"$$VER_PAT\"

kleiner-brauhelfer-core/modelkategorien.cpp

@@ -6,6 +6,15 @@ ModelKategorien::ModelKategorien(Brauhelfer *bh, const QSqlDatabase &db) :
     SqlTableModel(bh, db),
     bh(bh)
 {
+    connect(this, &QAbstractItemModel::modelReset, this, &ModelKategorien::addEmpty);
+}
+
+void ModelKategorien::addEmpty()
+{
+    for (int r = 0; r < rowCount(); ++r)
+        if (data(r, ColName).toString().isEmpty())
+            return;
+    append({{ColName, ""}});
 }
 
 bool ModelKategorien::setDataExt(const QModelIndex &idx, const QVariant &value)
@@ -39,3 +48,11 @@ void ModelKategorien::defaultValues(QMap<int, QVariant> &values) const
 {
     values[ColName] = getUniqueName(index(0, ColName), values[ColName], true);
 }
+
+bool ModelKategorien::removeRows(int row, int count, const QModelIndex &parent)
+{
+    for (int r = row; r < row + count; ++r)
+        if (data(r, ColName).toString().isEmpty())
+            return false;
+    return SqlTableModel::removeRows(row, count, parent);
+}

kleiner-brauhelfer-core/modelkategorien.h

@@ -6,7 +6,7 @@
 
 class Brauhelfer;
 
-class ModelKategorien : public SqlTableModel
+class LIB_EXPORT ModelKategorien : public SqlTableModel
 {
     Q_OBJECT
 
@@ -29,6 +29,11 @@ class ModelKategorien : public SqlTableModel
     ModelKategorien(Brauhelfer* bh, const QSqlDatabase &db = QSqlDatabase());
     bool setDataExt(const QModelIndex &idx, const QVariant &value) Q_DECL_OVERRIDE;
     void defaultValues(QMap<int, QVariant> &values) const Q_DECL_OVERRIDE;
+    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
+
+private:
+
+    void addEmpty();
 
 private:
 

kleiner-brauhelfer-core/proxymodelsud.cpp

@@ -9,7 +9,8 @@ ProxyModelSud::ProxyModelSud(QObject *parent) :
     mFilterStatus(Alle),
     mMinDate(QDateTime()),
     mMaxDate(QDateTime()),
-    mFilterText(QString())
+    mFilterText(QString()),
+    mFilterKategorie(QString())
 {
 }
 
@@ -97,6 +98,20 @@ void ProxyModelSud::setFilterText(const QString& text)
     }
 }
 
+QString ProxyModelSud::filterKategorie() const
+{
+    return mFilterKategorie;
+}
+
+void ProxyModelSud::setFilterKategorie(const QString& kategorie)
+{
+    if (mFilterKategorie != kategorie)
+    {
+        mFilterKategorie = kategorie;
+        invalidateRowsFilter();
+    }
+}
+
 bool ProxyModelSud::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     QModelIndex idx;
@@ -136,6 +151,12 @@ bool ProxyModelSud::filterAcceptsRow(int source_row, const QModelIndex &source_p
         if (idx.isValid())
             accept = dateInRange(sourceModel()->data(idx).toDateTime());
     }
+    if (accept && !mFilterKategorie.isEmpty())
+    {
+        idx = sourceModel()->index(source_row, ModelSud::ColKategorie, source_parent);
+        if (idx.isValid())
+            accept = sourceModel()->data(idx).toString() == mFilterKategorie;
+    }
     if (accept && !mFilterText.isEmpty())
     {
         QRegularExpression rx(QRegularExpression::escape(mFilterText), QRegularExpression::CaseInsensitiveOption);
@@ -241,3 +262,25 @@ bool ProxyModelSud::dateInRange(const QDateTime &dt) const
 {
     return (!mMinDate.isValid() || dt >= mMinDate) && (!mMaxDate.isValid() || dt <= mMaxDate);
 }
+
+void ProxyModelSud::saveSetting(QSettings* settings)
+{
+    settings->setValue("filterSudStatus", (int)filterStatus());
+    settings->setValue("filterSudMerkliste", filterMerkliste());
+    settings->setValue("filterSudDate", filterDate());
+    settings->setValue("filterSudDateVon", filterMinimumDate().date());
+    settings->setValue("filterSudDateBis", filterMaximumDate().date());
+    settings->setValue("filterSudKategorie", filterKategorie());
+}
+
+void ProxyModelSud::loadSettings(QSettings* settings)
+{
+    setFilterStatus(static_cast<ProxyModelSud::FilterStatus>(settings->value("filterSudStatus", ProxyModelSud::Alle).toInt()));
+    setFilterMerkliste(settings->value("filterSudMerkliste", false).toBool());
+    setFilterDate(settings->value("filterSudDate", false).toBool());
+    QDate minDate = settings->value("filterSudDateVon", QDate::currentDate().addYears(-1)).toDate();
+    QDate maxDate = settings->value("filterSudDateBis", QDate::currentDate()).toDate();
+    setFilterMinimumDate(QDateTime(minDate, QTime(1,0,0)));
+    setFilterMaximumDate(QDateTime(maxDate, QTime(23,59,59)));
+    setFilterKategorie(settings->value("filterSudKategorie", "").toString());
+}

kleiner-brauhelfer-core/proxymodelsud.h

@@ -5,6 +5,7 @@
 #include "proxymodel.h"
 #include <QFlag>
 #include <QDateTime>
+#include <QSettings>
 
 class LIB_EXPORT ProxyModelSud : public ProxyModel
 {
@@ -50,6 +51,12 @@ class LIB_EXPORT ProxyModelSud : public ProxyModel
     QString filterText() const;
     void setFilterText(const QString& text);
 
+    QString filterKategorie() const;
+    void setFilterKategorie(const QString& kategorie);
+
+    void saveSetting(QSettings* settings);
+    void loadSettings(QSettings* settings);
+
 protected:
     bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const Q_DECL_OVERRIDE;
 
@@ -63,6 +70,7 @@ class LIB_EXPORT ProxyModelSud : public ProxyModel
     QDateTime mMinDate;
     QDateTime mMaxDate;
     QString mFilterText;
+    QString mFilterKategorie;
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(ProxyModelSud::FilterStatus)

kleiner-brauhelfer/kleiner-brauhelfer.pro

@@ -113,6 +113,7 @@ SOURCES += \
     widgets/datetimeedit.cpp \
     widgets/doublespinbox.cpp \
     widgets/doublespinboxsud.cpp \
+    widgets/filterbuttonsud.cpp \
     widgets/iconthemed.cpp \
     widgets/pushbutton.cpp \
     widgets/spinbox.cpp \
@@ -211,6 +212,7 @@ HEADERS += \
     widgets/datetimeedit.h \
     widgets/doublespinbox.h \
     widgets/doublespinboxsud.h \
+    widgets/filterbuttonsud.h \
     widgets/iconthemed.h \
     widgets/pushbutton.h \
     widgets/spinbox.h \