Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
use App\Models\DaftarKontrakMitra;
use App\Models\Dipa;
use App\Models\HonorKegiatan;
use App\Models\KamusAnggaran;
use App\Models\KerangkaAcuan;
use App\Models\KontrakMitra;
use App\Models\NaskahKeluar;
Expand Down
3 changes: 2 additions & 1 deletion app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ public static function getMataAnggaranById($id)
public static function isAkunHonor($mata_anggaran_id): bool
{
$mak = MataAnggaran::cache()->get('all')->where('id', $mata_anggaran_id)->first()->mak;

return $mak == in_array(substr($mak, -6), self::$akun_honor);
}

Expand Down Expand Up @@ -649,7 +650,7 @@ public static function isAkunPersediaanChanged($mak_old, $mak_new)
public static function getCollectionDetailAkun($mak)
{
return KamusAnggaran::cache()->get('all')->filter(function ($item, $key) use ($mak) {
return Str::of($item->mak)->startsWith($mak) && Str::of($item->mak)->length > 37 && !empty($item->satuan);
return Str::of($item->mak)->startsWith($mak) && Str::of($item->mak)->length > 37 && ! empty($item->satuan);
});
}

Expand Down
1 change: 0 additions & 1 deletion app/Models/AnggaranKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public function mataAnggaran(): BelongsTo

