Group filings ending on same date

camp_fin/models.py

@@ -945,17 +945,18 @@ def trends(self, since="2010"):
  # Balances and debts
  summed_filings = """
  SELECT
- COALESCE(f.total_unpaid_debts, 0) AS total_unpaid_debts,
- f.closing_balance AS closing_balance,
+ SUM(COALESCE(f.total_unpaid_debts, 0)) AS total_unpaid_debts,
+ SUM(f.closing_balance) AS closing_balance,
  fp.end_date,
- fp.description
+ ARRAY_AGG(fp.description) AS description
  FROM camp_fin_filing AS f
  JOIN camp_fin_filingperiod AS fp
  ON f.filing_period_id = fp.id
  WHERE f.entity_id = %s
  AND fp.exclude_from_cascading = FALSE
  AND fp.regular_filing_period_id IS NULL
  AND f.filed_date >= '{year}-01-01'
+ GROUP BY fp.end_date
  ORDER BY fp.end_date
  """.format(
  year=since

camp_fin/static/js/chart_helper.js

@@ -174,7 +174,7 @@ ChartHelper.netfunds = function(el, title, sourceTxt, yaxisLabel, data, startYea
  $.each(this.points, function(i, point) {
  if (i === 0) {
  s += `
- <strong>${point.point.description}</strong><br />
+ <strong>${point.point.description.join(", ")}</strong><br />
  <strong>Period ending ${ChartHelper.toolTipDateFormat("day", this.x)}</strong>
  `
  }