Merge pull request #320 from AkshataKatwal16/reassign-cohorts

Reassign cohorts
tekdi · Oct 4, 2024 · 7e4b47d · 7e4b47d
2 parents 584e9d0 + b7b5e4f
commit 7e4b47d
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 1 deletion.
diff --git a/src/components/AssessmentReport.tsx b/src/components/AssessmentReport.tsx
@@ -82,8 +82,10 @@ const AssessmentReport: React.FC<AssessmentReportProp> = ({
  try {
  const options = {
  userId: [userId],
+ courseId:assessmentList, // temporary added here assessmentList(contentId)... if assessment is done then need to pass actual course id and unit id here
+ unitId:assessmentList,
  contentId: assessmentList,
- batchId: classId,
+  batchId: classId,
  };
  const assessmentStatus = await getAssessmentStatus(options);
  if (assessmentStatus?.length) {

diff --git a/src/pages/assessments/index.tsx b/src/pages/assessments/index.tsx
@@ -194,6 +194,8 @@ const Assessments = () => {
  try {
  const options = {
  userId: cohortMembers?.map((user: any) => user.userId),
+ courseId:assessmentList, // temporary added here assessmentList(contentId)... if assessment is done then need to pass actual course id and unit id here
+ unitId:assessmentList,
  contentId: assessmentList,
  batchId: classId,
  };

diff --git a/src/pages/assessments/user/[userId]/index.tsx b/src/pages/assessments/user/[userId]/index.tsx
@@ -154,6 +154,12 @@ function AssessmentsDetails() {
  try {
  const options = {
  userId: [params.userId],
+ courseId:assessmentList.map(
+ (item: any) => item.identifier
+ ) as string[], // temporary added here assessmentList(contentId)... if assessment is done then need to pass actual course id and unit id here
+ unitId:assessmentList.map(
+ (item: any) => item.identifier
+ ) as string[],
  contentId: assessmentList.map(
  (item: any) => item.identifier
  ) as string[],

diff --git a/src/pages/assessments/user/[userId]/subject/[subjectId]/index.tsx b/src/pages/assessments/user/[userId]/subject/[subjectId]/index.tsx
@@ -54,6 +54,8 @@ function SubjectDetail() {
  try {
  const body = {
  userId: params.userId,
+ courseId:params.subjectId,//temporary added content id here for both courseId and unitId
+ unitId:params.subjectId,
  contentId: params.subjectId,
  batchId: centerId as string,
  };

diff --git a/src/utils/Interfaces.ts b/src/utils/Interfaces.ts
@@ -636,8 +636,11 @@ export interface BottomDrawerProps {
 
 export interface IAssessmentStatusOptions {
  userId: string[];
+ courseId?:string[];
+ unitId?:string[];
  contentId: string[];
  batchId: string;
+
 }
 
 export interface GetTargetedSolutionsParams {
@@ -663,6 +666,8 @@ export interface EditEvent {
 
 export interface ISearchAssessment {
  userId: string;
+ courseId?:string;
+ unitId?:string;
  contentId: string;
  batchId: string;
 }