From d41b4849517839c342d87851bd85299c15439d1f Mon Sep 17 00:00:00 2001 From: Matt Lott Date: Tue, 22 Nov 2016 15:20:21 -0800 Subject: [PATCH] Update class progress tab to show details if student assigned --- app/locale/en.coffee | 2 +- app/templates/courses/teacher-class-view.jade | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/locale/en.coffee b/app/locale/en.coffee index 54e8e2a95ed..6e50ec32725 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -1400,7 +1400,7 @@ assigning_course: "Assigning course" course_solution: "Course Solution" level_overview_solutions: "Level Overview and Solutions" - no_student_progress: "No student progress yet." + no_student_assigned: "No students have been assigned this course." paren_new: "(new)" teacher_dashboard: "Teacher Dashboard" # Navbar my_classes: "My Classes" diff --git a/app/templates/courses/teacher-class-view.jade b/app/templates/courses/teacher-class-view.jade index 78b90969942..b66a7c3a6ed 100644 --- a/app/templates/courses/teacher-class-view.jade +++ b/app/templates/courses/teacher-class-view.jade @@ -273,9 +273,9 @@ mixin courseProgressTab .key-text span.small(data-i18n="teacher.level_not_started") .clearfix - - var progressData = state.get('progressData') || {}; - var course = state.get('selectedCourse'); - if course && view.availableCourseMap[course.id] && progressData[view.classroom.id] && progressData[view.classroom.id][course.id].started + - var courseInstance = view.courseInstances.findWhere({ courseID: course.id, classroomID: view.classroom.id }); + if course && view.availableCourseMap[course.id] && courseInstance && courseInstance.get('members').length > 0 .render-on-course-sync +courseOverview(course) .student-levels-table @@ -286,7 +286,7 @@ mixin courseProgressTab else br h2.text-center - i(data-i18n='teacher.no_student_progress') + i(data-i18n='teacher.no_student_assigned') .unassigned-students.render-on-course-sync if state.get('selectedCourse') && state.get('selectedCourse').members.length < state.get('students').length h2