Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts:
#	database/migrations/2024_11_08_081149_create_permohonan_histories_table.php

app/Models/Inspeksi.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\InspeksiFactory;
+
+class Inspeksi extends Model
+{
+    use HasFactory;
+
+    protected $table = 'inspeksi';
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by'];
+
+    // protected static function newFactory(): InspeksiFactory
+    // {
+    //     // return InspeksiFactory::new();
+    // }
+}

app/Models/PenilaianTeam.php

@@ -29,7 +29,7 @@ class PenilaianTeam extends Model
 
     public function penilaian(){
 
-        return $this->hasMany(Penilaian::class, 'penilaian_id', 'id');
+        return $this->belongsTo(Penilaian::class, 'penilaian_id', 'id');
     }
 
     protected static function newFactory(): PenilaianTeamFactory

app/Models/Regions.php

@@ -17,7 +17,7 @@ class Regions extends Model
     protected $table = 'regions';
 
     protected $fillable = [
-        'code', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by'
+        'code', 'name', 'status', 'name_url','url','authorized_status', 'authorized_at', 'authorized_by'
     ];
 
     public function teams(){