From: <gua...@us...> - 2012-02-05 04:48:40
|
Revision: 1727 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1727&view=rev Author: guanlisheng Date: 2012-02-05 04:48:34 +0000 (Sun, 05 Feb 2012) Log Message: ----------- acc in local Modified Paths: -------------- trunk/mmex/src/reporttransstats.cpp Modified: trunk/mmex/src/reporttransstats.cpp =================================================================== --- trunk/mmex/src/reporttransstats.cpp 2012-02-05 04:29:03 UTC (rev 1726) +++ trunk/mmex/src/reporttransstats.cpp 2012-02-05 04:48:34 UTC (rev 1727) @@ -44,6 +44,7 @@ } hb.endTableRow(); //Table + std::map<int, int> grand_total; for (int yidx = 0; yidx < 12; yidx++) { wxString monName = mmGetNiceMonthName(yidx); @@ -60,6 +61,7 @@ int numThis = 0; core_->bTransactionList_.getTransactionStats(-1, numThis, ignoreDate, dtThisBegin, dtThisEnd); hb.addTableCell(wxString::Format(wxT("%d"), numThis), true); + grand_total[y] += numThis; } hb.endTableRow(); } @@ -68,22 +70,10 @@ hb.addTableCell(_("Total")); //Grand Totals - wxDateTime prevYearEnd = wxDateTime(now); - - for (int y = 1; y <= yearsHist; y++) + for (std::map<int, int>::const_iterator it = grand_total.begin(); it != grand_total.end(); ++ it) { - prevYearEnd.SetYear(year_-y+1); - prevYearEnd.SetMonth(wxDateTime::Dec); - prevYearEnd.SetDay(31); - - wxDateTime dtEnd = prevYearEnd; - wxDateTime dtBegin = prevYearEnd.Subtract(wxDateSpan::Year()); - - int numLastYear = 0; - core_->bTransactionList_.getTransactionStats(-1, numLastYear, false, dtBegin, dtEnd); - - hb.addTableCell(wxString::Format(wxT("%d"), numLastYear), true); - } + hb.addTableCell(wxString::Format(wxT("%d"), it->second), true); + } //------------ hb.endTable(); hb.endCenter(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |