tforgione
/
3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Geraldine changes, and templated strings in analyse.js

This commit is contained in:
Thomas FORGIONE 2015-10-06 14:15:12 +02:00
parent 1daf627232
commit 32c2e5d67f
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
analysis/analyse.js
View File

@ -2,7 +2,7 @@ function main(path) {
var db = JSON.parse(require('fs').readFileSync(path, 'utf8')); var db = JSON.parse(require('fs').readFileSync(path, 'utf8'));
console.log('There were ' + db.users.length + ' users for ' + db.experiments.length + ' experiments'); console.log(`There were ${db.users.length} users for ${db.experiments.length} experiments`);
var meanTimeNoReco = 0; var meanTimeNoReco = 0;
var meanTimeArrow = 0; var meanTimeArrow = 0;
@ -21,8 +21,6 @@ function main(path) {
} }
// console.log(exp.user.worker_id + ' : ' + exp.user.rating + ' -> ' + timeToString(timeDifference(events[0].time, events[events.length-1].time)));
var coins = []; var coins = [];
for (var j = 0; j < exp.elements.events.length; j++) { for (var j = 0; j < exp.elements.events.length; j++) {
@ -37,7 +35,7 @@ function main(path) {
} }
} }
console.log(exp.id + ' -> ' + coins.length + ' (on ' + exp.coinCombination.scene_id + ')'); console.log(`${exp.id} -> ${coins.length} (on ${exp.coinCombination.scene_id} )`);
} }
console.log(); console.log();
@ -45,7 +43,7 @@ function main(path) {
for (var i = 0; i < db.users.length; i++) { for (var i = 0; i < db.users.length; i++) {
var user = db.users[i]; var user = db.users[i];
console.log(user.worker_id + ' has done ' + user.experiments.length + ' experiments with rating ' + user.rating); console.log(`${user.worker_id} has done ${user.experiments.length} experiments with rating ${user.rating}`);
} }

14
controllers/before-begin/views/index.jade
View File

@ -4,11 +4,15 @@ block content
h1 Now, things are getting serious h1 Now, things are getting serious
p. p.
You have successfully completed the tutorial ! Now, things are getting You have successfully completed the tutorial ! Now, things are getting
serious. You will be prompted with three successive scenes, each of serious.
which containing 8 red coins. Your mission is simple: you have to p.
collect the 8 red coins. There may be recommendations like the ones you You will be prompted with three successive scenes, each of which
saw in the tutorial : they are here to help you navigate in the scene. containing 8 red coins. Your mission is simple: you have to collect the
Use them or ignore them at your convenience. 8 red coins.
p.
There may be recommendations like the ones you saw in the tutorial :
they are here to help you navigate in the scene. Use them or ignore
them at your convenience.
button#next.btn.btn-success.navbar-btn(style={'margin-right':'10px', 'margin-bottom':'10px'}) button#next.btn.btn-success.navbar-btn(style={'margin-right':'10px', 'margin-bottom':'10px'})
span Go to the next step span Go to the next step

2
js/l3d/apps/prototype/tutorial/TutorialSteps.js vendored
View File

@ -111,7 +111,7 @@ var TutorialSteps = function(tutoCamera, scene, coins, onWindowResize, container
justclick:false justclick:false
}, },
{ {
text: "Congratulations! You've successfully collected all the coins and completed the tutorial ! Click on the green button to continue!", text: "Congratulations! You've successfully collected all the coins and completed the tutorial ! Click on the colored button at the bottom of the page to continue!",
justclick: false justclick: false
} }
]; ];