Merge pull request #153 from Rushikesh-Sonawane99/release-1.0.0

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

@@ -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<AssessmentReportProp> = ({ 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<AssessmentReportProp> = ({ isTitleRequired }) =
  borderRadius: '8px',
  gap: '5px',
  }}
- onClick={() => handleAssessmentDetails(assessment.userId)}
+ // onClick={() => handleAssessmentDetails(assessment.userId)}
  >
  <Box
  sx={{

src/components/LearnersListItem.tsx

@@ -644,7 +644,7 @@ const LearnersListItem: React.FC<LearnerListProps> = ({
  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<LearnerListProps> = ({
  type == Role.STUDENT ||
  (option.name !== 'mark-drop-out' &&
  option.name !== 'unmark-drop-out')
- )
+ ) .filter((option) => !isFromProfile || option.name !== 'reassign-centers')
  }
  renderCustomContent={renderCustomContent}
  />

src/components/ManageUser.tsx

@@ -737,7 +737,7 @@ const ManageUser: React.FC<ManageUsersProps> = ({
  ),
  name: 'delete-User',
  },
- ]}
+ ].filter(option => !isFromFLProfile || (option.name !== 'reassign-block' && option.name !== 'reassign-block-request'))}
  >
  <Box
  sx={{

src/pages/learner/[userId].tsx

@@ -982,8 +982,7 @@ const LearnerProfile: React.FC<LearnerProfileProp> = ({
  }}
  >
  <CardContent>
-
- <AssessmentReport isTitleRequired={true}/>
+ <AssessmentReport isTitleRequired={true} />
  </CardContent>
  </Card>
  </Box>

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 [
  {