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 'journal' into timetable

Browse Source 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/Auth/RegisterController.php
#	app/Http/Controllers/TimetableController.php
#	app/Models/SchoolClass.php
#	app/Models/User.php
#	composer.lock
This commit is contained in:
Andrew Robonen
2020-12-16 23:14:06 +07:00
parent 1726a499d1 be8b5faa32
commit b9326ad722
49 changed files with 2078 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
app/Http/Controllers/AnswerToTaskController.php Normal file
View File

@@ -0,0 +1,70 @@
<?php
namespace App\Http\Controllers;
use App\Models\AnswerToTask;
use App\Models\BankTask;
use Illuminate\Http\Request;
use App\Models\Task;
use Illuminate\Support\Facades\Auth;
use App\Models\Student;
use App\Models\TaskFile;
class AnswerToTaskController extends Controller
{
public function store(Task $task, Request $request) {
$input = $request->all();
$answer = AnswerToTask::create($input+ ['task_id' => $task->id,
'student_id' => 1]);
return response()->json($answer, 201);
}
public function show(Task $task, Student $student) {
$name = BankTask::find($task->banktask_id)->name;
$answer = AnswerToTask::where([
['student_id', '=', $student->id],
['task_id', '=', $task->id]
])->get();
$answer->name = $name;
$answer->deadline = $task->deadline;
$studentFile = TaskFile::where([
['user_id', '=', '2'], // Auth::id()
['task_id', '=', $task->id],
['review', '=', 0]
])
->get(['id','name', 'type', 'url']);
$teacherFile = TaskFile::where([
['user_id', '=', '2'], // Auth::id()
['task_id', '=', $task->id],
['review', '=', 1]
])
->get(['id','name', 'type', 'url']);
return response()->json([
'answer' => $answer,
'files' => [
'student' => $studentFile,
'teacher' => $teacherFile
]
],200);
}
public function delete(AnswerToTask $answer){
$answer->delete();
return response()->json(true, 204);
}
public function update(AnswerToTask $answer, Request $request) {
$answer->description = $request->input('description');
$answer->save();
return $answer;
}
}

