Merge branch 'staging' into feature/senior-officer

This commit is contained in:
majid
2025-01-14 09:53:19 +07:00
7 changed files with 67 additions and 47 deletions

View File

@@ -15,7 +15,7 @@ class PenilaianTeam extends Model
/**
* The attributes that are mass assignable.
*/
protected $fillable = ['penilaian_id', 'team_id', 'user_id','role'];
protected $fillable = ['penilaian_id', 'team_id', 'user_id', 'role'];
public function userPenilaiTeam()
@@ -23,12 +23,19 @@ class PenilaianTeam extends Model
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function team(){
public function team()
{
return $this->belongsTo(Teams::class, 'team_id', 'id');
}
public function penilaian(){
public function user()
{
return $this->belongsTo(User::class, 'user_id', 'id');
}
public function penilaian()
{
return $this->belongsTo(Penilaian::class, 'penilaian_id', 'id');
}