From kde-commits  Wed Sep 30 20:35:55 2015
From: Stephane Mankowski <stephane () mankowski ! fr>
Date: Wed, 30 Sep 2015 20:35:55 +0000
To: kde-commits
Subject: [skrooge] /: Default categories for payees
Message-Id: <E1ZhO6V-0002mm-Qj () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=144364536421758

Git commit 2c54e79b95dad6693d963160619a25cb80844e83 by Stephane Mankowski.
Committed on 30/09/2015 at 20:35.
Pushed by smankowski into branch 'master'.

Default categories for payees
BUG:349976

M  +1    -0    CHANGELOG
M  +7    -0    plugins/import/skrooge_import_csv/skgimportplugincsv.cpp
M  +4    -0    plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
M  +8    -0    plugins/skrooge/skrooge_operation/skgoperationpluginwidget.c=
pp
M  +1    -0    plugins/skrooge/skrooge_operation/skgoperationpluginwidget.h
M  +13   -5    plugins/skrooge/skrooge_operation/skgoperationpluginwidget_p=
ref.ui
M  +27   -0    skgbankmodeler/skgdocumentbank.cpp
M  +7    -0    skgbankmodeler/skgdocumentbank.h
M  +2    -0    tests/skgbankmodelertest/skgtestimportcsv.cpp

http://commits.kde.org/skrooge/2c54e79b95dad6693d963160619a25cb80844e83

diff --git a/CHANGELOG b/CHANGELOG
index a312f20..db5d40a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 skrooge (2.2.0)  =

   *Correction bug 352674: SQLite version of the system not aligned with em=
bedded in Qt when using sqlcipher =

   *Correction bug 349961: Values in "Text" report are clickable to open co=
rresponding operations
+  *Correction bug 349976: Default categories for payees
   *Correction: Drag and drop file is now able to move a file
   *Correction: The WORD function of "Search & Replace" is no more sensible=
 of useless space
   =

diff --git a/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp b/plu=
gins/import/skrooge_import_csv/skgimportplugincsv.cpp
index 2226b3c..d4a55ee 100644
--- a/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp
+++ b/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp
@@ -612,6 +612,13 @@ SKGError SKGImportPluginCsv::importFile()
                                         SKGCategoryObject Category;
                                         err =3D SKGCategoryObject::createP=
athCategory(m_importer->getDocument(), val, Category);
                                         IFOKDO(err, currentSubOperation.se=
tCategory(Category))
+
+                                        IFOK(err && getCSVMapping().indexO=
f("payee") =3D=3D -1) {
+                                            SKGPayeeObject payeeObj;
+                                            QString p =3D m_importer->getD=
ocument()->getCategoryForPayee(val);
+                                            err =3D SKGPayeeObject::create=
Payee(m_importer->getDocument(), p, payeeObj);
+                                            IFOKDO(err, currentOperation.s=
etPayee(payeeObj))
+                                        }
                                     }
                                 } else {
                                     // A property
diff --git a/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg b=
/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
index 483f0a3..fdf51b9 100644
--- a/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
+++ b/plugins/skrooge/skrooge_operation/skgoperation_settings.kcfg
@@ -25,6 +25,10 @@
 	    <label>Compute balances</label>
 	    <default>true</default>
     </entry>
+    <entry name=3D"setCategoryForPayee" type=3D"Bool">
+	    <label>Set the most used category when the payee is modified</label>
+	    <default>false</default>
+    </entry>    =

     <entry name=3D"automaticPointInReconciliation" type=3D"Bool">
 	    <label>Automatic point operations created during reconciliation</labe=
l>
 	    <default>true</default>
diff --git a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp=
 b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp
index bedba97..10d4c1c 100644
--- a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp
+++ b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp
@@ -218,6 +218,7 @@ SKGOperationPluginWidget::SKGOperationPluginWidget(SKGD=
ocumentBank* iDocument)
     connect(ui.kTaxEdit, &SKGCalculatorEdit::textChanged, this, &SKGOperat=
ionPluginWidget::onOperationCreatorModified, Qt::QueuedConnection);
     connect(ui.kAccountEdit, static_cast<void (SKGComboBox::*)(const QStri=
ng&)>(&SKGComboBox::currentIndexChanged), this, &SKGOperationPluginWidget::=
onOperationCreatorModified, Qt::QueuedConnection);
     connect(ui.kOperationView->getShowWidget(), &SKGShow::stateChanged, th=
is, &SKGOperationPluginWidget::onFilterChanged, Qt::QueuedConnection);
+    connect(ui.kPayeeEdit->lineEdit(), &QLineEdit::returnPressed, this, &S=
KGOperationPluginWidget::onPayeeChanged, Qt::QueuedConnection);
 =

     dataModified("", 0);
     onOperationCreatorModified();
@@ -638,6 +639,13 @@ void SKGOperationPluginWidget::onOperationCreatorModif=
ied()
     }
 }
 =

