From: <gua...@us...> - 2012-02-18 15:18:32
|
Revision: 1838 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1838&view=rev Author: guanlisheng Date: 2012-02-18 15:18:26 +0000 (Sat, 18 Feb 2012) Log Message: ----------- cleanup Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2012-02-18 15:12:46 UTC (rev 1837) +++ trunk/mmex/src/mmhomepagepanel.cpp 2012-02-18 15:18:26 UTC (rev 1838) @@ -16,8 +16,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ********************************************************/ -#include <map> - #include "mmhomepagepanel.h" #include "mmex.h" #include "util.h" @@ -37,23 +35,6 @@ END_EVENT_TABLE() -namespace -{ -/* - Returns true if _Left precedes and is not equal to _Right in the sort order. -*/ -struct CurrencyCompare : public std::binary_function<boost::shared_ptr<mmCurrency>, - boost::shared_ptr<mmCurrency>, bool> -{ - bool operator() (const boost::shared_ptr<mmCurrency> &_Left, const boost::shared_ptr<mmCurrency> &_Right) const - { - return _Left->currencyName_ < _Right->currencyName_; // order by currency name - } -}; - -} // namespace - - mmHomePagePanel::mmHomePagePanel(mmGUIFrame* frame, wxSQLite3Database* db, wxSQLite3Database* inidb, @@ -139,9 +120,7 @@ { // Only Show the account titles if we want to display Bank accounts. if ( frame_->expandedBankAccounts() ) - { displaySummaryHeader(hb, _("Bank Account")); - } // Get account balances and display accounts if we want them displayed wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWACCOUNTS"), wxT("ALL")); @@ -200,9 +179,7 @@ // Only Show the account titles if Term accounts are active and we want them displayed. if ( frame_->expandedTermAccounts() ) - { displaySummaryHeader(hb, _("Term Account")); - } // Get account balances and add to totals, and display accounts if we want them displayed wxString vAccts = mmDBWrapper::getINISettingValue(inidb_, wxT("VIEWACCOUNTS"), wxT("ALL")); @@ -386,9 +363,7 @@ //Determine how many currencies used int curnumber = 0; while(q1.NextRow()) - { curnumber+=1; - } if (curnumber > 1 ) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-02-19 00:42:15
|
Revision: 1844 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1844&view=rev Author: stef145g Date: 2012-02-19 00:42:09 +0000 (Sun, 19 Feb 2012) Log Message: ----------- Swapped Balanced and Reconciled columns on Home Page Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2012-02-18 23:36:25 UTC (rev 1843) +++ trunk/mmex/src/mmhomepagepanel.cpp 2012-02-19 00:42:09 UTC (rev 1844) @@ -86,8 +86,8 @@ { hb.startTableRow(); hb.addTableHeaderCell(summaryTitle, false); + hb.addTableHeaderCell(_("Reconciled"), true); hb.addTableHeaderCell(_("Balance"), true); - hb.addTableHeaderCell(_("Reconciled"), true); hb.endTableRow(); } void mmHomePagePanel::displayStocksHeader(mmHTMLBuilder& hb, wxString summaryTitle) @@ -159,8 +159,8 @@ { hb.startTableRow(); hb.addTableCellLink(wxT("ACCT:") + wxString::Format(wxT("%d"), pCA->id_), pCA->name_, false, true); + hb.addTableCell(reconciledBalanceStr, true); hb.addTableCell(balanceStr, true); - hb.addTableCell(reconciledBalanceStr, true); hb.endTableRow(); } @@ -217,8 +217,8 @@ { hb.startTableRow(); hb.addTableCellLink(wxT("ACCT:") + wxString::Format(wxT("%d"), pTA->id_), pTA->name_, false, true); + hb.addTableCell(reconciledBalStr, true); hb.addTableCell(balanceStr, true); - hb.addTableCell(reconciledBalStr, true); hb.endTableRow(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-19 09:00:50
|
Revision: 1846 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1846&view=rev Author: vomikan Date: 2012-02-19 09:00:44 +0000 (Sun, 19 Feb 2012) Log Message: ----------- following column has changed. Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2012-02-19 03:59:34 UTC (rev 1845) +++ trunk/mmex/src/mmhomepagepanel.cpp 2012-02-19 09:00:44 UTC (rev 1846) @@ -619,7 +619,6 @@ wxSQLite3ResultSet q1 = db_->ExecuteQuery(sql3); - wxString catAmountStr; std::vector<CategInfo> categList; hb.startTable(wxT("95%")); @@ -631,25 +630,22 @@ hb.startTable(wxT("95%")); hb.startTableRow(); - hb.addTableHeaderCell(_("Number"), false); hb.addTableHeaderCell(_("Category"), false); + hb.addTableHeaderCell(_("Quantity"), true); hb.addTableHeaderCell(_("Summary"), true); hb.endTableRow(); while(q1.NextRow()) { - double catAmount = q1.GetDouble(wxT("AMOUNT")); - wxString subcategString = q1.GetString(wxT("SUBCATEGORY")); - wxString accountString = q1.GetString(wxT("NUMBER")); - + double category_total = q1.GetDouble(wxT("AMOUNT")); + wxString category_total_str = wxEmptyString; mmDBWrapper::loadBaseCurrencySettings(core_->db_.get()); + mmex::formatDoubleToCurrency(category_total, category_total_str); - mmex::formatDoubleToCurrency(catAmount, catAmountStr); - hb.startTableRow(); - hb.addTableCell(accountString, false, true); - hb.addTableCell(subcategString, false, true); - hb.addTableCell(catAmountStr, true); + hb.addTableCell(q1.GetString(wxT("SUBCATEGORY")), false, true); + hb.addTableCell(q1.GetString(wxT("NUMBER")), true, true); + hb.addTableCell(category_total_str, true); hb.endTableRow(); } q1.Finalize(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2012-02-25 16:29:19
|
Revision: 1889 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=1889&view=rev Author: vomikan Date: 2012-02-25 16:29:13 +0000 (Sat, 25 Feb 2012) Log Message: ----------- modifications Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2012-02-25 15:42:15 UTC (rev 1888) +++ trunk/mmex/src/mmhomepagepanel.cpp 2012-02-25 16:29:13 UTC (rev 1889) @@ -409,27 +409,35 @@ { hb.startTable(wxT("95%")); - wxString incStr, expStr, difStr, colorStr; + wxString incStr, expStr, difStr; mmex::formatDoubleToCurrency(tincome, incStr); // must use loadBaseCurrencySettings (called above) mmex::formatDoubleToCurrency(texpenses, expStr); mmex::formatDoubleToCurrency(tincome-texpenses, difStr); - if (tincome-texpenses<0) - { - colorStr = wxT("#FF6600"); - } + mmGraphIncExpensesMonth gg; gg.init(tincome, texpenses); gg.Generate(wxT("")); - wxString headerMsg; - headerMsg << _("Income vs Expenses: ") << _ ("Current Month"); - hb.addTableHeaderRow(headerMsg, 2); + hb.addTableHeaderRow(_("Income vs Expenses: "), 2); + hb.startTableRow(); + //hb.startTableCell(wxT("50%\" align=\"center")); + hb.startTableCell(); + hb.addImage(gg.getOutputFileName()); + hb.endTableCell(); + + //hb.startTableCell(wxT("50%\" align=\"center")); + hb.startTableCell(); + //start table in table + hb.startTable(); + + hb.addTableHeaderRow(_ ("Current Month"), 2); + hb.startTableRow(); hb.addTableCell(_("Income:"), false, true); hb.addTableCell(incStr, true); hb.endTableRow(); - - hb.startTableRow(); + + hb.startTableRow(); hb.addTableCell(_("Expenses:"), false, true); hb.addTableCell(expStr, true); hb.endTableRow(); @@ -437,18 +445,19 @@ hb.addRowSeparator(2); hb.startTableRow(); hb.addTableCell(_("Difference:"), false, true, true); - hb.addTableCell(difStr, true, true, true, colorStr); + hb.addTableCell(difStr, true, true, true, (tincome-texpenses < 0.0 ? wxT("RED"):wxT(""))); + hb.endTableRow(); + hb.endTable(); + hb.endTableCell(); + //end table in table - // Add the graph - hb.startTable(wxT("50%"), wxT("top\" align=\"center")); - hb.startTableRow(); - hb.startTableCell(wxT("50%\" align=\"center")); - hb.addImage(gg.getOutputFileName()); - hb.endTableCell(); hb.endTableRow(); - hb.endTable(); + + hb.addRowSeparator(2); + hb.endTable(); + } //* bills & deposits *// @@ -614,25 +623,23 @@ "and CANS.STATUS <> 'V' " "group by CATEG, SUBCATEG " "order by ABS (AMOUNT) DESC, CATEG, SUBCATEG " - "limit 10 " - ") where AMOUNT < 0" ; + ") where AMOUNT < 0 " + "limit 7 "; wxSQLite3ResultSet q1 = db_->ExecuteQuery(sql3); std::vector<CategInfo> categList; - hb.startTable(wxT("95%")); wxString headerMsg = wxString() << _("Top Withdrawals: ") << _("Last 30 Days"); - hb.startTableRow(); - hb.addTableCell(headerMsg, false, false, true); - hb.endTableRow(); - hb.endTable(); + hb.addLineBreak(); + hb.addLineBreak(); hb.startTable(wxT("95%")); + hb.addTableHeaderRow(headerMsg, 3); hb.startTableRow(); - hb.addTableHeaderCell(_("Category"), false); - hb.addTableHeaderCell(_("Quantity"), true); - hb.addTableHeaderCell(_("Summary"), true); + hb.addTableCell(_("Category"), false, false, true); + hb.addTableCell(_("Quantity"), true, false, true); + hb.addTableCell(_("Summary"), true, false, true); hb.endTableRow(); while(q1.NextRow()) @@ -649,6 +656,7 @@ hb.endTableRow(); } q1.Finalize(); + hb.addRowSeparator(3); hb.endTable(); hb.getHTMLText(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ste...@us...> - 2012-03-17 10:04:06
|
Revision: 2017 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=2017&view=rev Author: stef145g Date: 2012-03-17 10:04:00 +0000 (Sat, 17 Mar 2012) Log Message: ----------- Updated home page to display Current month and Current Month to Date Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2012-03-17 01:32:29 UTC (rev 2016) +++ trunk/mmex/src/mmhomepagepanel.cpp 2012-03-17 10:04:00 UTC (rev 2017) @@ -432,7 +432,10 @@ gg.init(tincome, texpenses); gg.Generate(wxT("")); - hb.addTableHeaderRow(wxString()<<_("Income vs Expenses: ") << _("Current Month"), 2); + wxString monthHeading = _("Current Month"); + if (mmIniOptions::instance().ignoreFutureTransactions_) monthHeading = _("Current Month to Date"); + + hb.addTableHeaderRow(wxString() << _("Income vs Expenses: ") << monthHeading, 2); hb.startTableRow(); //hb.startTableCell(wxT("50%\" align=\"center")); @@ -738,7 +741,7 @@ wxDateTime today = wxDateTime::Now(); wxDateTime prevMonthEnd = today.Subtract(wxDateSpan::Days(today.GetDay())); wxDateTime dtBegin = prevMonthEnd; - wxDateTime dtEnd = wxDateTime::Now(); + wxDateTime dtEnd = wxDateTime::Now().GetLastMonthDay(); wxDateTime now = wxDateTime::Now(); wxString dt = _("Today's Date: ") + mmGetNiceDateString(now); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-10 09:44:54
|
Revision: 3558 http://moneymanagerex.svn.sourceforge.net/moneymanagerex/?rev=3558&view=rev Author: vomikan Date: 2013-03-10 09:44:48 +0000 (Sun, 10 Mar 2013) Log Message: ----------- Show income vs expenses for checking accounts if no accounts view selected Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-03-09 20:22:03 UTC (rev 3557) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-03-10 09:44:48 UTC (rev 3558) @@ -103,7 +103,7 @@ hb.startTable(wxT("100%"), wxT("top")); hb.startTableRow(); - hb.startTableCell(wxT("50%\" align=\"center")); + hb.startTableCell(wxT("50%\" valign=\"top\" align=\"center")); hb.addText(getCalendarWidget()); @@ -124,10 +124,11 @@ hb.addText(displayTopTransactions()); hb.endTableCell(); - hb.startTableCell(wxT("50%\" align=\"center")); + hb.startTableCell(wxT("50%\" valign=\"top\" align=\"center")); hb.addText(displayIncomeVsExpenses(tIncome, tExpenses)); //Also displays the Income vs Expenses graph. hb.addText(displayBillsAndDeposits()); hb.addText(getStatWidget()); + hb.endTableCell(); hb.endTableRow(); hb.endTable(); @@ -212,11 +213,12 @@ tBalance += bal * rate; // actual amount in that account in the original rate tRecBalance += reconciledBal * rate; + double income = 0.0; + double expenses = 0.0; // Display the individual Checking account links if we want to display them - if ( frame_->expandedBankAccounts() ) + if ( frame_->expandedBankAccounts() + || (!frame_->expandedBankAccounts() && !frame_->expandedTermAccounts()) ) { - double income = 0.0; - double expenses = 0.0; core_->bTransactionList_.getExpensesIncome(core_, pCA->id_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_); // show the actual amount in that account @@ -225,9 +227,10 @@ mmex::formatDoubleToCurrency(bal, balanceStr); mmex::formatDoubleToCurrency(reconciledBal, reconciledBalanceStr); - if ((vAccts == wxT("Open") && pCA->status_ == mmAccount::MMEX_Open) || + if (((vAccts == wxT("Open") && pCA->status_ == mmAccount::MMEX_Open) || (vAccts == wxT("Favorites") && pCA->favoriteAcct_) || (vAccts == wxT("ALL"))) + && frame_->expandedBankAccounts()) { hb.startTableRow(); hb.addTableCellLink(wxString::Format(wxT("ACCT:%d"), pCA->id_), pCA->name_, false, true); @@ -235,8 +238,7 @@ hb.addTableCell(balanceStr, true); hb.endTableRow(); } - - // if bank accounts being displayed, include income/expense totals on home page. + // if bank accounts being displayed or no accounts displayed, include income/expense totals on home page. tIncome += income; tExpenses += expenses; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <oma...@us...> - 2013-03-16 22:16:02
|
Revision: 3588 http://sourceforge.net/p/moneymanagerex/code/3588 Author: omalleypat Date: 2013-03-16 22:15:58 +0000 (Sat, 16 Mar 2013) Log Message: ----------- fix a bug where the repeating transaction for last day/business day of month would show up as inactive Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-03-16 22:06:57 UTC (rev 3587) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-03-16 22:15:58 UTC (rev 3588) @@ -648,14 +648,14 @@ if (th.daysRemaining_ == 0) { - if ((repeats > 10) && (numRepeats < 0) ) + if ( ((repeats > 10) && (repeats < 15)) && (numRepeats < 0) ) th.daysRemainingStr_ = _("Inactive"); } if (th.daysRemaining_ < 0) { th.daysRemainingStr_ = wxString::Format(wxT("%d"), abs(th.daysRemaining_)) + _(" days overdue!"); - if ((repeats > 10) && (numRepeats < 0) ) + if ( ((repeats > 10) && (repeats < 15)) && (numRepeats < 0) ) th.daysRemainingStr_ = _("Inactive"); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-17 10:56:56
|
Revision: 3590 http://sourceforge.net/p/moneymanagerex/code/3590 Author: vomikan Date: 2013-03-17 10:56:52 +0000 (Sun, 17 Mar 2013) Log Message: ----------- calendar widget new face Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-03-16 22:25:25 UTC (rev 3589) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-03-17 10:56:52 UTC (rev 3590) @@ -100,13 +100,21 @@ double tExpenses = 0.0; hb.startCenter(); + hb.startTable(wxT("100%"), wxT("top")); hb.startTableRow(); + hb.startTableCell(wxT("100%\" colspan=\"2\" valign=\"top\" align=\"center")); + hb.addText(getCalendarWidget()); + hb.endTableCell(); + hb.endTableRow(); + hb.startTableRow(); + hb.endTableRow(); + hb.startTableRow(); + + hb.startTableCell(wxT("50%\" valign=\"top\" align=\"center")); - hb.addText(getCalendarWidget()); - hb.addText(displayCheckingAccounts(tBalance, tIncome, tExpenses, dtBegin, dtEnd)); if ( frame_->hasActiveTermAccounts()) @@ -183,7 +191,7 @@ wxString mmHomePagePanel::displayCheckingAccounts(double& tBalance, double& tIncome, double& tExpenses, const wxDateTime& dtBegin, const wxDateTime& dtEnd) { mmHTMLBuilder hb; - hb.startTable(wxT("98%"), wxT("top"), wxT("1")); + hb.startTable(wxT("100%"), wxT("top"), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -216,7 +224,7 @@ double income = 0.0; double expenses = 0.0; // Display the individual Checking account links if we want to display them - if ( frame_->expandedBankAccounts() + if ( frame_->expandedBankAccounts() || (!frame_->expandedBankAccounts() && !frame_->expandedTermAccounts()) ) { core_->bTransactionList_.getExpensesIncome(core_, pCA->id_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_); @@ -260,7 +268,7 @@ double tTermBalance = 0.0; double tRecBalance = 0.0; - hb.startTable(wxT("98%"), wxT("top"), wxT("1")); + hb.startTable(wxT("100%"), wxT("top"), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -339,7 +347,7 @@ wxString tBalanceStr; wxString tGainStr; - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -426,7 +434,7 @@ if (mmIniOptions::instance().enableAssets_) { - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -494,7 +502,7 @@ if (curnumber > 1 ) { - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -559,45 +567,45 @@ gg.init(tincome, texpenses); gg.Generate(wxT("")); - hb.startTable(wxT("98%"), wxT("top"), wxT("1")); + hb.startTable(wxT("100%"), wxT("top"), wxT("1")); hb.startTableRow(); hb.startTableCell(); hb.startTable(wxT("100%")); - + wxString monthHeading = _("Current Month"); if (mmIniOptions::instance().ignoreFutureTransactions_) monthHeading = _("Current Month to Date"); - + hb.addTableHeaderRow(wxString::Format(_("Income vs Expenses: %s"), monthHeading.c_str()), 2); - + hb.startTableRow(); hb.startTableCell(); hb.addImage(gg.getOutputFileName()); hb.endTableCell(); - + hb.startTableCell(); - + hb.startTable(); hb.startTableRow(); hb.addTableHeaderCell(_("Type")); hb.addTableHeaderCell(_("Amount"), true); hb.endTableRow(); - + hb.startTableRow(); hb.addTableCell(_("Income:"), false, true); hb.addTableCell(incStr, true); hb.endTableRow(); - + hb.startTableRow(); hb.addTableCell(_("Expenses:"), false, true); hb.addTableCell(expStr, true); hb.endTableRow(); - + hb.startTableRow(); hb.addTableCell(_("Difference:"), false, true, true); hb.addTableCell(difStr, true, true, true, (tincome-texpenses < 0.0 ? wxT("RED"):wxT(""))); hb.endTableRow(); - + hb.endTable(); hb.endTableCell(); @@ -703,7 +711,7 @@ hb.addLineBreak(); hb.addLineBreak(); - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -795,7 +803,7 @@ wxString headerMsg = wxString() << _("Top Withdrawals: ") << _("Last 30 Days"); - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); hb.startTable(wxT("100%")); @@ -840,19 +848,35 @@ wxString mmHomePagePanel::getCalendarWidget() { mmHTMLBuilder hb; - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); - wxString sDate = mmGetNiceDateString(wxDateTime::Now()); - sDate = wxString::Format(_("Today's Date: %s"), sDate.c_str()); - hb.addHeaderItalic(1, sDate); - + hb.startTable(wxT("100%"), wxT(""), wxT("0")); + hb.startTableRow(); + //hb.addTableCell(wxString()<<wxDateTime::Now().GetYear()); + hb.addTableCell(wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth())), false, false, true); + wxDateTime thisMonth = wxDateTime::Now().SetDay(1); + for (int d = 1; d <= wxDateTime::Now().GetLastMonthDay().GetDay(); d++) + { + thisMonth.SetDay(d); + wxString sColor = wxT(""), sBgColor = wxT(""); + if (d == wxDateTime::Now().GetDay()) sBgColor = wxT("YELLOW"); + hb.startTableCell(wxString::Format(wxT("1\" bgcolor=\"%s"), sBgColor.c_str())); + int day_of_week = wxDateTime::Now().GetWeekDay(); + if (wxDateTime::GetWeekDayName(thisMonth.GetWeekDay())==wxT("Sunday")) sColor = wxT("#FF0000"); + else if (wxDateTime::GetWeekDayName(thisMonth.GetWeekDay())==wxT("Saturday")) sColor = wxT("#FF0000"); + hb.addText(wxString::Format(wxT("<font color=\"%s\"> %d </font>"), sColor.c_str(), d)); + hb.endTableCell(); + } + hb.addTableCell(wxString::Format(_("Week #%d"), wxDateTime::Now().GetWeekOfYear()), false, true); + + hb.endTableRow(); + hb.endTable(); + hb.endTableCell(); hb.endTableRow(); hb.endTable(); - hb.addLineBreak(); - hb.addLineBreak(); return hb.getHTMLText(); } @@ -863,7 +887,7 @@ hb.addLineBreak(); hb.addLineBreak(); - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); @@ -899,7 +923,7 @@ core_->currencyList_.LoadBaseCurrencySettings(); mmex::formatDoubleToCurrency(tBalance, tBalanceStr); - hb.startTable(wxT("98%"), wxT(""), wxT("1")); + hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-18 13:01:40
|
Revision: 3594 http://sourceforge.net/p/moneymanagerex/code/3594 Author: vomikan Date: 2013-03-18 13:01:38 +0000 (Mon, 18 Mar 2013) Log Message: ----------- more compact calendar Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-03-17 16:18:58 UTC (rev 3593) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-03-18 13:01:38 UTC (rev 3594) @@ -847,15 +847,19 @@ wxString mmHomePagePanel::getCalendarWidget() { + int font_size = mmIniOptions::instance().html_font_size_ -1; mmHTMLBuilder hb; hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); - - hb.startTable(wxT("100%"), wxT(""), wxT("0")); + hb.addText(wxString::Format(wxT("<font size=\"%i\">"), font_size)); + hb.startTable(wxT("100%"), wxT("left\" cellspacing=\"0"), wxT("0")); hb.startTableRow(); //hb.addTableCell(wxString()<<wxDateTime::Now().GetYear()); - hb.addTableCell(wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth())), false, false, true); + //hb.addTableCell(wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth())), false, false, true); + hb.startTableCell(wxString::Format(wxT("1"))); + hb.addText( wxString() << wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth()))); + hb.endTableCell(); wxDateTime thisMonth = wxDateTime::Now().SetDay(1); for (int d = 1; d <= wxDateTime::Now().GetLastMonthDay().GetDay(); d++) { @@ -863,17 +867,20 @@ wxString sColor = wxT(""), sBgColor = wxT(""); if (d == wxDateTime::Now().GetDay()) sBgColor = wxT("YELLOW"); hb.startTableCell(wxString::Format(wxT("1\" bgcolor=\"%s"), sBgColor.c_str())); - int day_of_week = wxDateTime::Now().GetWeekDay(); if (wxDateTime::GetWeekDayName(thisMonth.GetWeekDay())==wxT("Sunday")) sColor = wxT("#FF0000"); else if (wxDateTime::GetWeekDayName(thisMonth.GetWeekDay())==wxT("Saturday")) sColor = wxT("#FF0000"); - hb.addText(wxString::Format(wxT("<font color=\"%s\"> %d </font>"), sColor.c_str(), d)); + hb.addText(wxString::Format(wxT("<font color=\"%s\" > %d </font>") + , sColor.c_str(), d)); hb.endTableCell(); } - hb.addTableCell(wxString::Format(_("Week #%d"), wxDateTime::Now().GetWeekOfYear()), false, true); + hb.addTableCell(wxString::Format(_("Week #%d") + , wxDateTime::Now().GetWeekOfYear()) + , false, true, false); hb.endTableRow(); hb.endTable(); + hb.addText(wxT("</font>")); hb.endTableCell(); hb.endTableRow(); hb.endTable(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-03-20 13:50:15
|
Revision: 3596 http://sourceforge.net/p/moneymanagerex/code/3596 Author: vomikan Date: 2013-03-20 13:50:09 +0000 (Wed, 20 Mar 2013) Log Message: ----------- more compact calendar Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-03-19 10:47:46 UTC (rev 3595) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-03-20 13:50:09 UTC (rev 3596) @@ -847,19 +847,21 @@ wxString mmHomePagePanel::getCalendarWidget() { - int font_size = mmIniOptions::instance().html_font_size_ -1; + int font_size = mmIniOptions::instance().html_font_size_; mmHTMLBuilder hb; hb.startTable(wxT("100%"), wxT(""), wxT("1")); hb.startTableRow(); hb.startTableCell(); hb.addText(wxString::Format(wxT("<font size=\"%i\">"), font_size)); - hb.startTable(wxT("100%"), wxT("left\" cellspacing=\"0"), wxT("0")); + hb.startTable(wxT("100%"), wxT("left\" cellpadding=\"1\" cellspacing=\"0"), wxT("0")); hb.startTableRow(); //hb.addTableCell(wxString()<<wxDateTime::Now().GetYear()); - //hb.addTableCell(wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth())), false, false, true); hb.startTableCell(wxString::Format(wxT("1"))); - hb.addText( wxString() << wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth()))); + hb.addText( wxString(wxT("<b>")) + << wxGetTranslation(wxDateTime::GetMonthName(wxDateTime::Now().GetMonth())) + << wxT("</b>")); hb.endTableCell(); + hb.addTableCell(wxT("")); wxDateTime thisMonth = wxDateTime::Now().SetDay(1); for (int d = 1; d <= wxDateTime::Now().GetLastMonthDay().GetDay(); d++) { @@ -875,7 +877,7 @@ } hb.addTableCell(wxString::Format(_("Week #%d") , wxDateTime::Now().GetWeekOfYear()) - , false, true, false); + , false, false, true); hb.endTableRow(); hb.endTable(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gua...@us...> - 2013-05-05 12:23:22
|
Revision: 3852 http://sourceforge.net/p/moneymanagerex/code/3852 Author: guanlisheng Date: 2013-05-05 12:23:19 +0000 (Sun, 05 May 2013) Log Message: ----------- use addMoneyCell Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-05-05 12:21:49 UTC (rev 3851) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-05-05 12:23:19 UTC (rev 3852) @@ -169,18 +169,10 @@ // format the totals for display core_->currencyList_.LoadBaseCurrencySettings(); - wxString tRecBalanceStr; - CurrencyFormatter::formatDoubleToCurrency(tRecBalance, tRecBalanceStr); - wxString tBalanceStr; - CurrencyFormatter::formatDoubleToCurrency(tBalance, tBalanceStr); + std::vector<double> data; + data.push_back(tRecBalance); + data.push_back(tBalance); - // stocks don't have reconciled balances - if (totalsTitle == _("Stocks Total:")) tRecBalanceStr = wxEmptyString; - - std::vector<wxString> data; - data.push_back(tRecBalanceStr); - data.push_back(tBalanceStr); - hb.startTableRow(); hb.addTotalRow(totalsTitle, 3, data); hb.endTableRow(); @@ -227,10 +219,6 @@ core_->bTransactionList_.getExpensesIncome(core_, account->id_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_); // show the actual amount in that account - wxString balanceStr; - wxString reconciledBalanceStr; - CurrencyFormatter::formatDoubleToCurrency(bal, balanceStr); - CurrencyFormatter::formatDoubleToCurrency(reconciledBal, reconciledBalanceStr); if (((vAccts == "Open" && account->status_ == mmAccount::MMEX_Open) || (vAccts == "Favorites" && account->favoriteAcct_) || @@ -239,8 +227,8 @@ { hb.startTableRow(); hb.addTableCellLink(wxString::Format("ACCT:%d", account->id_), account->name_, false, true); - hb.addTableCell(reconciledBalanceStr, true); - hb.addTableCell(balanceStr, true); + hb.addMoneyCell(reconciledBal, true); + hb.addMoneyCell(bal); hb.endTableRow(); } // if bank accounts being displayed or no accounts displayed, include income/expense totals on home page. @@ -298,10 +286,6 @@ core_->bTransactionList_.getExpensesIncome(core_, account->id_, expenses, income, false, dtBegin, dtEnd, mmIniOptions::instance().ignoreFutureTransactions_); // show the actual amount in that account - wxString balanceStr; - wxString reconciledBalStr; - CurrencyFormatter::formatDoubleToCurrency(bal, balanceStr); - CurrencyFormatter::formatDoubleToCurrency(reconciledBal, reconciledBalStr); if ((vAccts == "Open" && account->status_ == mmAccount::MMEX_Open) || (vAccts == "Favorites" && account->favoriteAcct_) || @@ -309,8 +293,8 @@ { hb.startTableRow(); hb.addTableCellLink(wxString::Format("ACCT:%d", account->id_), account->name_, false, true); - hb.addTableCell(reconciledBalStr, true); - hb.addTableCell(balanceStr, true); + hb.addMoneyCell(reconciledBal, true); + hb.addMoneyCell(bal, true); hb.endTableRow(); } @@ -385,9 +369,6 @@ wxASSERT(pCurrencyPtr); CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - CurrencyFormatter::formatDoubleToCurrency(stockBalance, tBalanceStr); - CurrencyFormatter::formatDoubleToCurrency(stockGain, tGainStr); - // if Stock accounts being displayed, include income/expense totals on home page. //tIncome += income * baseconvrate; //tExpenses += expenses * baseconvrate; @@ -399,8 +380,8 @@ ////// //hb.addTableCell(stocknameStr, false,true); hb.addTableCellLink(wxString::Format("STOCK:%d", stockaccountId), stocknameStr, false, true); - hb.addTableCell(tGainStr, true); - hb.addTableCell(tBalanceStr, true); + hb.addMoneyCell(stockGain, true); + hb.addMoneyCell(stockBalance, true); hb.endTableRow(); } } @@ -521,13 +502,11 @@ wxString tBalanceStr; CurrencyFormatter::instance().loadSettings(*pCurrencyPtr); - CurrencyFormatter::formatDoubleToCurrency(currBalance, tBalanceStr); - CurrencyFormatter::formatDoubleToCurrencyEdit(convRate, convRateStr); hb.startTableRow(); hb.addTableCell(currencyStr); - hb.addTableCell(convRateStr, true); - hb.addTableCell(tBalanceStr, true); + hb.addMoneyCell(convRate); + hb.addMoneyCell(currBalance); hb.endTableRow(); } hb.endTable(); @@ -551,11 +530,6 @@ { mmHTMLBuilder hb; - wxString incStr, expStr, difStr; - CurrencyFormatter::formatDoubleToCurrency(tincome, incStr); // must use LoadBaseCurrencySettings (called above) - CurrencyFormatter::formatDoubleToCurrency(texpenses, expStr); - CurrencyFormatter::formatDoubleToCurrency(tincome-texpenses, difStr); - mmGraphIncExpensesMonth gg; gg.init(tincome, texpenses); gg.Generate(""); @@ -586,17 +560,17 @@ hb.startTableRow(); hb.addTableCell(_("Income:"), false, true); - hb.addTableCell(incStr, true); + hb.addMoneyCell(tincome); hb.endTableRow(); hb.startTableRow(); hb.addTableCell(_("Expenses:"), false, true); - hb.addTableCell(expStr, true); + hb.addMoneyCell(texpenses); hb.endTableRow(); hb.startTableRow(); hb.addTableCell(_("Difference:"), false, true, true); - hb.addTableCell(difStr, true, true, true, (tincome-texpenses < 0.0 ? "RED":"")); + hb.addMoneyCell(tincome - texpenses); hb.endTableRow(); hb.endTable(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-05-10 08:32:30
|
Revision: 3872 http://sourceforge.net/p/moneymanagerex/code/3872 Author: vomikan Date: 2013-05-10 08:32:27 +0000 (Fri, 10 May 2013) Log Message: ----------- update - minor changes Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-05-10 07:59:17 UTC (rev 3871) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-05-10 08:32:27 UTC (rev 3872) @@ -89,7 +89,6 @@ return; date_range_ = new mmCurrentMonth; - wxDateTime today = date_range_->today(); double tBalance = 0.0, tIncome = 0.0, tExpenses = 0.0; mmHTMLBuilder hb; @@ -814,7 +813,7 @@ wxString mmHomePagePanel::getCalendarWidget() { - const wxDateTime &now = date_range_->today(); + const wxDateTime &today = date_range_->today(); int font_size = mmIniOptions::instance().html_font_size_; mmHTMLBuilder hb; hb.startTable("100%", "", "1"); @@ -826,7 +825,7 @@ //hb.addTableCell(wxString()<<wxDateTime::Now().GetYear()); hb.startTableCell(wxString::Format("1")); hb.addText( wxString("<b>") - << wxGetTranslation(wxDateTime::GetMonthName(now.GetMonth())) + << wxGetTranslation(wxDateTime::GetMonthName(today.GetMonth())) << "</b>"); hb.endTableCell(); hb.addTableCell(""); @@ -835,7 +834,7 @@ { selectedMonthDay.SetDay(d); wxString sColor = "", sBgColor = ""; - if (d == now.GetDay()) sBgColor = "YELLOW"; + if (d == today.GetDay()) sBgColor = "YELLOW"; hb.startTableCell(wxString::Format("1\" bgcolor=\"%s", sBgColor)); if (wxDateTime::GetWeekDayName(selectedMonthDay.GetWeekDay())=="Sunday") sColor = "#FF0000"; else if (wxDateTime::GetWeekDayName(selectedMonthDay.GetWeekDay())=="Saturday") sColor = "#FF0000"; @@ -844,7 +843,7 @@ hb.endTableCell(); } hb.addTableCell(wxString::Format(_("Week #%d") - , now.GetWeekOfYear()) + , today.GetWeekOfYear()) , false, false, true); hb.endTableRow(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-05-10 14:53:16
|
Revision: 3875 http://sourceforge.net/p/moneymanagerex/code/3875 Author: vomikan Date: 2013-05-10 14:53:11 +0000 (Fri, 10 May 2013) Log Message: ----------- fix for reversed settings Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-05-10 14:01:26 UTC (rev 3874) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-05-10 14:53:11 UTC (rev 3875) @@ -87,9 +87,9 @@ if (!core_->db_.get()) return; if (mmIniOptions::instance().ignoreFutureTransactions_) + date_range_ = new mmCurrentMonthToDate; + else date_range_ = new mmCurrentMonth; - else - date_range_ = new mmCurrentMonthToDate; vAccts_ = core_->iniSettings_->GetStringSetting("VIEWACCOUNTS", VIEW_ACCOUNTS_ALL_STR); mmHTMLBuilder hb; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <vo...@us...> - 2013-05-24 09:36:31
|
Revision: 3969 http://sourceforge.net/p/moneymanagerex/code/3969 Author: vomikan Date: 2013-05-24 09:36:29 +0000 (Fri, 24 May 2013) Log Message: ----------- calendar alignment Modified Paths: -------------- trunk/mmex/src/mmhomepagepanel.cpp Modified: trunk/mmex/src/mmhomepagepanel.cpp =================================================================== --- trunk/mmex/src/mmhomepagepanel.cpp 2013-05-24 09:27:16 UTC (rev 3968) +++ trunk/mmex/src/mmhomepagepanel.cpp 2013-05-24 09:36:29 UTC (rev 3969) @@ -128,15 +128,15 @@ { mmHTMLBuilder hb; hb.init(); + hb.startCenter(); hb.startTable("100%", "top"); hb.startTableRow(); - hb.startTableCell("100%\" colspan=\"2\" valign=\"top\" align=\"center"); + hb.startTableCell("100%\" colspan=\"2\" valign=\"middle\" align=\"center"); hb.addText(getCalendarWidget()); hb.endTableCell(); hb.endTableRow(); - hb.startCenter(); hb.startTableRow(); hb.endTableRow(); hb.startTableRow(); @@ -793,9 +793,9 @@ hb.startTableCell(); hb.font_settings(hb.font_size()); hb.bold(wxGetTranslation(wxDateTime::GetMonthName(today.GetMonth()))); - hb.addText(" "); hb.font_end(); hb.endTableCell(); + hb.addTableCell(""); wxDateTime selectedMonthDay = date_range_->start_date(); for (int d = 1; d <= selectedMonthDay.GetLastMonthDay().GetDay(); d++) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |