Merge pull request #641 from Rushikesh-Sonawane99/release-1.1.0

Issue #PS-3615 chore:Facilitator Assessment View Enhancements
tekdi · Jan 24, 2025 · 2767e4a · 2767e4a
2 parents fce6cdd + 0a9ff1a
commit 2767e4a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/public/locales/en/common.json b/public/locales/en/common.json
@@ -633,7 +633,7 @@
     "ASSESSMENTS": "Assessments",
     "CENTER": "Center",
     "ASSESSMENT_TYPE": "Assessment Type",
-    "COMPLETED_THE_ASSESSMENT": "completed the assessment",
+    "COMPLETED_THE_ASSESSMENT": "completed all the assigned assessments",
     "SUBMITTED_ON": "Submitted On",
     "CORRECT_ANSWER": "correct answers",
     "NO_DATA_FOUND": "No data found",
@@ -649,7 +649,8 @@
     "NUMBER_OUT_OF_COMPLETED": "{{completedCount}} out of {{totalCount}} completed",
     "NO_SUBTOPIC_SELECTED": "No Subtopic selected",
     "NO_SUBJECT_FOUND": "No Subject found",
-    "NO_ASSIGNED": "No assigned"
+    "NO_ASSIGNED": "No assigned",
+    "OUT_OF": "Out of"
   },
   "BOARD_ENROLMENT": {
     "BOARD_ENROLLMENT": "Board Enrollment",

diff --git a/src/pages/assessments/index.tsx b/src/pages/assessments/index.tsx
@@ -456,6 +456,9 @@ const Assessments = () => {
                 <MenuItem value={'post'} style={{ textAlign: 'right' }}>
                   {t('PROFILE.POST_TEST')}
                 </MenuItem>
+                <MenuItem value={'other'} style={{ textAlign: 'right' }}>
+                  {t('FORM.OTHER')}
+                </MenuItem>
               </Select>
             </FormControl>
           </Box>
@@ -500,9 +503,9 @@ const Assessments = () => {
                 color: theme?.palette?.warning['400'],
               }}
             >
-              {testCompletionCount.totalCount > 0 && (
+              {testCompletionCount?.totalCount > 0 && (
                 <span>
-                  {`${testCompletionCount.completionCount}/${testCompletionCount.totalCount}`}{' '}
+                  {`${testCompletionCount.completionCount} ${t('ASSESSMENTS.OUT_OF')} ${testCompletionCount.totalCount}`}{' '}
                   {t('ASSESSMENTS.COMPLETED_THE_ASSESSMENT')}
                 </span>
               )}