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

Исправление кода в контроллерах

Browse Source
This commit is contained in:
ashen-1-dev
2020-12-18 03:02:31 +07:00
parent 654947873e
commit 98f2d8f65b
6 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/AnswerToTaskController.php
View File

@@ -16,9 +16,10 @@ class AnswerToTaskController extends Controller
$input = $request->all(); $input = $request->all();
$answer = AnswerToTask::create($input+ $answer = AnswerToTask::create($input+ [
['task_id' => $task->id, 'task_id' => $task->id,
'student_id' => auth()->user()->id]); 'student_id' => $request->student_id
]); //auth()->user()->id]
return response()->json($answer, 201); return response()->json($answer, 201);
} }

2
app/Http/Controllers/SchoolClassController.php
View File

@@ -67,7 +67,7 @@ class SchoolClassController extends Controller
$students = $class->students; $students = $class->students;
$studentsOnlyFIO = []; $studentsOnlyFIO = [];
foreach ($students as $student) { foreach ($students as $student) {
array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic')); array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic', 'photo'));
} }
return response()->json($studentsOnlyFIO, 200); return response()->json($studentsOnlyFIO, 200);
} }

6
app/Http/Controllers/TaskController.php
View File

@@ -44,9 +44,9 @@ class TaskController extends Controller
} }
public function store(TaskRequest $request) { public function store(TaskRequest $request) {
$teacherId = auth()->user()->id; $teacherId = $request->teacher_id; //auth()->user()->id;
$banktaskName = BankTask::find($request->banktask_id)->name; // $banktaskName = BankTask::find($request->banktask_id)->name;
$banktaskSubject = BankTask::find($request->banktask_id)->subject_id; // $banktaskSubject = BankTask::find($request->banktask_id)->subject_id;
$newTask = Task::create($request->all() + ['teacher_id' => $teacherId $newTask = Task::create($request->all() + ['teacher_id' => $teacherId
]); ]);

32
app/Http/Controllers/TaskFileController.php
View File

@@ -17,9 +17,7 @@ class TaskFileController extends Controller
public function store(Task $task, Request $request) public function store(Task $task, Request $request)
{ {
$taskId = $task->id; // НАДО ПОДУМАТЬ. СЕЙЧАС РАБОТАЕТ НЕКОРРЕКТНО. НУЖНО СДЕЛАТЬ ТАК ЧТО СИСТЕМА АВТОМАТИЧЕСКИ ОПРЕДЕЛЯЛА К КАКОМУ УЧЕНИКУ ЗАЛИВАТЬ ФАЙЛ УЧИТЕЛЮ $taskId = $task->id;
$studentId = auth()->user()->id;
$teacherId = auth()->user()->id;
$max_size = (int)ini_get('upload_max_filesize') * 1000; $max_size = (int)ini_get('upload_max_filesize') * 1000;
$all_ext = implode(',', $this->allExtensions()); $all_ext = implode(',', $this->allExtensions());
$this->validate($request, [ $this->validate($request, [
@@ -30,15 +28,18 @@ class TaskFileController extends Controller
$file = $request->file('file'); $file = $request->file('file');
$ext = $file->getClientOriginalExtension(); $ext = $file->getClientOriginalExtension();
$type = $this->getType($ext); $type = $this->getType($ext);
$userId = Student::find($request->student_id)->user_id;
if ($request->has('by_teacher') && ($request->by_teacher = 1)) { // auth()->user()->role_id == 2
if ($request->has('by_teacher') && (auth()->user()->role_id == 2)) { $pathToFile = 'public/task/' . $taskId . '/student/' . $userId . '/review/' . $type . '/';
$pathToFile = 'public/task/' . $taskId . '/student/' . $studentId . '/review/' . $type . '/'; $uri = '/storage/task' . '/' . $taskId . '/student/'. $userId . '/review/' . $type . '/' . $request->name;
$path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/review/' . $type . '/' . $request->name;
$review = 1; $review = 1;
} elseif (true) { } elseif (true) {
$pathToFile = 'public/task/' . $taskId . '/student/' . $studentId . '/' . $type . '/'; $pathToFile = 'public/task/' . $taskId . '/student/' . $userId . '/' . $type . '/';
$path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/' . $type . '/' . $request->name; $uri = '/storage/task' . '/' . $taskId . '/student/'. $userId . '/' . $type . '/' . $request->name;
$review = 0; $review = 0;
} }
@@ -49,14 +50,14 @@ class TaskFileController extends Controller
'type' => $type, 'type' => $type,
'extension' => $ext, 'extension' => $ext,
'task_id' => $taskId, 'task_id' => $taskId,
'url' => $path, 'url' => $uri,
'user_id' => $studentId, 'user_id' => $userId,
'review' => $review, 'review' => $review,
$file, $file,
$request->name . $ext $request->name . $ext
] ]
); );
return response()->json($request->by_teacher, 201); return response()->json(true, 201);
} }
return response()->json(false, 422); return response()->json(false, 422);
} }
@@ -98,8 +99,13 @@ class TaskFileController extends Controller
public function delete(TaskFile $file) { public function delete(TaskFile $file) {
$studentId = Student::where('user_id', '=', $file->user_id)->get()->id; $studentId = Student::where('user_id', '=', $file->user_id)->get()->id;
if (Storage::disk('local')->exists('/public/task/' . $file->task_id . '/student/' . $studentId . $file->type . '/' . $file->name)) { if ($file->review == true) {
if (Storage::disk('local')->delete('/public/task/' . $file->task_id . '/student/' . $studentId . $file->type . '/' . $file->name)) { $pathToFile = '/public/task/' . $file->task_id . '/student/' . $studentId . '/review/' . $file->type . '/' . $file->name;
} else {
$pathToFile = '/public/task/' . $file->task_id . '/student/' . $studentId . $file->type . '/' . $file->name;
}
if (Storage::disk('local')->exists($pathToFile)) {
if (Storage::disk('local')->delete($pathToFile)) {
return response()->json($file->delete()); return response()->json($file->delete());
} }
} }

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

@@ -31,6 +31,7 @@ class UserController extends Controller
} }
$user->toArray(); $user->toArray();
$user['role'] = auth()->user()->role->name; $user['role'] = auth()->user()->role->name;
$user['email'] = auth()->user()->email;
return response()->json($user, 200); return response()->json($user, 200);
} }

