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

1

Browse Source
This commit is contained in:
nikden13
2020-12-16 23:58:00 +07:00
parent 523f70972b b9326ad722
commit 51f178ddd6
49 changed files with 2059 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Filters/JournalFilter.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
namespace App\Filters;
use Carbon\Carbon;
class JournalFilter extends QueryFilter
{
protected function student($value)
{
$this->builder = $this->builder->where('student_id', $value);
}
protected function teacher($value)
{
$this->builder = $this->builder->where('teacher_id', $value);
}
protected function subject($value)
{
$this->builder = $this->builder->where('subject_id', $value);
}
protected function date($value)
{
$value = Carbon::createFromTimestamp($value/1000)->floorDays();
$this->builder = $this->builder->where('updated_at', $value);
}
protected function last($value)
{
$date = Carbon::now()->subDays($value);
$this->builder = $this->builder->where('updated_at', '>=', $date);
}
}

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();
}
}

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

@@ -3,13 +3,14 @@
namespace App\Http\Controllers\Users;
use App\Http\Controllers\Controller;
use App\Models\Subject;
use App\Models\AnswerToTask;
use App\Models\SchoolClass;
use App\Models\Student;
use App\Models\Task;
use App\Models\Teacher;
use App\Models\Timetable;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Response;
use App\Models\Subject;
class TeacherController extends Controller
{
@@ -92,4 +93,15 @@ class TeacherController extends Controller
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);
}
}

3
app/Http/Kernel.php
View File

@@ -15,12 +15,13 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
// \App\Http\Middleware\TrustHosts::class,
\App\Http\Middleware\TrustProxies::class,
\Fruitcake\Cors\HandleCors::class,
\App\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\PreventRequestsDuringMaintenance::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];
/**

2
app/Http/Middleware/VerifyCsrfToken.php
View File

@@ -12,6 +12,6 @@ class VerifyCsrfToken extends Middleware
* @var array
*/
protected $except = [
//
'api/*'
];
}

4
app/Http/Requests/Auth/LoginRequest.php
View File

@@ -14,6 +14,8 @@ class LoginRequest extends UserRequest
*/
public function specific()
{
return [];
return [
'remember_me' => 'integer'
];
}
}

25
app/Http/Requests/JournalRequest.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
class JournalRequest extends ApiFormRequest
{
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'student_id' => 'required|integer',
'teacher_id' => 'required|integer',
'subject_id' => 'required|integer',
'score' => 'required|integer',
'comment' => 'string|nullable',
'date' => 'integer',
];
}
}

27
app/Http/Requests/TaskRequest.php Normal file
View File

@@ -0,0 +1,27 @@
<?php
namespace App\Http\Requests;
class TaskRequest extends ApiFormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'banktask_id' => 'required|exists:bank_tasks,id',
'deadline' => 'required'
];
}
}

15
app/Models/AnswerToTask.php Normal file
View File

@@ -0,0 +1,15 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class AnswerToTask extends Model
{
use HasFactory;
protected $table = 'answers_to_task';
protected $fillable = ['description', 'student_id', 'task_id', 'class_id', 'checked', 'mark', 'comment_by_teacher'];
}

5
app/Models/BankTask.php
View File

@@ -28,4 +28,9 @@ class BankTask extends Model
return $this->belongsTo(Theme::class);
}
public function tasks() {
return $this->hasMany(Task::class);
}
}

6
app/Models/BankTaskFile.php
View File

@@ -8,6 +8,10 @@ use Illuminate\Database\Eloquent\Model;
class BankTaskFile extends Model
{
use HasFactory;
protected $table = 'bank_tasks_files';
protected $table = 'bank_task_files';
protected $fillable = ['name', 'type', 'extension', 'url', 'banktask_id'];
public function task() {
$this->belongsTo(Task::class);
}
}

2
app/Models/HeadTeacher.php
View File

