Revert "conflicts solved"

This reverts commit 9e7e84d, reversing
changes made to dfad5ba.

Author: rushi-tekdi

apps/admin-app-repo/public/Sample.csv

@@ -1,6 +1,5 @@
 name,externalId,type,hasAParentTask,parentTaskId,learningResources1-name,learningResources1-type,learningResources1-id,learningResources2-name,learningResources2-type,learningResources2-id,startDate,endDate
-Chapter 1: Real Numbers Clas 6,1,content,,,,,,,,,,
-Introduction to Real Numbers,2,content,YES,1,Real Numbers – Video,prerequisite,do_2141830551647928321130,Real Numbers – Assessment,postrequisite,do_2141829595245281281142,,
-Euclid’s Division Lemma,3,content,YES,1,Euclids Formula – Youtube,prerequisite,do_2141830572373852161134,Euclids Formula – EPUB,postrequisite,do_2141830562205204481132,,
-The Fundamental Theorem of Arithmetic,4,content,YES,1,Fundamental Therom – PDF,facilitator-requisite,do_2141830485434695681127,,,,,
-During Course,5,content,YES,1,Fundamental Therom – PDF,during,do_2141830485434695681127,,,,,
+Chapter 1: Real Numbers Clas 6,1,content,,,,,,,,,10-02-2025,11-02-2025
+Introduction to Real Numbers,2,content,YES,1,Real Numbers – Video,prerequisite,do_2141830551647928321130,Real Numbers – Assessment,postrequisite,do_2141829595245281281142,07-02-2025,11-02-2025
+Euclid’s Division Lemma,3,content,YES,1,Euclids Formula – Youtube,prerequisite,do_2141830572373852161134,Euclids Formula – EPUB,postrequisite,do_2141830562205204481132,10-02-2025,11-02-2025
+The Fundamental Theorem of Arithmetic,4,content,YES,1,Fundamental Therom – PDF,facilitator-requisite,do_2141830485434695681127,,,,10-02-2025,11-02-2025

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

@@ -166,10 +166,7 @@
     "ACTIVATE_USER": "Activate User",
     "ACTIVATE": "Activate",
     "RESIGNED_FROM_COMPANY": "Resigned from the company",
