Skip to content

S
sterlite_custom_reports
Commit 0c4f8863 authored by suryakant's avatar suryakant
Browse files
Options

ACP Custom Report Changes

parent 975dc483
Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 217 deletions
scripts/core/handler/event_handler.py
View file @ 0c4f8863
...@@ -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:
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, worksheet.merge_range(*merge_index, border_value,
workbook.add_format(header_merge_format)) 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:
if color_json and value in color_json:
style_format = copy.deepcopy(column_merge_format)
style_format["fg_color"] = color_json[value]
worksheet.write( worksheet.write(
start_row, col_index, value, start_row, col_index, value,
workbook.add_format(column_merge_format) 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,
......
scripts/template/acp_report_template.py
View file @ 0c4f8863
...@@ -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": {
"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": [],
# "A-SHIFT COMMUNICATION": { "data_column": [
# "columns": [ "s_no", "b_shift_comm"
# "S.No", "A-SHIFT COMMUNICATION" ],
# ], "addition": {
# "query": { "column_color": {
# "AShiftCommunication": [ "B-SHIFT COMMUNICATION": "#51E02A",
# ACPQuery.AShiftCommunication.QUERY_1, }
# ], }
# }, },
# "data": [], "B SHIFTWISE DATA": {
# "data_column": [ "columns": [
# "s_no", "a_shift_comm" "MOULD", "SET VALUE", "FIELD WT"
# ], ],
# }, "query": {
# "A SHIFTWISE DATA": { "BShiftwiseData": [
# "columns": [ ACPQuery.BShiftwiseData.QUERY_1,
# "MOULD", "SET VALUE", "FIELD WT" ]
# ], },
# "query": { "data": [],
# "AShiftwiseData": [ "data_column": [
# ACPQuery.AShiftwiseData.QUERY_1, "mould", "set_value", "field_wt"
# ] ],
# }, "addition": {
# "data": [], "merge_header": "SHIFTWISE DATA",
# "data_column": [ "column_color": {
# "mould", "set_value", "field_wt" "SHIFTWISE DATA": "#FDCD78",
# ], }
# "addition": { }
# "merge_header": "SHIFTWISE DATA" }
# } },
# } {
# }, "C-SHIFT COMMUNICATION": {
# { "columns": [
# "B-SHIFT COMMUNICATION": { "S.No", "C-SHIFT COMMUNICATION"
# "columns": [ ],
# "S.No", "B-SHIFT COMMUNICATION" "query": {
# ], "CShiftCommunication": [
# "query": { ACPQuery.CShiftCommunication.QUERY_1,
# "BShiftCommunication": [ ],
# ACPQuery.BShiftCommunication.QUERY_1, },
# ], "data": [],
# }, "data_column": [
# "data": [], "s_no", "a_shift_comm"
# "data_column": [ ],
# "s_no", "b_shift_comm" "addition": {
# ], "column_color": {
# }, "C-SHIFT COMMUNICATION": "#51E02A",
# "B SHIFTWISE DATA": { }
# "columns": [ }
# "MOULD", "SET VALUE", "FIELD WT" },
# ], "C SHIFTWISE DATA": {
# "query": { "columns": [
# "BShiftwiseData": [ "MOULD", "SET VALUE", "FIELD WT"
# ACPQuery.BShiftwiseData.QUERY_1, ],
# ] "query": {
# }, "CShiftwiseData": [
# "data": [], ACPQuery.CShiftwiseData.QUERY_1,
# "data_column": [ ]
# "mould", "set_value", "field_wt" },
# ], "data": [],
# "addition": { "data_column": [
# "merge_header": "SHIFTWISE DATA" "mould", "set_value", "field_wt"
# } ],
# } "addition": {
# }, "merge_header": "SHIFTWISE DATA",
# { "column_color": {
# "C-SHIFT COMMUNICATION": { "SHIFTWISE DATA": "#FDCD78",
# "columns": [ }
# "S.No", "C-SHIFT COMMUNICATION" }
# ], }
# "query": { },
# "CShiftCommunication": [ {
# ACPQuery.CShiftCommunication.QUERY_1, "PARAMETERS": {
# ], "columns": [
# }, "PARAMETERS", "RANGE", "VALUE"
# "data": [], ],
# "data_column": [ "query": {
# "s_no", "a_shift_comm" "Furnace1FoTemperature": [
# ], ACPQuery.Furnace1FoTemperature.QUERY_1,
# }, ],
# "C SHIFTWISE DATA": { "FoOilPressure": [
# "columns": [ ACPQuery.FoOilPressure.QUERY_1,
# "MOULD", "SET VALUE", "FIELD WT" ],
# ], "Furnace1OilFlow": [
# "query": { ACPQuery.Furnace1OilFlow.QUERY_1,
# "CShiftwiseData": [ ],
# ACPQuery.CShiftwiseData.QUERY_1, "Furnace2OilFlow": [
# ] ACPQuery.Furnace2OilFlow.QUERY_1,
# }, ],
# "data": [], "MeltTemperature": [
# "data_column": [ ACPQuery.MeltTemperature.QUERY_1,
# "mould", "set_value", "field_wt" ],
# ], "MouldTemperature": [
# "addition": { ACPQuery.MouldTemperature.QUERY_1,
# "merge_header": "SHIFTWISE DATA" ],
# } "LpgVapourizerTemperature": [
# } ACPQuery.LpgVapourizerTemperature.QUERY_1,
# }, ],
# { "LaunderBlowerAirPressure": [
# "PARAMETERS": { ACPQuery.LaunderBlowerAirPressure.QUERY_1,
# "columns": [ ],
# "PARAMETERS", "RANGE", "VALUE" "Furnace1ShellTemperature": [
# ], ACPQuery.Furnace1ShellTemperature.QUERY_1,
# "query": { ],
# "Furnace1FoTemperature": [ "Furnace2ShellTemperature": [
# ACPQuery.Furnace1FoTemperature.QUERY_1, ACPQuery.Furnace2ShellTemperature.QUERY_1,
# ], ],
# "FoOilPressure": [ "BariumSulphateSolutionSpecificGravity": [
# ACPQuery.FoOilPressure.QUERY_1, ACPQuery.BariumSulphateSolutionSpecificGravity.QUERY_1,
# ], ],
# "Furnace1OilFlow": [ "MouldAlignmentLevel": [
# ACPQuery.Furnace1OilFlow.QUERY_1, ACPQuery.MouldAlignmentLevel.QUERY_1,
# ], ],
# "Furnace2OilFlow": [ "HeatNoArsenicA": [
# ACPQuery.Furnace2OilFlow.QUERY_1, ACPQuery.HeatNoArsenicA.QUERY_1,
# ], ],
# "MeltTemperature": [ "HeatNoArsenicB": [
# ACPQuery.MeltTemperature.QUERY_1, ACPQuery.HeatNoArsenicB.QUERY_1,
# ], ],
# "MouldTemperature": [ "HeatNoArsenicC": [
# ACPQuery.MouldTemperature.QUERY_1, ACPQuery.HeatNoArsenicC.QUERY_1,
# ], ]
# "LpgVapourizerTemperature": [ },
# ACPQuery.LpgVapourizerTemperature.QUERY_1, "data": [],
# ], "data_column": [
# "LaunderBlowerAirPressure": [ "parameters", "range", "value"
# ACPQuery.LaunderBlowerAirPressure.QUERY_1, ],
# ], },
# "Furnace1ShellTemperature": [ },
# ACPQuery.Furnace1ShellTemperature.QUERY_1, {
# ], "FURNACE SHIFT A": {
# "Furnace2ShellTemperature": [ "columns": [
# ACPQuery.Furnace2ShellTemperature.QUERY_1, "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
# ], ],
# "BariumSulphateSolutionSpecificGravity": [ "query": {
# ACPQuery.BariumSulphateSolutionSpecificGravity.QUERY_1, "FurnaceShiftA": [
# ], ACPQuery.FurnaceShiftA.QUERY_1,
# "MouldAlignmentLevel": [ ],
# ACPQuery.MouldAlignmentLevel.QUERY_1, },
# ], "data": [],
# "HeatNoArsenicA": [ "data_column": [
# ACPQuery.HeatNoArsenicA.QUERY_1, "furnace", "burner_1", "burner_2", "burner_3"
# ], ],
# "HeatNoArsenicB": [ "addition": {
# ACPQuery.HeatNoArsenicB.QUERY_1, "merge_header": "SHIFT - A DATA"
# ], }
# "HeatNoArsenicC": [ },
# ACPQuery.HeatNoArsenicC.QUERY_1, "FURNACE SHIFT B": {
# ] "columns": [
# }, "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
# "data": [], ],
# "data_column": [ "query": {
# "parameters", "range", "value" "FurnaceShiftB": [
# ], ACPQuery.FurnaceShiftB.QUERY_1,
# }, ],
# }, },
# { "data": [],
# "FURNACE SHIFT A": { "data_column": [
# "columns": [ "furnace", "burner_1", "burner_2", "burner_3"
# "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3" ],
# ], "addition": {
# "query": { "merge_header": "SHIFT - B DATA"
# "FurnaceShiftA": [ }
# ACPQuery.FurnaceShiftA.QUERY_1, },
# ], "FURNACE SHIFT C": {
# }, "columns": [
# "data": [], "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3"
# "data_column": [ ],
# "furnace", "burner_1", "burner_2", "burner_3" "query": {
# ], "FurnaceShiftC": [
# "addition": { ACPQuery.FurnaceShiftC.QUERY_1,
# "merge_header": "SHIFT - A DATA" ],
# } },
# }, "data": [],
# "FURNACE SHIFT B": { "data_column": [
# "columns": [ "furnace", "burner_1", "burner_2", "burner_3"
# "FURNACE", "BURNER 1", "BURNER 2", "BURNER 3" ],
# ], "addition": {
# "query": { "merge_header": "SHIFT - C DATA"
# "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