robonen/education-project
1
0
Fork 0
mirror of https://github.com/robonen/education-project.git synced 2026-03-20 02:44:31 +00:00
Code Activity

Merge branch 'timetable' of https://github.com/Robonen/education-project into timetable

Browse Source
This commit is contained in:
ashen-1-dev
2020-12-17 00:29:15 +07:00
parent 1195db8958 51f178ddd6
commit f9ba08b546
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Users/TeacherController.php
View File

@@ -83,11 +83,11 @@ class TeacherController extends Controller
$subjects = $subjects->unique()->values(); $subjects = $subjects->unique()->values();
$classes->push([ $classes->push([
'id' => $class['id'], 'id' => $class['id'],
'number' => $class['number'], 'number' => $class['number'],
'letter' => $class['letter'], 'letter' => $class['letter'],
'subjects' => $subjects, 'subjects' => $subjects,
]); ]);
} }

2
app/Http/Controllers/Users/UserController.php
View File

@@ -29,7 +29,7 @@ class UserController extends Controller
$user = auth()->user()->parent; $user = auth()->user()->parent;
break; break;
} }
return response()->json($user); return response()->json($user, 200);
} }
} }