Merge pull request #209 from upendraTekdi/updated_code_teacher_app

Task #224820: changes const language files,add cursor for review attendance, remove facilitator list, changes download app name from manifest

app.config.ts

@@ -83,6 +83,7 @@ export enum AssessmentType {
 
 // handle component by this condition
 export const ShowCenterSessionsTab = false;
+export const ShowFacilitatorListTab = false
 
 // menu drawer items
 export const ShowAssesment = false;

public/locales/en/common.json

@@ -3,9 +3,9 @@
     "LANGUAGE": "Language",
     "LOADING": "Loading",
     "MARK": "Mark",
-    "MARK_TO_LEARNER": "Mark To Learners",
+    "MARK_TO_LEARNER": "Mark To Student",
     "MARK_TO_SELF": "Mark To Self",
-    "MARK_FOR_LEARNER": "Mark For Learners",
+    "MARK_FOR_LEARNER": "Mark For Student",
     "MARK_FOR_SELF": "Mark For Self",
     "MARK_MY_ATTENDANCE": "Mark My Attendance",
     "MARK_CENTER_ATTENDANCE": "Mark Center Attendance",
@@ -16,9 +16,9 @@
     "UPDATE": "Update",
     "MODIFY": "Modify",
     "MODIFY_FOR_SELF": "Modify Self",
-    "MODIFY_FOR_LEARNER": "Modify Learners",
+    "MODIFY_FOR_LEARNER": "Modify Student",
     "CLEAR_ALL": "Clear All",
-    "SEARCH_STUDENT": "Search Learner",
+    "SEARCH_STUDENT": "Search Student",
     "SORT_BY": "Sort by",
     "APPLY": "Apply",
     "A_TO_Z": "A to Z",
@@ -49,8 +49,8 @@
     "LAST_SIX_MONTHS": "Last Six Months",
     "CUSTOM_RANGE": "Custom Range",
     "NONE": "None",
-    "LEARNERS": "Learners",
-    "LEARNER_NAME": "Learner Name",
+    "LEARNERS": "Students",
+    "LEARNER_NAME": "Student Name",
     "DATE_RANGE": "Date Range",
     "SELECT_AN_OPTION": "Select an option",
     "AND": "and",
@@ -80,26 +80,26 @@
     "REASON_FOR_ABSENT": "Reason for Absent",
     "SURE_LOGOUT": "Are you sure you want to Logout?",
     "SURE_UPDATE": "Are you sure you want to update this attendance?",
-    "SURE_REMOVE": "Are you sure you want to remove this learner?",
+    "SURE_REMOVE": "Are you sure you want to remove this Student?",
     "SURE_REASSIGN_CENTER": "Are you sure you want to re-assign center to this user?",
     "SURE_CLOSE": "Are you sure you want to close without saving?",
-    "LEARNER_LIST": "Learners List",
-    "FACILITATOR_LIST": "Facilitators List",
+    "LEARNER_LIST": "Student List",
+    "FACILITATOR_LIST": "Teacher List",
     "FILTERS": "Filters",
     "MANAGE_USERS": "Manage Users",
-    "FACILITATORS": "Facilitators",
+    "FACILITATORS": "Teachers",
     "CENTERS_ASSIGNED": "Centers Assigned in {{block}}",
     "REASSIGN_CENTERS": "Re-assign Center",
     "REASSIGN_BLOCKS": "Add or Re-assign Centers",
     "REASSIGN_BLOCKS_REQUEST": "Request to Re-assign Blocks",
     "ASSIGN": "Assign",
-    "SEARCH_FACILITATORS": "Search Facilitators..",
-    "ADD_LEARNER": "Add Learners",
+    "SEARCH_FACILITATORS": "Search Teachers..",
+    "ADD_LEARNER": "Add Student",
     "DESELECT_ALL": "Deselect All",
     "SELECT_ALL": "Select All",
-    "LEARNER_MARKED_DROPOUT": "Learner marked as dropout",
-    "LEARNER_UNMARKED_DROPOUT": "Learner un-marked as dropout",
-    "LEARNER_REMOVED": "Learner has been removed",
+    "LEARNER_MARKED_DROPOUT": "Student marked as dropout",
+    "LEARNER_UNMARKED_DROPOUT": "Student un-marked as dropout",
+    "LEARNER_REMOVED": "Student has been removed",
     "DROPPED_OUT": "Dropped Out",
     "DELETE_USER": "Delete User Permanently",
     "REMOVE_USER_FROM_CLASS": "Remove user from class",
@@ -115,7 +115,7 @@
     "NEW": "New {{role}}",
     "USER_CREDENTIAL_SEND_SUCCESSFULLY": "User credentials sent successfully!",
     "USER_CREDENTIAL_SEND_FAILED": "User credentials failed to send!",
-    "CENTER_SESSIONS": "Center Sessions",
+    "CENTER_SESSIONS": "Class Sessions",
     "SCHEDULE_NEW": "Schedule New",
     "UPCOMING_EXTRA_SESSION": "Upcoming Extra Sessions (Next {{days}} days)",
     "NO_SESSIONS_SCHEDULED": "No sessions scheduled",
@@ -124,16 +124,16 @@
     "PAGE_NOT_FOUND": "Page not found",
     "ACCESS_DENIED": "Access Denied",
     "YOU_DONT_HAVE_PERMISSION_TO_ACCESS_THIS_PAGE": "You don't have access to this page",
-    "NEW_LEARNER": "New Learner",
-    "EDIT_LEARNER": "Edit Learner",
-    "NEW_FACILITATOR": "New Facilitator",
-    "EDIT_FACILITATOR": "Edit Facilitator",
+    "NEW_LEARNER": "New Student",
+    "EDIT_LEARNER": "Edit Student",
+    "NEW_FACILITATOR": "New Teacher",
+    "EDIT_FACILITATOR": "Edit Teacher",
     "SUBMIT": "Submit",
-    "LEARNER_CREATED_SUCCESSFULLY": "Leaner has been successfully created!",
+    "LEARNER_CREATED_SUCCESSFULLY": "Student has been successfully created!",
     "FACILITATOR_ADDED_SUCCESSFULLY": "Facilitator added successfully!",
-    "LEARNER_UPDATED_SUCCESSFULLY": "Learner profile updated successfully!",
+    "LEARNER_UPDATED_SUCCESSFULLY": "Student profile updated successfully!",
     "FACILITATOR_UPDATED_SUCCESSFULLY": "Facilitator profile updated successfully!",
-    "PLEASE_SELECT_THE_CENTER": "Please select the center.",
+    "PLEASE_SELECT_THE_CENTER": "Please select the class.",
     "CREATE": "Create",
     "SELF_ATTENDANCE": "Mark Attendance",
     "TURN_ON_DEVICE_LOCATION": "Turn on device location",
@@ -142,7 +142,7 @@
     "OKAY": "Okay",
     "HELD_EVERY_WEEK_ON": "Held every week on {{days}}",
     "SESSION_SCHEDULED_SUCCESSFULLY": "Session has been scheduled successfully!",
-    "CENTER": "Center"
+    "CENTER": "Class"
   },
   "LOGIN_PAGE": {
     "USERNAME": "Username",
@@ -164,7 +164,7 @@
     "NEW_PHYSICAL_CLASS": "New Physical Class",
     "CLASS": "Class",
     "NOT_MARKED": "Not Marked",
-    "NOT_MARKED_STUDENT": "Not Marked For Learners",
+    "NOT_MARKED_STUDENT": "Not Marked For Student",
     "NOT_MARKED_SELF": "Not Marked For Self",
     "FUTURE_DATE_CANT_MARK": "Future date can't be marked",
     "PERCENT_ATTENDANCE": "{{percent_students}}% Attendance",
@@ -173,17 +173,17 @@
     "MORE_DETAILS": "More Details",
     "MENU": "Menu",
     "EXTRA_CLASS": "Extra class",
-    "CENTER_ATTENDANCE": "Center Attendance",
+    "CENTER_ATTENDANCE": "Class Attendance",
     "MY_TIMETABLE": "My Timetable",
-    "MY_TEACHING_CENTERS": "My Teaching Centers",
-    "TEACHING_CENTERS": "Teaching Centers",
+    "MY_TEACHING_CENTERS": "My Teaching Class",
+    "TEACHING_CENTERS": "Teaching Class",
     "UPCOMING_EXTRA_SESSION": "Upcoming Extra Sessions",
     "BACK_TO_TOP": "Back to Top",
     "LAST_SEVEN_DAYS_RANGE": "Last 7 Days {{date_range}}",
     "AS_OF_TODAY_DATE": "As of Today, {{day_date}}",
-    "LEARNER": "Learners",
+    "LEARNER": "Student",
     "ATTENDANCE_COMPARISON": "Attendance Comparison",
-    "CENTER_TYPE": "Center Type",
+    "CENTER_TYPE": "Class Type",
     "REMOTE_AVERAGE_ATTENDANCE": "Remote Average Attendance",
     "REGULAR_AVERAGE_ATTENDANCE": "Regular Average Attendance",
     "BLOCK": "Block",
@@ -211,13 +211,13 @@
     "NO_GO_BACK": "No Go Back",
     "DAY_WISE_ATTENDANCE": "Day-Wise Attendance",
     "ATTENDANCE_OVERVIEW": "Attendance Overview",
-    "CENTER_ATTENDANCE": "Center Attendance",
-    "LOW_ATTENDANCE_STUDENTS": "Low Attendance Learners",
-    "N/A": "No Centers Assigned",
+    "CENTER_ATTENDANCE": "Class Attendance",
+    "LOW_ATTENDANCE_STUDENTS": "Low Attendance Students",
+    "N/A": "No Class Assigned",
     "NO_ATTENDANCE": "0 %",
     "UNKNOWN": "Unknown",
-    "CENTER_NAME": "Center Name",
-    "ALL_CENTERS": "All Centers",
+    "CENTER_NAME": "Class Name",
+    "ALL_CENTERS": "All Class",
     "NO_LEARNER_WITH_LOW_ATTENDANCE": "None",
     "ATTENDANCE_MARKED_OUT_OF_DAYS": "Attendance marked: {{count}} out of last 7 days",
     "PAID_LEAVE_HALF_DAY": "Paid leave - Half day",
@@ -243,7 +243,7 @@
     "VIEW_MORE": "View More",
     "VIEW_LESS": "View Less",
     "DATA_RANGE": "Data Range",
-    "LEARNER_DETAILS": "Learner Details",
+    "LEARNER_DETAILS": "Student Details",
     "VIEW_DAY_WISE": "View Day-Wise",
     "SUBMITTED_ON": "Submitted On",
     "MARK_OBTAINED": "Mark Obtained",
@@ -276,7 +276,7 @@
     "UNIT_CODE": "Unit Code",
     "ENROLLMENT_NUMBER": "Enrollment Number",
     "BLOCK_NAME": "Block Name",
-    "STUDENT_TYPE": "Type of Learner",
+    "STUDENT_TYPE": "Type of Student",
     "STATE_NAME": "State Name",
     "SUPPORT_NEEDED": "Support needed",
     "CLASS": "Class (Last passed grade)",
@@ -305,13 +305,13 @@
   },
   "GUIDE_TOUR": {
     "STEP_1": "Welcome! Let’s take a quick tour to understand the key features that will help you with your daily tasks.",
-    "STEP_2": "This section provides a quick overview of attendance trends to help you spot key insights for each center. You can mark attendance, check daily attendance percentages, and modify previous attendance for the last 7 days.",
-    "STEP_3": "Access the full calendar to track learners' attendance for any month and see who was present or absent each day.",
-    "STEP_4": "Use this button to view a detailed overview of center attendance and see a list of learners categorized by low, average, and good attendance for any custom date range.",
+    "STEP_2": "This section provides a quick overview of attendance trends to help you spot key insights for each Class. You can mark attendance, check daily attendance percentages, and modify previous attendance for the last 7 days.",
+    "STEP_3": "Access the full calendar to track Student' attendance for any month and see who was present or absent each day.",
+    "STEP_4": "Use this button to view a detailed overview of class attendance and see a list of Student categorized by low, average, and good attendance for any custom date range.",
     "STEP_5": "Update your preferred language anytime from here.",
-    "STEP_6": "Access your teaching centers and manage tasks like adding, editing, or removing learners, marking dropouts, and reassigning centers or blocks. You can also easily schedule online or offline sessions for your subjects.",
+    "STEP_6": "Access your teaching class and manage tasks like adding, editing, or removing Student, marking dropouts, and reassigning class or blocks. You can also easily schedule online or offline sessions for your subjects.",
     "STEP_7": "Access the full academic year’s course plan for each subject, along with resources like videos and documents for every topic. Track your teaching progress by updating topic completion status.",
-    "STEP_8": "View detailed scores and summaries of Pre and Post tests for each learner. Track which students have completed, are in progress or yet to start the test.",
+    "STEP_8": "View detailed scores and summaries of Pre and Post tests for each Student. Track which students have completed, are in progress or yet to start the test.",
     "PREVIOUS": "Previous",
     "NEXT": "Next",
     "SKIP": "Skip",
@@ -329,31 +329,31 @@
     "REASSIGN_BLOCK_REQUESTED": "Reassign Block Requested Successfully!"
   },
   "CENTERS": {
-    "CENTERS": "Centers",
-    "REGULAR_CENTERS": "Regular Centers",
-    "REMOTE_CENTERS": "Remote Centers",
-    "REMOTE_CENTER": "Remote Center",
+    "CENTERS": "Classes",
+    "REGULAR_CENTERS": "Regular Classes",
+    "REMOTE_CENTERS": "Remote Classes",
+    "REMOTE_CENTER": "Remote Classes",
     "REGULAR": "Regular",
     "REMOTE": "Remote",
     "SEARCH_BLOCKS": "Search Blocks",
-    "SEARCH_CENTERS": "Search Centers",
+    "SEARCH_CENTERS": "Search Classes",
     "BLOCK_REQUEST": "You are sending a request to the state Team Leader to re-assign the Block to this user",
-    "NEW_CENTER": "New Center",
-    "CENTER_TYPE": "Center Type",
+    "NEW_CENTER": "New Class",
+    "CENTER_TYPE": "Class Type",
     "UNIT_NAME": "Unit Name",
-    "NOTE": "Note: This will be the center name",
-    "CENTER_CREATED": "Center created successfully!",
-    "RENAME_CENTER": "Rename Center",
+    "NOTE": "Note: This will be the Class name",
+    "CENTER_CREATED": "Class created successfully!",
+    "RENAME_CENTER": "Rename Class",
     "REQUEST_TO_DELETE": "Request to Delete",
     "RENAME": "Rename",
-    "CENTER_RENAMED": "Center renamed successfully!",
+    "CENTER_RENAMED": "Class renamed successfully!",
     "SEND_REQUEST": "Send Request",
     "REQUEST_TO_DELETE_HAS_BEEN_SENT": "Request to Delete has been sent",
     "YOU_ARE_SENDING_REQUEST_TO_THE_STATE_ADMIN": "You are sending a request to the State Admin to delete this center",
     "THE_USER_BELONGS_TO_THE_FOLLOWING_COHORT": "The user belongs to the following cohort: ",
     "PLEASE_REMOVE_THE_USER_FROM_COHORT": "Please remove the user from these cohorts before proceeding with deletion.",
-    "ERROR_EMPTY": "Center name cannot be empty",
-    "ERROR_NUMBER": "Center name cannot be number",
+    "ERROR_EMPTY": "Class name cannot be empty",
+    "ERROR_NUMBER": "Class name cannot be number",
     "LONG_ABSENTEE": "Long Absentee",
     "TAKEN_TC": "Taken TC",
     "ALLOCATION_CHANGE": "Allocation  Change",
@@ -380,8 +380,8 @@
     "DOUBT_CLEARING": "For doubt clearing, webinars, etc",
     "TOPIC": "Topic",
     "SUBTOPIC": "Sub Topic",
-    "FACILITATORS": " Facilitators Pre-requisites",
-    "LEARNERS": " Learners Pre-requisites",
+    "FACILITATORS": " Teachers Pre-requisites",
+    "LEARNERS": " Student Pre-requisites",
     "TITLE": "Title",
     "DELETE_SESSION": "Delete Session",
     "SCHEDULE": "Schedule",
@@ -413,8 +413,8 @@
     "SESSION_EDITED_SUCCESSFULLY": "Session updated successfully"
   },
   "MANAGE_USERS": {
-    "CENTERS_REQUESTED_SUCCESSFULLY": "Center requested successfully",
-    "CENTERS_REQUEST_FAILED": "Center Request Failed"
+    "CENTERS_REQUESTED_SUCCESSFULLY": "Class requested successfully",
+    "CENTERS_REQUEST_FAILED": "Class Request Failed"
   },
   "FORM": {
     "FULL_NAME": "Full Name",
@@ -473,7 +473,7 @@
     "UNIT_CODE": "Unit Code",
     "ENROLLMENT_NUMBER": "Enrollment Number",
     "BLOCK_NAME": "Block Name",
-    "STUDENT_TYPE": "Type of Learner",
+    "STUDENT_TYPE": "Type of Student",
     "STATE_NAME": "State Name",
     "SUPPORT_NEEDED": "Support needed",
     "CLASS": "Class (Last passed grade)",
@@ -489,11 +489,11 @@
     "MOBILISATION_METHOD": "How Was the Learner Mobilized?",
     "MONTH_MOBILISATION": "Month of Mobilisation",
     "DROP_OUT_REASON": "Reason for Drop Out From School",
-    "ASSIGN_CENTERS": "Assign Centers",
+    "ASSIGN_CENTERS": "Assign Classes",
     "ACCESS_TO_WHATSAPP": "Access To WhatsApp",
     "MOTHER_NAME": "Mother's Name",
-    "TYPE_OF_COHORT": "Center type",
-    "NOTE_THIS_WILL_BE_CENTER_NAME": "Note this will be Center name",
+    "TYPE_OF_COHORT": "Class type",
+    "NOTE_THIS_WILL_BE_CENTER_NAME": "Note this will be Class name",
     "ENGLISH": "English",
     "HOME_SCIENCE": "Home Science",
     "MATH": "Math",
@@ -517,7 +517,7 @@
     "ENTER_VALID_YEAR": "Enter valid Year",
     "MUST_BE_LESS_THAN": "{{fieldname}} must be less than {{maxLength}}",
     "MUST_BE_GREATER_THAN": "{{fieldname}} must be greater than {{minLength}}",
-    "ENTER_VALID_CENTER_NAME": "Enter valid center name"
+    "ENTER_VALID_CENTER_NAME": "Enter valid Class name"
   },
   "COURSE_PLANNER": {
     "COURSE_PLANNER": "Course Plan",
@@ -529,7 +529,7 @@
   },
   "ASSESSMENTS": {
     "ASSESSMENTS": "Assessments",
-    "CENTER": "Center",
+    "CENTER": "Class",
     "ASSESSMENT_TYPE": "Assessment Type",
     "COMPLETED_THE_ASSESSMENT": "completed the assessment",
     "SUBMITTED_ON": "Submitted On",

public/manifest.json

@@ -4,9 +4,9 @@
   "display": "standalone",
   "scope": "/",
   "start_url": "/",
-  "name": "Pratham Teacher App",
+  "name": "OBLF Teacher App",
   "short_name": "Teacher app",
-  "description": "Teacher App for Pratham",
+  "description": "Teacher App for OBLF",
   "icons": [
     {
       "src": "/icon-192x192.png",

src/pages/centers/[cohortId]/index.tsx

@@ -65,6 +65,7 @@ import {
   eventDaysLimit,
   ShowCenterSessionsTab,
   showEventsByList,
+  ShowFacilitatorListTab,
 } from '../../../../app.config';
 
 const CohortPage = () => {
@@ -287,8 +288,6 @@ const CohortPage = () => {
     }
   }, [eventCreated, eventDeleted, eventUpdated]);
 
-
-
   const handleEventDeleted = () => {
     setEventDeleted(true);
   };
@@ -491,7 +490,10 @@ const CohortPage = () => {
             <Tab value={1} label={t('COMMON.CENTER_SESSIONS')} />
           )}
           <Tab value={2} label={t('COMMON.LEARNER_LIST')} />
-          <Tab value={3} label={t('COMMON.FACILITATOR_LIST')} />
+
+          {ShowFacilitatorListTab && (
+            <Tab value={3} label={t('COMMON.FACILITATOR_LIST')} />
+          )}
         </Tabs>
       </Box>
 
@@ -716,7 +718,12 @@ const CohortPage = () => {
             <Box
               px={'18px'}
               mt={2}
-              sx={{ display: 'flex', gap: '4px', alignItems: 'center' }}
+              sx={{
+                display: 'flex',
+                gap: '4px',
+                alignItems: 'center',
+                cursor: 'pointer',
+              }}
             >
               <Box
                 sx={{ color: theme.palette.secondary.main }}
@@ -750,7 +757,7 @@ const CohortPage = () => {
         )}
       </Box>
       <Box>
-        {value === 3 && (
+        {value === 3 && ShowFacilitatorListTab && (
           <>
             <Box mt={3} px={'18px'}></Box>
             <CohortFacilitatorList