diff --git a/controllers/bonfire.js b/controllers/bonfire.js index 6a4712f3b1..3fecaa89f7 100644 --- a/controllers/bonfire.js +++ b/controllers/bonfire.js @@ -236,6 +236,7 @@ exports.completedBonfire = function (req, res) { } else { var index = req.user.uncompletedBonfires.indexOf(bonfireHash); if (index > -1) { + req.user.progressTimestamps.push(Date.now() || 0); req.user.uncompletedBonfires.splice(index, 1) } @@ -243,6 +244,7 @@ exports.completedBonfire = function (req, res) { index = pairedWith.uncompletedBonfires.indexOf(bonfireHash); if (index > -1) { + pairedWith.progressTimestamps.push(Date.now() || 0); pairedWith.uncompletedBonfires.splice(index, 1); @@ -285,6 +287,7 @@ exports.completedBonfire = function (req, res) { var index = req.user.uncompletedBonfires.indexOf(bonfireHash); if (index > -1) { + req.user.progressTimestamps.push(Date.now() || 0); req.user.uncompletedBonfires.splice(index, 1) } diff --git a/controllers/courseware.js b/controllers/courseware.js index 28f4f6bec6..0d40f37c8e 100644 --- a/controllers/courseware.js +++ b/controllers/courseware.js @@ -253,11 +253,12 @@ exports.completedCourseware = function (req, res, next) { var index = req.user.completedCoursewares.indexOf(coursewareHash); if (index === -1) { + req.user.progressTimestamps.push(Date.now() || 0); req.user.uncompletedCoursewares.splice(index, 1); } - req.user.save(function (err, user) { + req.user.save(function (err, user, next) { if (err) { return next(err); } diff --git a/controllers/resources.js b/controllers/resources.js index 8cdd70e6d5..b430db79cd 100644 --- a/controllers/resources.js +++ b/controllers/resources.js @@ -172,6 +172,7 @@ module.exports = { var date2 = new Date(); var progressTimestamps = req.user.progressTimestamps; var now = Date.now() || 0; + if (req.user.pointsNeedMigration) { var challengesHash = req.user.challengesHash; for (var key in challengesHash) { diff --git a/views/coursewares/showJS.jade b/views/coursewares/showJS.jade index adbba9293f..32ed942ae6 100644 --- a/views/coursewares/showJS.jade +++ b/views/coursewares/showJS.jade @@ -47,6 +47,7 @@ block content var challengeSeed = !{JSON.stringify(challengeSeed)}; var passedCoursewareHash = !{JSON.stringify(coursewareHash)}; var challengeName = !{JSON.stringify(name)}; + var passedCoursewareName = challengeName; var started = Math.floor(Date.now()); .col-xs-12.col-sm-12.col-md-8 #mainEditorPanel