From c3af24fb0e97ed5c7f150b487876a84edb1f0471 Mon Sep 17 00:00:00 2001
From: timothyferrell <tj.ferrell@gmail.com>
Date: Tue, 25 Apr 2017 16:24:42 -0600
Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/master' into
 studentView

# Conflicts:
#	database/database.sqlt

Fixed a bug... in dashboard
---
 database/database.sqlt      | Bin 69632 -> 69632 bytes
 public/js/questions.js      |   1 +
 routes/student.js           |   2 +-
 views/student_dashboard.hbs |   2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/database/database.sqlt b/database/database.sqlt
index 7f0d0f7d5832807aaa5b0b20a4254898f7a59787..2ecb68d53cec02b0b8bd079d72fdcc31c82721b8 100644
GIT binary patch
delta 3298
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
U!C=0BgDl<`zeVxFS6C?h1tW!_)&Kwi

delta 322
zcmX|*F-rqM5QS%NFJ~5R@7)!0g^EEC1QBCrrx5%BV$$c(D-5W?jbb5~%1(%+5VSDp
z4-i=pK^wai7OCZkV0necLW>~iM$l%M?=kPqtGDcW%WjOY-0^53lcSmU+v~N~tnZ*f
z_{0Tn(7^*5I>_zgz<2m0E2(&UC0?zqZ*3~ewfGqOCp?oQN`mu{E$u}c%90sA&Wf?B
z6(SWYE^UL$JB9~ln}|a3duTQ({$jF>hhp$WNuyhsCKSye(pdahaBZ28cZf4g$V3PJ
zqtwaKl;zq;316mj52<PUgl7633gcp^5GqD0qglB+br|}Dz7EQ7$Wn#}BASzztm<o4
pWxjhy-0PCp#V+zDz2oWbYn~bR3!1(2;UTmM3ED=u$4MJ({s&pVTzdcj

diff --git a/public/js/questions.js b/public/js/questions.js
index 93570fc..f1e46e1 100644
--- a/public/js/questions.js
+++ b/public/js/questions.js
@@ -95,6 +95,7 @@ function displayQuestion(id){
             starter = "#include<iostream>\n\nusing namespace std;\n\nint main(){\n    cout << \"Hello World\"<< endl;\n    return 0;\n}"
         }
         editor.setValue(starter);
+        editor.resize();
         if(id === 0){
             prev = false;
             $("#prev").attr("disabled","");
diff --git a/routes/student.js b/routes/student.js
index e3bc04c..bd141cd 100644
--- a/routes/student.js
+++ b/routes/student.js
@@ -108,7 +108,7 @@ module.exports = function (app, passport) {
         let userProm = db.User.findById(req.session.passport.user.id);
         Promise.all([examProm, userProm]).then(function (res1) {
             //Create the submision ...
-            db.Submission.create({date_submitted:Date.now()}).then(function (sub) {
+            db.Submission.create({date_submitted:new Date()}).then(function (sub) {
                 res1[1].addSubmission(sub);
                 res1[0].addSubmission(sub);
                 let data = JSON.parse(req.body.submission);
diff --git a/views/student_dashboard.hbs b/views/student_dashboard.hbs
index 33e009e..72d1e95 100644
--- a/views/student_dashboard.hbs
+++ b/views/student_dashboard.hbs
@@ -13,7 +13,7 @@
             {{rules_stmt}}
         </div>
         <div class="mdl-card__actions mdl-card--border">
-            <a class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect" href="/exam/take/1">
+            <a class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect" href="/exam/take/{{id}}">
                 Take Exam
             </a>
             <a class="mdl-button mdl-button--colored mdl-js-button mdl-js-ripple-effect" href="/edit/exam/{{id}}">