Merge pull request moneymanagerex#8320 from JoshuaLampert/summary-of-accounts-report-accounts

whalley · web-flow · commit e338e62cc43a · 2026-04-16T14:16:40.000+01:00
Add selection between accounts and account types in summary of accounts report
diff --git a/src/panel/ReportPanel.cpp b/src/panel/ReportPanel.cpp
@@ -482,6 +482,10 @@ void ReportPanel::createControls()
                 int idx = w_selection_choice->FindString(removeQuotes(map["default"]));
                 w_selection_choice->SetSelection(idx != wxNOT_FOUND ? idx : 0);
             }
+            int sel = m_rb->getGenericSelection();
+            if (sel >= 0 && static_cast<unsigned int>(sel) < w_selection_choice->GetCount()) {
+                w_selection_choice->SetSelection(sel);
+            }
             itemBoxSizerHeader->Add(w_selection_choice, 0, wxALL | wxALIGN_CENTER_VERTICAL, 1);
             itemBoxSizerHeader->AddSpacer(30);
         }
@@ -721,6 +725,10 @@ bool ReportPanel::saveReportText()
         m_rb->setDateSelection(id);
     }
 
+    if ((m_rb->getParameters() & ReportBase::M_GENERIC_SELECTION) && w_selection_choice) {
+        m_rb->setGenericSelection(w_selection_choice->GetSelection());
+    }
+
     StringBuffer json_buffer;
     Writer<StringBuffer> json_writer(json_buffer);
 
diff --git a/src/report/BalanceReport.cpp b/src/report/BalanceReport.cpp
@@ -37,6 +37,9 @@ BalanceReport::BalanceReport(BalanceReport::PERIOD_ID period_id) :
         ? REPORT_ID::MonthlySummaryofAccounts
         : REPORT_ID::YearlySummaryofAccounts
     );
+    m_selection_map["name"] = _t("View");
+    m_selection_map["values"] = _t("Account Types") + "," + _t("Accounts");
+    m_selection_map["default"] = _t("Account Types");
 }
 
 std::map<mmDate, double> BalanceReport::loadAccountBalance_mDate(const AccountData& account_d)
@@ -114,9 +117,10 @@ wxString BalanceReport::getHTMLText()
     std::vector<BalanceEntry> date_balanceA_a;
 
     GraphData gd;
+    const bool view_accounts = (getGenericSelection() == 1);
     int acc_size = mmNavigatorList::instance().getNumberOfAccountTypes();
-    // +1 as we add balance to the end;
-    std::vector<GraphSeries> gs_data(acc_size + 1);
+    const auto account_data_a = AccountModel::instance().find_all();
+    const auto asset_data_a = AssetModel::instance().find_all();
 
     std::vector<mmDate> end_date_a;
 
@@ -148,11 +152,16 @@ wxString BalanceReport::getHTMLText()
     mmDate start_date = selected_start_date;
     bool has_included_accounts = false;
     mmDate earliest_open_date = selected_end_date;
+    std::vector<wxString> series_name_a;
+
     // Calculate the report date
