From 0316cc507e47467b42199a019874d93baba0549e Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Sat, 3 Sep 2016 08:16:32 -0700 Subject: [PATCH] :bug:Exclude practice levels from course progress counts --- app/lib/coursesHelper.coffee | 3 ++- app/templates/courses/teacher-class-view.jade | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/lib/coursesHelper.coffee b/app/lib/coursesHelper.coffee index 7f2f9dbc2..87fd19c92 100644 --- a/app/lib/coursesHelper.coffee +++ b/app/lib/coursesHelper.coffee @@ -13,6 +13,7 @@ module.exports = instance.numCompleted = 0 instance.started = false levels = classroom.getLevels({courseID: course.id}) + levels.remove(levels.filter((level) => level.get('practice'))) for userID in instance.get('members') instance.started ||= _.any levels.models, (level) -> session = _.find classroom.sessions.models, (session) -> @@ -180,7 +181,7 @@ module.exports = if _.find(sessions, (s) -> s.completed()) # have finished this level courseProgress.completed &&= true #no-op courseProgress[userID].completed &&= true #no-op - courseProgress[userID].levelsCompleted += 1 + courseProgress[userID].levelsCompleted += 1 unless level.get('practice') courseProgress[levelID].completed &&= true #no-op # courseProgress[levelID].numCompleted += 1 courseProgress[levelID][userID].completed = true diff --git a/app/templates/courses/teacher-class-view.jade b/app/templates/courses/teacher-class-view.jade index f8dfce36b..213c6509c 100644 --- a/app/templates/courses/teacher-class-view.jade +++ b/app/templates/courses/teacher-class-view.jade @@ -226,7 +226,7 @@ mixin studentRow(student) - var instance = view.courseInstances.findWhere({ courseID: course.id, classroomID: classroom.id }) if instance && instance.hasMember(student) - var progress = state.get('progressData').get({ classroom: view.classroom, course: course, user: student }) - - var levelsTotal = trimCourse.levels.length + - var levelsTotal = _.reject(trimCourse.levels, 'practice').length //- - var level = ??? - var label = courseLabelsArray[index]; +studentCourseProgressDot(progress, levelsTotal, level, label)