Mercurial > hg > syntilista

changeset 174:636a24c76232

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename some classes to add a SL prefix to their names.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 20 Sep 2017 09:43:11 +0300
parents 93f6097fe40d
children d61405758cc9
files src/main.cpp src/main.h src/printing.cpp
diffstat 3 files changed, 48 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/src/main.cpp	Tue Sep 19 13:54:46 2017 +0300
+++ b/src/main.cpp	Wed Sep 20 09:43:11 2017 +0300
@@ -152,10 +152,10 @@
 }
 
 
-void PersonInfo::dump()
+void SLPersonInfo::dump()
 {
     printf(
-        "PersonInfo() #%lld '%s %s' (added=%s, updated=%s, balance %1.2f)\n#%s#\n",
+        "SLPersonInfo() #%lld '%s %s' (added=%s, updated=%s, balance %1.2f)\n#%s#\n",
         id,
         firstName.toUtf8().constData(),
         lastName.toUtf8().constData(),
@@ -167,9 +167,9 @@
 
 
 //
-// Get PersonInfo record from SQL query object
+// Get SLPersonInfo record from SQL query object
 //
-void slGetPersonInfoRec(QSqlQuery &query, PersonInfo &info)
+void slGetPersonInfoRec(QSqlQuery &query, SLPersonInfo &info)
 {
     info.id         = query.value(0).toInt();
     info.firstName  = query.value(1).toString();
@@ -182,9 +182,9 @@
 
 
 //
-// Get PersonInfo record from SQL database for specified person ID #
+// Get SLPersonInfo record from SQL database for specified person ID #
 //
-bool slGetPersonInfo(qint64 id, PersonInfo &info)
+bool slGetPersonInfo(qint64 id, SLPersonInfo &info)
 {
     QSqlQuery query;
     query.prepare(
@@ -393,7 +393,7 @@
     peopleSortOrder = Qt::AscendingOrder;
     peopleFilter = "";
 
-    model_People = new PersonSQLModel();
+    model_People = new SLPersonSQLModel();
     updatePersonList();
 
     ui->tableview_People->setModel(model_People);
@@ -418,7 +418,7 @@
 
     ui->tableview_People->horizontalHeader()->setSortIndicator(1, Qt::AscendingOrder);
 
-    model_Latest = new TransactionSQLModel();
+    model_Latest = new SLTransactionSQLModel();
     ui->tableview_Latest->setModel(model_Latest);
     ui->tableview_Latest->setItemDelegate(new QSqlRelationalDelegate(ui->tableview_Latest));
     ui->tableview_Latest->verticalHeader()->setVisible(false);
@@ -809,7 +809,7 @@
         return;
     }
 
-    PersonInfo info;
+    SLPersonInfo info;
     if (!slGetPersonInfo(currPerson.id, info))
     {
         statusMsg(tr("Virhe! Ei henkilöä ID:llä #%1").arg(currPerson.id));
@@ -1011,9 +1011,9 @@
     if (slCheckAndReportSQLError("updateMiscValues() get total balance query", query.lastError()) &&
         query.next())
     {
-        double balance = query.value(0).toDouble();;
-        ui->label_TotalBalanceValue->setText(slMoneyValueToStr(balance));
-        ui->label_TotalBalanceValue->setStyleSheet(balance < 0 ? "color: red;" : "color: green;");
+        totalBalance = query.value(0).toDouble();;
+        ui->label_TotalBalanceValue->setText(slMoneyValueToStr(totalBalance));
+        ui->label_TotalBalanceValue->setStyleSheet(totalBalance < 0 ? "color: red;" : "color: green;");
     }
 
     // Update number of people
@@ -1023,6 +1023,7 @@
     if (slCheckAndReportSQLError("updateMiscValues() get people count", query.lastError()) &&
         query.next())
     {
+        totalPeople = query.value(0).toInt();
         ui->label_NumPeopleValue->setText(query.value(0).toString());
     }
 }
@@ -1041,7 +1042,7 @@
 //
 // Add one transaction to given person id
 //
-int SyntilistaMainWindow::addTransaction(qint64 id, double value, PersonInfo &info)
+int SyntilistaMainWindow::addTransaction(qint64 id, double value, SLPersonInfo &info)
 {
     if (!slGetPersonInfo(id, info))
         return -1;
@@ -1080,7 +1081,7 @@
 
 int SyntilistaMainWindow::addTransactionGUI(qint64 id, bool debt, double value)
 {
-    PersonInfo info;
+    SLPersonInfo info;
 
     // Check if person is selected
     if (id <= 0)
@@ -1180,7 +1181,7 @@
     raise();
     setFocus();
 
-    model_Transactions = new TransactionSQLModel();
+    model_Transactions = new SLTransactionSQLModel();
     ui->tableview_Transactions->setModel(model_Transactions);
     ui->tableview_Transactions->setItemDelegate(new QSqlRelationalDelegate(ui->tableview_Transactions));
     ui->tableview_Transactions->verticalHeader()->setVisible(false);
@@ -1348,7 +1349,7 @@
 
     if (id >= 0)
     {
-        PersonInfo pinfo;
+        SLPersonInfo pinfo;
         if (!slGetPersonInfo(id, pinfo))
         {
             statusMsg(tr("Virhe! Ei henkilöä ID:llä #%1").arg(id));
@@ -1388,12 +1389,12 @@
 //
 // Custom SQL models
 //
-PersonSQLModel::PersonSQLModel(QObject *parent) : QSqlQueryModel(parent)
+SLPersonSQLModel::SLPersonSQLModel(QObject *parent) : QSqlQueryModel(parent)
 {
 }
 
 
-QVariant PersonSQLModel::data(const QModelIndex &index, int role) const
+QVariant SLPersonSQLModel::data(const QModelIndex &index, int role) const
 {
     QVariant value = QSqlQueryModel::data(index, role);
 
@@ -1422,7 +1423,7 @@
 }
 
 
-int PersonSQLModel::updatePerson(const PersonInfo &info)
+int SLPersonSQLModel::updatePerson(const SLPersonInfo &info)
 {
     QSqlQuery np;
 
@@ -1434,7 +1435,7 @@
     np.addBindValue(info.id);
     np.exec();
 
-    if (!slCheckAndReportSQLError("PersonSQLModel::updatePerson()", np.lastError()))
+    if (!slCheckAndReportSQLError("SLPersonSQLModel::updatePerson()", np.lastError()))
         return -1;
 
     QSqlDatabase::database().commit();
@@ -1443,7 +1444,7 @@
 }
 
 
-qint64 PersonSQLModel::addPerson(const PersonInfo &info)
+qint64 SLPersonSQLModel::addPerson(const SLPersonInfo &info)
 {
 //    beginInsertRows(QModelIndex(), rowCount(), rowCount());
 
@@ -1456,7 +1457,7 @@
     np.addBindValue(QDateTime::currentDateTimeUtc());
     np.exec();
 
-    if (!slCheckAndReportSQLError("PersonSQLModel::addPerson()", np.lastError()))
+    if (!slCheckAndReportSQLError("SLPersonSQLModel::addPerson()", np.lastError()))
         return -1;
 
     QSqlDatabase::database().commit();
@@ -1469,7 +1470,7 @@
 }
 
 
-int PersonSQLModel::deletePerson(qint64 id)
+int SLPersonSQLModel::deletePerson(qint64 id)
 {
     QSqlDatabase::database().transaction();
     QSqlQuery del;
@@ -1500,19 +1501,19 @@
 }
 
 
-void PersonSQLModel::updateModel()
+void SLPersonSQLModel::updateModel()
 {
     query().exec();
     emit dataChanged(index(0, 0), index(rowCount(), columnCount()));
 }
 
 
-TransactionSQLModel::TransactionSQLModel(QObject *parent) : QSqlQueryModel(parent)
+SLTransactionSQLModel::SLTransactionSQLModel(QObject *parent) : QSqlQueryModel(parent)
 {
 }
 
 
-QVariant TransactionSQLModel::data(const QModelIndex &index, int role) const
+QVariant SLTransactionSQLModel::data(const QModelIndex &index, int role) const
 {
     QVariant value = QSqlQueryModel::data(index, role);
 
@@ -1541,7 +1542,7 @@
 }
 
 
-void TransactionSQLModel::updateModel()
+void SLTransactionSQLModel::updateModel()
 {
     query().exec();
     emit dataChanged(QModelIndex(), QModelIndex());
--- a/src/main.h	Tue Sep 19 13:54:46 2017 +0300
+++ b/src/main.h	Wed Sep 20 09:43:11 2017 +0300
@@ -48,12 +48,12 @@
 //
 // Person information record
 //
-class PersonInfo : public QObject
+class SLPersonInfo : public QObject
 {
     Q_OBJECT
 
 public:
-    explicit PersonInfo()
+    explicit SLPersonInfo()
     {
         id = -1;
         firstName = "";
@@ -62,7 +62,7 @@
         balance = 0;
     }
 
-    ~PersonInfo()
+    ~SLPersonInfo()
     {
     }
 
@@ -88,39 +88,39 @@
 int slErrorMsg(QString title, QString msg);
 bool slCheckAndReportSQLError(const QString where, const QSqlError &err, bool report = false);
 
-void slGetPersonInfoRec(QSqlQuery &query, PersonInfo &info);
+void slGetPersonInfoRec(QSqlQuery &query, SLPersonInfo &info);
 
 
 //
 // Custom SQL models
 //
-class PersonSQLModel : public QSqlQueryModel
+class SLPersonSQLModel : public QSqlQueryModel
 {
     Q_OBJECT
 
 private:
 
 public:
-    PersonSQLModel(QObject *parent = 0);
+    SLPersonSQLModel(QObject *parent = 0);
 
     QVariant data(const QModelIndex &item, int role) const Q_DECL_OVERRIDE;
 
-    int  updatePerson(const PersonInfo &person);
-    qint64  addPerson(const PersonInfo &person);
+    int  updatePerson(const SLPersonInfo &person);
+    qint64  addPerson(const SLPersonInfo &person);
     int  deletePerson(qint64 id);
     void updateModel();
 };
 
 
 
-class TransactionSQLModel : public QSqlQueryModel
+class SLTransactionSQLModel : public QSqlQueryModel
 {
     Q_OBJECT
 
 private:
 
 public:
-    TransactionSQLModel(QObject *parent = 0);
+    SLTransactionSQLModel(QObject *parent = 0);
 
     QVariant data(const QModelIndex &item, int role) const Q_DECL_OVERRIDE;
 
@@ -159,7 +159,7 @@
     void readSettings();
     void saveSettings();
     void setActivePerson(qint64 id);
-    int  addTransaction(qint64 id, double value, PersonInfo &info);
+    int  addTransaction(qint64 id, double value, SLPersonInfo &info);
     int  addTransactionGUI(qint64 id, bool debt, double value);
     void updatePersonList();
     void updateMiscValues();
@@ -167,7 +167,7 @@
 
     bool printDocumentPage(const bool getPageInfo, const int page, QPainter *pt, QPrinter *printer);
 
-    PersonSQLModel *model_People;
+    SLPersonSQLModel *model_People;
 
 public slots:
     void focusDebtEdit();
@@ -218,14 +218,17 @@
     QNetworkReply *httpBackupReply;
 #endif
 
-    TransactionSQLModel *model_Latest;
-    PersonInfo currPerson;
+    SLTransactionSQLModel *model_Latest;
+    SLPersonInfo currPerson;
 
     int peopleSortIndex;
     Qt::SortOrder peopleSortOrder;
     QString peopleFilter;
 
     SLPageInfo pinfo;
+
+    int totalPeople;
+    double totalBalance;
 };
 
 
@@ -260,8 +263,8 @@
 private:
     Ui::EditPerson *ui;
 
-    PersonInfo selPerson;
-    TransactionSQLModel *model_Transactions;
+    SLPersonInfo selPerson;
+    SLTransactionSQLModel *model_Transactions;
 };
 
 
--- a/src/printing.cpp	Tue Sep 19 13:54:46 2017 +0300
+++ b/src/printing.cpp	Wed Sep 20 09:43:11 2017 +0300
@@ -152,7 +152,7 @@
     int nline = 0;
     while (query.next())
     {
-        PersonInfo info;
+        SLPersonInfo info;
         slGetPersonInfoRec(query, info);
 
         // Check for end of page