Menu
▾
▴
[Moneymanagerex-commits] SF.net SVN: moneymanagerex:[3762] trunk/mmex
|
From: <gua...@us...> - 2013-04-22 14:35:57
|
Revision: 3762
http://sourceforge.net/p/moneymanagerex/code/3762
Author: guanlisheng
Date: 2013-04-22 14:35:54 +0000 (Mon, 22 Apr 2013)
Log Message:
-----------
remove incexpesestime.h incexpesestime.cpp
Modified Paths:
--------------
trunk/mmex/Makefile.in
trunk/mmex/build/msw/makefile.gcc
trunk/mmex/build/msw/makefile.vc
trunk/mmex/build/msw/mmex_mmex.vcproj
trunk/mmex/build/msw/tests/makefile.gcc
trunk/mmex/build/msw/tests/makefile.vc
trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj
trunk/mmex/src/mmex.cpp
trunk/mmex/src/reports/incexpenses.cpp
trunk/mmex/src/reports/incexpenses.h
trunk/mmex/src/tests/Makefile.in
Removed Paths:
-------------
trunk/mmex/src/reports/incexpesestime.cpp
trunk/mmex/src/reports/incexpesestime.h
Modified: trunk/mmex/Makefile.in
===================================================================
--- trunk/mmex/Makefile.in 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/Makefile.in 2013-04-22 14:35:54 UTC (rev 3762)
@@ -157,7 +157,6 @@
mmex_categovertimeperf.o \
mmex_incexpenses.o \
mmex_incexpensesfinancialperiod.o \
- mmex_incexpesestime.o \
mmex_payee.o \
mmex_summary.o \
mmex_summaryassets.o \
@@ -600,9 +599,6 @@
mmex_incexpensesfinancialperiod.o: $(srcdir)/src/reports/incexpensesfinancialperiod.cpp
$(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/src/reports/incexpensesfinancialperiod.cpp
-mmex_incexpesestime.o: $(srcdir)/src/reports/incexpesestime.cpp
- $(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/src/reports/incexpesestime.cpp
-
mmex_payee.o: $(srcdir)/src/reports/payee.cpp
$(CXXC) -c -o $@ $(MMEX_CXXFLAGS) $(srcdir)/src/reports/payee.cpp
Modified: trunk/mmex/build/msw/makefile.gcc
===================================================================
--- trunk/mmex/build/msw/makefile.gcc 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/build/msw/makefile.gcc 2013-04-22 14:35:54 UTC (rev 3762)
@@ -143,7 +143,6 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_categovertimeperf.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpenses.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpensesfinancialperiod.o \
- gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpesestime.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_payee.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_summary.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_summaryassets.o \
@@ -721,9 +720,6 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpensesfinancialperiod.o: ../../src/reports/incexpensesfinancialperiod.cpp
$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
-gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpesestime.o: ../../src/reports/incexpesestime.cpp
- $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
-
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_payee.o: ../../src/reports/payee.cpp
$(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $<
Modified: trunk/mmex/build/msw/makefile.vc
===================================================================
--- trunk/mmex/build/msw/makefile.vc 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/build/msw/makefile.vc 2013-04-22 14:35:54 UTC (rev 3762)
@@ -148,7 +148,6 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_categovertimeperf.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpenses.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpensesfinancialperiod.obj \
- vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpesestime.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_payee.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_summary.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_summaryassets.obj \
@@ -788,9 +787,6 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpensesfinancialperiod.obj: ..\..\src\reports\incexpensesfinancialperiod.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\incexpensesfinancialperiod.cpp
-vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_incexpesestime.obj: ..\..\src\reports\incexpesestime.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\incexpesestime.cpp
-
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_payee.obj: ..\..\src\reports\payee.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\payee.cpp
Modified: trunk/mmex/build/msw/mmex_mmex.vcproj
===================================================================
--- trunk/mmex/build/msw/mmex_mmex.vcproj 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/build/msw/mmex_mmex.vcproj 2013-04-22 14:35:54 UTC (rev 3762)
@@ -2153,9 +2153,6 @@
RelativePath="..\..\src\reports\incexpensesfinancialperiod.cpp">
</File>
<File
- RelativePath="..\..\src\reports\incexpesestime.cpp">
- </File>
- <File
RelativePath="..\..\src\lua_interface.cpp">
</File>
<File
@@ -2422,9 +2419,6 @@
RelativePath="..\..\src\reports\incexpensesfinancialperiod.h">
</File>
<File
- RelativePath="..\..\src\reports\incexpesestime.h">
- </File>
- <File
RelativePath="..\..\src\lua_interface.h">
</File>
<File
Modified: trunk/mmex/build/msw/tests/makefile.gcc
===================================================================
--- trunk/mmex/build/msw/tests/makefile.gcc 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/build/msw/tests/makefile.gcc 2013-04-22 14:35:54 UTC (rev 3762)
@@ -155,7 +155,6 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_categovertimeperf.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpenses.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpensesfinancialperiod.o \
- gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpesestime.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_payee.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_summary.o \
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_summaryassets.o \
@@ -747,9 +746,6 @@
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpensesfinancialperiod.o: ../../../src/reports/incexpensesfinancialperiod.cpp
$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
-gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpesestime.o: ../../../src/reports/incexpesestime.cpp
- $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
-
gcc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_payee.o: ../../../src/reports/payee.cpp
$(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $<
Modified: trunk/mmex/build/msw/tests/makefile.vc
===================================================================
--- trunk/mmex/build/msw/tests/makefile.vc 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/build/msw/tests/makefile.vc 2013-04-22 14:35:54 UTC (rev 3762)
@@ -164,7 +164,6 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_categovertimeperf.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpenses.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpensesfinancialperiod.obj \
- vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpesestime.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_payee.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_summary.obj \
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_summaryassets.obj \
@@ -787,9 +786,6 @@
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpensesfinancialperiod.obj: ..\..\..\src\reports\incexpensesfinancialperiod.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\reports\incexpensesfinancialperiod.cpp
-vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_incexpesestime.obj: ..\..\..\src\reports\incexpesestime.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\reports\incexpesestime.cpp
-
vc-$(SHAREDBUILDPOSTFIX)-$(UNICODEBUILDPOSTFIX)$(DEBUGBUILDPOSTFIX)-$(CPU_ARCH)\mmex_tests_payee.obj: ..\..\..\src\reports\payee.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\reports\payee.cpp
Modified: trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj
===================================================================
--- trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/build/msw/tests/mmex_tests_mmex_tests.vcproj 2013-04-22 14:35:54 UTC (rev 3762)
@@ -2156,9 +2156,6 @@
RelativePath="..\..\..\src\reports\incexpensesfinancialperiod.cpp">
</File>
<File
- RelativePath="..\..\..\src\reports\incexpesestime.cpp">
- </File>
- <File
RelativePath="..\..\..\src\lua_interface.cpp">
</File>
<File
@@ -2440,9 +2437,6 @@
RelativePath="..\..\..\src\reports\incexpensesfinancialperiod.h">
</File>
<File
- RelativePath="..\..\..\src\reports\incexpesestime.h">
- </File>
- <File
RelativePath="..\..\..\src\lua_interface.h">
</File>
<File
Modified: trunk/mmex/src/mmex.cpp
===================================================================
--- trunk/mmex/src/mmex.cpp 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/src/mmex.cpp 2013-04-22 14:35:54 UTC (rev 3762)
@@ -53,7 +53,6 @@
#include "reports/categovertimeperf.h"
#include "reports/incexpenses.h"
#include "reports/incexpensesfinancialperiod.h"
-#include "reports/incexpesestime.h"
#include "reports/payee.h"
#include "reports/summary.h"
#include "reports/summaryassets.h"
@@ -1493,7 +1492,7 @@
///////////////////////////////////////////////////////////////////
wxTreeItemId incexpOverTime = navTreeCtrl_->AppendItem(reports, _("Income vs Expenses"), 4, 4);
- navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData("Income vs Expenses", new mmReportIncomeExpenses(m_core.get())));
+ navTreeCtrl_->SetItemData(incexpOverTime, new mmTreeItemData("Income vs Expenses", new mmReportIncomeExpensesAllTime(m_core.get())));
wxTreeItemId incexpOverTimeCalMonth = navTreeCtrl_->AppendItem(incexpOverTime, _("Last Calendar Month"), 4, 4);
navTreeCtrl_->SetItemData(incexpOverTimeCalMonth
Modified: trunk/mmex/src/reports/incexpenses.cpp
===================================================================
--- trunk/mmex/src/reports/incexpenses.cpp 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/src/reports/incexpenses.cpp 2013-04-22 14:35:54 UTC (rev 3762)
@@ -88,3 +88,105 @@
hb.end();
return hb.getHTMLText();
}
+
+wxString mmReportIncomeExpensesAllTime::getHTMLText()
+{
+ int year = wxDateTime::Now().GetYear();
+ core_->currencyList_.LoadBaseCurrencySettings();
+
+ wxDateTime yearBegin(1, wxDateTime::Jan, year);
+ wxDateTime yearEnd(31, wxDateTime::Dec, year);
+
+ wxString yearStr = wxString::Format(_("Income vs Expenses for Year: %d"), year);
+
+ mmHTMLBuilder hb;
+ hb.init();
+ hb.addHeader(2, yearStr );
+ hb.addDateNow();
+
+ hb.startCenter();
+
+ hb.startTable("75%");
+ hb.startTableRow();
+ hb.addTableHeaderCell(_("Year"));
+ hb.addTableHeaderCell(_("Month"));
+ hb.addTableHeaderCell(_("Income"), true);
+ hb.addTableHeaderCell(_("Expenses"), true);
+ hb.addTableHeaderCell(_("Difference"), true);
+ hb.endTableRow();
+
+ double income = 0.0;
+ double expenses = 0.0;
+ double balance = 0.0;
+
+ for (int yidx = 0; yidx < 12; yidx++)
+ {
+ wxDateTime dtBegin = wxDateTime(yearBegin).Add(wxDateSpan::Months(yidx));
+ wxDateTime dtEnd = dtBegin.GetLastMonthDay();
+
+ yearStr = wxString()<< dtBegin.GetYear();
+ wxString monName = mmGetNiceMonthName(dtBegin.GetMonth());
+
+ bool ignoreDate = false;
+ income = 0.0;
+ expenses = 0.0;
+ core_->bTransactionList_.getExpensesIncome(core_, -1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_);
+
+ wxString actualExpStr;
+ mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr);
+
+ wxString actualIncStr;
+ mmex::formatDoubleToCurrencyEdit(income, actualIncStr);
+
+ hb.startTableRow();
+ hb.addTableCell(yearStr, false, true);
+ hb.addTableCell(monName, false, true);
+
+ balance = income - expenses;
+ wxString actualBalStr;
+ mmex::formatDoubleToCurrencyEdit(balance, actualBalStr);
+
+ hb.addTableCell(actualIncStr, true, true, true);
+ hb.addTableCell(actualExpStr, true, true, true);
+ hb.addTableCell(actualBalStr, true, true, true, (balance < 0.0 ? "RED" : ""));
+
+ hb.endTableRow();
+ }
+
+ wxDateTime today = wxDateTime::Now();
+ wxDateTime prevYearEnd = wxDateTime(today);
+ prevYearEnd.SetYear(year);
+ prevYearEnd.SetMonth(wxDateTime::Dec);
+ prevYearEnd.SetDay(31);
+
+ wxDateTime dtEnd = prevYearEnd;
+ wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
+
+ expenses = 0.0;
+ income = 0.0;
+ core_->bTransactionList_.getExpensesIncome(core_, -1, expenses, income, false, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_);
+
+ wxString actualExpStr;
+ mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr);
+
+ wxString actualIncStr;
+ mmex::formatDoubleToCurrencyEdit(income, actualIncStr);
+
+ balance = income - expenses;
+ wxString actualBalStr;
+ mmex::formatDoubleToCurrencyEdit(balance, actualBalStr);
+
+ std::vector<wxString> data;
+ data.push_back(actualIncStr);
+ data.push_back(actualExpStr);
+ data.push_back(actualBalStr);
+
+ hb.addRowSeparator(5);
+ hb.addTotalRow(_("Total:"), 5, data);
+
+ hb.endTable();
+ hb.endCenter();
+ hb.end();
+
+ return hb.getHTMLText();
+}
Modified: trunk/mmex/src/reports/incexpenses.h
===================================================================
--- trunk/mmex/src/reports/incexpenses.h 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/src/reports/incexpenses.h 2013-04-22 14:35:54 UTC (rev 3762)
@@ -38,6 +38,14 @@
};
+class mmReportIncomeExpensesAllTime: public mmReportIncomeExpenses
+{
+public:
+ mmReportIncomeExpensesAllTime(mmCoreDB* core): mmReportIncomeExpenses(core, new mmAllTime())
+ {}
+ wxString getHTMLText();
+};
+
class mmReportIncomeExpensesCurrentMonth: public mmReportIncomeExpenses
{
public:
Deleted: trunk/mmex/src/reports/incexpesestime.cpp
===================================================================
--- trunk/mmex/src/reports/incexpesestime.cpp 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/src/reports/incexpesestime.cpp 2013-04-22 14:35:54 UTC (rev 3762)
@@ -1,117 +0,0 @@
-#include "incexpesestime.h"
-
-#include "../htmlbuilder.h"
-#include "../budgetingpanel.h"
-
-mmReportIncExpensesOverTime::mmReportIncExpensesOverTime(mmCoreDB* core, int year, int shift)
-: mmPrintableBase(core)
-, year_(year)
-, shift_(shift)
-{}
-
-wxString mmReportIncExpensesOverTime::getHTMLText()
-{
- core_->currencyList_.LoadBaseCurrencySettings();
-
- wxDateTime yearBegin(1, wxDateTime::Jan, year_);
- wxDateTime yearEnd(31, wxDateTime::Dec, year_);
-
- wxString yearStr = wxString::Format(_("Income vs Expenses for Year: %d"), year_);
- if (shift_ > 0)
- {
- yearStr = _("Income vs Expenses - Last 12 months");
- yearBegin.Subtract(wxDateSpan::Months(shift_));
- yearEnd.Subtract(wxDateSpan::Months(shift_));
- }
-
- mmHTMLBuilder hb;
- hb.init();
- hb.addHeader(2, yearStr );
- hb.addDateNow();
-
- hb.startCenter();
-
- hb.startTable("75%");
- hb.startTableRow();
- hb.addTableHeaderCell(_("Year"));
- hb.addTableHeaderCell(_("Month"));
- hb.addTableHeaderCell(_("Income"), true);
- hb.addTableHeaderCell(_("Expenses"), true);
- hb.addTableHeaderCell(_("Difference"), true);
- hb.endTableRow();
-
- double income = 0.0;
- double expenses = 0.0;
- double balance = 0.0;
-
- for (int yidx = 0; yidx < 12; yidx++)
- {
- wxDateTime dtBegin = wxDateTime(yearBegin).Add(wxDateSpan::Months(yidx));
- wxDateTime dtEnd = dtBegin.GetLastMonthDay();
-
- yearStr = wxString()<< dtBegin.GetYear();
- wxString monName = mmGetNiceMonthName(dtBegin.GetMonth());
-
- bool ignoreDate = false;
- income = 0.0;
- expenses = 0.0;
- core_->bTransactionList_.getExpensesIncome(core_, -1, expenses, income, ignoreDate, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_);
-
- wxString actualExpStr;
- mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr);
-
- wxString actualIncStr;
- mmex::formatDoubleToCurrencyEdit(income, actualIncStr);
-
- hb.startTableRow();
- hb.addTableCell(yearStr, false, true);
- hb.addTableCell(monName, false, true);
-
- balance = income - expenses;
- wxString actualBalStr;
- mmex::formatDoubleToCurrencyEdit(balance, actualBalStr);
-
- hb.addTableCell(actualIncStr, true, true, true);
- hb.addTableCell(actualExpStr, true, true, true);
- hb.addTableCell(actualBalStr, true, true, true, (balance < 0.0 ? "RED" : ""));
-
- hb.endTableRow();
- }
-
- wxDateTime today = wxDateTime::Now();
- wxDateTime prevYearEnd = wxDateTime(today);
- prevYearEnd.SetYear(year_);
- prevYearEnd.SetMonth(wxDateTime::Dec);
- prevYearEnd.SetDay(31);
-
- wxDateTime dtEnd = prevYearEnd;
- wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year());
-
- expenses = 0.0;
- income = 0.0;
- core_->bTransactionList_.getExpensesIncome(core_, -1, expenses, income, false, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_);
-
- wxString actualExpStr;
- mmex::formatDoubleToCurrencyEdit(expenses, actualExpStr);
-
- wxString actualIncStr;
- mmex::formatDoubleToCurrencyEdit(income, actualIncStr);
-
- balance = income - expenses;
- wxString actualBalStr;
- mmex::formatDoubleToCurrencyEdit(balance, actualBalStr);
-
- std::vector<wxString> data;
- data.push_back(actualIncStr);
- data.push_back(actualExpStr);
- data.push_back(actualBalStr);
-
- hb.addRowSeparator(5);
- hb.addTotalRow(_("Total:"), 5, data);
-
- hb.endTable();
- hb.endCenter();
- hb.end();
-
- return hb.getHTMLText();
-}
Deleted: trunk/mmex/src/reports/incexpesestime.h
===================================================================
--- trunk/mmex/src/reports/incexpesestime.h 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/src/reports/incexpesestime.h 2013-04-22 14:35:54 UTC (rev 3762)
@@ -1,36 +0,0 @@
-/*******************************************************
- Copyright (C) 2006-2012
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- ********************************************************/
-
-#ifndef _MM_EX_REPORTINCEXPENSESTIME_H_
-#define _MM_EX_REPORTINCEXPENSESTIME_H_
-
-#include "../reportbase.h"
-
-class mmReportIncExpensesOverTime : public mmPrintableBase
-{
-public:
- mmReportIncExpensesOverTime(mmCoreDB* core, int year, int shift = 0);
-
- wxString getHTMLText();
-
-private:
- int year_;
- int shift_;
-};
-
-#endif //_MM_EX_REPORTINCEXPENSESTIME_H_
Modified: trunk/mmex/src/tests/Makefile.in
===================================================================
--- trunk/mmex/src/tests/Makefile.in 2013-04-22 14:30:47 UTC (rev 3761)
+++ trunk/mmex/src/tests/Makefile.in 2013-04-22 14:35:54 UTC (rev 3762)
@@ -171,7 +171,6 @@
mmex_tests_categovertimeperf.o \
mmex_tests_incexpenses.o \
mmex_tests_incexpensesfinancialperiod.o \
- mmex_tests_incexpesestime.o \
mmex_tests_payee.o \
mmex_tests_summary.o \
mmex_tests_summaryassets.o \
@@ -622,9 +621,6 @@
mmex_tests_incexpensesfinancialperiod.o: $(srcdir)/../../src/reports/incexpensesfinancialperiod.cpp
$(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/incexpensesfinancialperiod.cpp
-mmex_tests_incexpesestime.o: $(srcdir)/../../src/reports/incexpesestime.cpp
- $(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/incexpesestime.cpp
-
mmex_tests_payee.o: $(srcdir)/../../src/reports/payee.cpp
$(CXXC) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(srcdir)/../../src/reports/payee.cpp
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|