Merge pull request #2682 from Rushikesh-Sonawane99/release-1.15.0

Issue #PS-6430 chore: Changes in Batch Type for SCP in lap and lmp

Author: rushi-tekdi

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

@@ -149,20 +149,21 @@ const BatchFlow: React.FC<BatchFlowProps> = ({
     // Modify batch_type based on centerType
     if (centerType && alterSchema?.properties?.batch_type) {
       if (centerType === 'remote') {
-        // For remote center: show only "remote" option
-        alterSchema.properties.batch_type.enum = ['remote'];
-        alterSchema.properties.batch_type.enumNames = ['REMOTE'];
+        // For remote center: show "remote" and "hybrid" options
+        alterSchema.properties.batch_type.enum = ['remote', 'hybrid'];
+        alterSchema.properties.batch_type.enumNames = ['REMOTE', 'HYBRID'];
         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'];
         }
+      } else if (centerType === 'regular') {
+        // For regular center: show only "regular" option (disabled)
+        alterSchema.properties.batch_type.enum = ['regular'];
+        alterSchema.properties.batch_type.enumNames = ['REGULAR'];
+        alterSchema.properties.batch_type.default = 'regular';
+        if (alterUiSchema?.batch_type) {
+          alterUiSchema.batch_type['ui:disabled'] = true;
+        }
       }
     }
 
@@ -374,8 +375,8 @@ 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';
+        if (centerType === 'regular') {
+          tempFormData.batch_type = 'regular';
         }
         setPrefilledAddFormData(tempFormData);
         setIsEdit(true);

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

@@ -118,12 +118,12 @@ export const BatchCreateSchema = {
       enum: [
         'remote',
         'regular',
-        'contact',
+        'hybrid',
       ],
       enumNames: [
         'REMOTE',
         'REGULAR',
-        'CONTACT',
+        'HYBRID',
       ],
     },
   },

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

@@ -688,6 +688,7 @@
     "DESIGNATION": "Designation",
     "REGULAR": "Regular",
     "REMOTE": "Remote",
+    "HYBRID": "Hybrid",
     "NOTE_THIS_WILL_BE_CENTER_NAME": "Note : This will be center name",
     "STATE": "State",
     "DISTRICT": "District",

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

@@ -587,31 +587,22 @@ const CentersPage = () => {
     const ct = (params.centerType || '').toLowerCase();
     if (schema?.properties?.batch_type) {
       if (ct === 'remote') {
-        schema.properties.batch_type.enum = ['remote'];
-        schema.properties.batch_type.enumNames = ['REMOTE'];
+        // For remote center: show "remote" and "hybrid" options
+        schema.properties.batch_type.enum = ['remote', 'hybrid'];
+        schema.properties.batch_type.enumNames = ['Remote', 'Hybrid'];
         schema.properties.batch_type.default = 'remote';
         prefill.batch_type = 'remote';
+        ensureEnabled('batch_type');
+      } else if (ct === 'regular') {
+        // For regular center: show only "regular" option (disabled)
+        schema.properties.batch_type.enum = ['regular'];
+        schema.properties.batch_type.enumNames = ['Regular'];
+        schema.properties.batch_type.default = 'regular';
+        prefill.batch_type = 'regular';
         uiSchema.batch_type = {
           ...(uiSchema?.batch_type || {}),
           'ui:disabled': true,
         };
-      } else if (ct === 'regular') {
-        // Only restrict if enum exists; otherwise leave as-is.
-        const existingEnum = Array.isArray(schema.properties.batch_type.enum)
-          ? schema.properties.batch_type.enum
-          : null;
-        if (existingEnum) {
-          const allowed = ['regular', 'contact'].filter((v) =>
-            existingEnum.includes(v)
-          );
-          if (allowed.length) {
-            schema.properties.batch_type.enum = allowed;
-            schema.properties.batch_type.enumNames = allowed.map((v) =>
-              v.toUpperCase()
-            );
-          }
-        }
-        ensureEnabled('batch_type');
       }
     }