update module senior officer

This commit is contained in:
majid
2024-09-11 08:31:47 +07:00
parent a51d5fbeff
commit f9fea10607
26 changed files with 1881 additions and 227 deletions

View File

@@ -4,7 +4,7 @@ namespace Modules\Lpj\Models;
use Illuminate\Database\Eloquent\Model;
use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
use Modules\Lpj\Models\Penilaian;
class JenisPenilaian extends Model
{

View File

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
use Modules\Lpj\Database\Factories\PenilaianFactory;
use Modules\Lpj\Models\JenisPenilaian;
use Modules\Lpj\Models\Teams;
use Modules\Usermanagement\Models\User;
// use Modules\Usermanagement\Models\User;
class Penilaian extends Model
{
@@ -30,9 +30,9 @@ class Penilaian extends Model
return $this->belongsTo(Teams::class, 'team_id', 'id');
}
public function users(){
return $this->belongsTo(User::class, 'user_id', 'id');
}
// public function users(){
// return $this->belongsTo(User::class, 'user_id', 'id');
// }
}

View File

@@ -5,6 +5,7 @@ namespace Modules\Lpj\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Modules\Lpj\Database\Factories\RegionsFactory;
use Modules\Lpj\Models\Teams;
class Regions extends Model
{
@@ -14,13 +15,12 @@ class Regions extends Model
* The attributes that are mass assignable.
*/
protected $table = 'regions';
protected $fillable = [
'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by',
'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by'
];
public function teams(){
return $this->hasMany(Teams::class, 'region_id', 'id');
return $this->hasMany(Teams::class, 'regions_id', 'id');
}
}

View File

@@ -5,6 +5,10 @@ namespace Modules\Lpj\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Modules\Lpj\Database\Factories\TeamsFactory;
use Modules\Lpj\Models\TeamsUsers;
use Modules\Lpj\Models\Regions;
use Modules\Lpj\Models\Penilaian;
class Teams extends Model
{
@@ -13,16 +17,24 @@ class Teams extends Model
*/
protected $table = 'teams';
protected $fillable = [
'region_id', 'code', 'name', 'status', 'authorized_status', 'authorized_at',
'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
'regions_id', 'code', 'name', 'status', 'authorized_status', 'authorized_at',
'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
'deleted_at', 'deleted_by'
];
public function regions(){
return $this->belongsTo(Regions::class, 'region_id', 'id');
return $this->belongsTo(Regions::class, 'regions_id', 'id');
}
public function teamsUsers(){
return $this->hasMany(TeamsUsers::class, 'team_id', 'id');
return $this->hasMany(TeamsUsers::class, 'teams_id', 'id');
}
public function penilaian(){
return $this->hasMany(Penilaian::class, 'teams_id', 'id');
}
}

View File

@@ -4,7 +4,7 @@ namespace Modules\Lpj\Models;
use Illuminate\Database\Eloquent\Model;
use Modules\Lpj\Database\Factories\TeamsUsersFactory;
use Modules\User\Models\User;
// use Modules\User\Models\User;
use Modules\Lpj\Models\Teams;
class TeamsUsers extends Model
@@ -15,16 +15,17 @@ class TeamsUsers extends Model
*/
protected $table = 'teams_users';
protected $fillable = [
'team_id', 'user_id', 'status', 'authorized_status', 'authorized_at',
'teams_id', 'user_id', 'status', 'authorized_status', 'authorized_at',
'authorized_by', 'created_at', 'created_by', 'updated_at', 'updated_by',
'deleted_at', 'deleted_by'
];
public function team()
{
return $this->belongsTo(Teams::class, 'team_id', 'id');
return $this->belongsTo(Teams::class, 'teams_id', 'id');
}
public function user()
{
return $this->belongsTo(User::class, 'user_id', 'id');