Commit 0c4f8863 authored by suryakant's avatar suryakant

ACP Custom Report Changes

parent 975dc483
......@@ -196,6 +196,7 @@ class CustomReportHandler:
column_counter = 0
previous_category_cols = 0
header_flag = False
color_json = dict()
logger.info("Iterating through each block to create a dataframe")
# Iterate through the categories and concatenate their data
......@@ -221,6 +222,13 @@ class CustomReportHandler:
column_counter += shape[1]
previous_category_cols = column_counter
# Checking if color in addition section
if "addition" in category_data and "column_color" in category_data[
"addition"]:
color_json.update(
category_data["addition"]["column_color"]
)
if header_flag:
start_row += 1
......@@ -238,17 +246,28 @@ class CustomReportHandler:
# Generating merged header for each dataframe
for merge_index, border_value in border_json.items():
# (Start Rows, Start Column, End Row, End Column, Title, Format)
worksheet.merge_range(*merge_index, border_value,
workbook.add_format(header_merge_format))
if border_value and border_value in color_json:
merge_style_format = copy.deepcopy(header_merge_format)
merge_style_format["fg_color"] = color_json[border_value]
worksheet.merge_range(*merge_index, border_value,
workbook.add_format(merge_style_format))
else:
worksheet.merge_range(*merge_index, border_value,
workbook.add_format(header_merge_format))
# Write the column headers with the defined format.
for col_index, value in enumerate(result_df.columns.values):
if value:
worksheet.write(
start_row, col_index, value,
workbook.add_format(column_merge_format)
)
if color_json and value in color_json:
style_format = copy.deepcopy(column_merge_format)
style_format["fg_color"] = color_json[value]
worksheet.write(
start_row, col_index, value,
workbook.add_format(style_format))
else:
worksheet.write(
start_row, col_index, value,
workbook.add_format(column_merge_format))
else:
worksheet.write(
start_row, col_index, value,
......
......@@ -104,6 +104,13 @@ class ACPReportTemplate:
"data_column": [
"persons_on_duty", "a", "b", "c"
],
"addition": {
"column_color": {
"A": "#51E02A",
"B": "#51E02A",
"C": "#51E02A",
}
}
},
"BLANK1": {
"columns": [None],
......@@ -124,217 +131,247 @@ class ACPReportTemplate:
"data_column": [
"anode_lug_thickness", "anode_body_thickness"
],
"addition": {
"column_color": {
"ANODE LUG THICKNESS (22-32 mm)": "#51E02A",
"ANODE BODY THICKNESS (31-41 mm)": "#51E02A",
}
}
},
},
# {
# "A-SHIFT COMMUNICATION": {
# "columns": [
# "S.No", "A-SHIFT COMMUNICATION"
# ],
# "query": {
# "AShiftCommunication": [
# ACPQuery.AShiftCommunication.QUERY_1,
# ],
# },
# "data": [],
# "data_column": [
# "s_no", "a_shift_comm"
# ],
# },
# "A SHIFTWISE DATA": {
# "columns": [
# "MOULD", "SET VALUE", "FIELD WT"
# ],
# "query": {
# "AShiftwiseData": [
# ACPQuery.AShiftwiseData.QUERY_1,
# ]
# },
# "data": [],
# "data_column": [
# "mould", "set_value", "field_wt"
# ],
# "addition": {
# "merge_header": "SHIFTWISE DATA"
# }
# }
# },
# {
# "B-SHIFT COMMUNICATION": {
# "columns": [
# "S.No", "B-SHIFT COMMUNICATION"
# ],
# "query": {
# "BShiftCommunication": [
# ACPQuery.BShiftCommunication.QUERY_1,
# ],
# },
# "data": [],
# "data_column": [
# "s_no", "b_shift_comm"
# ],
# },
# "B SHIFTWISE DATA": {
# "columns": [
# "MOULD", "SET VALUE", "FIELD WT"
# ],
# "query": {
# "BShiftwiseData": [
# ACPQuery.BShiftwiseData.QUERY_1,
# ]
# },
# "data": [],
# "data_column": [
# "mould", "set_value", "field_wt"
# ],
# "addition": {
# "merge_header": "SHIFTWISE DATA"
# }
# }
# },
# {
# "C-SHIFT COMMUNICATION": {
# "columns": [
# "S.No", "C-SHIFT COMMUNICATION"
# ],
# "query": {
# "CShiftCommunication": [
# ACPQuery.CShiftCommunication.QUERY_1,
# ],
# },
# "data": [],
# "data_column": [
# "s_no", "a_shift_comm"
# ],
# },
# "C SHIFTWISE DATA": {
# "columns": [
# "MOULD", "SET VALUE", "FIELD WT"
# ],
# "query": {
# "CShiftwiseData": [
# ACPQuery.CShiftwiseData.QUERY_1,
# ]
# },
# "data": [],
# "data_column": [
# "mould", "set_value", "field_wt"
# ],
# "addition": {
# "merge_header": "SHIFTWISE DATA"
# }
# }
# },
# {
# "PARAMETERS": {
# "columns": [
# "PARAMETERS", "RANGE", "VALUE"
# ],
# "query": {
# "Furnace1FoTemperature": [
# ACPQuery.Furnace1FoTemperature.QUERY_1,
# ],
# "FoOilPressure": [
# ACPQuery.FoOilPressure.QUERY_1,
# ],
# "Furnace1OilFlow": [
# ACPQuery.Furnace1OilFlow.QUERY_1,
# ],
# "Furnace2OilFlow": [
# ACPQuery.Furnace2OilFlow.QUERY_1,
# ],
# "MeltTemperature": [
# ACPQuery.MeltTemperature.QUERY_1,
# ],
# "MouldTemperature": [
# ACPQuery.MouldTemperature.QUERY_1,
# ],
# "LpgVapourizerTemperature": [
# ACPQuery.LpgVapourizerTemperature.QUERY_1,
# ],
# "LaunderBlowerAirPressure": [
# ACPQuery.LaunderBlowerAirPressure.QUERY_1,
# ],
# "Furnace1ShellTemperature": [
# ACPQuery.Furnace1ShellTemperature.QUERY_1,
# ],
# "Furnace2ShellTemperature": [
# ACPQuery.Furnace2ShellTemperature.QUERY_1,
# ],
# "BariumSulphateSolutionSpecificGravity": [
# ACPQuery.BariumSulphateSolutionSpecificGravity.QUERY_1,
# ],
# "MouldAlignmentLevel": [
# ACPQuery.MouldAlignmentLevel.QUERY_1,
# ],
# "HeatNoArsenicA": [
# ACPQuery.HeatNoArsenicA.QUERY_1,
# ],
# "HeatNoArsenicB": [
# ACPQuery.HeatNoArsenicB.QUERY_1,
# ],
# "HeatNoArsenicC": [
# ACPQuery.HeatNoArsenicC.QUERY_1,
# ]
# },
# "data": [],
# "data_column": [
# "parameters", "range", "value"
# ],
# },
# },
# {
# "FURNACE SHIFT A": {
# "columns": [
# "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
# ],
# "query": {
# "FurnaceShiftA": [
# ACPQuery.FurnaceShiftA.QUERY_1,
# ],
# },
# "data": [],
# "data_column": [
# "furnace", "burner_1", "burner_2", "burner_3"
# ],
# "addition": {
# "merge_header": "SHIFT - A DATA"
# }
# },
# "FURNACE SHIFT B": {
# "columns": [
# "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
# ],
# "query": {
# "FurnaceShiftB": [
# ACPQuery.FurnaceShiftB.QUERY_1,
# ],
# },
# "data": [],
# "data_column": [
# "furnace", "burner_1", "burner_2", "burner_3"
# ],
# "addition": {
# "merge_header": "SHIFT - B DATA"
# }
# },
# "FURNACE SHIFT C": {
# "columns": [
# "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
# ],
# "query": {
# "FurnaceShiftC": [
# ACPQuery.FurnaceShiftC.QUERY_1,
# ],
# },
# "data": [],
# "data_column": [
# "furnace", "burner_1", "burner_2", "burner_3"
# ],
# "addition": {
# "merge_header": "SHIFT - C DATA"
# }
# }
# }
{
"A-SHIFT COMMUNICATION": {
"columns": [
"S.No", "A-SHIFT COMMUNICATION"
],
"query": {
"AShiftCommunication": [
ACPQuery.AShiftCommunication.QUERY_1,
],
},
"data": [],
"data_column": [
"s_no", "a_shift_comm"
],
"addition": {
"column_color": {
"A-SHIFT COMMUNICATION": "#51E02A",
}
}
},
"A SHIFTWISE DATA": {
"columns": [
"MOULD", "SET VALUE", "FIELD WT"
],
"query": {
"AShiftwiseData": [
ACPQuery.AShiftwiseData.QUERY_1,
]
},
"data": [],
"data_column": [
"mould", "set_value", "field_wt"
],
"addition": {
"merge_header": "SHIFTWISE DATA",
"column_color": {
"SHIFTWISE DATA": "#FDCD78",
}
}
}
},
{
"B-SHIFT COMMUNICATION": {
"columns": [
"S.No", "B-SHIFT COMMUNICATION"
],
"query": {
"BShiftCommunication": [
ACPQuery.BShiftCommunication.QUERY_1,
],
},
"data": [],
"data_column": [
"s_no", "b_shift_comm"
],
"addition": {
"column_color": {
"B-SHIFT COMMUNICATION": "#51E02A",
}
}
},
"B SHIFTWISE DATA": {
"columns": [
"MOULD", "SET VALUE", "FIELD WT"
],
"query": {
"BShiftwiseData": [
ACPQuery.BShiftwiseData.QUERY_1,
]
},
"data": [],
"data_column": [
"mould", "set_value", "field_wt"
],
"addition": {
"merge_header": "SHIFTWISE DATA",
"column_color": {
"SHIFTWISE DATA": "#FDCD78",
}
}
}
},
{
"C-SHIFT COMMUNICATION": {
"columns": [
"S.No", "C-SHIFT COMMUNICATION"
],
"query": {
"CShiftCommunication": [
ACPQuery.CShiftCommunication.QUERY_1,
],
},
"data": [],
"data_column": [
"s_no", "a_shift_comm"
],
"addition": {
"column_color": {
"C-SHIFT COMMUNICATION": "#51E02A",
}
}
},
"C SHIFTWISE DATA": {
"columns": [
"MOULD", "SET VALUE", "FIELD WT"
],
"query": {
"CShiftwiseData": [
ACPQuery.CShiftwiseData.QUERY_1,
]
},
"data": [],
"data_column": [
"mould", "set_value", "field_wt"
],
"addition": {
"merge_header": "SHIFTWISE DATA",
"column_color": {
"SHIFTWISE DATA": "#FDCD78",
}
}
}
},
{
"PARAMETERS": {
"columns": [
"PARAMETERS", "RANGE", "VALUE"
],
"query": {
"Furnace1FoTemperature": [
ACPQuery.Furnace1FoTemperature.QUERY_1,
],
"FoOilPressure": [
ACPQuery.FoOilPressure.QUERY_1,
],
"Furnace1OilFlow": [
ACPQuery.Furnace1OilFlow.QUERY_1,
],
"Furnace2OilFlow": [
ACPQuery.Furnace2OilFlow.QUERY_1,
],
"MeltTemperature": [
ACPQuery.MeltTemperature.QUERY_1,
],
"MouldTemperature": [
ACPQuery.MouldTemperature.QUERY_1,
],
"LpgVapourizerTemperature": [
ACPQuery.LpgVapourizerTemperature.QUERY_1,
],
"LaunderBlowerAirPressure": [
ACPQuery.LaunderBlowerAirPressure.QUERY_1,
],
"Furnace1ShellTemperature": [
ACPQuery.Furnace1ShellTemperature.QUERY_1,
],
"Furnace2ShellTemperature": [
ACPQuery.Furnace2ShellTemperature.QUERY_1,
],
"BariumSulphateSolutionSpecificGravity": [
ACPQuery.BariumSulphateSolutionSpecificGravity.QUERY_1,
],
"MouldAlignmentLevel": [
ACPQuery.MouldAlignmentLevel.QUERY_1,
],
"HeatNoArsenicA": [
ACPQuery.HeatNoArsenicA.QUERY_1,
],
"HeatNoArsenicB": [
ACPQuery.HeatNoArsenicB.QUERY_1,
],
"HeatNoArsenicC": [
ACPQuery.HeatNoArsenicC.QUERY_1,
]
},
"data": [],
"data_column": [
"parameters", "range", "value"
],
},
},
{
"FURNACE SHIFT A": {
"columns": [
"FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
],
"query": {
"FurnaceShiftA": [
ACPQuery.FurnaceShiftA.QUERY_1,
],
},
"data": [],
"data_column": [
"furnace", "burner_1", "burner_2", "burner_3"
],
"addition": {
"merge_header": "SHIFT - A DATA"
}
},
"FURNACE SHIFT B": {
"columns": [
"FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
],
"query": {
"FurnaceShiftB": [
ACPQuery.FurnaceShiftB.QUERY_1,
],
},
"data": [],
"data_column": [
"furnace", "burner_1", "burner_2", "burner_3"
],
"addition": {
"merge_header": "SHIFT - B DATA"
}
},
"FURNACE SHIFT C": {
"columns": [
"FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
],
"query": {
"FurnaceShiftC": [
ACPQuery.FurnaceShiftC.QUERY_1,
],
},
"data": [],
"data_column": [
"furnace", "burner_1", "burner_2", "burner_3"
],
"addition": {
"merge_header": "SHIFT - C DATA"
}
}
}
]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment