Merge branch 'journal' into timetable

# 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

app/Models/AnswerToTask.php

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

app/Models/BankTask.php

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

app/Models/BankTaskFile.php

@@ -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);
+    }
 }

app/Models/HeadTeacher.php

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

app/Models/Journal.php

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

app/Models/News.php

@@ -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 после добавления авторизации
+
+}
+

app/Models/NewsFile.php

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

app/Models/Parentt.php

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

app/Models/SchoolClass.php

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

app/Models/Student.php

@@ -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()

app/Models/Task.php

@@ -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';
 }

app/Models/TaskFile.php

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

app/Models/TaskHistory.php

@@ -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;
+}

app/Models/Teacher.php

@@ -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);
+    }
 }

app/Models/User.php

@@ -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