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-17 02:40:47 +07:00
parent e0bc94e346
commit 654947873e
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,9 @@ class AnswerToTaskController extends Controller
$input = $request->all(); $input = $request->all();
$answer = AnswerToTask::create($input+ ['task_id' => $task->id, $answer = AnswerToTask::create($input+
'student_id' => 1]); ['task_id' => $task->id,
'student_id' => auth()->user()->id]);
return response()->json($answer, 201); return response()->json($answer, 201);
} }
@@ -32,13 +33,13 @@ class AnswerToTaskController extends Controller
$answer->name = $name; $answer->name = $name;
$answer->deadline = $task->deadline; $answer->deadline = $task->deadline;
$studentFile = TaskFile::where([ $studentFile = TaskFile::where([
['user_id', '=', '2'], // Auth::id() ['user_id', '=', $student->user_id],
['task_id', '=', $task->id], ['task_id', '=', $task->id],
['review', '=', 0] ['review', '=', 0]
]) ])
->get(['id','name', 'type', 'url']); ->get(['id','name', 'type', 'url']);
$teacherFile = TaskFile::where([ $teacherFile = TaskFile::where([
['user_id', '=', '2'], // Auth::id() ['user_id', '=', $student->user_id],
['task_id', '=', $task->id], ['task_id', '=', $task->id],
['review', '=', 1] ['review', '=', 1]
]) ])

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

@@ -44,7 +44,7 @@ class TaskController extends Controller
} }
public function store(TaskRequest $request) { public function store(TaskRequest $request) {
$teacherId = 1; // Auth()->id(); $teacherId = 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

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

@@ -17,8 +17,9 @@ 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 = 1; $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,7 +31,7 @@ class TaskFileController extends Controller
$ext = $file->getClientOriginalExtension(); $ext = $file->getClientOriginalExtension();
$type = $this->getType($ext); $type = $this->getType($ext);
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/' . $studentId . '/review/' . $type . '/'; $pathToFile = 'public/task/' . $taskId . '/student/' . $studentId . '/review/' . $type . '/';
$path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/review/' . $type . '/' . $request->name; $path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/review/' . $type . '/' . $request->name;
$review = 1; $review = 1;
@@ -49,7 +50,7 @@ class TaskFileController extends Controller
'extension' => $ext, 'extension' => $ext,
'task_id' => $taskId, 'task_id' => $taskId,
'url' => $path, 'url' => $path,
'user_id' => 2, 'user_id' => $studentId,
'review' => $review, 'review' => $review,
$file, $file,
$request->name . $ext $request->name . $ext