Sterlite Custom Report Updates

scripts/core/db/postgres/custom_report_query.py

@@ -673,39 +673,61 @@ class SterliteRefineryQuery:
     class CurrentDensity:
         """ POWER AVAILABILITY """
         QUERY_1 = """
-                SELECT 
-                'Current Density' AS power_availability,
-                'Amp / m2' AS uom,
-                AVG(NUMO_PLAN) AS norms,
-                AVG(NUMO_ACTUAL) AS on_date
-                
-                FROM SEMANTIC_PROD.CE_CD_TE_DETAILED_VIEW CCTDV2
-                WHERE 
-                LOWER(TRIM(CATEGORY)) = 'cd'
-                AND DATE BETWEEN '{day_start_date}' AND '{day_end_date}'
-                """
-        QUERY_2 = """
-                SELECT 
-                'Current Density' AS power_availability,
-                'Amp / m2' AS uom,
-                AVG(NUMO_ACTUAL) AS mtd
+                    SELECT
 
-                FROM SEMANTIC_PROD.CE_CD_TE_DETAILED_VIEW CCTDV2
-                WHERE 
-                LOWER(TRIM(CATEGORY)) = 'cd'
-                AND DATE BETWEEN '{month_start_date}' AND '{month_end_date}'
-                """
-        QUERY_3 = """
-                SELECT 
-                'Current Density' AS power_availability,
-                'Amp / m2' AS uom,
-                AVG(NUMO_ACTUAL) AS ytd
+                    first_tbl.power_availability,
+                    first_tbl.uom,
+                    first_tbl.norms,
+                    ROUND(first_tbl.on_date :: NUMERIC, 2) on_date,
+                    ROUND(second_tbl.mtd :: NUMERIC, 2) mtd,
+                    ROUND(third_tbl.ytd :: NUMERIC, 2) ytd
 
-                FROM SEMANTIC_PROD.CE_CD_TE_DETAILED_VIEW CCTDV2
-                WHERE 
-                LOWER(TRIM(CATEGORY)) = 'cd'
-                AND DATE BETWEEN '{year_start_date}' AND '{year_end_date}'
-                """
+                    FROM
+
+                    (SELECT 
+                    'Current Density' AS power_availability,
+                    'Amp / m2' AS uom,
+                    AVG(NUMO_PLAN) AS norms,
+                    AVG(NUMO_ACTUAL) AS on_date
+
+                    FROM SEMANTIC_PROD.CE_CD_TE_DETAILED_VIEW CCTDV2
+                    WHERE 
+                    LOWER(TRIM(CATEGORY)) = 'cd'
+                    AND date between '{day_start_date}' AND '{day_end_date}'
+                    ) as first_tbl
+
+                    JOIN
+
+                    (SELECT 
+                    'Current Density' AS power_availability,
+                    'Amp / m2' AS uom,
+                    AVG(NUMO_PLAN) AS norms,
+                    AVG(NUMO_ACTUAL) AS mtd
+
+                    FROM SEMANTIC_PROD.CE_CD_TE_DETAILED_VIEW CCTDV2
+                    WHERE 
+                    LOWER(TRIM(CATEGORY)) = 'cd'
+                    AND date between '{month_start_date}' AND '{month_end_date}'
+                    ) as second_tbl 
+
+                    ON first_tbl.power_availability=second_tbl.power_availability
+
+                    JOIN 
+
+                    (SELECT 
+                    'Current Density' AS power_availability,
+                    'Amp / m2' AS uom,
+                    AVG(NUMO_PLAN) AS norms,
+                    AVG(NUMO_ACTUAL) AS ytd
+
+                    FROM SEMANTIC_PROD.CE_CD_TE_DETAILED_VIEW CCTDV2
+                    WHERE 
+                    LOWER(TRIM(CATEGORY)) = 'cd'
+                    AND date between '{year_start_date}' AND '{year_end_date}'
+                    ) as third_tbl
+
+                    ON second_tbl.power_availability=third_tbl.power_availability
+                    """
 
     class EdgeStripConsumption:
         """ SPECIFIC CONSUMPTION """

scripts/template/sterlite_report_template.py

@@ -92,18 +92,12 @@ class SterliteRefineryTemplate:
                     ],
                     "Cir-2 35 KA Rectifier Avg. Current": [
                         SterliteRefineryQuery.Cir235KARectifierAvgCurrent.QUERY_1,
-                        SterliteRefineryQuery.Cir235KARectifierAvgCurrent.QUERY_2,
-                        SterliteRefineryQuery.Cir235KARectifierAvgCurrent.QUERY_3,
                     ],
                     "Total Avg. Current": [
                         SterliteRefineryQuery.TotalAvgCurrent.QUERY_1,
-                        SterliteRefineryQuery.TotalAvgCurrent.QUERY_2,
-                        SterliteRefineryQuery.TotalAvgCurrent.QUERY_3,
                     ],
                     "Current Density": [
                         SterliteRefineryQuery.CurrentDensity.QUERY_1,
-                        SterliteRefineryQuery.CurrentDensity.QUERY_2,
-                        SterliteRefineryQuery.CurrentDensity.QUERY_3,
                     ]
                 },
                 "data": [],