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
5 changes: 2 additions & 3 deletions app/Models/AnggaranKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ protected static function booted(): void
{
static::saved(function (AnggaranKerangkaAcuan $anggaranKak) {
if (Helper::isAkunHonor($anggaranKak->mak)) {

if ($honor = HonorKegiatan::where('anggaran_kerangka_acuan_id', $anggaranKak->id)->first()) {
$honor->mak = $anggaranKak->mak;
$honor->perkiraan_anggaran = $anggaranKak->perkiraan;
$honor->perkiraan_anggaran = $anggaranKak->perkiraan;
$honor->save();
} else {
} else {
$kak = KerangkaAcuan::find($anggaranKak->kerangka_acuan_id);
$dipa = Dipa::cache()->get('all')->where('id', $kak->dipa_id)->first();
$honor = new HonorKegiatan;
Expand Down
1 change: 0 additions & 1 deletion app/Models/BastMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ protected static function booted(): void
$naskah_keluar->tanggal = $bast->tanggal_bast;
$naskah_keluar->save();
}

}
});
});
Expand Down
13 changes: 5 additions & 8 deletions app/Models/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,17 @@ public function kontrakNaskahKeluar(): BelongsTo

public function daftarHonorMitra(): HasMany
{
return $this->hasMany(DaftarHonorMitra::class,);
return $this->hasMany(DaftarHonorMitra::class);
}

public function bastNaskahKeluar(): BelongsTo
{
return $this->belongsTo(NaskahKeluar::class, 'bast_naskah_keluar_id');
}



