Commit 0c4f8863 authored by suryakant's avatar suryakant

ACP Custom Report Changes

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