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
3 changes: 1 addition & 2 deletions app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ public static function sk($id)
$data = HonorKegiatan::find($id);
$kpa = Helper::getPegawaiByUserId($data->kpa_user_id);


return [
'nomor' => NaskahKeluar::find($data->sk_naskah_keluar_id)->nomor,
'kegiatan' => $data->kegiatan,
Expand All @@ -259,7 +258,7 @@ public static function validate($jenis, $model_id)
);
}
if ($jenis === 'spj') {
$honor =HonorKegiatan::where('id', $model_id)->first();
$honor = HonorKegiatan::where('id', $model_id)->first();
throw_if(
$honor->status == 'dibuat',
'Mohon lengkapi terlebih dulu isian honor kegiatan yang akan dicetak melalui menu Ubah'
Expand Down
9 changes: 4 additions & 5 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ public static function getMitraById($id)
* Metode ini mengambil semua catatan dari cache Mitra dan memfilter
* untuk menemukan catatan pertama yang cocok dengan ID yang diberikan.
*
* @param int $id ID jenis kontrak yang akan diambil.
* @param int $id ID jenis kontrak yang akan diambil.
* @return mixed Catatan pertama yang cocok dengan ID yang diberikan, atau null jika tidak ada yang cocok.
*/
public static function getJenisKontrakById($id)
Expand Down Expand Up @@ -701,7 +701,6 @@ public static function makeBaseListMitraAndPegawai($honor_kegiatan_id, $tanggal)
$formattedMitra->push(...$formattedPegawai);

return $formattedMitra;

}

/**
Expand Down Expand Up @@ -875,11 +874,11 @@ public static function setOptionsJenisNaskah($tanggal)
public static function setOptionsKodeArsip($tanggal, array $filterId = [])
{
$kodeArsip = KodeArsip::cache()->get('all')->where('tata_naskah_id', self::getLatestTataNaskahId($tanggal));
if (!empty($filterId)) {

if (! empty($filterId)) {
$kodeArsip = $kodeArsip->whereIn('id', $filterId);
}

return self::setOptions($kodeArsip, 'id', 'detail', 'group', '', 'kode');
}

Expand Down
19 changes: 9 additions & 10 deletions app/Http/Controllers/RoleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ class RoleController extends Controller
/**
* Handle the incoming request.
*/
public function changeRole($role, Request $request)
{
$userId = Auth::user()->id;
public function changeRole($role, Request $request)
{
$userId = Auth::user()->id;

if (Pengelola::cache()->get('all')->where('user_id', $userId)
->whereNull('inactive')->contains('role', $role)) {
session(['role' => $role]);
}

return redirect(Nova::path());
}
if (Pengelola::cache()->get('all')->where('user_id', $userId)
->whereNull('inactive')->contains('role', $role)) {
session(['role' => $role]);
}

return redirect(Nova::path());
}
}
2 changes: 1 addition & 1 deletion app/Models/AnggaranKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ protected static function booted(): void
$honor->mak = $anggaranKak->mak;
$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
2 changes: 0 additions & 2 deletions app/Models/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Models;

use App\Helpers\Helper;
use App\Models\KontrakMitra;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;

Expand Down Expand Up @@ -55,5 +54,4 @@ protected static function booted(): void
}
});
}

}
11 changes: 5 additions & 6 deletions app/Models/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace App\Models;

