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

replaced every_day_* to periodic_* in excelexporters of API

pull/59/head
13621160019@163.com 2021-08-05 10:52:00 +08:00
parent fb6576ab36
commit b6c6659106
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
myems-api/excelexporters/combinedequipmentincome.py
View File

@ -434,9 +434,9 @@ def generate_excel(report,
row = str(table_row + 1 + j) row = str(table_row + 1 + j)
ws[col + row].font = title_font ws[col + row].font = title_font
ws[col + row].alignment = c_c_alignment ws[col + row].alignment = c_c_alignment
every_day_sum = reporting_period_values_every_day_sum(reporting_period_data, j, ca_len) periodic_sum = reporting_period_values_periodic_sum(reporting_period_data, j, ca_len)
total_sum += every_day_sum total_sum += periodic_sum
ws[col + row] = round(every_day_sum, 2) ws[col + row] = round(periodic_sum, 2)
ws[col + row].border = f_border ws[col + row].border = f_border
row = str(table_row + 1 + len(time)) row = str(table_row + 1 + len(time))
@ -713,12 +713,12 @@ def generate_excel(report,
return filename return filename
def reporting_period_values_every_day_sum(reporting_period_data, every_day_index, ca_len): def reporting_period_values_periodic_sum(reporting_period_data, periodic_index, ca_len):
every_day_sum = 0 periodic_sum = 0
for i in range(0, ca_len): 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): def get_parameters_timestamps_lists_max_len(parameters_timestamps_lists):