fixed worksheet name error in combined equipment efficiency excel exporter
commit
b2ac741fdc
|
|
@ -1,6 +1,7 @@
|
|||
import base64
|
||||
import uuid
|
||||
import os
|
||||
import re
|
||||
from openpyxl.chart import LineChart, Reference
|
||||
from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
|
||||
from openpyxl.drawing.image import Image
|
||||
|
|
@ -399,7 +400,7 @@ def generate_excel(report,
|
|||
parameters_data = report['parameters']
|
||||
parameters_names_len = len(parameters_data['names'])
|
||||
|
||||
file_name = __file__.split('/')[-1].replace(".py", "")
|
||||
file_name = (re.sub(r'[^A-Z]', '', ws.title))+'_'
|
||||
parameters_ws = wb.create_sheet(file_name + 'Parameters')
|
||||
|
||||
parameters_timestamps_data_max_len = \
|
||||
|
|
@ -426,32 +427,29 @@ def generate_excel(report,
|
|||
parameters_ws.add_image(img, 'A1')
|
||||
|
||||
# Title
|
||||
parameters_ws.row_dimensions[3].height = 60
|
||||
|
||||
parameters_ws['B3'].font = name_font
|
||||
parameters_ws['B3'].alignment = b_r_alignment
|
||||
parameters_ws['B3'] = 'Name:'
|
||||
parameters_ws['C3'].border = b_border
|
||||
parameters_ws['C3'].alignment = b_c_alignment
|
||||
parameters_ws['C3'].font = name_font
|
||||
parameters_ws['C3'] = name
|
||||
|
||||
parameters_ws['D3'].font = name_font
|
||||
parameters_ws['D3'].alignment = b_r_alignment
|
||||
parameters_ws['D3'] = 'Period:'
|
||||
parameters_ws['E3'].border = b_border
|
||||
parameters_ws['E3'].alignment = b_c_alignment
|
||||
parameters_ws['E3'].font = name_font
|
||||
parameters_ws['E3'] = period_type
|
||||
|
||||
parameters_ws['F3'].font = name_font
|
||||
parameters_ws['F3'].alignment = b_r_alignment
|
||||
parameters_ws['F3'] = 'Date:'
|
||||
parameters_ws['G3'].border = b_border
|
||||
parameters_ws['G3'].alignment = b_c_alignment
|
||||
parameters_ws['G3'].font = name_font
|
||||
parameters_ws['G3'] = reporting_start_datetime_local + "__" + reporting_end_datetime_local
|
||||
parameters_ws.merge_cells("G3:H3")
|
||||
parameters_ws['B4'].alignment = b_r_alignment
|
||||
parameters_ws['B4'] = 'Reporting Start Datetime:'
|
||||
parameters_ws['C4'].border = b_border
|
||||
parameters_ws['C4'].alignment = b_c_alignment
|
||||
parameters_ws['C4'] = reporting_start_datetime_local
|
||||
|
||||
parameters_ws['D4'].alignment = b_r_alignment
|
||||
parameters_ws['D4'] = 'Reporting End Datetime:'
|
||||
parameters_ws['E4'].border = b_border
|
||||
parameters_ws['E4'].alignment = b_c_alignment
|
||||
parameters_ws['E4'] = reporting_end_datetime_local
|
||||
|
||||
parameters_ws_current_row_number = 6
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue