Skip to content

Commit

Permalink
update 3.6 data pemberdayaan, update data anggota cu
Browse files Browse the repository at this point in the history
  • Loading branch information
t0n1zz committed Dec 3, 2024
1 parent 5cd3d52 commit f233b36
Show file tree
Hide file tree
Showing 319 changed files with 256,978 additions and 220,626 deletions.
Binary file modified .DS_Store
Binary file not shown.
Binary file modified app/.DS_Store
Binary file not shown.
19 changes: 13 additions & 6 deletions app/AnggotaCu.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ public static function boot()
);

protected $fillable = [
'nik','name','ahli_waris','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','lembaga','jabatan','penghasilan','pengeluaran','pendidikan','organisasi','kontak','id_villages','id_districts','id_regencies','id_provinces','gambar','npwp','tanggal_meninggal','tanggal_cacat','pekerjaan','suku','nama_ibu','kk','kontak_ahli_waris','rt','rw','status_jalinan','escete'
'nik','name','ahli_waris','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','lembaga','jabatan','penghasilan','pengeluaran','pendidikan','organisasi','kontak','id_villages','id_districts','id_regencies','id_provinces','gambar','npwp','tanggal_meninggal','tanggal_cacat','pekerjaan','suku','nama_ibu','kk','kontak_ahli_waris','rt','rw','status_jalinan','escete','ttd','gambarKtp'
];

protected $allowedFilters = [
'nik','name','ahli_waris','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','lembaga','jabatan','penghasilan','pengeluaran','pendidikan','organisasi','kontak','created_at','updated_at','npwp','tanggal_meninggal','tanggal_cacat','pekerjaan','suku','nama_ibu','kk','kontak_ahli_waris','rt','rw','escete',
'nik','name','ahli_waris','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','lembaga','jabatan','penghasilan','pengeluaran','pendidikan','organisasi','kontak','created_at','updated_at','npwp','tanggal_meninggal','tanggal_cacat','pekerjaan','suku','nama_ibu','kk','kontak_ahli_waris','rt','rw','escete','ttd','gambarKtp',

'villages.name', 'districts.name', 'regencies.name', 'provinces.name','anggota_cu_cu.no_ba','anggota_cu_cu.tanggal_masuk'
];

protected $orderable = [
'nik','name','ahli_waris','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','lembaga','jabatan','penghasilan','pengeluaran','pendidikan','organisasi','kontak','created_at','updated_at','npwp','tanggal_meninggal','tanggal_cacat','pekerjaan','suku','nama_ibu','kk','kontak_ahli_waris','rt','rw','escete'
'nik','name','ahli_waris','tempat_lahir','tanggal_lahir','kelamin','agama','status','alamat','hp','email','darah','tinggi','lembaga','jabatan','penghasilan','pengeluaran','pendidikan','organisasi','kontak','created_at','updated_at','npwp','tanggal_meninggal','tanggal_cacat','pekerjaan','suku','nama_ibu','kk','kontak_ahli_waris','rt','rw','escete','ttd','gambarKtp'
];

public static function initialize()
{
return [
'nik' => '','name' => '','ahli_waris' => '','tempat_lahir' => '','tanggal_lahir' => '','kelamin' => '','agama' => '','status' => '','alamat' => '','hp' => '','email' => '','darah' => '','tinggi' => '','kontak' => '','lembaga' => '','jabatan' => '','penghasilan' => '','pengeluaran' => '', 'pendidikan' => '','organisasi' => '','id_villages' => '', 'id_districts' => '', 'id_regencies' => '', 'id_provinces' => '','gambar'=> '','npwp' => '','tanggal_meninggal'=> '','tanggal_cacat'=> '','pekerjaan' => '','suku' => '','nama_ibu' => '','kk' => '','kontak_ahli_waris' => '','rt' => '','rw' => '','tanggal_masuk' => '','tp_id' => ''
'nik' => '','name' => '','ahli_waris' => '','tempat_lahir' => '','tanggal_lahir' => '','kelamin' => '','agama' => '','status' => '','alamat' => '','hp' => '','email' => '','darah' => '','tinggi' => '','kontak' => '','lembaga' => '','jabatan' => '','penghasilan' => '','pengeluaran' => '', 'pendidikan' => '','organisasi' => '','id_villages' => '', 'id_districts' => '', 'id_regencies' => '', 'id_provinces' => '','gambar'=> '','npwp' => '','tanggal_meninggal'=> '','tanggal_cacat'=> '','pekerjaan' => '','suku' => '','nama_ibu' => '','kk' => '','kontak_ahli_waris' => '','rt' => '','rw' => '','tanggal_masuk' => '','tp_id' => '','ttd' => '', 'gambarKtp' => ''
];
}