-    "MOVED_TO_DIFFERENT_ROLE": "Moved to a different role",
-    "NO_MOBILIZER_FOUND": "No Mobilizer Found",
-    "MAP": "Map",
-    "NEXT": "Next"
+    "MOVED_TO_DIFFERENT_ROLE":"Moved to a different role"
   },
   "LOGIN_PAGE": {
     "USERNAME": "Username",
@@ -245,8 +242,7 @@
     "PROGRAMS": "Programs",
     "SKILLING_CENTERS": "Skilling Centers",
     "CURRICULUM_PLANNER": "Curriculum Planner",
-    "BATCH": "Batch",
-    "MOBILIZER": "Mobilizer"
+    "BATCH": "Batch"
   },
   "FACILITATORS": {
     "STATE": "State",
@@ -282,7 +278,8 @@
     "EDIT_LEARNER": "Edit Learner",
     "NO_LEARNERS_FOUND": "No Learners Found",
     "RE_ASSIGN_LEARNER": "Re-assign Learner",
-    "ACTIVATE_USER_SUCCESS": "User has been successfully activated"
+               "ACTIVATE_USER_SUCCESS": "User has been successfully activated"
+
   },
   "MENTOR_LEADERS": {
     "SEARCHBAR_PLACEHOLDER": "Search Center Heads..",
@@ -361,8 +358,8 @@
     "DELETE_PLANNER": "Delete Planner",
     "CSV_TEMPLATE": "CSV Template",
     "NEW_TOPIC": "New Topic",
-    "DOWNLOAD_CSV": "Download Uploaded CSV",
-    "DURING_COURSE": "During Course"
+        "DOWNLOAD_CSV": "Download Uploaded CSV"
+   
 
   },
   "MASTER": {
@@ -386,6 +383,7 @@
     "BLOCK_CODE": "Block Code",
     "CODE": "Code",
     "MASTER": "Master"
+    
   },
   "CENTERS": {
     "CENTER": "center",
@@ -545,10 +543,8 @@
     "MOTHER_NAME": "Mother Name",
     "DATE_OF_BIRTH": "Date of Birth",
     "TEST_BELONG_TO": "test belongs to below center",
-    "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"
+         "WAS_BELONG_TO": "was archived in the below location",
+    "CONFIRM_TO_ACTIVATE":"Are you sure you want to activate this user again?"
   },
   "FORM_ERROR_MESSAGES": {
     "INVALID_INPUT": "Invalid Input.",
@@ -603,9 +599,7 @@
     "COURSE_STATUS": "Course Status",
     "ISSUED_DATE": "Issued Date",
     "USER_ID": "User Id",
-    "COURSE_ID": "Course Id",
-    "LOCATION": "Location (State / District / Block / Village)",
-    "WORKING_VILLAGE": "Working Village"
+    "COURSE_ID": "Course Id"
   },
   "WORKSPACE": {
     "EDITOR_WORKSPACE": "Editor Workspace",
@@ -756,7 +750,6 @@
   "REMOTE": "Remote",
   "IS_VOLUNTEER": "Is Volunteer",
   "middle_name": "Middle Name",
-  "CATCHMENT_AREA": "Catchment Area",
   "CONTENT_CREATORS": {
     "SEARCHBAR_PLACEHOLDER": "Search content creator..",
     "NEW_CONTENT_CREATOR": "New Content Creator",
@@ -850,24 +843,5 @@
     "DO_YOU_WANT_TO_UNMARK_AS_VOLUNTEER": "Do you want to unmark as a volunteer",
     "UNMARK_AS_VOLUNTEER_SUCCESSFULLY": "Unmarked as volunteer successfully",
     "UNMARK_AS_VOLUNTEER_FAILED": "Failed to unmark as volunteer"
-  },
-  "MOBILIZER": {
-    "ACTIVATE_USER_SUCCESS": "User has been successfully activated",
-    "MOBILIZER_UPDATED_SUCCESSFULLY": "Mobilizer has been successfully updated!",
-    "NOT_ABLE_UPDATE_MOBILIZER": "Not able to update Mobilizer",
-    "MOBILIZER_CREATED_SUCCESSFULLY": "Mobilizer has been successfully created!",
-    "NOT_ABLE_CREATE_MOBILIZER": "Not able to create Mobilizer",
-    "USER_CREDENTIALS_WILL_BE_SEND_SOON": "Mobilizer is created, credentials will be sent soon",
-    "MAP_USER_AS_LEAD": "Map User as Lead",
-    "MAP_USER_AS_MOBILIZER": "Map User as Mobilizer",
-    "PLEASE_SEARCH_AND_SELECT_USER": "Please search and select a user",
-    "UNKNOWN_STATE": "Unknown State",
-    "UNKNOWN_DISTRICT": "Unknown District",
-    "UNKNOWN_BLOCK": "Unknown Block",
-    "WORKING_LOCATION_REQUIRED": "Working location is required. Please select villages for all blocks.",
-    "WORKING_LOCATION_REQUIRED_MISSING_VILLAGES": "Working location is required. Please select villages for all blocks. Missing villages in: {{blocks}} and {{count}} more block(s).",
-    "WORKING_LOCATION_REQUIRED_MISSING_VILLAGES_SINGLE": "Working location is required. Please select villages for all blocks. Missing villages in: {{blocks}}.",
-    "WORKING_LOCATION_REQUIRED_AT_LEAST_ONE": "Working location is required. Please select at least one village in all blocks.",
-    "MOBILIZER_NAME": "Mobilizer Name"
   }
 }

apps/admin-app-repo/src/components/CoursePlan/CoursePlanForm.tsx

