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

fixed issues in excel exporters of combinedequipment in API

pull/35/MERGE
13621160019@163.com 2021-04-18 23:23:51 +08:00
parent 73516fba3e
commit e744744dfa
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
myems-api/excelexporters/combinedequipmentcost.py
View File

@ -763,7 +763,7 @@ def generate_excel(report,
parameters_ws[table_current_col_number + str(parameters_ws_current_row_number - 1)].fill = table_fill parameters_ws[table_current_col_number + str(parameters_ws_current_row_number - 1)].fill = table_fill
parameters_ws[table_current_col_number + str(parameters_ws_current_row_number - 1)].border = f_border parameters_ws[table_current_col_number + str(parameters_ws_current_row_number - 1)].border = f_border
col = chr(ord(table_current_col_number) + 1) col = decimal_to_column(column_to_decimal(table_current_col_number) + 1)
parameters_ws[col + str(parameters_ws_current_row_number - 1)].fill = table_fill parameters_ws[col + str(parameters_ws_current_row_number - 1)].fill = table_fill
parameters_ws[col + str(parameters_ws_current_row_number - 1)].border = f_border parameters_ws[col + str(parameters_ws_current_row_number - 1)].border = f_border
@ -781,7 +781,7 @@ def generate_excel(report,
parameters_ws[col + str(table_current_row_number)].alignment = c_c_alignment parameters_ws[col + str(table_current_row_number)].alignment = c_c_alignment
parameters_ws[col + str(table_current_row_number)] = value parameters_ws[col + str(table_current_row_number)] = value
col = chr(ord(col) + 1) col = decimal_to_column(column_to_decimal(col) + 1)
parameters_ws[col + str(table_current_row_number)].border = f_border parameters_ws[col + str(table_current_row_number)].border = f_border
parameters_ws[col + str(table_current_row_number)].font = title_font parameters_ws[col + str(table_current_row_number)].font = title_font
@ -790,7 +790,7 @@ def generate_excel(report,
table_current_row_number += 1 table_current_row_number += 1
table_current_col_number = chr(ord(table_current_col_number) + 3) table_current_col_number = decimal_to_column(column_to_decimal(table_current_col_number) + 3)
######################################################## ########################################################
# parameters chart and parameters table # parameters chart and parameters table
@ -870,3 +870,33 @@ def timestamps_data_not_equal_0(lists):
if len(value) > 0: if len(value) > 0:
number += 1 number += 1
return number return number
def decimal_to_column(num=65):
string = ''
num = num - 64
# The column number is not greater than 90
if num <= 26:
return chr(num + 64)
# The column number is greater than 90
while num // 26 > 0:
if num % 26 == 0:
string += 'Z'
num = num // 26 - 1
else:
string += chr(num % 26 + 64)
num //= 26
# Avoid conversion errors that might occur between 741 and 766
if num > 0:
string += chr(num + 64)
return string[::-1]
def column_to_decimal(string='A'):
num = 0
for index, key in enumerate(string[::-1]):
num += (ord(key) - 64) * (26 ** index)
return num + 64