Merge pull request #2484 from tekdi/release-1.13.0-qa-feat

Release 1.13.0 qa feat to teacher qa

Author: rushi-tekdi

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

@@ -424,7 +424,9 @@
     "BATCH_CREATED_SUCCESSFULLY": "Batch Created successfully",
     "BATCH_UPDATE_FAILED": "Something went wrong while updating batch",
     "YOU_CANT_DELETE_BATCH_HAS_ACTIVE_LEARNERS": "You can't delete the batch because it has {{activeMembers}} Active Learners",
-    "NO_BATCH_FOUND": "No Batch Found"
+    "NO_BATCH_FOUND": "No Batch Found",
+    "TYPE_OF_BATCH": "Type of Batch",
+    "BATCH_CREATE_FAILED": "Something went wrong while creating batch"
   },
   "FORM": {
     "FULL_NAME": "Full Name",
@@ -488,6 +490,7 @@
     "DESIGNATION": "Designation",
     "REGULAR": "Regular",
     "REMOTE": "Remote",
+    "CONTACT": "Contact",
     "NOTE_THIS_WILL_BE_CENTER_NAME": "Note : This will be center name",
     "STATE": "State",
     "DISTRICT": "District",
@@ -721,6 +724,7 @@
   "email": "Email",
   "UNIT_NAME": "Unit Name",
   "TYPE_OF_CENTER": "Type of Center",
+  "TYPE_OF_BATCH": "Type of Batch",
   "MY_MAIN_SUBJECTS": "Main subjects",
   "LIFE_SKILLS": "Life Skills",
   "ENGLISH": "English",

apps/admin-app-repo/src/components/BatchFlow/BatchFlow.tsx

@@ -44,13 +44,15 @@ interface BatchFlowProps {
   centerBoards?: string[];
   centerMediums?: string[];
   centerGrades?: string[];
+  centerType?: string | null;
 }
 
 const BatchFlow: React.FC<BatchFlowProps> = ({
   initialParentId,
   centerBoards = [],
   centerMediums = [],
   centerGrades = [],
+  centerType = null,
 }) => {
   const theme = useTheme<any>();
   const [isLoading, setIsLoading] = useState(false);
@@ -144,6 +146,24 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
     overrideEnum('medium', centerMediums);
     overrideEnum('grade', centerGrades);
 
+    // Modify batch_type based on centerType
+    if (centerType && alterSchema?.properties?.batch_type) {
+      if (centerType === 'remote') {
+        // For remote center: set default to "remote" and disable the field
+        alterSchema.properties.batch_type.default = 'remote';
+        if (alterUiSchema?.batch_type) {
+          alterUiSchema.batch_type['ui:disabled'] = true;
+        }
+      } else if (centerType === 'regular') {
+        // For regular center: show only "regular" and "contact" options
+        alterSchema.properties.batch_type.enum = ['regular', 'contact'];
+        alterSchema.properties.batch_type.enumNames = ['REGULAR', 'CONTACT'];
+        if (alterUiSchema?.batch_type?.['ui:disabled']) {
+          delete alterUiSchema.batch_type['ui:disabled'];
+        }
+      }
+    }
+
     if (!isEditMode) {
       if (centerBoards?.length === 1 && alterUiSchema?.board) {
         alterUiSchema.board['ui:disabled'] = true;
@@ -188,7 +208,7 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
     );
     setPrefilledFormData(withParent);
     fetchData();
-  }, [initialParentId]);
+  }, [initialParentId, centerType, centerBoards, centerMediums, centerGrades]);
 
   const updatedUiSchema = {
     ...uiSchema,
@@ -351,6 +371,10 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
         };
         buildSchemaAndUi(true, existingValues);
         let tempFormData = extractMatchingKeys(row, addSchema);
+        // Force batch_type to "remote" if centerType is "remote"
+        if (centerType === 'remote') {
+          tempFormData.batch_type = 'remote';
+        }
         setPrefilledAddFormData(tempFormData);
         setIsEdit(true);
         setEditableUserId(row?.cohortId);
@@ -419,7 +443,7 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
   const failureUpdateMessage = 'BATCH.BATCH_UPDATE_FAILED';
   const successCreateMessage = 'BATCH.BATCH_CREATED_SUCCESSFULLY';
   const telemetryCreateKey = 'batch-created-successfully';