protected static function booted(): void
{

static::saved(function (AnggaranKerangkaAcuan $anggaranKak) {
if ($anggaranKak->isDirty() && Helper::isAkunHonor($anggaranKak->mata_anggaran_id)) {
if ($honor = HonorKegiatan::where('anggaran_kerangka_acuan_id', $anggaranKak->id)->first()) {
Expand Down
3 changes: 0 additions & 3 deletions app/Models/ArsipDokumen.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@

class ArsipDokumen extends Model
{

public function kerangkaAcuan(): BelongsTo
{
return $this->belongsTo(KerangkaAcuan::class);
}


}
2 changes: 1 addition & 1 deletion app/Models/BarangPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function masterPersediaan(): BelongsTo
return $this->belongsTo(MasterPersediaan::class);
}

public function barangPersediaanable():MorphTo
public function barangPersediaanable(): MorphTo
{
return $this->morphTo();
}
Expand Down
3 changes: 1 addition & 2 deletions app/Models/BastMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ public function kontrakMitra(): BelongsTo

public function ppk(): BelongsTo
{
return $this->belongsTo(User::class ,'ppk_user_id');
return $this->belongsTo(User::class, 'ppk_user_id');
}


public function daftarKontrakMitra(): HasMany
{
return $this->hasMany(DaftarKontrakMitra::class);
Expand Down
4 changes: 2 additions & 2 deletions app/Models/DaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ class DaftarHonorMitra extends Model
{
protected $fillable = ['mitra_id', 'honor_kegiatan_id', 'daftar_kontrak_mitra_id'];

public function honorKegiatan():BelongsTo
public function honorKegiatan(): BelongsTo
{
return $this->belongsTo(HonorKegiatan::class, 'honor_kegiatan_id');
}

public function mitra():BelongsTo
public function mitra(): BelongsTo
{
return $this->belongsTo(Mitra::class);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/DaftarHonorPegawai.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public function user(): BelongsTo
return $this->belongsTo(User::class);
}

public function honorKegiatan():BelongsTo
public function honorKegiatan(): BelongsTo
{
return $this->belongsTo(HonorKegiatan::class);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public function kontrakMitra(): BelongsTo

public function mitra(): BelongsTo
{
return $this->belongsTo(Mitra::class,);
return $this->belongsTo(Mitra::class);
}

public function daftarHonorMitra(): HasMany
Expand Down
9 changes: 4 additions & 5 deletions app/Models/Dipa.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public function targetSerapanAnggaran(): HasMany
return $this->hasMany(TargetSerapanAnggaran::class);
}


/**
* Get the daftar kamus anggaran.
*/
Expand Down Expand Up @@ -68,10 +67,10 @@ protected static function booted(): void
});
static::created(function (Dipa $dipa) {
for ($bulan = 1; $bulan <= 12; $bulan++) {
$target = new TargetSerapanAnggaran();
$target->dipa_id = $dipa->id;
$target->bulan = $bulan;
$target->save();
$target = new TargetSerapanAnggaran();
$target->dipa_id = $dipa->id;
$target->bulan = $bulan;
$target->save();
}
});
}
Expand Down
1 change: 0 additions & 1 deletion app/Models/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public function unitKerja(): BelongsTo
return $this->belongsTo(UnitKerja::class);
}


public function arsipDokumen(): HasMany
{
return $this->hasMany(ArsipDokumen::class);
Expand Down
3 changes: 1 addition & 2 deletions app/Models/KontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,9 @@ public function jenisKontrak(): BelongsTo

public function ppk(): BelongsTo
{
return $this->belongsTo(User::class ,'ppk_user_id');
return $this->belongsTo(User::class, 'ppk_user_id');
}


protected static function booted(): void
{
static::creating(function (KontrakMitra $kontrak) {
Expand Down
6 changes: 3 additions & 3 deletions app/Models/NaskahMasuk.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@

class NaskahMasuk extends Model
{
public function jenisNaskah() : BelongsTo
public function jenisNaskah(): BelongsTo
{
return $this->belongsTo(JenisNaskah::class);
return $this->belongsTo(JenisNaskah::class);
}

protected $casts = [
'tanggal' => 'date',
];
Expand Down
3 changes: 1 addition & 2 deletions app/Models/Pengelola.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@

class Pengelola extends Model
{

public function user(): BelongsTo
{
return $this->belongsTo(User::class);
}

use LaraCache;

protected $casts = [
Expand Down
3 changes: 1 addition & 2 deletions app/Models/PermintaanPersediaan.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,9 @@ public function user(): BelongsTo

public function pbmn(): BelongsTo
{
return $this->belongsTo(User::class ,'pbmn_user_id');
return $this->belongsTo(User::class, 'pbmn_user_id');
}


protected static function booted(): void
{
static::creating(function (PermintaanPersediaan $permintaan) {
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Actions/ImportMataAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public function handle(ActionFields $fields, Collection $models)

$mataAnggaran->updated_at = now();
$mataAnggaran->save();

});
MataAnggaran::where('updated_at', null)->delete();
MataAnggaran::cache()->enable();
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Actions/ImportRealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public function handle(ActionFields $fields, Collection $models)
$realisasiAnggaran->nilai = $row['NILAI RUPIAH'];
$realisasiAnggaran->updated_at = now();
$realisasiAnggaran->save();

});
RealisasiAnggaran::where('updated_at', null)->delete();

Expand Down
5 changes: 3 additions & 2 deletions app/Nova/ArsipDokumen.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

class ArsipDokumen extends Resource
{
public static $with = ['kerangkaAcuan'];
public static $with = ['kerangkaAcuan'];

/**
* Get the label for the resource.
*
Expand Down Expand Up @@ -48,7 +49,7 @@ public function subtitle()
*/
public static $search = [
'slug',
'kerangkaAcuan.rincian'
'kerangkaAcuan.rincian',
];

/**
Expand Down
6 changes: 3 additions & 3 deletions app/Nova/DaftarHonorPegawai.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

class DaftarHonorPegawai extends Resource
{
public static $with = ['user' , 'honorKegiatan'];
public static $with = ['user', 'honorKegiatan'];
public static $displayInNavigation = false;

/**
Expand All @@ -39,11 +39,11 @@ public function subtitle()
return 'Kegiatan: '.$this->honorKegiatan->kegiatan;
}


public static $search = [
'user.name',
'user.nip',
];

public function fields(NovaRequest $request)
{
return [
Expand All @@ -55,7 +55,7 @@ public function fields(NovaRequest $request)
->creationRules('required', Rule::unique('daftar_honor_pegawais', 'user_id')->where('honor_kegiatan_id', $request->viaResourceId))
->onlyOnForms(),
BelongsTo::make('Nama Pegawai', 'user', 'App\Nova\User')
->exceptOnForms(),
->exceptOnForms(),
Number::make('Jumlah', 'volume')
->step(0.01)
->rules('nullable', 'bail', 'gt:0')
Expand Down
6 changes: 2 additions & 4 deletions app/Nova/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
use Laravel\Nova\Fields\HasMany;
use Laravel\Nova\Fields\Number;
use Laravel\Nova\Fields\Status;
use Laravel\Nova\Fields\Text;
use Laravel\Nova\Http\Requests\NovaRequest;

class DaftarKontrakMitra extends Resource
Expand Down Expand Up @@ -126,14 +125,13 @@ public function filters(NovaRequest $request)
{
$filters = [];
if ($request->viaResource == 'bast-mitras') {
$filters[] = StatusFilter::make('daftar_kontrak_mitras', 'status_bast');
$filters[] = StatusFilter::make('daftar_kontrak_mitras', 'status_bast');
}
if ($request->viaResource == 'kontrak-mitras') {
$filters[] = StatusFilter::make('daftar_kontrak_mitras', 'status_kontrak');
$filters[] = StatusFilter::make('daftar_kontrak_mitras', 'status_kontrak');
}

return $filters;

}

/**
Expand Down
4 changes: 1 addition & 3 deletions app/Nova/DataPegawai.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Helpers\Helper;
use App\Helpers\Policy;
use App\Nova\Actions\AddHasManyModel;
use Carbon\Unit;
use Laravel\Nova\Fields\BelongsTo;
use Laravel\Nova\Fields\Date;
use Laravel\Nova\Fields\Select;
Expand Down Expand Up @@ -39,7 +38,7 @@ public static function label()

public function subtitle()
{
return 'Golongan: '.$this->golongan.', Jabatan: '.$this->jabatan. ', Unit Kerja: '.$this->unitKerja->unit. '(Sejak: '.Helper::terbilangTanggal($this->tanggal).')';
return 'Golongan: '.$this->golongan.', Jabatan: '.$this->jabatan.', Unit Kerja: '.$this->unitKerja->unit.'(Sejak: '.Helper::terbilangTanggal($this->tanggal).')';
}

public static $search = [
Expand All @@ -49,7 +48,6 @@ public function subtitle()
'user.name',
];


/**
* Get the fields displayed by the resource.
*
Expand Down
5 changes: 2 additions & 3 deletions app/Nova/Dipa.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
class Dipa extends Resource
{
use HasTabs;

public static function label()
{
return 'DIPA';
Expand All @@ -42,7 +43,7 @@ public static function label()

public function subtitle()
{
return 'Tahun: ' . $this->tahun;
return 'Tahun: '.$this->tahun;
}
/**
* The columns that should be searched.
Expand Down Expand Up @@ -88,7 +89,6 @@ public function fields(NovaRequest $request)
*/
public function cards(NovaRequest $request)
{

$cards = [];
if (Policy::make()->allowedFor('admin')->get()) {
$cards[] =
Expand All @@ -97,7 +97,6 @@ public function cards(NovaRequest $request)
}

return $cards;

}

/**
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Filters/StatusFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public function options(NovaRequest $request)
->distinct()
->pluck($this->column, $this->column)
->mapWithKeys(function ($item, $key) {
return [strtoupper($key) => $item];
return [strtoupper($key) => $item];
});
}

Expand Down
2 changes: 1 addition & 1 deletion app/Nova/HargaSatuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function label()

public function subtitle()
{
return 'Tanggal: ' . Helper::terbilangTanggal($this->tanggal);
return 'Tanggal: '.Helper::terbilangTanggal($this->tanggal);
}

/**
Expand Down
6 changes: 3 additions & 3 deletions app/Nova/IzinKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ public static function label()
* @var string
*/
public static $title = 'user.name';

public function subtitle()
{
return 'Tanggal: '.Helper::terbilangTanggal($this->tanggal). ' Kegiatan: '.$this->kegiatan;
return 'Tanggal: '.Helper::terbilangTanggal($this->tanggal).' Kegiatan: '.$this->kegiatan;
}

/**
Expand Down Expand Up @@ -92,7 +92,7 @@ public function fields(NovaRequest $request)
->rules('required'),
Panel::make('Jam Kembali', [
Time::make('Jam Kembali', 'kembali')
->sortable(),
->sortable(),
AdvancedImage::make('Bukti Dukung', 'bukti')
->disk('izin_keluar')
->croppable()
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/JenisKontrak.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static function label()

public function subtitle()
{
return 'Batas maksimal: ' . Helper::formatRupiah($this->sbml);
return 'Batas maksimal: '.Helper::formatRupiah($this->sbml);
}

/**
Expand Down
Loading