Skip to content

TCA-1033 - update certification progress in course details page -> dev #517

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

Merged
merged 1 commit into from
Feb 21, 2023
Merged

TCA-1033 - update certification progress in course details page -> dev #517

Show file tree
Hide file tree
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
22 changes: 9 additions & 13 deletions src-ts/tools/learn/course-details/tca-certification-banner/TCACertificationBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ const TCACertificationBanner: FC<TCACertificationBannerProps> = (props: TCACerti
// Fetch Enrollment status & progress
const {
progress: certifProgress,
ready: certifProgressReady,
}: TCACertificationProgressProviderData = useGetTCACertificationProgress(
props.userId as unknown as string,
certification?.dashedName as string,
Expand All @@ -69,9 +68,7 @@ const TCACertificationBanner: FC<TCACertificationBannerProps> = (props: TCACerti
// so we can show their progress even before they enroll with the certification
const {
progresses: certsProgress,
}: UserCertificationsProviderData = useGetUserCertifications('freeCodeCamp', {
enabled: certifProgressReady && !certifProgress,
})
}: UserCertificationsProviderData = useGetUserCertifications('freeCodeCamp')

const progressById: ProgressByIdCollection = useMemo(() => (
certsProgress?.reduce((all, progress) => {
Expand All @@ -97,22 +94,21 @@ const TCACertificationBanner: FC<TCACertificationBannerProps> = (props: TCACerti
: certification.certificationResources.filter(d => (
progressById[d.freeCodeCampCertification.fccId]?.status === UserCertificationProgressStatus.completed
)).length
const inProgressCoursesCount: number = certification.certificationResources.filter(d => (
progressById[d.freeCodeCampCertification.fccId]?.status === UserCertificationProgressStatus.inProgress
)).length

if (!completedCoursesCount) {
return certifProgress ? getStatusBox(
return inProgressCoursesCount ? getStatusBox(
<IconOutline.ClockIcon />,
`Good job! You are making progress with ${inProgressCoursesCount} of ${coursesCount} required courses.`,
'green',
) : certifProgress ? getStatusBox(
<IconOutline.DotsCircleHorizontalIcon />,
'Begin working towards earning this Topcoder Certification by starting this course today!',
) : <></>
}

if (completedCoursesCount === 1) {
return getStatusBox(
<IconOutline.ClockIcon />,
`Good job! You are making progress with 1 of ${coursesCount} required courses.`,
'green',
)
}

return getStatusBox(
<IconSolid.CheckCircleIcon />,
`You have completed ${completedCoursesCount} of ${coursesCount} required courses.`,
Expand Down
2 changes: 2 additions & 0 deletions ...ca-certifications-provider/tca-certification-progress/tca-certification-progress.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { LearnModelBase } from '../../../functions'
import { UserCertificationProgressStatus } from '../../user-certifications-provider'
import { TCACertification } from '../tca-certification.model'

import { TCAFccCertificationProgress } from './tca-fcc-certification-progress.model'
Expand All @@ -17,6 +18,7 @@ export interface TCACertificationProgress extends LearnModelBase {
completedAt: null | Date
certificationProgress: number
resourceProgresses: [{
status: UserCertificationProgressStatus,
fccCertificationProgress: TCAFccCertificationProgress
}]
userHandle: string
Expand Down