Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions src/course-home/progress-tab/ProgressTab.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { useSelector } from 'react-redux';
import { breakpoints, useWindowSize } from '@openedx/paragon';
import { useWindowSize } from '@openedx/paragon';

import CourseCompletion from './course-completion/CourseCompletion';
import ProgressHeader from './ProgressHeader';
Expand All @@ -26,22 +26,20 @@ const ProgressTab = () => {
return null;
}

const wideScreen = windowWidth >= breakpoints.large.minWidth;
return (
<>
<ProgressHeader />
<div className="row w-100 m-0">
{/* Main body */}
<div className="col-12 col-md-8 p-0">
{!disableProgressGraph && <CourseCompletion />}
{!wideScreen && <ProgressTabCertificateStatusSlot courseId={courseId} />}
<ProgressTabCertificateStatusSlot courseId={courseId} />
<ProgressTabCourseGradeSlot courseId={courseId} />
<ProgressTabGradeBreakdownSlot courseId={courseId} />
</div>

{/* Side panel */}
<div className="col-12 col-md-4 p-0 px-md-4">
{wideScreen && <ProgressTabCertificateStatusSlot courseId={courseId} />}
<ProgressTabRelatedLinksSlot courseId={courseId} />
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const CompletionDonutChart = ({ intl, optional = false }) => {
const lockedCount = optional ? completionSummary.optionalLockedCount : completionSummary.lockedCount;

const numTotalUnits = completeCount + incompleteCount + lockedCount;
const completePercentage = completeCount ? Number(((completeCount / numTotalUnits) * 100).toFixed(0)) : 0;
const lockedPercentage = lockedCount ? Number(((lockedCount / numTotalUnits) * 100).toFixed(0)) : 0;
const completePercentage = completeCount ? Number(((completeCount / numTotalUnits) * 100).toFixed(1)) : 0;
const lockedPercentage = lockedCount ? Number(((lockedCount / numTotalUnits) * 100).toFixed(1)) : 0;
const incompletePercentage = 100 - completePercentage - lockedPercentage;

const isLocaleRtl = isRtl(getLocale());
Expand Down
Loading