-  const failureCreateMessage = 'BATCH.BATCH_UPDATE_FAILED';
+  const failureCreateMessage = 'BATCH.BATCH_CREATE_FAILED';
 
   return (
     <>
@@ -461,6 +485,11 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
               if (centerGrades?.length === 1)
                 prefillWithBMGS.grade = [centerGrades[0]];
 
+              // Prefill batch_type for remote center
+              if (centerType === 'remote') {
+                prefillWithBMGS.batch_type = 'remote';
+              }
+
               buildSchemaAndUi(false);
 
               setPrefilledAddFormData(prefillWithBMGS);

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

@@ -108,12 +108,30 @@ export const BatchCreateSchema = {
       field_type: 'text',
       pattern: '^[a-zA-Z][a-zA-Z ]*[a-zA-Z]$',
     },
+    batch_type: {
+      type: 'string',
+      title: 'Type of Batch',
+      coreField: 0,
+      fieldId: '0417d8fd-47ae-4ec4-9b3b-3f8fdca31625',
+      field_type: 'radio',
+      isRequired: true,
+      enum: [
+        'remote',
+        'regular',
+        'contact',
+      ],
+      enumNames: [
+        'REMOTE',
+        'REGULAR',
+        'CONTACT',
+      ],
+    },
   },
-  required: ['board', 'medium', 'grade', 'name'],
+  required: ['board', 'medium', 'grade', 'name', 'batch_type'],
 };
 
 export const BatchCreateUISchema = {
-  'ui:order': ['board', 'medium', 'grade', 'name'],
+  'ui:order': ['board', 'medium', 'grade', 'name', 'batch_type'],
   board: {
     'ui:widget': 'AutoCompleteMultiSelectWidget',
     'ui:options': {
@@ -145,4 +163,10 @@ export const BatchCreateUISchema = {
       hideError: true,
     },
   },
+  batch_type: {
+    'ui:widget': 'CustomRadioWidget',
+    'ui:options': {
+      hideError: true,
+    },
+  },
 };

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

@@ -391,7 +391,7 @@ const Batch = () => {
   const failureUpdateMessage = 'BATCH.BATCH_UPDATE_FAILED';
   const successCreateMessage = 'BATCH.BATCH_CREATED_SUCCESSFULLY';
   const telemetryCreateKey = 'batch-created-successfully';
-  const failureCreateMessage = 'BATCH.BATCH_UPDATE_FAILED';
+  const failureCreateMessage = 'BATCH.BATCH_CREATE_FAILED';
 
   return (
     <>

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

@@ -471,6 +471,7 @@ const Centers = () => {
       callback: async (row: any) => {
         setSelectedCenter(row);
         setOpenBatchModal(true);
+        // console.log('row in view batch', row);
       },
       show: (row) => row.status !== 'archived',
     },
@@ -732,6 +733,11 @@ const Centers = () => {
                   (field: any) => field.label === 'GRADE'
                 )?.selectedValues || []
               }
+              centerType={
+                selectedCenter?.customFields?.find(
+                  (field: any) => field.label === 'TYPE_OF_CENTER'
+                )?.selectedValues?.[0]?.value || null
+              }
             />
           ) : null}
         </SimpleModal>

mfes/scp-teacher-repo/public/locales/en/common.json

@@ -993,7 +993,8 @@
     "BATCH_CREATED_SUCCESSFULLY": "Batch Created successfully",
     "BATCH_UPDATE_FAILED": "Something went wrong while updating batch",
     "YOU_CANT_DELETE_BATCH_HAS_ACTIVE_LEARNERS": "You can't delete the batch because it has {{activeMembers}} Active Learners",
-    "NO_BATCH_FOUND": "No Batch Found"
+    "NO_BATCH_FOUND": "No Batch Found",
+    "BATCH_CREATE_FAILED": "Something went wrong while creating batch"
   },
   "WHAT_IS_YOUR_PRIMARY_WORK": "What is Your Primary Work?",
   "STATE": "State",

mfes/scp-teacher-repo/src/pages/centers/index.tsx

@@ -768,7 +768,7 @@ const CentersPage = () => {
           extraFieldsUpdate={{}}
           successCreateMessage="BATCH.BATCH_CREATED_SUCCESSFULLY"
           telemetryCreateKey="batch-created-successfully"
-          failureCreateMessage="BATCH.BATCH_CREATION_FAILED"
+          failureCreateMessage="BATCH.BATCH_CREATE_FAILED"
           successUpdateMessage="BATCH.BATCH_UPDATED_SUCCESSFULLY"
           telemetryUpdateKey="batch-updated-successfully"
           failureUpdateMessage="BATCH.BATCH_UPDATE_FAILED"