[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [skrooge] /: Addition of "Import date" on account object
From:       Stephane MANKOWSKI <null () kde ! org>
Date:       2018-05-11 16:29:58
Message-ID: E1fHAve-0001KM-HA () code ! kde ! org
[Download RAW message or body]

Git commit bf96e19c0117e8b501a7362253c44195afba34ac by Stephane MANKOWSKI.
Committed on 11/05/2018 at 16:29.
Pushed by smankowski into branch 'master'.

Addition of "Import date" on account object

M  +1    -0    CHANGELOG
M  +15   -5    skgbankmodeler/skgdocumentbank.cpp
M  +1    -0    skgbankmodeler/skgimportexportmanager.cpp

https://commits.kde.org/skrooge/bf96e19c0117e8b501a7362253c44195afba34ac

diff --git a/CHANGELOG b/CHANGELOG
index d4fa13748..0e53f5592 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 skrooge (2.14.0)
   *Correction: Change bootstrap url in templates
+  *Feature: Addition of "Import date" on account object  
   
  -- Stephane MANKOWSKI <stephane@mankowski.fr>  xxx
  
diff --git a/skgbankmodeler/skgdocumentbank.cpp b/skgbankmodeler/skgdocumentbank.cpp
index 6414b5979..b2ce0a4d1 100644
--- a/skgbankmodeler/skgdocumentbank.cpp
+++ b/skgbankmodeler/skgdocumentbank.cpp
@@ -1918,6 +1918,11 @@ QStringList SKGDocumentBank::getMigationSteps()
             << QStringLiteral("10.4")
             << QStringLiteral("ALTER TABLE account ADD COLUMN \
                f_reconciliationbalance FLOAT")
             << QStringLiteral("UPDATE account SET f_reconciliationbalance=NULL")
+            // ============ SKROOGE 2.13.0 ^^^
+            << QStringLiteral("")
+            << QStringLiteral("10.4")
+            << QStringLiteral("10.5")
+            << QStringLiteral("ALTER TABLE account ADD COLUMN d_importdate DATE")
             ;
 
     return migrationSteps;
@@ -1936,7 +1941,7 @@ SKGError SKGDocumentBank::migrate(bool& oMigrationDone)
         IFOK(err) {
             QString version = getParameter(QStringLiteral("SKG_DB_BANK_VERSION"));
             QString initialversion = version;
-            QString lastversion = QStringLiteral("10.4");
+            QString lastversion = QStringLiteral("10.5");
             if (version.isEmpty()) {
                 SKGTRACEL(10) << "Initial creation" << endl;
                 /**
@@ -2006,6 +2011,7 @@ SKGError SKGDocumentBank::migrate(bool& oMigrationDone)
                                           "t_maxamount_enabled VARCHAR(1) DEFAULT \
                'N' CHECK (t_close IN ('Y', 'N')),"
                                           "f_minamount FLOAT NOT NULL DEFAULT 0.0,"
                                           "t_minamount_enabled VARCHAR(1) DEFAULT \
'N' CHECK (t_close IN ('Y', 'N'))," +                                          \
"d_importdate DATE,"  "f_importbalance FLOAT,"
                                           "d_reconciliationdate DATE,"
                                           "f_reconciliationbalance FLOAT,"
@@ -2621,21 +2627,21 @@ SKGDocument::SKGModelTemplateList \
SKGDocumentBank::getDisplaySchemas(const QStri  def.id = QStringLiteral("default");
         def.name = i18nc("Noun, the default value of an item", "Default");
         def.icon = QStringLiteral("edit-undo");
-        def.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_TYPENLS;t_BANK_NUMBER;t_agency_number;t_number;t \
_agency_address;t_comment;f_CURRENTAMOUNT;f_QUANTITY|N;f_TODAYAMOUNT|N;f_CHECKED;f_COM \
ING_SOON;f_importbalance|N;f_reconciliationbalance|N;d_reconciliationdate|N;i_NBOPERATIONS;f_RATE|N" \
% propSchema; +        def.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_TYPENLS;t_BANK_NUMBER;t_agency_number;t_number;t \
_agency_address;t_comment;f_CURRENTAMOUNT;f_QUANTITY|N;f_TODAYAMOUNT|N;f_CHECKED;f_COM \
ING_SOON;f_importbalance|N;d_importdate|N;f_reconciliationbalance|N;d_reconciliationdate|N;i_NBOPERATIONS;f_RATE|N" \
% propSchema;  listSchema.push_back(def);
 
         SKGModelTemplate minimum;
         minimum.id = QStringLiteral("minimum");
         minimum.name = i18nc("Noun, the minimum value of an item", "Minimum");
         minimum.icon = QStringLiteral("");
-        minimum.schema = \
"t_BANK;t_close;t_bookmarked|N;t_name;t_TYPENLS|N;t_BANK_NUMBER|N;t_agency_number|N;t_ \
number|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT|N;f_QUANTITY|N;f_TODAYAMOUNT|N \
;f_CHECKED|N;f_COMING_SOON|N;f_importbalance|N;f_reconciliationbalance|N;d_reconciliationdate|N;i_NBOPERATIONS|N;f_RATE|N" \
% propSchema; +        minimum.schema = \
"t_BANK;t_close;t_bookmarked|N;t_name;t_TYPENLS|N;t_BANK_NUMBER|N;t_agency_number|N;t_ \
number|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT|N;f_QUANTITY|N;f_TODAYAMOUNT|N \
;f_CHECKED|N;f_COMING_SOON|N;f_importbalance|N;d_importdate|N;f_reconciliationbalance|N;d_reconciliationdate|N;i_NBOPERATIONS|N;f_RATE|N" \
% propSchema;  listSchema.push_back(minimum);
 
         SKGModelTemplate intermediate;
         intermediate.id = QStringLiteral("intermediate");
         intermediate.name = i18nc("Noun, an intermediate value between two \
extremums", "Intermediate");  intermediate.icon = QStringLiteral("");
-        intermediate.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_TYPENLS|N;t_BANK_NUMBER|N;t_agency_number|N;t_nu \
mber|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT;f_QUANTITY|N;f_TODAYAMOUNT|N,f_C \
HECKED;f_COMING_SOON;f_importbalance|N;f_reconciliationbalance|N;d_reconciliationdate|N;i_NBOPERATIONS|N;f_RATE|N" \
% propSchema; +        intermediate.schema = \
"t_BANK;t_close;t_bookmarked;t_name;t_TYPENLS|N;t_BANK_NUMBER|N;t_agency_number|N;t_nu \
mber|N;t_agency_address|N;t_comment|N;f_CURRENTAMOUNT;f_QUANTITY|N;f_TODAYAMOUNT|N,f_C \
HECKED;f_COMING_SOON;f_importbalance|N;d_importdate|N;f_reconciliationbalance|N;d_reconciliationdate|N;i_NBOPERATIONS|N;f_RATE|N" \
% propSchema;  listSchema.push_back(intermediate);
     } else if (iRealTable == QStringLiteral("category")) {
         SKGModelTemplate def;
@@ -2847,7 +2853,8 @@ QString SKGDocumentBank::getIconName(const QString& iString) \
const  return QStringLiteral("system-run");
     }
     if (att.endsWith(QLatin1String("t_imported")) ||
-        att.endsWith(QLatin1String("f_importbalance"))) {
+        att.endsWith(QLatin1String("f_importbalance")) ||
+        att.endsWith(QLatin1String("d_importdate"))) {
         return QStringLiteral("utilities-file-archiver");
     }
     if (att.endsWith(QLatin1String("t_refund")) ||
@@ -3250,6 +3257,9 @@ QString SKGDocumentBank::getDisplay(const QString& iString) \
const  if (output.endsWith(QLatin1String("f_reconciliationbalance"))) {
         return i18nc("Noun", "Balance reconciliation");
     }
+    if (output.endsWith(QLatin1String("d_importdate"))) {
+        return i18nc("Noun, the date of the last import", "Import date");
+    }
 
     return SKGDocument::getDisplay(iString);
 }
diff --git a/skgbankmodeler/skgimportexportmanager.cpp \
b/skgbankmodeler/skgimportexportmanager.cpp index 60d6e21d9..32c2f05d6 100644
--- a/skgbankmodeler/skgimportexportmanager.cpp
+++ b/skgbankmodeler/skgimportexportmanager.cpp
@@ -394,6 +394,7 @@ SKGError SKGImportExportManager::finalizeImportation()
                 auto act = m_AccountToCheck.at(i).first;
                 auto targetBalance = m_AccountToCheck.at(i).second;
                 err = act.setAttribute(QStringLiteral("f_importbalance"), \
SKGServices::doubleToString(targetBalance)); +                IFOKDO(err, \
act.setAttribute(QStringLiteral("d_importdate"), \
SKGServices::dateToSqlString(QDate::currentDate())));  IFOKDO(err, act.save());
 
                 auto soluces = act.getPossibleReconciliations(targetBalance, false);


[prev in list] [next in list] [prev in thread] [next in thread]