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 00:27:04 +07:00
parent 9dd2ed1a67 b9326ad722
commit 1195db8958
29 changed files with 1206 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -0,0 +1,53 @@
<?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 start($value)
{
$this->builder = $this->builder->where('updated_at', '>=', $this->transformDate($value));
}
protected function end($value)
{
$this->builder = $this->builder->where('updated_at', '<=', $this->transformDate($value));
}
protected function transformDate($value)
{
return Carbon::createFromTimestamp($value/1000)->floorDays();;
}
// 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);
}
}

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)
{

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

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

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

@@ -7,6 +7,7 @@ use App\Http\Requests\StudentRequest;
use App\Models\SchoolClass;
use App\Models\Student;
use Illuminate\Http\JsonResponse;
use App\Models\AnswerToTask;
class StudentController extends Controller
{
@@ -31,6 +32,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,6 +67,7 @@ class StudentController extends Controller
return response()->json(collect($student)->except('school_class'), 200);
}
public function destroy(Student $student)
{
$user = $student->user;
@@ -61,4 +75,9 @@ class StudentController extends Controller
return response()->json(null, 204);
}
public function getAnswers(Student $student) {
return AnswerToTask::where('student_id', '=', $student->id)->get();
}
}

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

@@ -10,7 +10,7 @@ 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
{
@@ -71,11 +71,27 @@ 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) {

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',
];
}
}

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',
];

1
app/Models/SchoolClass.php
View File

@@ -27,6 +27,7 @@ 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()

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