From 62640ac367c6d2791afd715036ce1c627e011337 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 10 Apr 2021 19:41:09 +0800 Subject: [PATCH] added associated paramters data to excel exporter of tenantload in API --- myems-api/reports/tenantload.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/myems-api/reports/tenantload.py b/myems-api/reports/tenantload.py index a87b02e7..c0f828bf 100644 --- a/myems-api/reports/tenantload.py +++ b/myems-api/reports/tenantload.py @@ -524,13 +524,15 @@ class Reporting: else None) result['reporting_period']['averages_increment_rate'].append( (reporting[energy_category_id]['average'] - base[energy_category_id]['average']) / - base[energy_category_id]['average'] if (base[energy_category_id]['average'] is not None and + base[energy_category_id]['average'] if (reporting[energy_category_id]['average'] is not None and + base[energy_category_id]['average'] is not None and base[energy_category_id]['average'] > Decimal(0.0)) else None) result['reporting_period']['maximums'].append(reporting[energy_category_id]['maximum']) result['reporting_period']['maximums_increment_rate'].append( (reporting[energy_category_id]['maximum'] - base[energy_category_id]['maximum']) / - base[energy_category_id]['maximum'] if (base[energy_category_id]['maximum'] is not None and + base[energy_category_id]['maximum'] if (reporting[energy_category_id]['maximum'] is not None and + base[energy_category_id]['maximum'] is not None and base[energy_category_id]['maximum'] > Decimal(0.0)) else None) result['reporting_period']['maximums_per_unit_area'].append( @@ -542,7 +544,8 @@ class Reporting: result['reporting_period']['factors'].append(reporting[energy_category_id]['factor']) result['reporting_period']['factors_increment_rate'].append( (reporting[energy_category_id]['factor'] - base[energy_category_id]['factor']) / - base[energy_category_id]['factor'] if (base[energy_category_id]['factor'] is not None and + base[energy_category_id]['factor'] if (reporting[energy_category_id]['factor'] is not None and + base[energy_category_id]['factor'] is not None and base[energy_category_id]['factor'] > Decimal(0.0)) else None)