seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

removed abs functions for calculating percentage in equipmentsaving

pull/8/MERGE
13621160019@163.com 2021-03-07 10:58:30 +08:00
parent a62735c9b6
commit 57a4bf377b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
myems-api/excelexporters/equipmentsaving.py
View File

@ -330,7 +330,7 @@ def generate_excel(report,
ws['D' + str(current_row_number)].alignment = c_c_alignment 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)].border = f_border
ws['D' + str(current_row_number)] = \ 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)) + '%' subtotals_in_kgce_saving_sum * 100, 2)) + '%'
current_row_number += 1 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)].alignment = c_c_alignment
ws['D' + str(current_row_number)].border = f_border ws['D' + str(current_row_number)].border = f_border
ws['D' + str(current_row_number)] = \ 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)) + '%' subtotals_in_kgco2e_saving_sum * 100, 2)) + '%'
current_row_number += 1 current_row_number += 1
@ -567,6 +567,6 @@ def sum_list(lists):
total = 0 total = 0
for i in range(0, len(lists)): for i in range(0, len(lists)):
total += abs(lists[i]) total += lists[i]
return total return total