Merge branch 'develop' of https://github.com/egovernments/punjab-mgra…

…mseva into ISTE-8
egovernments · Apr 24, 2024 · c027c07 · c027c07
2 parents 5a30509 + ac7bad3
commit c027c07
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 18 deletions.
diff --git a/frontend/mgramseva/lib/utils/role_actions.dart b/frontend/mgramseva/lib/utils/role_actions.dart
@@ -89,19 +89,19 @@ class RoleActionsFiltering {
     switch (route) {
       // GP Admin
       case Routes.HOUSEHOLD:
-        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY' ,'REVENUE_COLLECTOR'];
+        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY' ,'REVENUE_COLLECTOR'];
 
       case Routes.CONSUMER_UPDATE:
-        return ['GP_ADMIN', 'SUPERUSER', 'COLLECTION_OPERATOR', 'DIV_ADMIN','SARPANCH','SECRETORY' ,'REVENUE_COLLECTOR'];
+        return ['GP_ADMIN', 'SUPERUSER', 'COLLECTION_OPERATOR', 'DIV_ADMIN','SARPANCH','SECRETARY' ,'REVENUE_COLLECTOR'];
 
       case Routes.CONSUMER_SEARCH_UPDATE:
-        return ['GP_ADMIN', 'SUPERUSER', 'COLLECTION_OPERATOR', 'DIV_ADMIN','SARPANCH','SECRETORY' ,'REVENUE_COLLECTOR'];
+        return ['GP_ADMIN', 'SUPERUSER', 'COLLECTION_OPERATOR', 'DIV_ADMIN','SARPANCH','SECRETARY' ,'REVENUE_COLLECTOR'];
 
       case Routes.CONSUMER_CREATE:
-        return ['GP_ADMIN', 'SUPERUSER', 'COLLECTION_OPERATOR', 'DIV_ADMIN','SARPANCH','SECRETORY', 'REVENUE_COLLECTOR'];
+        return ['GP_ADMIN', 'SUPERUSER', 'COLLECTION_OPERATOR', 'DIV_ADMIN','SARPANCH','SECRETARY', 'REVENUE_COLLECTOR'];
 
       case Routes.HOUSEHOLD_DETAILS:
-        return ['BULK_DEMAND_PROCESSING', 'COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY','REVENUE_COLLECTOR'];
+        return ['BULK_DEMAND_PROCESSING', 'COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY','REVENUE_COLLECTOR'];
 
       case Routes.SEARCH_CONSUMER_RESULT:
         return [
@@ -111,36 +111,36 @@ class RoleActionsFiltering {
           'SUPERUSER',
           'DIV_ADMIN',
           'SARPANCH',
-          'SECRETORY'
+          'SECRETARY'
           'REVENUE_COLLECTOR'
         ];
 
       case Routes.HOUSEHOLD_REGISTER:
-        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY','REVENUE_COLLECTOR'];
+        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY','REVENUE_COLLECTOR'];
 
       // Expense Processing
       case Routes.EXPENSE_SEARCH:
-        return ['EXPENSE_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY'];
+        return ['EXPENSE_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY'];
       case Routes.EXPENSES_ADD:
-        return ['EXPENSE_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY'];
+        return ['EXPENSE_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY'];
       case Routes.EXPENSE_UPDATE:
-        return ['EXPENSE_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY'];
+        return ['EXPENSE_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY'];
       case Routes.HOUSEHOLDRECEIPTS:
-        return ['BULK_DEMAND_PROCESSING', 'COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY','REVENUE_COLLECTOR'];
+        return ['BULK_DEMAND_PROCESSING', 'COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY','REVENUE_COLLECTOR'];
 
       case Routes.MANUAL_BILL_GENERATE:
-        return ['BULK_DEMAND_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY'];
+        return ['BULK_DEMAND_PROCESSING', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY'];
 
       // Collection Operator
       case Routes.CONSUMER_SEARCH:
-        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','REVENUE_COLLECTOR','SARPANCH','SECRETORY','REVENUE_COLLECTOR'];
+        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','REVENUE_COLLECTOR','SARPANCH','SECRETARY','REVENUE_COLLECTOR'];
       case Routes.BILL_GENERATE:
-        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETORY','REVENUE_COLLECTOR'];
+        return ['COLLECTION_OPERATOR', 'SUPERUSER', 'DIV_ADMIN','SARPANCH','SECRETARY','REVENUE_COLLECTOR'];
 
       case Routes.DASHBOARD:
-        return ['SUPERUSER', 'DASHBOARD_VIEWER', 'GP_ADMIN', 'DIV_ADMIN','SARPANCH','SECRETORY','REVENUE_COLLECTOR'];
+        return ['SUPERUSER', 'DASHBOARD_VIEWER', 'GP_ADMIN', 'DIV_ADMIN','SARPANCH','SECRETARY','REVENUE_COLLECTOR'];
       case Routes.REPORTS:
-        return ['SUPERUSER', 'DASHBOARD_VIEWER', 'GP_ADMIN', 'DIV_ADMIN','SARPANCH''SECRETORY','REVENUE_COLLECTOR'];
+        return ['SUPERUSER', 'DASHBOARD_VIEWER', 'GP_ADMIN', 'DIV_ADMIN','SARPANCH''SECRETARY','REVENUE_COLLECTOR'];
       default:
         return [];
     }

diff --git a/...ro-ui-internals/packages/modules/core/src/pages/employee/ChangePassword/changePassword.js b/...ro-ui-internals/packages/modules/core/src/pages/employee/ChangePassword/changePassword.js
@@ -54,6 +54,8 @@ const ChangePasswordComponent = ({ config: propsConfig, t }) => {
       }
       const requestData = {
         ...data,
+        username:mobileNumber,
+
         otpReference: otp,
         tenantId,
         type: getUserType().toUpperCase(),

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/Inbox.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/Inbox.js
@@ -28,7 +28,7 @@ const Inbox = ({ parentRoute, businessService = "HRMS", initialStates = {}, filt
 
   let roles = STATE_ADMIN
     ? { roles: "DIV_ADMIN, HRMS_ADMIN", isStateLevelSearch: true }
-    : { roles: "SYSTEM, GP_ADMIN, COLLECTION_OPERATOR, PROFILE_UPDATE, DASHBOAD_VIEWER", isStateLevelSearch: false };
+    : { roles: "SYSTEM, GP_ADMIN, COLLECTION_OPERATOR, PROFILE_UPDATE, DASHBOAD_VIEWER, SARPANCH, REVENUE_COLLECTOR, SECRETARY", isStateLevelSearch: false };
 
   let requestBody = {
     criteria: {

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Password.js b/frontend/micro-ui/web/micro-ui-internals/packages/react-components/src/atoms/Password.js
@@ -27,7 +27,7 @@ const Password = (props) => {
                         ref={props.inputRef}
                         value={props.value}
                         style={{ ...props.style }}
-                        minLength={props.minlength || 10}
+                        minLength={props.minlength}
                         maxLength={props.maxlength || 10}
                         max={props.max}
                         min={props.min}