memperbaiki conflicts --> add feature Data Proses Penawaran

app/Models/PenawaranDetailTender.php

@@ -5,6 +5,7 @@ namespace Modules\Lpj\Models;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+// use Modules\Lpj\Database\Factories\PenawaranDetailTenderFactory;
 
 class PenawaranDetailTender extends Model
 {

app/Models/PenawaranTender.php

@@ -3,6 +3,7 @@
 namespace Modules\Lpj\Models;
 
 use Illuminate\Database\Eloquent\Model;
+use Modules\Lpj\Models\PenawaranDetailTender;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\HasMany; // andy add
 
@@ -23,4 +24,9 @@ class PenawaranTender extends Model
         return $this->hasMany(PenawaranDetailTender::class, 'penawaran_id', 'id')->where('status', '=', 1);
     }
     // andy add
+
+    public function penawaranKjpp()
+    {
+        return $this->hasMany(PenawaranDetailTender::class, 'penawaran_id');
+    }
 }

app/Models/Penilaian.php

@@ -10,45 +10,50 @@ 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',
+        'jenis_penilaian_id', 'teams_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(){
+    public function jenis_penilaian()
+    {
         return $this->belongsTo(JenisPenilaian::class, 'jenis_penilaian_id', 'id');
     }
 
-    public function teams(){
+    public function teams()
+    {
         return $this->belongsTo(Teams::class, 'teams_id', 'id');
     }
 
-    public function users(){
+    public function users()
+    {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
-    public function userPenilai(){
+    public function userPenilai()
+    {
         return $this->belongsTo(User::class, 'penilaian_id', 'id');
     }
 
-    public function userSurveyor(){
+    public function userSurveyor()
+    {
         return $this->belongsTo(User::class, 'surveyor_id', 'id');
     }
 
-    public function userPenilaiSurveyor(){
+    public function userPenilaiSurveyor()
+    {
         return $this->belongsTo(User::class, 'penilai_surveyor_id', 'id');
     }
 
-    public function permohonan(){
+    public function permohonan()
+    {
         return $this->belongsTo(Permohonan::class, 'nomor_registrasi', 'nomor_registrasi');
     }
 

app/Models/TeamsUsers.php

@@ -6,6 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\TeamsUsersFactory;
 use Modules\Usermanagement\Models\User;
 use Modules\Lpj\Models\Teams;
+use Modules\Lpj\Models\Penilaian;
 
 class TeamsUsers extends Model
 {
@@ -30,4 +31,10 @@ class TeamsUsers extends Model
     {
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
+
+    public function penilaian()
+    {
+        return $this->belongsTo(Penilaian::class, 'teams_id', 'id');
+    }
+
 }