protected static function booted(): void
{
static::creating(function (DaftarKontrakMitra $daftar) {
static::creating(function (DaftarKontrakMitra $daftar) {
$daftar->status = 'dibuat';
$kontrak = KontrakMitra::find($daftar->kontrak_mitra_id);
$jenis_kontrak = Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kontrak->jenis_kontrak)->first(), 'jenis');
Expand All @@ -51,7 +49,7 @@ protected static function booted(): void
$naskahkeluar->kode_arsip_id = $kontrak->kode_arsip_id;
$naskahkeluar->derajat_naskah_id = Helper::getPropertyFromCollection($default_naskah, 'derajat_naskah_id');
$naskahkeluar->tujuan = Helper::getPropertyFromCollection(Helper::getMitraById($daftar->mitra_id), 'nama');
$naskahkeluar->perihal = 'PERJANJIAN KERJA MITRA STATISTIK PETUGAS '.strtoupper($jenis_kontrak).' BULAN '.strtoupper($bulan_kontrak). ' TAHUN '.$kontrak->tahun;
$naskahkeluar->perihal = 'PERJANJIAN KERJA MITRA STATISTIK PETUGAS '.strtoupper($jenis_kontrak).' BULAN '.strtoupper($bulan_kontrak).' TAHUN '.$kontrak->tahun;
$naskahkeluar->generate = 'A';
$naskahkeluar->save();
$daftar->kontrak_naskah_keluar_id = $naskahkeluar->id;
Expand All @@ -62,11 +60,10 @@ protected static function booted(): void
});

static::saving(function (DaftarKontrakMitra $daftar) {
if ($daftar->isDirty('bast_naskah_keluar_id') ) {
if ($daftar->isDirty('bast_naskah_keluar_id')) {
if (is_null($daftar->bast_naskah_keluar_id)) {
NaskahKeluar::destroy($daftar->getOriginal('bast_naskah_keluar_id'));
}

}
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ protected static function booted(): void
if ($kak->isDirty('dipa_id')) {
$kak->deleteOldAnggaran();
}
if ($kak->isDirty(['tanggal', 'awal', 'akhir', 'kegiatan','dipa_id'])) {
if ($kak->isDirty(['tanggal', 'awal', 'akhir', 'kegiatan', 'dipa_id'])) {
$dipa = Dipa::cache()->get('all')->where('id', $kak->dipa_id)->first();
$honor = HonorKegiatan::where('kerangka_acuan_id', $kak->id)->first();
$honor->generate_sk ? $honor->tanggal_sk = $kak->tanggal : null;
Expand Down
1 change: 0 additions & 1 deletion app/Models/KontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ protected static function booted(): void
$naskah_keluar->tanggal = $kontrak->tanggal_spk;
$naskah_keluar->save();
}

}
});
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/NaskahKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class NaskahKeluar extends Model
protected static function booted(): void
{
static::saving(function (NaskahKeluar $naskah) {
if ($naskah->isDirty(['jenis_naskah_id', 'tanggal','kode_arsip_id', 'derajat_naskah_id','unit_kerja_id'])) {
if ($naskah->isDirty(['jenis_naskah_id', 'tanggal', 'kode_arsip_id', 'derajat_naskah_id', 'unit_kerja_id'])) {
$unit_kerja_id = $naskah->unit_kerja_id ?? Helper::getPropertyFromCollection(Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal), 'unit_kerja_id');
$nomor = Helper::nomor($naskah->tanggal, $naskah->jenis_naskah_id, $unit_kerja_id, $naskah->kode_arsip_id, $naskah->derajat_naskah_id);
$naskah->nomor = $nomor['nomor'];
Expand Down
13 changes: 6 additions & 7 deletions app/Nova/Actions/GenerateKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@ public function handle(ActionFields $fields, Collection $models)
]
);

$daftarHonorIds = DaftarHonorMitra::where("mitra_id", $mitra->mitra_id)
$daftarHonorIds = DaftarHonorMitra::where('mitra_id', $mitra->mitra_id)
->get()
->pluck("honor_kegiatan_id");
$jumlah_kontrak = HonorKegiatan::whereIn("id", $daftarHonorIds)
->distinct(["jenis_kontrak", "jenis_honor", "bulan", "tahun"])
->pluck('honor_kegiatan_id');
$jumlah_kontrak = HonorKegiatan::whereIn('id', $daftarHonorIds)
->distinct(['jenis_kontrak', 'jenis_honor', 'bulan', 'tahun'])
->count();
if ($mitra->nilai_kontrak <= Helper::getPropertyFromCollection(Helper::getJenisKontrakById($model->jenis_kontrak), "sbml")) {
if ($mitra->nilai_kontrak <= Helper::getPropertyFromCollection(Helper::getJenisKontrakById($model->jenis_kontrak), 'sbml')) {
$daftar_mitra->valid_sbml = true;
}

if ($jumlah_kontrak <= 1) {
$daftar_mitra->valid_jumlah_kontrak = true;
}
}
$daftar_mitra->jumlah_kegiatan = $mitra->jumlah_kegiatan;
$daftar_mitra->nilai_kontrak = $mitra->nilai_kontrak;
$daftar_mitra->updated_at = now();
Expand All @@ -81,7 +81,6 @@ public function handle(ActionFields $fields, Collection $models)
$daftar_honor->daftar_kontrak_mitra_id = $daftar_mitra->id;
$daftar_honor->save();
}

}
$model->status = 'selesai';
$model->save();
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Actions/ImportDaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function handle(ActionFields $fields, Collection $models)
}
});
$ids = DaftarHonorMitra::where('updated_at', null)->get()->pluck('id');
DaftarHonorMitra::destroy($ids);
DaftarHonorMitra::destroy($ids);

return Action::message('File BOS sukses diimport!');
}
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Actions/ImportKodeArsip.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function handle(ActionFields $fields, Collection $models)

$kodeArsip->save();
});
$ids = KodeArsip::where('updated_at', null)->get()->pluck('id');
$ids = KodeArsip::where('updated_at', null)->get()->pluck('id');
KodeArsip::destroy($ids);
KodeArsip::cache()->enable();
KodeArsip::cache()->update('all');
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Actions/ImportMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function handle(ActionFields $fields, Collection $models)
$mitra->save();
}
});
$ids = Mitra::where('updated_at', null)->get()->pluck('id');
$ids = Mitra::where('updated_at', null)->get()->pluck('id');
Mitra::destroy($ids);
Mitra::cache()->enable();
Mitra::cache()->update('all');
Expand Down
9 changes: 5 additions & 4 deletions app/Nova/BastMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ public static function label()
*/
public function fields(NovaRequest $request)
{
$akhir = $this->kontrakMitra ? $this->kontrakMitra->akhir_kontrak : 'today';
$akhir = $this->kontrakMitra ? $this->kontrakMitra->akhir_kontrak : 'today';

return [
BelongsTo::make('Kontrak Mitra')
->onlyOnIndex(),
Expand All @@ -70,11 +71,11 @@ public function fields(NovaRequest $request)
->displayUsing(fn ($kode) => Helper::getPropertyFromCollection(KodeArsip::cache()->get('all')->where('id', $kode)->first(), 'kode'))
->dependsOn(['tanggal_bast'], function (Select $field, NovaRequest $request, FormData $formData) {
$default_naskah = NaskahDefault::cache()
->get("all")
->where("jenis", "bast")
->get('all')
->where('jenis', 'bast')
->first();
$field->rules('required')
->options(Helper::setOptionsKodeArsip($formData->tanggal_bast, Helper::getPropertyFromCollection($default_naskah, "kode_arsip_id")));
->options(Helper::setOptionsKodeArsip($formData->tanggal_bast, Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')));
}),
Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
->rules('required')
Expand Down
62 changes: 31 additions & 31 deletions app/Nova/DaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,35 @@ public function fields(NovaRequest $request)
$kegiatan = HonorKegiatan::find($this->honor_kegiatan_id);
if ($request->viaResource === 'honor-kegiatans') {
return [
Text::make('Nama', fn () => $mitra->nama)
->onlyOnIndex(),
Text::make('Golongan', fn () => '-')
Text::make('Nama', fn () => $mitra->nama)
->onlyOnIndex(),
Text::make('Golongan', fn () => '-')
->onlyOnIndex(),
Number::make('Jumlah', 'volume')
->onlyOnIndex(),
Currency::make('Harga Satuan', 'harga_satuan')
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Currency::make('Bruto', fn () => $this->volume * $this->harga_satuan)
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Currency::make('Pajak', fn () => round($this->volume * $this->harga_satuan * $this->persen_pajak / 100, 0, PHP_ROUND_HALF_UP))
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Currency::make('Netto', fn () => $this->volume * $this->harga_satuan - round($this->volume * $this->harga_satuan * $this->persen_pajak / 100, 0, PHP_ROUND_HALF_UP))
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Text::make('Rekening', fn () => $mitra->rekening)
->onlyOnIndex(),
];
}

return [
Text::make('Kegiatan', fn () => $kegiatan->kegiatan)
->onlyOnIndex(),
Number::make('Jumlah', 'volume')
->onlyOnIndex(),
Expand All @@ -75,32 +101,6 @@ public function fields(NovaRequest $request)
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Text::make('Rekening', fn () => $mitra->rekening)
->onlyOnIndex(),
];
}

return [
Text::make('Kegiatan', fn () => $kegiatan->kegiatan)
->onlyOnIndex(),
Number::make('Jumlah', 'volume')
->onlyOnIndex(),
Currency::make('Harga Satuan', 'harga_satuan')
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Currency::make('Bruto', fn () => $this->volume * $this->harga_satuan)
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Currency::make('Pajak', fn () => round($this->volume * $this->harga_satuan * $this->persen_pajak / 100, 0, PHP_ROUND_HALF_UP))
->currency('IDR')
->locale('id')
->onlyOnIndex(),
Currency::make('Netto', fn () => $this->volume * $this->harga_satuan - round($this->volume * $this->harga_satuan * $this->persen_pajak / 100, 0, PHP_ROUND_HALF_UP))
->currency('IDR')
->locale('id')
->onlyOnIndex(),
];
}

Expand Down Expand Up @@ -133,7 +133,7 @@ public function lenses(NovaRequest $request)
{
return [
RekapHonorMitra::make(),

];
}

Expand All @@ -156,7 +156,7 @@ public function actions(NovaRequest $request)
->standalone()
->confirmButtonText('Import');
}
}
}

