From 2f5c9673de670790cf0cff0685a2fe63b11d0a03 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Thu, 4 Mar 2021 19:55:57 +0800 Subject: [PATCH] Added 'excelexporters.combinedequipmentoutput.export()' method --- myems-api/reports/combinedequipmentoutput.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/myems-api/reports/combinedequipmentoutput.py b/myems-api/reports/combinedequipmentoutput.py index e97b3b07..60e30665 100644 --- a/myems-api/reports/combinedequipmentoutput.py +++ b/myems-api/reports/combinedequipmentoutput.py @@ -5,6 +5,7 @@ import config from datetime import datetime, timedelta, timezone from core import utilities from decimal import Decimal +import excelexporters.combinedequipmentoutput class Reporting: @@ -478,4 +479,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.combinedequipmentoutput.export(result, + combined_equipment['name'], + reporting_start_datetime_local, + reporting_end_datetime_local, + period_type) + resp.body = json.dumps(result)