...
| Code Block |
|---|
"revenueAndExpenditureTrendTwo": {
"chartName": "DSS_MGRAMSEVA_COLLECTIONS_DATA_TWO",
"queries": [
{
"module": "WS",
"dateRefField": "dataObject.paymentDetails.receiptDate",
"requestQueryMap": "{\"wardId\" : \"domainObject.ward.name.keyword\",\"module\" : \"dataObject.Bill.billDetails.businessService.keyword\", \"tenantId\" : \"dataObject.tenantId\", \"district\" : \"dataObject.tenantData.cityDistrictCode\"}",
"indexName": "dss-collection_v2",
"aggrQuery": "{\"aggs\":{\"AGGR\":{\"filter\":{\"bool\":{\"must_not\":[{\"term\":{\"dataObject.tenantId.keyword\":\"pb.testing\"}},{\"terms\":{\"dataObject.paymentDetails.bill.status.keyword\":[\"Cancelled\"]}}]}},\"aggs\":{\"Water_Service\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"WS\"]}}]}},\"aggs\":{\"WaterService\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.amountPaid\"}}}}}},\"Expense_Service\":{\"filter\":{\"bool\":{\"must\":[{\"terms\":{\"dataObject.paymentDetails.bill.businessService.keyword\":[\"EXPENSE.SALARY\",\"EXPENSE.OM\",\"EXPENSE.ELECTRICITY_BILL\"]}}]}},\"aggs\":{\"ExpenseService\":{\"date_histogram\":{\"field\":\"dataObject.paymentDetails.receiptDate\",\"interval\":\"month\"},\"aggs\":{\"Count\":{\"sum\":{\"field\":\"dataObject.paymentDetails.bill.billDetails.amountPaid\"}}}}}}}}}}"
}
],
"chartType": "line",
"valueType": "number",
"action": "",
"drillChart": "none",
"documentType": "_doc",
"aggregationPaths": [
"WaterService",
"ExpenseService"
],
"isCumulative": false,
"interval": "month",
"insight": {},
"_comment": " "
}, |
Click here to check the complete configuration
Master Dashboard Configuration:
...
Kafka connection and re-indexing is available in this documentation. Please check from here. mGramseva- Services Re-Indexing
Dashboard Service Changes:
Main-Monthly Dashboard:
For main monthly dashboard we are using the service API to fetch the data and to show in main monthly dashboard table.
Ws-services:/ws-services/wc/_revenueCollectionData Should be added to get the main monthly dashboard details. It is used to show the table data based on the no of months for selected financial year.
eChallan-Service:
/echallan-services/eChallan/v1/_chalanCollectionData it is added to get the main monthly dashboard data for the expense.
Dashboard-Metrix:
To show the data in metrix format in specific month dashboard we are using service API which will fetch the data based on dash board type.
Ws-services:/ws-services/wc/_revenueDashboard Should be added to get the revenue dashboard metrix data. It will show the data of revenue collections information
eChallan-Service:
/echallan-services/eChallan/v1/_expenseDashboard Is added in echallan-service to show the data of expenses in metrix format.
MDMS- changes for dashboard:
Actions & Role Action Mapping
Actions
| Code Block |
|---|
[
{
"id": {{PLACEHOLDER1}},
"name": " feedback search",
"url": "/ws-services/wc/_revenueDashboard",
"parentModule": "",
"displayName": "get Revenue Dashboard Data",
"orderNumber": 2,
"enabled": false,
"serviceCode": "ws-services",
"code": "null",
"path": ""
},
{
"id": {{PLACEHOLDER2}},
"name": " feedback search",
"url": "/ws-services/wc/_revenueCollectionData",
"parentModule": "",
"displayName": "get Revenue Dashboard Data",
"orderNumber": 2,
"enabled": false,
"serviceCode": "ws-services",
"code": "null",
"path": ""
},
{
"id": {{PLACEHOLDER3}},
"name": "Expense Update",
"url": "/echallan-services/eChallan/v1/_expenseDashboard",
"parentModule": "",
"displayName": "get Expense Dashboard",
"orderNumber": 0,
"enabled": false,
"serviceCode": "echallan-services",
"code": "null",
"path": ""
},
{
"id": {{PLACEHOLDER4}},
"name": "Expense Update",
"url": "/echallan-services/eChallan/v1/_chalanCollectionData",
"parentModule": "",
"displayName": "get Expense Dashboard",
"orderNumber": 0,
"enabled": false,
"serviceCode": "echallan-services",
"code": "null",
"path": ""
},
{
"id": {{PLACEHOLDER5}},
"name": "DSS Dashboard Charts",
"url": "/dashboard-analytics/dashboard/getChartV2",
"parentModule": "",
"displayName": "DSS",
"orderNumber": 0,
"enabled": false,
"serviceCode": "DSS",
"code": "null",
"path": ""
},
]
|
Role Action Mapping
| Code Block |
|---|
[
{
"rolecode": "GP_ADMIN",
"actionid": {{PLACEHOLDER1}},
"actioncode": "",
"tenantId": "pb"
},
{
"rolecode": "GP_ADMIN",
"actionid": {{PLACEHOLDER2}},
"actioncode": "",
"tenantId": "pb"
},
{
"rolecode": "GP_ADMIN",
"actionid": {{PLACEHOLDER3}},
"actioncode": "",
"tenantId": "pb"
},
{
"rolecode": "GP_ADMIN",
"actionid": {{PLACEHOLDER4}},
"actioncode": "",
"tenantId": "pb"
},
{
"rolecode": "GP_ADMIN",
"actionid": {{PLACEHOLDER5}},
"actioncode": "",
"tenantId": "pb"
},
{
"rolecode": "DASHBOARD_VIEWER",
"actionid": {{PLACEHOLDER5}},
"actioncode": "",
"tenantId": "pb"
}
]
|
Roles to be available:
| Code Block |
|---|
{
"code": "GP_ADMIN",
"name": "GP Admin",
"description": "Who has a access to ws-services"
},
{
"code": "COLLECTION_OPERATOR",
"name": "Collection Operator",
"description": "Who has a access to ws-services,demand, bill and payment"
},
{
"code": "BULK_DEMAND_PROCESSING",
"name": "Bulk Demand Processing",
"description": "Who has a access to bulk demand generation,raise bill, downloa bill and receipts"
},
{
"code": "EXPENSE_PROCESSING",
"name": "Expense Processing",
"description": "Who has a access to create and update expenses"
},
{
"code": "DASHBOARD_VIEWER",
"name": "Dashbaord Viewer",
"description": "Who has a access to dashboard of revenue and expenditure"
}
|
Postman-collection for these dashboard:
echallan-services/eChallan/v1/_chalanCollectionData | |
echallan-services/eChallan/v1/_chalanCollectionData | |
/ws-services/wc/_revenueDashboard | |
/ws-services/wc/_revenueCollectionData | |
/dashboard-analytics/dashboard/getChartV2 |