Merge branch 'task' into journal

# Conflicts:
#	app/Http/Controllers/Users/StudentController.php
#	app/Models/SchoolClass.php
#	app/Models/Teacher.php
#	composer.json
#	composer.lock
#	database/migrations/2020_12_03_104028_create_bank_task_files_table.php
#	routes/api.php

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

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

app/Models/SchoolClass.php

@@ -25,4 +25,9 @@ class SchoolClass extends Model
         return $this->belongsToMany(Subject::class, 'academic_plans', 'class_id')
             ->withPivot('hours_per_week', 'hours_per_year');
     }
+
+    public function tasks() {
+        return $this->hasMany(Task::class, 'class_id');
+    }
+
 }

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

@@ -29,4 +29,7 @@ class Teacher extends Model
         return $this->belongsTo(User::class);
     }
 
+    public function tasks(){
+        return $this->hasMany(Task::class);
+    }
 }