forked from extern/django-helpdesk
Merge pull request #876 from Benbb96/0.2.x-dev
Display a Total row in Reports
This commit is contained in:
commit
8fbebb321e
@ -75,6 +75,10 @@
|
|||||||
{% for d in data %}<tr class='row_{% cycle 'odd' 'even' %}'>
|
{% for d in data %}<tr class='row_{% cycle 'odd' 'even' %}'>
|
||||||
{% for f in d %}<td class='report'>{{ f }}</td>{% endfor %}
|
{% for f in d %}<td class='report'>{{ f }}</td>{% endfor %}
|
||||||
</tr>{% endfor %}
|
</tr>{% endfor %}
|
||||||
|
{# Total row #}
|
||||||
|
<tr>
|
||||||
|
{% for f in total_data %}<td class='report'>{{ f }}</td>{% endfor %}
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1309,11 +1309,17 @@ def run_report(request, report):
|
|||||||
|
|
||||||
column_headings = [col1heading] + possible_options
|
column_headings = [col1heading] + possible_options
|
||||||
|
|
||||||
|
# Prepare a dict to store totals for each possible option
|
||||||
|
totals = {}
|
||||||
# Pivot the data so that 'header1' fields are always first column
|
# Pivot the data so that 'header1' fields are always first column
|
||||||
# in the row, and 'possible_options' are always the 2nd - nth columns.
|
# in the row, and 'possible_options' are always the 2nd - nth columns.
|
||||||
for item in header1:
|
for item in header1:
|
||||||
data = []
|
data = []
|
||||||
for hdr in possible_options:
|
for hdr in possible_options:
|
||||||
|
if hdr not in totals.keys():
|
||||||
|
totals[hdr] = summarytable[item, hdr]
|
||||||
|
else:
|
||||||
|
totals[hdr] += summarytable[item, hdr]
|
||||||
data.append(summarytable[item, hdr])
|
data.append(summarytable[item, hdr])
|
||||||
table.append([item] + data)
|
table.append([item] + data)
|
||||||
|
|
||||||
@ -1332,10 +1338,16 @@ def run_report(request, report):
|
|||||||
for series in table:
|
for series in table:
|
||||||
series_names.append(series[0])
|
series_names.append(series[0])
|
||||||
|
|
||||||
|
# Add total row to table
|
||||||
|
total_data = ['Total']
|
||||||
|
for hdr in possible_options:
|
||||||
|
total_data.append(str(totals[hdr]))
|
||||||
|
|
||||||
return render(request, 'helpdesk/report_output.html', {
|
return render(request, 'helpdesk/report_output.html', {
|
||||||
'title': title,
|
'title': title,
|
||||||
'charttype': charttype,
|
'charttype': charttype,
|
||||||
'data': table,
|
'data': table,
|
||||||
|
'total_data': total_data,
|
||||||
'headings': column_headings,
|
'headings': column_headings,
|
||||||
'series_names': series_names,
|
'series_names': series_names,
|
||||||
'morrisjs_data': morrisjs_data,
|
'morrisjs_data': morrisjs_data,
|
||||||
|
Loading…
Reference in New Issue
Block a user