diff --git a/model/createHelperData.js b/model/createHelperData.js
new file mode 100644
index 0000000..c3648b0
--- /dev/null
+++ b/model/createHelperData.js
@@ -0,0 +1,48 @@
+/* randomly sorts videos(with AI and without AI) and inserts rows in database
+Author: Vaishali*/
+const db = require('../db/database');
+const userStudy = require('../model/userStudy');
+
+class createHelperData {
+ constructor() {
+ this.id = 'id_1';
+ }
+ set name(name) {
+ this._name = name.charAt(0).toUpperCase() + name.slice(1);
+ }
+ get name() {
+ return this._name;
+ }
+ sayHello() {
+ console.log('Hello, my name is ' + this.name + ', I have ID: ' + this.id);
+ }
+
+ create1(userId, callback) {
+ return db.query('SELECT * FROM us_user ORDER BY id ASC', callback);
+ }
+
+ create
+}
+
+var justAGuy = new createHelperData();
+justAGuy.name = 'martin'; // The setter will be used automatically here.
+justAGuy.sayHello(); // Will output 'Hello, my name is Martin, I have ID: id_1'
+
+// userStudy.getAllUsers().then(function (result) {
+// userDetails = result;
+// console.log("Initialized user details");
+// // Use user details from here
+// console.log(result)
+// }, function (err) {
+// console.log(err);
+// })
+
+justAGuy.create1().then(function (result) {
+ userDetails = result;
+ console.log("Initialized user details");
+ // Use user details from here
+ console.log(result)
+}, function (err) {
+ console.log(err);
+});
+
diff --git a/model/userStudy.js b/model/userStudy.js
index db4f60d..0a61d39 100644
--- a/model/userStudy.js
+++ b/model/userStudy.js
@@ -20,8 +20,12 @@ let userStudy = {
},
addVideo : function(data, callback){
return db.query(`INSERT into us_user_video (user_id,youtube_id, ai_support) VALUES ($1, $2, $3)`, [data.id, data.youtube_id, data.ai_support], callback);
- }
-
+ },
+ getHelperVideo: function (callback) {
+ return db.query(`SELECT u.volunteer_id, u.video_id, v.title, u.ai_support FROM us_helper_video u
+ JOIN video v
+ ON u.video_id = v.youtube_id `, callback);
+ },
};
diff --git a/model/userStudy2.js b/model/userStudy2.js
new file mode 100644
index 0000000..aa6d14d
--- /dev/null
+++ b/model/userStudy2.js
@@ -0,0 +1,13 @@
+const db = require('../db/database');
+let userStudy2 = {
+
+ getAllUsers: function (callback) {
+ return db.query('SELECT * FROM us_user_blind ORDER BY id ASC', callback);
+ },
+
+ getUserById: function (id, callback) {
+ return db.query(`SELECT * FROM us_user_blind where uuid = ${id}`, callback);
+ },
+};
+
+module.exports = userStudy2;
diff --git a/public/javascripts/homeUserStudy2.js b/public/javascripts/homeUserStudy2.js
new file mode 100644
index 0000000..715f038
--- /dev/null
+++ b/public/javascripts/homeUserStudy2.js
@@ -0,0 +1,13 @@
+$(document).ready(function () {
+ fetchUsers();
+});
+
+function fetchUsers() {
+ $.get('/userStudy2/users', function (rows) {
+ let generatedHtml = '';
+ for (let i = 0; i < rows.length; i++) {
+ generatedHtml += ` ${rows[i].name} `
+ }
+ $( ".list-group" ).append(generatedHtml);
+ });
+}
\ No newline at end of file
diff --git a/public/stylesheets/homeUserStudy2.css b/public/stylesheets/homeUserStudy2.css
new file mode 100644
index 0000000..e69de29
diff --git a/routes/index.js b/routes/index.js
index 7537887..1efb504 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -2,6 +2,8 @@ var express = require('express');
var router = express.Router();
const video = require('../backend/video');
const userStudy = require('../model/userStudy');
+const userStudy2 = require('../model/userStudy2');
+
const db = require('../db/database');
router.get('/', function(req, res, next) {
@@ -103,12 +105,43 @@ router.post('/updateBlockAndScene', function(req, res, next) {
router.get('/userStudy', function (req, res) {
res.render('homeUserStudy', { title: 'User Study' });
});
+
+//poorva
+router.get('/userStudy2', function (req, res) {
+ res.render('homeUserStudy2', { title: 'User Study 2' });
+});
+
//list of video for a user
router.get('/userStudy/video', function (req, res) {
res.render('videoUserStudy', { title: 'User Study Video' });
});
+//list of video for visually impaired users
+router.get('/userStudy/videoHelper', function (req, res) {
+ res.render('videoHelper', { title: 'User Study Video Helper' });
+});
+
+
+//list of visually impaired users
+router.get('/userStudy/helper/video', function (req, res) {
+ console.log({ param: req.query.userId });
+ let userId = req.query.userId;
+ if (userId) {
+ let queryResult = userStudy.getHelperVideo();
+ queryResult
+ .then(result => {
+ res.send(result);
+ })
+ .catch((err) => {
+ res.send(err);
+ });
+ }
+});
+
+
+
//list of users
+//list of users study 1
router.get('/userStudy/users/', function (req, res) {
console.log({param: req.query.userId});
let userId = req.query.userId;
@@ -135,6 +168,23 @@ router.get('/userStudy/users/', function (req, res) {
}
});
+
+//list of users study 2
+router.get('/userStudy2/users/', function (req, res) {
+ // let userId = req.query.userId;
+ // if(userId){
+ //let queryResult = userStudy2.getVideoByUserId(userId);
+ let queryResult = db.query(`SELECT * from us_user_blind`);
+ queryResult
+ .then(result => {
+ res.send(result);
+ })
+ .catch((err) => {
+ res.send(err);
+ });
+ // }
+});
+
router.post('/saveNonAiDescription', function(req, res, next) {
let inputJson = req.body;
console.log(inputJson);
@@ -155,6 +205,10 @@ router.post('/saveAiDescription', function(req, res, next) {
}).catch((err) => {
res.send({success: false});
});
-})
+
+
+
+res.render('index', { title: 'Express' });
+});
module.exports = router;
diff --git a/views/homeUserStudy2.ejs b/views/homeUserStudy2.ejs
new file mode 100644
index 0000000..76061e2
--- /dev/null
+++ b/views/homeUserStudy2.ejs
@@ -0,0 +1,27 @@
+
+
+
+ User Study 2
+
+
+
+
+
+
+
+
+
+
+
+
Participant List
+
+
Please click on the Participant Number assigned to you
+
+
+
+
+
+
+
List of Video
+
+
Please select the video
+
+
+
+
+
+
+
+
+