Merge pull request #2577 from Rushikesh-Sonawane99/feat-batch-revamp

Issue #PS-6223 chore: Updated ordering of form fields in batch and center creation form

Author: rushi-tekdi

apps/admin-app-repo/public/locales/en/common.json

@@ -550,7 +550,8 @@
     "WAS_BELONG_TO": "was archived in the below location",
     "CONFIRM_TO_ACTIVATE": "Are you sure you want to activate this user again?",
     "WORKING_LOCATION": "Working Location",
-    "CATCHMENT_AREA": "Catchment Area"
+    "CATCHMENT_AREA": "Catchment Area",
+    "TYPE_OF_BATCH": "Type of Batch"
   },
   "FORM_ERROR_MESSAGES": {
     "INVALID_INPUT": "Invalid Input.",

apps/admin-app-repo/src/constant/Forms/BatchCreate.js

@@ -131,7 +131,7 @@ export const BatchCreateSchema = {
 };
 
 export const BatchCreateUISchema = {
-  'ui:order': ['board', 'medium', 'grade', 'name', 'batch_type'],
+  'ui:order': ['name', 'batch_type', 'board', 'medium', 'grade'],
   board: {
     'ui:widget': 'AutoCompleteMultiSelectWidget',
     'ui:options': {

apps/admin-app-repo/src/pages/centers.tsx

@@ -12,7 +12,7 @@ import SimpleModal from '@/components/SimpleModal';
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations';
 import editIcon from '../../public/images/editIcon.svg';
 import deleteIcon from '../../public/images/deleteIcon.svg';
-import MapIcon from '@mui/icons-material/Map';
+// import MapIcon from '@mui/icons-material/Map';
 import Image from 'next/image';
 import {
   extractMatchingKeys,
@@ -162,6 +162,22 @@ const Centers = () => {
 
       //set 2 grid layout
       let alterUISchema = responseForm?.uiSchema;
+      alterUISchema['ui:order'] = [
+        "name",
+        "center_type",
+        "state",
+        "district",
+        "block",
+        "village",
+        "address",
+        "image",
+        "google_map_link",
+        'industry',
+        "catchment_area",
+        "board",
+        "medium",
+        "grade",
+      ];
       alterUISchema = enhanceUiSchemaWithGrid(alterUISchema);
 
       setAddUiSchema(alterUISchema);
@@ -424,35 +440,35 @@ const Centers = () => {
 
   // Define actions
   const actions = [
-    {
-      icon: (
-        <Box
-          sx={{
-            display: 'flex',
-            flexDirection: 'column',
-            alignItems: 'center',
-            cursor: 'pointer',
-            // backgroundColor: 'rgb(227, 234, 240)',
-            justifyContent: 'center',
-            padding: '10px',
-          }}
-          title="Google Map Link"
-        >
-          <MapIcon />
-        </Box>
-      ),
-      callback: async (row: any) => {
-        window.open(
-          row.customFields.find((field) => field.label === 'GOOGLE_MAP_LINK')
-            ?.selectedValues,
-          '_blank',
-          'noopener,noreferrer'
-        );
-      },
-      show: (row) =>
-        row.customFields.find((field) => field.label === 'GOOGLE_MAP_LINK')
-          ?.selectedValues,
-    },
+    // {
+    //   icon: (
+    //     <Box
+    //       sx={{
+    //         display: 'flex',
+    //         flexDirection: 'column',
+    //         alignItems: 'center',
+    //         cursor: 'pointer',
+    //         // backgroundColor: 'rgb(227, 234, 240)',
+    //         justifyContent: 'center',
+    //         padding: '10px',
+    //       }}
+    //       title="Google Map Link"
+    //     >
+    //       <MapIcon />
+    //     </Box>
+    //   ),
+    //   callback: async (row: any) => {
+    //     window.open(
+    //       row.customFields.find((field) => field.label === 'GOOGLE_MAP_LINK')
+    //         ?.selectedValues,
+    //       '_blank',
+    //       'noopener,noreferrer'
+    //     );
+    //   },
+    //   show: (row) =>
+    //     row.customFields.find((field) => field.label === 'GOOGLE_MAP_LINK')
+    //       ?.selectedValues,
+    // },
     {
       icon: (
         <Box

libs/shared-lib-v2/src/lib/context/locales/en.json

@@ -70,6 +70,7 @@
   "UNEMPLOYED_HOUSEWIFE_DOMESTIC_WORK": "Unemployed, Housewife or Domestic Work",
   "WORKING_LOCATION": "Working Location",
   "CATCHMENT_AREA": "Catchment Area",
+  "TYPE_OF_BATCH": "Type of Batch",
   "SURVEYS": {
     "SURVEYS": "Surveys",
     "ACTIVE_SURVEYS": "Active Surveys",