Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Task #228138 Modify Existing APIs (create, list, read, delete, search, and status) #16

Merged
merged 1 commit into from
Oct 1, 2024
Merged

Task #228138 Modify Existing APIs (create, list, read, delete, search, and status) #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/modules/tracking_content/tracking_content.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,11 +417,13 @@ export class TrackingContentService {
for (let jj = 0; jj < courseIdArray.length; jj++) {
let courseId = courseIdArray[jj];
const result = await this.dataSource.query(
`SELECT "contentTrackingId","userId","courseId","lastAccessOn","createdOn","updatedOn" FROM content_tracking WHERE "userId"=$1 and "courseId"=$2 order by "createdOn" asc;`,
`SELECT "contentTrackingId","userId","courseId","lastAccessOn","createdOn","updatedOn","contentId" FROM content_tracking WHERE "userId"=$1 and "courseId"=$2 order by "createdOn" asc;`,
[userId, courseId],
);
let in_progress = 0;
let completed = 0;
let in_progress_list = [];
let completed_list = [];
for (let i = 0; i < result.length; i++) {
const result_details = await this.dataSource.query(
`SELECT "eid","edata","duration","mode","pageid","type","subtype","summary","progress","createdOn","updatedOn" FROM content_tracking_details WHERE "contentTrackingId"=$1 `,
Expand All @@ -444,15 +446,19 @@ export class TrackingContentService {
}
if (status == 'In_Progress') {
in_progress++;
in_progress_list.push(result[i].contentId);
} else if (status == 'Completed') {
completed++;
completed_list.push(result[i].contentId);
}
}
courseList.push({
courseId: courseId,
in_progress: in_progress,
completed: completed,
started_on: result[0]?.createdOn ? result[0].createdOn : null,
in_progress_list: in_progress_list,
completed_list: completed_list,
});
}
userList.push({ userId: userId, course: courseList });
Expand Down Expand Up @@ -490,11 +496,13 @@ export class TrackingContentService {
for (let jj = 0; jj < unitIdArray.length; jj++) {
let unitId = unitIdArray[jj];
const result = await this.dataSource.query(
`SELECT "contentTrackingId","userId","courseId","lastAccessOn","createdOn","updatedOn" FROM content_tracking WHERE "userId"=$1 and "courseId"=$2 and "unitId"=$3 order by "createdOn" asc;`,
`SELECT "contentTrackingId","userId","courseId","lastAccessOn","createdOn","updatedOn","contentId" FROM content_tracking WHERE "userId"=$1 and "courseId"=$2 and "unitId"=$3 order by "createdOn" asc;`,
[userId, courseId, unitId],
);
let in_progress = 0;
let completed = 0;
let in_progress_list = [];
let completed_list = [];
for (let i = 0; i < result.length; i++) {
const result_details = await this.dataSource.query(
`SELECT "eid","edata","duration","mode","pageid","type","subtype","summary","progress","createdOn","updatedOn" FROM content_tracking_details WHERE "contentTrackingId"=$1 `,
Expand All @@ -517,8 +525,10 @@ export class TrackingContentService {
}
if (status == 'In_Progress') {
in_progress++;
in_progress_list.push(result[i].contentId);
} else if (status == 'Completed') {
completed++;
completed_list.push(result[i].contentId);
}
}
unitList.push({
Expand All @@ -527,6 +537,8 @@ export class TrackingContentService {
in_progress: in_progress,
completed: completed,
started_on: result[0]?.createdOn ? result[0].createdOn : null,
in_progress_list: in_progress_list,
completed_list: completed_list,
});
}
userList.push({ userId: userId, unit: unitList });
Expand Down
Loading