From dafbe77460d83b79a75ce279d6b436a28053a30b Mon Sep 17 00:00:00 2001 From: hyh123a Date: Mon, 19 Jul 2021 17:43:10 +0800 Subject: [PATCH 1/4] modify the sheet title for excel --- myems-api/excelexporters/combinedequipmentbatch.py | 2 ++ myems-api/excelexporters/combinedequipmentcost.py | 1 + myems-api/excelexporters/combinedequipmentefficiency.py | 1 + myems-api/excelexporters/combinedequipmentenergycategory.py | 1 + myems-api/excelexporters/combinedequipmentenergyitem.py | 1 + myems-api/excelexporters/combinedequipmentincome.py | 1 + myems-api/excelexporters/combinedequipmentload.py | 1 + myems-api/excelexporters/combinedequipmentoutput.py | 1 + myems-api/excelexporters/combinedequipmentsaving.py | 1 + myems-api/excelexporters/combinedequipmentstatistics.py | 1 + myems-api/excelexporters/equipmentbatch.py | 1 + myems-api/excelexporters/equipmentcost.py | 1 + myems-api/excelexporters/equipmentefficiency.py | 1 + myems-api/excelexporters/equipmentenergycategory.py | 1 + myems-api/excelexporters/equipmentenergyitem.py | 1 + myems-api/excelexporters/equipmentincome.py | 1 + myems-api/excelexporters/equipmentload.py | 1 + myems-api/excelexporters/equipmentoutput.py | 1 + myems-api/excelexporters/equipmentsaving.py | 1 + myems-api/excelexporters/equipmentstatistics.py | 1 + myems-api/excelexporters/equipmenttracking.py | 1 + myems-api/excelexporters/metercost.py | 2 +- myems-api/excelexporters/meterenergy.py | 1 + myems-api/excelexporters/metersubmetersbalance.py | 1 + myems-api/excelexporters/metertracking.py | 1 + myems-api/excelexporters/metertrend.py | 1 + myems-api/excelexporters/offlinemetercost.py | 2 +- myems-api/excelexporters/offlinemeterenergy.py | 1 + myems-api/excelexporters/shopfloorbatch.py | 1 + myems-api/excelexporters/shopfloorcost.py | 1 + myems-api/excelexporters/shopfloorenergycategory.py | 1 + myems-api/excelexporters/shopfloorenergyitem.py | 1 + myems-api/excelexporters/shopfloorload.py | 1 + myems-api/excelexporters/shopfloorsaving.py | 1 + myems-api/excelexporters/shopfloorstatistics.py | 1 + myems-api/excelexporters/spacecost.py | 1 + myems-api/excelexporters/spaceefficiency.py | 1 + myems-api/excelexporters/spaceenergycategory.py | 1 + myems-api/excelexporters/spaceenergyitem.py | 1 + myems-api/excelexporters/spaceincome.py | 1 + myems-api/excelexporters/spaceload.py | 2 +- myems-api/excelexporters/spaceoutput.py | 1 + myems-api/excelexporters/spacesaving.py | 1 + myems-api/excelexporters/spacestatistics.py | 1 + myems-api/excelexporters/storebatch.py | 1 + myems-api/excelexporters/storecost.py | 1 + myems-api/excelexporters/storeenergycategory.py | 1 + myems-api/excelexporters/storeenergyitem.py | 1 + myems-api/excelexporters/storeload.py | 1 + myems-api/excelexporters/storesaving.py | 1 + myems-api/excelexporters/storestatistics.py | 1 + myems-api/excelexporters/tenantbatch.py | 1 + myems-api/excelexporters/tenantbill.py | 1 + myems-api/excelexporters/tenantcost.py | 1 + myems-api/excelexporters/tenantenergycategory.py | 1 + myems-api/excelexporters/tenantenergyitem.py | 1 + myems-api/excelexporters/tenantload.py | 2 +- myems-api/excelexporters/tenantsaving.py | 1 + myems-api/excelexporters/tenantstatistics.py | 1 + myems-api/excelexporters/virtualmetercost.py | 2 +- myems-api/excelexporters/virtualmeterenergy.py | 2 +- 61 files changed, 62 insertions(+), 6 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentbatch.py b/myems-api/excelexporters/combinedequipmentbatch.py index fb3dac46..847396f5 100644 --- a/myems-api/excelexporters/combinedequipmentbatch.py +++ b/myems-api/excelexporters/combinedequipmentbatch.py @@ -52,6 +52,8 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active + ws.title = "123" + ws.title = "" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index d68b58b4..330116d0 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -72,6 +72,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index c7698950..74c71b5a 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index ae31e952..17878cb2 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.py @@ -70,6 +70,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index d250ebcc..9ae80eba 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -69,6 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index a8dd4cc9..7631fe9e 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -72,6 +72,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index 1bcb6e95..c836368b 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -67,6 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index dd05175d..6ffe4db4 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/myems-api/excelexporters/combinedequipmentoutput.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index d1915e39..6768074d 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.py @@ -72,6 +72,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index 3ddc8178..0b0ad35f 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/myems-api/excelexporters/combinedequipmentstatistics.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentbatch.py b/myems-api/excelexporters/equipmentbatch.py index 8724b61d..f63b8477 100644 --- a/myems-api/excelexporters/equipmentbatch.py +++ b/myems-api/excelexporters/equipmentbatch.py @@ -52,6 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 0e752072..14047f8d 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.py @@ -71,6 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index 18165e59..ef450206 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index c7f2afa9..84c9c9be 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -71,6 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index 94cdc15c..c9c9cb20 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/myems-api/excelexporters/equipmentenergyitem.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index e228f7ed..8dfbec64 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index f53d263a..a5dd3d4a 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/myems-api/excelexporters/equipmentload.py @@ -67,6 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 0c98a3b4..5c72e778 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/myems-api/excelexporters/equipmentoutput.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index ec2f59e0..b5f64adc 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index 3aeff0e9..516e25ff 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/myems-api/excelexporters/equipmentstatistics.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmenttracking.py b/myems-api/excelexporters/equipmenttracking.py index ac8e3ccb..29224678 100644 --- a/myems-api/excelexporters/equipmenttracking.py +++ b/myems-api/excelexporters/equipmenttracking.py @@ -55,6 +55,7 @@ def generate_excel(report, space_name): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 118 diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index 1bf4d1ba..79e25dbb 100644 --- a/myems-api/excelexporters/metercost.py +++ b/myems-api/excelexporters/metercost.py @@ -65,7 +65,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index b8e32905..10ae63cb 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/myems-api/excelexporters/meterenergy.py @@ -60,6 +60,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index f8c238e7..344ca7fb 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/myems-api/excelexporters/metersubmetersbalance.py @@ -59,6 +59,7 @@ def export(result, name, reporting_start_datetime_local, reporting_end_datetime_ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/metertracking.py b/myems-api/excelexporters/metertracking.py index c51f1d2b..c7d415b8 100644 --- a/myems-api/excelexporters/metertracking.py +++ b/myems-api/excelexporters/metertracking.py @@ -57,6 +57,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index 972c4f91..53a56557 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/myems-api/excelexporters/metertrend.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/offlinemetercost.py b/myems-api/excelexporters/offlinemetercost.py index e932afe4..20ad3ff9 100644 --- a/myems-api/excelexporters/offlinemetercost.py +++ b/myems-api/excelexporters/offlinemetercost.py @@ -64,7 +64,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/offlinemeterenergy.py b/myems-api/excelexporters/offlinemeterenergy.py index 6eebc35a..8e59219e 100644 --- a/myems-api/excelexporters/offlinemeterenergy.py +++ b/myems-api/excelexporters/offlinemeterenergy.py @@ -59,6 +59,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py index f24d7485..4f58ea2f 100644 --- a/myems-api/excelexporters/shopfloorbatch.py +++ b/myems-api/excelexporters/shopfloorbatch.py @@ -52,6 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 441a31ed..b977546a 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -69,6 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 1474d22e..a89997c5 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -69,6 +69,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 7091c7c4..1b153c87 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 8b6e8806..3251b3dd 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -67,6 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 9ad487db..a4de9db9 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -69,6 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index 0ac147c2..dcca4642 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -67,6 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index 40bbe4d5..c9c60395 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/myems-api/excelexporters/spacecost.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index d66225e8..1e3e8e98 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/myems-api/excelexporters/spaceefficiency.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index b078b48c..ce8fff67 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/myems-api/excelexporters/spaceenergycategory.py @@ -71,6 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index 8d9cdee7..4b94f097 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/myems-api/excelexporters/spaceenergyitem.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index 83e205bb..f24862a7 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/myems-api/excelexporters/spaceincome.py @@ -71,6 +71,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index 48425220..5c93f19f 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/myems-api/excelexporters/spaceload.py @@ -68,7 +68,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index 1114ecad..290f990a 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/myems-api/excelexporters/spaceoutput.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index 1346cd60..5b5a9bc2 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/myems-api/excelexporters/spacesaving.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index 5d92d9c0..2e3f323d 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/myems-api/excelexporters/spacestatistics.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storebatch.py b/myems-api/excelexporters/storebatch.py index e2b2f71d..2e8bc9f6 100644 --- a/myems-api/excelexporters/storebatch.py +++ b/myems-api/excelexporters/storebatch.py @@ -52,6 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 37fbf883..2f8273aa 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -70,6 +70,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 118 diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index 85687a50..5bad7c58 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -69,6 +69,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 64f570b0..710e9f96 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/myems-api/excelexporters/storeenergyitem.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index b997d04c..cd0124d8 100644 --- a/myems-api/excelexporters/storeload.py +++ b/myems-api/excelexporters/storeload.py @@ -67,6 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index 9ad487db..a4de9db9 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.py @@ -69,6 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index f8a32203..19902da4 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantbatch.py b/myems-api/excelexporters/tenantbatch.py index 5eb987a7..034c1ba9 100644 --- a/myems-api/excelexporters/tenantbatch.py +++ b/myems-api/excelexporters/tenantbatch.py @@ -52,6 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantbill.py b/myems-api/excelexporters/tenantbill.py index e5627b1e..07f941a2 100644 --- a/myems-api/excelexporters/tenantbill.py +++ b/myems-api/excelexporters/tenantbill.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height for i in range(1, 11 + 1): diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index 8f94a588..aaaee78a 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.py @@ -71,6 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index 3a2e684d..2e29c680 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/myems-api/excelexporters/tenantenergycategory.py @@ -71,6 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index bd990495..a29e24fb 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/myems-api/excelexporters/tenantenergyitem.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index 0b6f1357..5bd83e21 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.py @@ -68,7 +68,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index efbff5f5..481a554b 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/myems-api/excelexporters/tenantsaving.py @@ -70,6 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index d7f34a99..60c3e68b 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/myems-api/excelexporters/tenantstatistics.py @@ -68,6 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/virtualmetercost.py b/myems-api/excelexporters/virtualmetercost.py index 1d0040de..6dc770cb 100644 --- a/myems-api/excelexporters/virtualmetercost.py +++ b/myems-api/excelexporters/virtualmetercost.py @@ -64,7 +64,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - + ws.title = "123" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/virtualmeterenergy.py b/myems-api/excelexporters/virtualmeterenergy.py index 73ed2313..0ec50075 100644 --- a/myems-api/excelexporters/virtualmeterenergy.py +++ b/myems-api/excelexporters/virtualmeterenergy.py @@ -61,7 +61,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb = Workbook() # todo ws = wb.active - + ws.title = "VirtualMeterEnergy" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): From d8c26d571d941ae004e5ea0c6a1fe3a8ee103bbb Mon Sep 17 00:00:00 2001 From: hyh123a Date: Mon, 19 Jul 2021 18:09:51 +0800 Subject: [PATCH 2/4] modify the excel title --- myems-api/excelexporters/combinedequipmentbatch.py | 3 +-- myems-api/excelexporters/combinedequipmentcost.py | 2 +- myems-api/excelexporters/combinedequipmentefficiency.py | 2 +- myems-api/excelexporters/combinedequipmentenergycategory.py | 2 +- myems-api/excelexporters/combinedequipmentenergyitem.py | 2 +- myems-api/excelexporters/combinedequipmentincome.py | 2 +- myems-api/excelexporters/combinedequipmentload.py | 2 +- myems-api/excelexporters/combinedequipmentoutput.py | 2 +- myems-api/excelexporters/combinedequipmentsaving.py | 2 +- myems-api/excelexporters/combinedequipmentstatistics.py | 2 +- myems-api/excelexporters/equipmentbatch.py | 2 +- myems-api/excelexporters/equipmentcost.py | 2 +- myems-api/excelexporters/equipmentefficiency.py | 2 +- myems-api/excelexporters/equipmentenergycategory.py | 2 +- myems-api/excelexporters/equipmentenergyitem.py | 2 +- myems-api/excelexporters/equipmentincome.py | 2 +- myems-api/excelexporters/equipmentload.py | 2 +- myems-api/excelexporters/equipmentoutput.py | 2 +- myems-api/excelexporters/equipmentsaving.py | 2 +- myems-api/excelexporters/equipmentstatistics.py | 2 +- myems-api/excelexporters/equipmenttracking.py | 2 +- myems-api/excelexporters/metercost.py | 2 +- myems-api/excelexporters/meterenergy.py | 2 +- myems-api/excelexporters/metersubmetersbalance.py | 2 +- myems-api/excelexporters/metertracking.py | 2 +- myems-api/excelexporters/metertrend.py | 2 +- myems-api/excelexporters/offlinemetercost.py | 2 +- myems-api/excelexporters/offlinemeterenergy.py | 2 +- myems-api/excelexporters/shopfloorbatch.py | 2 +- myems-api/excelexporters/shopfloorcost.py | 2 +- myems-api/excelexporters/shopfloorenergycategory.py | 2 +- myems-api/excelexporters/shopfloorenergyitem.py | 2 +- myems-api/excelexporters/shopfloorload.py | 2 +- myems-api/excelexporters/shopfloorsaving.py | 2 +- myems-api/excelexporters/shopfloorstatistics.py | 2 +- myems-api/excelexporters/spacecost.py | 2 +- myems-api/excelexporters/spaceefficiency.py | 2 +- myems-api/excelexporters/spaceenergycategory.py | 2 +- myems-api/excelexporters/spaceenergyitem.py | 2 +- myems-api/excelexporters/spaceincome.py | 2 +- myems-api/excelexporters/spaceload.py | 2 +- myems-api/excelexporters/spaceoutput.py | 2 +- myems-api/excelexporters/spacesaving.py | 2 +- myems-api/excelexporters/spacestatistics.py | 2 +- myems-api/excelexporters/storebatch.py | 2 +- myems-api/excelexporters/storecost.py | 2 +- myems-api/excelexporters/storeenergycategory.py | 2 +- myems-api/excelexporters/storeenergyitem.py | 2 +- myems-api/excelexporters/storeload.py | 2 +- myems-api/excelexporters/storesaving.py | 2 +- myems-api/excelexporters/storestatistics.py | 2 +- myems-api/excelexporters/tenantbatch.py | 2 +- myems-api/excelexporters/tenantbill.py | 2 +- myems-api/excelexporters/tenantcost.py | 2 +- myems-api/excelexporters/tenantenergycategory.py | 2 +- myems-api/excelexporters/tenantenergyitem.py | 2 +- myems-api/excelexporters/tenantload.py | 2 +- myems-api/excelexporters/tenantsaving.py | 2 +- myems-api/excelexporters/tenantstatistics.py | 2 +- myems-api/excelexporters/virtualmetercost.py | 2 +- 60 files changed, 60 insertions(+), 61 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentbatch.py b/myems-api/excelexporters/combinedequipmentbatch.py index 847396f5..68416b4b 100644 --- a/myems-api/excelexporters/combinedequipmentbatch.py +++ b/myems-api/excelexporters/combinedequipmentbatch.py @@ -52,8 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active - ws.title = "123" - ws.title = "" + ws.title = "CombinedEquipmentBatch" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index 330116d0..55032407 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -72,7 +72,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentCost" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index 74c71b5a..65411790 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentEfficiency" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index 17878cb2..6f4533f2 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.py @@ -70,7 +70,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentEnergyCategory" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index 9ae80eba..bcb33419 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -69,7 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentEnergyItem" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 7631fe9e..983d2137 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -72,7 +72,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentIncome" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index c836368b..60ba2aec 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -67,7 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentLoad" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index 6ffe4db4..00994261 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/myems-api/excelexporters/combinedequipmentoutput.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentOutput" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index 6768074d..f92abd4e 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.py @@ -72,7 +72,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentSaving" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index 0b0ad35f..f21ccb00 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/myems-api/excelexporters/combinedequipmentstatistics.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "CombinedEquipmentStatistics" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentbatch.py b/myems-api/excelexporters/equipmentbatch.py index f63b8477..586990d1 100644 --- a/myems-api/excelexporters/equipmentbatch.py +++ b/myems-api/excelexporters/equipmentbatch.py @@ -52,7 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentBatch" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 14047f8d..2e081812 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.py @@ -71,7 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentCost" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index ef450206..c8c5eb78 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentEfficiency" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index 84c9c9be..b537fa67 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -71,7 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentEnergyCategory" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index c9c9cb20..d6b34f5b 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/myems-api/excelexporters/equipmentenergyitem.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentEnergyItem" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index 8dfbec64..5ff99f37 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentIncome" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index a5dd3d4a..4d395998 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/myems-api/excelexporters/equipmentload.py @@ -67,7 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentLoad" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 5c72e778..8e683b49 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/myems-api/excelexporters/equipmentoutput.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentOutput" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index b5f64adc..e4594d22 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentSaving" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index 516e25ff..19f9b6b6 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/myems-api/excelexporters/equipmentstatistics.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentStatistics" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/equipmenttracking.py b/myems-api/excelexporters/equipmenttracking.py index 29224678..cee9f85e 100644 --- a/myems-api/excelexporters/equipmenttracking.py +++ b/myems-api/excelexporters/equipmenttracking.py @@ -55,7 +55,7 @@ def generate_excel(report, space_name): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "EquipmentTracking" # Row height ws.row_dimensions[1].height = 118 diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index 79e25dbb..f0246e42 100644 --- a/myems-api/excelexporters/metercost.py +++ b/myems-api/excelexporters/metercost.py @@ -65,7 +65,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - ws.title = "123" + ws.title = "MeterCost" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index 10ae63cb..cccd7186 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/myems-api/excelexporters/meterenergy.py @@ -60,7 +60,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "MeterEnergy" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index 344ca7fb..ff700236 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/myems-api/excelexporters/metersubmetersbalance.py @@ -59,7 +59,7 @@ def export(result, name, reporting_start_datetime_local, reporting_end_datetime_ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "MeterSubmetersBalance" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/metertracking.py b/myems-api/excelexporters/metertracking.py index c7d415b8..ea92594b 100644 --- a/myems-api/excelexporters/metertracking.py +++ b/myems-api/excelexporters/metertracking.py @@ -57,7 +57,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "MeterTracking" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index 53a56557..6c5fe719 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/myems-api/excelexporters/metertrend.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "MeterTrend" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/offlinemetercost.py b/myems-api/excelexporters/offlinemetercost.py index 20ad3ff9..a77415e7 100644 --- a/myems-api/excelexporters/offlinemetercost.py +++ b/myems-api/excelexporters/offlinemetercost.py @@ -64,7 +64,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - ws.title = "123" + ws.title = "OfflineMeterCost" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/offlinemeterenergy.py b/myems-api/excelexporters/offlinemeterenergy.py index 8e59219e..20ad9c15 100644 --- a/myems-api/excelexporters/offlinemeterenergy.py +++ b/myems-api/excelexporters/offlinemeterenergy.py @@ -59,7 +59,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "OfflineMeterEnergy" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py index 4f58ea2f..0502832c 100644 --- a/myems-api/excelexporters/shopfloorbatch.py +++ b/myems-api/excelexporters/shopfloorbatch.py @@ -52,7 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorBatch" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index b977546a..9bd7ea8b 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -69,7 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorCost" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index a89997c5..3b45f5e5 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -69,7 +69,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorEnergyCategory" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 1b153c87..5485ce20 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorEnergyItem" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 3251b3dd..bd226e8e 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -67,7 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorLoad" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index a4de9db9..869e0c88 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -69,7 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorSaving" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index dcca4642..f3871ede 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -67,7 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "ShopFloorStatistics" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index c9c60395..c00d0cc9 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/myems-api/excelexporters/spacecost.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceCost" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index 1e3e8e98..7cb08dfc 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/myems-api/excelexporters/spaceefficiency.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceEfficiency" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index ce8fff67..8a5951ad 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/myems-api/excelexporters/spaceenergycategory.py @@ -71,7 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceEnergyCategory" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index 4b94f097..8767d57b 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/myems-api/excelexporters/spaceenergyitem.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceEnergyItem" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index f24862a7..b4254c65 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/myems-api/excelexporters/spaceincome.py @@ -71,7 +71,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceIncome" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index 5c93f19f..d4380ad5 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/myems-api/excelexporters/spaceload.py @@ -68,7 +68,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - ws.title = "123" + ws.title = "SpaceLoad" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index 290f990a..e41cf23e 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/myems-api/excelexporters/spaceoutput.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceOutput" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index 5b5a9bc2..3342eff9 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/myems-api/excelexporters/spacesaving.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceSaving" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index 2e3f323d..eefda06f 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/myems-api/excelexporters/spacestatistics.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "SpaceStatistics" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storebatch.py b/myems-api/excelexporters/storebatch.py index 2e8bc9f6..5fef655b 100644 --- a/myems-api/excelexporters/storebatch.py +++ b/myems-api/excelexporters/storebatch.py @@ -52,7 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreBatch" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 2f8273aa..14183597 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -70,7 +70,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreCost" # Row height ws.row_dimensions[1].height = 118 diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index 5bad7c58..e4e448ee 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -69,7 +69,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreEnergyCategory" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 710e9f96..898bffe8 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/myems-api/excelexporters/storeenergyitem.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreEnergyItem" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index cd0124d8..a5f63645 100644 --- a/myems-api/excelexporters/storeload.py +++ b/myems-api/excelexporters/storeload.py @@ -67,7 +67,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreLoad" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index a4de9db9..1aec8830 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.py @@ -69,7 +69,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreSaving" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index 19902da4..00528e05 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "StoreStatistics" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantbatch.py b/myems-api/excelexporters/tenantbatch.py index 034c1ba9..c811764d 100644 --- a/myems-api/excelexporters/tenantbatch.py +++ b/myems-api/excelexporters/tenantbatch.py @@ -52,7 +52,7 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantBatch" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantbill.py b/myems-api/excelexporters/tenantbill.py index 07f941a2..6d56607d 100644 --- a/myems-api/excelexporters/tenantbill.py +++ b/myems-api/excelexporters/tenantbill.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantBill" # Row height for i in range(1, 11 + 1): diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index aaaee78a..73845ee5 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.py @@ -71,7 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantCost" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index 2e29c680..93a746a4 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/myems-api/excelexporters/tenantenergycategory.py @@ -71,7 +71,7 @@ def generate_excel(report, wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantEnergyCategory" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index a29e24fb..8d00fed9 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/myems-api/excelexporters/tenantenergyitem.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantEnergyItem" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index 5bd83e21..80151363 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.py @@ -68,7 +68,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - ws.title = "123" + ws.title = "TenantLoad" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index 481a554b..890a8326 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/myems-api/excelexporters/tenantsaving.py @@ -70,7 +70,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantSaving" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index 60c3e68b..3dec847b 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/myems-api/excelexporters/tenantstatistics.py @@ -68,7 +68,7 @@ def generate_excel(report, period_type): wb = Workbook() ws = wb.active - ws.title = "123" + ws.title = "TenantStatistics" # Row height ws.row_dimensions[1].height = 102 diff --git a/myems-api/excelexporters/virtualmetercost.py b/myems-api/excelexporters/virtualmetercost.py index 6dc770cb..0c8388a6 100644 --- a/myems-api/excelexporters/virtualmetercost.py +++ b/myems-api/excelexporters/virtualmetercost.py @@ -64,7 +64,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # todo ws = wb.active - ws.title = "123" + ws.title = "VirtualMeterCost" # Row height ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): From a57f59918c67ba1b978f1a8eab53000ec53ccb73 Mon Sep 17 00:00:00 2001 From: hyh123a Date: Mon, 19 Jul 2021 18:18:10 +0800 Subject: [PATCH 3/4] modify the field to parameters --- myems-api/excelexporters/combinedequipmentcost.py | 9 +++++---- .../excelexporters/combinedequipmentefficiency.py | 9 +++++---- .../excelexporters/combinedequipmentenergycategory.py | 9 +++++---- .../excelexporters/combinedequipmentenergyitem.py | 9 +++++---- myems-api/excelexporters/combinedequipmentincome.py | 9 +++++---- myems-api/excelexporters/combinedequipmentload.py | 9 +++++---- myems-api/excelexporters/combinedequipmentoutput.py | 9 +++++---- myems-api/excelexporters/combinedequipmentsaving.py | 9 +++++---- .../excelexporters/combinedequipmentstatistics.py | 9 +++++---- myems-api/excelexporters/equipmentcost.py | 9 +++++---- myems-api/excelexporters/equipmentefficiency.py | 9 +++++---- myems-api/excelexporters/equipmentenergycategory.py | 9 +++++---- myems-api/excelexporters/equipmentenergyitem.py | 9 +++++---- myems-api/excelexporters/equipmentincome.py | 9 +++++---- myems-api/excelexporters/equipmentload.py | 9 +++++---- myems-api/excelexporters/equipmentoutput.py | 9 +++++---- myems-api/excelexporters/equipmentsaving.py | 9 +++++---- myems-api/excelexporters/equipmentstatistics.py | 9 +++++---- myems-api/excelexporters/metercost.py | 9 +++++---- myems-api/excelexporters/meterenergy.py | 9 +++++---- myems-api/excelexporters/metersubmetersbalance.py | 9 +++++---- myems-api/excelexporters/metertrend.py | 9 +++++---- myems-api/excelexporters/shopfloorcost.py | 9 +++++---- myems-api/excelexporters/shopfloorenergycategory.py | 9 +++++---- myems-api/excelexporters/shopfloorenergyitem.py | 9 +++++---- myems-api/excelexporters/shopfloorload.py | 9 +++++---- myems-api/excelexporters/shopfloorsaving.py | 9 +++++---- myems-api/excelexporters/shopfloorstatistics.py | 9 +++++---- myems-api/excelexporters/spacecost.py | 9 +++++---- myems-api/excelexporters/spaceefficiency.py | 9 +++++---- myems-api/excelexporters/spaceenergycategory.py | 9 +++++---- myems-api/excelexporters/spaceenergyitem.py | 9 +++++---- myems-api/excelexporters/spaceincome.py | 9 +++++---- myems-api/excelexporters/spaceload.py | 9 +++++---- myems-api/excelexporters/spaceoutput.py | 9 +++++---- myems-api/excelexporters/spacesaving.py | 9 +++++---- myems-api/excelexporters/spacestatistics.py | 9 +++++---- myems-api/excelexporters/storecost.py | 9 +++++---- myems-api/excelexporters/storeenergycategory.py | 9 +++++---- myems-api/excelexporters/storeenergyitem.py | 9 +++++---- myems-api/excelexporters/storeload.py | 9 +++++---- myems-api/excelexporters/storesaving.py | 9 +++++---- myems-api/excelexporters/storestatistics.py | 9 +++++---- myems-api/excelexporters/tenantcost.py | 9 +++++---- myems-api/excelexporters/tenantenergycategory.py | 9 +++++---- myems-api/excelexporters/tenantenergyitem.py | 10 +++++----- myems-api/excelexporters/tenantload.py | 9 +++++---- myems-api/excelexporters/tenantsaving.py | 9 +++++---- myems-api/excelexporters/tenantstatistics.py | 9 +++++---- 49 files changed, 245 insertions(+), 197 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index 55032407..c781f29d 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -685,7 +685,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -744,7 +745,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -800,7 +801,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -817,7 +818,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index 65411790..f8da4d24 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -416,7 +416,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -475,7 +476,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -531,7 +532,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -548,7 +549,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index 6f4533f2..21c38d79 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.py @@ -555,7 +555,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -614,7 +615,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -669,7 +670,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -686,7 +687,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index bcb33419..7cd42153 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -515,7 +515,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -574,7 +575,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -630,7 +631,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -647,7 +648,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 983d2137..542de3a1 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -556,7 +556,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -615,7 +616,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -671,7 +672,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -688,7 +689,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index 60ba2aec..23b2f0cb 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -464,7 +464,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -523,7 +524,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -579,7 +580,7 @@ def generate_excel(report, ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -596,7 +597,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index 00994261..1e19486e 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/myems-api/excelexporters/combinedequipmentoutput.py @@ -455,7 +455,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -514,7 +515,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -570,7 +571,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -587,7 +588,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index f92abd4e..7961498e 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.py @@ -645,7 +645,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -704,7 +705,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -760,7 +761,7 @@ def generate_excel(report, ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -777,7 +778,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index f21ccb00..8b265b29 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/myems-api/excelexporters/combinedequipmentstatistics.py @@ -495,7 +495,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -554,7 +555,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -610,7 +611,7 @@ def generate_excel(report, ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -627,7 +628,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 2e081812..5b8162c4 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.py @@ -548,7 +548,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -607,7 +608,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -663,7 +664,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -680,7 +681,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index c8c5eb78..853f92f5 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.py @@ -416,7 +416,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -475,7 +476,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -531,7 +532,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -548,7 +549,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index b537fa67..f66986f8 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -596,7 +596,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -655,7 +656,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -711,7 +712,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -728,7 +729,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index d6b34f5b..a9a808e2 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/myems-api/excelexporters/equipmentenergyitem.py @@ -459,7 +459,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -518,7 +519,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -574,7 +575,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -591,7 +592,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index 5ff99f37..b4d86174 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.py @@ -480,7 +480,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -539,7 +540,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -595,7 +596,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -612,7 +613,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index 4d395998..3262129f 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/myems-api/excelexporters/equipmentload.py @@ -401,7 +401,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -460,7 +461,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -516,7 +517,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -533,7 +534,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 8e683b49..8c727d27 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/myems-api/excelexporters/equipmentoutput.py @@ -398,7 +398,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -457,7 +458,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -513,7 +514,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -530,7 +531,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index e4594d22..46c0f98f 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -585,7 +585,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -644,7 +645,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -700,7 +701,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -717,7 +718,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index 19f9b6b6..a63c4e15 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/myems-api/excelexporters/equipmentstatistics.py @@ -434,7 +434,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -493,7 +494,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -549,7 +550,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -566,7 +567,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index f0246e42..571e23db 100644 --- a/myems-api/excelexporters/metercost.py +++ b/myems-api/excelexporters/metercost.py @@ -393,7 +393,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -452,7 +453,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -508,7 +509,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -525,7 +526,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index cccd7186..1a13e382 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/myems-api/excelexporters/meterenergy.py @@ -412,7 +412,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -471,7 +472,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -527,7 +528,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -544,7 +545,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index ff700236..5dd08ef0 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/myems-api/excelexporters/metersubmetersbalance.py @@ -352,7 +352,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -411,7 +412,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -467,7 +468,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -484,7 +485,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index 6c5fe719..78b4a0d9 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/myems-api/excelexporters/metertrend.py @@ -307,7 +307,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -358,7 +359,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -414,7 +415,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -431,7 +432,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 9bd7ea8b..0569fadc 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -636,7 +636,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -695,7 +696,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -751,7 +752,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -768,7 +769,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 3b45f5e5..92204c37 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -522,7 +522,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -581,7 +582,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -637,7 +638,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -654,7 +655,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 5485ce20..ce5273e2 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -480,7 +480,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -539,7 +540,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -595,7 +596,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -612,7 +613,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index bd226e8e..1e8aefe7 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -453,7 +453,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -512,7 +513,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -568,7 +569,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -585,7 +586,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 869e0c88..8921af39 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -623,7 +623,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -682,7 +683,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -738,7 +739,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -755,7 +756,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index f3871ede..c0bcb6a9 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -558,7 +558,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -617,7 +618,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -673,7 +674,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -690,7 +691,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index c00d0cc9..d253b290 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/myems-api/excelexporters/spacecost.py @@ -674,7 +674,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -733,7 +734,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -789,7 +790,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -806,7 +807,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index 7cb08dfc..dd0d7f20 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/myems-api/excelexporters/spaceefficiency.py @@ -418,7 +418,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -477,7 +478,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -533,7 +534,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -550,7 +551,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index 8a5951ad..24b18057 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/myems-api/excelexporters/spaceenergycategory.py @@ -713,7 +713,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -772,7 +773,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -828,7 +829,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -845,7 +846,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index 8767d57b..8d1e6960 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/myems-api/excelexporters/spaceenergyitem.py @@ -566,7 +566,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -625,7 +626,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -681,7 +682,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -698,7 +699,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index b4254c65..b69d912c 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/myems-api/excelexporters/spaceincome.py @@ -606,7 +606,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -665,7 +666,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -721,7 +722,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -738,7 +739,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index d4380ad5..2ebd0cb0 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/myems-api/excelexporters/spaceload.py @@ -513,7 +513,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -572,7 +573,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -628,7 +629,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -645,7 +646,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index e41cf23e..95e39df7 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/myems-api/excelexporters/spaceoutput.py @@ -502,7 +502,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -561,7 +562,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -617,7 +618,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -634,7 +635,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index 3342eff9..c734f48e 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/myems-api/excelexporters/spacesaving.py @@ -710,7 +710,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -769,7 +770,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -825,7 +826,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -842,7 +843,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index eefda06f..279acd9d 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/myems-api/excelexporters/spacestatistics.py @@ -551,7 +551,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -610,7 +611,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -666,7 +667,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -683,7 +684,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 14183597..00472753 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -598,7 +598,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -657,7 +658,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -713,7 +714,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -730,7 +731,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index e4e448ee..38c53daf 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -523,7 +523,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -582,7 +583,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -638,7 +639,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -655,7 +656,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 898bffe8..2ad6dd28 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/myems-api/excelexporters/storeenergyitem.py @@ -482,7 +482,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -541,7 +542,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -597,7 +598,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -614,7 +615,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index a5f63645..4d5ed3f3 100644 --- a/myems-api/excelexporters/storeload.py +++ b/myems-api/excelexporters/storeload.py @@ -451,7 +451,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -510,7 +511,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -566,7 +567,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -583,7 +584,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index 1aec8830..7dac382d 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.py @@ -623,7 +623,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -682,7 +683,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -738,7 +739,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -755,7 +756,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index 00528e05..cddb418e 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -559,7 +559,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -618,7 +619,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -674,7 +675,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -691,7 +692,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index 73845ee5..b28834be 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.py @@ -579,7 +579,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -638,7 +639,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -694,7 +695,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -711,7 +712,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index 93a746a4..ccb30c16 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/myems-api/excelexporters/tenantenergycategory.py @@ -644,7 +644,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -703,7 +704,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -759,7 +760,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -776,7 +777,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index 8d00fed9..ca168648 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/myems-api/excelexporters/tenantenergyitem.py @@ -474,8 +474,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -534,7 +534,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -590,7 +590,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -607,7 +607,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index 80151363..9ddda203 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.py @@ -515,7 +515,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -574,7 +575,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -630,7 +631,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -647,7 +648,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index 890a8326..f4e89b40 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/myems-api/excelexporters/tenantsaving.py @@ -618,7 +618,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -677,7 +678,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -733,7 +734,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -750,7 +751,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index 3dec847b..7e82c97c 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/myems-api/excelexporters/tenantstatistics.py @@ -550,7 +550,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -609,7 +610,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -665,7 +666,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -682,7 +683,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) From 89f04523f42fb964ba26b4b1bdfda107c2d5a6df Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 20 Jul 2021 17:43:06 +0800 Subject: [PATCH 4/4] fixed warnings of excel exporters in API --- .../excelexporters/combinedequipmentbatch.py | 4 +- .../excelexporters/combinedequipmentcost.py | 11 +--- .../combinedequipmentefficiency.py | 27 +++------ .../combinedequipmentenergycategory.py | 37 ++++-------- .../combinedequipmentenergyitem.py | 33 ++++------- .../excelexporters/combinedequipmentincome.py | 33 ++++------- .../excelexporters/combinedequipmentload.py | 16 +++-- .../excelexporters/combinedequipmentoutput.py | 25 +++----- .../excelexporters/combinedequipmentsaving.py | 18 ++---- .../combinedequipmentstatistics.py | 19 +++--- myems-api/excelexporters/equipmentbatch.py | 10 +--- myems-api/excelexporters/equipmentcost.py | 49 ++++++---------- .../excelexporters/equipmentefficiency.py | 24 ++++---- .../excelexporters/equipmentenergycategory.py | 58 ++++++------------- .../excelexporters/equipmentenergyitem.py | 31 ++++------ myems-api/excelexporters/equipmentincome.py | 27 +++------ myems-api/excelexporters/equipmentload.py | 43 ++++---------- myems-api/excelexporters/equipmentoutput.py | 27 +++------ myems-api/excelexporters/equipmentsaving.py | 31 ++++------ .../excelexporters/equipmentstatistics.py | 33 +++++------ myems-api/excelexporters/equipmenttracking.py | 21 +------ myems-api/excelexporters/metercost.py | 32 +++------- myems-api/excelexporters/meterenergy.py | 43 ++++---------- .../excelexporters/metersubmetersbalance.py | 25 +++----- myems-api/excelexporters/metertracking.py | 11 +--- myems-api/excelexporters/metertrend.py | 39 ++++--------- myems-api/excelexporters/offlinemetercost.py | 16 ++--- .../excelexporters/offlinemeterenergy.py | 20 +------ myems-api/excelexporters/shopfloorbatch.py | 6 -- myems-api/excelexporters/shopfloorcost.py | 37 ++++-------- .../excelexporters/shopfloorenergycategory.py | 44 +++++--------- .../excelexporters/shopfloorenergyitem.py | 22 ++++--- myems-api/excelexporters/shopfloorload.py | 33 +++++------ myems-api/excelexporters/shopfloorsaving.py | 22 +++---- .../excelexporters/shopfloorstatistics.py | 32 +++++----- myems-api/excelexporters/spacecost.py | 35 +++++------ myems-api/excelexporters/spaceefficiency.py | 31 ++++------ .../excelexporters/spaceenergycategory.py | 24 ++++---- myems-api/excelexporters/spaceenergyitem.py | 28 ++++----- myems-api/excelexporters/spaceincome.py | 29 ++++------ myems-api/excelexporters/spaceload.py | 27 +++------ myems-api/excelexporters/spaceoutput.py | 33 ++++------- myems-api/excelexporters/spacesaving.py | 33 ++++------- myems-api/excelexporters/spacestatistics.py | 35 +++++------ myems-api/excelexporters/storebatch.py | 10 +--- myems-api/excelexporters/storecost.py | 33 ++++------- .../excelexporters/storeenergycategory.py | 44 +++++--------- myems-api/excelexporters/storeenergyitem.py | 29 ++++------ myems-api/excelexporters/storeload.py | 33 +++++------ myems-api/excelexporters/storesaving.py | 29 ++++------ myems-api/excelexporters/storestatistics.py | 33 +++++------ myems-api/excelexporters/tenantbatch.py | 10 +--- myems-api/excelexporters/tenantbill.py | 16 +---- myems-api/excelexporters/tenantcost.py | 39 ++++--------- .../excelexporters/tenantenergycategory.py | 36 ++++-------- myems-api/excelexporters/tenantenergyitem.py | 31 ++++------ myems-api/excelexporters/tenantload.py | 27 +++------ myems-api/excelexporters/tenantsaving.py | 31 ++++------ myems-api/excelexporters/tenantstatistics.py | 35 +++++------ myems-api/excelexporters/virtualmetercost.py | 22 ++----- .../excelexporters/virtualmeterenergy.py | 16 ++--- 61 files changed, 581 insertions(+), 1127 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentbatch.py b/myems-api/excelexporters/combinedequipmentbatch.py index 68416b4b..5a55dbfa 100644 --- a/myems-api/excelexporters/combinedequipmentbatch.py +++ b/myems-api/excelexporters/combinedequipmentbatch.py @@ -6,12 +6,12 @@ from openpyxl.drawing.image import Image from openpyxl import Workbook -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, space_name, reporting_start_datetime_local, reporting_end_datetime_local): #################################################################################################################### diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index c781f29d..34e609e3 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -16,12 +16,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -79,12 +79,6 @@ def generate_excel(report, for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 37 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(38, 90 + 1): - # ws.row_dimensions[i].height = 30 - # Col width ws.column_dimensions['A'].width = 1.5 @@ -96,7 +90,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index f8da4d24..712d5a46 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -243,7 +235,7 @@ def generate_excel(report, current_row_number += 2 - ##################################### + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True current_sheet_parameters_row_number = current_row_number @@ -405,13 +397,13 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################################################### + #################################################################################################################### if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -442,7 +434,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -527,9 +518,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index 21c38d79..5466d80b 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.py @@ -13,12 +13,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -89,7 +89,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,16 +118,9 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 1.06 img.height = img.height * 1.06 ws.add_image(img, 'B1') @@ -167,14 +159,14 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 能耗分析 # 6: title # 7: table title # 8~10 table_data # Total: 5 rows # if has not energy data: set low height for rows - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -271,13 +263,13 @@ def generate_excel(report, else: for i in range(6, 9 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### # Second: 分时电耗 # 12: title # 13: table title # 14~17 table_data # Total: 6 rows - ################################################ + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ reporting_period_data['toppeaks'] is None or \ @@ -346,15 +338,13 @@ def generate_excel(report, pie_data = Reference(ws, min_col=3, min_row=13, max_row=17) pie.add_data(pie_data, titles_from_data=True) pie.set_categories(labels) - pie.height = 7.25 # cm 1.05*5 1.05cm = 30 pt + pie.height = 7.25 pie.width = 9 - # pie.title = "Pies sold by category" s1 = pie.series[0] s1.dLbls = DataLabelList() s1.dLbls.showCatName = False # 标签显示 s1.dLbls.showVal = True # 数量显示 s1.dLbls.showPercent = True # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 ws.add_chart(pie, "D13") @@ -362,13 +352,13 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### # Fourth: 能耗详情 # current_row_number: title # current_row_number+1 ~ current_row_number+1+ca_len*6-1: line # current_row_number+1+ca_len*6: table title # current_row_number+1+ca_len*6~: table_data - ################################################ + #################################################################################################################### current_row_number = 19 reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -459,20 +449,17 @@ def generate_excel(report, line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 24 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() line.dLbls.dLblPos = 't' - # line.dLbls.showCatName = True # label show line.dLbls.showVal = True # val show line.dLbls.showPercent = True # percent show - # s1 = CharacterProperties(sz=1800) # font size *100 chart_col = 'B' chart_cell = chart_col + str(chart_start_row_number + 6*i) ws.add_chart(line, chart_cell) - ##################################### + #################################################################################################################### has_associated_equipment_flag = True @@ -713,7 +700,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index 7cd42153..3dffad35 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -13,12 +13,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -87,7 +87,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -117,17 +116,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -165,7 +157,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -302,7 +294,7 @@ def generate_excel(report, current_row_number += 1 - ##################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -389,7 +381,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -433,7 +425,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################### + #################################################################################################################### has_associated_equipment_flag = True @@ -489,7 +481,7 @@ def generate_excel(report, ws[col + row].alignment = c_c_alignment ws[col + row] = round(associated_equipment['subtotals_array'][j][i], 2) ws[col + row].border = f_border - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -508,9 +500,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -541,7 +533,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -626,9 +617,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -674,7 +665,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 542de3a1..9b585da9 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -16,12 +16,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -90,7 +90,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -120,18 +119,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -169,7 +161,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -244,7 +236,7 @@ def generate_excel(report, else: for i in range(6, 8 + 1): ws.row_dimensions[i].height = 0.1 - ################################## + #################################################################################################################### current_row_number = 10 has_subtotals_data_flag = True if "subtotals" not in reporting_period_data.keys() or \ @@ -328,7 +320,7 @@ def generate_excel(report, for i in range(13, 22 + 1): ws.row_dimensions[i].height = 0.1 - ############################################# + #################################################################################################################### current_row_number = 14 reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -457,7 +449,7 @@ def generate_excel(report, for i in range(37, 69 + 1): ws.row_dimensions[i].height = 0.1 - ##################################### + #################################################################################################################### has_associated_equipment_flag = True @@ -530,7 +522,7 @@ def generate_excel(report, ws[col_subtotal + row] = round(subtotal, 2) ws[col_subtotal + row].border = f_border print(subtotal) - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -549,9 +541,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -582,7 +574,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -667,9 +658,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -715,7 +706,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index 23b2f0cb..36ed4005 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -118,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 ws.add_image(img, 'B1') @@ -329,11 +328,11 @@ def generate_excel(report, ws[col_maximum + str(rows)].number_format = '0.00' ws[col_maximum + str(rows)].border = f_border - ######################################################## - # third: LineChart - # LineChart requires data from the detailed data table in the Excel file - # so print the detailed data table first and then print LineChart - ######################################################## + ################################################################################################################ + # third: LineChart + # LineChart requires data from the detailed data table in the Excel file + # so print the detailed data table first and then print LineChart + ################################################################################################################ for i in range(0, ca_len): line = LineChart() line.title = "报告期 最大负荷 - " + names[i] + "(" + reporting_period_data['units'][i] + ")" @@ -360,7 +359,7 @@ def generate_excel(report, chart_cell = str(analysis_end_row_number + 6 * i) ws.add_chart(line, chart_col + chart_cell) - ##################################### + ################################################################################################################ has_associated_equipment_flag = True @@ -490,7 +489,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -623,7 +621,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index 1e19486e..6584c092 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/myems-api/excelexporters/combinedequipmentoutput.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -373,7 +365,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################### + #################################################################################################################### has_associated_equipment_flag = True @@ -448,9 +440,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -481,7 +473,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -566,9 +557,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -614,7 +605,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index 7961498e..fd94cefa 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.py @@ -16,12 +16,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -90,7 +90,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -120,18 +119,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -169,7 +161,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -431,7 +423,7 @@ def generate_excel(report, s1.dLbls.showPercent = True ws.add_chart(pie, 'E' + str(chart_start_row_number)) - ############################################# + #################################################################################################################### has_values_saving_data = True has_timestamps_data = True @@ -804,7 +796,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index 8b265b29..085e11d7 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/myems-api/excelexporters/combinedequipmentstatistics.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -86,7 +86,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 ws.add_image(img, 'B1') @@ -156,12 +154,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -311,11 +309,11 @@ def generate_excel(report, if reporting_period_data['variances_increment_rate'][i] is not None else '0.00%' ws['H' + str(row + 1)].border = f_border - ######################################################## + #################################################################################################################### # Second: 详细数据 # analysis_end_row_number+1~ analysis_end_row_number+1+line_charts_row_number+: line # detailed_start_row_number~ : the detailed data table - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -411,7 +409,7 @@ def generate_excel(report, ser.marker.size = 5 ws.add_chart(line, 'B' + str(analysis_end_row_number + 6 * i)) - ##################################### + ################################################################################################################ has_associated_equipment_flag = True @@ -521,7 +519,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -654,7 +651,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentbatch.py b/myems-api/excelexporters/equipmentbatch.py index 586990d1..9a794fac 100644 --- a/myems-api/excelexporters/equipmentbatch.py +++ b/myems-api/excelexporters/equipmentbatch.py @@ -6,12 +6,12 @@ from openpyxl.drawing.image import Image from openpyxl import Workbook -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, space_name, reporting_start_datetime_local, reporting_end_datetime_local): #################################################################################################################### @@ -103,12 +103,6 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 5b8162c4..bbf5e808 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -120,16 +120,9 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 1.06 img.height = img.height * 1.06 ws.add_image(img, 'B1') @@ -168,14 +161,14 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 报告期成本分析 # 6: title # 7: table title # 8~10 table_data # Total: 5 rows # if has not energy data: set low height for rows - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -250,13 +243,13 @@ def generate_excel(report, else: for i in range(6, 8 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### # Second: 分时用电成本 # 12: title # 13: table title # 14~17 table_data # Total: 6 rows - ################################################ + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ reporting_period_data['toppeaks'] is None or \ @@ -325,15 +318,13 @@ def generate_excel(report, pie_data = Reference(ws, min_col=3, min_row=13, max_row=17) pie.add_data(pie_data, titles_from_data=True) pie.set_categories(labels) - pie.height = 7.25 # cm 1.05*5 1.05cm = 30 pt + pie.height = 7.25 pie.width = 9 - # pie.title = "Pies sold by category" s1 = pie.series[0] s1.dLbls = DataLabelList() s1.dLbls.showCatName = False # 标签显示 s1.dLbls.showVal = True # 数量显示 s1.dLbls.showPercent = True # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 ws.add_chart(pie, "D13") @@ -342,9 +333,9 @@ def generate_excel(report, ws.row_dimensions[i].height = 0.1 # end_row 10 # start_row 12 - ################################################ + #################################################################################################################### # Second: 成本占比 - ################################################ + #################################################################################################################### current_row_number = 19 has_subtotals_data_flag = True @@ -413,13 +404,13 @@ def generate_excel(report, current_row_number += 1 - ################################################ + #################################################################################################################### # Fourth: 成本详情 # current_row_number: title # current_row_number+1 ~ current_row_number+1+ca_len*6-1: line # current_row_number+1+ca_len*6: table title # current_row_number+1+ca_len*6~: table_data - ################################################ + #################################################################################################################### reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] has_detail_data_flag = True @@ -509,21 +500,18 @@ def generate_excel(report, line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 24 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() line.dLbls.dLblPos = 't' - # line.dLbls.showCatName = True # label show line.dLbls.showVal = True # val show line.dLbls.showPercent = True # percent show - # s1 = CharacterProperties(sz=1800) # font size *100 chart_col = 'B' chart_cell = chart_col + str(chart_start_row_number + 6*i) ws.add_chart(line, chart_cell) current_sheet_parameters_row_number = chart_start_row_number + ca_len * 6 - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ report['parameters'] is None or \ @@ -541,9 +529,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -574,7 +562,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -659,9 +646,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -707,7 +694,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index 853f92f5..88fa80c3 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -128,7 +128,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +166,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -243,7 +242,7 @@ def generate_excel(report, current_row_number += 2 - ##################################### + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True current_sheet_parameters_row_number = current_row_number @@ -263,7 +262,7 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False - ##################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -361,7 +360,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -405,13 +404,13 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################################################### + #################################################################################################################### if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -442,7 +441,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -527,9 +525,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index f66986f8..ac207d72 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -120,16 +120,9 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 1.06 img.height = img.height * 1.06 ws.add_image(img, 'B1') @@ -168,14 +161,14 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 能耗分析 # 6: title # 7: table title # 8~10 table_data # Total: 5 rows # if has not energy data: set low height for rows - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -270,13 +263,13 @@ def generate_excel(report, else: for i in range(6, 9 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### # Second: 分时电耗 # 12: title # 13: table title # 14~17 table_data # Total: 6 rows - ################################################ + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ reporting_period_data['toppeaks'] is None or \ @@ -345,15 +338,13 @@ def generate_excel(report, pie_data = Reference(ws, min_col=3, min_row=13, max_row=17) pie.add_data(pie_data, titles_from_data=True) pie.set_categories(labels) - pie.height = 7.25 # cm 1.05*5 1.05cm = 30 pt + pie.height = 7.25 pie.width = 9 - # pie.title = "Pies sold by category" s1 = pie.series[0] s1.dLbls = DataLabelList() s1.dLbls.showCatName = False # 标签显示 s1.dLbls.showVal = True # 数量显示 s1.dLbls.showPercent = True # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 ws.add_chart(pie, "D13") @@ -362,13 +353,13 @@ def generate_excel(report, ws.row_dimensions[i].height = 0.1 # end_row 10 # start_row 12 - ################################################ + #################################################################################################################### # Third: 子空间能耗 # 19: title # 20: table title # 21~24 table_data # Total: 6 rows - ################################################ + #################################################################################################################### has_child_flag = True # Judge if the space has child space, if not, delete it. if "child_space" not in report.keys() or "energy_category_names" not in report['child_space'].keys() or \ @@ -434,24 +425,18 @@ def generate_excel(report, pie_data = Reference(ws, min_col=3 + i, min_row=table_start_row_number, max_row=table_end_row_number) pie.add_data(pie_data, titles_from_data=True) pie.set_categories(labels) - pie.height = 6.6 # cm 1.05*5 1.05cm = 30 pt + pie.height = 6.6 pie.width = 8 - # pie.title = "Pies sold by category" s1 = pie.series[0] s1.dLbls = DataLabelList() s1.dLbls.showCatName = False # 标签显示 s1.dLbls.showVal = True # 数量显示 s1.dLbls.showPercent = True # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 - chart_cell = '' if i % 2 == 0: chart_cell = 'B' + str(chart_start_row_number) else: chart_cell = 'E' + str(chart_start_row_number) chart_start_row_number += 5 - # ws.add_chart(pie, chart_cell) - # chart_col = chr(ord('B') + 2 * j) - # chart_cell = chart_col + '25' ws.add_chart(pie, chart_cell) current_row_number = chart_start_row_number @@ -461,13 +446,13 @@ def generate_excel(report, current_row_number += 1 - ################################################ + #################################################################################################################### # Fourth: 能耗详情 # current_row_number: title # current_row_number+1 ~ current_row_number+1+ca_len*6-1: line # current_row_number+1+ca_len*6: table title # current_row_number+1+ca_len*6~: table_data - ################################################ + #################################################################################################################### reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] has_detail_data_flag = True @@ -525,7 +510,6 @@ def generate_excel(report, for j in range(0, time_len): row = str(table_row+1 + j) - # col = chr(ord('B') + i) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment ws[col + row] = round(reporting_period_data['values'][i][j], 2) @@ -557,21 +541,18 @@ def generate_excel(report, line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 24 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() line.dLbls.dLblPos = 't' - # line.dLbls.showCatName = True # label show line.dLbls.showVal = True # val show line.dLbls.showPercent = True # percent show - # s1 = CharacterProperties(sz=1800) # font size *100 chart_col = 'B' chart_cell = chart_col + str(chart_start_row_number + 6*i) ws.add_chart(line, chart_cell) current_sheet_parameters_row_number = chart_start_row_number + ca_len * 6 - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ report['parameters'] is None or \ @@ -589,9 +570,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -622,7 +603,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -707,9 +687,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -755,7 +735,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index a9a808e2..dc454a56 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/myems-api/excelexporters/equipmentenergyitem.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +158,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -303,7 +295,7 @@ def generate_excel(report, current_row_number += 1 - #################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -390,7 +382,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -434,7 +426,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ############################################### + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -452,9 +444,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -485,7 +477,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -570,9 +561,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -618,7 +609,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ############################################### + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index b4d86174..e01d84a2 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.py @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,18 +117,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -242,7 +234,7 @@ def generate_excel(report, else: for i in range(6, 8 + 1): ws.row_dimensions[i].height = 0.1 - ################################## + #################################################################################################################### current_row_number = 10 has_subtotals_data_flag = True if "subtotals" not in reporting_period_data.keys() or \ @@ -327,7 +319,7 @@ def generate_excel(report, for i in range(13, 22 + 1): ws.row_dimensions[i].height = 0.1 - ############################################# + #################################################################################################################### current_row_number = 14 reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -454,7 +446,7 @@ def generate_excel(report, else: for i in range(37, 69 + 1): ws.row_dimensions[i].height = 0.1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = current_row_number + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -473,9 +465,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -506,7 +498,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -591,9 +582,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -639,7 +630,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index 3262129f..998ad8b9 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/myems-api/excelexporters/equipmentload.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -85,7 +85,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -115,16 +114,9 @@ def generate_excel(report, wrap_text=False, shrink_to_fit=False, indent=0) - # c_r_alignment = Alignment(vertical='bottom', - # horizontal='center', - # text_rotation=0, - # wrap_text=False, - # shrink_to_fit=False, - # indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 1.06 img.height = img.height * 1.06 ws.add_image(img, 'B1') @@ -161,12 +153,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~2*ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -262,12 +254,12 @@ def generate_excel(report, if reporting_period_data['factors_increment_rate'][i] is not None else '0.00%' ws['E' + str(row + 1)].border = f_border - ######################################################## + #################################################################################################################### # Third: 详细数据 # row_sat~ row_sat + 6*cal_len: line # row_da: table title # row_da + 1~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -339,18 +331,8 @@ def generate_excel(report, ws[col_maximum + str(rows)].border = f_border current_row_number = row_da + 1 + time_len - # ws['B' + str(current_row_number)].font = title_font - # ws['B' + str(current_row_number)].alignment = c_c_alignment - # ws['B' + str(current_row_number)].border = f_border - # ws['B' + str(current_row_number)] = '小计' # LineChart for i in range(0, ca_len): - # col = chr(ord('C') + i) - # ws[col + str(current_row_number)].font = title_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['subtotals'][i], 2) - lc = LineChart() lc.title = "报告期 最大负荷" lc.style = 10 @@ -376,7 +358,7 @@ def generate_excel(report, chart_cell = str(row_sat + 6 * i) ws.add_chart(lc, chart_col + chart_cell) - ########################################### + #################################################################################################################### current_sheet_parameters_row_number = row_sat + 1 + 6 * ca_len has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -394,9 +376,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -427,7 +409,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -512,9 +493,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -560,7 +541,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################### + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 8c727d27..9fbbf077 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/myems-api/excelexporters/equipmentoutput.py @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +158,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -242,7 +234,7 @@ def generate_excel(report, current_row_number += 2 - #################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -329,7 +321,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -373,7 +365,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - #################################################### + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -391,9 +383,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -424,7 +416,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -509,9 +500,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -557,7 +548,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - #################################################### + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index 46c0f98f..5ee81bf7 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,18 +117,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -429,7 +421,7 @@ def generate_excel(report, s1.dLbls.showPercent = True ws.add_chart(pie, 'E' + str(chart_start_row_number)) - ############################################# + #################################################################################################################### has_values_saving_data = True has_timestamps_data = True @@ -516,7 +508,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -560,7 +552,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################### + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 2 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -578,9 +570,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -611,7 +603,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -696,9 +687,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -744,7 +735,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ##################################### + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index a63c4e15..011caa43 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/myems-api/excelexporters/equipmentstatistics.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -86,7 +86,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -154,12 +152,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -309,11 +307,11 @@ def generate_excel(report, if reporting_period_data['variances_increment_rate'][i] is not None else '0.00%' ws['H' + str(row + 1)].border = f_border - ######################################################## + #################################################################################################################### # Second: 详细数据 # a+1~ analysis_end_row_number+1+line_charts_row_number+: line # detailed_start_row_number~ : the detailed data table - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -382,16 +380,16 @@ def generate_excel(report, ws[col + str(row_subtotals)].border = f_border ws[col + str(row_subtotals)].number_format = '0.00' - ######################################################## + #################################################################################################################### # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + #################################################################################################################### for i in range(0, ca_len): line = LineChart() line.title = "报告期消耗" + " - " + names[i] + "(" + reporting_period_data['units'][i] + ")" line.style = 10 - line.height = 8.40 # cm 1.05*8 1.05cm = 30 pt + line.height = 8.40 line.width = 24 line.x_axis.majorTickMark = 'in' line.y_axis.majorTickMark = 'in' @@ -409,7 +407,7 @@ def generate_excel(report, ser.marker.size = 5 ws.add_chart(line, 'B' + str(analysis_end_row_number + 2 + 6 * i)) - ################################################## + #################################################################################################################### current_sheet_parameters_row_number = analysis_end_row_number + 2 + 6 * ca_len has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -427,9 +425,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -460,7 +458,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -545,9 +542,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -593,7 +590,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ################################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/equipmenttracking.py b/myems-api/excelexporters/equipmenttracking.py index cee9f85e..cc2a7808 100644 --- a/myems-api/excelexporters/equipmenttracking.py +++ b/myems-api/excelexporters/equipmenttracking.py @@ -11,12 +11,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, space_name): #################################################################################################################### @@ -67,17 +67,12 @@ def generate_excel(report, space_name): # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) - table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), right=Side(border_style='medium', color='00000000'), bottom=Side(border_style='medium', color='00000000'), top=Side(border_style='medium', color='00000000') ) - b_border = Border( - bottom=Side(border_style='medium', color='00000000'), - ) b_c_alignment = Alignment(vertical='bottom', horizontal='center', @@ -91,18 +86,6 @@ def generate_excel(report, space_name): wrap_text=False, shrink_to_fit=False, indent=0) - b_r_alignment = Alignment(vertical='bottom', - horizontal='right', - text_rotation=0, - wrap_text=False, - shrink_to_fit=False, - indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=False, - shrink_to_fit=False, - indent=0) for i in range(ord('B'), ord('F')): ws.column_dimensions[chr(i)].width = 30.0 diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index 571e23db..ba0892e4 100644 --- a/myems-api/excelexporters/metercost.py +++ b/myems-api/excelexporters/metercost.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -70,11 +70,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 11 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(12, 43 + 1): - # ws.row_dimensions[i].height = 30 # Col width ws.column_dimensions['A'].width = 1.5 @@ -87,7 +82,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -117,18 +111,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +153,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ############################### + #################################################################################################################### has_cost_data_flag = True @@ -261,7 +248,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(6, 9 + 1): ws.rows_dimensions[i].height = 0.1 - ###################################### + #################################################################################################################### has_cost_datail_flag = True reporting_period_data = report['reporting_period'] @@ -365,7 +352,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(11, 43 + 1): ws.row_dimensions[i].height = 0.0 - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True # 12 is the starting line number of the last line chart in the report period time_len = len(reporting_period_data['timestamps']) @@ -385,9 +372,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -419,7 +406,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -504,9 +490,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index 1a13e382..1f78af32 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/myems-api/excelexporters/meterenergy.py @@ -13,12 +13,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -67,12 +67,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 11 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(12, 43 + 1): - # ws.row_dimensions[i].height = 30 - # Col width ws.column_dimensions['A'].width = 1.5 @@ -84,7 +78,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -114,18 +107,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -162,12 +148,12 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 能耗分析 # 6: title # 7: table title # 8~9 table_data - ################################################# + #################################################################################################################### has_energy_data_flag = True if "values" not in report['reporting_period'].keys() or len(report['reporting_period']['values']) == 0: @@ -178,7 +164,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ws['B6'] = name + '能耗分析' reporting_period_data = report['reporting_period'] - # print(reporting_period_data) + category = report['meter']['energy_category_name'] ca_len = len(category) @@ -262,13 +248,13 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d else: for i in range(6, 9 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### # Second: 能耗详情 # 11: title # 12 ~ 16: chart # 18: table title # 19~43: table_data - ################################################# + #################################################################################################################### has_energy_detail_flag = True reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -350,17 +336,13 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - # line_data.smooth = True - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 24 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() - # line.dLbls.showCatName = True # 标签显示 line.dLbls = DataLabelList() line.dLbls.dLblPos = 't' line.dLbls.showVal = True # 数量显示 line.dLbls.showPercent = False # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 ws.add_chart(line, "B12") col = 'B' @@ -404,9 +386,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -438,7 +420,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -523,9 +504,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index 5dd08ef0..5074cd49 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/myems-api/excelexporters/metersubmetersbalance.py @@ -13,12 +13,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -77,7 +77,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -107,18 +106,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -155,7 +147,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wb.save(filename) return filename - ################################################# + #################################################################################################################### has_difference_values_data_flag = True if 'difference_values' not in report['reporting_period'].keys() or len( @@ -322,7 +314,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d else: pass - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True # 12 is the starting line number of the last line chart in the report period category = report['meter']['energy_category_name'] @@ -344,9 +336,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -378,7 +370,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -463,9 +454,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/metertracking.py b/myems-api/excelexporters/metertracking.py index ea92594b..d9065dce 100644 --- a/myems-api/excelexporters/metertracking.py +++ b/myems-api/excelexporters/metertracking.py @@ -11,12 +11,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, space_name, reporting_start_datetime_local, reporting_end_datetime_local): #################################################################################################################### @@ -78,7 +78,6 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -108,12 +107,6 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index 78b4a0d9..6fe7b004 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/myems-api/excelexporters/metertrend.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, @@ -77,9 +77,6 @@ def generate_excel(report, for i in range(2, 8): ws.row_dimensions[i].height = 42 - # for i in range(2, 6 + 1): - # ws.row_dimensions[i].height = 30 - # Col width ws.column_dimensions['A'].width = 1.5 @@ -121,18 +118,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -160,12 +150,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################ + #################################################################################################################### # First: 趋势 # 6: title # 7: table title # 8~ table_data - ################################################ + #################################################################################################################### has_data_flag = True reporting_period_data = report['reporting_period'] if "names" not in reporting_period_data.keys() or \ @@ -212,7 +202,6 @@ def generate_excel(report, if has_data: max_row = start_detail_data_row_num + len(time) - # print("max_row", max_row) ws['B6'].font = title_font ws['B6'] = name + ' 趋势' @@ -226,7 +215,6 @@ def generate_excel(report, for i in range(0, len(time)): col = 'B' row = str(start_detail_data_row_num + i) - # col = chr(ord('B') + i) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment ws[col + row] = time[i] @@ -245,7 +233,6 @@ def generate_excel(report, for j in range(0, len(time)): row = str(start_detail_data_row_num + j) - # col = chr(ord('B') + i) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment ws[col + row] = round(reporting_period_data['values'][i][j], 3) if \ @@ -260,19 +247,14 @@ def generate_excel(report, line_data = Reference(ws, min_col=3 + i, min_row=start_detail_data_row_num+1, max_row=max_row-1) line.add_data(line_data, titles_from_data=True) line.set_categories(labels) - # line_data = line.series[0] - # line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 36 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() - # line.dLbls.showCatName = True # label show line.dLbls.dLblPos = 't' line.dLbls.showVal = False # val show line.dLbls.showPercent = False # percent show - # s1 = CharacterProperties(sz=1800) # font size *100 chart_col = chr(ord('B')) chart_cell = chart_col + str(7 + 6*i) @@ -280,7 +262,7 @@ def generate_excel(report, else: pass - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True # 12 is the starting line number of the last line chart in the report period @@ -299,9 +281,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -333,7 +315,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -410,9 +391,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/offlinemetercost.py b/myems-api/excelexporters/offlinemetercost.py index a77415e7..a7753006 100644 --- a/myems-api/excelexporters/offlinemetercost.py +++ b/myems-api/excelexporters/offlinemetercost.py @@ -13,12 +13,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -81,7 +81,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -111,18 +110,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -160,7 +152,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ############################### + #################################################################################################################### has_cost_data_flag = True @@ -256,7 +248,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(6, 9 + 1): ws.rows_dimensions[i].height = 0.1 - ###################################### + #################################################################################################################### has_cost_datail_flag = True reporting_period_data = report['reporting_period'] diff --git a/myems-api/excelexporters/offlinemeterenergy.py b/myems-api/excelexporters/offlinemeterenergy.py index 20ad9c15..2cee35b0 100644 --- a/myems-api/excelexporters/offlinemeterenergy.py +++ b/myems-api/excelexporters/offlinemeterenergy.py @@ -12,12 +12,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -66,12 +66,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 11 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(12, 43 + 1): - # ws.row_dimensions[i].height = 30 - # Col width ws.column_dimensions['A'].width = 1.5 @@ -83,7 +77,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -113,18 +106,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -162,7 +148,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ################################ + #################################################################################################################### has_energy_data_flag = True diff --git a/myems-api/excelexporters/shopfloorbatch.py b/myems-api/excelexporters/shopfloorbatch.py index 0502832c..7f7c3ff9 100644 --- a/myems-api/excelexporters/shopfloorbatch.py +++ b/myems-api/excelexporters/shopfloorbatch.py @@ -103,12 +103,6 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 0569fadc..f97b6866 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -13,12 +13,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -76,12 +76,6 @@ def generate_excel(report, for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 37 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(38, 90 + 1): - # ws.row_dimensions[i].height = 30 - # Col width ws.column_dimensions['A'].width = 1.5 @@ -93,7 +87,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -123,18 +116,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -171,7 +157,7 @@ def generate_excel(report, return filename - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -260,7 +246,7 @@ def generate_excel(report, for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ @@ -375,7 +361,7 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### current_row_number = 19 @@ -461,7 +447,7 @@ def generate_excel(report, current_row_number = 30 ws.row_dimensions[i].height = 0.1 - ############################################### + #################################################################################################################### current_row_number += 1 @@ -608,7 +594,7 @@ def generate_excel(report, for i in range(30, 69 + 1): current_row_number = 70 ws.row_dimensions[i].height = 0.1 - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -628,9 +614,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -662,7 +648,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -747,9 +732,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 92204c37..8ad2428e 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -12,12 +12,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,16 +117,9 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 1.06 img.height = img.height * 1.06 ws.add_image(img, 'B1') @@ -166,14 +158,14 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 能耗分析 # 6: title # 7: table title # 8~10 table_data # Total: 5 rows # if has not energy data: set low height for rows - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -288,13 +280,13 @@ def generate_excel(report, else: for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### # Second: 分时电耗 # 12: title # 13: table title # 14~17 table_data # Total: 6 rows - ################################################ + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ reporting_period_data['toppeaks'] is None or \ @@ -363,15 +355,13 @@ def generate_excel(report, pie_data = Reference(ws, min_col=3, min_row=13, max_row=17) pie.add_data(pie_data, titles_from_data=True) pie.set_categories(labels) - pie.height = 7.25 # cm 1.05*5 1.05cm = 30 pt + pie.height = 7.25 pie.width = 9 - # pie.title = "Pies sold by category" s1 = pie.series[0] s1.dLbls = DataLabelList() s1.dLbls.showCatName = False # 标签显示 s1.dLbls.showVal = True # 数量显示 s1.dLbls.showPercent = True # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 ws.add_chart(pie, "D13") @@ -379,13 +369,13 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### # Fourth: 能耗详情 # current_row_number: title # current_row_number+1 ~ current_row_number+1+ca_len*6-1: line # current_row_number+1+ca_len*6: table title # current_row_number+1+ca_len*6~: table_data - ################################################ + #################################################################################################################### current_row_number = 19 reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -481,20 +471,17 @@ def generate_excel(report, line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 24 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() line.dLbls.dLblPos = 't' - # line.dLbls.showCatName = True # label show line.dLbls.showVal = True # val show line.dLbls.showPercent = True # percent show - # s1 = CharacterProperties(sz=1800) # font size *100 chart_col = 'B' chart_cell = chart_col + str(chart_start_row_number + 6*i) ws.add_chart(line, chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -514,9 +501,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -548,7 +535,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -633,9 +619,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index ce5273e2..94a905fd 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -12,12 +12,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -126,7 +126,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -164,7 +163,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -318,7 +317,7 @@ def generate_excel(report, current_row_number += 1 - ##################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -409,7 +408,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -452,7 +451,7 @@ def generate_excel(report, chart_cell = chart_col + str(chart_start_row_number + 6 * i) ws.add_chart(line, chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -472,9 +471,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -506,7 +505,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -591,9 +589,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 1e8aefe7..5ba01f90 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -85,7 +85,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,7 +117,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 ws.add_image(img, 'B1') @@ -155,12 +153,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -256,12 +254,12 @@ def generate_excel(report, if reporting_period_data['factors_increment_rate'][i] is not None else '0.00%' ws['E' + str(row + 1)].border = f_border - ################################################# + #################################################################################################################### # Second: 报告期单位面积消耗 # 9 + ca_len * 2: title # 10 + ca_len * 2: table title # per_unit_area_start_row_number + 2 ~ per_unit_area_start_row_number + 2 + ca_len : table_data - ################################################# + #################################################################################################################### if has_energy_data_flag: names = reporting_period_data['names'] @@ -316,12 +314,12 @@ def generate_excel(report, ws['D' + str(row_data)].border = f_border ws['D' + str(row_data)].number_format = '0.00' - ######################################################## + #################################################################################################################### # Third: 详细数据 # analysis_end_row_number~ analysis_end_row_number + 6*cal_len: line # detailed_start_row_number: table title # detailed_start_row_number + 1~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -394,11 +392,11 @@ def generate_excel(report, ws[col_maximum + str(rows)].number_format = '0.00' ws[col_maximum + str(rows)].border = f_border - ######################################################## + #################################################################################################################### # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + #################################################################################################################### for i in range(0, ca_len): line = LineChart() line.title = "报告期 最大负荷 - " + names[i] + "(" + reporting_period_data['units'][i] + ")" @@ -425,7 +423,7 @@ def generate_excel(report, chart_cell = str(analysis_end_row_number + 6 * i) ws.add_chart(line, chart_col + chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -445,9 +443,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -479,7 +477,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -564,9 +561,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 8921af39..b83f4811 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -87,7 +87,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -117,18 +116,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +158,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -460,7 +452,7 @@ def generate_excel(report, s1.dLbls.showPercent = True ws.add_chart(pie, 'E' + str(chart_start_row_number)) - ############################################# + #################################################################################################################### has_values_saving_data = True has_timestamps_data = True @@ -552,7 +544,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -615,9 +607,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -734,9 +726,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index c0bcb6a9..43e925a9 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -11,12 +11,12 @@ from openpyxl.drawing.image import Image from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -118,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -153,12 +152,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -307,12 +306,12 @@ def generate_excel(report, ws['H' + str(row + 1)] = str(round(reporting_period_data['variances_increment_rate'][i] * 100, 2)) + "%" \ if reporting_period_data['variances_increment_rate'][i] is not None else '0.00%' ws['H' + str(row + 1)].border = f_border - ################################################# + #################################################################################################################### # Second: 报告期消耗 # 9 + ca_len * 2: title # 10 + ca_len * 2: table title # per_unit_area_start_row_number + 2 ~ per_unit_area_start_row_number + 2 + ca_len : table_data - ################################################# + #################################################################################################################### if has_energy_data_flag: names = reporting_period_data['names'] @@ -420,12 +419,12 @@ def generate_excel(report, ws['H' + str(row_data)].border = f_border ws['H' + str(row_data)].number_format = '0.00' - ######################################################## + #################################################################################################################### # Third: 详细数据 # detailed_start_row_number~ detailed_start_row_number+time_len: line # detailed_start_row_number+1: table title # i + analysis_end_row_number + 2 + 6 * ca_len~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -499,11 +498,11 @@ def generate_excel(report, ws[col + str(row_subtotals)].border = f_border ws[col + str(row_subtotals)].number_format = '0.00' - ######################################################## + #################################################################################################################### # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + #################################################################################################################### for i in range(0, ca_len): line = LineChart() @@ -530,7 +529,7 @@ def generate_excel(report, chart_cell = str(analysis_end_row_number + 6 * i) ws.add_chart(line, chart_col + chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -550,9 +549,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -584,7 +583,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -669,9 +667,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index d253b290..ccbf31e5 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/myems-api/excelexporters/spacecost.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,18 +117,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -259,7 +251,7 @@ def generate_excel(report, for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ############################## + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ @@ -343,7 +335,7 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################## + #################################################################################################################### current_row_number = 19 @@ -413,7 +405,7 @@ def generate_excel(report, current_row_number += 1 - ##################################### + #################################################################################################################### reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -541,7 +533,7 @@ def generate_excel(report, current_row_number = current_end_row_number - ######################################## + #################################################################################################################### has_child_flag = True @@ -649,7 +641,7 @@ def generate_excel(report, current_row_number += 5 current_row_number += 1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = table_start_draw_flag + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -667,9 +659,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -700,7 +692,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -785,9 +776,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -833,7 +824,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index dd0d7f20..4f860aab 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/myems-api/excelexporters/spaceefficiency.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -244,7 +236,7 @@ def generate_excel(report, current_row_number += 2 - ##################################### + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True current_sheet_parameters_row_number = current_row_number @@ -264,7 +256,7 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False - ##################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -363,7 +355,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -407,13 +399,13 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################################################### + #################################################################################################################### if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -444,7 +436,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -529,9 +520,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index 24b18057..95ce2b2e 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/myems-api/excelexporters/spaceenergycategory.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -168,7 +168,7 @@ def generate_excel(report, return filename - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -282,7 +282,7 @@ def generate_excel(report, for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ @@ -364,7 +364,7 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### current_row_number = 19 @@ -433,7 +433,7 @@ def generate_excel(report, current_row_number += 1 - ##################################################### + #################################################################################################################### has_kgco2e_data_flag = True @@ -577,7 +577,6 @@ def generate_excel(report, s1.dLbls.showCatName = False s1.dLbls.showVal = True s1.dLbls.showPercent = True - chart_cell = '' char_col = chr(_col + i*2) chart_cell = char_col + str(chart_start_row_number) @@ -585,7 +584,7 @@ def generate_excel(report, current_row_number += 1 - ############################################### + #################################################################################################################### has_detail_data_flag = True @@ -687,8 +686,7 @@ def generate_excel(report, current_row_number += 2 - - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = table_start_draw_flag + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -824,9 +822,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -872,7 +870,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index 8d1e6960..927eb683 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/myems-api/excelexporters/spaceenergyitem.py @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,12 +117,6 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 @@ -166,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -320,7 +313,7 @@ def generate_excel(report, current_row_number += 1 - ################################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -407,7 +400,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -451,7 +444,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################### + #################################################################################################################### has_child_flag = True @@ -541,7 +534,7 @@ def generate_excel(report, current_row_number += 5 current_row_number += 1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -559,9 +552,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -592,7 +585,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -677,9 +669,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -725,7 +717,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index b69d912c..b2d280bd 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/myems-api/excelexporters/spaceincome.py @@ -89,7 +89,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,18 +118,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -168,7 +160,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -258,7 +250,7 @@ def generate_excel(report, else: for i in range(6, 9 + 1): ws.row_dimensions[i].height = 0.1 - ################################## + #################################################################################################################### current_row_number = 11 has_subtotals_data_flag = True if "subtotals" not in reporting_period_data.keys() or \ @@ -340,7 +332,7 @@ def generate_excel(report, current_row_number += 1 - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -470,7 +462,7 @@ def generate_excel(report, current_row_number = current_end_row_number - ################################## + #################################################################################################################### has_child_flag = True @@ -581,7 +573,7 @@ def generate_excel(report, current_row_number += 1 - ############################################# + #################################################################################################################### current_sheet_parameters_row_number = table_start_draw_flag + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -599,9 +591,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -632,7 +624,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -717,9 +708,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -765,7 +756,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index 2ebd0cb0..a1cce7f3 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/myems-api/excelexporters/spaceload.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -85,7 +85,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -115,18 +114,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -163,7 +155,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ############################### + #################################################################################################################### has_names_data_flag = True @@ -488,7 +480,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d line.dLbls.showVal = True ws.add_chart(line, "B" + str(current_chart_row_number)) current_chart_row_number += 6 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = current_chart_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -506,9 +498,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -539,7 +531,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -624,9 +615,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -672,7 +663,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index 95e39df7..4df47bc5 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/myems-api/excelexporters/spaceoutput.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +158,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -259,7 +251,7 @@ def generate_excel(report, current_row_number += 2 - ####################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -346,7 +338,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -390,7 +382,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ##################################### + #################################################################################################################### has_child_flag = True @@ -477,7 +469,7 @@ def generate_excel(report, current_row_number += 5 current_row_number += 1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -495,9 +487,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -528,7 +520,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -613,9 +604,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -661,7 +652,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index c734f48e..d8ecd53c 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/myems-api/excelexporters/spacesaving.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,18 +117,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -461,7 +453,7 @@ def generate_excel(report, s1.dLbls.showPercent = True ws.add_chart(pie, 'E' + str(chart_start_row_number)) - ################################ + #################################################################################################################### has_values_saving_data = True has_timestamps_data = True @@ -548,7 +540,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -592,7 +584,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ############################################# + #################################################################################################################### has_child_space_data_flag = True @@ -685,7 +677,7 @@ def generate_excel(report, current_row_number += 5 current_row_number += 1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -703,9 +695,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -736,7 +728,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -821,9 +812,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -869,7 +860,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index 279acd9d..b88b2637 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/myems-api/excelexporters/spacestatistics.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -86,7 +86,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -154,12 +152,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -308,12 +306,12 @@ def generate_excel(report, ws['H' + str(row + 1)] = str(round(reporting_period_data['variances_increment_rate'][i] * 100, 2)) + "%" \ if reporting_period_data['variances_increment_rate'][i] is not None else '0.00%' ws['H' + str(row + 1)].border = f_border - ################################################# + #################################################################################################################### # Second: 报告期消耗 # 9 + ca_len * 2: title # 10 + ca_len * 2: table title # per_unit_area_start_row_number + 2 ~ per_unit_area_start_row_number + 2 + ca_len : table_data - ################################################# + #################################################################################################################### if has_energy_data_flag: names = reporting_period_data['names'] @@ -423,12 +421,12 @@ def generate_excel(report, ws['H' + str(row_data)].border = f_border ws['H' + str(row_data)].number_format = '0.00' - ######################################################## + #################################################################################################################### # Third: 详细数据 # analysis_end_row_number~ analysis_end_row_number+time_len: line # analysis_end_row_number+1+line_charts_row_number: table title # i + analysis_end_row_number + 2 + 10 * ca_len~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -497,11 +495,11 @@ def generate_excel(report, ws[col + str(row_subtotals)].border = f_border ws[col + str(row_subtotals)].number_format = '0.00' - ######################################################## + #################################################################################################################### # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + #################################################################################################################### for i in range(0, ca_len): line = LineChart() @@ -526,7 +524,7 @@ def generate_excel(report, ser.marker.symbol = "diamond" ser.marker.size = 5 ws.add_chart(line, 'B' + str(analysis_end_row_number + 6 * i)) - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = analysis_end_row_number + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -544,9 +542,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -577,7 +575,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -662,9 +659,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -710,7 +707,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/storebatch.py b/myems-api/excelexporters/storebatch.py index 5fef655b..b3c2e6a1 100644 --- a/myems-api/excelexporters/storebatch.py +++ b/myems-api/excelexporters/storebatch.py @@ -6,12 +6,12 @@ from openpyxl.drawing.image import Image from openpyxl import Workbook -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, space_name, reporting_start_datetime_local, reporting_end_datetime_local): #################################################################################################################### @@ -103,12 +103,6 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 00472753..8948f31a 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -13,12 +13,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,15 +117,8 @@ def generate_excel(report, wrap_text=False, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=False, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -164,7 +156,7 @@ def generate_excel(report, return filename - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -251,7 +243,7 @@ def generate_excel(report, for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ @@ -332,7 +324,7 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### current_row_number = 19 @@ -403,7 +395,7 @@ def generate_excel(report, current_row_number = 30 ws.row_dimensions[i].height = 0.1 - ############################################### + #################################################################################################################### has_detail_data_flag = True @@ -506,7 +498,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -570,7 +562,7 @@ def generate_excel(report, current_row_number = 70 ws.row_dimensions[i].height = 0.1 - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -590,9 +582,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -624,7 +616,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -709,9 +700,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index 38c53daf..e35fb6e5 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -12,12 +12,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,16 +117,9 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 1.06 img.height = img.height * 1.06 ws.add_image(img, 'B1') @@ -166,14 +158,14 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 能耗分析 # 6: title # 7: table title # 8~10 table_data # Total: 5 rows # if has not energy data: set low height for rows - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -288,13 +280,13 @@ def generate_excel(report, else: for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### # Second: 分时电耗 # 12: title # 13: table title # 14~17 table_data # Total: 6 rows - ################################################ + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ reporting_period_data['toppeaks'] is None or \ @@ -363,15 +355,13 @@ def generate_excel(report, pie_data = Reference(ws, min_col=3, min_row=13, max_row=17) pie.add_data(pie_data, titles_from_data=True) pie.set_categories(labels) - pie.height = 7.25 # cm 1.05*5 1.05cm = 30 pt + pie.height = 7.25 pie.width = 9 - # pie.title = "Pies sold by category" s1 = pie.series[0] s1.dLbls = DataLabelList() s1.dLbls.showCatName = False # 标签显示 s1.dLbls.showVal = True # 数量显示 s1.dLbls.showPercent = True # 百分比显示 - # s1 = CharacterProperties(sz=1800) # 图表中字体大小 *100 ws.add_chart(pie, "D13") @@ -379,13 +369,13 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### # Fourth: 能耗详情 # current_row_number: title # current_row_number+1 ~ current_row_number+1+ca_len*6-1: line # current_row_number+1+ca_len*6: table title # current_row_number+1+ca_len*6~: table_data - ################################################ + #################################################################################################################### current_row_number = 19 reporting_period_data = report['reporting_period'] times = reporting_period_data['timestamps'] @@ -426,7 +416,6 @@ def generate_excel(report, for i in range(0, len(time)): col = 'B' row = str(table_row+1 + i) - # col = chr(ord('B') + i) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment ws[col + row] = time[i] @@ -449,7 +438,6 @@ def generate_excel(report, for j in range(0, time_len): row = str(table_row+1 + j) - # col = chr(ord('B') + i) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment ws[col + row] = round(reporting_period_data['values'][i][j], 2) @@ -481,15 +469,12 @@ def generate_excel(report, line_data.marker.symbol = "circle" line_data.smooth = True line.x_axis.crosses = 'min' - line.height = 8.25 # cm 1.05*5 1.05cm = 30 pt + line.height = 8.25 line.width = 24 - # pie.title = "Pies sold by category" line.dLbls = DataLabelList() line.dLbls.dLblPos = 't' - # line.dLbls.showCatName = True # label show line.dLbls.showVal = True # val show line.dLbls.showPercent = True # percent show - # s1 = CharacterProperties(sz=1800) # font size *100 chart_col = 'B' chart_cell = chart_col + str(chart_start_row_number + 6*i) ws.add_chart(line, chart_cell) @@ -515,9 +500,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -549,7 +534,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -634,9 +618,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 2ad6dd28..0ac20a0c 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/myems-api/excelexporters/storeenergyitem.py @@ -12,12 +12,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -86,7 +86,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -116,17 +115,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -164,7 +156,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -318,7 +310,7 @@ def generate_excel(report, current_row_number += 1 - ####################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -409,7 +401,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -454,7 +446,7 @@ def generate_excel(report, chart_cell = chart_col + str(chart_start_row_number + 6 * i) ws.add_chart(line, chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -474,9 +466,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -508,7 +500,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -593,9 +584,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index 4d5ed3f3..5de1bb93 100644 --- a/myems-api/excelexporters/storeload.py +++ b/myems-api/excelexporters/storeload.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -85,7 +85,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,7 +117,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 ws.add_image(img, 'B1') @@ -155,12 +153,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -256,12 +254,12 @@ def generate_excel(report, if reporting_period_data['factors_increment_rate'][i] is not None else '0.00%' ws['E' + str(row + 1)].border = f_border - ################################################# + #################################################################################################################### # Second: 报告期单位面积消耗 # 9 + ca_len * 2: title # 10 + ca_len * 2: table title # per_unit_area_start_row_number + 2 ~ per_unit_area_start_row_number + 2 + ca_len : table_data - ################################################# + #################################################################################################################### if has_energy_data_flag: names = reporting_period_data['names'] @@ -316,12 +314,12 @@ def generate_excel(report, ws['D' + str(row_data)].border = f_border ws['D' + str(row_data)].number_format = '0.00' - ######################################################## + #################################################################################################################### # Third: 详细数据 # analysis_end_row_number~ analysis_end_row_number + 6*cal_len: line # detailed_start_row_number: table title # detailed_start_row_number + 1~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -395,11 +393,11 @@ def generate_excel(report, ws[col_maximum + str(rows)].border = f_border current_row_number += 1 - ######################################################## + ################################################################################################################ # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + ################################################################################################################ for i in range(0, ca_len): line = LineChart() line.title = "报告期 最大负荷 - " + names[i] + "(" + reporting_period_data['units'][i] + ")" @@ -423,7 +421,7 @@ def generate_excel(report, chart_cell = str(current_row_number + 6 * i) ws.add_chart(line, chart_col + chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -443,9 +441,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -477,7 +475,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -562,9 +559,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index 7dac382d..5bd56efb 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.py @@ -13,12 +13,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -87,7 +87,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -117,18 +116,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +158,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -460,7 +452,7 @@ def generate_excel(report, s1.dLbls.showPercent = True ws.add_chart(pie, 'E' + str(chart_start_row_number)) - ############################################# + #################################################################################################################### has_values_saving_data = True has_timestamps_data = True @@ -552,7 +544,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -595,7 +587,7 @@ def generate_excel(report, chart_cell = chart_col + str(chart_start_row_number + 6 * i) ws.add_chart(line, chart_cell) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -615,9 +607,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -649,7 +641,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -734,9 +725,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index cddb418e..76cc1bb9 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -12,12 +12,12 @@ from openpyxl.drawing.image import Image from openpyxl.styles import PatternFill, Border, Side, Alignment, Font import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -86,7 +86,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -154,12 +152,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -308,12 +306,12 @@ def generate_excel(report, ws['H' + str(row + 1)] = str(round(reporting_period_data['variances_increment_rate'][i] * 100, 2)) + "%" \ if reporting_period_data['variances_increment_rate'][i] is not None else '0.00%' ws['H' + str(row + 1)].border = f_border - ################################################# + #################################################################################################################### # Second: 报告期消耗 # 9 + ca_len * 2: title # 10 + ca_len * 2: table title # per_unit_area_start_row_number + 2 ~ per_unit_area_start_row_number + 2 + ca_len : table_data - ################################################# + #################################################################################################################### if has_energy_data_flag: names = reporting_period_data['names'] @@ -421,12 +419,12 @@ def generate_excel(report, ws['H' + str(row_data)].border = f_border ws['H' + str(row_data)].number_format = '0.00' - ######################################################## + #################################################################################################################### # Third: 详细数据 # detailed_start_row_number~ detailed_start_row_number+time_len: line # detailed_start_row_number+1: table title # i + analysis_end_row_number + 2 + 6 * ca_len~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -502,11 +500,11 @@ def generate_excel(report, ws[col + str(row_subtotals)].border = f_border ws[col + str(row_subtotals)].number_format = '0.00' - ######################################################## + #################################################################################################################### # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + #################################################################################################################### for i in range(0, ca_len): line = LineChart() line.title = "报告期消耗" + " - " + names[i] + "(" + reporting_period_data['units'][i] + ")" @@ -531,7 +529,7 @@ def generate_excel(report, ser.marker.size = 5 ws.add_chart(line, 'B' + str(current_row_number + 6 * i)) - ########################################## + #################################################################################################################### has_parameters_names_and_timestamps_and_values_data = True ca_len = len(report['reporting_period']['names']) @@ -551,9 +549,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] @@ -585,7 +583,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -670,9 +667,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' diff --git a/myems-api/excelexporters/tenantbatch.py b/myems-api/excelexporters/tenantbatch.py index c811764d..65430b3b 100644 --- a/myems-api/excelexporters/tenantbatch.py +++ b/myems-api/excelexporters/tenantbatch.py @@ -6,12 +6,12 @@ from openpyxl.drawing.image import Image from openpyxl import Workbook -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, space_name, reporting_start_datetime_local, reporting_end_datetime_local): #################################################################################################################### @@ -103,12 +103,6 @@ def generate_excel(report, space_name, reporting_start_datetime_local, reporting wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") diff --git a/myems-api/excelexporters/tenantbill.py b/myems-api/excelexporters/tenantbill.py index 6d56607d..87794946 100644 --- a/myems-api/excelexporters/tenantbill.py +++ b/myems-api/excelexporters/tenantbill.py @@ -14,12 +14,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -119,12 +119,6 @@ def generate_excel(report, bottom=Side(border_style='medium', color='00000000'), ) - b_c_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=False, - shrink_to_fit=False, - indent=0) c_c_alignment = Alignment(vertical='center', horizontal='center', text_rotation=0, @@ -137,12 +131,6 @@ def generate_excel(report, wrap_text=False, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=False, - shrink_to_fit=False, - indent=0) b_l_alignment = Alignment(vertical='bottom', horizontal='left', text_rotation=0, diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index b28834be..f5e5784e 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -78,12 +78,6 @@ def generate_excel(report, for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 37 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(38, 90 + 1): - # ws.row_dimensions[i].height = 30 - # Col width ws.column_dimensions['A'].width = 1.5 @@ -95,7 +89,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -125,18 +118,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -173,7 +159,7 @@ def generate_excel(report, return filename - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -262,7 +248,7 @@ def generate_excel(report, for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ @@ -344,7 +330,7 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### current_row_number = 19 @@ -416,7 +402,7 @@ def generate_excel(report, current_row_number = 30 ws.row_dimensions[i].height = 0.1 - ############################################### + #################################################################################################################### current_row_number += 1 @@ -554,7 +540,7 @@ def generate_excel(report, for i in range(30, 69 + 1): current_row_number = 70 ws.row_dimensions[i].height = 0.1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = table_start_draw_flag + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -572,9 +558,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -605,7 +591,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -690,9 +675,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -738,7 +723,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index ccb30c16..af30eb05 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/myems-api/excelexporters/tenantenergycategory.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -77,11 +77,6 @@ def generate_excel(report, ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # for i in range(2, 37 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(38, 90 + 1): - # ws.row_dimensions[i].height = 30 # Col width ws.column_dimensions['A'].width = 1.5 @@ -94,7 +89,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -124,18 +118,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -173,7 +160,7 @@ def generate_excel(report, return filename - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] @@ -287,7 +274,7 @@ def generate_excel(report, for i in range(6, 10 + 1): ws.row_dimensions[i].height = 0.1 - ################################################# + #################################################################################################################### has_ele_peak_flag = True if "toppeaks" not in reporting_period_data.keys() or \ @@ -369,7 +356,7 @@ def generate_excel(report, for i in range(12, 18 + 1): ws.row_dimensions[i].height = 0.1 - ################################################ + #################################################################################################################### current_row_number = 19 @@ -441,7 +428,7 @@ def generate_excel(report, current_row_number = 30 ws.row_dimensions[i].height = 0.1 - ##################################################### + #################################################################################################################### current_row_number += 1 has_kgco2e_data_flag = True @@ -512,7 +499,7 @@ def generate_excel(report, current_row_number = 40 ws.row_dimensions[i].height = 0.1 - ############################################### + #################################################################################################################### current_row_number += 1 has_detail_data_flag = True @@ -619,7 +606,7 @@ def generate_excel(report, for i in range(40, 69 + 1): current_row_number = 70 ws.row_dimensions[i].height = 0.1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = table_start_draw_flag + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -670,7 +657,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -755,9 +741,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -803,7 +789,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index ca168648..34523cad 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/myems-api/excelexporters/tenantenergyitem.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,17 +117,10 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +158,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -320,7 +312,7 @@ def generate_excel(report, current_row_number += 1 - ####################### + #################################################################################################################### has_values_data = True has_timestamps_data = True @@ -407,7 +399,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -450,7 +442,7 @@ def generate_excel(report, chart_cell = chart_col + str(chart_start_row_number) chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -468,9 +460,9 @@ def generate_excel(report, has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -500,7 +492,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -585,9 +576,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -633,7 +624,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index 9ddda203..0cdbb565 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -85,7 +85,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -115,18 +114,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -163,7 +155,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ############################### + #################################################################################################################### has_names_data_flag = True @@ -490,7 +482,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ws.add_chart(line, "B" + str(current_chart_row_number)) current_chart_row_number += 6 current_chart_col_number += 1 - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = current_chart_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -508,9 +500,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d has_parameters_names_and_timestamps_and_values_data = False if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -541,7 +533,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -626,9 +617,9 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -674,7 +665,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index f4e89b40..fb14c98f 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/myems-api/excelexporters/tenantsaving.py @@ -14,12 +14,12 @@ from openpyxl.chart.label import DataLabelList import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -88,7 +88,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -118,18 +117,11 @@ def generate_excel(report, wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -167,7 +159,7 @@ def generate_excel(report, return filename - ################################## + #################################################################################################################### current_row_number = 6 @@ -461,7 +453,7 @@ def generate_excel(report, s1.dLbls.showPercent = True ws.add_chart(pie, 'E' + str(chart_start_row_number)) - ############################################# + #################################################################################################################### has_values_saving_data = True has_timestamps_data = True @@ -548,7 +540,7 @@ def generate_excel(report, format_time_width_number = 1.0 min_len_number = 1.0 - min_width_number = 11.0 # format_time_width_number * min_len_number + 4 and min_width_number > 11.0 + min_width_number = 11.0 if period_type == 'hourly': format_time_width_number = 4.0 @@ -592,7 +584,7 @@ def generate_excel(report, chart_start_row_number += 6 ws.add_chart(line, chart_cell) - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = chart_start_row_number + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -611,9 +603,9 @@ def generate_excel(report, if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -644,7 +636,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -729,9 +720,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -777,7 +768,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index 7e82c97c..0fe3b89d 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/myems-api/excelexporters/tenantstatistics.py @@ -12,12 +12,12 @@ from openpyxl import Workbook import openpyxl.utils.cell as format_cell -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excel file # Step 3: Encode the excel file bytes to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, @@ -86,7 +86,6 @@ def generate_excel(report, # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - # data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -119,7 +118,6 @@ def generate_excel(report, # Img img = Image("excelexporters/myems.png") - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -154,12 +152,12 @@ def generate_excel(report, wb.save(filename) return filename - ################################################# + #################################################################################################################### # First: 统计分析 # 6: title # 7: table title # 8~ca_len table_data - ################################################# + #################################################################################################################### reporting_period_data = report['reporting_period'] has_energy_data_flag = True @@ -308,12 +306,12 @@ def generate_excel(report, ws['H' + str(row + 1)] = str(round(reporting_period_data['variances_increment_rate'][i] * 100, 2)) + "%" \ if reporting_period_data['variances_increment_rate'][i] is not None else '0.00%' ws['H' + str(row + 1)].border = f_border - ################################################# + #################################################################################################################### # Second: 报告期消耗 # 9 + ca_len * 2: title # 10 + ca_len * 2: table title # per_unit_area_start_row_number + 2 ~ per_unit_area_start_row_number + 2 + ca_len : table_data - ################################################# + #################################################################################################################### if has_energy_data_flag: names = reporting_period_data['names'] @@ -421,12 +419,12 @@ def generate_excel(report, ws['H' + str(row_data)].border = f_border ws['H' + str(row_data)].number_format = '0.00' - ######################################################## + #################################################################################################################### # Third: 详细数据 # detailed_start_row_number~ detailed_start_row_number+time_len: line # detailed_start_row_number + 1: table title # i + analysis_end_row_number + 2 + 6 * ca_len~: table_data - ######################################################## + #################################################################################################################### has_timestamps_flag = True if "timestamps" not in reporting_period_data.keys() or \ reporting_period_data['timestamps'] is None or \ @@ -495,11 +493,11 @@ def generate_excel(report, ws[col + str(row_subtotals)].border = f_border ws[col + str(row_subtotals)].number_format = '0.00' - ######################################################## + #################################################################################################################### # third: LineChart # LineChart requires data from the detailed data table in the Excel file # so print the detailed data table first and then print LineChart - ######################################################## + #################################################################################################################### for i in range(0, ca_len): line = LineChart() @@ -524,7 +522,7 @@ def generate_excel(report, ser.marker.symbol = "diamond" ser.marker.size = 5 ws.add_chart(line, 'B' + str(analysis_end_row_number + 6 * i)) - ########################################## + #################################################################################################################### current_sheet_parameters_row_number = analysis_end_row_number + ca_len * 6 + 1 has_parameters_names_and_timestamps_and_values_data = True if 'parameters' not in report.keys() or \ @@ -543,9 +541,9 @@ def generate_excel(report, if has_parameters_names_and_timestamps_and_values_data: - ############################### + ################################################################################################################ # new worksheet - ############################### + ################################################################################################################ parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) @@ -576,7 +574,6 @@ def generate_excel(report, img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") parameters_ws.add_image(img, 'B1') # Title @@ -661,9 +658,9 @@ def generate_excel(report, table_current_col_number = table_current_col_number + 3 - ######################################################## + ################################################################################################################ # parameters chart and parameters table - ######################################################## + ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' @@ -709,7 +706,7 @@ def generate_excel(report, current_sheet_parameters_row_number = chart_start_row_number current_sheet_parameters_row_number += 1 - ########################################## + #################################################################################################################### filename = str(uuid.uuid4()) + '.xlsx' wb.save(filename) diff --git a/myems-api/excelexporters/virtualmetercost.py b/myems-api/excelexporters/virtualmetercost.py index 0c8388a6..65962fd3 100644 --- a/myems-api/excelexporters/virtualmetercost.py +++ b/myems-api/excelexporters/virtualmetercost.py @@ -13,12 +13,12 @@ from openpyxl import Workbook from openpyxl.chart.label import DataLabelList -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(report, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -69,12 +69,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ws.row_dimensions[1].height = 102 for i in range(2, 2000 + 1): ws.row_dimensions[i].height = 42 - # ws.row_dimensions[1].height = 102 - # for i in range(2, 11 + 1): - # ws.row_dimensions[i].height = 30 - # - # for i in range(12, 43 + 1): - # ws.row_dimensions[i].height = 30 # Col width ws.column_dimensions['A'].width = 1.5 @@ -87,7 +81,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -117,18 +110,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -166,7 +152,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ############################### + #################################################################################################################### has_cost_data_flag = True @@ -262,7 +248,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(6, 9 + 1): ws.rows_dimensions[i].height = 0.1 - ###################################### + #################################################################################################################### has_cost_detail_flag = True reporting_period_data = report['reporting_period'] diff --git a/myems-api/excelexporters/virtualmeterenergy.py b/myems-api/excelexporters/virtualmeterenergy.py index 0ec50075..cab86ef2 100644 --- a/myems-api/excelexporters/virtualmeterenergy.py +++ b/myems-api/excelexporters/virtualmeterenergy.py @@ -14,12 +14,12 @@ from openpyxl.drawing.image import Image from openpyxl.styles import PatternFill, Border, Side, Alignment, Font -#################################################################################################################### +######################################################################################################################## # PROCEDURES # Step 1: Validate the report data # Step 2: Generate excelexporters file # Step 3: Encode the excelexporters file to Base64 -#################################################################################################################### +######################################################################################################################## def export(result, name, reporting_start_datetime_local, reporting_end_datetime_local, period_type): #################################################################################################################### @@ -78,7 +78,6 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d # Font name_font = Font(name='Constantia', size=15, bold=True) title_font = Font(name='宋体', size=15, bold=True) - data_font = Font(name='Franklin Gothic Book', size=11) table_fill = PatternFill(fill_type='solid', fgColor='1F497D') f_border = Border(left=Side(border_style='medium', color='00000000'), @@ -108,18 +107,11 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d wrap_text=True, shrink_to_fit=False, indent=0) - c_r_alignment = Alignment(vertical='bottom', - horizontal='center', - text_rotation=0, - wrap_text=True, - shrink_to_fit=False, - indent=0) # Img img = Image("excelexporters/myems.png") img.width = img.width * 0.85 img.height = img.height * 0.85 - # img = Image("myems.png") ws.add_image(img, 'B1') # Title @@ -157,7 +149,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d return filename - ############################### + #################################################################################################################### has_cost_data_flag = True @@ -253,7 +245,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d for i in range(6, 9 + 1): ws.rows_dimensions[i].height = 0.1 - ###################################### + #################################################################################################################### has_cost_detail_flag = True reporting_period_data = report['reporting_period']