From 0a797a96b5609a3e1f0997314d7e659b0a968843 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 7 Mar 2021 10:52:48 +0800 Subject: [PATCH] removed abs function for calculating percentage in combinedequipmentsaving --- myems-api/excelexporters/combinedequipmentsaving.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index 7d5a7a1a..c272af9c 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.py @@ -330,7 +330,7 @@ def generate_excel(report, ws['D' + str(current_row_number)].alignment = c_c_alignment ws['D' + str(current_row_number)].border = f_border ws['D' + str(current_row_number)] = \ - str(round(abs(reporting_period_data['subtotals_in_kgce_saving'][i]) / + str(round(reporting_period_data['subtotals_in_kgce_saving'][i] / subtotals_in_kgce_saving_sum * 100, 2)) + '%' current_row_number += 1 @@ -399,7 +399,7 @@ def generate_excel(report, ws['D' + str(current_row_number)].alignment = c_c_alignment ws['D' + str(current_row_number)].border = f_border ws['D' + str(current_row_number)] = \ - str(round(abs(reporting_period_data['subtotals_in_kgco2e_saving'][i]) / + str(round(reporting_period_data['subtotals_in_kgco2e_saving'][i] / subtotals_in_kgco2e_saving_sum * 100, 2)) + '%' current_row_number += 1 @@ -567,6 +567,6 @@ def sum_list(lists): total = 0 for i in range(0, len(lists)): - total += abs(lists[i]) + total += lists[i] return total