Merge pull request #659 from egovernments/SM-2754

[SM-2754] - Added URC Charts
egovernments · Aug 29, 2023 · 774d63e · 774d63e
2 parents a988630 + ecc80ec
commit 774d63e
Show file tree

Hide file tree

Showing 2 changed files with 170 additions and 5 deletions.
diff --git a/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json
@@ -5853,6 +5853,98 @@
     "insight": {},
     "_comment": " "
   },
+  "fsmTotalApplicationsFromSource": {
+    "chartName": "DSS_FSM_TOTAL_APPLICATIONS_BY_SOURCE",
+    "queries": [
+        {
+            "module": "FSM",
+            "dateRefField": "Data.fsm.@timestamp",
+            "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,  \"district\" : \"Data.tenantData.city.districtCode\"}",
+            "indexName": "fsm",
+            "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.fsm.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Source\":{\"terms\":{\"field\":\"Data.fsm.address.additionalDetails.boundaryType.keyword\"},\"aggs\":{\"Applications by Source\":{\"value_count\":{\"field\":\"Data.fsm.id.keyword\"}}}}}}}}"
+        }
+    ],
+    "chartType": "pie",
+    "valueType": "number",
+    "action": "",
+    "documentType": "_doc",
+    "drillChart": "none",
+    "aggregationPaths": [
+      "Source"
+    ],
+    "insight": {},
+    "_comment": " "
+    }, 
+    "fsmTotalSludgeFromSource": {
+      "chartName": "DSS_FSM_TOTAL_SLUDGE_FROM_SOURCE",
+      "queries": [
+          {
+              "module": "FSM",
+              "dateRefField": "Data.vehicleTrip.@timestamp",
+              "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,  \"district\" : \"Data.tenantData.city.districtCode\"}",
+              "indexName": "vehicletrip",
+              "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.fsm.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"Data.vehicleTrip.applicationStatus.keyword\":\"DISPOSED\"}}]}},\"aggs\":{\"Sludge Disposed From Source\":{\"terms\":{\"field\":\"Data.fsm.address.additionalDetails.boundaryType.keyword\"},\"aggs\":{\"Sludge Disposed\":{\"sum\":{\"field\":\"Data.vehicleTrip.volumeCarried\"}}}}}}}}"
+          }
+      ],
+      "chartType": "pie",
+      "valueType": "number",
+      "action": "",
+      "documentType": "_doc",
+      "drillChart": "none",
+      "aggregationPaths": [
+        "Sludge Disposed From Source"
+      ],
+      "insight": {},
+      "_comment": " "
+    }, 
+  "fsmTotalApplicationsFromGP": {
+    "chartName": "DSS_FSM_TOTAL_REQUESTS_FROM_GP",
+    "queries": [
+        {
+            "module": "FSM",
+            "dateRefField": "Data.fsm.@timestamp",
+            "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,  \"district\" : \"Data.tenantData.city.districtCode\"}",
+            "indexName": "fsm",
+            "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.fsm.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Applications From GP\":{\"date_histogram\":{\"field\":\"Data.fsm.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"totalApplicationsFromGP\":{\"filter\":{\"terms\":{\"Data.fsm.address.additionalDetails.boundaryType.keyword\":[\"GP\"]}},\"aggs\":{\"Count\":{\"value_count\":{\"field\":\"Data.fsm.id.keyword\"}}}}}}}}}}"
+        }
+    ],
+    "chartType": "line",
+    "valueType": "number",
+    "action": "",
+    "drillChart": "none",
+    "documentType": "_doc",
+    "aggregationPaths": [
+        "Total Applications From GP"
+    ],
+    "isCumulative": false,
+    "interval": "month",
+    "insight": {},
+    "_comment": " "
+  }, 
+  "fsmsludgeDisposedFromGP": {
+    "chartName": "DSS_FSM_SLUDGE_DISPOSED_FROM_GP",
+    "queries": [
+        {
+            "module": "FSM",
+            "dateRefField": "Data.vehicleTrip.@timestamp",
+            "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \"tenantId\" : \"Data.tenantData.code\" ,  \"district\" : \"Data.tenantData.city.districtCode\"}",
+            "indexName": "vehicletrip",
+            "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.fsm.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"Data.vehicleTrip.applicationStatus.keyword\":\"DISPOSED\"}}]}},\"aggs\":{\"Total Sludge Disposed\":{\"date_histogram\":{\"field\":\"Data.vehicleTrip.@timestamp\",\"interval\":\"intervalvalue\"},\"aggs\":{\"totalSludgeDisposedFromGP\":{\"filter\":{\"terms\":{\"Data.fsm.address.additionalDetails.boundaryType.keyword\":[\"GP\"]}},\"aggs\":{\"Sludge Disposed\":{\"sum\":{\"field\":\"Data.vehicleTrip.volumeCarried\"}}}}}}}}}}"
+        }
+    ],
+    "chartType": "line",
+    "valueType": "number",
+    "action": "",
+    "drillChart": "none",
+    "documentType": "_doc",
+    "aggregationPaths": [
+        "Total Sludge Disposed"
+    ],
+    "isCumulative": false,
+    "interval": "month",
+    "insight": {},
+    "_comment": " "
+  },
   "fsmCollectionByGender": {
     "chartName": "DSS_FSM_RESQUEST_BY_GENDER",
     "queries": [

diff --git a/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/configs/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json
@@ -5166,7 +5166,80 @@
           "name": "DSS_REVENUE",
           "vizArray": [
             {
-              "id": 331,
+              "id": 343,
+              "name": "DSS_FSM_TOTAL_APPLICATIONS_BY_SOURCE",
+              "dimensions": {
+                "height": 250,
+                "width": 3
+              },
+              "vizType": "chart",
+              "label": "",
+              "noUnit": false,
+              "isCollapsible": false,
+              "charts": [
+                {
+                  "id": "fsmTotalApplicationsFromSource",
+                  "name": "DSS_FSM_TOTAL_APPLICATIONS_BY_SOURCE",
+                  "code": "",
+                  "chartType": "donut",
+                  "filter": "",
+                  "headers": [],
+                  "source": "es",
+                  "tabName": "Applications"
+                },
+                {
+                  "id": "fsmTotalSludgeFromSource",
+                  "name": "DSS_FSM_TOTAL_SLUDGE_FROM_SOURCE",
+                  "code": "",
+                  "chartType": "donut",
+                  "filter": "",
+                  "headers": [],
+                  "source": "es",
+                  "tabName": "Sludge Disposed"
+                }
+              ]
+            },
+            {
+              "id": 344,
+              "name": "DSS_FSM_TOTAL_REQUESTS_FROM_GP",
+              "dimensions": {
+                "height": 250,
+                "width": 5
+              },
+              "vizType": "chart",
+              "isCollapsible": false,
+              "label": "",
+              "charts": [
+                {
+                  "id": "fsmTotalApplicationsFromGP",
+                  "name": "DSS_FSM_TOTAL_REQUESTS_FROM_GP",
+                  "code": "",
+                  "chartType": "bar",
+                  "filter": "",
+                  "headers": [],
+                  "source": "es",
+                  "tabName": "Applications"
+                },
+                {
+                  "id": "fsmsludgeDisposedFromGP",
+                  "name": "DSS_FSM_SLUDGE_DISPOSED_FROM_GP",
+                  "code": "",
+                  "chartType": "bar",
+                  "filter": "",
+                  "headers": [],
+                  "source": "es",
+                  "tabName": "Sludge Disposed"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "row": 4,
+          "name": "DSS_REVENUE",
+          "vizArray": [
+            {
+              "id": 321,
               "name": "DSS_FSM_COLLECTION_BY_USAGE_TYPE",
               "dimensions": {
                 "height": 250,
@@ -5212,7 +5285,7 @@
           ]
         },
         {
-          "row": 4,
+          "row": 5,
           "name": "DSS_REVENUE",
           "vizArray": [
             {
@@ -5263,7 +5336,7 @@
           ]
         },
         {
-          "row": 5,
+          "row": 6,
           "name": "DSS_REVENUE",
           "vizArray": [
             {
@@ -5313,7 +5386,7 @@
           ]
         },
         {
-          "row": 6,
+          "row": 7,
           "name": "DSS_REVENUE",
           "vizArray": [
             {
@@ -5342,7 +5415,7 @@
           ]
         },
         {
-          "row": 7,
+          "row": 8,
           "name": "DSS_REVENUE",
           "vizArray": [
             {