extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-08-19 04:06:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bugfixes from 0.2.23-devel

Browse Source
This commit is contained in:
Garret Wassermann
2020-10-12 03:19:46 -04:00
parent 22d3a59390 5d70fc167d
commit 6b335590e6
6 changed files with 115 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
helpdesk/views/staff.py
View File

@@ -1350,11 +1350,17 @@ def run_report(request, report):
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
# in the row, and 'possible_options' are always the 2nd - nth columns.
for item in header1:
data = []
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])
table.append([item] + data)
@@ -1373,10 +1379,16 @@ def run_report(request, report):
for series in table:
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', {
'title': title,
'charttype': charttype,
'data': table,
'total_data': total_data,
'headings': column_headings,
'series_names': series_names,
'morrisjs_data': morrisjs_data,