More work towards unifying timestamps

This commit is contained in:
Nathan Leniz
2015-03-28 12:22:08 +09:00
parent eb96d2cb02
commit 338d87424c
4 changed files with 7 additions and 1 deletions

View File

@ -236,6 +236,7 @@ exports.completedBonfire = function (req, res) {
} else { } else {
var index = req.user.uncompletedBonfires.indexOf(bonfireHash); var index = req.user.uncompletedBonfires.indexOf(bonfireHash);
if (index > -1) { if (index > -1) {
req.user.progressTimestamps.push(Date.now() || 0); req.user.progressTimestamps.push(Date.now() || 0);
req.user.uncompletedBonfires.splice(index, 1) req.user.uncompletedBonfires.splice(index, 1)
} }
@ -243,6 +244,7 @@ exports.completedBonfire = function (req, res) {
index = pairedWith.uncompletedBonfires.indexOf(bonfireHash); index = pairedWith.uncompletedBonfires.indexOf(bonfireHash);
if (index > -1) { if (index > -1) {
pairedWith.progressTimestamps.push(Date.now() || 0); pairedWith.progressTimestamps.push(Date.now() || 0);
pairedWith.uncompletedBonfires.splice(index, 1); pairedWith.uncompletedBonfires.splice(index, 1);
@ -285,6 +287,7 @@ exports.completedBonfire = function (req, res) {
var index = req.user.uncompletedBonfires.indexOf(bonfireHash); var index = req.user.uncompletedBonfires.indexOf(bonfireHash);
if (index > -1) { if (index > -1) {
req.user.progressTimestamps.push(Date.now() || 0); req.user.progressTimestamps.push(Date.now() || 0);
req.user.uncompletedBonfires.splice(index, 1) req.user.uncompletedBonfires.splice(index, 1)
} }

View File

@ -253,11 +253,12 @@ exports.completedCourseware = function (req, res, next) {
var index = req.user.completedCoursewares.indexOf(coursewareHash); var index = req.user.completedCoursewares.indexOf(coursewareHash);
if (index === -1) { if (index === -1) {
req.user.progressTimestamps.push(Date.now() || 0); req.user.progressTimestamps.push(Date.now() || 0);
req.user.uncompletedCoursewares.splice(index, 1); req.user.uncompletedCoursewares.splice(index, 1);
} }
req.user.save(function (err, user) { req.user.save(function (err, user, next) {
if (err) { if (err) {
return next(err); return next(err);
} }

View File

@ -172,6 +172,7 @@ module.exports = {
var date2 = new Date(); var date2 = new Date();
var progressTimestamps = req.user.progressTimestamps; var progressTimestamps = req.user.progressTimestamps;
var now = Date.now() || 0; var now = Date.now() || 0;
if (req.user.pointsNeedMigration) { if (req.user.pointsNeedMigration) {
var challengesHash = req.user.challengesHash; var challengesHash = req.user.challengesHash;
for (var key in challengesHash) { for (var key in challengesHash) {

View File

@ -47,6 +47,7 @@ block content
var challengeSeed = !{JSON.stringify(challengeSeed)}; var challengeSeed = !{JSON.stringify(challengeSeed)};
var passedCoursewareHash = !{JSON.stringify(coursewareHash)}; var passedCoursewareHash = !{JSON.stringify(coursewareHash)};
var challengeName = !{JSON.stringify(name)}; var challengeName = !{JSON.stringify(name)};
var passedCoursewareName = challengeName;
var started = Math.floor(Date.now()); var started = Math.floor(Date.now());
.col-xs-12.col-sm-12.col-md-8 .col-xs-12.col-sm-12.col-md-8
#mainEditorPanel #mainEditorPanel