Memperbaiki Conflict Staging dan Tender

app/Models/JenisPenilaian.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
+use Modules\Lpj\Models\Penilaian;
+class JenisPenilaian extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'jenis_penilaian';
+
+    protected $fillable = [
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by',
+        'created_at', 'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+    public function penilaian(){
+        return $this->hasMany(Penilaian::class , 'jenis_penilaian_id', 'id');
+    }
+
+}

app/Models/Penilaian.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Lpj\Database\Factories\PenilaianFactory;
+use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Usermanagement\Models\User;
+
+
+class Penilaian extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'penilaian';
+    protected $fillable = [
+        'jenis_penilaian_id', 'teams_id', 'user_id', 'tanggal_kunjungan', 'keterangan','nomor_registrasi','penilaian_id','surveyor_id','penilai_surveyor_id',
+        'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_at',
+        'created_by', 'updated_at', 'updated_by', 'deleted_at', 'deleted_by'
+    ];
+
+    public function jenis_penilaian(){
+        return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
+    }
+
+    public function teams(){
+        return $this->belongsTo(Teams::class, 'teams_id', 'id');
+    }
+
+    public function users(){
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+
+    public function userPenilai(){
+        return $this->belongsTo(User::class, 'penilaian_id', 'id');
+    }
+
+    public function userSurveyor(){
+        return $this->belongsTo(User::class, 'surveyor_id', 'id');
+    }
+
+    public function userPenilaiSurveyor(){
+        return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
+    }
+
+    public function permohonan(){
+        return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
+    }
+
+
+}

app/Models/Permohonan.php

@@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\PermohonanFactory;
 use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Models\TujuanPenilaian;
+use Modules\Lpj\Models\JenisFasilitasKredit;
 
 class Permohonan extends Base
 {
@@ -18,13 +20,15 @@ class Permohonan extends Base
         'tujuan_penilaian_id',
         'debiture_id',
         'keterangan',
+        'dokumen',
         'jenis_fasilitas_kredit_id',
         'nilai_plafond_id',
         'status',
         'authorized_at',
         'authorized_status',
         'authorized_by',
-
+        'status_bayar',
+        'nilai_njop'
     ];
 
     public function user(){
@@ -54,4 +58,8 @@ class Permohonan extends Base
     public function jenisFasilitasKredit(){
         return $this->belongsTo(JenisFasilitasKredit::class);
     }
+
+    public function penilaian(){
+        return $this->belongsTo(Penilaian::class,  'nomor_registrasi', 'nomor_registrasi');
+    }
 }

app/Models/Regions.php

@@ -0,0 +1,26 @@
+<?php
+
+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
+{
+    use HasFactory;
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'regions';
+
+    protected $fillable = [
+        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by'
+    ];
+
+    public function teams(){
+        return $this->hasMany(Teams::class, 'regions_id', 'id');
+    }
+}

app/Models/Teams.php

@@ -0,0 +1,40 @@
+<?php
+
+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
+{
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'teams';
+    protected $fillable = [
+        '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, 'regions_id', 'id');
+    }
+
+    public function teamsUsers(){
+        return $this->hasMany(TeamsUsers::class, 'teams_id', 'id');
+    }
+
+    public function penilaian(){
+        return $this->hasMany(Penilaian::class, 'teams_id', 'id');
+    }
+
+
+
+}
+

app/Models/TeamsUsers.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Database\Factories\TeamsUsersFactory;
+use Modules\Usermanagement\Models\User;
+use Modules\Lpj\Models\Teams;
+
+class TeamsUsers extends Model
+{
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $table = 'teams_users';
+    protected $fillable = [
+        '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, 'teams_id', 'id');
+    }
+
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+}