Refactor

nus-mtp · Mar 15, 2017 · de39375 · de39375
1 parent 820e9a9
commit de39375
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 11 deletions.
diff --git a/source/controller/dashboard.js b/source/controller/dashboard.js
@@ -54,21 +54,25 @@ var forceSyncIVLE = function (req, res, next) {
 	}
 }
 
-var findTutorials = function (req, res, next) {
+// Query methods
+
+// Returns JSON object containing users tutorial sessions and roles
+var getTutorials = function (req, res, next) {
 	if (req.body.auth.success) {
 		var user = req.body.auth.decoded;
-		var tuts = Tutorial.findTutorialSession(user.id).catch(function (err) {
+		console.log(user.id);
+		Tutorial.getTutorialsession(user.id).catch(function (err) {
 			res.json({success: false, message: err});
-		}).then(function() {
-			res.json({success: true, result: 'Synchronization Complete'});
+		}).then(function (data) {
+			res.json({success: true, result: 'Found tutorials'});
+			console.log(data[0].dataValues);
 		});
-		console.log(tuts);
 	} else {
 		res.send("Permission denied");
-
 	}
 }
 
+
 module.exports.get = get;
 module.exports.forceSyncIVLE = forceSyncIVLE;
-module.exports.findTutorials = findTutorials;
+module.exports.getTutorials = getTutorials;
diff --git a/source/router.js b/source/router.js
@@ -17,7 +17,8 @@ router.get ('/login/callback', login.callback);
 router.get ('/dashboard', auth.ensureAuth, dashboard.get);
 
 router.post('/api/dashboard/forceSyncIVLE', auth.ensureAuth, dashboard.forceSyncIVLE);
-router.post('/api/dashboard/findTutorials', auth.ensureAuth, dashboard.findTutorials);
+router.post('/api/dashboard/getTutorials', auth.ensureAuth, dashboard.getTutorials);
+
 
 //router.post('/api/dashboard/forceSyncIVLE', auth.ensureAuth, dashboard.forceSyncIVLE);
 //router.post ('/api/dashboard/getAllUserTutorialSessions', auth.ensureAuth, dashboard.getAllUserTutorialSessions);

diff --git a/source/view/dashboard.ejs b/source/view/dashboard.ejs
@@ -8,7 +8,7 @@
 </head>
 <body>
 User is: <%= user.name %>
-
+<br>
 
 
 <button id="sync-ivle">sync</button>
@@ -36,10 +36,10 @@ User is: <%= user.name %>
         });
     }
 
-    function findTutorials() {
+    function getTutorials() {
         $.ajax({
             type: 'POST',
-            url: '/api/dashboard/findTutorials',
+            url: '/api/dashboard/getTutorials',
             data: { },
             dataType: 'json',
             success: function(data) {
@@ -52,6 +52,10 @@ User is: <%= user.name %>
         syncIVLE();
     });
 
+    $('#get-mods').click(function() {
+        getTutorials();
+    });
+
 </script>