use App\Helpers\Helper;
use App\Models\KontrakMitra;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
Expand Down Expand Up @@ -88,22 +87,22 @@ protected static function booted(): void
$honor->st_naskah_keluar_id = null;
}
if ($honor->jenis_honor !== null) {
if ($honor->jenis_honor === 'Kontrak Mitra Bulanan'){
if ($honor->jenis_honor === 'Kontrak Mitra Bulanan') {
$kontrak = KontrakMitra::firstOrNew(
[
'jenis_kontrak' => $honor->jenis_kontrak,
'bulan' => $honor->bulan,
'tahun' => $honor->tahun,
]
);
$kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak),'jenis').' Bulan '.Helper::$bulan[$honor->bulan];
$kontrak->nama_kontrak = 'Kontrak '.Helper::getPropertyFromCollection(Helper::getJenisKontrakById($honor->jenis_kontrak), 'jenis').' Bulan '.Helper::$bulan[$honor->bulan];
$kontrak->status = 'dibuat';
$kontrak->jenis_honor = $honor->jenis_honor;
$kontrak->awal_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->startOfMonth();
$kontrak->akhir_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->endOfMonth();
$kontrak->akhir_kontrak = Carbon::createFromDate(session('year'), $honor->bulan)->endOfMonth();
$kontrak->save();
}
if ($honor->jenis_honor === 'Kontrak Mitra AdHoc'){
if ($honor->jenis_honor === 'Kontrak Mitra AdHoc') {
$kontrak = KontrakMitra::firstOrNew(
[
'honor_kegiatan_id' => $honor->id,
Expand All @@ -114,7 +113,7 @@ protected static function booted(): void
$kontrak->status = 'dibuat';
$kontrak->jenis_honor = $honor->jenis_honor;
$kontrak->awal_kontrak = $honor->awal;
$kontrak->akhir_kontrak = $honor->akhir;
$kontrak->akhir_kontrak = $honor->akhir;
$kontrak->save();
}
if ($honor->generate_sk) {
Expand Down
1 change: 0 additions & 1 deletion app/Models/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,6 @@ private function createInitialArsipDokumen(): void
$arsipDokumen->slug = $slug;
$arsipDokumen->kerangka_acuan_id = $this->id;
$arsipDokumen->save();

}
}

Expand Down
1 change: 1 addition & 0 deletions app/Nova/Actions/GenerateKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function handle(ActionFields $fields, Collection $models)
$model->status = 'selesai';
$model->save();
DaftarKontrakMitra::where('updated_at', null)->delete();

return Action::message('Kontrak Sukses Digenerate');
}

Expand Down
1 change: 0 additions & 1 deletion app/Nova/Actions/ImportDaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ public function handle(ActionFields $fields, Collection $models)
$daftarHonorMitra->updated_at = now();

$daftarHonorMitra->save();

}
});
DaftarHonorMitra::where('updated_at', null)->delete();
Expand Down
3 changes: 1 addition & 2 deletions app/Nova/Actions/ImportKodeArsip.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ public function handle(ActionFields $fields, Collection $models)
'tata_naskah_id' => $model->id,
'kode' => $row['kode'],
]
);
);
$kodeArsip->group = $row['group'];
$kodeArsip->updated_at = now();

$kodeArsip->save();

});
KodeArsip::where('updated_at', null)->delete();
KodeArsip::cache()->enable();
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 @@ -61,7 +61,6 @@ public function handle(ActionFields $fields, Collection $models)
$mataAnggaran->updated_at = now();
$mataAnggaran->save();
}

});
MataAnggaran::where('updated_at', null)->delete();
KamusAnggaran::where('updated_at', null)->delete();
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Actions/ImportMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ public function handle(ActionFields $fields, Collection $models)
$mitra->npwp = $row['NPWP'];

$mitra->save();

}
});
Mitra::where('updated_at', null)->delete();
Expand Down
3 changes: 2 additions & 1 deletion app/Nova/DaftarKontrakMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public static function label()
public function fields(NovaRequest $request)
{
$mitra = Helper::getMitraById($this->mitra_id);

return [
Text::make('NIK', fn () => Helper::getPropertyFromCollection($mitra, 'nik'))
->readOnly(),
Expand All @@ -57,7 +58,7 @@ public function fields(NovaRequest $request)
->readOnly(),
Text::make('Nomor BAST', 'nomor_bast')
->readOnly(),
Number::make('Jumlah Kegiatan','jumlah_kegiatan')
Number::make('Jumlah Kegiatan', 'jumlah_kegiatan')
->readOnly(),
Currency::make('Honor', 'honor')
->currency('IDR')
Expand Down
10 changes: 4 additions & 6 deletions app/Nova/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ public function fields(NovaRequest $request)
return $fail('Bulan Kontrak harus berisi tanggal setelah atau sama dengan awal bulan tanggal KAK.');
}
});

}
})
->options(Helper::$bulan)
Expand All @@ -129,7 +128,6 @@ public function fields(NovaRequest $request)
->show()
->options(Helper::setOptionJenisKontrak($form->tanggal_kak))
->rules('required');

}
})
->displayUsing(fn ($kode) => Helper::getPropertyFromCollection(JenisKontrak::cache()->get('all')->where('id', $kode)->first(), 'jenis')),
Expand Down Expand Up @@ -187,8 +185,8 @@ public function fields(NovaRequest $request)
$field->show()
->rules('required')
->options(Helper::setOptionPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk)));
}
}),
}
}),
]),

Panel::make('Keterangan Surat Tugas', [
Expand Down Expand Up @@ -239,8 +237,8 @@ public function fields(NovaRequest $request)
$field->show()
->rules('required')
->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
}
}),
}
}),
]),
Status::make('Status', 'status')
->loadingWhen(['dibuat', 'import', 'diubah'])
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/NaskahKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function fields(NovaRequest $request)
->sortable()
->rules('required', 'before_or_equal:today')
->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal))
->rules('required', 'before_or_equal:today', function ($attribute, $value, $fail) {
->rules('required', 'before_or_equal:today', function ($attribute, $value, $fail) {
if (Helper::getYearFromDateString($value) != session('year')) {
return $fail('Tanggal harus di tahun yang telah dipilih');
}
Expand Down