Query Update

scripts/core/db/postgres/custom_report_query.py

@@ -2858,6 +2858,82 @@ class SterliteRefineryQuery:
                 GROUP BY 1,2;
                 """
 
+    class FilterAvailability:
+        """ FILTER AVAILABILITY """
+        QUERY_1 = """
+                SELECT 
+        'Filter Availability' AS filter_availability,
+        '%' AS uom,
+        ROUND(MAX(NORMS)::NUMERIC, 2) AS norms,
+        ROUND(MAX(METRIC_VALUE)::NUMERIC, 2) AS on_date
+
+        FROM
+        (SELECT KPI,
+        CASE
+        WHEN LOWER(TRIM(KPI)) = 'filter_availability_plan' THEN AVG(METRIC_VALUE)
+        ELSE NULL
+        END AS NORMS,
+        CASE
+        WHEN LOWER(TRIM(KPI)) = 'filter_availability_actual' THEN AVG(METRIC_VALUE)
+        ELSE NULL
+        END AS METRIC_VALUE
+
+        FROM SEMANTIC_PROD.REFINERY_FILTER_AVAILABILITY_VIEW
+        WHERE LOWER(TRIM(KPI)) in ('filter_availability_actual',
+        'filter_availability_plan')
+        AND DATE BETWEEN '{day_start_date}' AND '{day_end_date}'
+        GROUP BY 1)TB
+        GROUP BY 1,2
+        """
+        QUERY_2 = """
+                SELECT 
+                'Filter Availability' AS filter_availability,
+                '%' AS uom,
+                ROUND(MAX(METRIC_VALUE)::NUMERIC, 2) AS mtd
+
+                FROM
+                (SELECT KPI,
+                CASE
+                WHEN LOWER(TRIM(KPI)) = 'filter_availability_plan' THEN AVG(METRIC_VALUE)
+                ELSE NULL
+                END AS NORMS,
+                CASE
+                WHEN LOWER(TRIM(KPI)) = 'filter_availability_actual' THEN AVG(METRIC_VALUE)
+                ELSE NULL
+                END AS METRIC_VALUE
+
+                FROM SEMANTIC_PROD.REFINERY_FILTER_AVAILABILITY_VIEW
+                WHERE LOWER(TRIM(KPI)) in ('filter_availability_actual',
+                'filter_availability_plan')
+                AND DATE BETWEEN '{month_start_date}' AND '{month_end_date}'
+                GROUP BY 1)TB
+                GROUP BY 1,2
+                """
+        QUERY_3 = """
+                        SELECT 
+                'Filter Availability' AS filter_availability,
+                '%' AS uom,
+                ROUND(MAX(METRIC_VALUE)::NUMERIC, 2) AS ytd
+
+                FROM
+                (SELECT KPI,
+                CASE
+                WHEN LOWER(TRIM(KPI)) = 'filter_availability_plan' THEN AVG(METRIC_VALUE)
+                ELSE NULL
+                END AS NORMS,
+                CASE
+                WHEN LOWER(TRIM(KPI)) = 'filter_availability_actual' THEN AVG(METRIC_VALUE)
+                ELSE NULL
+                END AS METRIC_VALUE
+
+                FROM SEMANTIC_PROD.REFINERY_FILTER_AVAILABILITY_VIEW
+                WHERE LOWER(TRIM(KPI)) in ('filter_availability_actual',
+                'filter_availability_plan')
+                AND DATE BETWEEN '{year_start_date}' AND '{year_end_date}'
+                GROUP BY 1)TB
+                GROUP BY 1,2
+                """
+
     class CsmPlateRejection:
         """ CSM Plate Rejection """
         QUERY_1 = """

scripts/template/sterlite_report_template.py

@@ -340,8 +340,7 @@ class SterliteRefineryTemplate:
                     "UOM",
                     "1st CROP - Stripping time",
                     "2nd CROP - Change over time",
-                    "3rd CROP",
-                    "CSM Plate Rejection"
+                    "3rd CROP"
                 ],
                 "query": {
                     "StrippingTime": [
@@ -351,7 +350,7 @@ class SterliteRefineryTemplate:
                 "data": [],
                 "data_column": [
                     "stripping_time", "uom", "1st_crop",
-                    "2nd_crop", "3rd_crop", "csm_plate_rejection"
+                    "2nd_crop", "3rd_crop"
                 ],
             },
             "CSM PLATE REJECTION": {
@@ -375,16 +374,21 @@ class SterliteRefineryTemplate:
             "FILTER AVAILABILITY": {
                 "columns": [
                     "FILTER AVAILABILITY",
+                    "UOM",
+                    "NORMS",
                     "ON DATE",
-                    "MTD",
-                    "Filtered Volume",
-                    "Total Volume Refinery",
+                    "MTD"
                 ],
-                "query": [],
+                "query": {
+                    "FilterAvailability": [
+                        SterliteRefineryQuery.FilterAvailability.QUERY_1,
+                        SterliteRefineryQuery.FilterAvailability.QUERY_2,
+                        SterliteRefineryQuery.FilterAvailability.QUERY_3,
+                    ]
+                },
                 "data": [],
                 "data_column": [
-                    "filter_availability", "on_date", "mtd", "filtered_volume",
-                    "total_volume_refinery"],
+                    "filter_availability", "uom", "norms", "on_date", "mtd"],
             }
         },
         {