diff --git a/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json b/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json index 39da88cd9..adad53464 100644 --- a/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json +++ b/egov-dss-dashboards/dashboard-analytics/ChartApiConfig.json @@ -17814,5 +17814,323 @@ "isRoundOff": true }, "_comment": " " + }, + "nssPtSlaAchieved": { + "chartName": "NATIONAL_DSS_PT_SLA_ACHIEVED", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "pt-national-dashboard", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"applicationStatus.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"stateApplicationsWithinSla\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applicationsSubmittedWithInSla\":{\"avg\":{\"field\":\"todaysApplicationsWithinSLA\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applicationsSubmittedWithInSla\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Applications_Within_SLA\":{\"sum_bucket\":{\"buckets_path\":\"stateApplicationsWithinSla.stateApplications\"}},\"stateMovedApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"totalMovedApplications\":{\"avg\":{\"field\":\"todaysMovedApplicationsForApplicationStatus\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.totalMovedApplications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Moved_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateMovedApplications.stateApplications\"}}}}}}" + }, + { + "module": "PT", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "pt-national-dashboard", + "aggrQuery": "{\"size\":0,\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"applicationStatus.keyword\":\"REJECTED\"}}]}},\"aggs\":{\"stateMovedApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"totalMovedApplications\":{\"avg\":{\"field\":\"todaysMovedApplicationsForApplicationStatus\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.totalMovedApplications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Moved_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateMovedApplications.stateApplications\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "nss", + "action": "percentage", + "isRoundOff": true, + "aggregationPaths": [ + "Total_Applications_Within_SLA", + "Total_Moved_Applications" + ], + "insight": { + "chartResponseMap" : "nssPtSlaAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": " " + }, + "nssPtPendancy": { + "chartName": "NATIONAL_DSS_PT_PENDANCY", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "pt-national-dashboard", + "aggrQuery": "{\"aggs\":{\"all_matching_docs\":{\"filters\":{\"filters\":{\"all\":{\"match_all\":{}}}},\"aggs\":{\"stateClosedApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applications\":{\"avg\":{\"field\":\"todaysClosedApplications\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Closed_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateClosedApplications.stateApplications\"}},\"stateTotalApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applications\":{\"avg\":{\"field\":\"todaysTotalApplications\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateTotalApplications.stateApplications\"}},\"Applications_Pending\":{\"bucket_script\":{\"buckets_path\":{\"total\":\"Total_Applications\",\"closed\":\"Total_Closed_Applications\"},\"script\":\"(params.total - params.closed) \"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "nss", + "action": "percentage", + "isRoundOff": true, + "aggregationPaths": [ + "Applications_Pending", + "Total_Applications" + ], + "insight": { + "chartResponseMap" : "nssPtPendancy", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": " " + }, + "nssOverviewPendancy": { + "chartName": "NATIONAL_DSS_OVERVIEW_PENDANCY", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "pt-national-dashboard", + "aggrQuery": "{\"aggs\":{\"all_matching_docs\":{\"filters\":{\"filters\":{\"all\":{\"match_all\":{}}}},\"aggs\":{\"stateClosedApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applications\":{\"avg\":{\"field\":\"todaysClosedApplications\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Closed_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateClosedApplications.stateApplications\"}},\"stateTotalApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applications\":{\"avg\":{\"field\":\"todaysTotalApplications\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateTotalApplications.stateApplications\"}},\"Applications_Pending\":{\"bucket_script\":{\"buckets_path\":{\"total\":\"Total_Applications\",\"closed\":\"Total_Closed_Applications\"},\"script\":\"(params.total - params.closed) \"}}}}}}" + }, + { + "module": "TL", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "tl-national-dashboard", + "aggrQuery": "{\"aggs\":{\"all_matching_docs\":{\"filters\":{\"filters\":{\"all\":{\"match_all\":{}}}},\"aggs\":{\"stateClosedApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applications\":{\"avg\":{\"field\":\"todaysClosedApplications\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Closed_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateClosedApplications.stateApplications\"}},\"stateTotalApplications\":{\"terms\":{\"field\":\"state.keyword\"},\"aggs\":{\"intermediateAggrULB\":{\"terms\":{\"field\":\"ulb.keyword\"},\"aggs\":{\"intermediateAggrWard\":{\"terms\":{\"field\":\"ward.keyword\"},\"aggs\":{\"days\":{\"terms\":{\"field\":\"date\"},\"aggs\":{\"applications\":{\"avg\":{\"field\":\"todaysApplications\"}}}},\"wardapplications\":{\"sum_bucket\":{\"buckets_path\":\"days.applications\"}}}},\"ulbApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrWard.wardapplications\"}}}},\"stateApplications\":{\"sum_bucket\":{\"buckets_path\":\"intermediateAggrULB.ulbApplications\"}}}},\"Total_Applications\":{\"sum_bucket\":{\"buckets_path\":\"stateTotalApplications.stateApplications\"}},\"Applications_Pending\":{\"bucket_script\":{\"buckets_path\":{\"total\":\"Total_Applications\",\"closed\":\"Total_Closed_Applications\"},\"script\":\"(params.total - params.closed) \"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "nss", + "action": "percentage", + "isRoundOff": true, + "aggregationPaths": [ + "Applications_Pending", + "Total_Applications" + ], + "insight": { + "chartResponseMap" : "nssOverviewPendancy", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": " " + }, + "nssPtCitizenFeedbackScore": { + "chartName": "NATIONAL_DSS_PT_CITIZEN_FEEDBACK_SCORE", + "queries": [ + { + "module": "CF", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "citizen-feedback-national-dashboard", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"serviceModule.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Feedback Score\":{\"sum\":{\"script\":{\"lang\":\"painless\",\"inline\":\"doc['todaysAverageCitizenRating'].value * doc['todaysNoOfCitizenResponsesForChannel'].value\"}}},\"Total Number of Responses\":{\"sum\":{\"field\":\"todaysNoOfCitizenResponsesForChannel\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "nss", + "action": "division", + "isRoundOff": false, + "aggregationPaths": [ + "Total Feedback Score", + "Total Number of Responses" + ], + "insight": { + "chartResponseMap" : "nssPtCitizenFeedbackScore", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": false + }, + "_comment": " " + }, + "nssOverviewCitizenFeedbackScore": { + "chartName": "NATIONAL_DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE", + "queries": [ + { + "module": "CF", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "citizen-feedback-national-dashboard", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must\":[{\"term\":{\"serviceModule.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Feedback Score\":{\"sum\":{\"script\":{\"lang\":\"painless\",\"inline\":\"doc['todaysAverageCitizenRating'].value * doc['todaysNoOfCitizenResponsesForChannel'].value\"}}},\"Total Number of Responses\":{\"sum\":{\"field\":\"todaysNoOfCitizenResponsesForChannel\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "nss", + "action": "division", + "isRoundOff": false, + "aggregationPaths": [ + "Total Feedback Score", + "Total Number of Responses" + ], + "insight": { + "chartResponseMap" : "nssOverviewCitizenFeedbackScore", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": false + }, + "_comment": " " + }, + "nssPtCitizenServiceDeliveryIndex": { + "chartName": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "pt-national-dashboard", + "aggrQuery": "{\"aggs\":{\"all_matching_docs\":{\"filters\":{\"filters\":{\"all\":{\"match_all\":{}}}},\"aggs\":{\"state\":{\"terms\":{\"field\":\"state.keyword\",\"size\":10000},\"aggs\":{\"ulb\":{\"terms\":{\"field\":\"ulb.keyword\",\"size\":10000},\"aggs\":{\"ward\":{\"terms\":{\"field\":\"ward.keyword\",\"size\":10000},\"aggs\":{\"SlaintermediateAggr\":{\"terms\":{\"field\":\"date\",\"size\":10000},\"aggs\":{\"applicationsSubmittedWithInSla\":{\"avg\":{\"field\":\"todaysApplicationsWithinSLA\"}}}},\"Total_Applications_Within_SLA\":{\"sum_bucket\":{\"buckets_path\":\"SlaintermediateAggr.applicationsSubmittedWithInSla\"}},\"app\":{\"filter\":{\"bool\":{\"must\":[{\"match\":{\"applicationStatus.keyword\":\"APPROVED\"}}]}},\"aggs\":{\"totalapplication\":{\"sum\":{\"field\":\"todaysMovedApplicationsForApplicationStatus\"}}}},\"reject\":{\"filter\":{\"bool\":{\"must\":[{\"match\":{\"applicationStatus.keyword\":\"REJECTED\"}}]}},\"aggs\":{\"totalapplication\":{\"sum\":{\"field\":\"todaysMovedApplicationsForApplicationStatus\"}}}},\"aggregatedsla\":{\"bucket_script\":{\"buckets_path\":{\"total\":\"app.totalapplication\",\"total_rejected\":\"reject.totalapplication\",\"withinsla\":\"Total_Applications_Within_SLA\"},\"script\":\"((params.withinsla \/ (params.total + params.total_rejected)) * 100)*0.5\"}}}}}}}}}}}}" + }, + { + "module": "CF", + "requestQueryMap": "{\"state\" : \"state.keyword\",\"ulb\" : \"ulb.keyword\",\"ward\" : \"ward.keyword\"}", + "dateRefField": "date", + "indexName": "citizen-feedback-national-dashboard", + "aggrQuery": " {\"aggs\": {\"AGGR\": {\"filter\": {\"bool\": {\"must\": [{\"term\": {\"serviceModule.keyword\": \"PT\"}}]}},\"aggs\": {\"all_matching_docs\": {\"filters\": {\"filters\": {\"all\": {\"match_all\": {}}},\"aggs\": {\"TotalFeedbackScore\": {\"sum\": {\"script\": {\"lang\": \"painless\",\"inline\": \"doc['todaysAverageCitizenRating'].value * doc['todaysNoOfCitizenResponsesForChannel'].value\"}}},\"TotalNumberofResponses\": {\"sum\": {\"field\": \"todaysNoOfCitizenResponsesForChannel\"}},\"deliveryindex\": {\"bucket_script\": {\"buckets_path\": {\"response\": \"TotalNumberofResponses\",\"feedbak\": \"TotalFeedbackScore\"},\"script\": \"(((params.feedbak / params.response)/5)* 100)*0.5\"}}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "nss", + "action": "", + "isRoundOff": true, + "aggregationPaths": [ + "aggregatedsla", + "citizenavgfeedback" + ], + "insight": { + "chartResponseMap" : "nssPtCitizenServiceDeliveryIndex", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": " " + }, + "sdssPtSlaAchieved": { + "chartName": "DSS_PT_SLA_ACHIEVED", + "queries": [ + { + "module": "PT", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.auditDetails.lastModifiedTime", + "indexName": "property-application", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Closed With In Sla\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"Data.history.state.state.keyword\":[\"APPROVED\",\"REJECTED\"]}},{\"script\":{\"script\":{\"source\":\"doc['Data.auditDetails.lastModifiedTime'].date.millis - doc['Data.auditDetails.createdTime'].date.millis < doc['Data.businessserviceSla'].date.millis\",\"lang\":\"painless\"}}}]}},\"aggs\":{\"count\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}},\"Total Applications\":{\"terms\":{\"field\":\"Data.tenantId.keyword\"},\"aggs\":{\"tenant_count\":{\"value_count\":{\"field\":\"Data.tenantId.keyword\"}}}}}}}}" + } + ], + "chartType": "metric", + "valueType": "percentage", + "drillChart": "none", + "documentType": "_doc", + "action": "percentage", + "isRoundOff": true, + "aggregationPaths": [ + "Closed With In Sla", + "Total Applications" + ], + "insight": { + "chartResponseMap" : "sdssPtSlaAchieved", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": true + }, + "_comment": " " + }, + "sdssPtCitizenFeedbackScore": { + "chartName": "DSS_PT_CITIZEN_FEEDBACK_SCORE", + "queries": [ + { + "module": "CF", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.auditDetails.lastModifiedTime", + "indexName": "citizen-feedback", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}],\"must\":[{\"term\":{\"Data.serviceModule.keyword\":\"PT\"}}]}},\"aggs\":{\"Total Feedback Score\":{\"sum\":{\"field\":\"Data.rating\"}},\"Total Applications\":{\"value_count\":{\"field\":\"Data.id.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "division", + "isRoundOff": false, + "aggregationPaths": [ + "Total Feedback Score", + "Total Applications" + ], + "insight": { + "chartResponseMap" : "sdssPtCitizenFeedbackScore", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": false + }, + "_comment": " " + }, + "sdssOverviewCitizenFeedbackScore": { + "chartName": "DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE", + "queries": [ + { + "module": "CF", + "requestQueryMap": "{\"wardId\" : \"Data.ward.name.keyword\", \r\n \"district\" : \"Data.tenantData.city.districtCode\", \r\n\"tenantId\" : \"Data.tenantId\" \r\n}", + "dateRefField": "Data.auditDetails.lastModifiedTime", + "indexName": "citizen-feedback", + "aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"Data.tenantId.keyword\":\"pb.testing\"}}]}},\"aggs\":{\"Total Feedback Score\":{\"sum\":{\"field\":\"Data.rating\"}},\"Total Applications\":{\"value_count\":{\"field\":\"Data.id.keyword\"}}}}}}" + } + ], + "chartType": "metric", + "valueType": "number", + "drillChart": "none", + "documentType": "_doc", + "action": "division", + "isRoundOff": false, + "aggregationPaths": [ + "Total Feedback Score", + "Total Applications" + ], + "insight": { + "chartResponseMap" : "sdssOverviewCitizenFeedbackScore", + "action" : "differenceOfNumbers", + "upwardIndicator" : "positive", + "downwardIndicator" : "negative", + "textMessage" : "$indicator$value% than last $insightInterval", + "colorCode" : "#228B22", + "insightInterval" : "year", + "isRoundOff": false + }, + "_comment": " " } } diff --git a/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json b/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json index a1e378e56..e4f59007f 100644 --- a/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json +++ b/egov-dss-dashboards/dashboard-analytics/MasterDashboardConfig.json @@ -191,6 +191,14 @@ "chartType": "metric", "filter": "", "headers": [] + }, + { + "id": "sdssOverviewCitizenFeedbackScore", + "name": "DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] } ] }, @@ -476,6 +484,30 @@ "chartType": "metric", "filter": "", "headers": [] + }, + { + "id": "nssOverviewPendancy", + "name": "NATIONAL_DSS_OVERVIEW_PENDANCY", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssPtCitizenServiceDeliveryIndex", + "name": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssOverviewCitizenFeedbackScore", + "name": "NATIONAL_DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] } ] }, @@ -850,6 +882,22 @@ "chartType": "metric", "filter": "", "headers": [] + }, + { + "id": "sdssPtSlaAchieved", + "name": "DSS_PT_SLA_ACHIEVED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "sdssPtCitizenFeedbackScore", + "name": "DSS_PT_CITIZEN_FEEDBACK_SCORE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] } ] }, @@ -1251,6 +1299,38 @@ "chartType": "metric", "filter": "", "headers": [] + }, + { + "id": "nssPtSlaAchieved", + "name": "NATIONAL_DSS_PT_SLA_ACHIEVED", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssPtPendancy", + "name": "NATIONAL_DSS_PT_PENDANCY", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssPtCitizenServiceDeliveryIndex", + "name": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssPtCitizenFeedbackScore", + "name": "NATIONAL_DSS_PT_CITIZEN_FEEDBACK_SCORE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] } ] }, @@ -3637,6 +3717,14 @@ "chartType": "metric", "filter": "", "headers": [] + }, + { + "id": "sdssOverviewCitizenFeedbackScore", + "name": "DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] } ] }, @@ -8395,6 +8483,30 @@ "chartType": "metric", "filter": "", "headers": [] + }, + { + "id": "nssOverviewCitizenFeedbackScore", + "name": "NATIONAL_DSS_OVERVIEW_CITIZEN_FEEDBACK_SCORE", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssPtCitizenServiceDeliveryIndex", + "name": "NATIONAL_DSS_PT_CITIZEN_SERVICE_DELIVERY_INDEX", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] + }, + { + "id": "nssOverviewPendancy", + "name": "NATIONAL_DSS_OVERVIEW_PENDANCY", + "code": "", + "chartType": "metric", + "filter": "", + "headers": [] } ] } diff --git a/egov-indexer/property-services.yml b/egov-indexer/property-services.yml index ee2f7fd36..a8994b735 100644 --- a/egov-indexer/property-services.yml +++ b/egov-indexer/property-services.yml @@ -240,7 +240,13 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search + queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} + uriResponseMapping: + - inJsonPath: $.BusinessServices[0].businessServiceSla + outJsonPath: $.Data.businessserviceSla mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -394,7 +400,13 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search + queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} + uriResponseMapping: + - inJsonPath: $.BusinessServices[0].businessServiceSla + outJsonPath: $.Data.businessserviceSla mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -542,7 +554,13 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search + queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} + uriResponseMapping: + - inJsonPath: $.BusinessServices[0].businessServiceSla + outJsonPath: $.Data.businessserviceSla mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant @@ -701,7 +719,13 @@ ServiceMaps: apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} uriResponseMapping: - inJsonPath: $.ProcessInstances - outJsonPath: $.Data.history + outJsonPath: $.Data.history + - path: http://egov-workflow-v2.egov:8080/egov-workflow-v2/egov-wf/businessservice/_search + queryParam: businessServices=PT.+$.creationReason,tenantId=$.tenantId + apiRequest: {"RequestInfo":{"apiId":"org.egov.pt","ver":"1.0","ts":1502890899493,"action":"asd","did":"4354648646","key":"xyz","msgId":"654654","requesterId":"61","authToken":"d9994555-7656-4a67-ab3a-a952a0d4dfc8","userInfo":{"id":1,"uuid":"1fec8102-0e02-4d0a-b283-cd80d5dab067","type":"EMPLOYEE","tenantId":"pg.citya","roles":[{"name":"Employee","code":"EMPLOYEE","tenantId":"pg.citya"}]}}} + uriResponseMapping: + - inJsonPath: $.BusinessServices[0].businessServiceSla + outJsonPath: $.Data.businessserviceSla mdmsMapping: - path: http://egov-mdms-service.egov:8080/egov-mdms-service/v1/_search moduleName: tenant diff --git a/egov-persister/service-request-persister.yml b/egov-persister/service-request-persister.yml new file mode 100644 index 000000000..76173d06f --- /dev/null +++ b/egov-persister/service-request-persister.yml @@ -0,0 +1,138 @@ +serviceMaps: + serviceName: service-request + mappings: + - version: 1.0 + description: Persists service definition details in service definition table + fromTopic: save-service-definition + isTransaction: true + queryMaps: + + - query: INSERT INTO eg_service_definition(id, tenantid, code, module, isactive, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails, clientid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.ServiceDefinition + jsonMaps: + - jsonPath: $.ServiceDefinition.id + + - jsonPath: $.ServiceDefinition.tenantId + + - jsonPath: $.ServiceDefinition.code + + - jsonPath: $.ServiceDefinition.module + + - jsonPath: $.ServiceDefinition.isActive + + - jsonPath: $.ServiceDefinition.auditDetails.createdBy + + - jsonPath: $.ServiceDefinition.auditDetails.lastModifiedBy + + - jsonPath: $.ServiceDefinition.auditDetails.createdTime + + - jsonPath: $.ServiceDefinition.auditDetails.lastModifiedTime + + - jsonPath: $.ServiceDefinition.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.ServiceDefinition.clientId + + + + - query: INSERT INTO eg_service_attribute_definition(id, referenceid, tenantid, code, datatype, "values", isactive, required, regex, "order", createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.ServiceDefinition.attributes.* + jsonMaps: + - jsonPath: $.ServiceDefinition.attributes.*.id + + - jsonPath: $.ServiceDefinition.attributes.*.referenceId + + - jsonPath: $.ServiceDefinition.attributes.*.tenantId + + - jsonPath: $.ServiceDefinition.attributes.*.code + + - jsonPath: $.ServiceDefinition.attributes.*.dataType + + - jsonPath: $.ServiceDefinition.attributes.*.values + type: ARRAY + dbType: STRING + + - jsonPath: $.ServiceDefinition.attributes.*.isActive + + - jsonPath: $.ServiceDefinition.attributes.*.required + + - jsonPath: $.ServiceDefinition.attributes.*.regex + + - jsonPath: $.ServiceDefinition.attributes.*.order + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.createdBy + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.lastModifiedBy + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.createdTime + + - jsonPath: $.ServiceDefinition.attributes.*.auditDetails.lastModifiedTime + + - jsonPath: $.ServiceDefinition.attributes.*.additionalDetails + type: JSON + dbType: JSONB + + + + + + - version: 1.0 + description: Persists service details in service table + fromTopic: save-service + isTransaction: true + queryMaps: + + + - query: INSERT INTO eg_service(id, tenantid, servicedefid, referenceid, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails, accountid, clientid) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Service + jsonMaps: + - jsonPath: $.Service.id + + - jsonPath: $.Service.tenantId + + - jsonPath: $.Service.serviceDefId + + - jsonPath: $.Service.referenceId + + - jsonPath: $.Service.auditDetails.createdBy + + - jsonPath: $.Service.auditDetails.lastModifiedBy + + - jsonPath: $.Service.auditDetails.createdTime + + - jsonPath: $.Service.auditDetails.lastModifiedTime + + - jsonPath: $.Service.additionalDetails + type: JSON + dbType: JSONB + + - jsonPath: $.Service.accountId + + - jsonPath: $.Service.clientId + + + - query: INSERT INTO eg_service_attribute_value(id, referenceid, attributecode, value, createdby, lastmodifiedby, createdtime, lastmodifiedtime, additionaldetails) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?); + basePath: $.Service.attributes.* + jsonMaps: + - jsonPath: $.Service.attributes.*.id + + - jsonPath: $.Service.attributes.*.referenceId + + - jsonPath: $.Service.attributes.*.attributeCode + + - jsonPath: $.Service.attributes.*.value + type: JSON + dbType: JSONB + + - jsonPath: $.Service.attributes.*.auditDetails.createdBy + + - jsonPath: $.Service.attributes.*.auditDetails.lastModifiedBy + + - jsonPath: $.Service.attributes.*.auditDetails.createdTime + + - jsonPath: $.Service.attributes.*.auditDetails.lastModifiedTime + + - jsonPath: $.Service.attributes.*.additionalDetails + type: JSON + dbType: JSONB \ No newline at end of file diff --git a/internal-gateway.json b/internal-gateway.json new file mode 100644 index 000000000..f92143e49 --- /dev/null +++ b/internal-gateway.json @@ -0,0 +1,105 @@ +{ + "/eus/.*": { + "in.statea": "http://eus.statea:8080", + "in.stateb": "http://eus.stateb:8080", + "in": "http://eus.digit:8080" + }, + "/egov-url-shortening/.*": { + "in.statea": "http://egov-url-shortening.statea:8080", + "in.stateb": "http://egov-url-shortening.stateb:8080", + "in": "http://egov-url-shortening.digit:8080" + }, + "/egov-idgen/.*": { + "in.statea": "http://egov-idgen.statea:8080", + "in.stateb": "http://egov-idgen.stateb:8080", + "in": "http://egov-idgen.digit:8080" + }, + "/egov-localization/.*": { + "in.statea": "http://egov-localization.digit:8080", + "in.stateb": "http://egov-localization.digit:8080", + "in": "http://egov-localization.digit:8080" + }, + "/egov-mdms-service/.*": { + "in.statea": "http://egov-mdms-service.statea:8080", + "in.stateb": "http://egov-mdms-service.stateb:8080", + "in": "http://egov-mdms-service:8080" + }, + "/pt-calculator-v2/.*": { + "in.statea": "http://pt-calculator-v2.statea:8080", + "in.stateb": "http://pt-calculator-v2.stateb:8080" + }, + "/property-services/.*": { + "in.stateb": "http://property-services.digit:8080", + "in.statea": "http://property-services.digit:8080" + }, + "/billing-service/.*": { + "in.stateb": "http://billing-service.digit:8080", + "in.statea": "http://billing-service.digit:8080" + }, + "/tl-calculator/.*": { + "in.statea": "http://tl-calculator.statea:8080", + "in.stateb": "http://tl-calculator.stateb:8080" + }, + "/ws-calculator/.*": { + "in.statea": "http://ws-calculator.statea:8080", + "in.stateb": "http://ws-calculator.stateb:8080" + }, + "/sw-calculator/.*": { + "in.statea": "http://sw-calculator.statea:8080", + "in.stateb": "http://sw-calculator.stateb:8080" + }, + "/firenoc-calculator/.*": { + "in.statea": "http://firenoc-calculator.statea:8080", + "in.stateb": "http://firenoc-calculator.stateb:8080" + }, + "/pg-service/.*": { + "in.statea": "http://egov-pg-service.statea:8080", + "in.stateb": "http://egov-pg-service.stateb:8080" + }, + "/dashboard-analytics/.*": { + "in.statea": "http://dashboard-analytics.statea:8080", + "in.stateb": "http://dashboard-analytics.stateb:8080" + }, + "/report/.*": { + "in.statea": "http://report.digit:8080", + "in.stateb": "http://report.digit:8080" + }, + "/pdf-service/.*": { + "in.statea": "http://pdf-service.statea:8080", + "in.stateb": "http://pdf-service.stateb:8080" + }, + "/filestore/.*": { + "in.statea": "http://egov-filestore.digit:8080", + "in.stateb": "http://egov-filestore.digit:8080", + "in": "http://egov-filestore.digit:8080" + }, + "/echallan-calculator/.*": { + "in.statea": "http://echallan-calculator.statea:8080", + "in.stateb": "http://echallan-calculator.stateb:8080" + }, + "/edcr/.*": { + "in.statea": "http://egov-edcr.statea:8080", + "in.stateb": "http://egov-edcr.stateb:8080" + }, + "/egov-user/.*": { + "in.statea": "http://egov-user.digit:8080", + "in.stateb": "http://egov-user.digit:8080", + "in": "http://egov-user.digit:8080" + }, + "/egov-pdf/.*": { + "in.statea": "http://egov-pdf.digit:8080", + "in.stateb": "http://egov-pdf.digit:8080" + }, + "/inbox/.*": { + "in.statea": "http://inbox.statea:8080", + "in.stateb": "http://inbox.stateb:8080" + }, + "/egov-searcher/.*": { + "in.statea": "http://egov-searcher.digit:8080", + "in.stateb": "http://egov-searcher.digit:8080" + }, + "/bpa-calculator/.*": { + "in.statea": "http://bpa-calculator.statea:8080", + "in.stateb": "http://bpa-calculator.stateb:8080" + } + } \ No newline at end of file diff --git a/pdf-service/data-config/mcollect-challan.json b/pdf-service/data-config/mcollect-challan.json index df2552dfc..f9b5b910a 100644 --- a/pdf-service/data-config/mcollect-challan.json +++ b/pdf-service/data-config/mcollect-challan.json @@ -702,7 +702,7 @@ "qrcodeConfig": [ { "variable": "qrcodeimage", - "value": "Payer Name : {{consumnerName}},Challan number: {{challanNo}}, Challan Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" + "value": "Payer Name : {{consumerName}},Challan number: {{challanNo}}, Challan Date: {{billDate}}, Total Amount: {{totalAmount}}, Billing Period: {{fromPeriod}} to {{toPeriod}}" } ] }