Fixed the Income bug
parent
ad611f096a
commit
5b9305ee5a
|
@ -7,11 +7,12 @@ from openpyxl.chart import (
|
||||||
BarChart,
|
BarChart,
|
||||||
Reference,
|
Reference,
|
||||||
)
|
)
|
||||||
|
from decimal import *
|
||||||
from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
|
from openpyxl.styles import PatternFill, Border, Side, Alignment, Font
|
||||||
from openpyxl.drawing.image import Image
|
from openpyxl.drawing.image import Image
|
||||||
from openpyxl import Workbook
|
from openpyxl import Workbook
|
||||||
from openpyxl.chart.label import DataLabelList
|
from openpyxl.chart.label import DataLabelList
|
||||||
|
import openpyxl.utils.cell as format_cell
|
||||||
|
|
||||||
####################################################################################################################
|
####################################################################################################################
|
||||||
# PROCEDURES
|
# PROCEDURES
|
||||||
|
@ -276,9 +277,9 @@ def generate_excel(report,
|
||||||
current_row_number += 1
|
current_row_number += 1
|
||||||
|
|
||||||
ca_len = len(reporting_period_data['names'])
|
ca_len = len(reporting_period_data['names'])
|
||||||
wssum = 0
|
income_sum = Decimal(0.0)
|
||||||
for i in range(0, ca_len):
|
for i in range(0, ca_len):
|
||||||
wssum = round(reporting_period_data['subtotals'][i], 2) + wssum
|
income_sum = round(reporting_period_data['subtotals'][i], 2) + income_sum
|
||||||
for i in range(0, ca_len):
|
for i in range(0, ca_len):
|
||||||
ws['B' + str(current_row_number)].font = title_font
|
ws['B' + str(current_row_number)].font = title_font
|
||||||
ws['B' + str(current_row_number)].alignment = c_c_alignment
|
ws['B' + str(current_row_number)].alignment = c_c_alignment
|
||||||
|
@ -293,7 +294,9 @@ def generate_excel(report,
|
||||||
ws['D' + str(current_row_number)].font = title_font
|
ws['D' + str(current_row_number)].font = title_font
|
||||||
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)] = '{:.2%}'.format(round(reporting_period_data['subtotals'][i], 2) / wssum)
|
ws['D' + str(current_row_number)] = '{:.2%}'.format(round(reporting_period_data['subtotals'][i], 2) /
|
||||||
|
income_sum if income_sum is not None and
|
||||||
|
income_sum != Decimal(0.0) else "")
|
||||||
|
|
||||||
current_row_number += 1
|
current_row_number += 1
|
||||||
|
|
||||||
|
@ -328,7 +331,8 @@ def generate_excel(report,
|
||||||
times = reporting_period_data['timestamps']
|
times = reporting_period_data['timestamps']
|
||||||
has_detail_data_flag = True
|
has_detail_data_flag = True
|
||||||
ca_len = len(report['reporting_period']['names'])
|
ca_len = len(report['reporting_period']['names'])
|
||||||
table_row = (current_row_number + 1) + ca_len * 6
|
real_timestamps_len = timestamps_data_not_equal_0(report['parameters']['timestamps'])
|
||||||
|
table_row = (current_row_number + 1) + ca_len * 6 + real_timestamps_len * 7
|
||||||
if "timestamps" not in reporting_period_data.keys() or \
|
if "timestamps" not in reporting_period_data.keys() or \
|
||||||
reporting_period_data['timestamps'] is None or \
|
reporting_period_data['timestamps'] is None or \
|
||||||
len(reporting_period_data['timestamps']) == 0:
|
len(reporting_period_data['timestamps']) == 0:
|
||||||
|
@ -448,7 +452,189 @@ def generate_excel(report,
|
||||||
else:
|
else:
|
||||||
for i in range(37, 69 + 1):
|
for i in range(37, 69 + 1):
|
||||||
ws.row_dimensions[i].height = 0.1
|
ws.row_dimensions[i].height = 0.1
|
||||||
|
##########################################
|
||||||
|
current_sheet_parameters_row_number = current_row_number + ca_len * 6 + 1
|
||||||
|
has_parameters_names_and_timestamps_and_values_data = True
|
||||||
|
if 'parameters' not in report.keys() or \
|
||||||
|
report['parameters'] is None or \
|
||||||
|
'names' not in report['parameters'].keys() or \
|
||||||
|
report['parameters']['names'] is None or \
|
||||||
|
len(report['parameters']['names']) == 0 or \
|
||||||
|
'timestamps' not in report['parameters'].keys() or \
|
||||||
|
report['parameters']['timestamps'] is None or \
|
||||||
|
len(report['parameters']['timestamps']) == 0 or \
|
||||||
|
'values' not in report['parameters'].keys() or \
|
||||||
|
report['parameters']['values'] is None or \
|
||||||
|
len(report['parameters']['values']) == 0 or \
|
||||||
|
timestamps_data_all_equal_0(report['parameters']['timestamps']):
|
||||||
|
|
||||||
|
has_parameters_names_and_timestamps_and_values_data = False
|
||||||
|
if has_parameters_names_and_timestamps_and_values_data:
|
||||||
|
|
||||||
|
###############################
|
||||||
|
# new worksheet
|
||||||
|
###############################
|
||||||
|
|
||||||
|
parameters_data = report['parameters']
|
||||||
|
parameters_names_len = len(parameters_data['names'])
|
||||||
|
|
||||||
|
parameters_ws = wb.create_sheet('相关参数')
|
||||||
|
|
||||||
|
parameters_timestamps_data_max_len = \
|
||||||
|
get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps']))
|
||||||
|
|
||||||
|
# Row height
|
||||||
|
parameters_ws.row_dimensions[1].height = 102
|
||||||
|
for i in range(2, 7 + 1):
|
||||||
|
parameters_ws.row_dimensions[i].height = 42
|
||||||
|
|
||||||
|
for i in range(8, parameters_timestamps_data_max_len + 10):
|
||||||
|
parameters_ws.row_dimensions[i].height = 60
|
||||||
|
|
||||||
|
# Col width
|
||||||
|
parameters_ws.column_dimensions['A'].width = 1.5
|
||||||
|
|
||||||
|
parameters_ws.column_dimensions['B'].width = 25.0
|
||||||
|
|
||||||
|
for i in range(3, 12+parameters_names_len*3):
|
||||||
|
parameters_ws.column_dimensions[format_cell.get_column_letter(i)].width = 15.0
|
||||||
|
|
||||||
|
# Img
|
||||||
|
img = Image("excelexporters/myems.png")
|
||||||
|
img.width = img.width * 0.85
|
||||||
|
img.height = img.height * 0.85
|
||||||
|
# img = Image("myems.png")
|
||||||
|
parameters_ws.add_image(img, 'B1')
|
||||||
|
|
||||||
|
# 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_current_row_number = 6
|
||||||
|
|
||||||
|
parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font
|
||||||
|
parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数'
|
||||||
|
|
||||||
|
parameters_ws_current_row_number += 1
|
||||||
|
|
||||||
|
parameters_table_start_row_number = parameters_ws_current_row_number
|
||||||
|
|
||||||
|
parameters_ws.row_dimensions[parameters_ws_current_row_number].height = 80
|
||||||
|
|
||||||
|
parameters_ws_current_row_number += 1
|
||||||
|
|
||||||
|
table_current_col_number = 'B'
|
||||||
|
|
||||||
|
for i in range(0, parameters_names_len):
|
||||||
|
|
||||||
|
if len(parameters_data['timestamps'][i]) == 0:
|
||||||
|
continue
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
col = chr(ord(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)].border = f_border
|
||||||
|
parameters_ws[col + str(parameters_ws_current_row_number-1)].font = name_font
|
||||||
|
parameters_ws[col + str(parameters_ws_current_row_number-1)].alignment = c_c_alignment
|
||||||
|
parameters_ws[col + str(parameters_ws_current_row_number-1)] = parameters_data['names'][i]
|
||||||
|
|
||||||
|
table_current_row_number = parameters_ws_current_row_number
|
||||||
|
|
||||||
|
for j, value in enumerate(list(parameters_data['timestamps'][i])):
|
||||||
|
col = table_current_col_number
|
||||||
|
|
||||||
|
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)].alignment = c_c_alignment
|
||||||
|
parameters_ws[col + str(table_current_row_number)] = value
|
||||||
|
|
||||||
|
col = chr(ord(col) + 1)
|
||||||
|
|
||||||
|
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)].alignment = c_c_alignment
|
||||||
|
parameters_ws[col + str(table_current_row_number)] = round(parameters_data['values'][i][j], 2)
|
||||||
|
|
||||||
|
table_current_row_number += 1
|
||||||
|
|
||||||
|
table_current_col_number = chr(ord(table_current_col_number) + 3)
|
||||||
|
|
||||||
|
########################################################
|
||||||
|
# parameters chart and parameters table
|
||||||
|
########################################################
|
||||||
|
|
||||||
|
ws['B' + str(current_sheet_parameters_row_number)].font = title_font
|
||||||
|
ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数'
|
||||||
|
|
||||||
|
current_sheet_parameters_row_number += 1
|
||||||
|
|
||||||
|
chart_start_row_number = current_sheet_parameters_row_number
|
||||||
|
|
||||||
|
col_index = 0
|
||||||
|
|
||||||
|
for i in range(0, parameters_names_len):
|
||||||
|
|
||||||
|
if len(parameters_data['timestamps'][i]) == 0:
|
||||||
|
continue
|
||||||
|
|
||||||
|
line = LineChart()
|
||||||
|
data_col = 3+col_index*3
|
||||||
|
labels_col = 2+col_index*3
|
||||||
|
col_index += 1
|
||||||
|
line.title = '相关参数 - ' + \
|
||||||
|
parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value
|
||||||
|
labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1,
|
||||||
|
max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number))
|
||||||
|
line_data = Reference(parameters_ws, min_col=data_col, min_row=parameters_table_start_row_number,
|
||||||
|
max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number))
|
||||||
|
line.add_data(line_data, titles_from_data=True)
|
||||||
|
line.set_categories(labels)
|
||||||
|
line_data = line.series[0]
|
||||||
|
line_data.marker.symbol = "circle"
|
||||||
|
line_data.smooth = True
|
||||||
|
line.x_axis.crosses = 'min'
|
||||||
|
line.height = 8.25
|
||||||
|
line.width = 24
|
||||||
|
line.dLbls = DataLabelList()
|
||||||
|
line.dLbls.dLblPos = 't'
|
||||||
|
line.dLbls.showVal = False
|
||||||
|
line.dLbls.showPercent = False
|
||||||
|
chart_col = 'B'
|
||||||
|
chart_cell = chart_col + str(chart_start_row_number)
|
||||||
|
chart_start_row_number += 6
|
||||||
|
ws.add_chart(line, chart_cell)
|
||||||
|
|
||||||
|
current_sheet_parameters_row_number = chart_start_row_number
|
||||||
|
|
||||||
|
current_sheet_parameters_row_number += 1
|
||||||
|
##########################################
|
||||||
filename = str(uuid.uuid4()) + '.xlsx'
|
filename = str(uuid.uuid4()) + '.xlsx'
|
||||||
wb.save(filename)
|
wb.save(filename)
|
||||||
|
|
||||||
|
@ -461,3 +647,28 @@ def reporting_period_values_every_day_sum(reporting_period_data, every_day_index
|
||||||
every_day_sum += reporting_period_data['values'][i][every_day_index]
|
every_day_sum += reporting_period_data['values'][i][every_day_index]
|
||||||
|
|
||||||
return every_day_sum
|
return every_day_sum
|
||||||
|
|
||||||
|
|
||||||
|
def timestamps_data_all_equal_0(lists):
|
||||||
|
for i, value in enumerate(list(lists)):
|
||||||
|
if len(value) > 0:
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
def get_parameters_timestamps_lists_max_len(parameters_timestamps_lists):
|
||||||
|
max_len = 0
|
||||||
|
for i, value in enumerate(list(parameters_timestamps_lists)):
|
||||||
|
if len(value) > max_len:
|
||||||
|
max_len = len(value)
|
||||||
|
|
||||||
|
return max_len
|
||||||
|
|
||||||
|
|
||||||
|
def timestamps_data_not_equal_0(lists):
|
||||||
|
number = 0
|
||||||
|
for i, value in enumerate(list(lists)):
|
||||||
|
if len(value) > 0:
|
||||||
|
number += 1
|
||||||
|
return number
|
Loading…
Reference in New Issue