+void SKGOperationPluginWidget::onPayeeChanged()
+{
+    if (skgoperation_settings::setCategoryForPayee() && ui.kCategoryEdit->=
text().isEmpty()) {
+        ui.kCategoryEdit->setText(static_cast<SKGDocumentBank*>(getDocumen=
t())->getCategoryForPayee(ui.kPayeeEdit->text()));
+    }
+}
+
 void SKGOperationPluginWidget::onUpdateOperationClicked()
 {
     SKGError err;
diff --git a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.h b=
/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.h
index 134ce4a..cc4b9ae 100644
--- a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.h
+++ b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.h
@@ -115,6 +115,7 @@ protected:
 private Q_SLOTS:
     void dataModified(const QString& iTableName, int iIdTransaction, bool =
iLightTransaction =3D false);
     void onOperationCreatorModified();
+    void onPayeeChanged();
     void onAddOperationClicked();
     void onUpdateOperationClicked();
     void onFilterChanged();
diff --git a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget_pre=
f.ui b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget_pref.ui
index c43dc60..c94b4db 100644
--- a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget_pref.ui
+++ b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget_pref.ui
@@ -196,6 +196,13 @@
     </layout>
    </item>
    <item>
+    <widget class=3D"QCheckBox" name=3D"kcfg_setCategoryForPayee">
+     <property name=3D"text">
+      <string>Set the most used category when the payee is modified</strin=
g>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class=3D"QCheckBox" name=3D"kcfg_computeBalances">
      <property name=3D"text">
       <string>Compute balances (uncheck to improve performances)</string>
@@ -425,11 +432,6 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>SKGComboBox</class>
-   <extends>KComboBox</extends>
-   <header>skgcombobox.h</header>
-  </customwidget>
-  <customwidget>
    <class>KColorButton</class>
    <extends>QPushButton</extends>
    <header>kcolorbutton.h</header>
@@ -444,12 +446,18 @@
    <extends>QLineEdit</extends>
    <header>klineedit.h</header>
   </customwidget>
+  <customwidget>
+   <class>SKGComboBox</class>
+   <extends>KComboBox</extends>
+   <header>skgcombobox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>kcfg_fontFutureColor</tabstop>
   <tabstop>kcfg_fontNotValidatedColor</tabstop>
   <tabstop>kcfg_fontSubOperationColor</tabstop>
   <tabstop>kcfg_fasteditmode</tabstop>
+  <tabstop>kcfg_setCategoryForPayee</tabstop>
   <tabstop>kcfg_computeBalances</tabstop>
   <tabstop>kcfg_automaticPointInReconciliation</tabstop>
   <tabstop>tabWidget</tabstop>
diff --git a/skgbankmodeler/skgdocumentbank.cpp b/skgbankmodeler/skgdocumen=
tbank.cpp
index 3c417b7..2022a5e 100644
--- a/skgbankmodeler/skgdocumentbank.cpp
+++ b/skgbankmodeler/skgdocumentbank.cpp
@@ -2257,6 +2257,33 @@ SKGServices::SKGUnitInfo SKGDocumentBank::getSeconda=
ryUnit()
     return output;
 }
 =

+QString SKGDocumentBank::getCategoryForPayee(const QString& iPayee)
+{
+    QString output;
+    QString key =3D "categoryForPayee-" + iPayee;
+
+    output =3D getCachedValue(key);
+    if (output.isEmpty()) {
+        QString sql =3D "SELECT COUNT(1), t_REALCATEGORY FROM (SELECT t_RE=
ALCATEGORY , d_date FROM v_suboperation_consolidated WHERE t_PAYEE=3D'" % S=
KGServices::stringToSqlString(iPayee) % "' ORDER BY d_date DESC LIMIT 50) G=
ROUP BY t_REALCATEGORY";
+
+        SKGStringListList result;
+        executeSelectSqliteOrder(sql, result);
+        int nb =3D result.count();
+        if (nb >=3D 2) {
+            int sum =3D 0;
+            for (int i =3D 1 ; i < nb; ++i) {
+                sum =3D SKGServices::stringToInt(result.at(i).at(0));
+            }
+            if (100 * SKGServices::stringToInt(result.at(1).at(0)) / sum >=
 90) {
+                output =3D result.at(1).at(1);
+                addValueInCache(key, output);
+            }
+        }
+    }
+
+    return output;
+}
+
 void SKGDocumentBank::refreshCache(const QString& iTable)
 {
     if (iTable =3D=3D "unit" || iTable.isEmpty()) {
diff --git a/skgbankmodeler/skgdocumentbank.h b/skgbankmodeler/skgdocumentb=
ank.h
index d8745da..400bbbb 100644
--- a/skgbankmodeler/skgdocumentbank.h
+++ b/skgbankmodeler/skgdocumentbank.h
@@ -106,6 +106,13 @@ public Q_SLOTS:
     virtual SKGServices::SKGUnitInfo getSecondaryUnit();
 =

     /**
+    * Get the preferred category for a payee. WARNING: This value can be n=
ot uptodated in a transaction.
+    * @param iPayee the payee
+    * @return The preferred category.
+    */
+    virtual QString getCategoryForPayee(const QString& iPayee);
+
+    /**
      * Refresh all views and indexes in the database
      * @param iForce force the refresh
      * @return an object managing the error.
diff --git a/tests/skgbankmodelertest/skgtestimportcsv.cpp b/tests/skgbankm=
odelertest/skgtestimportcsv.cpp
index b060e9d..185ff98 100644
--- a/tests/skgbankmodelertest/skgtestimportcsv.cpp
+++ b/tests/skgbankmodelertest/skgtestimportcsv.cpp
@@ -61,6 +61,8 @@ int main(int argc, char** argv)
         SKGTESTERROR("ACCOUNT.getObjectByName", SKGNamedObject::getObjectB=
yName(&document1, "v_account", "Courant steph", account), true);
         SKGTESTERROR("ACCOUNT.load", account.load(), true);
         SKGTEST("ACCOUNT:getCurrentAmount", SKGServices::doubleToString(ac=
count.getCurrentAmount()), "-935");
+        SKGTEST("document1:getCategoryForPayee", document1.getCategoryForP=
ayee("Anthony Hopkins"), "Entertain > Movie");
+        SKGTEST("document1:getCategoryForPayee", document1.getCategoryForP=
ayee("NOT FOUND"), "");
     }
 =

     {