From 0d6c14b999abf4a04db4541abb5f320ef5de2014 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 3 Mar 2021 11:47:26 +0800 Subject: [PATCH] Added 'excelexporters.combinedequipmentenergyitem.export()' method --- myems-api/reports/combinedequipmentenergyitem.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/myems-api/reports/combinedequipmentenergyitem.py b/myems-api/reports/combinedequipmentenergyitem.py index bccdf7c0..5e25004a 100644 --- a/myems-api/reports/combinedequipmentenergyitem.py +++ b/myems-api/reports/combinedequipmentenergyitem.py @@ -5,6 +5,7 @@ import config from datetime import datetime, timedelta, timezone from core import utilities from decimal import Decimal +import excelexporters.combinedequipmentenergyitem class Reporting: @@ -516,4 +517,11 @@ class Reporting: "values": parameters_data['values'] } + # export result to Excel file and then encode the file to base64 string + result['excel_bytes_base64'] = excelexporters.combinedequipmentenergyitem.export(result, + combined_equipment['name'], + reporting_start_datetime_local, + reporting_end_datetime_local, + period_type) + resp.body = json.dumps(result)