From af866cce18116d7c7f72b1bd367ddfbb936f9a85 Mon Sep 17 00:00:00 2001 From: Taniya-eGov <103186387+Taniya-eGov@users.noreply.github.com> Date: Wed, 22 Nov 2023 17:32:56 +0530 Subject: [PATCH 1/2] fsm mdms changes --- .../actions-test.json | 58 +++++++++- .../roleactions.json | 60 ++++++++++ data/pg/FSM/AdvancePayment.json | 2 +- data/pg/FSM/CancelReason.json | 12 +- data/pg/FSM/CommonFieldsConfig.json | 58 ++++++---- data/pg/FSM/Config.json | 2 +- data/pg/FSM/DeclineReason.json | 19 +++- data/pg/Vehicle/FSTPORejectionReason.json | 20 ++-- data/pg/citya/FSM/UrcConfig.json | 9 ++ data/pg/citya/FSM/ZeroPricing.json | 2 +- .../pg/citya/egov-location/boundary-data.json | 106 ++++++++++++++++++ data/pg/cityb/FSM/UrcConfig.json | 9 ++ data/pg/cityb/FSM/ZeroPricing.json | 9 ++ .../pg/cityb/egov-location/boundary-data.json | 106 ++++++++++++++++++ data/pg/common-masters/Designation.json | 6 + data/pg/common-masters/IdFormat.json | 2 +- 16 files changed, 440 insertions(+), 40 deletions(-) create mode 100644 data/pg/citya/FSM/UrcConfig.json create mode 100644 data/pg/cityb/FSM/UrcConfig.json create mode 100644 data/pg/cityb/FSM/ZeroPricing.json diff --git a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json index f6bd1ec38..097df71c9 100644 --- a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json +++ b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json @@ -5578,7 +5578,7 @@ "enabled": true, "serviceCode": "HRMS", "code": "null", - "navigationURL": "/digit-ui/employee/hrms/inbox", + "navigationURL": "hrms/search", "path": "HRMS.Search", "leftIcon": "social:people" }, @@ -5657,7 +5657,7 @@ "serviceCode": "", "code": "", "path": "", - "navigationURL": "/digit-ui/employee/hrms/inbox", + "navigationURL": "hrms/search", "leftIcon": "social:people", "rightIcon": "", "queryParams": "" @@ -14891,6 +14891,60 @@ "serviceCode": "MDMS v2", "code": "null", "path": "" + }, + { + "id": 2524, + "name": "Locality searcher endpoint for Vehicle", + "url": "/egov-searcher/locality/Vehicle/_get", + "displayName": "Vehicle searcher", + "orderNumber": 0, + "enabled": false, + "serviceCode": "egov-searcher", + "code": "null", + "path": "" + }, + { + "id": 2525, + "name": "rainmaker-common-dashboard", + "url": "card", + "displayName": "Dashboard", + "orderNumber": 3, + "queryParams": "", + "parentModule": "", + "enabled": true, + "serviceCode": "", + "code": "", + "path": "", + "navigationURL": "egov-dashboard/home", + "leftIcon": "custom:publicIcon", + "rightIcon": "" + }, + { + "id": 2526, + "name": "Search FSM Application", + "url": "/fsm/v1/_plainsearch", + "displayName": "Search FSM Appliacations", + "orderNumber": 1, + "enabled": false, + "serviceCode": "FSM", + "code": "null", + "path": "" + }, + { + "id": 2527, + "name": "rainmaker-citizen-fsm", + "url": "url", + "displayName": "Faecal Sludge Management", + "orderNumber": 8, + "parentModule": "", + "enabled": true, + "serviceCode": "fsm", + "code": "", + "path": "fsm", + "navigationURL": "/digit-ui/citizen", + "leftIcon": "custom:localShipping", + "rightIcon": "", + "queryParams": "" } ] } diff --git a/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json index 3e50e0917..cf546f1f1 100644 --- a/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -26221,6 +26221,66 @@ "actionid": 1734, "actioncode": "", "tenantId": "pg" + }, + { + "rolecode": "EMPLOYEE", + "actionid": 2524, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_EDITOR_EMP", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_VIEW_EMP", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_ADMIN", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_DSO", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_DRIVER", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_EMP_FSTPO", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "FSM_COLLECTOR", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "CSR_FSTPO", + "actionid": 2526, + "actioncode": "", + "tenantId": "pg" + }, + { + "rolecode": "CITIZEN", + "actionid": 2527, + "actioncode": "", + "tenantId": "pg" } ] } diff --git a/data/pg/FSM/AdvancePayment.json b/data/pg/FSM/AdvancePayment.json index 45fc2f726..9286c8918 100644 --- a/data/pg/FSM/AdvancePayment.json +++ b/data/pg/FSM/AdvancePayment.json @@ -11,7 +11,7 @@ { "name": "PercentageValue", "code": "PERCENTAGEVALUE", - "active": true, + "active": false, "advancePercentage":"50" } ] diff --git a/data/pg/FSM/CancelReason.json b/data/pg/FSM/CancelReason.json index 37b14fd8a..03923015a 100644 --- a/data/pg/FSM/CancelReason.json +++ b/data/pg/FSM/CancelReason.json @@ -3,10 +3,20 @@ "moduleName": "FSM", "CancelReason": [ { - "name": "Duplicate application", + "name": "Duplicate Applications", "code": "DUPLICATE", "active": true }, + { + "name": "Unable to contact the Applicant", + "code": "CANNOT_CONTACT_APPLICANT", + "active": true + }, + { + "name": "Applicant denied the request", + "code": "CITIZEN_DENIED_REQUEST", + "active": true + }, { "name": "Others", "code": "OTHERS", diff --git a/data/pg/FSM/CommonFieldsConfig.json b/data/pg/FSM/CommonFieldsConfig.json index 3dbcee308..77a5ea109 100644 --- a/data/pg/FSM/CommonFieldsConfig.json +++ b/data/pg/FSM/CommonFieldsConfig.json @@ -33,38 +33,32 @@ "cardText": "CS_FILE_APPLICATION_PROPERTY_SUBTYPE_TEXT", "submitBarLabel": "CS_COMMON_NEXT" }, - "nextStep": "map" + "nextStep": "pincode" } ] }, { "head": "ES_NEW_APPLICATION_LOCATION_DETAILS", "body": [ + { - "route": "map", - "component": "FSMSelectGeolocation", - "nextStep": "pincode", - "hideInEmployee": true, - "key": "address" - }, - { - "route": "pincode", - "component": "FSMSelectPincode", + "route": "address", + "component": "SelectAddress", + "withoutLabel": true, "texts": { - "headerCaption": "", - "header": "CS_FILE_APPLICATION_PINCODE_LABEL", - "cardText": "CS_FILE_APPLICATION_PINCODE_TEXT", - "submitBarLabel": "CS_COMMON_NEXT", - "skipText": "CORE_COMMON_SKIP_CONTINUE" + "headerCaption": "CS_FILE_APPLICATION_PROPERTY_LOCATION_LABEL", + "header": "CS_FILE_APPLICATION_PROPERTY_LOCATION_ADDRESS_TEXT", + "cardText": "CS_FILE_APPLICATION_PROPERTY_LOCATION_CITY_MOHALLA_TEXT", + "submitBarLabel": "CS_COMMON_NEXT" }, - "withoutLabel": true, "key": "address", - "nextStep": "address", + "nextStep": "locality-gramPanchayat", + "isMandatory": true, "type": "component" }, { - "route": "address", - "component": "FSMSelectAddress", + "route": "locality-gramPanchayat", + "component": "SelectLocalityOrGramPanchayat", "withoutLabel": true, "texts": { "headerCaption": "CS_FILE_APPLICATION_PROPERTY_LOCATION_LABEL", @@ -73,10 +67,26 @@ "submitBarLabel": "CS_COMMON_NEXT" }, "key": "address", - "nextStep": "check-slum", + "nextStep": "select-trip-number", "isMandatory": true, "type": "component" }, + { + "route": "pincode", + "component": "SelectPincode", + "texts": { + "headerCaption": "", + "header": "CS_FILE_APPLICATION_PINCODE_LABEL", + "cardText": "CS_FILE_APPLICATION_PINCODE_TEXT", + "submitBarLabel": "CS_COMMON_NEXT", + "skipText": "CORE_COMMON_SKIP_CONTINUE" + }, + "withoutLabel": true, + "key": "address", + "nextStep": "check-slum", + + "type": "component" + }, { "type": "component", "route": "check-slum", @@ -108,7 +118,7 @@ { "type": "component", "route": "street", - "component": "FSMSelectStreet", + "component": "SelectStreet", "key": "address", "withoutLabel": true, "texts": { @@ -123,7 +133,7 @@ { "type": "component", "route": "landmark", - "component": "FSMSelectLandmark", + "component": "SelectLandmark", "withoutLabel": true, "texts": { "headerCaption": "CS_FILE_APPLICATION_PROPERTY_LOCATION_LABEL", @@ -168,7 +178,7 @@ }, "type": "component", "key": "pitDetail", - "nextStep": "select-payment-preference", + "nextStep": "select-gender", "label": "ES_NEW_APPLICATION_PIT_DIMENSION" }, { @@ -255,4 +265,4 @@ ] } ] -} +} \ No newline at end of file diff --git a/data/pg/FSM/Config.json b/data/pg/FSM/Config.json index b062e024e..b3d2a4771 100644 --- a/data/pg/FSM/Config.json +++ b/data/pg/FSM/Config.json @@ -10,7 +10,7 @@ }, { "code":"additionalDetails.tripAmount", - "override":false, + "override":true, "active":true }, { diff --git a/data/pg/FSM/DeclineReason.json b/data/pg/FSM/DeclineReason.json index 7ab4fad12..2a5b1e79e 100644 --- a/data/pg/FSM/DeclineReason.json +++ b/data/pg/FSM/DeclineReason.json @@ -3,14 +3,29 @@ "moduleName": "FSM", "DeclineReason": [ { - "name": "Vehicle is under repair", + "name": "Cesspool Vehicle is under repair", "code": "VEHICLE_REPAIR", "active": true }, { - "name": "Inaccessible road", + "name": "Inaccessible Approach Road", "code": "ROAD_INACCESS", "active": true + }, + { + "name": "Inaccessible Septic Tank", + "code": "SEPT_INACCESS", + "active": true + }, + { + "name": "Hardening of sludge in the Septic Tank", + "code": "SLUDGE_HARDENING", + "active": true + }, + { + "name": "Others", + "code": "OTHERS", + "active": true } ] } \ No newline at end of file diff --git a/data/pg/Vehicle/FSTPORejectionReason.json b/data/pg/Vehicle/FSTPORejectionReason.json index 9b5aef4fa..65c7a9ca1 100644 --- a/data/pg/Vehicle/FSTPORejectionReason.json +++ b/data/pg/Vehicle/FSTPORejectionReason.json @@ -1,25 +1,31 @@ { "tenantId": "pg", "moduleName": "Vehicle", - "FSTPORejectionReason": [{ - "name": "Septage Source", - "code": "SEPTAGE_SOURCE", + "FSTPORejectionReason": [ + { + "name": "Approach Road to FSTP is inaccessible", + "code": "FSTP_INACCESS", "active": true }, { - "name": "Outside operational hours", - "code": "OUTSIDE_OPERATIONAL_HOURS", + "name": "Over Utilization of the FSTP Capacity (>100% Capacity Utilization)", + "code": "OVER_UTILIZE", "active": true }, { - "name": "Under Maintenance", + "name": "FSTP under maintenance", "code": "UNDER_MAINTENANCE", "active": true }, + { + "name": "Vehicle breakdown on the way to FSTP", + "code": "VEHICLE_BREAKDOWN", + "active": true + }, { "name": "Others", "code": "OTHERS", "active": true } ] -} +} \ No newline at end of file diff --git a/data/pg/citya/FSM/UrcConfig.json b/data/pg/citya/FSM/UrcConfig.json new file mode 100644 index 000000000..003c4ea7c --- /dev/null +++ b/data/pg/citya/FSM/UrcConfig.json @@ -0,0 +1,9 @@ +{ + "tenantId": "pg.citya", + "moduleName": "FSM", + "UrcConfig": [ + { + "URCEnable": true + } + ] +} \ No newline at end of file diff --git a/data/pg/citya/FSM/ZeroPricing.json b/data/pg/citya/FSM/ZeroPricing.json index cc67c7698..c19585a9b 100644 --- a/data/pg/citya/FSM/ZeroPricing.json +++ b/data/pg/citya/FSM/ZeroPricing.json @@ -3,7 +3,7 @@ "moduleName": "FSM", "zeroPricing": [ { - "zeroPricingStatus": true + "zeroPricingStatus": false } ] } diff --git a/data/pg/citya/egov-location/boundary-data.json b/data/pg/citya/egov-location/boundary-data.json index a3318053c..27ccd3f66 100644 --- a/data/pg/citya/egov-location/boundary-data.json +++ b/data/pg/citya/egov-location/boundary-data.json @@ -14362,6 +14362,112 @@ ] } ] + }, + { + "id": 8, + "boundaryNum": 1, + "name": "Other", + "localname": "Other", + "longitude": null, + "latitude": null, + "label": "Locality", + "code": "OTH2", + "children": [] + }, + { + "id": 1, + "boundaryNum": 1, + "name": "GP 1", + "localname": "GP1", + "longitude": null, + "latitude": null, + "label": "GP", + "code": "GP1", + "children": [ + { + "id": 2, + "boundaryNum": 1, + "name": "Village 1", + "localname": "Village local 1", + "longitude": 74.871552, + "latitude": 31.63089, + "label": "Village", + "code": "VIL1", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + }, + { + "id": 3, + "boundaryNum": 1, + "name": "Village 2", + "localname": "Village local 2", + "longitude": null, + "latitude": null, + "label": "Village", + "code": "VIL2", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + } + ] + }, + { + "id": 4, + "boundaryNum": 1, + "name": "GP 2", + "localname": "GP2", + "longitude": null, + "latitude": null, + "label": "GP", + "code": "GP2", + "children": [ + { + "id": 5, + "boundaryNum": 1, + "name": "Village 3", + "localname": "Village local 3", + "longitude": 74.871552, + "latitude": 31.63089, + "label": "Village", + "code": "VIL3", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + }, + { + "id": 6, + "boundaryNum": 1, + "name": "Village 4", + "localname": "Village local 4", + "longitude": null, + "latitude": null, + "label": "Village", + "code": "VIL4", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + } + ] + }, + { + "id": 7, + "boundaryNum": 1, + "name": "Other", + "localname": "Other", + "longitude": null, + "latitude": null, + "label": "GP", + "code": "OTH1", + "children": [] } ] } diff --git a/data/pg/cityb/FSM/UrcConfig.json b/data/pg/cityb/FSM/UrcConfig.json new file mode 100644 index 000000000..1009ca1f7 --- /dev/null +++ b/data/pg/cityb/FSM/UrcConfig.json @@ -0,0 +1,9 @@ +{ + "tenantId": "pg.cityb", + "moduleName": "FSM", + "UrcConfig": [ + { + "URCEnable": true + } + ] +} \ No newline at end of file diff --git a/data/pg/cityb/FSM/ZeroPricing.json b/data/pg/cityb/FSM/ZeroPricing.json new file mode 100644 index 000000000..0f8546479 --- /dev/null +++ b/data/pg/cityb/FSM/ZeroPricing.json @@ -0,0 +1,9 @@ +{ + "tenantId": "pg.cityb", + "moduleName": "FSM", + "zeroPricing": [ + { + "zeroPricingStatus": false + } + ] +} \ No newline at end of file diff --git a/data/pg/cityb/egov-location/boundary-data.json b/data/pg/cityb/egov-location/boundary-data.json index ca2c391ac..717d9bb33 100644 --- a/data/pg/cityb/egov-location/boundary-data.json +++ b/data/pg/cityb/egov-location/boundary-data.json @@ -604,6 +604,112 @@ ] } ] + }, + { + "id": 8, + "boundaryNum": 1, + "name": "Other", + "localname": "Other", + "longitude": null, + "latitude": null, + "label": "Locality", + "code": "OTH2", + "children": [] + }, + { + "id": 1, + "boundaryNum": 1, + "name": "GP 1", + "localname": "GP1", + "longitude": null, + "latitude": null, + "label": "GP", + "code": "GP1", + "children": [ + { + "id": 2, + "boundaryNum": 1, + "name": "Village 1", + "localname": "Village local 1", + "longitude": 74.871552, + "latitude": 31.63089, + "label": "Village", + "code": "VIL1", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + }, + { + "id": 3, + "boundaryNum": 1, + "name": "Village 2", + "localname": "Village local 2", + "longitude": null, + "latitude": null, + "label": "Village", + "code": "VIL2", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + } + ] + }, + { + "id": 4, + "boundaryNum": 1, + "name": "GP 2", + "localname": "GP2", + "longitude": null, + "latitude": null, + "label": "GP", + "code": "GP2", + "children": [ + { + "id": 5, + "boundaryNum": 1, + "name": "Village 3", + "localname": "Village local 3", + "longitude": 74.871552, + "latitude": 31.63089, + "label": "Village", + "code": "VIL3", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + }, + { + "id": 6, + "boundaryNum": 1, + "name": "Village 4", + "localname": "Village local 4", + "longitude": null, + "latitude": null, + "label": "Village", + "code": "VIL4", + "pincode": [ + 143001 + ], + "area": "V-Area1", + "children": [] + } + ] + }, + { + "id": 7, + "boundaryNum": 1, + "name": "Other", + "localname": "Other", + "longitude": null, + "latitude": null, + "label": "GP", + "code": "OTH1", + "children": [] } ] } diff --git a/data/pg/common-masters/Designation.json b/data/pg/common-masters/Designation.json index 21a48b95d..d253acf5f 100644 --- a/data/pg/common-masters/Designation.json +++ b/data/pg/common-masters/Designation.json @@ -175,6 +175,12 @@ "description": "Commissioner", "code": "COMM", "active": true + }, + { + "name": "FSM Executive", + "description": "FSM Executive", + "code": "DESIG_200", + "active": true } ] } diff --git a/data/pg/common-masters/IdFormat.json b/data/pg/common-masters/IdFormat.json index 76750c866..323713664 100644 --- a/data/pg/common-masters/IdFormat.json +++ b/data/pg/common-masters/IdFormat.json @@ -572,7 +572,7 @@ }, { "idname": "fsm.aplnumber", - "format": "[CITY.CODE]-FSM-[cy:yyyy-MM-dd]-[SEQ_EGOV_FSM]" + "format": "FSM-[CITY.CODE]-[cy:yyyy-MM-dd]-[SEQ_EGOV_FSM]" }, { "idname": "echallan.aplnumber", From 7c4a130e560736767804c87006d591d51b78fd1d Mon Sep 17 00:00:00 2001 From: Taniya-eGov <103186387+Taniya-eGov@users.noreply.github.com> Date: Fri, 24 Nov 2023 17:17:08 +0530 Subject: [PATCH 2/2] remove role action --- .../actions-test.json | 54 ---------------- .../roleactions.json | 62 +------------------ 2 files changed, 1 insertion(+), 115 deletions(-) diff --git a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json index 097df71c9..a8c5f376c 100644 --- a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json +++ b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json @@ -14891,60 +14891,6 @@ "serviceCode": "MDMS v2", "code": "null", "path": "" - }, - { - "id": 2524, - "name": "Locality searcher endpoint for Vehicle", - "url": "/egov-searcher/locality/Vehicle/_get", - "displayName": "Vehicle searcher", - "orderNumber": 0, - "enabled": false, - "serviceCode": "egov-searcher", - "code": "null", - "path": "" - }, - { - "id": 2525, - "name": "rainmaker-common-dashboard", - "url": "card", - "displayName": "Dashboard", - "orderNumber": 3, - "queryParams": "", - "parentModule": "", - "enabled": true, - "serviceCode": "", - "code": "", - "path": "", - "navigationURL": "egov-dashboard/home", - "leftIcon": "custom:publicIcon", - "rightIcon": "" - }, - { - "id": 2526, - "name": "Search FSM Application", - "url": "/fsm/v1/_plainsearch", - "displayName": "Search FSM Appliacations", - "orderNumber": 1, - "enabled": false, - "serviceCode": "FSM", - "code": "null", - "path": "" - }, - { - "id": 2527, - "name": "rainmaker-citizen-fsm", - "url": "url", - "displayName": "Faecal Sludge Management", - "orderNumber": 8, - "parentModule": "", - "enabled": true, - "serviceCode": "fsm", - "code": "", - "path": "fsm", - "navigationURL": "/digit-ui/citizen", - "leftIcon": "custom:localShipping", - "rightIcon": "", - "queryParams": "" } ] } diff --git a/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json index 8e7f7bbd5..3e50e0917 100644 --- a/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -26221,66 +26221,6 @@ "actionid": 1734, "actioncode": "", "tenantId": "pg" - }, - { - "rolecode": "EMPLOYEE", - "actionid": 2524, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_EDITOR_EMP", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_VIEW_EMP", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_ADMIN", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_DSO", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_DRIVER", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_EMP_FSTPO", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "FSM_COLLECTOR", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "CSR_FSTPO", - "actionid": 2526, - "actioncode": "", - "tenantId": "pg" - }, - { - "rolecode": "CITIZEN", - "actionid": 2527, - "actioncode": "", - "tenantId": "pg" - } + } ] }