A couple fixes for demo flow
This commit is contained in:
parent
33134eb6c9
commit
246469bdde
3 changed files with 9 additions and 4 deletions
app
templates/teachers/hovers
views/courses
server/middleware
|
@ -13,7 +13,9 @@ if completed
|
||||||
.small-details.nowrap
|
.small-details.nowrap
|
||||||
span.spr(data-i18n='teacher.completed')
|
span.spr(data-i18n='teacher.completed')
|
||||||
| 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
|
+timePlayed
|
||||||
//- .small-details
|
//- .small-details
|
||||||
//- i(data-i18n='teacher.click_to_view_solution')
|
//- i(data-i18n='teacher.click_to_view_solution')
|
||||||
|
|
|
@ -41,7 +41,10 @@ module.exports = class TeacherCoursesView extends RootView
|
||||||
@ownedClassrooms.fetchMine({data: {project: '_id'}})
|
@ownedClassrooms.fetchMine({data: {project: '_id'}})
|
||||||
@supermodel.trackCollection(@ownedClassrooms)
|
@supermodel.trackCollection(@ownedClassrooms)
|
||||||
@courses = new Courses()
|
@courses = new Courses()
|
||||||
@supermodel.trackRequest @courses.fetchReleased()
|
if me.isAdmin()
|
||||||
|
@supermodel.trackRequest @courses.fetch()
|
||||||
|
else
|
||||||
|
@supermodel.trackRequest @courses.fetchReleased()
|
||||||
@campaigns = new Campaigns()
|
@campaigns = new Campaigns()
|
||||||
@supermodel.trackRequest @campaigns.fetchByType('course', { data: { project: 'levels,levelsUpdated' } })
|
@supermodel.trackRequest @campaigns.fetchByType('course', { data: { project: 'levels,levelsUpdated' } })
|
||||||
@
|
@
|
||||||
|
|
|
@ -105,13 +105,13 @@ module.exports =
|
||||||
members = classroom.get('members') or []
|
members = classroom.get('members') or []
|
||||||
members = members.slice(memberSkip, memberSkip + memberLimit)
|
members = members.slice(memberSkip, memberSkip + memberLimit)
|
||||||
dbqs = []
|
dbqs = []
|
||||||
select = 'state.complete level creator playtime changed dateFirstCompleted submitted'
|
select = 'state.complete level creator playtime changed created dateFirstCompleted submitted'
|
||||||
for member in members
|
for member in members
|
||||||
dbqs.push(LevelSession.find({creator: member.toHexString()}).select(select).exec())
|
dbqs.push(LevelSession.find({creator: member.toHexString()}).select(select).exec())
|
||||||
results = yield dbqs
|
results = yield dbqs
|
||||||
sessions = _.flatten(results)
|
sessions = _.flatten(results)
|
||||||
res.status(200).send(sessions)
|
res.status(200).send(sessions)
|
||||||
|
|
||||||
fetchMembers: wrap (req, res, next) ->
|
fetchMembers: wrap (req, res, next) ->
|
||||||
throw new errors.Unauthorized() unless req.user
|
throw new errors.Unauthorized() unless req.user
|
||||||
memberLimit = parse.getLimitFromReq(req, {default: 10, max: 100, param: 'memberLimit'})
|
memberLimit = parse.getLimitFromReq(req, {default: 10, max: 100, param: 'memberLimit'})
|
||||||
|
|
Reference in a new issue