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

From mixed convetion (_, and camel case) to all camel case

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-08-28 21:34:29 +02:00
parent f136ce833f
commit 74cad3824b
40 changed files with 323 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
posts/coin-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 coinclicked(exp_id, coin_id, time) VALUES($1,$2, to_timestamp($3));",
[req.session.exp_id, req.body.coin_id, req.body.time],
[req.session.expId, req.body.coinId, req.body.time],
function(err, result) {
if (err !== null)
Log.dberror(err + ' in coin-clicked');

2
posts/fps/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 fpscounter(exp_id, fps, time) VALUES($1,$2,to_timestamp($3));",
[req.session.exp_id, req.body.fps, req.body.time],
[req.session.expId, req.body.fps, req.body.time],
function(err, result) {
if (err !== null)
Log.dberror(err + ' in fps');

4
posts/hovered/index.js
View File

@@ -9,10 +9,10 @@ module.exports.index = function(req, res) {
"INSERT INTO hovered(exp_id, time, start, arrow_id)" +
"VALUES($1, to_timestamp($2), $3, $4);" ,
[
req.session.exp_id,
req.session.expId,
req.body.time,
req.body.start ? true : false,
req.body.arrow_id
req.body.arrowId
],
function(err, result) {
if (err !== null)

6
posts/identification/index.js
View File

@@ -7,8 +7,8 @@ module.exports.index = function(req, res) {
db.checkUserName(req.body.inputId, function(ok) {
if (!ok) {
db.tryUser(req.session.user_id, function(id) {
req.session.user_id = id;
db.tryUser(req.session.userId, function(id) {
req.session.userId = id;
req.session.save();
pg.connect(secret.url, function(err, client, release) {
@@ -18,7 +18,7 @@ module.exports.index = function(req, res) {
req.body.inputId,
req.body.inputAge,
req.body.inputGender === 'male',
req.session.user_id,
req.session.userId,
req.body.input3dskills,
req.body.inputLastTime
],

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

@@ -9,7 +9,7 @@ module.exports.index = function(req, res) {
"INSERT INTO keyboardevent(exp_id, camera, time, keycode, keypressed)" +
"VALUES($1, ROW(ROW($2,$3,$4),ROW($5,$6,$7)), to_timestamp($8), $9, $10);" ,
[
req.session.exp_id,
req.session.expId,
req.body.camera.position.x,
req.body.camera.position.y,
req.body.camera.position.z,

4
posts/pointer-locked/index.js
View File

@@ -7,10 +7,10 @@ module.exports.index = function(req, res) {
pg.connect(secret.url, function(err, client, release) {
client.query(
"INSERT INTO pointerlocked(exp_id, locked, time) VALUES($1,$2,to_timestamp($3));",
[req.session.exp_id, req.body.locked, req.body.time],
[req.session.expId, req.body.locked, req.body.time],
function(err, result) {
if (err !== null)
Log.dberror(err + ' in fps');
Log.dberror(err + ' in pointer-lock');
release();
}
);

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

@@ -9,7 +9,7 @@ module.exports.index = function(req, res) {
"INSERT INTO previousnextclicked(exp_id, previousnext, time, camera)" +
"VALUES($1, $2, to_timestamp($3), ROW(ROW($4,$5,$6), ROW($7,$8,$9)));" ,
[
req.session.exp_id,
req.session.expId,
req.body.previous ? 'p' : 'n',
req.body.time,
req.body.camera.position.x,

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

@@ -9,7 +9,7 @@ module.exports.index = function(req, res) {
"INSERT INTO resetclicked(exp_id, time)" +
"VALUES($1, to_timestamp($2));" ,
[
req.session.exp_id,
req.session.expId,
req.body.time
],
function(err, result) {

2
posts/switched-lock-option/index.js
View File

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