From 8fbf1559607c1a38198c0a40294ab5f31b4dda2f Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Thu, 5 Aug 2021 10:52:05 +0800 Subject: [PATCH] replaced every_day_* to periodic_* in excelexporters of API --- .../excelexporters/combinedequipmentcost.py | 8 +++---- .../excelexporters/combinedequipmentincome.py | 1 - myems-api/excelexporters/equipmentincome.py | 14 ++++++------ myems-api/excelexporters/shopfloorcost.py | 6 ++--- myems-api/excelexporters/spacecost.py | 22 +++++++++---------- myems-api/excelexporters/spaceincome.py | 20 ++++++++--------- myems-api/excelexporters/storecost.py | 6 ++--- myems-api/excelexporters/tenantcost.py | 6 ++--- 8 files changed, 40 insertions(+), 43 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index 34e609e3..f40896cb 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -2,11 +2,9 @@ import base64 import uuid import os from decimal import Decimal - from openpyxl.chart import ( PieChart, LineChart, - BarChart, Reference, ) from openpyxl.styles import PatternFill, Border, Side, Alignment, Font @@ -511,7 +509,7 @@ def generate_excel(report, col = 'B' - every_day_total = Decimal(0.0) + periodic_sum = Decimal(0.0) for j in range(0, ca_len): col = chr(ord('C') + j) @@ -519,14 +517,14 @@ def generate_excel(report, ws[col + str(current_row_number)].font = title_font ws[col + str(current_row_number)].alignment = c_c_alignment value = round(reporting_period_data['values'][j][i], 2) - every_day_total += value + periodic_sum += value ws[col + str(current_row_number)] = value ws[col + str(current_row_number)].border = f_border end_col = chr(ord(col) + 1) ws[end_col + str(current_row_number)].font = title_font ws[end_col + str(current_row_number)].alignment = c_c_alignment - ws[end_col + str(current_row_number)] = round(every_day_total, 2) + ws[end_col + str(current_row_number)] = round(periodic_sum, 2) ws[end_col + str(current_row_number)].border = f_border current_row_number += 1 diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 1359c008..6c7dbf0f 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -6,7 +6,6 @@ from decimal import Decimal from openpyxl.chart import ( PieChart, LineChart, - BarChart, Reference, ) from openpyxl.styles import PatternFill, Border, Side, Alignment, Font diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index e01d84a2..0ab13693 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.py @@ -432,9 +432,9 @@ def generate_excel(report, row = str(table_row + 1 + j) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment - every_day_sum = reporting_period_values_every_day_sum(reporting_period_data, j, ca_len) - total_sum += every_day_sum - ws[col + row] = round(every_day_sum, 2) + periodic_sum = reporting_period_values_periodic_sum(reporting_period_data, j, ca_len) + total_sum += periodic_sum + ws[col + row] = round(periodic_sum, 2) ws[col + row].border = f_border row = str(table_row + 1 + len(time)) @@ -637,12 +637,12 @@ def generate_excel(report, return filename -def reporting_period_values_every_day_sum(reporting_period_data, every_day_index, ca_len): - every_day_sum = 0 +def reporting_period_values_periodic_sum(reporting_period_data, periodic_index, ca_len): + periodic_sum = 0.0 for i in range(0, ca_len): - every_day_sum += reporting_period_data['values'][i][every_day_index] + periodic_sum += reporting_period_data['values'][i][periodic_index] - return every_day_sum + return periodic_sum def timestamps_data_all_equal_0(lists): diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index f97b6866..2c9a524b 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -522,7 +522,7 @@ def generate_excel(report, col = 'B' - every_day_total = 0 + periodic_sum = 0.0 for j in range(0, ca_len): col = chr(ord('C') + j) @@ -530,14 +530,14 @@ def generate_excel(report, ws[col + str(current_row_number)].font = title_font ws[col + str(current_row_number)].alignment = c_c_alignment value = round(reporting_period_data['values'][j][i], 2) - every_day_total += value + periodic_sum += value ws[col + str(current_row_number)] = value ws[col + str(current_row_number)].border = f_border end_col = chr(ord(col) + 1) ws[end_col + str(current_row_number)].font = title_font ws[end_col + str(current_row_number)].alignment = c_c_alignment - ws[end_col + str(current_row_number)] = round(every_day_total, 2) + ws[end_col + str(current_row_number)] = round(periodic_sum, 2) ws[end_col + str(current_row_number)].border = f_border current_row_number += 1 diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index ccbf31e5..3cbdc0ba 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/myems-api/excelexporters/spacecost.py @@ -1,10 +1,10 @@ import base64 import uuid import os +from decimal import Decimal from openpyxl.chart import ( PieChart, LineChart, - BarChart, Reference, ) from openpyxl.styles import PatternFill, Border, Side, Alignment, Font @@ -520,9 +520,9 @@ def generate_excel(report, row = str(table_row + 1 + j) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment - every_day_sum = reporting_period_values_every_day_sum(reporting_period_data, j, ca_len) - total_sum += every_day_sum - ws[col + row] = round(every_day_sum, 2) + periodic_sum = reporting_period_values_periodic_sum(reporting_period_data, j, ca_len) + total_sum += periodic_sum + ws[col + row] = round(periodic_sum, 2) ws[col + row].border = f_border row = str(table_row + 1 + len(time)) @@ -591,20 +591,20 @@ def generate_excel(report, ws['B' + row].border = f_border col = '' - every_day_sum = 0 + periodic_sum = 0 for j in range(0, ca_len): col = chr(ord('C') + j) ws[col + row].font = name_font ws[col + row].alignment = c_c_alignment - every_day_sum += child['subtotals_array'][j][i] + periodic_sum += child['subtotals_array'][j][i] ws[col + row] = round(child['subtotals_array'][j][i], 2) ws[col + row].border = f_border col = chr(ord(col) + 1) ws[col + row].font = name_font ws[col + row].alignment = c_c_alignment - ws[col + row] = round(every_day_sum, 2) + ws[col + row] = round(periodic_sum, 2) ws[col + row].border = f_border table_end_row_number = current_row_number @@ -831,12 +831,12 @@ def generate_excel(report, return filename -def reporting_period_values_every_day_sum(reporting_period_data, every_day_index, ca_len): - every_day_sum = 0 +def reporting_period_values_periodic_sum(reporting_period_data, periodic_index, ca_len): + periodic_sum = Decimal(0.0) for i in range(0, ca_len): - every_day_sum += reporting_period_data['values'][i][every_day_index] + periodic_sum += reporting_period_data['values'][i][periodic_index] - return every_day_sum + return periodic_sum def timestamps_data_all_equal_0(lists): diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index b2d280bd..b116f431 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/myems-api/excelexporters/spaceincome.py @@ -449,9 +449,9 @@ def generate_excel(report, row = str(table_row + 1 + j) ws[col + row].font = title_font ws[col + row].alignment = c_c_alignment - every_day_sum = reporting_period_values_every_day_sum(reporting_period_data, j, ca_len) - total_sum += every_day_sum - ws[col + row] = round(every_day_sum, 2) + periodic_sum = reporting_period_values_periodic_sum(reporting_period_data, j, ca_len) + total_sum += periodic_sum + ws[col + row] = round(periodic_sum, 2) ws[col + row].border = f_border row = str(table_row + 1 + len(time)) @@ -520,20 +520,20 @@ def generate_excel(report, ws['B' + row].border = f_border col = '' - every_day_sum = Decimal(0.0) + periodic_sum = Decimal(0.0) for j in range(0, ca_len): col = chr(ord('C') + j) ws[col + row].font = name_font ws[col + row].alignment = c_c_alignment - every_day_sum += child['subtotals_array'][j][i] + periodic_sum += child['subtotals_array'][j][i] ws[col + row] = round(child['subtotals_array'][j][i], 2) ws[col + row].border = f_border col = chr(ord(col) + 1) ws[col + row].font = name_font ws[col + row].alignment = c_c_alignment - ws[col + row] = round(every_day_sum, 2) + ws[col + row] = round(periodic_sum, 2) ws[col + row].border = f_border table_end_row_number = current_row_number @@ -763,12 +763,12 @@ def generate_excel(report, return filename -def reporting_period_values_every_day_sum(reporting_period_data, every_day_index, ca_len): - every_day_sum = Decimal(0.0) +def reporting_period_values_periodic_sum(reporting_period_data, periodic_index, ca_len): + periodic_sum = Decimal(0.0) for i in range(0, ca_len): - every_day_sum += reporting_period_data['values'][i][every_day_index] + periodic_sum += reporting_period_data['values'][i][periodic_index] - return every_day_sum + return periodic_sum def timestamps_data_all_equal_0(lists): diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 8948f31a..42613f3e 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -467,7 +467,7 @@ def generate_excel(report, col = 'B' - every_day_total = 0 + periodic_sum = 0.0 for j in range(0, ca_len): col = chr(ord('C') + j) @@ -475,14 +475,14 @@ def generate_excel(report, ws[col + str(current_row_number)].font = title_font ws[col + str(current_row_number)].alignment = c_c_alignment value = round(reporting_period_data['values'][j][i], 2) - every_day_total += value + periodic_sum += value ws[col + str(current_row_number)] = value ws[col + str(current_row_number)].border = f_border end_col = chr(ord(col) + 1) ws[end_col + str(current_row_number)].font = title_font ws[end_col + str(current_row_number)].alignment = c_c_alignment - ws[end_col + str(current_row_number)] = round(every_day_total, 2) + ws[end_col + str(current_row_number)] = round(periodic_sum, 2) ws[end_col + str(current_row_number)].border = f_border current_row_number += 1 diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index f5e5784e..83baa0e3 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.py @@ -471,7 +471,7 @@ def generate_excel(report, col = 'B' - every_day_total = 0 + periodic_sum = 0.0 for j in range(0, ca_len): col = chr(ord('C') + j) @@ -479,14 +479,14 @@ def generate_excel(report, ws[col + str(current_row_number)].font = title_font ws[col + str(current_row_number)].alignment = c_c_alignment value = round(reporting_period_data['values'][j][i], 2) - every_day_total += value + periodic_sum += value ws[col + str(current_row_number)] = value ws[col + str(current_row_number)].border = f_border end_col = chr(ord(col) + 1) ws[end_col + str(current_row_number)].font = title_font ws[end_col + str(current_row_number)].alignment = c_c_alignment - ws[end_col + str(current_row_number)] = round(every_day_total, 2) + ws[end_col + str(current_row_number)] = round(periodic_sum, 2) ws[end_col + str(current_row_number)].border = f_border current_row_number += 1