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

Some commit

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-09-09 15:18:18 +02:00
parent 464b3a47c0
commit 5e844538d2
7 changed files with 164 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
posts/arrow-clicked/index.js
View File

@@ -7,7 +7,7 @@ module.exports.index = function(req, res) {
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO arrowclicked(exp_id, arrow_id, time) VALUES($1,$2, to_timestamp($3));",
[req.session.exp_id, req.body.arrow_id, req.body.time],
[req.session.expId, req.body.arrowId, req.body.time],
function(err, result) {
if (err !== null)
Log.dberror(err + ' arrow-clicked');

36
posts/identification/index.js
View File

@@ -7,32 +7,20 @@ module.exports.index = function(req, res) {
db.checkUserName(req.body.inputId, function(ok) {
if (!ok) {
db.tryUser(req.session.userId, function(id) {
req.session.userId = id;
req.session.save();
pg.connect(secret.url, function(err, client, release) {
client.query(
"UPDATE Users SET worker_id = $1, age = $2, male = $3, rating = $5, lasttime = $6 WHERE id = $4;",
[
req.body.inputId,
req.body.inputAge,
req.body.inputGender === 'male',
req.session.userId,
req.body.input3dskills,
req.body.inputLastTime
],
function(err, result) {
if (err !== null)
Log.dberror(err + ' in identfication');
release();
}
);
});
db.createUser(
req.body.inputId,
req.body.inputAge,
req.body.inputGender === 'male',
req.body.input3dskills,
req.body.inputLastTime,
function(id) {
req.session.userId = id;
req.session.save();
res.redirect('/prototype/tutorial');
}
);
res.redirect('/prototype/tutorial');
});
} else {
req.session.identificationFailed = true;
res.redirect('/user-study');