return $actions;
}
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
class DaftarKontrakMitra extends Resource
{
public static $displayInNavigation = false;
public static $with = ['kontrakNaskahKeluar', 'bastNaskahKeluar' ,'daftarHonorMitra'];
public static $with = ['kontrakNaskahKeluar', 'bastNaskahKeluar', 'daftarHonorMitra'];
/**
* The model the resource corresponds to.
*
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Filters/BulanKontrak.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ public function options(NovaRequest $request)
*/
public function default()
{
return Date('m');
return date('m');
}
}
14 changes: 7 additions & 7 deletions app/Nova/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public function fields(NovaRequest $request)
->hideWhenUpdating()
->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal)),
Date::make('Akhir Penyelesaian', 'akhir')
->rules('required','after_or_equal:awal')
->rules('required', 'after_or_equal:awal')
->hideFromIndex()
->readOnly()
->hideWhenUpdating()
Expand Down Expand Up @@ -183,12 +183,12 @@ public function fields(NovaRequest $request)
->dependsOn(['generate_sk', 'tanggal_sk'], function (Select $field, NovaRequest $request, FormData $formData) {
if ($formData->generate_sk) {
$default_naskah = NaskahDefault::cache()
->get("all")
->where("jenis", "sk")
->get('all')
->where('jenis', 'sk')
->first();
$field->rules('required')
->show()
->options(Helper::setOptionsKodeArsip($formData->tanggal_sk, Helper::getPropertyFromCollection($default_naskah, "kode_arsip_id")));
->options(Helper::setOptionsKodeArsip($formData->tanggal_sk, Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')));
}
}),
Select::make('Kuasa Pengguna Anggaran', 'kpa_user_id')
Expand Down Expand Up @@ -239,12 +239,12 @@ public function fields(NovaRequest $request)
->dependsOn(['generate_st', 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) {
if ($formData->generate_st) {
$default_naskah = NaskahDefault::cache()
->get("all")
->where("jenis", "st")
->get('all')
->where('jenis', 'st')
->first();
$field->rules('required')
->show()
->options(Helper::setOptionsKodeArsip($formData->tanggal_st, Helper::getPropertyFromCollection($default_naskah, "kode_arsip_id")));
->options(Helper::setOptionsKodeArsip($formData->tanggal_st, Helper::getPropertyFromCollection($default_naskah, 'kode_arsip_id')));
}
}),
Select::make('Kepala', 'kepala_user_id')
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RekapHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function cards(NovaRequest $request)
return [
JumlahKegiatan::make()->width('1/2')->help('Jumlah kegiatan yang tertuang dalam kontrak bulanan mitra'),
JumlahMitra::make()->width('1/2')->help('Jumlah mitra yang berkontrak tiap bulan di semua kegiatan'),
];
];
}

/**
Expand Down
9 changes: 4 additions & 5 deletions app/Nova/Metrics/JumlahKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
use Illuminate\Support\Facades\DB;
use Laravel\Nova\Http\Requests\NovaRequest;
use Laravel\Nova\Metrics\Value;
use Laravel\Nova\Nova;

class JumlahKegiatan extends Value
{
/**
* Get the displayable name of the metric
* Get the displayable name of the metric.
*
* @return string
*/
public function name()
{
return 'Jumlah Kegiatan Bulan '.Helper::$bulan[date('m')];
}

/**
* Calculate the value of the metric.
*
Expand All @@ -40,17 +40,16 @@ public function calculate(NovaRequest $request)
->join('honor_kegiatans', 'honor_kegiatans.id', '=', 'daftar_honor_mitras.honor_kegiatan_id')
->where('jenis_honor', 'Kontrak Mitra Bulanan')
->where('tahun', session('year'))
->where('bulan', date('m')-1)
->where('bulan', date('m') - 1)
->distinct('honor_kegiatans.id')
->count();

return $this->result($bulan_ini)
->previous($bulan_lalu)
->suffix('Kegiatan')
->withoutSuffixInflection();

}


/**
* Determine the amount of time the results of the metric should be cached.
*
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Metrics/JumlahMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
class JumlahMitra extends Trend
{
/**
* Get the displayable name of the metric
* Get the displayable name of the metric.
*
* @return string
*/
Expand Down
1 change: 0 additions & 1 deletion app/Nova/NaskahKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -217,5 +217,4 @@ public function replicate()
$model->tanggal = null;
});
}

}
Loading