From 246469bdde862b6e5ea5afbcc1e6825b34cc4734 Mon Sep 17 00:00:00 2001
From: Nick Winter <livelily@gmail.com>
Date: Thu, 4 Aug 2016 18:37:01 -0700
Subject: [PATCH] A couple fixes for demo flow
---
.../teachers/hovers/progress-dot-single-student-level.jade | 4 +++-
app/views/courses/TeacherCoursesView.coffee | 5 ++++-
server/middleware/classrooms.coffee | 4 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/app/templates/teachers/hovers/progress-dot-single-student-level.jade b/app/templates/teachers/hovers/progress-dot-single-student-level.jade
index 0c77f5853..db167a122 100644
--- a/app/templates/teachers/hovers/progress-dot-single-student-level.jade
+++ b/app/templates/teachers/hovers/progress-dot-single-student-level.jade
@@ -13,7 +13,9 @@ if completed
.small-details.nowrap
span.spr(data-i18n='teacher.completed')
| Completed
- span= new Date(session.get('dateFirstCompleted')).toLocaleString()
+ - var dateCompleted = session.get('dateFirstCompleted') || session.get('created') || session.get('changed');
+ if dateCompleted
+ span= new Date(dateCompleted).toLocaleString()
+timePlayed
//- .small-details
//- i(data-i18n='teacher.click_to_view_solution')
diff --git a/app/views/courses/TeacherCoursesView.coffee b/app/views/courses/TeacherCoursesView.coffee
index d1cf6d024..004485754 100644
--- a/app/views/courses/TeacherCoursesView.coffee
+++ b/app/views/courses/TeacherCoursesView.coffee
@@ -41,7 +41,10 @@ module.exports = class TeacherCoursesView extends RootView
@ownedClassrooms.fetchMine({data: {project: '_id'}})
@supermodel.trackCollection(@ownedClassrooms)
@courses = new Courses()
- @supermodel.trackRequest @courses.fetchReleased()
+ if me.isAdmin()
+ @supermodel.trackRequest @courses.fetch()
+ else
+ @supermodel.trackRequest @courses.fetchReleased()
@campaigns = new Campaigns()
@supermodel.trackRequest @campaigns.fetchByType('course', { data: { project: 'levels,levelsUpdated' } })
@
diff --git a/server/middleware/classrooms.coffee b/server/middleware/classrooms.coffee
index b04045fce..2a300a435 100644
--- a/server/middleware/classrooms.coffee
+++ b/server/middleware/classrooms.coffee
@@ -105,13 +105,13 @@ module.exports =
members = classroom.get('members') or []
members = members.slice(memberSkip, memberSkip + memberLimit)
dbqs = []
- select = 'state.complete level creator playtime changed dateFirstCompleted submitted'
+ select = 'state.complete level creator playtime changed created dateFirstCompleted submitted'
for member in members
dbqs.push(LevelSession.find({creator: member.toHexString()}).select(select).exec())
results = yield dbqs
sessions = _.flatten(results)
res.status(200).send(sessions)
-
+
fetchMembers: wrap (req, res, next) ->
throw new errors.Unauthorized() unless req.user
memberLimit = parse.getLimitFromReq(req, {default: 10, max: 100, param: 'memberLimit'})