projects
/
qomet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactoring, better README (breaking commit...)
[qomet.git]
/
routes
/
courses.js
diff --git
a/routes/courses.js
b/routes/courses.js
index
d221858
..
89b38b3
100644
(file)
--- a/
routes/courses.js
+++ b/
routes/courses.js
@@
-3,7
+3,6
@@
const access = require("../utils/access.js");
const validator = require("../public/javascripts/utils/validation");
const sanitizeHtml = require('sanitize-html');
const ObjectId = require("bson-objectid");
const validator = require("../public/javascripts/utils/validation");
const sanitizeHtml = require('sanitize-html');
const ObjectId = require("bson-objectid");
-const CourseEntity = require("../entities/course");
const CourseModel = require("../models/course");
router.get('/add/course', access.ajax, access.logged, (req,res) => {
const CourseModel = require("../models/course");
router.get('/add/course', access.ajax, access.logged, (req,res) => {
@@
-12,7
+11,7
@@
router.get('/add/course', access.ajax, access.logged, (req,res) => {
let error = validator({code:code}, "Course");
if (error.length > 0)
return res.json({errmsg:error});
let error = validator({code:code}, "Course");
if (error.length > 0)
return res.json({errmsg:error});
- Course
Entity
.insert(req.user._id, code, description, (err,course) => {
+ Course
Model
.insert(req.user._id, code, description, (err,course) => {
access.checkRequest(res, err, course, "Course addition failed", () => {
res.json(course);
});
access.checkRequest(res, err, course, "Course addition failed", () => {
res.json(course);
});
@@
-55,7
+54,7
@@
router.get('/get/student', access.ajax, (req,res) => {
let error = validator({ _id: cid, students: [{number:number}] }, "Course");
if (error.length > 0)
return res.json({errmsg:error});
let error = validator({ _id: cid, students: [{number:number}] }, "Course");
if (error.length > 0)
return res.json({errmsg:error});
- Course
Entity
.getStudent(ObjectId(cid), number, (err,ret) => {
+ Course
Model
.getStudent(ObjectId(cid), number, (err,ret) => {
access.checkRequest(res, err, ret, "Failed retrieving student", () => {
res.json({student: ret.students[0]});
});
access.checkRequest(res, err, ret, "Failed retrieving student", () => {
res.json({student: ret.students[0]});
});