mirror of
https://github.com/robonen/education-project.git
synced 2026-03-20 10:54:31 +00:00
Правки после слияния
This commit is contained in:
@@ -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
22
app/Models/Journal.php
Normal 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
14
app/Models/News.php
Normal 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
13
app/Models/NewsFile.php
Normal 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'];
|
||||
}
|
||||
@@ -10,7 +10,7 @@ class Parentt extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $guarded = [
|
||||
protected $fillable = [
|
||||
'user_id',
|
||||
'updated_at',
|
||||
];
|
||||
|
||||
@@ -27,6 +27,7 @@ class SchoolClass extends Model
|
||||
}
|
||||
|
||||
|
||||
|
||||
public function tasks() {
|
||||
return $this->hasMany(Task::class, 'class_id');
|
||||
}
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user