diff --git a/lms/static/js/learner_analytics_dashboard/GradeTable.jsx b/lms/static/js/learner_analytics_dashboard/GradeTable.jsx index b0bbca0fb1..6c2b044faa 100644 --- a/lms/static/js/learner_analytics_dashboard/GradeTable.jsx +++ b/lms/static/js/learner_analytics_dashboard/GradeTable.jsx @@ -30,35 +30,41 @@ class GradeTable extends React.Component { return value; } }); - const multipleAssessments = groupData.length > 1; + const multipleAssignments = groupData.length > 1; const rows = groupData.map(({assignment_type, total_possible, total_earned, passing_grade}, index) => { - const label = multipleAssessments ? `${assignment_type} ${index + 1}` : assignment_type; + const label = multipleAssignments ? `${assignment_type} ${index + 1}` : assignment_type; return ( {label} {passing_grade}/{total_possible} - {total_earned <= 0 ? '-' : total_earned}/{total_possible} + {total_earned}/{total_possible} ); }); - return {rows}; + return {rows}; } render() { - const {assignmentTypes} = this.props; + const {assignmentTypes, passingGrade, percentGrade} = this.props; return ( - + {assignmentTypes.map((type, index) => this.getTableGroup(type, index))} + + + + + + +
AssessmentAssignment Passing You
Totals{passingGrade}%*{percentGrade}%
) } @@ -66,7 +72,9 @@ class GradeTable extends React.Component { GradeTable.propTypes = { assignmentTypes: PropTypes.array.isRequired, - grades: PropTypes.array.isRequired + grades: PropTypes.array.isRequired, + passingGrade: PropTypes.number.isRequired, + percentGrade: PropTypes.number.isRequired } export default GradeTable; diff --git a/lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx b/lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx index e67cdf0650..baea0e0cf1 100644 --- a/lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx +++ b/lms/static/js/learner_analytics_dashboard/LearnerAnalyticsDashboard.jsx @@ -51,14 +51,11 @@ function getStreakIcons(count) { function getStreakString(count) { const unit = (count ===1) ? 'week' : 'weeks'; - return `Logged in ${count} ${unit} in a row`; + return `Active ${count} ${unit} in a row`; } export function LearnerAnalyticsDashboard(props) { - const {grading_policy, grades, schedule, week_streak, weekly_active_users, discussion_info, profile_images} = props; - // temp. for local dev - // const week_streak = 3; - // const weekly_active_users = 83400; + const {grading_policy, grades, schedule, week_streak, weekly_active_users, discussion_info, profile_images, passing_grade, percent_grade} = props; const gradeBreakdown = grading_policy.GRADER.map(({type, weight}, index) => { return { value: weight, @@ -96,9 +93,13 @@ export function LearnerAnalyticsDashboard(props) { } -

Graded Assessments

+

Graded Assignments

- + +
* Your current grade is calculated based on all assignments, including those you have not yet completed.
diff --git a/lms/static/sass/features/_learner-analytics-dashboard.scss b/lms/static/sass/features/_learner-analytics-dashboard.scss index e092892830..39a2c9a8c8 100644 --- a/lms/static/sass/features/_learner-analytics-dashboard.scss +++ b/lms/static/sass/features/_learner-analytics-dashboard.scss @@ -337,6 +337,7 @@ $trophy-gold: #f39c12; .user-count { margin-top: -10px; + font-weight: 600; } } }