Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[4882] trunk
|
From: <gua...@us...> - 2013-10-16 14:24:21
|
Revision: 4882
http://sourceforge.net/p/moneymanagerex/code/4882
Author: guanlisheng
Date: 2013-10-16 14:24:18 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
write short code
Modified Paths:
--------------
trunk/src/db/DB_Table.h
trunk/src/db/DB_Table_Accountlist_V1.h
trunk/src/db/DB_Table_Assets_V1.h
trunk/src/db/DB_Table_Billsdeposits_V1.h
trunk/src/db/DB_Table_Budgetsplittransactions_V1.h
trunk/src/db/DB_Table_Budgettable_V1.h
trunk/src/db/DB_Table_Budgetyear_V1.h
trunk/src/db/DB_Table_Category_V1.h
trunk/src/db/DB_Table_Checkingaccount_V1.h
trunk/src/db/DB_Table_Currencyformats_V1.h
trunk/src/db/DB_Table_Infotable_V1.h
trunk/src/db/DB_Table_Payee_V1.h
trunk/src/db/DB_Table_Setting_V1.h
trunk/src/db/DB_Table_Splittransactions_V1.h
trunk/src/db/DB_Table_Stock_V1.h
trunk/src/db/DB_Table_Subcategory_V1.h
trunk/src/reports/html_widget_top_categories.cpp
trunk/util/sqlite2cpp.py
Modified: trunk/src/db/DB_Table.h
===================================================================
--- trunk/src/db/DB_Table.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
@@ -29,10 +29,10 @@
#include "cajun/json/writer.h"
class wxString;
+enum OP { EQUAL = 0, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL, NOT_EQUAL };
template<class V>
struct DB_Column
{
- enum OP { EQUAL = 0, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL };
V v_;
OP op_;
DB_Column(const V& v, OP op = EQUAL): v_(v), op_(op)
@@ -61,10 +61,11 @@
out += Arg1::name();
switch (arg1.op_)
{
- case Arg1::GREATER: out += " > ? "; break;
- case Arg1::GREATER_OR_EQUAL: out += " >= ? "; break;
- case Arg1::LESS: out += " < ? "; break;
- case Arg1::LESS_OR_EQUAL: out += " <= ? "; break;
+ case GREATER: out += " > ? "; break;
+ case GREATER_OR_EQUAL: out += " >= ? "; break;
+ case LESS: out += " < ? "; break;
+ case LESS_OR_EQUAL: out += " <= ? "; break;
+ case NOT_EQUAL: out += " != ? "; break;
default:
out += " = ? "; break;
}
@@ -76,10 +77,11 @@
out += Arg1::name();
switch (arg1.op_)
{
- case Arg1::GREATER: out += " > ? "; break;
- case Arg1::GREATER_OR_EQUAL: out += " >= ? "; break;
- case Arg1::LESS: out += " < ? "; break;
- case Arg1::LESS_OR_EQUAL: out += " <= ? "; break;
+ case GREATER: out += " > ? "; break;
+ case GREATER_OR_EQUAL: out += " >= ? "; break;
+ case LESS: out += " < ? "; break;
+ case LESS_OR_EQUAL: out += " <= ? "; break;
+ case NOT_EQUAL: out += " != ? "; break;
default:
out += " = ? "; break;
}
Modified: trunk/src/db/DB_Table_Accountlist_V1.h
===================================================================
--- trunk/src/db/DB_Table_Accountlist_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Accountlist_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Assets_V1.h
===================================================================
--- trunk/src/db/DB_Table_Assets_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Assets_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Billsdeposits_V1.h
===================================================================
--- trunk/src/db/DB_Table_Billsdeposits_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Billsdeposits_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Budgetsplittransactions_V1.h
===================================================================
--- trunk/src/db/DB_Table_Budgetsplittransactions_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Budgetsplittransactions_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Budgettable_V1.h
===================================================================
--- trunk/src/db/DB_Table_Budgettable_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Budgettable_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Budgetyear_V1.h
===================================================================
--- trunk/src/db/DB_Table_Budgetyear_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Budgetyear_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Category_V1.h
===================================================================
--- trunk/src/db/DB_Table_Category_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Category_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Checkingaccount_V1.h
===================================================================
--- trunk/src/db/DB_Table_Checkingaccount_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Checkingaccount_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Currencyformats_V1.h
===================================================================
--- trunk/src/db/DB_Table_Currencyformats_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Currencyformats_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Infotable_V1.h
===================================================================
--- trunk/src/db/DB_Table_Infotable_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Infotable_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Payee_V1.h
===================================================================
--- trunk/src/db/DB_Table_Payee_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Payee_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Setting_V1.h
===================================================================
--- trunk/src/db/DB_Table_Setting_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Setting_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Splittransactions_V1.h
===================================================================
--- trunk/src/db/DB_Table_Splittransactions_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Splittransactions_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Stock_V1.h
===================================================================
--- trunk/src/db/DB_Table_Stock_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Stock_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/db/DB_Table_Subcategory_V1.h
===================================================================
--- trunk/src/db/DB_Table_Subcategory_V1.h 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/db/DB_Table_Subcategory_V1.h 2013-10-16 14:24:18 UTC (rev 4882)
@@ -10,7 +10,7 @@
* @brief
*
* Revision History:
- * AUTO GENERATED at 2013-10-16 21:00:32.104748.
+ * AUTO GENERATED at 2013-10-16 22:20:21.081694.
* DO NOT EDIT!
*/
//=============================================================================
Modified: trunk/src/reports/html_widget_top_categories.cpp
===================================================================
--- trunk/src/reports/html_widget_top_categories.cpp 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/src/reports/html_widget_top_categories.cpp 2013-10-16 14:24:18 UTC (rev 4882)
@@ -79,12 +79,9 @@
std::map<wxString, double> stat;
Model_Checking::Data_Set transactions = Model_Checking::instance().find(
- DB_Table_CHECKINGACCOUNT_V1::TRANSDATE(date_range->start_date().FormatISODate()
- , DB_Table_CHECKINGACCOUNT_V1::TRANSDATE::GREATER_OR_EQUAL)
- , DB_Table_CHECKINGACCOUNT_V1::TRANSDATE(date_range->end_date().FormatISODate()
- , DB_Table_CHECKINGACCOUNT_V1::TRANSDATE::LESS_OR_EQUAL));
+ DB_Table_CHECKINGACCOUNT_V1::TRANSDATE(date_range->start_date().FormatISODate(), GREATER_OR_EQUAL)
+ , DB_Table_CHECKINGACCOUNT_V1::TRANSDATE(date_range->end_date().FormatISODate(), LESS_OR_EQUAL));
- wxLogDebug("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
for (const auto &trx : transactions)
{
if (Model_Checking::status(trx) == Model_Checking::VOID_) continue; // skip
Modified: trunk/util/sqlite2cpp.py
===================================================================
--- trunk/util/sqlite2cpp.py 2013-10-16 13:29:29 UTC (rev 4881)
+++ trunk/util/sqlite2cpp.py 2013-10-16 14:24:18 UTC (rev 4882)
@@ -541,10 +541,10 @@
#include "cajun/json/writer.h"
class wxString;
+enum OP { EQUAL = 0, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL, NOT_EQUAL };
template<class V>
struct DB_Column
{
- enum OP { EQUAL = 0, GREATER, LESS, GREATER_OR_EQUAL, LESS_OR_EQUAL };
V v_;
OP op_;
DB_Column(const V& v, OP op = EQUAL): v_(v), op_(op)
@@ -573,10 +573,11 @@
out += Arg1::name();
switch (arg1.op_)
{
- case Arg1::GREATER: out += " > ? "; break;
- case Arg1::GREATER_OR_EQUAL: out += " >= ? "; break;
- case Arg1::LESS: out += " < ? "; break;
- case Arg1::LESS_OR_EQUAL: out += " <= ? "; break;
+ case GREATER: out += " > ? "; break;
+ case GREATER_OR_EQUAL: out += " >= ? "; break;
+ case LESS: out += " < ? "; break;
+ case LESS_OR_EQUAL: out += " <= ? "; break;
+ case NOT_EQUAL: out += " != ? "; break;
default:
out += " = ? "; break;
}
@@ -588,10 +589,11 @@
out += Arg1::name();
switch (arg1.op_)
{
- case Arg1::GREATER: out += " > ? "; break;
- case Arg1::GREATER_OR_EQUAL: out += " >= ? "; break;
- case Arg1::LESS: out += " < ? "; break;
- case Arg1::LESS_OR_EQUAL: out += " <= ? "; break;
+ case GREATER: out += " > ? "; break;
+ case GREATER_OR_EQUAL: out += " >= ? "; break;
+ case LESS: out += " < ? "; break;
+ case LESS_OR_EQUAL: out += " <= ? "; break;
+ case NOT_EQUAL: out += " != ? "; break;
default:
out += " = ? "; break;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|