From d694c1a73f77def42c17b58027f046bf9e1af809 Mon Sep 17 00:00:00 2001
From: Waref Haque <warefhaque@inside-239-60.wireless.utoronto.ca>
Date: Wed, 20 Jul 2016 22:10:32 -0400
Subject: questions for each exam page

---
 routes/index.js | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'routes')

diff --git a/routes/index.js b/routes/index.js
index 84087e7..16f5778 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -83,6 +83,27 @@ router.get('/search', function(req, res, next) {
     res.redirect('/exams/' + courseName);
 });
 
+
+/* REDIRECT - exam -> questions page*/
+router.get('/exam_click',function (req,res) {
+    //TODO:get needs to have exam_id attached
+    var examId = req.query.exam_id;
+    res.redirect('/questions/'+examId);
+});
+
+/*EXAMPLE DATA GIVEN BELOW:
+ * questions = [{id,count,comments},{id,count,comments}] --> array of "question" objects
+ *
+ * id = questions number
+ * count= number of solutions
+ * comments = number of comments*/
+router.get('/questions/:exam_id', function (req,res) {
+    dbFile.get_exam_info_by_ID(req.params.exam_id, function (questions) {
+
+        res.render('questions', {query: questions});
+    });
+});
+
 router.get('/signup', function(req, res, next) {
     res.render('signup', {csrfToken: req.csrfToken()});
 });
-- 
cgit v1.2.3


From 2549ee68e435b77e7e07d3ea95363268cbfe9164 Mon Sep 17 00:00:00 2001
From: HumairAK <humair88@hotmail.com>
Date: Thu, 21 Jul 2016 02:24:24 -0400
Subject: Added other dependencies for authentication, made minor adjustments
 to index.js, added templating for exams, will remove dependencie modules
 later, keep for now

---
 routes/index.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'routes')

diff --git a/routes/index.js b/routes/index.js
index 16f5778..ff7de10 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -59,10 +59,11 @@ router.get('/exams/:id', function(req, res, next) {
             //console.log(exams);
             //only pass over the information that is necessary for the exams page
             for (var i = 0; i<exams.length;i++){
+                var getInstructors = exams[i].instructors.join(", ");
                 var minExamInfo = {     courseCode:exams[i].course_code,
                     year:exams[i].year,
                     term:toProperCase(exams[i].term),
-                    instructors:exams[i].instructors,
+                    instructors: getInstructors,
                     type:toProperCase(exams[i].type) + " Examination",
                     title:exams[i].title,
                     id:exams[i]._id
@@ -72,7 +73,7 @@ router.get('/exams/:id', function(req, res, next) {
             }
         }
         console.log(minExamInfoArray);
-        res.render('exams', {query: minExamInfoArray});
+        res.render('exams',  {query: req.params.id, result: minExamInfoArray});
     });
 });
 
-- 
cgit v1.2.3