From 345369733838f7d9cdae61be6b28c2523d7576e9 Mon Sep 17 00:00:00 2001 From: debasishchakraborty-egovt Date: Tue, 17 Oct 2023 12:25:54 +0530 Subject: [PATCH] PFM-1419 : HRMS mdms Changes --- .../actions-test.json | 37 +++++++- .../roleactions.json | 72 ++++++++++++++++ data/pb/ACCESSCONTROL-ROLES/roles.json | 5 ++ data/pb/common-masters/Department.json | 29 ++++--- data/pb/common-masters/Designation.json | 86 +++++++++++++------ data/pb/commonUiConfig/LoginConfig.json | 31 +++++++ data/pb/egov-location/boundary-data.json | 80 ++++++++++++++++- data/pb/tenant/citymodule.json | 20 +++++ data/pb/tenant/tenants.json | 16 ++++ .../ws-services-masters/WSServiceRoles.json | 56 ++++++++++++ 10 files changed, 389 insertions(+), 43 deletions(-) create mode 100644 data/pb/commonUiConfig/LoginConfig.json create mode 100644 data/pb/ws-services-masters/WSServiceRoles.json diff --git a/data/pb/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pb/ACCESSCONTROL-ACTIONS-TEST/actions-test.json index 4522635a10..d597f41a92 100644 --- a/data/pb/ACCESSCONTROL-ACTIONS-TEST/actions-test.json +++ b/data/pb/ACCESSCONTROL-ACTIONS-TEST/actions-test.json @@ -1349,6 +1349,41 @@ "serviceCode": "ws-service", "code": "null", "path": "" - } + }, + { + "id": 2041, + "name": "Delete Token", + "url": "/user/_logout", + "parentModule": "", + "displayName": "Delete Token", + "orderNumber": 1, + "enabled": false, + "serviceCode": "ADMIN", + "code": "null", + "path": "Administration.Delete Token" + }, + { + "id": 2042, + "name": "SearchUserByTenants", + "url": "/user/_searchByTenant", + "displayName": "Search User by tenants", + "orderNumber": 1, + "enabled": false, + "serviceCode": "ADMIN", + "code": "null", + "path": "Administration.SearchUserByTenants" + }, + { + "id": 2043, + "name": "Employee Count", + "url": "/egov-hrms/employees/v1/_count", + "parentModule": "egov-hrms", + "displayName": "Employee Count", + "orderNumber": 0, + "enabled": false, + "serviceCode": "egov-hrms", + "code": "null", + "path": "" + } ] } diff --git a/data/pb/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/pb/ACCESSCONTROL-ROLEACTIONS/roleactions.json index cdc0227fa9..f3dbb320c0 100644 --- a/data/pb/ACCESSCONTROL-ROLEACTIONS/roleactions.json +++ b/data/pb/ACCESSCONTROL-ROLEACTIONS/roleactions.json @@ -4005,6 +4005,78 @@ "actionid": 2040, "actioncode": "", "tenantId": "pb" + }, + { + "rolecode": "EMPLOYEE", + "actionid": 2041, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "DIV_ADMIN", + "actionid": 2041, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "HRMS_ADMIN", + "actionid": 2041, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "SUPERUSER", + "actionid": 2041, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "EMPLOYEE", + "actionid": 2042, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "DIV_ADMIN", + "actionid": 2042, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "HRMS_ADMIN", + "actionid": 2042, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "SUPERUSER", + "actionid": 2042, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "EMPLOYEE", + "actionid": 2043, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "DIV_ADMIN", + "actionid": 2043, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "HRMS_ADMIN", + "actionid": 2043, + "actioncode": "", + "tenantId": "pb" + }, + { + "rolecode": "SUPERUSER", + "actionid": 2043, + "actioncode": "", + "tenantId": "pb" } ] } diff --git a/data/pb/ACCESSCONTROL-ROLES/roles.json b/data/pb/ACCESSCONTROL-ROLES/roles.json index aab896b7dc..294e31f199 100644 --- a/data/pb/ACCESSCONTROL-ROLES/roles.json +++ b/data/pb/ACCESSCONTROL-ROLES/roles.json @@ -131,6 +131,11 @@ "code": "DIV_ADMIN", "name": "DIVISION ADMIN", "description": "Used for Internal team Debug" + }, + { + "code": "STATE_ADMIN", + "name": "STATE ADMIN", + "description": "Used for Creating Div admin user" } ] } diff --git a/data/pb/common-masters/Department.json b/data/pb/common-masters/Department.json index 8873216fe6..f5f4ce5135 100644 --- a/data/pb/common-masters/Department.json +++ b/data/pb/common-masters/Department.json @@ -5,66 +5,71 @@ { "name": "Street Lights", "code": "DEPT_1", - "active": true + "active": false }, { "name": "Building & Roads", "code": "DEPT_2", - "active": true + "active": false }, { "name": "Health & Sanitation", "code": "DEPT_3", - "active": true + "active": false }, { "name": "Operation & Maintenance", "code": "DEPT_4", - "active": true + "active": false }, { "name": "Horticulture", "code": "DEPT_5", - "active": true + "active": false }, { "name": "Building Branch", "code": "DEPT_6", - "active": true + "active": false }, { "name": "Citizen service desk", "code": "DEPT_7", - "active": true + "active": false }, { "name": "Complaint Cell", "code": "DEPT_8", - "active": true + "active": false }, { "name": "Executive Branch", "code": "DEPT_9", - "active": true + "active": false }, { "name": "Others", "code": "DEPT_10", - "active": true + "active": false }, { "name": "Tax Branch", "code": "DEPT_13", - "active": true + "active": false }, { "name": "Accounts Branch", "code": "DEPT_25", - "active": true + "active": false }, { "name": "Works Branch", "code": "DEPT_35", + "active": false + }, + { + "name": "DWSS", + "code": "DWSS", "active": true } ] diff --git a/data/pb/common-masters/Designation.json b/data/pb/common-masters/Designation.json index 37c7a8b602..331c2b0f0e 100644 --- a/data/pb/common-masters/Designation.json +++ b/data/pb/common-masters/Designation.json @@ -6,174 +6,204 @@ "code": "DESIG_01", "name": "Superintending Engineer ( B&R)", "description": "Superintending Engineer ( B&R)", - "active": true + "active": false }, { "code": "DESIG_02", "name": "Corporation Engineer (B&R)", "description": "Corporation Engineer (B&R)", - "active": true + "active": false }, { "code": "DESIG_03", "name": "Asst. Engineer ( B&R)", "description": "Asst. Engineer ( B&R)", - "active": true + "active": false }, { "code": "DESIG_04", "name": "Junior Engineer ( B&R)", "description": "Junior Engineer ( B&R)", - "active": true + "active": false }, { "code": "DESIG_05", "name": "Land Scape Officer", "description": "Land Scape Officer", - "active": true + "active": false }, { "code": "DESIG_06", "name": "Superintending Engineer ( O&M)", "description": "Superintending Engineer ( O&M)", - "active": true + "active": false }, { "code": "DESIG_07", "name": "Corporation Engineer (O&M)", "description": "Corporation Engineer (O&M)", - "active": true + "active": false }, { "code": "DESIG_08", "name": "Asst. Engineer ( O&M)", "description": "Asst. Engineer ( O&M)", - "active": true + "active": false }, { "code": "DESIG_09", "name": "Junior Engineer ( O&M)", "description": "Junior Engineer ( O&M)", - "active": true + "active": false }, { "code": "DESIG_10", "name": "Superintending Engineer ( Light)", "description": "Superintending Engineer ( Light)", - "active": true + "active": false }, { "code": "DESIG_11", "name": "Corporation Engineer (Light)", "description": "Corporation Engineer (Light)", - "active": true + "active": false }, { "code": "DESIG_12", "name": "Junior Engineer ( Light)", "description": "Junior Engineer ( Light)", - "active": true + "active": false }, { "code": "DESIG_13", "name": "Health Officer", "description": "Health Officer", - "active": true + "active": false }, { "code": "DESIG_14", "name": "Medical Officer", "description": "Medical Officer", - "active": true + "active": false }, { "code": "DESIG_15", "name": "Chief Sanitary Inspector", "description": "Mechanical Oversear", - "active": true + "active": false }, { "code": "DESIG_16", "name": "Sainitary Inspector", "description": "Clerk", - "active": true + "active": false }, { "code": "DESIG_17", "name": "Sainitary Supervisor", "description": "Accountant", - "active": true + "active": false }, { "code": "DESIG_18", "name": "Senior Town Planner", "description": "Senior Town Planner", - "active": true + "active": false }, { "code": "DESIG_19", "name": "Municipal Town Planner", "description": "Municipal Town Planner", - "active": true + "active": false }, { "code": "DESIG_20", "name": "Asst. Town Planner", "description": "Asst. Town Planner", - "active": true + "active": false }, { "code": "DESIG_21", "name": "Building Inspector", "description": "Building Inspector", - "active": true + "active": false }, { "code": "DESIG_22", "name": "Junior Enginer ( Horticulutre)", "description": "Junior Enginer ( Horticulutre)", - "active": true + "active": false }, { "code": "DESIG_23", "name": "Citizen service representative", "description": "Citizen service representative", - "active": true + "active": false }, { "name": "Deputy Controller Finance and Accounts", "description": "Deputy Controller Finance and Accounts", "code": "DESIG_1001", - "active": true + "active": false }, { "name": "Accountant", "description": "Accountant", "code": "DESIG_58", - "active": true + "active": false }, { "code": "DESIG_24", "name": "Assistant Commissioner", "description": "Assistant Commissioner", - "active": true + "active": false }, { "name": "Superintendent", "description": "Superintendent", "code": "DESIG_47", - "active": true + "active": false }, { "name": "Accounts Officer", "description": "Accounts Officer", "code": "DESIG_59", - "active": true + "active": false }, { "name": "Commissioner", "description": "Commissioner", "code": "DESIG_60", + "active": false + }, + { + "code": "DESIG_61", + "name": "Sarpanch", + "description": "Sarpanch", + "active": true + }, + { + "code": "DESIG_62", + "name": "Revenue Collector", + "description": "Revenue Collector", + "active": true + }, + { + "code": "DESIG_63", + "name": "Secretary", + "description": "Secretary", + "active": true + }, + { + "code": "DESIG_64", + "name": "Treasurer", + "description": "treasurer", + "active": true + }, + { + "code": "DESIG_65", + "name": "Division Admin", + "description": "Division Admin", "active": true } ] diff --git a/data/pb/commonUiConfig/LoginConfig.json b/data/pb/commonUiConfig/LoginConfig.json new file mode 100644 index 0000000000..00ecb6d38e --- /dev/null +++ b/data/pb/commonUiConfig/LoginConfig.json @@ -0,0 +1,31 @@ +{ + "tenantId": "pb", + "moduleName": "commonUiConfig", + "LoginConfig": [ + { + "texts": { + "header": "CORE_COMMON_LOGIN", + "submitButtonLabel": "CORE_COMMON_CONTINUE", + "secondaryButtonLabel": "CORE_COMMON_FORGOT_PASSWORD" + }, + "inputs": [ + { + "label": "CORE_LOGIN_USERNAME", + "type": "text", + "populators": { + "name": "username" + }, + "isMandatory": true + }, + { + "label": "CORE_LOGIN_PASSWORD", + "type": "password", + "populators": { + "name": "password" + }, + "isMandatory": true + } + ] + } + ] +} \ No newline at end of file diff --git a/data/pb/egov-location/boundary-data.json b/data/pb/egov-location/boundary-data.json index b770d2a8f3..d1fc4bbf05 100644 --- a/data/pb/egov-location/boundary-data.json +++ b/data/pb/egov-location/boundary-data.json @@ -4,8 +4,8 @@ "TenantBoundary": [ { "hierarchyType": { - "code": "ADMIN", - "name": "ADMIN" + "code": "REVENUE", + "name": "REVENUE" }, "boundary": { "id": 1, @@ -77,6 +77,82 @@ } ] } + }, + { + "hierarchyType": { + "code": "ADMIN", + "name": "ADMIN" + }, + "boundary": { + "id": 1, + "boundaryNum": 1, + "name": "Punjab", + "localname": "Punjab", + "longitude": null, + "latitude": null, + "label": "State", + "code": "ST", + "children": [ + { + "id": "1c7d8d00-7678-4fd4-8aa2-2802dbb7249b", + "boundaryNum": 1, + "name": "ZONE_NORTH", + "localname": "ZONE_NORTH", + "longitude": null, + "latitude": null, + "label": "ZONE", + "code": "Z1", + "children": [ + { + "id": "1c5dbabd-e04a-44e1-ac27-1fea19fac28f", + "boundaryNum": 1, + "name": "C1-Roopnagar", + "localname": "C1-Roopnagar", + "longitude": null, + "latitude": null, + "label": "CIRCLE", + "code": "C1", + "children": [ + { + "id": "1c7d8d00-7678-4fd4-8dd2-2802daa7249b", + "boundaryNum": 1, + "name": "D1-Roopnagar", + "localname": "D1-Roopnagar", + "longitude": null, + "latitude": null, + "label": "DVISION", + "code": "D1", + "children": [ + { + "id": "1c7d8d00-7678-4fd4-8dd2-2802dbb7249b", + "boundaryNum": 1, + "name": "SD1-Roopnagar", + "localname": "SD1-Roopnagar", + "longitude": null, + "latitude": null, + "label": "SUBDVISION", + "code": "SD1", + "children": [ + { + "id": "1c7d8d00-7678-4fd4-8aa2-2802dbb7249b", + "boundaryNum": 1, + "name": "SEC1-Roopnagar", + "localname": "SEC1-Roopnagar", + "longitude": null, + "latitude": null, + "label": "SECTION", + "code": "SEC1" + } + ] + } + ] + } + ] + } + ] + } + ] } + } ] } \ No newline at end of file diff --git a/data/pb/tenant/citymodule.json b/data/pb/tenant/citymodule.json index e111453606..6cbab0799e 100644 --- a/data/pb/tenant/citymodule.json +++ b/data/pb/tenant/citymodule.json @@ -12,6 +12,26 @@ "code": "pb" } ] + }, + { + "module": "HRMS", + "code": "HRMS", + "active": true, + "order": 4, + "tenants": [ + { + "code": "pb.lodhipur" + }, + { + "code": "pb.massewal" + }, + { + "code": "pb.testing" + }, + { + "code": "pb.abianakalan" + } + ] } ] } diff --git a/data/pb/tenant/tenants.json b/data/pb/tenant/tenants.json index 1b98001791..d0f750523f 100644 --- a/data/pb/tenant/tenants.json +++ b/data/pb/tenant/tenants.json @@ -399,6 +399,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV1", + "divisionName": "Division 1", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, @@ -504,6 +506,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV2", + "divisionName": "Division 2", "OfficeTimings": { "Mon - Fri": "9.00 AM - 6.00 PM" }, @@ -714,6 +718,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV2", + "divisionName": "Division 2", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, @@ -784,6 +790,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV2", + "divisionName": "Division 2", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, @@ -1554,6 +1562,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV3", + "divisionName": "Division 3", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, @@ -1799,6 +1809,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV1", + "divisionName": "Division 1", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, @@ -1869,6 +1881,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV3", + "divisionName": "Division 3", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, @@ -2884,6 +2898,8 @@ "twitterUrl": null, "facebookUrl": null, "emailId": "", + "divisionCode": "DIV1", + "divisionName": "Division 1", "OfficeTimings": { "Mon - Fri": "9.00 AM - 5.00 PM" }, diff --git a/data/pb/ws-services-masters/WSServiceRoles.json b/data/pb/ws-services-masters/WSServiceRoles.json new file mode 100644 index 0000000000..25e0b9df53 --- /dev/null +++ b/data/pb/ws-services-masters/WSServiceRoles.json @@ -0,0 +1,56 @@ +{ + "tenantId": "pb", + "moduleName": "ws-services-masters", + "WSServiceRoles": [ + { + "code": "EMPLOYEE", + "name": "Employee", + "description": "Default role for all employees" + }, + { + "code": "SYSTEM", + "name": "System user", + "description": "System user role" + }, + { + "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" + }, + { + "code": "PROFILE_UPDATE", + "name": "Profile update", + "description": "Who has a access to update their own profile data" + }, + { + "code": "DIV_ADMIN", + "name": "DIVISION ADMIN", + "description": "Used for Internal team Debug" + }, + { + "code":"HRMS_ADMIN", + "name":"HRMS_ADMIN", + "description":"hrms admin" + } + ] +} \ No newline at end of file