codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-01-22 04:09:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into production

Browse source
This commit is contained in:
phoenixeliot 2016-07-19 14:20:45 -07:00
commit 5259a86d3a
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/templates/courses/teacher-courses-view.jade
View file

@ -57,6 +57,7 @@ block content
select.level-select.form-control select.level-select.form-control
if view.campaigns.loaded if view.campaigns.loaded
- var campaign = view.campaigns.get(course.get('campaignID')) - var campaign = view.campaigns.get(course.get('campaignID'))
if campaign
each level, levelIndex in campaign.getLevels().models each level, levelIndex in campaign.getLevels().models
- var levelNumber = campaign.getLevelNumber(level.get('original'), levelIndex + 1) - var levelNumber = campaign.getLevelNumber(level.get('original'), levelIndex + 1)
option(value=level.get('slug')) option(value=level.get('slug'))

5
app/views/courses/ClassroomView.coffee
View file

@ -157,7 +157,10 @@ module.exports = class ClassroomView extends RootView
course = session.collection.course course = session.collection.course
levelOriginal = session.get('level').original levelOriginal = session.get('level').original
level = @levels.findWhere({original: levelOriginal}) level = @levels.findWhere({original: levelOriginal})
return "#{course.get('name')}, #{level.get('name')}" lastPlayed = ""
lastPlayed += course.get('name') if course
lastPlayed += ", #{level.get('name')}" if level
lastPlayed
userPlaytimeString: (user) -> userPlaytimeString: (user) ->
return '' unless user.sessions? return '' unless user.sessions?