Merge pull request #2564 from tekdi/feat-direct-enroll

Feat direct enroll to prod register

Author: rushi-tekdi

apps/learner-web-app/src/components/Content/Player.tsx

@@ -74,6 +74,8 @@ const App = ({
   useEffect(() => {
     const fetch = async () => {
       const response = await fetchContent(identifier);
+      setItem({ content: response });
+
       const rt = (await hierarchyAPI(courseId as string)) as any;
       console.log('rt=======>', rt);
       const currentPath =
@@ -117,7 +119,8 @@ const App = ({
       console.log('response2=======>', mimeType);
 
       setMemetype(mimeType);
-      setItem({ content: response });
+      console.log('setItem=======>', response);
+
       if (unitId) {
         const course = await hierarchyAPI(courseId as string);
         const breadcrum = findCourseUnitPath({

apps/learner-web-app/src/components/themantic/footer/Footer.tsx

@@ -214,7 +214,7 @@ const Footer = () => {
               textAlign: 'center',
             }}
           >
-            © 2025 Pratham
+            © {new Date().getFullYear()} Pratham
           </Typography>
         </Box>
       </Box>

mfes/content/src/components/Content/List.tsx

@@ -653,17 +653,20 @@ export default function Content(props: Readonly<ContentProps>) {
           })
         );
         persistFilters(localFilters);
+        
+        const activeLink = window.location.pathname + window.location.search;
+        
         if (propData?.handleCardClick) {
           propData.handleCardClick(content, e, rowNumber);
         } else if (SUPPORTED_MIME_TYPES.includes(content?.mimeType)) {
           router.push(
             `${props?._config?.contentBaseUrl ?? ''}/player/${content?.identifier
-            }?activeLink=${window.location.pathname + window.location.search}`
+            }?activeLink=${encodeURIComponent(activeLink)}`
           );
         } else {
           router.push(
             `${props?._config?.contentBaseUrl ?? ''}/content-details/${content?.identifier
-            }?activeLink=${window.location.pathname + window.location.search}`
+            }?activeLink=${encodeURIComponent(activeLink)}`
           );
         }
       } catch (error) {

mfes/scp-teacher-repo/src/components/PlannedSession.tsx

@@ -221,7 +221,7 @@ const PlannedSession: React.FC<PlannedModalProps> = ({
           // });
 
           // const courseSubjectLists = getSubjects.map((subject: any) => {
-          const commonAssociations = getSubjects?.filter(
+          const commonAssociations = getSubjects?.filter((subject: any) => subject?.status !== "Retired")?.filter(
             (assoc: any) =>
               // matchState?.associations.filter(
               //   (item: any) => item.code === assoc.code

mfes/scp-teacher-repo/src/pages/centers/[cohortId]/events/[date]/index.tsx

@@ -213,17 +213,18 @@ const EventMonthView: React.FC<any> = () => {
             const medium = cohortData.customField.find(
               (item: CustomField) => item.label === 'MEDIUM'
             );
-            setMedium(medium?.selectedValues?.[0]?.value || '');
+            console.log("medium=====>", medium?.selectedValues[0]);
+            setMedium(medium?.selectedValues?.[0] || '');
 
             const grade = cohortData.customField.find(
               (item: CustomField) => item.label === 'GRADE'
             );
-            setGrade(grade?.selectedValues?.[0]?.value || '');
+            setGrade(grade?.selectedValues?.[0] || '');
 
             const board = cohortData.customField.find(
               (item: CustomField) => item.label === 'BOARD'
             );
-            setBoard(board?.selectedValues?.[0]?.value || '');
+            setBoard(board?.selectedValues?.[0] || '');
           }
           // setCohortDetails(cohortData);
           // setCohortName(cohortData?.name);