Commit d06e70a4 authored by suryakant's avatar suryakant

Sterlite Custom Report Updates

parent 72f96be0
...@@ -43,6 +43,8 @@ class CommonConstants: ...@@ -43,6 +43,8 @@ class CommonConstants:
MONTH_END_DATE = "month_end_date" MONTH_END_DATE = "month_end_date"
YEAR_START_DATE = "year_start_date" YEAR_START_DATE = "year_start_date"
YEAR_END_DATE = "year_end_date" YEAR_END_DATE = "year_end_date"
DATA_COLUMN = "data_column"
DATA = "data"
class ReportType: class ReportType:
......
...@@ -66,7 +66,6 @@ class CustomReportHandler: ...@@ -66,7 +66,6 @@ class CustomReportHandler:
""" """
for each_blocks in input_json: for each_blocks in input_json:
# Iterating each blocks for fetching query # Iterating each blocks for fetching query
print(each_blocks)
if input_json[each_blocks][CommonConstants.QUERY]: if input_json[each_blocks][CommonConstants.QUERY]:
for each_kpi in input_json[each_blocks][CommonConstants.QUERY]: for each_kpi in input_json[each_blocks][CommonConstants.QUERY]:
...@@ -93,17 +92,19 @@ class CustomReportHandler: ...@@ -93,17 +92,19 @@ class CustomReportHandler:
if not temp_data_dict: if not temp_data_dict:
# Creating null values if no data # Creating null values if no data
for each_columns in input_json[each_blocks]["data_column"]: for each_columns in input_json[each_blocks][
CommonConstants.DATA_COLUMN]:
temp_data_dict.update({each_columns: None}) temp_data_dict.update({each_columns: None})
input_json[each_blocks]["data"].append(temp_data_dict) input_json[each_blocks][CommonConstants.DATA].append(temp_data_dict)
else: else:
temp_data_dict = dict() temp_data_dict = dict()
for each_columns in input_json[each_blocks]["data_column"]: for each_columns in input_json[each_blocks][
CommonConstants.DATA_COLUMN]:
temp_data_dict.update( temp_data_dict.update(
{each_columns: None} {each_columns: None}
) )
input_json[each_blocks]["data"].append(temp_data_dict) input_json[each_blocks][CommonConstants.DATA].append(temp_data_dict)
return input_json return input_json
def custom_report_handler(self, input_json): def custom_report_handler(self, input_json):
...@@ -113,7 +114,7 @@ class CustomReportHandler: ...@@ -113,7 +114,7 @@ class CustomReportHandler:
""" """
status = False status = False
message = "Error generating a message" message = "Error generating a message"
data = "Data" data = CommonConstants.DATA
try: try:
# if str(input_json.job_type).lower() == ReportType.REFINERY_REPORT: # if str(input_json.job_type).lower() == ReportType.REFINERY_REPORT:
if str(input_json["job_type"]).lower() == ReportType.REFINERY_REPORT: if str(input_json["job_type"]).lower() == ReportType.REFINERY_REPORT:
...@@ -126,7 +127,7 @@ class CustomReportHandler: ...@@ -126,7 +127,7 @@ class CustomReportHandler:
each_blocks = self.get_queries_from_db( each_blocks = self.get_queries_from_db(
input_json=each_blocks, date_filter=each_date_range input_json=each_blocks, date_filter=each_date_range
) )
# print(each_blocks) print(each_blocks)
print("=========================================") print("=========================================")
break break
......
...@@ -66,6 +66,9 @@ class SterliteRefineryTemplate: ...@@ -66,6 +66,9 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["power_availability", "uom",
"norms", "on_date", "mtd",
"ytd"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -81,6 +84,8 @@ class SterliteRefineryTemplate: ...@@ -81,6 +84,8 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["rm_anode_receipt_details", "on_date",
"mtd", "ytd", "material", "opening_stock"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -98,6 +103,8 @@ class SterliteRefineryTemplate: ...@@ -98,6 +103,8 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["efficiencies", "uom", "norms",
"on_date", "mtd", "ytd"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -112,6 +119,8 @@ class SterliteRefineryTemplate: ...@@ -112,6 +119,8 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["bank_crop", "ce(%)", "theor_weight",
"actual_weight", "stripping_time"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -129,6 +138,8 @@ class SterliteRefineryTemplate: ...@@ -129,6 +138,8 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["production", "uom", "norms",
"on_date", "mtd", "ytd"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -142,6 +153,7 @@ class SterliteRefineryTemplate: ...@@ -142,6 +153,7 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["circulation", "ce", "theor_weight", "actual_weight"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -157,6 +169,8 @@ class SterliteRefineryTemplate: ...@@ -157,6 +169,8 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["fg_inventory", "on_date",
"mtd", "ytd"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
...@@ -170,6 +184,8 @@ class SterliteRefineryTemplate: ...@@ -170,6 +184,8 @@ class SterliteRefineryTemplate:
], ],
"query": [], "query": [],
"data": [], "data": [],
"data_column": ["production", "on_date",
"mtd", "ytd"],
"additions": [], "additions": [],
"description": "", "description": "",
"format": "" "format": ""
......
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