Fix ClassroomView sparse progress handling
This commit is contained in:
parent
afbfc69fd5
commit
3ac8f16d28
4 changed files with 19 additions and 14 deletions
app
styles/courses
templates/courses
views/courses
|
@ -11,3 +11,7 @@
|
||||||
|
|
||||||
.progress-bar
|
.progress-bar
|
||||||
border-right: 1px solid grey
|
border-right: 1px solid grey
|
||||||
|
|
||||||
|
.progress-bar-default
|
||||||
|
background-color: white
|
||||||
|
color: grey
|
|
@ -1,10 +1,11 @@
|
||||||
- var completed = session && session.get('state').complete;
|
- var completed = session && session.get('state').complete;
|
||||||
h3 #{i + 1}. #{level.name.replace('Course: ', '')}
|
h3 #{i}. #{level.name.replace('Course: ', '')}
|
||||||
|
if session
|
||||||
p
|
p
|
||||||
span.spr(data-i18n="courses.play_time")
|
span.spr(data-i18n="courses.play_time")
|
||||||
span #{moment.duration(session.get('playtime'), "seconds").humanize()}
|
span #{moment.duration(session.get('playtime'), "seconds").humanize()}
|
||||||
p
|
p
|
||||||
span.spr(data-i18n=completed ? "courses.completed" : "clans.last_played")
|
span.spr(data-i18n=completed ? "courses.completed" : "clans.last_played")
|
||||||
span #{moment(session.get('changed')).format('MMMM Do YYYY, h:mm:ss a')}
|
span #{moment(session.get('changed')).format('MMMM Do YYYY, h:mm:ss a')}
|
||||||
if canViewSolution
|
if session && canViewSolution
|
||||||
strong(data-i18n=completed ? "clans.view_solution" : "clans.view_attempt")
|
strong(data-i18n=completed ? "clans.view_solution" : "clans.view_attempt")
|
||||||
|
|
|
@ -69,16 +69,16 @@ block content
|
||||||
- var i = 0;
|
- var i = 0;
|
||||||
.progress
|
.progress
|
||||||
each level, levelID in campaign.get('levels')
|
each level, levelID in campaign.get('levels')
|
||||||
|
- i++
|
||||||
- var session = sessionMap[levelID];
|
- var session = sessionMap[levelID];
|
||||||
if !session
|
|
||||||
- break;
|
|
||||||
a(href=view.getLevelURL(level, course, courseInstance, session))
|
a(href=view.getLevelURL(level, course, courseInstance, session))
|
||||||
- var content = view.levelPopoverContent(level, session, i);
|
- var content = view.levelPopoverContent(level, session, i);
|
||||||
if session && session.get('state').complete
|
if session && session.get('state').complete
|
||||||
.progress-bar.progress-bar-success(style=css, data-content=content, data-toggle='popover')= i + 1
|
.progress-bar.progress-bar-success(style=css, data-content=content, data-toggle='popover')= i
|
||||||
|
else if session
|
||||||
|
.progress-bar.progress-bar-warning(style=css, data-content=content, data-toggle='popover')= i
|
||||||
else
|
else
|
||||||
.progress-bar.progress-bar-warning(style=css, data-content=content, data-toggle='popover')= i + 1
|
.progress-bar.progress-bar-default(style=css, data-content=content, data-toggle='popover')= i
|
||||||
- i++
|
|
||||||
else if paidFor
|
else if paidFor
|
||||||
button.enable-btn.btn.btn-info.btn-sm(data-user-id=user.id, data-course-instance-cid=courseInstance.cid) Enable
|
button.enable-btn.btn.btn-info.btn-sm(data-user-id=user.id, data-course-instance-cid=courseInstance.cid) Enable
|
||||||
|
|
||||||
|
|
|
@ -163,7 +163,7 @@ module.exports = class ClassroomView extends RootView
|
||||||
@render()
|
@render()
|
||||||
|
|
||||||
levelPopoverContent: (level, session, i) ->
|
levelPopoverContent: (level, session, i) ->
|
||||||
return null unless level and session
|
return null unless level
|
||||||
context = {
|
context = {
|
||||||
moment: moment
|
moment: moment
|
||||||
level: level
|
level: level
|
||||||
|
|
Reference in a new issue