-    for (const auto& account_d : AccountModel::instance().find_all()) {
+    for (const auto& account_d : account_data_a) {
         if (m_account_a && wxNOT_FOUND == m_account_a->Index(account_d.m_name))
             continue;
 
+        if (view_accounts)
+            series_name_a.push_back(account_d.m_name);
+
         if (!has_included_accounts || account_d.m_open_date < earliest_open_date) {
             earliest_open_date = account_d.m_open_date;
             has_included_accounts = true;
@@ -176,6 +185,25 @@ wxString BalanceReport::getHTMLText()
         }
     }
 
+    const bool include_asset_series = view_accounts && !asset_data_a.empty();
+    if (include_asset_series)
+        series_name_a.push_back(_t("Assets"));
+
+    if (!view_accounts) {
+        for (int i = 0; i < acc_size; ++i)
+            series_name_a.push_back(mmNavigatorList::instance().getAccountTypeName(i));
+    }
+
+    const int series_count = static_cast<int>(series_name_a.size());
+    // +1 as we add total balance series to the end.
+    std::vector<GraphSeries> gs_data(series_count + 1);
+    for (int i = 0; i < series_count; ++i) {
+        gs_data[i].name = series_name_a[i];
+        gs_data[i].type = "column";
+    }
+    gs_data[series_count].name = _t("Balance");
+    gs_data[series_count].type = "line";
+
     // Skip leading periods where selected accounts cannot have any balance yet.
     if (has_included_accounts && start_date < earliest_open_date)
         start_date = earliest_open_date;
@@ -209,54 +237,76 @@ wxString BalanceReport::getHTMLText()
         date_balanceA.date = end_date;
         double total = 0.0;
 
-        std::vector<double> balance_a(acc_size +1);
+        std::vector<double> balance_a(series_count);
         std::fill(balance_a.begin(), balance_a.end(), 0.0);
-        int idx;
-        for (const auto& account_d : AccountModel::instance().find_all()) {
+        int idx = 0;
+        int type_idx;
+        for (const auto& account_d : account_data_a) {
             if (m_account_a && wxNOT_FOUND == m_account_a->Index(account_d.m_name))
                 continue;
 
-            idx = mmNavigatorList::instance().getAccountTypeIdx(account_d.m_type_);
-            if (idx == -1) {
-                idx = mmNavigatorList::instance().getAccountTypeIdx(mmNavigatorItem::TYPE_ID_CHECKING);
-            }
-            if (idx > -1) {
+            if (view_accounts) {
                 double rate = getCurrencyDateRate(account_d.m_currency_id, end_date);
                 std::pair<double, double> dailybal = getBalance(&account_d, end_date);
-                balance_a[idx] += dailybal.first * rate;
+                balance_a[idx] = dailybal.first * rate;
                 if (AccountModel::type_id(account_d) == mmNavigatorItem::TYPE_ID_INVESTMENT) {
                     balance_a[idx] += dailybal.second * rate;
                 }
+                idx++;
+            }
+            else {
+                type_idx = mmNavigatorList::instance().getAccountTypeIdx(account_d.m_type_);
+                if (type_idx == -1) {
+                    type_idx = mmNavigatorList::instance().getAccountTypeIdx(mmNavigatorItem::TYPE_ID_CHECKING);
+                }
+                if (type_idx > -1) {
+                    double rate = getCurrencyDateRate(account_d.m_currency_id, end_date);
+                    std::pair<double, double> dailybal = getBalance(&account_d, end_date);
+                    balance_a[type_idx] += dailybal.first * rate;
+                    if (AccountModel::type_id(account_d) == mmNavigatorItem::TYPE_ID_INVESTMENT) {
+                        balance_a[type_idx] += dailybal.second * rate;
+                    }
+                }
             }
         }
 
-        idx = mmNavigatorList::instance().getAccountTypeIdx(mmNavigatorItem::TYPE_ID_ASSET);
-        if (idx > -1) {
-            for (const auto& asset_d : AssetModel::instance().find_all()) {
-                double rate = getCurrencyDateRate(asset_d.m_currency_id_n, end_date);
-                balance_a[idx] += AssetModel::instance().get_data_value_date(
-                    asset_d, end_date
-                ).second * rate;
+        if (view_accounts) {
+            if (include_asset_series) {
+                double asset_balance = 0.0;
+                for (const auto& asset_d : asset_data_a) {
+                    double rate = getCurrencyDateRate(asset_d.m_currency_id_n, end_date);
+                    asset_balance += AssetModel::instance().get_data_value_date(
+                        asset_d, end_date
+                    ).second * rate;
+                }
+                balance_a[idx] = asset_balance;
+            }
+        }
+        else {
+            type_idx = mmNavigatorList::instance().getAccountTypeIdx(mmNavigatorItem::TYPE_ID_ASSET);
+            if (type_idx > -1) {
+                for (const auto& asset_d : asset_data_a) {
+                    double rate = getCurrencyDateRate(asset_d.m_currency_id_n, end_date);
+                    balance_a[type_idx] += AssetModel::instance().get_data_value_date(
+                        asset_d, end_date
+                    ).second * rate;
+                }
             }
         }
 
         int k = -1;
-        for (int i = 0; i < acc_size; ++i) {
+        for (int i = 0; i < series_count; ++i) {
             date_balanceA.balance_a.push_back(balance_a[i]);
             gs_data[++k].values.push_back(balance_a[i]);
             total += balance_a[i];
-            gs_data[k].name = mmNavigatorList::instance().getAccountTypeName(i);
-            gs_data[k].type = "column";
         }
         date_balanceA.balance_a.push_back(total);
         date_balanceA_a.push_back(date_balanceA);
         gs_data[++k].values.push_back(total);
-        gs_data[k].name = _t("Balance");
-        gs_data[k].type = "line";
     }
 
     std::vector<bool> is_visible_a;
-    for (int i = 0; i <  acc_size; i++) {
+    for (int i = 0; i < series_count; i++) {
         bool av;
         for (double value : gs_data[i].values) {
             av = false;
@@ -272,7 +322,7 @@ wxString BalanceReport::getHTMLText()
 
     // Chart
     if (getChartSelection() == 0) {
-        for (int i = 0; i <  (acc_size + 1); ++i) {
+        for (int i = 0; i <  (series_count + 1); ++i) {
             if (is_visible_a[i]) {
                 gd.series.push_back(gs_data[i]);
             }
@@ -304,7 +354,7 @@ wxString BalanceReport::getHTMLText()
                 hb.startTableRow();
                 {
                     hb.addTableHeaderCell(_t("Date"));
-                    for (int i = 0; i < acc_size + 1; i++) {
+                    for (int i = 0; i < series_count + 1; i++) {
                         if (is_visible_a[i])
                             hb.addTableHeaderCell(gs_data[i].name, "text-right");
                     }
@@ -322,7 +372,7 @@ wxString BalanceReport::getHTMLText()
                         hb.addTableCellMonth(dateTime.GetMonth(), dateTime.GetYear());
                     else
                         hb.addTableCell(wxString::Format("%d", dateTime.GetYear()));
-                    for (int i = 0; i < acc_size + 1; i++) {
+                    for (int i = 0; i < series_count + 1; i++) {
                         if (is_visible_a[i])
                             hb.addMoneyCell(date_balanceA.balance_a[i]);
                     }
diff --git a/src/report/_ReportBase.cpp b/src/report/_ReportBase.cpp
@@ -53,8 +53,8 @@ void ReportBase::setReportParameters(ReportBase::REPORT_ID report_id)
 
     switch (report_id) {
     case MyUsage:                     m_parameters = M_DATE_RANGE | M_CHART; break;
-    case MonthlySummaryofAccounts:    m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART; break;
-    case YearlySummaryofAccounts:     m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART; break;
+    case MonthlySummaryofAccounts:    m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART | M_GENERIC_SELECTION; break;
+    case YearlySummaryofAccounts:     m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART | M_GENERIC_SELECTION; break;
     case WheretheMoneyGoes:           m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART; break;
     case WheretheMoneyComesFrom:      m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART; break;
     case CategoriesSummary:           m_parameters = M_DATE_RANGE | M_ACCOUNT | M_CHART; break;
@@ -92,12 +92,18 @@ void ReportBase::setAccounts(int selection, const wxString& type_name)
     {
         wxArrayString account_name_a;
         auto account_a = AccountModel::instance().find_all();
+        const bool exclude_share_accounts =
+            m_report_id == REPORT_ID::MonthlySummaryofAccounts ||
+            m_report_id == REPORT_ID::YearlySummaryofAccounts;
         std::stable_sort(account_a.begin(), account_a.end(),
             AccountData::SorterByName()
         );
         for (const auto& account_d : account_a) {
             if (m_only_active && !account_d.is_open())
                 continue;
+            if (exclude_share_accounts &&
+                AccountModel::type_id(account_d) == mmNavigatorItem::TYPE_ID_SHARES)
+                continue;
             account_name_a.Add(account_d.m_name);
         }
 
@@ -222,6 +228,13 @@ void ReportBase::saveReportSettings()
         json_writer.String(m_generic_filter.utf8_str());
     }
 
+    if (m_parameters & M_GENERIC_SELECTION)
+    {
+        isActive = true;
+        json_writer.Key("GENERIC_SELECTION");
+        json_writer.Int(m_generic_selection);
+    }
+
     json_writer.EndObject();
 
     if (isActive) {
@@ -262,6 +275,10 @@ void ReportBase::restoreReportSettings()
         m_generic_filter = j_doc["GENERIC_FILTER"].GetString();
     }
 
+    if (j_doc.HasMember("GENERIC_SELECTION") && j_doc["GENERIC_SELECTION"].IsInt()) {
+        m_generic_selection = j_doc["GENERIC_SELECTION"].GetInt();
+    }
+
     m_account_selection = -1;
     int selection = 0;
     int acc_size = mmNavigatorList::instance().getNumberOfAccountTypes();
diff --git a/src/report/_ReportBase.h b/src/report/_ReportBase.h
@@ -90,6 +90,7 @@ class ReportBase
     bool m_only_active = false;
     int m_chart_selection = 0;
     int m_stock_selection = 0;
+    int m_generic_selection = 0;
     wxString m_stock_name = "";
     wxString m_generic_filter = "";
     std::map<wxString, wxString> m_filter_map;
@@ -120,6 +121,7 @@ class ReportBase
     void setAccounts(int selection, const wxString& type_name);
     void setChartSelection(int selection);
     void setStockSelection(int selection);
+    void setGenericSelection(int selection);
 
     REPORT_ID getReportId() const;
     const wxString getReportSettings() const;
@@ -130,6 +132,7 @@ class ReportBase
     wxString getFilterValue() const;
     int getChartSelection() const;
     int getStockSelection() const;
+    int getGenericSelection() const;
     void setStockName(const wxString& name);
 
     void saveReportSettings();
@@ -159,6 +162,7 @@ inline void ReportBase::setDateSelection(int64 sel) { m_date_selection = sel; }
 inline void ReportBase::setForwardMonths(int sel) { m_forward_months = sel; }
 inline void ReportBase::setChartSelection(int selection) { m_chart_selection = selection; }
 inline void ReportBase::setStockSelection(int selection) { m_stock_selection = selection; }
+inline void ReportBase::setGenericSelection(int selection) { m_generic_selection = selection; }
 inline void ReportBase::setStockName(const wxString& name) { m_stock_name = name; }
 
 
@@ -171,6 +175,7 @@ inline int ReportBase::getForwardMonths() const { return this->m_forward_months;
 inline int ReportBase::getAccountSelection() const { return this->m_account_selection; }
 inline int ReportBase::getChartSelection() const { return this->m_chart_selection; }
 inline int ReportBase::getStockSelection() const { return this->m_stock_selection; }
+inline int ReportBase::getGenericSelection() const { return this->m_generic_selection; }
 inline wxString ReportBase::getFilterValue() const { return this->m_generic_filter; }
 inline std::map<wxString, wxString> ReportBase::getFilterMap() const { return this->m_filter_map; }
 inline std::map<wxString, wxString> ReportBase::getSelectionMap() const { return this->m_selection_map; }

Original file line number	Diff line number	Diff line change
`@@ -482,6 +482,10 @@ void ReportPanel::createControls()`
`482`	`482`	`int idx = w_selection_choice->FindString(removeQuotes(map["default"]));`
`483`	`483`	`w_selection_choice->SetSelection(idx != wxNOT_FOUND ? idx : 0);`
`484`	`484`	`}`
	`485`	`+ int sel = m_rb->getGenericSelection();`
	`486`	`+ if (sel >= 0 && static_cast<unsigned int>(sel) < w_selection_choice->GetCount()) {`
	`487`	`+ w_selection_choice->SetSelection(sel);`
	`488`	`+ }`
`485`	`489`	`itemBoxSizerHeader->Add(w_selection_choice, 0, wxALL \| wxALIGN_CENTER_VERTICAL, 1);`
`486`	`490`	`itemBoxSizerHeader->AddSpacer(30);`
`487`	`491`	`}`
`@@ -721,6 +725,10 @@ bool ReportPanel::saveReportText()`
`721`	`725`	`m_rb->setDateSelection(id);`
`722`	`726`	`}`
`723`	`727`
	`728`	`+ if ((m_rb->getParameters() & ReportBase::M_GENERIC_SELECTION) && w_selection_choice) {`
	`729`	`+ m_rb->setGenericSelection(w_selection_choice->GetSelection());`
	`730`	`+ }`
	`731`	`+`
`724`	`732`	`StringBuffer json_buffer;`
`725`	`733`	`Writer<StringBuffer> json_writer(json_buffer);`
`726`	`734`