bug fix, change pengelola into aktivis and adding aktivis tingkat sel…

…ection

app/Pengelola.php → app/Aktivis.php

@@ -5,11 +5,11 @@
 use App\Support\Dataviewer;
 use Spatie\Activitylog\Traits\LogsActivity;
 
-class Pengelola extends Model {
+class Aktivis extends Model {
 
     use Dataviewer, LogsActivity;
 
-    protected $table = 'pengelola';
+    protected $table = 'aktivis';
 
     protected static $logFillable = true;
 
@@ -32,7 +32,7 @@ class Pengelola extends Model {
     protected $orderable = [
         'nim','nik','name','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','berat','kontak','created_at','updated_at',
 
-        'pengelola_pekerjaan.tingkat', 'pekerjaan_aktif.tingkat'
+        'aktivis_pekerjaan.tingkat', 'pekerjaan_aktif.tingkat'
     ];
 
     public static function initialize()
@@ -43,39 +43,39 @@ public static function initialize()
     }
 
     public function pendidikan(){
-        return $this->hasOne('App\PengelolaPendidikan','id_pengelola','id');
+        return $this->hasOne('App\AktivisPendidikan','id_aktivis','id');
     }
 
     public function pendidikans(){
-        return $this->hasMany('App\PengelolaPendidikan','id_pengelola','id');
+        return $this->hasMany('App\AktivisPendidikan','id_aktivis','id');
     }
 
     public function pendidikan_tertinggi(){
-        return $this->hasOne('App\PengelolaPendidikan','id_pengelola','id')->oldest();
+        return $this->hasOne('App\AktivisPendidikan','id_aktivis','id')->oldest();
     }
 
     public function pekerjaan(){
-        return $this->hasOne('App\PengelolaPekerjaan','id_pengelola','id');
+        return $this->hasOne('App\AktivisPekerjaan','id_aktivis','id');
     }
 
     public function pekerjaans(){
-        return $this->hasMany('App\PengelolaPekerjaan','id_pengelola','id')->orderBy('mulai','desc');
+        return $this->hasMany('App\AktivisPekerjaan','id_aktivis','id')->orderBy('mulai','desc');
     }
 
     public function pekerjaan_aktif(){
-        return $this->hasOne('App\PengelolaPekerjaan','id_pengelola','id')->where('selesai',null)->orWhere('selesai','>',date('Y-m-d'))->latest();
+        return $this->hasOne('App\AktivisPekerjaan','id_aktivis','id')->where('selesai',null)->orWhere('selesai','>',date('Y-m-d'))->latest();
     }
 
     public function keluarga(){
-        return $this->hasMany('App\PengelolaKeluarga','id_pengelola','id');
+        return $this->hasMany('App\AktivisKeluarga','id_aktivis','id');
     }
 
     public function anggotacu(){
-        return $this->hasMany('App\PengelolaAnggotaCU','id_pengelola','id');
+        return $this->hasMany('App\AktivisAnggotaCU','id_aktivis','id');
     }
 
     public function organisasi(){
-        return $this->hasMany('App\PengelolaOrganisasi','id_pengelola','id');
+        return $this->hasMany('App\AktivisOrganisasi','id_aktivis','id');
     }
 
     public function Provinces()

app/PengelolaAnggotaCu.php → app/AktivisAnggotaCu.php

@@ -5,16 +5,16 @@
 use App\Support\FilterPaginateOrder;
 use Spatie\Activitylog\Traits\LogsActivity;
 
-class PengelolaAnggotaCu extends Model {
+class AktivisAnggotaCu extends Model {
 
     use FilterPaginateOrder, LogsActivity;
 
-    protected $table = 'pengelola_anggota_cu';
+    protected $table = 'aktivis_anggota_cu';
 
     protected static $logFillable = true;
 
     protected $fillable = [
-        'id_pengelola','name','no_ba'
+        'id_aktivis','name','no_ba'
     ];
 
     protected $filter = [
@@ -28,8 +28,8 @@ public static function initialize()
         ];
     }
 
-    public function pengelola(){
-        return $this->belongsTo('App\Pengelola','id_pengelola','id');
+    public function aktivis(){
+        return $this->belongsTo('App\Aktivis','id_aktivis','id');
     }
 
 }

app/PengelolaKeluarga.php → app/AktivisKeluarga.php

@@ -5,16 +5,16 @@
 use App\Support\FilterPaginateOrder;
 use Spatie\Activitylog\Traits\LogsActivity;
 
-class PengelolaKeluarga extends Model {
+class AktivisKeluarga extends Model {
 
     use FilterPaginateOrder, LogsActivity;
 
-    protected $table = 'pengelola_keluarga';
+    protected $table = 'aktivis_keluarga';
 
     protected static $logFillable = true;
 
     protected $fillable = [
-        'id_pengelola','name','tipe'
+        'id_aktivis','name','tipe'
     ];
 
     protected $filter = [
@@ -28,8 +28,8 @@ public static function initialize()
         ];
     }
 
-    public function pengelola(){
-        return $this->belongsTo('App\Pengelola','id_pengelola','id');
+    public function aktivis(){
+        return $this->belongsTo('App\Aktivis','id_aktivis','id');
     }
 
 }

app/PengelolaOrganisasi.php → app/AktivisOrganisasi.php

@@ -5,16 +5,16 @@
 use App\Support\FilterPaginateOrder;
 use Spatie\Activitylog\Traits\LogsActivity;
 
-class PengelolaOrganisasi extends Model {
+class AktvisOrganisasi extends Model {
 
     use FilterPaginateOrder, LogsActivity;
 
-    protected $table = 'pengelola_organisasi';
+    protected $table = 'aktivis_organisasi';
 
     protected static $logFillable = true;
 
     protected $fillable = [
-        'id_pengelola','tipe','name','jabatan','tempat','mulai','selesai'
+        'id_aktivis','tipe','name','jabatan','tempat','mulai','selesai'
     ];
 
     protected $filter = [

app/PengelolaPekerjaan.php → app/AktivisPekerjaan.php

@@ -5,16 +5,16 @@
 use App\Support\FilterPaginateOrder;
 use Spatie\Activitylog\Traits\LogsActivity;
 
-class PengelolaPekerjaan extends Model {
+class AktivisPekerjaan extends Model {
 
     use FilterPaginateOrder, LogsActivity;
 
-    protected $table = 'pengelola_pekerjaan';
+    protected $table = 'aktivis_pekerjaan';
 
     protected static $logFillable = true;
 
     protected $fillable = [
-        'id_pengelola','id_tempat','id_tp','lembaga_lain','tipe','name','tingkat','mulai','selesai'
+        'id_aktivis','id_tempat','id_tp','lembaga_lain','tipe','name','tingkat','mulai','selesai'
     ];
 
     protected $filter = [
@@ -28,8 +28,8 @@ public static function initialize()
         ];
     }
 
-    public function pengelola(){
-        return $this->belongsTo('App\Pengelola','id_pengelola','id');
+    public function aktivis(){
+        return $this->belongsTo('App\Aktivis','id_aktivis','id');
     }
 
     public function lembaga(){

app/PengelolaPendidikan.php → app/AktivisPendidikan.php

@@ -5,16 +5,16 @@
 use App\Support\FilterPaginateOrder;
 use Spatie\Activitylog\Traits\LogsActivity;
 
-class PengelolaPendidikan extends Model {
+class AktivisPendidikan extends Model {
 
     use FilterPaginateOrder, LogsActivity;
 
-    protected $table = 'pengelola_pendidikan';
+    protected $table = 'aktivis_pendidikan';
 
     protected static $logFillable = true;
 
     protected $fillable = [
-        'id_pengelola','name','tingkat','tempat','mulai','selesai'
+        'id_aktivis','name','tingkat','tempat','mulai','selesai'
     ];
 
     protected $filter = [
@@ -28,8 +28,8 @@ public static function initialize()
         ];
     }
 
-    public function pengelola(){
-        return $this->belongsTo('App\Pengelola','id_pengelola','id');
+    public function aktivis(){
+        return $this->belongsTo('App\Aktivis','id_aktivis','id');
     }
 
 }