Menu
▾
▴
Re: [Moneymanagerex-commits] SF.net SVN: moneymanagerex:[4281] trunk
|
From: Lisheng G. <gua...@gm...> - 2013-07-06 09:10:55
|
Seems you forgot to use svn mv or svn copy again. The change history of mmhomepagepanel is lost! Lisheng ---------- Forwarded message ---------- From: <vo...@us...> Date: 2013/7/6 Subject: [Moneymanagerex-commits] SF.net SVN: moneymanagerex:[4281] trunk To: mon...@li... Revision: 4281 http://sourceforge.net/p/moneymanagerex/code/4281 Author: vomikan Date: 2013-07-06 07:42:12 +0000 (Sat, 06 Jul 2013) Log Message: ----------- Home Page Panel moved back Modified Paths: -------------- trunk/build/bakefiles/common.bkl trunk/build/msw/makefile.gcc trunk/build/msw/makefile.vc trunk/build/msw/tests/makefile.gcc trunk/build/msw/tests/makefile.vc trunk/src/mmex.cpp trunk/src/tests/Makefile.in Added Paths: ----------- trunk/src/mmhomepagepanel.cpp trunk/src/mmhomepagepanel.h Removed Paths: ------------- trunk/src/reports/mmhomepagepanel.cpp trunk/src/reports/mmhomepagepanel.h Modified: trunk/build/bakefiles/common.bkl =================================================================== --- trunk/build/bakefiles/common.bkl 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/build/bakefiles/common.bkl 2013-07-06 07:42:12 UTC (rev 4281) @@ -187,7 +187,7 @@ <if cond="1">/mac</if> </set> - <headers>$(fileList( [ 'src/*.h', 'src/reports/*.h', 'src/db/*.h', 'src/import_export/*.h' ] ))</headers> + <headers>$(fileList( [ 'src/*.h', 'src/reports/*.h', 'src/db/*.h', 'src/import_export/*.h', 'src/model/*.h' ] ))</headers> <sources>$(fileList( [ 'src/*.cpp', 'src/reports/*.cpp', 'src/db/*.cpp', 'src/' + PLATF_DIR + '/*.cpp', 'src/import_export/*.cpp' ] ))</sources> Modified: trunk/build/msw/makefile.gcc =================================================================== --- trunk/build/msw/makefile.gcc 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/build/msw/makefile.gcc 2013-07-06 07:42:12 UTC (rev 4281) @@ -128,6 +128,7 @@ mmex_mmex.o \ mmex_mmex_settings.o \ mmex_mmhelppanel.o \ + mmex_mmhomepagepanel.o \ mmex_mmpayee.o \ mmex_mmreportspanel.o \ mmex_mmtransaction.o \ @@ -160,7 +161,6 @@ mmex_mmgraphincexpensesmonth.o \ mmex_mmgraphpie.o \ mmex_mmgraphtopcategories.o \ - mmex_mmhomepagepanel.o \ mmex_payee.o \ mmex_summary.o \ mmex_summaryassets.o \ @@ -606,6 +606,9 @@ mmex_mmhelppanel.o: ../../src/mmhelppanel.cpp $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $< +mmex_mmhomepagepanel.o: ../../src/mmhomepagepanel.cpp + $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $< + mmex_mmpayee.o: ../../src/mmpayee.cpp $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $< @@ -702,9 +705,6 @@ mmex_mmgraphtopcategories.o: ../../src/reports/mmgraphtopcategories.cpp $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $< -mmex_mmhomepagepanel.o: ../../src/reports/mmhomepagepanel.cpp - $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $< - mmex_payee.o: ../../src/reports/payee.cpp $(CXX) -c -o $@ $(MMEX_CXXFLAGS) $(CPPDEPS) $< Modified: trunk/build/msw/makefile.vc =================================================================== --- trunk/build/msw/makefile.vc 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/build/msw/makefile.vc 2013-07-06 07:42:12 UTC (rev 4281) @@ -129,6 +129,7 @@ mmex_mmex.obj \ mmex_mmex_settings.obj \ mmex_mmhelppanel.obj \ + mmex_mmhomepagepanel.obj \ mmex_mmpayee.obj \ mmex_mmreportspanel.obj \ mmex_mmtransaction.obj \ @@ -161,7 +162,6 @@ mmex_mmgraphincexpensesmonth.obj \ mmex_mmgraphpie.obj \ mmex_mmgraphtopcategories.obj \ - mmex_mmhomepagepanel.obj \ mmex_payee.obj \ mmex_summary.obj \ mmex_summaryassets.obj \ @@ -739,6 +739,9 @@ mmex_mmhelppanel.obj: ..\..\src\mmhelppanel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\mmhelppanel.cpp +mmex_mmhomepagepanel.obj: ..\..\src\mmhomepagepanel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\mmhomepagepanel.cpp + mmex_mmpayee.obj: ..\..\src\mmpayee.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\mmpayee.cpp @@ -835,9 +838,6 @@ mmex_mmgraphtopcategories.obj: ..\..\src\reports\mmgraphtopcategories.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\mmgraphtopcategories.cpp -mmex_mmhomepagepanel.obj: ..\..\src\reports\mmhomepagepanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\mmhomepagepanel.cpp - mmex_payee.obj: ..\..\src\reports\payee.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_CXXFLAGS) ..\..\src\reports\payee.cpp Modified: trunk/build/msw/tests/makefile.gcc =================================================================== --- trunk/build/msw/tests/makefile.gcc 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/build/msw/tests/makefile.gcc 2013-07-06 07:42:12 UTC (rev 4281) @@ -127,6 +127,7 @@ mmex_tests_mmex.o \ mmex_tests_mmex_settings.o \ mmex_tests_mmhelppanel.o \ + mmex_tests_mmhomepagepanel.o \ mmex_tests_mmpayee.o \ mmex_tests_mmreportspanel.o \ mmex_tests_mmtransaction.o \ @@ -159,7 +160,6 @@ mmex_tests_mmgraphincexpensesmonth.o \ mmex_tests_mmgraphpie.o \ mmex_tests_mmgraphtopcategories.o \ - mmex_tests_mmhomepagepanel.o \ mmex_tests_payee.o \ mmex_tests_summary.o \ mmex_tests_summaryassets.o \ @@ -619,6 +619,9 @@ mmex_tests_mmhelppanel.o: ../../../src/mmhelppanel.cpp $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< +mmex_tests_mmhomepagepanel.o: ../../../src/mmhomepagepanel.cpp + $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< + mmex_tests_mmpayee.o: ../../../src/mmpayee.cpp $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< @@ -715,9 +718,6 @@ mmex_tests_mmgraphtopcategories.o: ../../../src/reports/mmgraphtopcategories.cpp $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< -mmex_tests_mmhomepagepanel.o: ../../../src/reports/mmhomepagepanel.cpp - $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< - mmex_tests_payee.o: ../../../src/reports/payee.cpp $(CXX) -c -o $@ $(MMEX_TESTS_CXXFLAGS) $(CPPDEPS) $< Modified: trunk/build/msw/tests/makefile.vc =================================================================== --- trunk/build/msw/tests/makefile.vc 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/build/msw/tests/makefile.vc 2013-07-06 07:42:12 UTC (rev 4281) @@ -129,6 +129,7 @@ mmex_tests_mmex.obj \ mmex_tests_mmex_settings.obj \ mmex_tests_mmhelppanel.obj \ + mmex_tests_mmhomepagepanel.obj \ mmex_tests_mmpayee.obj \ mmex_tests_mmreportspanel.obj \ mmex_tests_mmtransaction.obj \ @@ -161,7 +162,6 @@ mmex_tests_mmgraphincexpensesmonth.obj \ mmex_tests_mmgraphpie.obj \ mmex_tests_mmgraphtopcategories.obj \ - mmex_tests_mmhomepagepanel.obj \ mmex_tests_payee.obj \ mmex_tests_summary.obj \ mmex_tests_summaryassets.obj \ @@ -710,6 +710,9 @@ mmex_tests_mmhelppanel.obj: ..\..\..\src\mmhelppanel.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmhelppanel.cpp +mmex_tests_mmhomepagepanel.obj: ..\..\..\src\mmhomepagepanel.cpp + $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmhomepagepanel.cpp + mmex_tests_mmpayee.obj: ..\..\..\src\mmpayee.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\mmpayee.cpp @@ -806,9 +809,6 @@ mmex_tests_mmgraphtopcategories.obj: ..\..\..\src\reports\mmgraphtopcategories.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\reports\mmgraphtopcategories.cpp -mmex_tests_mmhomepagepanel.obj: ..\..\..\src\reports\mmhomepagepanel.cpp - $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\reports\mmhomepagepanel.cpp - mmex_tests_payee.obj: ..\..\..\src\reports\payee.cpp $(CXX) /c /nologo /TP /Fo$@ $(MMEX_TESTS_CXXFLAGS) ..\..\..\src\reports\payee.cpp Modified: trunk/src/mmex.cpp =================================================================== --- trunk/src/mmex.cpp 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/src/mmex.cpp 2013-07-06 07:42:12 UTC (rev 4281) @@ -34,6 +34,7 @@ #include "mmcheckingpanel.h" #include "mmCurrencyFormatter.h" #include "mmhelppanel.h" +#include "mmhomepagepanel.h" #include "mmreportspanel.h" #include "newacctdialog.h" #include "optionsdialog.h" @@ -52,7 +53,6 @@ #include "reports/categovertimeperf.h" #include "reports/incexpenses.h" //#include "reports/mmgraphtopcategories.h" -#include "reports/mmhomepagepanel.h" #include "reports/htmlbuilder.h" #include "reports/payee.h" #include "reports/summary.h" Copied: trunk/src/mmhomepagepanel.cpp (from rev 4279, trunk/src/reports/mmhomepagepanel.cpp) =================================================================== --- trunk/src/mmhomepagepanel.cpp (rev 0) +++ trunk/src/mmhomepagepanel.cpp 2013-07-06 07:42:12 UTC (rev 4281) @@ -0,0 +1,771 @@ +/******************************************************* + Copyright (C) 2006 Madhan Kanagavel + + 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 + ********************************************************/ + +#include "mmhomepagepanel.h" +#include "reports/html_widget_top_categories.h" +#include "mmex.h" + +#include "reports/htmlbuilder.h" +#include "billsdepositspanel.h" +#include "reports/mmgraphincexpensesmonth.h" +#include "mmCurrencyFormatter.h" +#include "db/assets.h" +#include <algorithm> + + +BEGIN_EVENT_TABLE( mmHomePagePanel, wxPanel ) +END_EVENT_TABLE() + +BEGIN_EVENT_TABLE(mmHtmlWindow, wxHtmlWindow) +END_EVENT_TABLE() + +mmHomePagePanel::mmHomePagePanel(mmGUIFrame* frame, + mmCoreDB* core, + wxWindow *parent, + wxWindowID winid, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) + : mmPanelBase(core) + , frame_(frame) +{ + //FIXME: this runs twice + Create(parent, winid, pos, size, style, name); + frame_->setHomePageActive(); + frame_->menuPrintingEnable(true); +} + +mmHomePagePanel::~mmHomePagePanel() +{ + frame_->setHomePageActive(false); + frame_->menuPrintingEnable(false); +} + +wxString mmHomePagePanel::GetHomePageText() +{ + return html_text_; +} + +bool mmHomePagePanel::Create( wxWindow *parent, + wxWindowID winid, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name ) +{ + SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); + wxPanel::Create(parent, winid, pos, size, style, name); + + CreateControls(); + GetSizer()->Fit(this); + GetSizer()->SetSizeHints(this); + + createFrames(); + + + return TRUE; +} + +void mmHomePagePanel::createFrames() +{ + if (!core_->db_.get()) return; + + if (mmIniOptions::instance().ignoreFutureTransactions_) + date_range_ = new mmCurrentMonthToDate; + else + date_range_ = new mmCurrentMonth; + vAccts_ = core_->iniSettings_->GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); + + + double tBalance = 0.0, termBalance = 0.0; + wxString acc, term ="", stocks="", assets="", grand_total="", curr="", top="", leftFrame="", rightFrame=""; + + acc = displayAccounts(tBalance); + + if ( frame_->hasActiveTermAccounts()) + { + term = displayAccounts(termBalance, ACCOUNT_TYPE_TERM); + tBalance += termBalance; + } + + if (core_->accountList_.has_stock_account()) + stocks = displayStocks(tBalance); + + leftFrame << acc << term << stocks; + leftFrame << displayAssets(tBalance); + leftFrame << displayGrandTotals(tBalance); + curr = displayCurrencies(); + leftFrame << displayCurrencies(); + + htmlWidgetTop7Categories top_trx(core_); + leftFrame += top_trx.getHTMLText(); + + //Also displays the Income vs Expenses graph. + rightFrame << displayIncomeVsExpenses(); + rightFrame << displayBillsAndDeposits(); + rightFrame << getStatWidget(); + + wxString pageHTML = prepareTemplate(leftFrame, rightFrame); + htmlWindow_->SetPage(pageHTML); + +} + +wxString mmHomePagePanel::prepareTemplate(const wxString& left, const wxString& right) +{ + mmHTMLBuilder hb; + hb.init(); + hb.startCenter(); + + hb.startTable("100%", "top"); + hb.startTableRow(); + hb.startTableCell("100%\" colspan=\"2\" valign=\"middle\" align=\"center"); + hb.addText(getCalendarWidget()); + hb.endTableCell(); + hb.endTableRow(); + + hb.startTableRow(); + hb.endTableRow(); + hb.startTableRow(); + + hb.startTableCell("50%\" valign=\"top\" align=\"center"); + + hb.addText(left); + + hb.endTableCell(); + hb.startTableCell("50%\" valign=\"top\" align=\"center"); + + hb.addText(right); + + hb.endTableCell(); + hb.endTableRow(); + hb.endTable(); + hb.end(); + return hb.getHTMLText(); +} + +wxString mmHomePagePanel::displaySummaryHeader(const wxString& summaryTitle) +{ + mmHTMLBuilder hb; + hb.startTableRow(); + hb.addTableHeaderCell(summaryTitle, false); + hb.addTableHeaderCell(_("Reconciled"), true); + hb.addTableHeaderCell(_("Balance"), true); + hb.endTableRow(); + return hb.getHTMLText(); +} + +wxString mmHomePagePanel::displaySectionTotal(const wxString& totalsTitle, double tRecBalance, double& tBalance) +{ + mmHTMLBuilder hb; + // format the totals for display + core_->currencyList_.LoadBaseCurrencySettings(); + + std::vector<double> data; + data.push_back(tRecBalance); + data.push_back(tBalance); + + hb.startTableRow(); + hb.addTotalRow(totalsTitle, 3, data); + hb.endTableRow(); + return hb.getHTMLText(); +} + +/* Accounts */ +wxString mmHomePagePanel::displayAccounts(double& tBalance, const wxString& type) +{ + bool type_is_bank = type == ACCOUNT_TYPE_BANK; + double tRecBalance = 0.0; + + mmHTMLBuilder hb; + hb.startTable("100%"); + // Only Show the account titles if we want to display Bank accounts. + if ( frame_->expandedBankAccounts() && type_is_bank) + hb.addText(displaySummaryHeader(_("Bank Account"))); + else if (frame_->expandedTermAccounts() && !type_is_bank) + hb.addText(displaySummaryHeader(_("Term account"))); + + // Get account balances and display accounts if we want them displayed + for (const auto& account: core_->accountList_.accounts_) + { + if (account->acctType_ != type || account->status_ == mmAccount::MMEX_Closed) continue; + + mmCurrency* pCurrencyPtr = core_->accountList_.getCurrencySharedPtr(account->id_); + wxASSERT(pCurrencyPtr); + CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); + + double bal = account->initialBalance_ + core_->bTransactionList_.getBalance(account->id_ + , mmIniOptions::instance().ignoreFutureTransactions_); + double reconciledBal = account->initialBalance_ + core_->bTransactionList_.getReconciledBalance(account->id_ + , mmIniOptions::instance().ignoreFutureTransactions_); + double rate = pCurrencyPtr->baseConv_; + tBalance += bal * rate; // actual amount in that account in the original rate + tRecBalance += reconciledBal * rate; + + // Display the individual account links if we want to display them + if ( ((type_is_bank) ? frame_->expandedBankAccounts() : frame_->expandedTermAccounts()) + || (!frame_->expandedBankAccounts() && !frame_->expandedTermAccounts()) ) + { + + // show the actual amount in that account + if (((vAccts_ == "Open" && account->status_ == mmAccount::MMEX_Open) || + (vAccts_ == "Favorites" && account->favoriteAcct_) || + (vAccts_ == VIEW_ACCOUNTS_ALL_STR)) + && ((type_is_bank) ? frame_->expandedBankAccounts() : frame_->expandedTermAccounts())) + { + hb.startTableRow(); + hb.addTableCellLink(wxString::Format("ACCT:%d", account->id_), account->name_, false, true); + hb.addMoneyCell(reconciledBal, true); + hb.addMoneyCell(bal); + hb.endTableRow(); + } + } + } + const wxString totalStr = (type_is_bank) ? _("Bank Accounts Total:") : _("Term Accounts Total:"); + hb.addText(displaySectionTotal(totalStr, tRecBalance, tBalance)); + hb.endTable(); + + return hb.getHTMLinTableWraper(); +} + +//* Stocks *// +wxString mmHomePagePanel::displayStocks(double& tBalance /*, double& tIncome, double& tExpenses */) +{ + mmHTMLBuilder hb; + double stTotalBalance = 0.0, stTotalGain = 0.0; + wxString tBalanceStr, tGainStr; + + hb.startTable("100%"); + if (frame_->expandedStockAccounts()) + { + hb.startTableRow(); + hb.addTableHeaderCell(_("Stocks"), false); + hb.addTableHeaderCell(_("Gain/Loss"), true); + hb.addTableHeaderCell(_("Total"), true); + hb.endTableRow(); + } + + static const char sql[] = + "select " + "c.BASECONVRATE, " + "st.heldat as ACCOUNTID, a.accountname as ACCOUNTNAME, " + "a.initialbal + " + "total((st.CURRENTPRICE)*st.NUMSHARES) as BALANCE, " + "total ((st.CURRENTPRICE-st.PURCHASEPRICE)*st.NUMSHARES-st.COMMISSION) as GAIN " + "from stock_v1 st " + "left join accountlist_v1 a on a.accountid=st.heldat " + "left join currencyformats_v1 c on c.currencyid=a.currencyid " + " where st.purchasedate<=date ('now','localtime') " + "and a.status='Open' " + "group by st.heldat "; + + wxSQLite3ResultSet q1 = core_->db_.get()->ExecuteQuery(sql); + while(q1.NextRow()) + { + int stockaccountId = q1.GetInt("ACCOUNTID"); + double stockBalance = q1.GetDouble("BALANCE"); + wxString stocknameStr = q1.GetString("ACCOUNTNAME"); + //double income = q1.GetDouble("INCOME"); + //double expenses = q1.GetDouble("EXPENCES"); + double baseconvrate = q1.GetDouble("BASECONVRATE"); + double stockGain = q1.GetDouble("GAIN"); + + mmCurrency* pCurrencyPtr = core_->accountList_.getCurrencySharedPtr(stockaccountId); + wxASSERT(pCurrencyPtr); + CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); + + // if Stock accounts being displayed, include income/expense totals on home page. + //tIncome += income * baseconvrate; + //tExpenses += expenses * baseconvrate; + stTotalBalance += stockBalance * baseconvrate; + stTotalGain += stockGain * baseconvrate; + //We can hide or show Stocks on Home Page + if (frame_->expandedStockAccounts()) + { + hb.startTableRow(); + ////// + //hb.addTableCell(stocknameStr, false,true); + hb.addTableCellLink(wxString::Format("STOCK:%d" + , stockaccountId), stocknameStr, false, true); + hb.addMoneyCell(stockGain, true); + hb.addMoneyCell(stockBalance, true); + hb.endTableRow(); + } + } + q1.Finalize(); + + hb.addText(displaySectionTotal(_("Stocks Total:"), stTotalGain, stTotalBalance)); + hb.endTable(); + + // Add Stock balance to Grand Total balance + tBalance += stTotalBalance; + return hb.getHTMLinTableWraper(); +} + +//* Assets *// +wxString mmHomePagePanel::displayAssets(double& tBalance) +{ + mmHTMLBuilder hb; + core_->currencyList_.LoadBaseCurrencySettings(); + TAssetList asset_list(core_->db_.get()); + + if (mmIniOptions::instance().enableAssets_) + { + hb.startTable("100%"); + hb.startTableRow(); + hb.addTableCellLink("Assets", _("Assets"), false, true); + hb.addTableCell("", true); + hb.addTableCell(asset_list.GetAssetBalanceCurrencyFormat(), true, true, true); + hb.endTableRow(); + hb.endTable(); + + } + tBalance += asset_list.GetAssetBalance(); + return hb.getHTMLinTableWraper(); +} + +//* Currencies *// +wxString mmHomePagePanel::displayCurrencies() +{ + static const char sql[] = + "select ACCOUNTID, CURRENCYNAME, BALANCE, BASECONVRATE from ( " + "select t.accountid as ACCOUNTID, c.currencyname as CURRENCYNAME, " + "total (t.BALANCE) as BALANCE, " + "c.BASECONVRATE as BASECONVRATE " + "from ( " + "select acc.accountid as ACCOUNTID, acc.INITIALBAL as BALANCE " + "from ACCOUNTLIST_V1 ACC " + "where ACC.STATUS='Open' " + "group by acc.accountid " + "union all " + "select " + "st.heldat as ACCOUNTID, " + "total((st.CURRENTPRICE)*st.NUMSHARES-st.COMMISSION) as BALANCE " + "from stock_v1 st " + "where st.purchasedate<=date ('now','localtime') " + "group by st.heldat " + "union all " + "select ca.toaccountid, total(ca.totransamount) " + "from checkingaccount_v1 ca " + "where ca.transcode ='Transfer' and ca.STATUS<>'V' and ca.transdate<=date ('now','localtime') " + "group by ca.toaccountid " + "union all " + "select ca.accountid, total(case ca.transcode when 'Deposit' then ca.transamount else -ca.transamount end) " + "from checkingaccount_v1 ca " + "where ca.STATUS<>'V' and ca.transdate<=date ('now','localtime') " + "group by ca.accountid) t " + "left join accountlist_v1 a on a.accountid=t.accountid " + "left join currencyformats_v1 c on c.currencyid=a.currencyid " + "where a.status='Open' and balance<>0 " + "group by c.currencyid) order by CURRENCYNAME "; + + wxSQLite3ResultSet q1 = core_->db_.get()->ExecuteQuery(sql); + q1 = core_->db_.get()->ExecuteQuery(sql); + + //Determine how many currencies used + int curnumber = 0; + while(q1.NextRow()) + curnumber+=1; + + mmHTMLBuilder hb; + if (curnumber > 1 ) + { + // display the currency header + hb.startTable("100%"); + hb.startTableRow(); + hb.addTableHeaderCell(_("Currency"), false); + hb.addTableHeaderCell(_("Base Rate"), true); + hb.addTableHeaderCell(_("Summary"), true); + hb.endTableRow(); + + // display the totals for each currency value + while(q1.NextRow()) + { + int accountId = q1.GetInt("ACCOUNTID"); + double currBalance = q1.GetDouble("BALANCE"); + wxString currencyStr = q1.GetString("CURRENCYNAME"); + double convRate = q1.GetDouble("BASECONVRATE"); + wxString convRateStr; + + mmCurrency* pCurrencyPtr = core_->accountList_.getCurrencySharedPtr(accountId); + wxASSERT(pCurrencyPtr); + + wxString tBalanceStr; + CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); + + hb.startTableRow(); + hb.addTableCell(currencyStr, false, false, true); + hb.addTableCell(CurrencyFormatter::float2String(convRate), true); + hb.addMoneyCell(currBalance); + hb.endTableRow(); + } + hb.endTable(); + q1.Finalize(); + } + + return hb.getHTMLinTableWraper(true); +} + +//* Income vs Expenses *// +wxString mmHomePagePanel::displayIncomeVsExpenses() +{ + bool group_by_account = true; + double tIncome = 0.0, tExpenses = 0.0; + std::map<int, std::pair<double, double> > incomeExpensesStats; + core_->bTransactionList_.getExpensesIncomeStats(incomeExpensesStats + , date_range_ + , -1 + , group_by_account + ); + core_->currencyList_.LoadBaseCurrencySettings(); + + bool show_nothing = !frame_->expandedBankAccounts() && !frame_->expandedTermAccounts(); + bool show_all = (frame_->expandedBankAccounts() && frame_->expandedTermAccounts()) || show_nothing; + bool show_bank = frame_->expandedBankAccounts(); + for (const auto& account: core_->accountList_.accounts_) + { + //if (account->status_ == mmAccount::MMEX_Closed && vAccts_ == VIEW_ACCOUNTS_OPEN_STR) continue; + //if (!account->favoriteAcct_ && vAccts_ == VIEW_ACCOUNTS_FAVORITES_STR) continue; + if (!show_all) + { + if (show_bank && account->acctType_ != ACCOUNT_TYPE_BANK) continue; + if (frame_->expandedTermAccounts() && account->acctType_ != ACCOUNT_TYPE_TERM) continue; + } + int idx = group_by_account ? (1000000 * account->id_) : 0; + tIncome += incomeExpensesStats[idx].first; + tExpenses += incomeExpensesStats[idx].second; + if (!group_by_account) break; + } + + mmHTMLBuilder hb; + + mmGraphIncExpensesMonth gg; + gg.init(tIncome, tExpenses); + gg.Generate(""); + + wxString monthHeading = date_range_->title(); + hb.startTable("100%"); + hb.addTableHeaderRow(wxString::Format(_("Income vs Expenses: %s"), monthHeading), 2); + + hb.startTableRow(); + hb.startTableCell(); + hb.addImage(gg.getOutputFileName()); + hb.endTableCell(); + + hb.startTableCell(); + + hb.startCenter(); + hb.startTable(); + hb.startTableRow(); + hb.addTableHeaderCell(_("Type")); + hb.addTableHeaderCell(_("Amount"), true); + hb.endTableRow(); + + hb.startTableRow(); + hb.addTableCell(_("Income:"), false, true); + hb.addMoneyCell(tIncome); + hb.endTableRow(); + + hb.startTableRow(); + hb.addTableCell(_("Expenses:"), false, true); + hb.addMoneyCell(tExpenses); + hb.endTableRow(); + + hb.addRowSeparator(2); + hb.startTableRow(); + hb.addTableCell(_("Difference:"), false, true, true); + hb.addMoneyCell(tIncome - tExpenses); + hb.endTableRow(); + + if (!show_all) + { + wxString accounts_type = show_bank ? _("Bank Accounts") : _("Term Accounts"); + hb.addRowSeparator(2); + hb.startTableRow(); + hb.addTableCell(_("Accounts: "), false, true, false); + hb.addTableCell(accounts_type, false, true, false); + hb.endTableRow(); + } + hb.endTable(); + hb.endCenter(); + + hb.endTableCell(); + hb.endTableRow(); + hb.endTable(); + + return hb.getHTMLinTableWraper(); +} + +//* bills & deposits *// +wxString mmHomePagePanel::displayBillsAndDeposits() +{ + mmHTMLBuilder hb; + std::vector<mmBDTransactionHolder> trans_; + wxSQLite3ResultSet q1 = core_->db_.get()->ExecuteQuery( + "select BDID, NEXTOCCURRENCEDATE, NUMOCCURRENCES, REPEATS, PAYEEID, TRANSCODE, ACCOUNTID, TOACCOUNTID, TRANSAMOUNT, TOTRANSAMOUNT from BILLSDEPOSITS_V1"); + + const wxDateTime &today = date_range_->today(); + bool visibleEntries = false; + while (q1.NextRow()) + { + mmBDTransactionHolder th; + + th.id_ = q1.GetInt("BDID"); + th.nextOccurDate_ = q1.GetDate("NEXTOCCURRENCEDATE"); + th.nextOccurStr_ = mmGetDateForDisplay(th.nextOccurDate_); + int numRepeats = q1.GetInt("NUMOCCURRENCES"); + + int repeats = q1.GetInt("REPEATS"); + // DeMultiplex the Auto Executable fields. + if (repeats >= BD_REPEATS_MULTIPLEX_BASE) // Auto Execute User Acknowlegement required + repeats -= BD_REPEATS_MULTIPLEX_BASE; + + if (repeats >= BD_REPEATS_MULTIPLEX_BASE) // Auto Execute Silent mode + repeats -= BD_REPEATS_MULTIPLEX_BASE; + + wxTimeSpan ts = th.nextOccurDate_.Subtract(today); + th.daysRemaining_ = ts.GetDays(); + int minutesRemaining_ = ts.GetMinutes(); + + if (minutesRemaining_ > 0) + th.daysRemaining_ += 1; + + th.daysRemainingStr_ = wxString::Format("%d", th.daysRemaining_) + _(" days remaining"); + + if (th.daysRemaining_ == 0) + { + if ( ((repeats > 10) && (repeats < 15)) && (numRepeats < 0) ) + th.daysRemainingStr_ = _("Inactive"); + } + + if (th.daysRemaining_ < 0) + { + th.daysRemainingStr_ = wxString::Format("%d", abs(th.daysRemaining_)) + _(" days overdue!"); + if ( ((repeats > 10) && (repeats < 15)) && (numRepeats < 0) ) + th.daysRemainingStr_ = _("Inactive"); + } + + th.payeeID_ = q1.GetInt("PAYEEID"); + th.transType_ = q1.GetString("TRANSCODE"); + th.accountID_ = q1.GetInt("ACCOUNTID"); + th.toAccountID_ = q1.GetInt("TOACCOUNTID"); + + th.amt_ = q1.GetDouble("TRANSAMOUNT"); + th.toAmt_ = q1.GetDouble("TOTRANSAMOUNT"); + + th.transAmtString_ = CurrencyFormatter::float2String(th.amt_); + //for Withdrawal amount should be negative + if (th.transType_== TRANS_TYPE_WITHDRAWAL_STR) + { + th.transAmtString_= "-" + th.transAmtString_; + th.amt_ = -th.amt_; + } + + th.transToAmtString_ = CurrencyFormatter::float2String(th.toAmt_); + + th.payeeStr_ = core_->payeeList_.GetPayeeName(th.payeeID_); + + if (th.transType_ == TRANS_TYPE_TRANSFER_STR) + { + wxString fromAccount = core_->accountList_.GetAccountName(th.accountID_); + wxString toAccount = core_->accountList_.GetAccountName(th.toAccountID_ ); + + th.payeeStr_ = toAccount; + } + + if (th.daysRemaining_ <= 14) + visibleEntries = true; + + trans_.push_back(th); + } + q1.Finalize(); + std::sort(trans_.begin(), trans_.end(), + [](const mmBDTransactionHolder& x, const mmBDTransactionHolder& y){ return x.daysRemaining_ < y.daysRemaining_; }); + + //////////////////////////////////// + if ( visibleEntries ) + { + wxString colorStr; + + hb.startTable("100%"); + hb.addTableHeaderRowLink("billsdeposits", _("Upcoming Transactions"), 3); + + std::vector<wxString> data4; + for (size_t bdidx = 0; bdidx < trans_.size(); ++bdidx) + { + data4.clear(); + wxTimeSpan ts = trans_[bdidx].nextOccurDate_.Subtract(today); + //int hoursRemaining_ = ts.GetHours(); + + if (trans_[bdidx].daysRemaining_ <= 14) + { + wxString daysRemainingStr; + colorStr = "#9999FF"; + + daysRemainingStr = trans_[bdidx].daysRemainingStr_; + if (trans_[bdidx].daysRemaining_ < 0) + colorStr = "#FF6600"; + + // Load the currency for this BD + mmCurrency* pCurrency = core_->accountList_.getCurrencySharedPtr(trans_[bdidx].accountID_); + wxASSERT(pCurrency); + if (pCurrency) + pCurrency->loadCurrencySettings(); + + hb.startTableRow(); + hb.addTableCell(trans_[bdidx].payeeStr_, false, true); + hb.addTableCell(CurrencyFormatter::float2Money(trans_[bdidx].amt_), true); + //Draw it as numeric that mean align right + hb.addTableCell(daysRemainingStr, true, false, false, colorStr); + hb.endTableRow(); + } + } + hb.endTable(); + } + return hb.getHTMLinTableWraper(true); +} + +wxString mmHomePagePanel::getCalendarWidget() +{ + const wxDateTime &today = date_range_->today(); + mmHTMLBuilder hb; + hb.startTable("100%", "left\" cellpadding=\"1\" cellspacing=\"0", "0"); + hb.startTableRow(); + hb.startTableCell(); + hb.font_settings(hb.font_size()); + hb.bold(wxGetTranslation(wxDateTime::GetEnglishMonthName(today.GetMonth()))); + hb.font_end(); + hb.endTableCell(); + hb.addTableCell(""); + wxDateTime selectedMonthDay = date_range_->start_date(); + for (int d = 1; d <= selectedMonthDay.GetLastMonthDay().GetDay(); d++) + { + selectedMonthDay.SetDay(d); + wxString sColor = "", sBgColor = ""; + if (d == today.GetDay()) sBgColor = "YELLOW"; + hb.startTableCell(wxString::Format("0\" bgcolor=\"%s", sBgColor)); + if (wxDateTime::GetWeekDayName(selectedMonthDay.GetWeekDay())=="Sunday") sColor = "#FF0000"; + else if (wxDateTime::GetWeekDayName(selectedMonthDay.GetWeekDay())=="Saturday") sColor = "#FF0000"; + hb.font_settings(hb.font_size(), sColor); + hb.addText(wxString()<<d); + hb.font_end(); + + hb.endTableCell(); + } + hb.addTableCell(wxString::Format(_("Week#%d") + , today.GetWeekOfYear()) + , false, false, true); + hb.addTableCell(wxString()<<wxDateTime::Now().GetYear(), false, false, true); + + hb.endTableRow(); + hb.endTable(); + + return hb.getHTMLinTableWraper(); +} + +wxString mmHomePagePanel::getStatWidget() +{ + mmHTMLBuilder hb; + int countFollowUp = core_->bTransactionList_.countFollowupTransactions(); + + hb.startTable("100%"); + hb.addTableHeaderRow(_("Transaction Statistics"), 2); + + if (countFollowUp > 0) + { + hb.startTableRow(); + hb.addTableCell(_("Follow Up On Transactions: ")); + hb.addTableCell(wxString::Format("%d", countFollowUp), true, true, true); + hb.endTableRow(); + } + + hb.startTableRow(); + hb.addTableCell( _("Total Transactions: ")); + hb.addTableCell(wxString::Format("%ld", core_->bTransactionList_.transactions_.size()), true, true, true); + hb.endTableRow(); + hb.endTable(); + + return hb.getHTMLinTableWraper(true); +} + +wxString mmHomePagePanel::displayGrandTotals(double& tBalance) +{ + mmHTMLBuilder hb; + // Display the grand total from all sections + wxString tBalanceStr; + core_->currencyList_.LoadBaseCurrencySettings(); + tBalanceStr = CurrencyFormatter::float2Money(tBalance); + + hb.startTable("100%"); + hb.addTotalRow(_("Grand Total:"), 2, tBalanceStr); + hb.endTable(); + + return hb.getHTMLinTableWraper(); +} + +void mmHomePagePanel::CreateControls() +{ + wxBoxSizer* itemBoxSizer2 = new wxBoxSizer(wxVERTICAL); + this->SetSizer(itemBoxSizer2); + + htmlWindow_ = new mmHtmlWindow( this, frame_, core_, + ID_PANEL_HOMEPAGE_HTMLWINDOW, + wxDefaultPosition, wxDefaultSize, + wxHW_SCROLLBAR_AUTO|wxSUNKEN_BORDER|wxHSCROLL|wxVSCROLL ); + itemBoxSizer2->Add(htmlWindow_, 1, wxGROW|wxALL, 0); +} + +void mmHtmlWindow::OnLinkClicked(const wxHtmlLinkInfo& link) +{ + wxString href = link.GetHref(); + wxString number; + bool isAcct = href.StartsWith("ACCT:", &number); + bool isStock = href.StartsWith("STOCK:", &number); + if (href == "billsdeposits") + { + frame_->setNavTreeSection(_("Repeating Transactions")); + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_BILLSDEPOSITS); + frame_->GetEventHandler()->AddPendingEvent(evt); + } + else if (href == "Assets") + { + frame_->setNavTreeSection(_("Assets")); + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_ASSETS); + frame_->GetEventHandler()->AddPendingEvent(evt); + } + else if (isAcct) + { + long id = -1; + number.ToLong(&id); + frame_->setGotoAccountID(id); + frame_->setAccountNavTreeSection(core_->accountList_.GetAccountName(id)); + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_GOTOACCOUNT); + frame_->GetEventHandler()->AddPendingEvent(evt); + } + else if (isStock) + { + long id = -1; + number.ToLong(&id); + frame_->setGotoAccountID(id); + frame_->setAccountNavTreeSection(core_->accountList_.GetAccountName(id)); + wxCommandEvent evt(wxEVT_COMMAND_MENU_SELECTED, MENU_STOCKS); + frame_->GetEventHandler()->AddPendingEvent(evt); + } +} + +//---------------------------------------------------------------------------- Copied: trunk/src/mmhomepagepanel.h (from rev 4279, trunk/src/reports/mmhomepagepanel.h) =================================================================== --- trunk/src/mmhomepagepanel.h (rev 0) +++ trunk/src/mmhomepagepanel.h 2013-07-06 07:42:12 UTC (rev 4281) @@ -0,0 +1,100 @@ +/******************************************************* + Copyright (C) 2006 Madhan Kanagavel + + 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_HOMEPAGEPANEL_H_ +#define _MM_EX_HOMEPAGEPANEL_H_ + +#include "mmpanelbase.h" +#include "constants.h" +#include "reports/mmDateRange.h" + +class mmGUIFrame; +class mmHTMLBuilder; +class mmDateRange; + +class mmHtmlWindow: public wxHtmlWindow +{ + DECLARE_NO_COPY_CLASS(mmHtmlWindow) + DECLARE_EVENT_TABLE() + +public: + mmHtmlWindow(wxWindow *parent, mmGUIFrame* frame, mmCoreDB* core, + const wxWindowID id, const wxPoint& pos, + const wxSize& size, long style) + : wxHtmlWindow(parent, id, pos, size, style), + frame_(frame), core_(core) + {} + +public: + /* required overrides for virtual style list control */ + virtual void OnLinkClicked(const wxHtmlLinkInfo& link); + +private: + mmGUIFrame* frame_; + mmCoreDB* core_; +}; + +class mmHomePagePanel : public mmPanelBase +{ + DECLARE_EVENT_TABLE() + +public: + mmHomePagePanel( mmGUIFrame* frame, + mmCoreDB* core_, + wxWindow *parent, + wxWindowID winid = wxID_ANY, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr ); + + bool Create( wxWindow *parent, wxWindowID winid, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxTAB_TRAVERSAL | wxNO_BORDER, + const wxString& name = wxPanelNameStr); + + ~mmHomePagePanel(); + + wxString GetHomePageText(); + +private: + mmGUIFrame* frame_; + mmHtmlWindow* htmlWindow_; + mmDateRange* date_range_; + void CreateControls(); + void createFrames(); + wxString prepareTemplate(const wxString& left, const wxString& right); + wxString html_text_; + wxString vAccts_; + + wxString displaySummaryHeader(const wxString& summaryTitle ); + wxString displaySectionTotal(const wxString& totalsTitle, double tRecBalance, double& tBalance); + + wxString displayAccounts(double& tBalance, const wxString& type = ACCOUNT_TYPE_BANK); + wxString displayStocks(double& tBalance /*, double& tIncome, double& tExpenses */); + wxString displayAssets(double& tBalance); + wxString displayCurrencies(); + wxString displayIncomeVsExpenses(); + wxString displayBillsAndDeposits(); + wxString getStatWidget(); + wxString getCalendarWidget(); + wxString displayGrandTotals(double& tBalance); +}; + +#endif Deleted: trunk/src/reports/mmhomepagepanel.cpp =================================================================== --- trunk/src/reports/mmhomepagepanel.cpp 2013-07-06 07:25:41 UTC (rev 4280) +++ trunk/src/reports/mmhomepagepanel.cpp 2013-07-06 07:42:12 UTC (rev 4281) @@ -1,771 +0,0 @@ -/******************************************************* - Copyright (C) 2006 Madhan Kanagavel - - 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 - ********************************************************/ - -#include "mmhomepagepanel.h" -#include "html_widget_top_categories.h" -#include "../mmex.h" - -#include "htmlbuilder.h" -#include "../billsdepositspanel.h" -#include "mmgraphincexpensesmonth.h" -#include "../mmCurrencyFormatter.h" -#include "../db/assets.h" -#include <algorithm> - - -BEGIN_EVENT_TABLE( mmHomePagePanel, wxPanel ) -END_EVENT_TABLE() - -BEGIN_EVENT_TABLE(mmHtmlWindow, wxHtmlWindow) -END_EVENT_TABLE() - -mmHomePagePanel::mmHomePagePanel(mmGUIFrame* frame, - mmCoreDB* core, - wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ) - : mmPanelBase(core) - , frame_(frame) -{ - //FIXME: this runs twice - Create(parent, winid, pos, size, style, name); - frame_->setHomePageActive(); - frame_->menuPrintingEnable(true); -} - -mmHomePagePanel::~mmHomePagePanel() -{ - frame_->setHomePageActive(false); - frame_->menuPrintingEnable(false); -} - -wxString mmHomePagePanel::GetHomePageText() -{ - return html_text_; -} - -bool mmHomePagePanel::Create( wxWindow *parent, - wxWindowID winid, - const wxPoint& pos, - const wxSize& size, - long style, - const wxString& name ) -{ - SetExtraStyle(GetExtraStyle()|wxWS_EX_BLOCK_EVENTS); - wxPanel::Create(parent, winid, pos, size, style, name); - - CreateControls(); - GetSizer()->Fit(this); - GetSizer()->SetSizeHints(this); - - createFrames(); - - - return TRUE; -} - -void mmHomePagePanel::createFrames() -{ - if (!core_->db_.get()) return; - - if (mmIniOptions::instance().ignoreFutureTransactions_) - date_range_ = new mmCurrentMonthToDate; - else - date_range_ = new mmCurrentMonth; - vAccts_ = core_->iniSettings_->GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); - - - double tBalance = 0.0, termBalance = 0.0; - wxString acc, term ="", stocks="", assets="", grand_total="", curr="", top="", leftFrame="", rightFrame=""; - - acc = displayAccounts(tBalance); - - if ( frame_->hasActiveTermAccounts()) - { - term = displayAccounts(termBalance, ACCOUNT_TYPE_TERM); - tBalance += termBalance; - } - - if (core_->accountList_.has_stock_account()) - stocks = displayStocks(tBalance); - - leftFrame << acc << term << stocks; - leftFrame << displayAssets(tBalance); - leftFrame << displayGrandTotals(tBalance); - curr = displayCurrencies(); - leftFrame << displayCurrencies(); - - htmlWidgetTop7Categories top_trx(core_); - leftFrame += top_trx.getHTMLText(); - - //Also displays the Income vs Expenses graph. - rightFrame << displayIncomeVsExpenses(); - rightFrame << displayBillsAndDeposits(); - rightFrame << getStatWidget(); - - wxString pageHTML = prepareTemplate(leftFrame, rightFrame); - htmlWindow_->SetPage(pageHTML); - -} - -wxString mmHomePagePanel::prepareTemplate(const wxString& left, const wxString& right) -{ - mmHTMLBuilder hb; - hb.init(); - hb.startCenter(); - - hb.startTable("100%", "top"); - hb.startTableRow(); - hb.startTableCell("100%\" colspan=\"2\" valign=\"middle\" align=\"center"); - hb.addText(getCalendarWidget()); - hb.endTableCell(); - hb.endTableRow(); - - hb.startTableRow(); - hb.endTableRow(); - hb.startTableRow(); - - hb.startTableCell("50%\" valign=\"top\" align=\"center"); - - hb.addText(left); - - hb.endTableCell(); - hb.startTableCell("50%\" valign=\"top\" align=\"center"); - - hb.addText(right); - - hb.endTableCell(); - hb.endTableRow(); - hb.endTable(); - hb.end(); - return hb.getHTMLText(); -} - -wxString mmHomePagePanel::displaySummaryHeader(const wxString& summaryTitle) -{ - mmHTMLBuilder hb; - hb.startTableRow(); - hb.addTableHeaderCell(summaryTitle, false); - hb.addTableHeaderCell(_("Reconciled"), true); - hb.addTableHeaderCell(_("Balance"), true); - hb.endTableRow(); - return hb.getHTMLText(); -} - -wxString mmHomePagePanel::displaySectionTotal(const wxString& totalsTitle, double tRecBalance, double& tBalance) -{ - mmHTMLBuilder hb; - // format the totals for display - core_->currencyList_.LoadBaseCurrencySettings(); - - std::vector<double> data; - data.push_back(tRecBalance); - data.push_back(tBalance); - - hb.startTableRow(); - hb.addTotalRow(totalsTitle, 3, data); - hb.endTableRow(); - return hb.getHTMLText(); -} - -/* Accounts */ -wxString mmHomePagePanel::displayAccounts(double& tBalance, const wxString& type) -{ - bool type_is_bank = type == ACCOUNT_TYPE_BANK; - double tRecBalance = 0.0; - - mmHTMLBuilder hb; - hb.startTable("100%"); - // Only Show the account titles if we want to display Bank accounts. - if ( frame_->expandedBankAccounts() && type_is_bank) - hb.addText(displaySummaryHeader(_("Bank Account"))); - else if (frame_->expandedTermAccounts() && !type_is_bank) - hb.addText(displaySummaryHeader(_("Term account"))); - - // Get account balances and display accounts if we want them displayed - for (const auto& account: core_->accountList_.accounts_) - { - if (account->acctType_ != type || account->status_ == mmAccount::MMEX_Closed) continue; - - mmCurrency* pCurrencyPtr = core_->accountList_.getCurrencySharedPtr(account->id_); - wxASSERT(pCurrencyPtr); - CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - - double bal = account->initialBalance_ + core_->bTransactionList_.getBalance(account->id_ - , mmIniOptions::instance().ignoreFutureTransactions_); - double reconciledBal = account->initialBalance_ + core_->bTransactionList_.getReconciledBalance(account->id_ - , mmIniOptions::instance().ignoreFutureTransactions_); - double rate = pCurrencyPtr->baseConv_; - tBalance += bal * rate; // actual amount in that account in the original rate - tRecBalance += reconciledBal * rate; - - // Display the individual account links if we want to display them - if ( ((type_is_bank) ? frame_->expandedBankAccounts() : frame_->expandedTermAccounts()) - || (!frame_->expandedBankAccounts() && !frame_->expandedTermAccounts()) ) - { - - // show the actual amount in that account - if (((vAccts_ == "Open" && account->status_ == mmAccount::MMEX_Open) || - (vAccts_ == "Favorites" && account->favoriteAcct_) || - (vAccts_ == VIEW_ACCOUNTS_ALL_STR)) - && ((type_is_bank) ? frame_->expandedBankAccounts() : frame_->expandedTermAccounts())) - { - hb.startTableRow(); - hb.addTableCellLink(wxString::Format("ACCT:%d", account->id_), account->name_, false, true); - hb.addMoneyCell(reconciledBal, true); - hb.addMoneyCell(bal); - hb.endTableRow(); - } - } - } - const wxString totalStr = (type_is_bank) ? _("Bank Accounts Total:") : _("Term Accounts Total:"); - hb.addText(displaySectionTotal(totalStr, tRecBalance, tBalance)); - hb.endTable(); - - return hb.getHTMLinTableWraper(); -} - -//* Stocks *// -wxString mmHomePagePanel::displayStocks(double& tBalance /*, double& tIncome, double& tExpenses */) -{ - mmHTMLBuilder hb; - double stTotalBalance = 0.0, stTotalGain = 0.0; - wxString tBalanceStr, tGainStr; - - hb.startTable("100%"); - if (frame_->expandedStockAccounts()) - { - hb.startTableRow(); - hb.addTableHeaderCell(_("Stocks"), false); - hb.addTableHeaderCell(_("Gain/Loss"), true); - hb.addTableHeaderCell(_("Total"), true); - hb.endTableRow(); - } - - static const char sql[] = - "select " - "c.BASECONVRATE, " - "st.heldat as ACCOUNTID, a.accountname as ACCOUNTNAME, " - "a.initialbal + " - "total((st.CURRENTPRICE)*st.NUMSHARES) as BALANCE, " - "total ((st.CURRENTPRICE-st.PURCHASEPRICE)*st.NUMSHARES-st.COMMISSION) as GAIN " - "from stock_v1 st " - "left join accountlist_v1 a on a.accountid=st.heldat " - "left join currencyformats_v1 c on c.currencyid=a.currencyid " - " where st.purchasedate<=date ('now','localtime') " - "and a.status='Open' " - "group by st.heldat "; - - wxSQLite3ResultSet q1 = core_->db_.get()->ExecuteQuery(sql); - while(q1.NextRow()) - { - int stockaccountId = q1.GetInt("ACCOUNTID"); - double stockBalance = q1.GetDouble("BALANCE"); - wxString stocknameStr = q1.GetString("ACCOUNTNAME"); - //double income = q1.GetDouble("INCOME"); - //double expenses = q1.GetDouble("EXPENCES"); - double baseconvrate = q1.GetDouble("BASECONVRATE"); - double stockGain = q1.GetDouble("GAIN"); - - mmCurrency* pCurrencyPtr = core_->accountList_.getCurrencySharedPtr(stockaccountId); - wxASSERT(pCurrencyPtr); - CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - - // if Stock accounts being displayed, include income/expense totals on home page. - //tIncome += income * baseconvrate; - //tExpenses += expenses * baseconvrate; - stTotalBalance += stockBalance * baseconvrate; - stTotalGain += stockGain * baseconvrate; - //We can hide or show Stocks on Home Page - if (frame_->expandedStockAccounts()) - { - hb.startTableRow(); - ////// - //hb.addTableCell(stocknameStr, false,true); - hb.addTableCellLink(wxString::Format("STOCK:%d" - , stockaccountId), stocknameStr, false, true); - hb.addMoneyCell(stockGain, true); - hb.addMoneyCell(stockBalance, true); - hb.endTableRow(); - } - } - q1.Finalize(); - - hb.addText(displaySectionTotal(_("Stocks Total:"), stTotalGain, stTotalBalance)); - hb.endTable(); - - // Add Stock balance to Grand Total balance - tBalance += stTotalBalance; - return hb.getHTMLinTableWraper(); -} - -//* Assets *// -wxString mmHomePagePanel::displayAssets(double& tBalance) -{ - mmHTMLBuilder hb; - core_->currencyList_.LoadBaseCurrencySettings(); - TAssetList asset_list(core_->db_.get()); - - if (mmIniOptions::instance().enableAssets_) - { - hb.startTable("100%"); - hb.startTableRow(); - hb.addTableCellLink("Assets", _("Assets"), false, true); - hb.addTableCell("", true); - hb.addTableCell(asset_list.GetAssetBalanceCurrencyFormat(), true, true, true); - hb.endTableRow(); - hb.endTable(); - - } - tBalance += asset_list.GetAssetBalance(); - return hb.getHTMLinTableWraper(); -} - -//* Currencies *// -wxString mmHomePagePanel::displayCurrencies() -{ - static const char sql[] = - "select ACCOUNTID, CURRENCYNAME, BALANCE, BASECONVRATE from ( " - "select t.accountid as ACCOUNTID, c.currencyname as CURRENCYNAME, " - "total (t.BALANCE) as BALANCE, " - "c.BASECONVRATE as BASECONVRATE " - "from ( " - "select acc.accountid as ACCOUNTID, acc.INITIALBAL as BALANCE " - "from ACCOUNTLIST_V1 ACC " - "where ACC.STATUS='Open' " - "group by acc.accountid " - "union all " - "select " - "st.heldat as ACCOUNTID, " - "total((st.CURRENTPRICE)*st.NUMSHARES-st.COMMISSION) as BALANCE " - "from stock_v1 st " - "where st.purchasedate<=date ('now','localtime') " - "group by st.heldat " - "union all " - "select ca.toaccountid, total(ca.totransamount) " - "from checkingaccount_v1 ca " - "where ca.transcode ='Transfer' and ca.STATUS<>'V' and ca.transdate<=date ('now','localtime') " - "group by ca.toaccountid " - "union all " - "select ca.accountid, total(case ca.transcode when 'Deposit' then ca.transamount else -ca.transamount end) " - "from checkingaccount_v1 ca " - "where ca.STATUS<>'V' and ca.transdate<=date ('now','localtime') " - "group by ca.accountid) t " - "left join accountlist_v1 a on a.accountid=t.accountid " - "left join currencyformats_v1 c on c.currencyid=a.currencyid " - "where a.status='Open' and balance<>0 " - "group by c.currencyid) order by CURRENCYNAME "; - - wxSQLite3ResultSet q1 = core_->db_.get()->ExecuteQuery(sql); - q1 = core_->db_.get()->ExecuteQuery(sql); - - //Determine how many currencies used - int curnumber = 0; - while(q1.NextRow()) - curnumber+=1; - - mmHTMLBuilder hb; - if (curnumber > 1 ) - { - // display the currency header - hb.startTable("100%"); - hb.startTableRow(); - hb.addTableHeaderCell(_("Currency"), false); - hb.addTableHeaderCell(_("Base Rate"), true); - hb.addTableHeaderCell(_("Summary"), true); - hb.endTableRow(); - - // display the totals for each currency value - while(q1.NextRow()) - { - int accountId = q1.GetInt("ACCOUNTID"); - double currBalance = q1.GetDouble("BALANCE"); - wxString currencyStr = q1.GetString("CURRENCYNAME"); - double convRate = q1.GetDouble("BASECONVRATE"); - wxString convRateStr; - - mmCurrency* pCurrencyPtr = core_->accountList_.getCurrencySharedPtr(accountId); - wxASSERT(pCurrencyPtr); - - wxString tBalanceStr; - CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - - hb.startTableRow(); - hb.addTableCell(currencyStr, false, false, true); - hb.addTableCell(CurrencyFormatter::float2String(convRate), true); - hb.addMoneyCell(currBalance); - hb.endTableRow(); - } - hb.endTable(); - q1.Finalize(); - } - - return hb.getHTMLinTableWraper(true); -} - -//* Income vs Expenses *// -wxString mmHomePagePanel::displayIncomeVsExpenses() -{ - bool group_by_account = true; - double tIncome = 0.0, tExpenses = 0.0; - std::map<int, std::pair<double, double> > incomeExpensesStats; - core_->bTransactionList_.getExpensesIncomeStats(incomeExpensesStats - , date_range_ - , -1 - , group_by_account - ); - core_->currencyList_.LoadBaseCurrencySettings(); - - bool show_nothing = !frame_->expandedBankAccounts() && !frame_->expandedTermAccounts(); - bool show_all = (frame_->expandedBankAccounts() && frame_->expandedTermAccounts()) || show_nothing; - bool show_bank = frame_->expandedBankAccounts(); - for (const auto& account: core_->accountList_.accounts_) - { - //if (account->status_ == mmAccount::MMEX_Closed && vAccts_ == VIEW_ACCOUNTS_OPEN_STR) continue; - //if (!account->favoriteAcct_ && vAccts_ == VIEW_ACCOUNTS_FAVORITES_STR) continue; - if (!show_all) - { - if (show_bank && account->acctType_ != ACCOUNT_TYPE_BANK) continue; - if (frame_->expandedTermAccounts() && account->acctType_ != ACCOUNT_TYPE_TERM) continue; - } - int idx = group_by_account ? (1000000 * account->id_) : 0; - tIncome += incomeExpensesStats[idx].first; - tExpenses += incomeExpensesStats[idx].second; - if (!group_by_account) break; - } - - mmHTMLBuilder hb; - - mmGraphIncExpensesMonth gg; - gg.init(tIncome, tExpenses); - gg.Generate(""); - - wxString monthHeading = date_range_->title(); - hb.startTable("100%"); - hb.addTableHeaderRow(wxString::Format(_("Income vs Expenses: %s"), monthHeading), 2); - - hb.startTableRow(); - hb.startTableCell(); - hb.addImage(gg.getOutputFileName()); - hb.endTableCell(); - - hb.startTableCell(); - - hb.startCenter(); - hb.startTable(); - hb.startTableRow(); - hb.addTableHeaderCell(_("Type")); - hb.addTableHeaderCell(_("Amount"), true); - hb.endTableRow(); - - hb.startTableRow(); - hb.addTableCell(_("Income:"), false, true); - hb.addMoneyCell(tIncome); - hb.endTableRow(); - - hb.startTableRow(); - hb.addTableCell(_("Expenses:"), false, true); - hb.addMoneyCell(tExpenses); - hb.endTableRow(); - - hb.addRowSeparator(2); - hb.startTableRow(); - hb.addTableCell(_("Difference:"), false, true, true); - hb.addMoneyCell(tIncome - tExpenses); - hb.endTableRow(); - - if (!show_all) - { - wxString accounts_type = show_bank ? _("Bank Accounts") : _("Term Accounts"); - hb.addRowSeparator(2); - hb.startTableRow(); - hb.addTableCell(_("Accounts: "), false, true, false); - hb.addTableCell(accounts_type, false, true, false); - hb.endTableRow(); - } - hb.endTable(); - hb.endCenter(); - - hb.endTableCell(); - hb.endTableRow(); - hb.endTable(); - - return hb.getHTMLinTableWraper(); -} - -//* bills & deposits *// -wxString mmHomePagePanel::displayBillsAndDeposits() -{ - mmHTMLBuilder hb; - std::vector<mmBDTransactionHolder> trans_; - wxSQLite3ResultSet q1 = core_->db_.get()->ExecuteQuery( - "select BDID, NEXTOCCURRENCEDATE, NUMOCCURRENCES, REPEATS, PAYEEID, TRANSCODE, ACCOUNTID, TOACCOUNTID, TRANSAMOUNT, TOTRANSAMOUNT from BILLSDEPOSITS_V1"); - - const wxDateTime &today = date_range_->today(); - bool visibleEntries = false; - while (q1.NextRow()) - { - mmBDTransactionHolder th; - - th.id_ = q1.GetInt("BDID"); - th.nextOccurDate_ = q1.GetDate("NEXTOCCURRENCEDATE"); - th.nextOccurStr_ = mmGetDateForDisplay(th.nextOccurDate_); - int numRepeats = q1.GetInt("NUMOCCURRENCES"); - - int repeats = q1.GetInt("REPEATS"); - // DeMultiplex the Auto Executable fields. - if (repeats >= BD_REPEATS_MULTIPLEX_BASE) // Auto Execute User Acknowlegement required - repeats -= BD_REPEATS_MULTIPLEX_BASE; - - if (repeats >= BD_REPEATS_MULTIPLEX_BASE) // Auto Execute Silent mode - repeats -= BD_REPEATS_MULTIPLEX_BASE; - - wxTimeSpan ts = th.nextOccurDate_.Subtract(today); - th.daysRemaining_ = ts.GetDays(); - int minutesRemaining_ = ts.GetMinutes(); - - if (minutesRemaining_ > 0) - th.daysRemaining_ += 1; - - th.daysRemainingStr_ = wxString::Format("%d", th.daysRemaining_) + _(" days remaining"); - - if (th.daysRemaining_ == 0) - { - if ( ((repeats > 10) && (repeats < 15)) && (numRepeats < 0) ) - th.daysRemainingStr_ = _("Inactive"); - } - - if (th.daysRemaining_ < 0) - { - th.daysRemainingStr_ = wxString::Format("%d", abs(th.daysRemaining_)) + _(" days overdue!"); - ... [truncated message content] |