7
app/Http/Controllers/BankTaskController.php → app/Http/Controllers/BankTask/BankTaskController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\BankTask;
use App\Http\Requests\BankTaskRequest;
use App\Models\BankTask;
@@ -12,6 +12,7 @@ use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Models\BankTaskFile;
use Illuminate\Support\Facades\DB;
use App\Http\Controllers\Controller;
class BankTaskController extends Controller
{
@@ -27,7 +28,7 @@ class BankTaskController extends Controller
$tasks = $tasks->newQuery();
if ($request->has('name')) {
$tasks->where('name', 'like', $request->input('name').'%');
$tasks->where('name', 'ilike', $request->input('name').'%');
}
if ($request->has('subject_id')) {
$tasks->where('subject_id', $request->input('subject_id'));
@@ -37,7 +38,7 @@ class BankTaskController extends Controller
}
if ($request->has('author')) {
$tasks->where('author', 'like', $request->input('author').'%');
$tasks->where('author', 'ilike', $request->input('author').'%');
}
if ($request->has('count')) {

4
app/Http/Controllers/BankTaskFileController.php → app/Http/Controllers/BankTask/BankTaskFileController.php
View File

@@ -1,12 +1,13 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\BankTask;
use App\Models\BankTask;
use http\Env\Response;
use Illuminate\Http\Request;
use App\Models\BankTaskFile;
use Illuminate\Support\Facades\Storage;
use App\Http\Controllers\Controller;
class BankTaskFileController extends Controller
@@ -78,7 +79,6 @@ class BankTaskFileController extends Controller
}
public function delete(BankTaskFile $file) {
echo $file;
if (Storage::disk('local')->exists('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name )) {
if (Storage::disk('local')->delete('/public/banktask/' . $file->banktask_id . '/' . $file->type . '/' . $file->name)) {
return response()->json($file->delete());

5
app/Http/Controllers/SubjectController.php → app/Http/Controllers/BankTask/SubjectController.php
View File

@@ -1,12 +1,13 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\BankTask;
use App\Http\Requests\SubjectRequest;
use App\Models\Subject;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class SubjectController extends Controller
{
@@ -17,7 +18,7 @@ class SubjectController extends Controller
*/
public function index()
{
return response()->json(Subject::all()->sortBy('name'), 200);
return response()->json(Subject::all(), 200);
}
/**

5
app/Http/Controllers/ThemeController.php → app/Http/Controllers/BankTask/ThemeController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace App\Http\Controllers;
namespace App\Http\Controllers\BankTask;
use App\Http\Requests\ThemeRequest;
@@ -9,6 +9,7 @@ use http\Env\Response;
use Illuminate\Database\QueryException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
class ThemeController extends Controller
{
@@ -20,7 +21,7 @@ class ThemeController extends Controller
*/
public function index(Request $request)
{
return response()->json(Theme::all()->sortBy($request->input('sort_by')), 200);
return response()->json(Theme::all(), 200);
}
/**

115
app/Http/Controllers/JournalController.php Normal file
View File

@@ -0,0 +1,115 @@
<?php
namespace App\Http\Controllers;
use App\Filters\JournalFilter;
use App\Http\Requests\JournalRequest;
use App\Models\Journal;
use Carbon\Carbon;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Response;
class JournalController extends Controller
{
/**
* Display a listing of the resource.
*
* @param Request $request
* @return JsonResponse
*/
public function index(Request $request)
{
$journal = (new JournalFilter(Journal::all(), $request))->apply()->values();
return response()->json($journal, 200);
}
/**
* Show the form for creating a new resource.
*
* @return Response
*/
// public function create()
// {
// //
// }
/**
* Store a newly created resource in storage.
*
* @param JournalRequest $request
* @return JsonResponse
*/
public function store(JournalRequest $request)
{
if ($request->has('date'))
$date = Carbon::createFromTimestamp($request->get('date')/1000)->floorDays();
else
$date = Carbon::now()->floorDays();
$exist = Journal::where('updated_at', $date)
->where('student_id', $request->get('student_id'))
->where('subject_id', $request->get('subject_id'))
->get();
if ($exist->isNotEmpty())
return response()->json('Оценка на эту дату уже выставлена', 200);
$data = array_merge(['updated_at' => $date], $request->all());
$journal = Journal::create($data);
return response()->json($journal, 200);
}
/**
* Display the specified resource.
*
* @param int $journal
* @return JsonResponse
*/
public function show(int $journal)
{
return response()->json(Journal::find($journal), 200);
}
/**
* Show the form for editing the specified resource.
*
* @param Journal $journal
* @return Response
*/
// public function edit(Journal $journal)
// {
// //
// }
/**
* Update the specified resource in storage.
*
* @param JournalRequest $request
* @param Journal $journal
* @return JsonResponse
*/
public function update(Request $request, int $journal)
{
$j = Journal::find($journal);
$j->score = $request->get('score');
$j->comment = $request->get('comment');
$j->timestamps = false;
$j->save();
return response()->json(['id' => $j->id], 200);
}
/**
* Remove the specified resource from storage.
*
* @param Journal $journal
* @return JsonResponse
*/
public function destroy(Journal $journal)
{
$journal->delete();
return response()->json(null, 200);
}
}

60
app/Http/Controllers/News/NewsController.php Normal file
View File

@@ -0,0 +1,60 @@
<?php
namespace App\Http\Controllers\News;
use App\Http\Controllers\Controller;
use App\Models\NewsFile;
use Illuminate\Http\Request;
use App\Models\News;
class NewsController extends Controller
{
public function index(Request $request) {
$count = 5;
$news = new News;
if ($request->has('count')) {
$temp = (int)$request->count;
if ($temp>0 && $temp<= 100) {
$count = $temp;
}
}
return response()->json($news->orderByDesc('created_at')->paginate($count), 200);
}
public function store(Request $request) {
// Добавить проверку, после добавление авторизации
$request->validate([
'title' => 'required|min:5',
'description' => 'required',
]);
$news = News::create($request->all());
return response()->json($news, 201);
}
public function show(News $news) {
return response()->json([
$news,
'photo_id' => NewsFile::where('news_id', '=', $news->id)->get(['id'])
], 200);
}
public function edit(News $news, Request $request) {
$request->validate([
'title' => 'required|min:5',
'description' => 'required'
]);
$news->update($request->all());
return response()->json($news, 200);
}
public function delete(News $news) {
$news->delete();
return response()->json(true, 204);
}
}

82
app/Http/Controllers/News/NewsFileController.php Normal file
View File

@@ -0,0 +1,82 @@
<?php
namespace App\Http\Controllers\News;
use App\Models\NewsFile;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Storage;
use App\Models\News;
class NewsFileController extends Controller
{
private $image_ext = ['jpg', 'jpeg', 'png', 'gif'];
private $file_ext = ['doc', 'docx', 'pdf', 'odt', 'mp3', 'ogg', 'mpga', 'mp4', 'mpeg', 'ppt', 'pptx'];
public function store(News $news, Request $request)
{
$newsId = $news->id;
$max_size = (int)ini_get('upload_max_filesize') * 1000;
$all_ext = implode(',', $this->allExtensions());
$this->validate($request, [
'name' => 'required',
'file' => 'required|file|mimes:' . $all_ext . '|max:' . $max_size
]);
$file = $request->file('file');
$ext = $file->getClientOriginalExtension();
$type = $this->getType($ext);
if (Storage::putFileAs('public/news/' . $newsId . '/' . $type . '/', $file, $request->name)) {
NewsFile::create([
'name' => $request->name,
'type' => $type,
'extension' => $ext,
'news_id' => $newsId,
$file,
$request->name . $ext
]);
$news->photo_uri = '/storage/news' . '/' . $newsId . '/' . $type . '/' . $request->name;
$news->save();
return true;
}
return false;
}
public function delete(NewsFile $file) {
if (Storage::disk('local')->exists('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
if (Storage::disk('local')->delete('/public/news/' . $file->news_id . '/' . $file->type . '/' . $file->name)) {
return response()->json($file->delete(), 204);
}
}
return response()->json(['News not found'], 404);
}
private function getType($ext)
{
if (in_array(strtolower($ext), $this->image_ext)) {
return 'image';
}
if (in_array(strtolower($ext), $this->file_ext)) {
return 'file';
}
}
private function allExtensions()
{
return array_merge($this->image_ext, $this->file_ext);
}
}

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

@@ -2,9 +2,11 @@
namespace App\Http\Controllers;
use App\Filters\JournalFilter;
use App\Http\Requests\SchoolClassRequest;
use App\Models\SchoolClass;
use App\Models\Teacher;
use Carbon\Carbon;
use Illuminate\Database\QueryException;
use Illuminate\Http\Request;
@@ -65,11 +67,26 @@ class SchoolClassController extends Controller
$students = $class->students;
$studentsOnlyFIO = [];
foreach ($students as $student) {
array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic'));
array_push($studentsOnlyFIO, $student->only('id', 'name', 'surname', 'patronymic'));
}
return response()->json($studentsOnlyFIO, 200);
}
public function getStudentsJournal(SchoolClass $class, Request $request)
{
$students = $class->students;
$allStudents = [];
foreach ($students as $student)
{
$cpys = clone $student;
$cpys->scores = (new JournalFilter($student->scores, $request))->apply()->values();
$allStudents[] = $cpys;
}
return response()->json($allStudents, 200);
}
//получение всех предметов для класса
public function getSubjects(SchoolClass $class)
{

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

@@ -2,60 +2,115 @@
namespace App\Http\Controllers;
use App\Models\AnswerToTask;
use App\Models\BankTask;
use App\Models\SchoolClass;
use App\Models\Student;
use App\Models\User;
use Illuminate\Http\Request;
use App\Models\Task;
use App\Http\Requests\TaskRequest;
use App\Models\TaskHistory;
use Illuminate\Support\Facades\Auth;
use App\Models\TaskFile;
use App\Models\Teacher;
class TaskController extends Controller
{
public function createTask(Request $request)
{
public function index(Request $request) {
$tasks = Task::where('class_id', '=', $request->class_id)->get()->sortBy('deadline');
$temp = [];
foreach ($tasks as $task) {
$task->banktask->subject;
array_push($temp, collect($task)->except(
'banktask.id',
'banktask.description',
'banktask.short_description',
'banktask.theme_id',
'banktask.created_at',
'banktask.updated_at',
'banktask.author',
'banktask.subject.created_at',
'banktask.subject.updated_at',
'banktask.subject_id'
));
}
return response()->json($temp , 200);
}
public function store(TaskRequest $request) {
$teacherId = 1; // Auth()->id();
$banktaskName = BankTask::find($request->banktask_id)->name;
$banktaskSubject = BankTask::find($request->banktask_id)->subject_id;
$newTask = Task::create($request->all() + ['teacher_id' => $teacherId
]);
return response()->json($newTask, 201);
}
// public function addbanktask(Task $task, Request $request) {
// $temp = new TaskHistory();
// $temp->task_id = $task->id;
// $temp->banktask_id = $request->input('banktask_id'); // Баг - можно впихнуть 2 одинаковых задания из банка задач в один таск
//
// $temp->save();
//
// return response()->json($temp, 201);
// }
public function show(Task $task) {
$userId = Teacher::find($task->teacher_id)->user_id;
$file = TaskFile::where('task_id', '=', $task->id)->get(['id', 'name', 'type', 'url', 'user_id']);
return response()->json([
$task,
'files' => $file,
], 200);
}
public function delete(Task $task) {
$task->delete();
return response()->json(true, 200);
}
public function update(Task $task, Request $request) {
$request->validate([
'name' => 'required|min:5|max:100',
'subject_id' => 'required'
'banktask_id' => 'required|exists:bank_tasks,id',
]);
$task->update($request->all());
$add_new = new Task;
$add_new->name = $request->input('name');
$add_new->description = $request->input('description');
$add_new->subject_id = $request->input('subject_id');
$add_new->path_to_task = $request->input('path_to_task');
$add_new->save();
return Task::findOrFail($add_new->id);
}
public function index()
{
return Task::all(); // Здесь наверное лучше выводить только задания по конкретному предмету
// Добавить сортировку
}
public function showTask($taskId)
{
return Task::where('id', '=', $taskId)->get();
}
public function editTask(Task $task, Request $request)
{
$request->validate([
'name' => 'required|min:5:max:100',
'subject_id' => 'required'
]);
$task->name = $request->input('name');
$task->description = $request->input('description');
$task->path_to_task = $request->input('path_to_task');
$task->save();
return Task::where('id', '=', $task->id)->get();
}
public function deleteTask(Task $task)
{
$task->delete();
public function checkAnswer(AnswerToTask $answer, Request $request) {
$request->validate([
'mark' => 'required|numeric'
]);
return 'Task №' . $task->id . ' has been deleted';
$answer->comment_by_teacher = $request->input('comment_by_teacher');
$answer->mark = $request->input('mark');
$answer->checked = 1;
$answer->save();
return response()->json($answer, 200);
}
}
}

127
app/Http/Controllers/TaskFileController.php Normal file
View File

@@ -0,0 +1,127 @@
<?php
namespace App\Http\Controllers;
use App\Models\Student;
use Illuminate\Http\Request;
use App\Models\TaskFile;
use App\Models\Task;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Storage;
class TaskFileController extends Controller
{
private $image_ext = ['jpg', 'jpeg', 'png', 'gif'];
private $file_ext = ['doc', 'docx', 'pdf', 'odt', 'mp3', 'ogg', 'mpga', 'mp4', 'mpeg', 'ppt', 'pptx'];
public function store(Task $task, Request $request)
{
$taskId = $task->id;
$studentId = 1;
$max_size = (int)ini_get('upload_max_filesize') * 1000;
$all_ext = implode(',', $this->allExtensions());
$this->validate($request, [
'name' => 'required',
'file' => 'required|file|mimes:' . $all_ext . '|max:' . $max_size
]);
$file = $request->file('file');
$ext = $file->getClientOriginalExtension();
$type = $this->getType($ext);
if ($request->has('by_teacher') && $request->by_teacher == 1) { // auth()->user()->role_id == 2
$pathToFile = 'public/task/' . $taskId . '/student/' . $studentId . '/review/' . $type . '/';
$path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/review/' . $type . '/' . $request->name;
$review = 1;
} elseif (true) {
$pathToFile = 'public/task/' . $taskId . '/student/' . $studentId . '/' . $type . '/';
$path = '/storage/task' . '/' . $taskId . '/student/'. $studentId . '/' . $type . '/' . $request->name;
$review = 0;
}
if (Storage::putFileAs($pathToFile, $file, $request->name)) {
TaskFile::create(
[
'name' => $request->name,
'type' => $type,
'extension' => $ext,
'task_id' => $taskId,
'url' => $path,
'user_id' => 2,
'review' => $review,
$file,
$request->name . $ext
]
);
return response()->json($request->by_teacher, 201);
}
return response()->json(false, 422);
}
public function showFiles(Task $task)
{
$taskId = $task->id;
$files = TaskFile::where('task_id', '=', $taskId)->get();
return response()->json($files, 200);
}
// public function download(TaskFile $file)
// {
// return Storage::download('/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name);
// }
// public function update(TaskFile $file, Request $request) Бесполезная функция
// {
//
// $request->validate([
// 'name' => 'required'
// ]);
// $old_filename = '/public/task/' . $file->task_id . '/' . $file->type . '/' . $file->name;
// $new_filename = '/public/task/' . $file->task_id . '/' . $file->type . '/' . $request->name;
//
// if (Storage::disk('local')->exists($old_filename)) {
// if (Storage::disk('local')->move($old_filename, $new_filename)) {
// $file->name = $request->name;
// $file->url = '/storage/task/' . $file->task_id . '/' . $request->type . '/' . $file->name;
// return response()->json([$file->save(), $file]);
// }
// }
//
// return response()->json(false, 404);
// }
public function delete(TaskFile $file) {
$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 (Storage::disk('local')->delete('/public/task/' . $file->task_id . '/student/' . $studentId . $file->type . '/' . $file->name)) {
return response()->json($file->delete());
}
}
return response()->json(['Not found'], 404);
}
private function getType($ext)
{
if (in_array(strtolower($ext), $this->image_ext)) {
return 'image';
}
if (in_array(strtolower($ext), $this->file_ext)) {
return 'file';
}
}
private function allExtensions()
{
return array_merge($this->image_ext, $this->file_ext);
}
}

5
app/Http/Controllers/TimetableController.php
View File

@@ -45,8 +45,9 @@ class TimetableController extends Controller
'class' => $class,
]);
}
$dateTimetables = [];
//if (!$filterTimetables->isEmpty()) {
if (!$filterTimetables->isEmpty()) {
for ($i = 0; $i < 6; $i++) {
$date = Carbon::parse($request->input('date'))
->startOfWeek()
@@ -54,7 +55,7 @@ class TimetableController extends Controller
->format('Y-m-d');
array_push($dateTimetables, [$date => $filterTimetables->where('date', $date)->values()]);
}
//}
}
return response()->json($dateTimetables, 200);
}

20
app/Http/Controllers/Users/StudentController.php
View File

@@ -31,6 +31,18 @@ class StudentController extends Controller
return response()->json($student, 200);
}
/**
* Создание ученика
*
* @param StudentRequest $request
* @return JsonResponse
*/
/*public function store(StudentRequest $request)
{
$student = Student::creat($request->all());
return response()->json($student, 200);
}*/
/**
* Обновление ученика
*
@@ -54,11 +66,7 @@ class StudentController extends Controller
return response()->json(collect($student)->except('school_class'), 200);
}
public function destroy(Student $student)
{
$user = $student->user;
$user->delete();
return response()->json(null, 204);
public function getAnswers(Student $student) {
return AnswerToTask::where('student_id', '=', $student->id)->get();
}
}

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

@@ -3,10 +3,14 @@
namespace App\Http\Controllers\Users;
use App\Http\Controllers\Controller;
use App\Models\AnswerToTask;
use App\Models\SchoolClass;
use App\Models\Student;
use App\Models\Task;
use App\Models\Teacher;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Response;
use App\Models\Subject;
class TeacherController extends Controller
{
@@ -67,10 +71,37 @@ class TeacherController extends Controller
public function getClasses(Teacher $teacher)
{
$timetables = $teacher->timetables;
$classes = [];
$classes = collect([]);
foreach ($timetables as $timetable) {
array_push($classes, $timetable->schoolClass->only('id','number','letter'));
$subjects = collect([]);
$class = $timetable->schoolClass->only('id','number','letter');
$forClassTimetables = $timetables->where('class_id', $class['id']);
foreach ($forClassTimetables as $forClassTimetable) {
$subjects->push(Subject::find($forClassTimetable['subject_id']));
}
$subjects = $subjects->unique()->values();
$classes->push([
'id' => $class['id'],
'number' => $class['number'],
'letter' => $class['letter'],
'subjects' => $subjects,
]);
}
return response()->json(collect($classes)->unique(), 200);
return response()->json($classes->unique()->values(), 200);
}
public function getUncheckedTask(Teacher $teacher, SchoolClass $class) {
$temp = [];
$tasks = $teacher->tasks->where('class_id', '=', $class->id);
foreach ($tasks as $task) {
$answers = Task::find($task->id)->answers->where('checked', '=', false);
array_push($temp, $answers);
}
return response()->json($temp, 200);
}
}