Skip to content

Merge remote-tracking branch 'remotes/origin/master' into studentView #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dragonman117 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merge remote-tracking branch 'remotes/origin/master' into studentView #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified database/database.sqlt
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions public/js/questions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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","");
Expand Down
2 changes: 1 addition & 1 deletion routes/student.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion views/student_dashboard.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}}">
Expand Down