diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 9b585da9..1359c008 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -434,9 +434,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)) @@ -713,12 +713,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 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 get_parameters_timestamps_lists_max_len(parameters_timestamps_lists):