11
routes/api.php
View File

@@ -17,7 +17,6 @@ Route::apiResource('headteachers', 'Users\HeadTeacherController');
Route::apiResource('teachers', 'Users\TeacherController');//->middleware(['auth:api','role:headteacher|teacher']); Route::apiResource('teachers', 'Users\TeacherController');//->middleware(['auth:api','role:headteacher|teacher']);
Route::get('teacher/{teacher}/classes', 'Users\TeacherController@getClasses'); //получить классы у которых ведет учитель Route::get('teacher/{teacher}/classes', 'Users\TeacherController@getClasses'); //получить классы у которых ведет учитель
Route::get('teacher/{teacher}/classes', 'Users\TeacherController@getClasses');
Route::get('teacher/{teacher}/classes/{class}/unchecked-task', 'Users\TeacherController@getUncheckedTask'); Route::get('teacher/{teacher}/classes/{class}/unchecked-task', 'Users\TeacherController@getUncheckedTask');
Route::apiResource('students', 'Users\StudentController'); Route::apiResource('students', 'Users\StudentController');
@@ -25,7 +24,7 @@ Route::get('/student/{student}/answers', 'Users\StudentController@getAnswers');
Route::apiResource('parents', 'Users\ParenttController'); Route::apiResource('parents', 'Users\ParenttController');
Route::apiResource('subjects', 'BankTask\SubjectController'); Route::apiResource('subjects', 'BankTask\SubjectController');//->middleware(['auth:api', 'role:teacher|headteacher|student']);
Route::apiResource('classes', 'SchoolClassController'); Route::apiResource('classes', 'SchoolClassController');
Route::post('classes/{class}/teacher', 'SchoolClassController@addTeacher'); Route::post('classes/{class}/teacher', 'SchoolClassController@addTeacher');
@@ -36,12 +35,12 @@ Route::get('classes/{class}/subjects', 'SchoolClassController@getSubjects'); //
Route::apiResource('journal', 'JournalController'); Route::apiResource('journal', 'JournalController');
Route::apiResource('themes', 'BankTask\ThemeController'); Route::apiResource('themes', 'BankTask\ThemeController');//->middleware('auth:api');
Route::apiResource('timetables', 'TimetableController'); Route::apiResource('timetables', 'TimetableController');
Route::get('banktasks', 'BankTask\BankTaskController@index'); //получение списка всех заданий Route::get('banktasks', 'BankTask\BankTaskController@index'); //->middleware(['auth:api', 'role:teacher|headteacher']); //получение списка всех заданий
Route::group(['prefix' => 'banktask'], function () { Route::group(['prefix' => 'banktask' ], function () { // 'middleware' => 'auth:api', 'role:teacher|headteacher'
Route::post('', 'BankTask\BankTaskController@store'); //создание задания Route::post('', 'BankTask\BankTaskController@store'); //создание задания
Route::get('{banktask}', 'BankTask\BankTaskController@show'); //получение задания Route::get('{banktask}', 'BankTask\BankTaskController@show'); //получение задания
Route::put('{banktask}', 'BankTask\BankTaskController@update'); //обновление задания Route::put('{banktask}', 'BankTask\BankTaskController@update'); //обновление задания
@@ -65,7 +64,7 @@ Route::group(['prefix' => 'news'], function () {
Route::delete('/photo/{file}', 'News\NewsFileController@delete'); Route::delete('/photo/{file}', 'News\NewsFileController@delete');
}); });
Route::group(['prefix' => 'task'], function () { Route::group(['prefix' => 'task' ], function () { // 'middleware' => ['auth:api']
Route::post('', 'TaskController@store'); // Добавить таск Route::post('', 'TaskController@store'); // Добавить таск
Route::get('', 'TaskController@index'); // Показать задания для класса (в запросе нужно указывать Id класса) Route::get('', 'TaskController@index'); // Показать задания для класса (в запросе нужно указывать Id класса)
Route::get('/{task}', 'TaskController@show'); //Показать задание Route::get('/{task}', 'TaskController@show'); //Показать задание