Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fsm mdms changes #223

Open
wants to merge 3 commits into
base: 2.8_upgrade
Choose a base branch
from
Open

fsm mdms changes #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af866cc
fsm mdms changes
Taniya-eGov Nov 22, 2023
0198e36
Merge branch '2.8_upgrade' into fsm-upyog
Taniya-eGov Nov 24, 2023
7c4a130
remove role action
Taniya-eGov Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 2 additions & 134 deletions data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down Expand Up @@ -5657,7 +5657,7 @@
"serviceCode": "",
"code": "",
"path": "",
"navigationURL": "/digit-ui/employee/hrms/inbox",
"navigationURL": "hrms/search",
"leftIcon": "social:people",
"rightIcon": "",
"queryParams": ""
Expand Down Expand Up @@ -14891,138 +14891,6 @@
"serviceCode": "MDMS v2",
"code": "null",
"path": ""
},
{
"id": 2524,
"name": "MDMS",
"url":"/mdms-v2/v2/_create/egf-master.FinancialYear",
"displayName": "Create egf-master FinancialYear",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2525,
"name": "MDMS",
"url":"/mdms-v2/v2/_update/egf-master.FinancialYear",
"displayName": "Update egf-master FinancialYear",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2526,
"name": "MDMS",
"url":"/mdms-v2/v2/_create/common-masters.Department",
"displayName": "Create common-masters.Department",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2527,
"name": "MDMS",
"url":"/mdms-v2/v2/_update/common-masters.Department",
"displayName": "Update common-masters.Department",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2528,
"name": "MDMS",
"url":"/mdms-v2/v2/_create/RAINMAKER-PGR.UIConstants",
"displayName": "Create RAINMAKER-PGR.UIConstants",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2529,
"name": "MDMS",
"url":"/mdms-v2/v2/_update/RAINMAKER-PGR.UIConstants",
"displayName": "Update RAINMAKER-PGR.UIConstants",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2530,
"name": "MDMS",
"url":"/mdms-v2/v2/_create/RAINMAKER-PGR.ComplainClosingTime",
"displayName": "Create RAINMAKER-PGR.ComplainClosingTime",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2531,
"name": "MDMS",
"url":"/mdms-v2/v2/_update/RAINMAKER-PGR.ComplainClosingTime",
"displayName": "Update RAINMAKER-PGR.ComplainClosingTime",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2532,
"name": "MDMS",
"url":"/mdms-v2/v2/_create/RAINMAKER-PGR.ServiceDefs",
"displayName": "Create RAINMAKER-PGR.ServiceDefs",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2533,
"name": "MDMS",
"url":"/mdms-v2/v2/_update/RAINMAKER-PGR.ServiceDefs",
"displayName": "Update RAINMAKER-PGR.ServiceDefs",
"orderNumber": 1,
"parentModule": "",
"enabled": true,
"serviceCode": "MDMS",
"code": "null",
"path": ""
},
{
"id": 2534,
"name": "MDMS v2 (search v2)",
"url": "/mdms-v2/v1/_search",
"parentModule": "",
"displayName": "MDMS v2",
"orderNumber": 1,
"enabled": true,
"serviceCode": "MDMS v2",
"code": "null",
"path": ""
}
]
}
84 changes: 0 additions & 84 deletions data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26221,90 +26221,6 @@
"actionid": 1734,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2524,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2525,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2526,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2527,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2528,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2529,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2530,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2531,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2532,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "MDMS_ADMIN",
"actionid": 2533,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "EMPLOYEE",
"actionid": 2523,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "CITIZEN",
"actionid": 2523,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "EMPLOYEE",
"actionid": 2534,
"actioncode": "",
"tenantId": "pg"
},
{
"rolecode": "CITIZEN",
"actionid": 2534,
"actioncode": "",
"tenantId": "pg"
}
]
}
2 changes: 1 addition & 1 deletion data/pg/FSM/AdvancePayment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{
"name": "PercentageValue",
"code": "PERCENTAGEVALUE",
"active": true,
"active": false,
"advancePercentage":"50"
}
]
Expand Down
12 changes: 11 additions & 1 deletion data/pg/FSM/CancelReason.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
58 changes: 34 additions & 24 deletions data/pg/FSM/CommonFieldsConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -108,7 +118,7 @@
{
"type": "component",
"route": "street",
"component": "FSMSelectStreet",
"component": "SelectStreet",
"key": "address",
"withoutLabel": true,
"texts": {
Expand All @@ -123,7 +133,7 @@
{
"type": "component",
"route": "landmark",
"component": "FSMSelectLandmark",
"component": "SelectLandmark",
"withoutLabel": true,
"texts": {
"headerCaption": "CS_FILE_APPLICATION_PROPERTY_LOCATION_LABEL",
Expand Down Expand Up @@ -168,7 +178,7 @@
},
"type": "component",
"key": "pitDetail",
"nextStep": "select-payment-preference",
"nextStep": "select-gender",
"label": "ES_NEW_APPLICATION_PIT_DIMENSION"
},
{
Expand Down Expand Up @@ -255,4 +265,4 @@
]
}
]
}
}
Loading