UPDATED CCPP QUERIES and CCPC

scripts/core/handler/event_handler.py

@@ -4,6 +4,7 @@ import pandas as pd
 from datetime import datetime
 from scripts.constants import ReportType, CommonConstants, PostgresConstant
 from scripts.template.ccpc_report_template import CCPCReportTemplate
+from scripts.template.ccpp_report_template import CCPPReportTemplate
 from scripts.template.refinery_report_template import SterliteRefineryTemplate
 from scripts.template.acp_report_template import ACPReportTemplate
 from scripts.core.logging.application_logging import logger
@@ -631,7 +632,7 @@ class CustomReportHandler:
                             logger.info(f"date filter: {each_date_range}")
 
                             report_template = copy.deepcopy(
-                                ACPReportTemplate.REPORT_TEMPLATE
+                                CCPPReportTemplate.CCPP_REPORT_TEMPLATE
                             )
                             start_col = CommonConstants.START_COLUMN
                             start_row = CommonConstants.START_ROW
@@ -658,9 +659,9 @@ class CustomReportHandler:
                                         input_json=each_blocks, writer=writer,
                                         workbook=workbook, sheet_name=sheet_name,
                                         start_col=start_col, start_row=start_row,
-                                        header_merge_format=ACPReportTemplate.COLUMN_HEADER_FORMAT,
-                                        column_merge_format=ACPReportTemplate.COLUMN_HEADER_FORMAT,
-                                        blank_merge_format=ACPReportTemplate.BLANK_COLUMN_HEADER_FORMAT
+                                        header_merge_format=CCPPReportTemplate.COLUMN_HEADER_FORMAT,
+                                        column_merge_format=CCPPReportTemplate.COLUMN_HEADER_FORMAT,
+                                        blank_merge_format=CCPPReportTemplate.BLANK_COLUMN_HEADER_FORMAT
                                     )
 
                                 if total_column < shape[1]:

scripts/template/ccpc_report_template.py

@@ -25,6 +25,18 @@ class CCPCReportTemplate:
                     "MTD",
                 ],
                 "query": {
+                    "Production":[
+                        SterliteCCPCQuery.Production.QUERY_1,
+                        SterliteCCPCQuery.Production.QUERY_2
+                    ],
+                    "BariumSulphateP":[
+                        SterliteCCPCQuery.BariumSulphateP.QUERY_1,
+                        SterliteCCPCQuery.BariumSulphateP.QUERY_2
+                    ],
+                    "Sodiumsilicate":[
+                        SterliteCCPCQuery.Sodiumsilicate.QUERY_1,
+                        SterliteCCPCQuery.Sodiumsilicate.QUERY_2
+                    ],
                     "BLISTER": [
                         SterliteCCPCQuery.BLISTER.QUERY_1,
                         SterliteCCPCQuery.BLISTER.QUERY_2,
@@ -295,7 +307,11 @@ class CCPCReportTemplate:
             },
             "MONTHWISE PRODUCTION DETAILS (MT)": {
                 "columns": ["NOS", "TARGET", "PRODUCTION"],
-                "query": {},
+                "query": {
+                    "MonthWiseData":[
+                        SterliteCCPCQuery.MonthWiseData.QUERY_1
+                    ]
+                },
                 "data": [],
                 "data_column": ["nos", "target", "production"],
                 "addition": {
@@ -317,11 +333,17 @@ class CCPCReportTemplate:
                     "OD PRODN (MT) ="
                 ],
                 "query": {
+                    "ProductionDetails1":[
+                        SterliteCCPCQuery.ProductionDetails1.QUERY1
+                    ],
+                    "ProductionDetails2": [
+                        SterliteCCPCQuery.ProductionDetails2.QUERY_1
+                    ]
 
                 },
                 "data": [],
                 "data_column": [
-                    "production details-no. of anodes",
+                    "kpi",
                     "a_shift",
                     "b_shift",
                     "c_shift",