Merge branch 'master' into nhat

qlsv_be/controllers/admin/student.controller.js

@@ -41,8 +41,6 @@ const addStudent = async (req, res) => {
     }
 };
 
-
-
 // Delete a student
 const deleteStudent = async (req, res) => {
     const { mssv } = req.params;

qlsv_be/controllers/admin/teacher.controller.js

@@ -39,8 +39,6 @@ const addTeacher = async (req, res) => {
         res.status(400).send(error.message);
     }
 };
-
-
 const deleteTeacher = async (req, res) => {
     const { msgv } = req.params;
 

qlsv_be/controllers/users/student.controller.js

@@ -1,7 +1,7 @@
 const bcrypt = require('bcrypt');
 const jwt = require('jsonwebtoken');
 const { validationResult } = require('express-validator');
-const studentModel = require('../../models/student.model');
+const teacherModel = require('../../models/teacher.model');
 
 const login = async (req, res) => {
     const errors = validationResult(req);

qlsv_be/models/student.model.js

@@ -33,7 +33,6 @@ const studentSchema = new mongoose.Schema({
         type: Boolean,
         default: false
     },
-
       // Training information
     training_info:{
         namNhapHoc: String,

qlsv_be/routes/users/studentdashboard.route.js

@@ -8,7 +8,6 @@ const tkb = require('../../controllers/users/tkb.controller');
 const bangdiem = require('../../controllers/users/bangdiem.controller');
 const lichthi = require('../../controllers/users/lichthi.controller');
 
-
 router.use('/thongtinsinhvien', thongtinSinhVien.dashboard);
 router.use('/thongtindaotao', thongtinDaoTao.dashboard);
 router.use('/tkb', tkb.dashboard);
@@ -17,4 +16,8 @@ router.use('/bangdiem', bangdiem.dashboard);
 router.get('/lichthi', lichthi.getAllLichThi);
 router.get('/lichthi/:courseCode', lichthi.getLichThi);
 
+router.use('/tkb',tkb.dashboard);
+router.get('/lichthi',lichthi.getAllLichThi);
+router.get('/lichthi/:courseCode',lichthi.getLichThi);
+router.use('/bangdiem',bangdiem.dashboard);
 module.exports = router;

qlsv_be/routes/users/teacher.route.js

@@ -19,5 +19,4 @@ router.post('/login', [
 
 router.use('/dashboard', authenticate, teacherDashboard);
 
-
 module.exports = router;