Expand Down Expand Up @@ -118,12 +118,19 @@ public function anggota_produk_cu(){
$id = Auth::user()->getIdCu();

if($id == 0){
return $this->belongsToMany('App\ProdukCu','anggota_produk_cu')->select('produk_cu.id','anggota_produk_cu.id','id_cu','kode_produk','name','jalinan','tipe')->withPivot('id','no_rek','saldo','tanggal','lama_pinjaman')->orderBy('anggota_produk_cu.tanggal','desc')->withTimestamps();
return $this->belongsToMany('App\ProdukCu','anggota_produk_cu')->select('produk_cu.id','anggota_produk_cu.id','id_cu','kode_produk','name','jalinan','tipe')->withPivot('id','no_rek','tanggal','lama_pinjaman')->orderBy('anggota_produk_cu.tanggal','desc')->withTimestamps();
}else{
return $this->belongsToMany('App\ProdukCu','anggota_produk_cu')->select('produk_cu.id','anggota_produk_cu.id','id_cu','kode_produk','name','jalinan','tipe')->where('id_cu',$id)->withPivot('id','no_rek','saldo','tanggal','lama_pinjaman')->orderBy('anggota_produk_cu.tanggal','desc')->withTimestamps();
return $this->belongsToMany('App\ProdukCu','anggota_produk_cu')->select('produk_cu.id','anggota_produk_cu.id','id_cu','kode_produk','name','jalinan','tipe')->where('id_cu',$id)->withPivot('id','no_rek','tanggal','lama_pinjaman')->orderBy('anggota_produk_cu.tanggal','desc')->withTimestamps();
}
}

public function anggota_cu_cu_informasi(){
return $this->hasMany('App\AnggotaCuCu','anggota_cu_id','id');
}

public function anggota_produk_cu_informasi(){
return $this->belongsToMany('App\ProdukCu','anggota_produk_cu')->select('produk_cu.id','anggota_produk_cu.id','id_cu','kode_produk','name','jalinan','tipe')->withPivot('id','no_rek','tanggal','kolekbi','dpd')->orderBy('anggota_produk_cu.tanggal','desc')->withTimestamps();
}

