Skip to content

Commit 7b6a063

Browse files
Resolve conflicts.
2 parents 9a4aae7 + 134841a commit 7b6a063

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/app/controllers/AuthController.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class AuthController {
3333
}
3434
const { id, name, usertype } = user;
3535

36-
let list = [];
36+
var list = [];
3737

3838
if (usertype === 0) {
3939
const relations = await GuardianChild.findAll({
@@ -50,6 +50,7 @@ class AuthController {
5050
list = undefined;
5151
}
5252

53+
5354
return res.json({
5455
user: {
5556
id,

src/routes.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ routes.get('/adm/list-professionals', TeacherController.list);
3333
routes.get('/adm/list-guardians', GuardianController.list);
3434
routes.get('/adm/list-classes', AdmController.listClasses);
3535
routes.get('/adm/list-anotations', AnotationController.listAll);
36+
routes.post('/adm/register-class-teacher', AdmController.registerTeacherClass);
3637
routes.delete('/adm/delete-class-teacher', AdmController.deleteTeacherClass);
3738
// routes.get('/adm/list-activities', ActivityController.list);
3839

0 commit comments

Comments
 (0)