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

Added user_id and exp_id (disinction between both)

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-06-04 16:52:58 +02:00
parent c82f735273
commit fa063a0f91
10 changed files with 185 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,13 +3,10 @@ var secret = require('../../private');
module.exports.index = function(req, res) {
var user_id = req.session.user_id;
var arrow_id = req.body.arrow_id;
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO arrowclicked(user_id, arrow_id, time) VALUES($1,$2, to_timestamp($3));",
[user_id, arrow_id, req.body.time],
"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],
function(err, result) {
release();
}
@@ -17,6 +14,4 @@ module.exports.index = function(req, res) {
});
res.setHeader('Content-Type', 'text/html');
res.send("user_id = " + user_id);
}

10
posts/coin-clicked/index.js
View File

@@ -3,13 +3,10 @@ var secret = require('../../private');
module.exports.index = function(req, res) {
var user_id = req.session.user_id;
var coin_id = req.body.coin_id;
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO coinclicked(user_id, coin_id, time) VALUES($1,$2, to_timestamp($3));",
[user_id, coin_id, req.body.time],
"INSERT INTO coinclicked(exp_id, coin_id, time) VALUES($1,$2, to_timestamp($3));",
[req.session.exp_id, req.body.coin_id, req.body.time],
function(err, result) {
release();
}
@@ -17,6 +14,5 @@ module.exports.index = function(req, res) {
});
res.setHeader('Content-Type', 'text/html');
res.send("user_id = " + user_id);
res.send("");
}

9
posts/hovered/index.js
View File

@@ -3,14 +3,12 @@ var secret = require('../../private');
module.exports.index = function(req, res) {
var user_id = req.session.user_id;
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO hovered(user_id, time, start, arrow_id)" +
"INSERT INTO hovered(exp_id, time, start, arrow_id)" +
"VALUES($1, to_timestamp($2), $3, $4);" ,
[
user_id,
req.session.exp_id,
req.body.time,
req.body.start ? true : false,
req.body.arrow_id
@@ -22,6 +20,5 @@ module.exports.index = function(req, res) {
});
res.setHeader('Content-Type', 'text/html');
res.send("user_id = " + user_id);
res.send("");
}

22
posts/keyboard-event/index.js
View File

@@ -3,22 +3,19 @@ var secret = require('../../private');
module.exports.index = function(req, res) {
var user_id = req.session.user_id;
var camera = req.body.camera;
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO keyboardevent(user_id, camera, time)" +
"INSERT INTO keyboardevent(exp_id, camera, time)" +
"VALUES($1, ROW(ROW($2,$3,$4),ROW($5,$6,$7)), to_timestamp($8));" ,
[
user_id,
camera.position.x,
camera.position.y,
camera.position.z,
req.session.exp_id,
req.body.camera.position.x,
req.body.camera.position.y,
req.body.camera.position.z,
camera.target.x,
camera.target.y,
camera.target.z,
req.body.camera.target.x,
req.body.camera.target.y,
req.body.camera.target.z,
req.body.time
],
@@ -29,6 +26,5 @@ module.exports.index = function(req, res) {
});
res.setHeader('Content-Type', 'text/html');
res.send("user_id = " + user_id);
res.send("")
}

21
posts/previous-next-clicked/index.js
View File

@@ -3,23 +3,20 @@ var secret = require('../../private');
module.exports.index = function(req, res) {
var user_id = req.session.user_id;
var camera = req.body.camera;
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO previousnextclicked(user_id, previousnext, time, camera)" +
"INSERT INTO previousnextclicked(exp_id, previousnext, time, camera)" +
"VALUES($1, $2, to_timestamp($3), ROW(ROW($4,$5,$6), ROW($7,$8,$9)));" ,
[
user_id,
req.session.exp_id,
req.body.previous ? 'p' : 'n',
req.body.time,
camera.position.x,
camera.position.y,
camera.position.z,
camera.target.x,
camera.target.y,
camera.target.z
req.body.camera.position.x,
req.body.camera.position.y,
req.body.camera.position.z,
req.body.camera.target.x,
req.body.camera.target.y,
req.body.camera.target.z
],
function(err, result) {
release();
@@ -28,6 +25,6 @@ module.exports.index = function(req, res) {
});
res.setHeader('Content-Type', 'text/html');
res.send("user_id = " + user_id);
res.send("");
}

9
posts/reset-clicked/index.js
View File

@@ -3,15 +3,12 @@ var secret = require('../../private');
module.exports.index = function(req, res) {
var user_id = req.session.user_id;
var camera = req.body.camera;
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO resetclicked(user_id, time)" +
"INSERT INTO resetclicked(exp_id, time)" +
"VALUES($1, to_timestamp($2));" ,
[
user_id,
req.session.exp_id,
req.body.time
],
function(err, result) {
@@ -21,6 +18,6 @@ module.exports.index = function(req, res) {
});
res.setHeader('Content-Type', 'text/html');
res.send("user_id = " + user_id);
res.send("");
}