Sterlite Custom Report Updates

dev-variables.env

@@ -5,7 +5,6 @@ EXCEPTION_TRACE=True
 ENV=dev
 
 # PostgreSQL DB Details
-POSTGRES_URI=postgresql://svc_sterlite:sterliteSvc#1247@20.207.116.89:5946/strelite-datalakedev
 POSTGRES_HOST = 20.207.116.89
 POSTGRES_PORT = 5946
 POSTGRES_USERNAME = svc_sterlite

scripts/configurations/__init__.py

@@ -56,7 +56,6 @@ class PostgresDetails(BaseSettings):
         env_prefix (str): The environment variable prefix for PostgreSQL settings.
     """
 
-    uri: str
     host: str
     port: str
     username: str

scripts/template/sterlite_report_template.py

@@ -79,12 +79,21 @@ class SterliteRefineryTemplate:
                     "YTD",
                 ],
                 "query": {
-                    "Grid Power Availability": [],
-                    "Cir 1 Avg. Rectifier Running Hrs.": [],
-                    "Cir 2 Avg. Rectifier Running Hrs.": [],
-                    "Power Availability to Cir-1": [],
-                    "Power Availability to Cir-2": [],
-                    "Power Availability to Cell House": [],
+                    "Grid Power Availability": [
+                        SterliteRefineryQuery.GridPowerAvailability.QUERY_1,
+                        SterliteRefineryQuery.GridPowerAvailability.QUERY_2,
+                        SterliteRefineryQuery.GridPowerAvailability.QUERY_3,
+                    ],
+                    "Cir 1 Avg. Rectifier Running Hrs.": [
+                        SterliteRefineryQuery.Circulation1.QUERY_1,
+                        SterliteRefineryQuery.Circulation1.QUERY_2,
+                        SterliteRefineryQuery.Circulation1.QUERY_3,
+                    ],
+                    "Cir 2 Avg. Rectifier Running Hrs.": [
+                        SterliteRefineryQuery.Circulation2.QUERY_1,
+                        SterliteRefineryQuery.Circulation2.QUERY_2,
+                        SterliteRefineryQuery.Circulation2.QUERY_3,
+                    ],
                     "Cir-1 40 KA Rectifier Avg. Current": [
                         SterliteRefineryQuery.Cir140KARectifierAvgCurrent.QUERY_1,
                         SterliteRefineryQuery.Cir140KARectifierAvgCurrent.QUERY_2,
@@ -120,7 +129,11 @@ class SterliteRefineryTemplate:
                     "Material",
                     "OPENING STOCK",
                 ],
-                "query": [],
+                "query": {
+                    "AcpCcpcCcp": [
+                        SterliteRefineryQuery.AcpCcpcCcp.QUERY_1,
+                    ]
+                },
                 "data": [],
                 "data_column": ["rm_anode_receipt_details", "on_date",
                                 "mtd", "ytd", "material", "opening_stock"],
@@ -168,16 +181,36 @@ class SterliteRefineryTemplate:
                     "ACTUAL WEIGHT",
                     "STRIPPING TIME",
                 ],
-                "query": [],
+                "query": {
+                    "BANK / CROP": [
+                        SterliteRefineryQuery.BankCropStripping.QUERY_1,
+                    ]
+                },
                 "data": [],
-                "data_column": ["bank_crop", "ce(%)", "theor_weight",
+                "data_column": ["bank_crop", "ce", "theor_weight",
                                 "actual_weight", "stripping_time"],
             },
         },
         {
             "PRODUCTION": {
                 "columns": ["PRODUCTION", "UOM", "NORMS", "ON DATE", "MTD", "YTD"],
-                "query": [],
+                "query": {
+                    "CathodeDeposit": [
+                        SterliteRefineryQuery.CathodeDeposit.QUERY_1,
+                        SterliteRefineryQuery.CathodeDeposit.QUERY_2,
+                        SterliteRefineryQuery.CathodeDeposit.QUERY_3,
+                    ],
+                    "CathodeProductionSAP": [
+                        SterliteRefineryQuery.CathodeProductionSAP.QUERY_1,
+                        SterliteRefineryQuery.CathodeProductionSAP.QUERY_2,
+                        SterliteRefineryQuery.CathodeProductionSAP.QUERY_3,
+                    ],
+                    "DepositCellDay": [
+                        SterliteRefineryQuery.DepositCellDay.QUERY_1,
+                        SterliteRefineryQuery.DepositCellDay.QUERY_2,
+                        SterliteRefineryQuery.DepositCellDay.QUERY_3,
+                    ]
+                },
                 "data": [],
                 "data_column": ["production", "uom", "norms",
                                 "on_date", "mtd", "ytd"],