From 6a1b986f56b22ca8cfb3f250ef9a84418bd1cb23 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 23 Mar 2021 15:54:48 +0800 Subject: [PATCH] fixed NoneType error in TenantLoad Report API --- myems-api/excelexporters/tenantload.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index 6969079e..0118835d 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.py @@ -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