@@ -9,7 +9,7 @@ class HeadTeacher extends Model
{
use HasFactory;
protected $guarded = [
protected $fillable = [
'user_id',
'updated_at',
];

22
app/Models/Journal.php Normal file
View File

@@ -0,0 +1,22 @@
<?php
namespace App\Models;
use App\Filters\QueryFilter;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Journal extends Model
{
use HasFactory;
protected $fillable = [
'teacher_id',
'student_id',
'subject_id',
'score',
'comment',
'updated_at',
];
}

14
app/Models/News.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class News extends Model
{
use HasFactory;
protected $fillable = ['title', 'description', 'headteacher_id']; // убрать headteacher_id после добавления авторизации
}

13
app/Models/NewsFile.php Normal file
View File

@@ -0,0 +1,13 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class NewsFile extends Model
{
use HasFactory;
protected $table = 'news_files';
protected $fillable = ['name', 'type', 'extension', 'url', 'news_id'];
}

2
app/Models/Parentt.php
View File

@@ -10,7 +10,7 @@ class Parentt extends Model
{
use HasFactory;
protected $guarded = [
protected $fillable = [
'user_id',
'updated_at',
];

4
app/Models/SchoolClass.php
View File

@@ -32,4 +32,8 @@ class SchoolClass extends Model
}
public function tasks() {
return $this->hasMany(Task::class, 'class_id');
}
}

12
app/Models/Student.php
View File

@@ -2,6 +2,7 @@
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Validator;
@@ -10,8 +11,11 @@ class Student extends Model
{
use HasFactory;
protected $guarded = [
protected $fillable = [
'user_id',
];
protected $guarded = [
'updated_at',
];
@@ -21,7 +25,11 @@ class Student extends Model
public function schoolClass()
{
return $this->belongsTo(SchoolClass::class, 'class_id');
return $this->belongsTo(SchoolClass::class, 'class_id')->where('');
}
public function scores()
{
return $this->hasMany(Journal::class, 'student_id');
}
public function user()

22
app/Models/Task.php
View File

@@ -8,6 +8,26 @@ use Illuminate\Database\Eloquent\Model;
class Task extends Model
{
use HasFactory;
protected $fillable = ['banktask_id', 'deadline', 'teacher_id', 'class_id'];
public function banktask() {
return $this->belongsTo(BankTask::class);
}
public function teacher(){
return $this->belongsTo(Teacher::class);
}
public function class() {
return $this->belongsTo(SchoolClass::class);
}
public function tasks() {
return $this->hasMany(Task::class);
}
public function answers() {
return $this->hasMany(AnswerToTask::class);
}
protected $table = 'tasks';
}

14
app/Models/TaskFile.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TaskFile extends Model
{
use HasFactory;
protected $table = 'task_files';
protected $fillable = ['name', 'type', 'extension', 'url', 'task_id', 'user_id', 'review'];
protected $hidden = ['review'];
}

15
app/Models/TaskHistory.php Normal file
View File

@@ -0,0 +1,15 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TaskHistory extends Model
{
use HasFactory;
protected $table = 'banktask_task';
protected $fillable = ['banktask_id', 'task_id'];
public $timestamps = false;
}

5
app/Models/Teacher.php
View File

@@ -10,7 +10,7 @@ class Teacher extends Model
{
use HasFactory;
protected $guarded = [
protected $fillable = [
'user_id',
'updated_at',
];
@@ -34,4 +34,7 @@ class Teacher extends Model
return $this->belongsTo(User::class);
}
public function tasks(){
return $this->hasMany(Task::class);
}
}

1
app/Models/User.php
View File

@@ -5,7 +5,6 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Carbon\Carbon;
use Laravel\Passport\HasApiTokens;
class User extends Authenticatable

2
app/Providers/AuthServiceProvider.php
View File

@@ -26,6 +26,6 @@ class AuthServiceProvider extends ServiceProvider
{
$this->registerPolicies();
Passport::routes();
// Passport::routes();
}
}

4
app/Providers/RouteServiceProvider.php
View File

@@ -38,7 +38,7 @@ class RouteServiceProvider extends ServiceProvider
$this->configureRateLimiting();
$this->routes(function () {
Route::prefix('/api')
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
@@ -57,7 +57,7 @@ class RouteServiceProvider extends ServiceProvider
protected function configureRateLimiting()
{
RateLimiter::for('api', function (Request $request) {
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
return Limit::perMinute(100)->by(optional($request->user())->id ?: $request->ip());
});
}
}

1
composer.json
View File

@@ -9,6 +9,7 @@
"license": "MIT",
"require": {
"php": "^7.3|^8.0",
"cboden/ratchet": "^0.4.3",
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",

1140
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

2
config/app.php
View File

@@ -162,6 +162,7 @@ return [
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
/*
* Package Service Providers...
*/
@@ -175,6 +176,7 @@ return [
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
],
/*

6
database/migrations/2020_12_03_104028_create_bank_task_files_table.php
View File

@@ -13,7 +13,7 @@ class CreateBankTaskFilesTable extends Migration
*/
public function up()
{
Schema::create('bank_tasks_files', function (Blueprint $table) {
Schema::create('bank_task_files', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name');
$table->string('type');
@@ -23,7 +23,7 @@ class CreateBankTaskFilesTable extends Migration
$table->unsignedInteger('banktask_id');
$table->foreign('banktask_id')
->references('id')->on('bank_tasks')
->onDelete('no action');
->onDelete('cascade');
});
}
@@ -35,6 +35,6 @@ class CreateBankTaskFilesTable extends Migration
*/
public function down()
{
Schema::dropIfExists('bank_tasks_files');
Schema::dropIfExists('bank_task_files');
}
}

43
database/migrations/2020_12_03_172010_create_tasks_table.php Normal file
View File

@@ -0,0 +1,43 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateTasksTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('tasks', function (Blueprint $table) {
$table->id();
$table->unsignedInteger('banktask_id');
$table->timestamp('deadline')->nullable();
$table->unsignedInteger('teacher_id')->nullable();
$table->unsignedInteger('class_id')->nullable();
$table->timestamps();
$table->foreign('banktask_id')->references('id')->on('bank_tasks')
->onDelete('set null');
// $table->foreign('class_id')->references('id')->on('school_classes')
// ->onDelete('cascade');
// $table->foreign('teacher_id')->references('id')->on('teachers')
// ->onDelete('set null');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('tasks');
}
}

42
database/migrations/2020_12_07_120455_create_answers_to_task_table.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateAnswersToTaskTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('answers_to_task', function (Blueprint $table) {
$table->id();
$table->text('description')->nullable();
$table->smallInteger('mark')->nullable();
$table->text('comment_by_teacher')->nullable();
$table->boolean('checked')->default('0');
$table->unsignedInteger('task_id');
$table->unsignedInteger('student_id');
$table->boolean('review')->default('0');
$table->timestamps();
$table->foreign('task_id')->references('id')->on('tasks')
->onDelete('set null');
$table->foreign('student_id')->references('id')->on('students');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('answers_to_task');
}
}

42
database/migrations/2020_12_08_122859_create_task_files_table.php Normal file
View File

@@ -0,0 +1,42 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateTaskFilesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('task_files', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name');
$table->string('type');
$table->string('extension');
$table->string('url', 400);
$table->timestamps();
$table->unsignedInteger('task_id');
$table->unsignedInteger('user_id');
$table->foreign('task_id')->references('id')->on('tasks')
->onDelete('cascade');
$table->foreign('user_id')->references('id')->on('users')
->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('task_files');
}
}

47
database/migrations/2020_12_13_200032_create_journals_table.php Normal file
View File

@@ -0,0 +1,47 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateJournalsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('journals', function (Blueprint $table) {
$table->id();
$table->unsignedBigInteger('teacher_id');
$table->unsignedBigInteger('student_id');
$table->unsignedBigInteger('subject_id');
$table->unsignedBigInteger('score');
$table->string('comment')->nullable();
$table->timestamps();
$table->foreign('subject_id')
->references('id')->on('subjects');
$table->foreign('teacher_id')
->references('id')->on('teachers')
->onDelete('cascade');
$table->foreign('student_id')
->references('id')->on('students')
->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('journals');
}
}

37
database/migrations/2020_12_14_170701_create_news_table.php Normal file
View File

@@ -0,0 +1,37 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateNewsTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('news', function (Blueprint $table) {
$table->id();
$table->string('title');
$table->text('description');
$table->string('photo_uri')->nullable();
$table->unsignedInteger('headteacher_id');
$table->foreign('headteacher_id')->references('id')->on('head_teachers');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('news');
}
}

39
database/migrations/2020_12_15_092036_create_news_files_table.php Normal file
View File

@@ -0,0 +1,39 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class CreateNewsFilesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('news_files', function (Blueprint $table) {
$table->bigIncrements('id');
$table->string('name');
$table->string('type');
$table->string('extension');
$table->timestamps();
$table->unsignedInteger('news_id');
$table->foreign('news_id')
->references('id')->on('news')
->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('news');
}
}

55
routes/api.php
View File

@@ -17,32 +17,69 @@ Route::apiResource('headteachers', 'Users\HeadTeacherController');
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/{class}/uncheked-task', 'Users\TeacherController@getUncheckedTask');
Route::apiResource('students', 'Users\StudentController');
Route::get('/student/{student}/answers', 'Users\StudentController@getAnswers');
Route::apiResource('parents', 'Users\ParenttController');
Route::apiResource('subjects', 'SubjectController');
Route::apiResource('subjects', 'BankTask\SubjectController');
Route::apiResource('classes', 'SchoolClassController');
Route::post('classes/{class}/teacher', 'SchoolClassController@addTeacher');
Route::get('classes/{class}/students', 'SchoolClassController@getStudents'); //все ученики класса
Route::get('classes/{class}/journal', 'SchoolClassController@getStudentsJournal'); //все ученики класса с оценками
Route::get('classes/{class}/subjects', 'SchoolClassController@getSubjects'); //все предметы класса
Route::apiResource('themes', 'ThemeController');
Route::apiResource('journal', 'JournalController');
Route::apiResource('themes', 'BankTask\ThemeController');
Route::apiResource('timetables', 'TimetableController');
Route::get('banktasks', 'BankTaskController@index'); //получение списка всех заданий
Route::get('banktasks', 'BankTask\BankTaskController@index'); //получение списка всех заданий
Route::group(['prefix' => 'banktask'], function () {
Route::post('', 'BankTaskController@store'); //создание задания
Route::get('{banktask}', 'BankTaskController@show'); //получение задания
Route::put('{banktask}', 'BankTaskController@update'); //обновление задания
Route::delete('{banktask}', 'BankTaskController@delete'); //удаление задания
Route::post('{banktask}/addfile', 'BankTaskFileController@store');
Route::get('{banktask}/files', 'BankTaskFileController@showFiles');
Route::post('', 'BankTask\BankTaskController@store'); //создание задания
Route::get('{banktask}', 'BankTask\BankTaskController@show'); //получение задания
Route::put('{banktask}', 'BankTask\BankTaskController@update'); //обновление задания
Route::delete('{banktask}', 'BankTask\BankTaskController@delete'); //удаление задания
Route::post('{banktask}/addfile', 'BankTask\BankTaskFileController@store');
Route::get('{banktask}/files', 'BankTask\BankTaskFileController@showFiles');
Route::get('/file/{file}/download', 'BankTask\BankTaskFileController@download');
Route::delete('/file/{file}/delete', 'BankTask\BankTaskFileController@delete');
Route::put('/file/{file}/update', 'BankTask\BankTaskFileController@update');
});
Route::get('/file/{file}/download', 'BankTaskFileController@download');
Route::delete('/file/{file}/delete', 'BankTaskFileController@delete');
Route::put('/file/{file}/update', 'BankTaskFileController@update');
Route::group(['prefix' => 'news'], function () {
Route::post('', 'News\NewsController@store');
Route::get('', 'News\NewsController@index');
Route::get('/{news}', 'News\NewsController@show');
Route::put('/{news}', 'News\NewsController@edit');
Route::delete('/{news}', 'News\NewsController@delete');
Route::post('/{news}/addphoto', 'News\NewsFileController@store');
Route::delete('/photo/{file}', 'News\NewsFileController@delete');
});
Route::group(['prefix' => 'task'], function () {
Route::post('', 'TaskController@store'); // Добавить таск
Route::get('', 'TaskController@index'); // Показать задания для класса (в запросе нужно указывать Id класса)
Route::get('/{task}', 'TaskController@show'); //Показать задание
Route::put('/{task}', 'TaskController@update'); // Обновить задание
Route::delete('/{task}', 'TaskController@delete'); // Удалить задание
Route::put('/answer/check/{answer}', 'TaskController@checkAnswer'); // Проверить ответ ученика
Route::post('/{task}/addanswer', 'AnswerToTaskController@store'); // Добавить ответ(для ученика)
Route::get('/{task}/student/{student}', 'AnswerToTaskController@show'); // Показать ответ ученика
Route::delete('/answer/{answer}', 'AnswerToTaskController@delete'); // Удалить ответ
Route::put('/answer/{answer}', 'AnswerToTaskController@update'); // Изменить ответ
Route::post('/{task}/addfile', 'TaskFileController@store'); // Добавить файл
Route::get('/{task}/files', 'TaskFileController@showFiles'); // Посмотреть файлы у таска(только файлы
// которые добавил учитель).
Route::get('/{task}/file/{file}', 'TaskFileController@download'); // Скачать файл
Route::delete('/file/{file}', 'TaskFileController@delete'); // Удалить файл
});

2
routes/web.php
View File

@@ -12,3 +12,5 @@
| contains the "web" middleware group. Now create something great!
|
*/
Route::view('/', 'auth');