seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed NoneType error in TenantLoad Report API 

Merge branch 'develop'
pull/35/head^2
13621160019@163.com 2021-03-23 15:54:56 +08:00
parent f46ceb8790 6a1b986f56
commit 66dcba4cce
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
myems-api/excelexporters/tenantload.py
View File

@ -205,7 +205,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['averages'][i], 2)
ws[col + str(current_row_number)] = round(reporting_period_data['averages'][i], 2) \
if reporting_period_data['averages'][i] is not None else 'N/A'
current_row_number += 1
@ -219,7 +220,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['averages_per_unit_area'][i], 2)
ws[col + str(current_row_number)] = round(reporting_period_data['averages_per_unit_area'][i], 2) \
if reporting_period_data['averages_per_unit_area'][i] is not None else 'N/A'
current_row_number += 1
@ -268,7 +270,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['maximums'][i], 2)
ws[col + str(current_row_number)] = round(reporting_period_data['maximums'][i], 2) \
if reporting_period_data['maximums'][i] is not None else 'N/A'
current_row_number += 1
@ -282,7 +285,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d
ws[col + str(current_row_number)].font = name_font
ws[col + str(current_row_number)].alignment = c_c_alignment
ws[col + str(current_row_number)].border = f_border
ws[col + str(current_row_number)] = round(reporting_period_data['maximums_per_unit_area'][i], 2)
ws[col + str(current_row_number)] = round(reporting_period_data['maximums_per_unit_area'][i], 2) \
if reporting_period_data['maximums_per_unit_area'][i] is not None else 'N/A'
current_row_number += 1