public function status_jalinan()
{
Expand Down
2 changes: 1 addition & 1 deletion app/AnggotaCuCu.php
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public function anggota_cu_simple()

public function cu()
{
return $this->belongsTo('App\Cu','cu_id','id')->select('id','no_ba','name','id_villages','id_districts','id_regencies','id_provinces');
return $this->belongsTo('App\Cu','cu_id','id')->select('id','no_ba','name','id_villages','id_districts','id_regencies','id_provinces','escete');
}

public function tp()
Expand Down
6 changes: 3 additions & 3 deletions app/AnggotaProdukCu.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ class AnggotaProdukCu extends BaseEloquent {
];

protected $fillable = [
'no_rek','anggota_cu_id','anggota_cu_cu_id','produk_cu_id','saldo','tanggal','tanggal_target','lama_pinjaman','lama_sisa_pinjaman','tujuan','pengurang','dpd','kolekbi','tanggal_bayar_akhir'
'no_rek','anggota_cu_id','anggota_cu_cu_id','produk_cu_id','tanggal','tanggal_target','lama_pinjaman','lama_sisa_pinjaman','tujuan','pengurang','dpd','kolekbi','tanggal_bayar_akhir'
];

protected $filter = [
'no_rek','anggota_cu_id','anggota_cu_cu_id','produk_cu_id','saldo','tanggal','tanggal_target','lama_pinjaman','lama_sisa_pinjaman','tujuan','created_at','updated_at','pengurang','dpd'
'no_rek','anggota_cu_id','anggota_cu_cu_id','produk_cu_id','tanggal','tanggal_target','lama_pinjaman','lama_sisa_pinjaman','tujuan','created_at','updated_at','pengurang','dpd'
];

public static function initialize()
{
return [
'no_rek' => '','anggota_cu_id' => '','anggota_cu_cu_id' => '','produk_cu_id' => '','saldo' => '','name' => '','no_ba' => '','lama_pinjaman' => '','lama_sisa_pinjaman' => '','tanggal_target' => '','tujuan' => '','pengurang' => '','dpd' => ''
'no_rek' => '','anggota_cu_id' => '','anggota_cu_cu_id' => '','produk_cu_id' => '','name' => '','no_ba' => '','lama_pinjaman' => '','lama_sisa_pinjaman' => '','tanggal_target' => '','tujuan' => '','pengurang' => '','dpd' => ''
];
}

Expand Down
4 changes: 2 additions & 2 deletions app/CU.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static function boot()

protected $fillable = [
'id_villages','id_districts','id_regencies','id_provinces','no_ba','name','name_legal','gambar','badan_hukum','npwp','nik','situ','siusp','izin_operasional','alamat','pos','telp','hp','website','email','app','misi','visi','nilai','slogan','sejarah','deskripsi','ultah',
'bergabung','created_at','updated_at','deleted_at','escete','logo','facebook','instagram','youtube','tiktok'
'bergabung','created_at','updated_at','deleted_at','escete','logo','facebook','instagram','youtube','tiktok','lat','lng'
];

protected $allowedFilters = [
Expand All @@ -65,7 +65,7 @@ public static function boot()
public static function initialize(){
return [
'id_villages' => '', 'id_districts' => '', 'id_regencies' => '', 'id_provinces' => '', 'no_ba' => '', 'name' => '','name_legal' => '', 'gambar' => '',
'badan_hukum' => '','npwp' => '','nik' => '','situ' => '','siusp' => '','izin_operasional' => '', 'alamat' => '', 'pos' => '', 'telp' => '', 'hp' => '', 'website' => '', 'email' => '', 'app' => '', 'ultah' => '', 'bergabung' => '', 'logo' => '','facebook' => '','instagram' => '','youtube' => '','tiktok' => ''
'badan_hukum' => '','npwp' => '','nik' => '','situ' => '','siusp' => '','izin_operasional' => '', 'alamat' => '', 'pos' => '', 'telp' => '', 'hp' => '', 'website' => '', 'email' => '', 'app' => '', 'ultah' => '', 'bergabung' => '', 'logo' => '','facebook' => '','instagram' => '','youtube' => '','tiktok' => '','lat' => '','lng' => ''
];
}

Expand Down
68 changes: 68 additions & 0 deletions app/Enterpreneur.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
<?php
namespace App;

use illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use App\Support\Dataviewer;
use Spatie\Activitylog\Traits\LogsActivity;

class Enterpreneur extends BaseEloquent {

use \Venturecraft\Revisionable\RevisionableTrait;
use Dataviewer, LogsActivity, SoftDeletes;

protected $table = 'enterpreneur';
protected $dates = ['deleted_at'];
protected static $logFillable = true;
protected static $logOnlyDirty = true;
protected $revisionEnabled = true;
protected $revisionCleanup = true;
protected $historyLimit = 500;

public static $rules = [
'anggota_cu_id' => 'required',
'id_cu' => 'required'
];

protected $fillable = [
'anggota_cu_id','id_usaha','id_cu','jmlh_pinjaman','marketplace','deskripsi'
];

protected $allowedFilters = [
'id','anggota_cu_id','id_usaha','id_cu','jmlh_pinjaman','marketplace','deskripsi','created_at','updated_at',

'anggota_cu.name','cu.name','usaha.name'
];

protected $orderable = [
'id','anggota_cu_id','id_usaha','id_cu','jmlh_pinjaman','marketplace','deskripsi','created_at','updated_at',

'anggota_cu.name','cu.name','usaha.name'
];

public static function initialize(){
return [
'anggota_cu_id' => '', 'id_usaha' => '','id_cu' => '','jmlh_pinjaman' => '0','marketplace' => '', 'deskripsi' => ''
];
}

public function anggota_cu()
{
return $this->belongsTo('App\AnggotaCu','anggota_cu_id','id');
}

public function Cu()
{
return $this->belongsTo('App\Cu','id_cu','id')->select('id','no_ba','name','id_provinces')->withTrashed();
}

public function Usaha()
{
return $this->belongsTo('App\KubnUsaha','id_usaha','id')->select('id','name')->withTrashed();
}

public function Diklat()
{
return $this->hasMany('App\EnterpreneurDiklat','id_enterpreneur','id');
}
}
37 changes: 37 additions & 0 deletions app/EnterpreneurDiklat.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?php
namespace App;

use Illuminate\Database\Eloquent\SoftDeletes;
use App\Support\Dataviewer;
use Spatie\Activitylog\Traits\LogsActivity;

class EnterpreneurDiklat extends BaseEloquent {

use Dataviewer, LogsActivity, SoftDeletes;

protected $table = 'enterpreneur_diklat';
protected $dates = ['deleted_at'];
protected static $logFillable = true;
protected static $logOnlyDirty = true;

public static $rules = [
'id_enterpreneur' => 'required',
'name' => 'required',
];

protected $fillable = ['id_enterpreneur','name','deskripsi','tanggal_mulai','tanggal_selesai','fasilitator','tempat'];

protected $allowedFilters = [
'id','id_enterpreneur','name','deskripsi','tanggal_mulai','tanggal_selesai','fasilitator','tempat','created_at','updated_at'
];

protected $orderable = [
'id','id_enterpreneur','name','deskripsi','tanggal_mulai','tanggal_selesai','fasilitator','tempat','created_at','updated_at'
];

public static function initialize(){
return [
'id_enterpreneur' => '','name' => '', 'deskripsi' => '','tanggal_mulai' => '','tanggal_selesai' => '','fasilitator' => '','tempat' => ''
];
}
}
62 changes: 62 additions & 0 deletions app/Fasilitator.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?php
namespace App;

use illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use App\Support\Dataviewer;
use Spatie\Activitylog\Traits\LogsActivity;

class Fasilitator extends BaseEloquent {

use \Venturecraft\Revisionable\RevisionableTrait;
use Dataviewer, LogsActivity, SoftDeletes;

protected $table = 'fasilitator';
protected $dates = ['deleted_at'];
protected static $logFillable = true;
protected static $logOnlyDirty = true;
protected $revisionEnabled = true;
protected $revisionCleanup = true;
protected $historyLimit = 500;

public static $rules = [
'anggota_cu_id' => 'required',
'id_cu' => 'required'
];

protected $fillable = [
'anggota_cu_id','id_cu','deskripsi'
];

protected $allowedFilters = [
'id','anggota_cu_id','id_cu','deskripsi','created_at','updated_at',

'anggota_cu.name','cu.name'
];

protected $orderable = [
'id','anggota_cu_id','id_cu','deskripsi','created_at','updated_at',

'anggota_cu.name','cu.name'
];

public static function initialize(){
return [
'anggota_cu_id' => '','id_cu' => '', 'deskripsi' => ''
];
}

public function anggota_cu()
{
return $this->belongsTo('App\AnggotaCu','anggota_cu_id','id');
}

public function Cu()
{
return $this->belongsTo('App\Cu','id_cu','id')->select('id','no_ba','name','id_provinces')->withTrashed();
}

public function jenis_diklat(){
return $this->belongsToMany('App\JenisDiklat','fasilitator_jenis_diklat')->withPivot('id','jenis_diklat_id','fasilitator_id')->withTimestamps();
}
}
10 changes: 10 additions & 0 deletions app/FasilitatorJenisDiklat.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php
namespace App;

use illuminate\Database\Eloquent\Model;

class FasilitatorJenisDiklat extends Model {

protected $table = 'fasilitator_jenis_diklat';

}
Binary file modified app/Http/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion app/Http/Controllers/AktivisController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1186,7 +1186,7 @@ public function history()

public function cariData($nik)
{
$table_data = Aktivis::with('Villages','Districts','Regencies','Provinces','anggota_cu','keluarga')->where('nik',$nik)->first();
$table_data = Aktivis::withTrashed('Villages','Districts','Regencies','Provinces','anggota_cu','keluarga')->where('nik',$nik)->first();

if($table_data){
return response()
Expand Down
52 changes: 47 additions & 5 deletions app/Http/Controllers/AnggotaCuController.php
Original file line number Diff line number Diff line change
Expand Up @@ -351,9 +351,21 @@ public function store(Request $request)
else
$fileName = '';

$kelas = AnggotaCu::create($request->except('nik','gambar','statusNIK') + [
if(!empty($request->ttd))
$fileNameTTD = Helper::image_processing($this->imagepath,$this->width,$this->height,$request->ttd,'',$name . '_TTD');
else
$fileNameTTD = '';

if(!empty($request->gambarKtp))
$fileNameKTP = Helper::image_processing($this->imagepath,$this->width,$this->height,$request->gambarKtp,'',$name . '_KTP');
else
$fileNameKTP = '';

$kelas = AnggotaCu::create($request->except('nik','gambar','ttd','gambarKtp','statusNIK') + [
'nik' => $nik,
'gambar' => $fileName
'gambar' => $fileName,
'ttd' => $fileNameTTD,
'gambarKtp' => $fileNameKTP,
]);

$this->syncCu($request, $kelas);
Expand Down Expand Up @@ -444,9 +456,21 @@ public function update(Request $request, $id)
else
$fileName = '';

if(!empty($request->ttd))
$fileNameTTD = Helper::image_processing($this->imagepath,$this->width,$this->height,$request->ttd,$kelas->ttd,$name . '_TTD');
else
$fileNameTTD = '';

if(!empty($request->gambarKtp))
$fileNameKtp = Helper::image_processing($this->imagepath,$this->width,$this->height,$request->gambarKtp,$kelas->gambarKtp,$name . '_KTP');
else
$fileNameKtp = '';

// dd($request->all());
$kelas->update($request->except('gambar') + [
'gambar' => $fileName
$kelas->update($request->except('gambar','ttd','gambarKtp') + [
'gambar' => $fileName,
'ttd' => $fileNameTTD,
'gambarKtp' => $fileNameKtp,
]);

$cuArray = $this->syncCu($request, $kelas);
Expand Down Expand Up @@ -808,7 +832,6 @@ private function syncProdukCu($request, $kelas)
foreach($produkcu as $produk){
$produkCuArray[$produk['produk_cu']['id']] = [
'produk_cu_id' => array_key_exists('produk_cu', $produk) ? $produk['produk_cu']['id'] : null,
'saldo' => array_key_exists('saldo', $produk) ? $produk['saldo'] : null,
'no_rek' => array_key_exists('no_rek', $produk) ? $produk['no_rek'] : null,
'tanggal' => array_key_exists('tanggal', $produk) ? $produk['tanggal'] : null,
'lama_pinjaman' => array_key_exists('lama_pinjaman', $produk) ? $produk['lama_pinjaman'] : null,
Expand Down Expand Up @@ -881,6 +904,25 @@ public function systemNIK()
]);
}

public function cariDataInformasi($nik)
{
$table_data = AnggotaCu::with('anggota_cu_cu_informasi.cu','anggota_cu_cu_informasi.tp','anggota_produk_cu_informasi.cu','Villages','Districts','Regencies','Provinces')->where('nik',$nik)->first();

if($table_data){
return response()
->json([
'model' => $table_data
]);
}else{
return response()
->json([
'form' => AnggotaCu::initialize(),
'rules' => AnggotaCu::$rules,
'option' => []
]);
}
}

public function cariDataKTP($nik)
{
$table_data = AnggotaCu::with('anggota_cu_cu.cu','anggota_cu_cu.tp','anggota_produk_cu','Villages','Districts','Regencies','Provinces')->where('nik',$nik)->first();
Expand Down
Loading

0 comments on commit f233b36

Please sign in to comment.