@@ -1018,9 +1018,6 @@ const CoursePlanForm: React.FC<CoursePlanFormProps> = ({
                                   <option value="facilitator-requisite">
                                     {t('Facilitator-requisite')}
                                   </option>
-                                  <option value="during">
-                                    {t('During')}
-                                  </option>
                                 </Select>
                               </FormControl>
                             </Grid>

apps/admin-app-repo/src/components/DynamicForm/DynamicFormCallback.ts

@@ -67,7 +67,7 @@ export const searchListData = async (
     // status: [Status.ACTIVE],
     ...Object.entries(restFormData).reduce((acc, [key, value]) => {
       if (value !== undefined && value !== '') {
-        if (key === 'tenantStatus' || key === 'status') {
+        if (key === 'status') {
           acc[key] = [value];
         } else if (key === 'name' && typeof value === 'string') {
           acc[key] = value.trimEnd();

apps/admin-app-repo/src/components/DynamicForm/DynamicFormConstant.ts

@@ -42,9 +42,6 @@ export const FormContext = {
   youth: {
     context: 'USERS',
     contextType: 'Learner'
-  },
-  mobilizer: {
-    context: 'USERS',
-    contextType: 'MOBILIZER'
   }
+
 };

apps/admin-app-repo/src/components/LearnerCourses/CourseTable.tsx

@@ -207,7 +207,7 @@ const CourseTable: React.FC = () => {
         let response;
         if (searchKeyword !== '')
           response = await courseWiseLernerList({ limit, offset, filters });
-        else response = await courseWiseLernerList({ limit,offset, filters });
+        else response = await courseWiseLernerList({ offset, filters });
         const totalCount = response.count;
         setPageCount(Math.ceil(totalCount / pageLimit));
 

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

@@ -45,7 +45,7 @@ const RouteGuard: React.FC<{ children: React.ReactNode }> = ({ children }) => {
     const user = JSON.parse(adminInfo);
 
     const allowedPaths = ["/workspace","/course-planner", "/subjectDetails","/stateDetails" ];
-    const notAllowedPathsForCentralAdmin = ["/team-leader", "/faciliator", "/learners", "/centers", "/certificate-issuance", "/mentor", "/central-head", "/user-leader" ];
+    const notAllowedPathsForCentralAdmin = ["/team-leader", "/faciliator", "/learners", "/centers", "/certificate-issuance", "/mentor", "/central-head"  ];
 
     const isWorkspaceContent = router.pathname.startsWith("/workspace");
     const coursePlannerPaths = [

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

@@ -37,7 +37,7 @@ const SimpleModal: React.FC<SimpleModalProps> = ({
   footer,
   children,
   modalTitle,
-  isFullwidth = true,
+  isFullwidth = false,
   id = '',
 }) => {
   const theme = useTheme<any>();
@@ -47,19 +47,18 @@ const SimpleModal: React.FC<SimpleModalProps> = ({
   const modalStyle: SxProps<Theme> = {
     display: 'flex',
     flexDirection: 'column',
-    position: isFullwidth ? 'fixed' : 'absolute',
-    top: isFullwidth ? 0 : '50%',
-    left: isFullwidth ? 0 : '50%',
-    transform: isFullwidth ? 'none' : 'translate(-50%, -50%)',
-    width: isFullwidth ? '100vw' : '40%',
-    maxWidth: isFullwidth ? '100vw' : '40%',
-    height: isFullwidth ? '100vh' : 'auto',
-    maxHeight: isFullwidth ? '100vh' : '80vh',
+    position: 'absolute',
+    top: '50%',
+    left: '50%',
+    transform: 'translate(-50%, -50%)',
+    width: isFullwidth ? '96%' : '40%',
+    maxWidth: isFullwidth ? '96%' : '40%',
+    height: isFullwidth ? '96vh' : 'auto',
+    maxHeight: isFullwidth ? '96vh' : '80vh',
     backgroundColor: 'rgb(255, 255, 255)',
-    borderRadius: isFullwidth ? 0 : '8px',
+    borderRadius: '8px',
     boxShadow:
       'rgba(0, 0, 0, 0.2) 0px 3px 5px -1px, rgba(0, 0, 0, 0.14) 0px 5px 8px 0px, rgba(0, 0, 0, 0.12) 0px 1px 14px 0px',
-    overflow: 'hidden',
   };
 
   const titleStyle = isFullwidth