From 1543580c5dff0196878b07991fa03a2a7b95e945 Mon Sep 17 00:00:00 2001 From: Rushikesh-Sonawane99 Date: Fri, 16 Aug 2024 13:58:35 +0530 Subject: [PATCH] Issue #PS-1648 chore: Removed re-assign block and center option from profile and modified test report UI on learner profie --- src/components/AssessmentReport.tsx | 6 +++--- src/components/LearnersListItem.tsx | 4 ++-- src/components/ManageUser.tsx | 2 +- src/pages/learner/[userId].tsx | 3 +-- src/services/UpdateAssesmentService.ts | 17 +++++++++++++++++ 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/src/components/AssessmentReport.tsx b/src/components/AssessmentReport.tsx index 813b4ab7..dcaecb50 100644 --- a/src/components/AssessmentReport.tsx +++ b/src/components/AssessmentReport.tsx @@ -7,7 +7,7 @@ import KeyboardArrowRightIcon from '@mui/icons-material/KeyboardArrowRight'; import { useRouter } from 'next/router'; import RemoveIcon from '@mui/icons-material/Remove'; import RadioButtonUncheckedIcon from '@mui/icons-material/RadioButtonUnchecked'; -import { updateAssessment } from '@/services/UpdateAssesmentService'; +import { learnerAssessmentReport } from '@/services/UpdateAssesmentService'; interface AssessmentReportProp{ isTitleRequired?: boolean @@ -21,7 +21,7 @@ const AssessmentReport: React.FC = ({ isTitleRequired }) = const [assessmentList, setAssessmentList] = React.useState([]); useEffect(() => { - const res: any = updateAssessment(); + const res: any = learnerAssessmentReport(); setAssessmentList(res); }, []); @@ -56,7 +56,7 @@ const AssessmentReport: React.FC = ({ isTitleRequired }) = borderRadius: '8px', gap: '5px', }} - onClick={() => handleAssessmentDetails(assessment.userId)} + // onClick={() => handleAssessmentDetails(assessment.userId)} > = ({ type == Role.STUDENT || (option.name !== 'mark-drop-out' && option.name !== 'unmark-drop-out') - ) + ) .filter((option) => !isFromProfile || option.name !== 'reassign-centers') : [ { label: t('COMMON.REASSIGN_CENTERS'), @@ -680,7 +680,7 @@ const LearnersListItem: React.FC = ({ type == Role.STUDENT || (option.name !== 'mark-drop-out' && option.name !== 'unmark-drop-out') - ) + ) .filter((option) => !isFromProfile || option.name !== 'reassign-centers') } renderCustomContent={renderCustomContent} /> diff --git a/src/components/ManageUser.tsx b/src/components/ManageUser.tsx index 2008fe9c..92013110 100644 --- a/src/components/ManageUser.tsx +++ b/src/components/ManageUser.tsx @@ -737,7 +737,7 @@ const ManageUser: React.FC = ({ ), name: 'delete-User', }, - ]} + ].filter(option => !isFromFLProfile || (option.name !== 'reassign-block' && option.name !== 'reassign-block-request'))} > = ({ }} > - - + diff --git a/src/services/UpdateAssesmentService.ts b/src/services/UpdateAssesmentService.ts index baef378a..33d8ece4 100644 --- a/src/services/UpdateAssesmentService.ts +++ b/src/services/UpdateAssesmentService.ts @@ -23,6 +23,23 @@ export const updateAssessment = (): Assessment[] => { ]; }; +export const learnerAssessmentReport = (): Assessment[] => { + return [ + { + userId: 1, + studentName: 'Pre-test', + progress: 'Overall score :', + score: 89 + }, + { + userId: 2, + studentName: 'Post-test', + progress: 'Not Started', + score: 0 + } + ]; +}; + export const getAssessmentSubjects = (): AssessmentSubject[] => { return [ {