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
13 changes: 7 additions & 6 deletions app/Helpers/Cetak.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,12 +70,12 @@ public static function getTemplate(string $jenis, $id, $template_id)
foreach ($detailAnggarans as $detailAnggaran) {
if (Str::of($data[$detailAnggaran])->contains('edit manual karena belum ada di POK')) {
$detail = new TextRun();
$detail ->addText(Str::of($data[$detailAnggaran])->before('edit manual karena belum ada di POK'));
$detail->addText('edit manual karena belum ada di POK', array('color' => 'red'));
$detail->addText(Str::of($data[$detailAnggaran])->before('edit manual karena belum ada di POK'));
$detail->addText('edit manual karena belum ada di POK', ['color' => 'red']);
$templateProcessor->setComplexValue($detailAnggaran, $detail);
unset($data[$detailAnggaran]);
}
}
}

unset($data['daftar_honor_mitra']);
HonorKegiatan::where('id', $id)->update(['status' => 'selesai']);
Expand Down Expand Up @@ -158,12 +158,13 @@ public static function kak($id)
public static function spj($id)
{
$data = HonorKegiatan::find($id);
$kamus = KamusAnggaran::cache()->get('all')->where('id',$data->kamus_anggaran_id)->first();
$kamus = KamusAnggaran::cache()->get('all')->where('id', $data->kamus_anggaran_id)->first();

return [
'nama' => $data->judul_spj,
'tanggal_spj' => Helper::terbilangTanggal($data->tanggal_spj),
'detail' => $kamus == null ?'edit manual karena belum ada di POK':$kamus->detail,
'bulan' => $data->bulan == '13'? Helper::terbilangTanggal($data->awal).' - '.Helper::terbilangTanggal($data->akhir) :Helper::terbilangBulan($data->bulan),
'detail' => $kamus == null ? 'edit manual karena belum ada di POK' : $kamus->detail,
'bulan' => $data->bulan == '13' ? Helper::terbilangTanggal($data->awal).' - '.Helper::terbilangTanggal($data->akhir) : Helper::terbilangBulan($data->bulan),
'mak' => $data->mak,
'kegiatan' => Helper::getDetailAnggaran($data->mak, 'kegiatan'),
'kro' => Helper::getDetailAnggaran($data->mak, 'kro'),
Expand Down
16 changes: 9 additions & 7 deletions app/Helpers/Helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -574,10 +574,9 @@ public static function isAkunHonor(string $mak): bool
return in_array(substr($mak, -6), self::$akun_honor);
}


public static function isAkunHonorChanged($mak_old, $mak_new)
{
return (self::isAkunHonor($mak_old) && !self::isAkunHonor($mak_new)) ||(self::isAkunHonor($mak_old) && self::isAkunHonor($mak_new) && $mak_old != $mak_new) ;
return (self::isAkunHonor($mak_old) && ! self::isAkunHonor($mak_new)) || (self::isAkunHonor($mak_old) && self::isAkunHonor($mak_new) && $mak_old != $mak_new);
}

// /**
Expand Down Expand Up @@ -710,7 +709,7 @@ public static function getDetailAnggaran($mak, $level = 'akun', bool $kode_prefi
$kamus = KamusAnggaran::cache()->get('all')->filter(function ($item, $key) use ($mak, $length, $level) {
return Str::of($item->mak)->startsWith(Str::substr($mak, 0, $length[$level])) && Str::of($item->mak)->length == $length[$level];
})->first();
$detail = $kamus == null ? 'edit manual karena belum ada di POK': $kamus->detail;
$detail = $kamus == null ? 'edit manual karena belum ada di POK' : $kamus->detail;

return $kode_prefix ? $kode[$level].$detail : $detail;
}
Expand Down Expand Up @@ -791,7 +790,7 @@ public static function formatSpj($spesifikasi)
if (isset($item['harga_satuan'])) {
$item['harga_satuan'] = self::formatUang($item['harga_satuan']);
}
if (!isset($item['golongan'])) {
if (! isset($item['golongan'])) {
$item['golongan'] = '-';
}
if (isset($item['bruto'])) {
Expand Down Expand Up @@ -844,7 +843,7 @@ public static function getTemplatePathById($id)
*/
public static function getDipa($id)
{
return Dipa::cache()->get('all')->where('id', $id)->first()?? '';
return Dipa::cache()->get('all')->where('id', $id)->first() ?? '';
}

/**
Expand All @@ -856,13 +855,15 @@ public static function getDipa($id)
public static function getLatestTataNaskahId($tanggal)
{
$tata_naskah = TataNaskah::cache()->get('all')->where('tanggal', '<=', $tanggal)->sortByDesc('tanggal')->first();
return $tata_naskah == null ? '': $tata_naskah->id;

return $tata_naskah == null ? '' : $tata_naskah->id;
}

public static function getLatestHargaSatuanId($tanggal)
{
$harga_satuan = HargaSatuan::cache()->get('all')->where('tanggal', '<=', $tanggal)->sortByDesc('tanggal')->first();
return $harga_satuan == null ? null: $harga_satuan->id;

return $harga_satuan == null ? null : $harga_satuan->id;
}

/**
Expand Down Expand Up @@ -997,6 +998,7 @@ public static function setOptionDipa()
{
return self::setOptions(Dipa::cache()->get('all')->whereBetween('tahun', [session('year'), session('year') + 1]), 'id', 'tahun');
}

public static function setOptionKepkaMitra($tahun)
{
return self::setOptions(KepkaMitra::cache()->get('all')->where('tahun', $tahun), 'id', 'nomor');
Expand Down
5 changes: 2 additions & 3 deletions app/Imports/DaftarHonorMitraImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,10 @@ public function __construct($id, $bulan, $jenis, $kepka_mitra_id)
{
$this->id = $id;
$this->jenis = $jenis;
$this->bulan = $bulan;
$this->kepka_mitra_id = $kepka_mitra_id;
$this->bulan = $bulan;
$this->kepka_mitra_id = $kepka_mitra_id;
}


public function collection(Collection $rows)
{
foreach ($rows as $row) {
Expand Down
2 changes: 1 addition & 1 deletion app/Imports/MataAnggaransImport.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public function collection(Collection $rows)
[
'detail' => $row['Program/ Kegiatan/ KRO/ RO/ Komponen'],
'updated_at' => now(),
'satuan' => $row['Volume'] !=''? explode(' ', $row['Volume'])[1]:'',
'satuan' => $row['Volume'] != '' ? explode(' ', $row['Volume'])[1] : '',
]
);
}
Expand Down
11 changes: 5 additions & 6 deletions app/Models/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ public function DaftarHonorMitra(): HasMany
protected static function booted(): void
{
static::saving(function (HonorKegiatan $honor) {
if ($honor->isDirty()){
if ($honor->isDirty()) {
$honor->status = 'diubah';
}
if (!$honor->generate_sk) {
}
if (! $honor->generate_sk) {
$honor->tanggal_sk = null;
NaskahKeluar::destroy($honor->sk_naskah_keluar_id);
$honor->sk_naskah_keluar_id = null;
}
if (!$honor->generate_st) {
if (! $honor->generate_st) {
$honor->tanggal_st = null;
$honor->uraian_tugas = null;
$honor->kode_arsip_id = null;
Expand All @@ -84,7 +84,7 @@ protected static function booted(): void
->get('all')
->where('kode', 'VS.220')
->where('tata_naskah_id', Helper::getLatestTataNaskahId($honor->tanggal_sk))
->first();
->first();
$naskahkeluar = new NaskahKeluar;
$naskahkeluar->tanggal = $honor->tanggal_sk;
$naskahkeluar->jenis_naskah_id = $jenis_naskah->id;
Expand Down Expand Up @@ -142,7 +142,6 @@ protected static function booted(): void
NaskahKeluar::destroy([$honor->sk_naskah_keluar_id, $honor->st_naskah_keluar_id]);
$DaftarHonorMitraIds = DaftarHonorMitra::where('honor_kegiatan_id', $honor->id)->pluck('id');
DaftarHonorMitra::destroy($DaftarHonorMitraIds);

});
static::creating(function (HonorKegiatan $honor) {
$honor->status = 'dibuat';
Expand Down
2 changes: 1 addition & 1 deletion app/Models/KerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ protected static function booted(): void
$naskahkeluar->tanggal = $kak->tanggal;
$naskahkeluar->perihal = 'Form Permintaan '.$kak->rincian;
$naskahkeluar->save();
if ($kak->isDirty('dipa_id')){
if ($kak->isDirty('dipa_id')) {
$anggaranKerangkaAcuanIds = AnggaranKerangkaAcuan::where('kerangka_acuan_id', $kak->id)->pluck('id');
AnggaranKerangkaAcuan::destroy($anggaranKerangkaAcuanIds);
}
Expand Down
2 changes: 1 addition & 1 deletion app/Models/NaskahKeluar.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ protected static function booted(): void
{
static::saving(function (NaskahKeluar $naskah) {
if ($naskah->isDirty(['kode_naskah_id', 'tanggal'])) {
$unit_kerja_id = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal) == null? null : Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal)->unit_kerja_id;
$unit_kerja_id = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal) == null ? null : 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->nomor = $nomor['nomor'];
$naskah->no_urut = $nomor['no_urut'];
Expand Down
5 changes: 2 additions & 3 deletions app/Nova/Actions/ImportDaftarHonorMitra.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Helpers\Helper;
use App\Imports\DaftarHonorMitraImport;
use App\Models\DaftarHonorMitra;
use App\Models\KepkaMitra;
use Illuminate\Bus\Queueable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Support\Collection;
Expand All @@ -28,7 +27,6 @@ public function __construct($tahun)
$this->tahun = $tahun;
}


/**
* Perform the action on the given models.
*
Expand All @@ -44,6 +42,7 @@ public function handle(ActionFields $fields, Collection $models)
Excel::import(new DaftarHonorMitraImport($model->id, $model->bulan, $model->jenis, $fields->kepka_mitra_id), $fields->file);
$model->status = 'import';
$model->save();

return Action::message('File BOS sukses diimport!');
}

Expand All @@ -59,7 +58,7 @@ public function fields(NovaRequest $request)
->rules('required', 'mimes:xlsx')->acceptedTypes('.xlsx'),
Select::make('Kepka Mitra', 'kepka_mitra_id')
->rules('required')
->options(Helper::setOptionKepkaMitra($this->tahun))
->options(Helper::setOptionKepkaMitra($this->tahun)),
];
}
}
23 changes: 10 additions & 13 deletions app/Nova/HonorKegiatan.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
use App\Models\JenisKontrak;
use App\Models\KamusAnggaran;
use App\Models\KodeArsip;
use App\Models\User;
use App\Nova\Actions\Download;
use App\Nova\Actions\ImportDaftarHonorMitra;
use Illuminate\Database\Eloquent\Model;
Expand All @@ -25,7 +24,6 @@
use Laravel\Nova\Http\Requests\ActionRequest;
use Laravel\Nova\Http\Requests\NovaRequest;
use Laravel\Nova\Panel;
use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable;

class HonorKegiatan extends Resource
{
Expand Down Expand Up @@ -137,8 +135,9 @@ public function fields(NovaRequest $request)
->hideFromIndex()
->help('Contoh Satuan Pembayaran: Dokumen, Ruta, BS')
->dependsOn('kamus_anggaran_id', function (Text $field, NovaRequest $request, FormData $formData) {
if (KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first())
$field->setValue(KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()->satuan);
if (KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()) {
$field->setValue(KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()->satuan);
}
}),
Text::make('Tim Kerja', 'unit_kerja_id')
->onlyOnIndex()
Expand Down Expand Up @@ -167,7 +166,7 @@ public function fields(NovaRequest $request)
Boolean::make('Buat Surat Tugas', 'generate_st')
->hideFromIndex(),
Date::make('Tanggal Surat Tugas', 'tanggal_st')
->hide()
->hide()
->dependsOn('generate_st', function (Date $field, NovaRequest $request, FormData $formData) {
if ($formData->generate_st) {
$field->show()
Expand All @@ -185,26 +184,26 @@ public function fields(NovaRequest $request)
->dependsOn('generate_st', function (Text $field, NovaRequest $request, FormData $formData) {
if ($formData->generate_st) {
$field->show()
->rules('required');
->rules('required');
}
})
->hideFromIndex(),
Select::make('Klasifikasi Arsip', 'kode_arsip_id')
->searchable()
->hide()
->hideFromIndex()
->hideFromIndex()
->displayUsing(fn ($kode) => $kode ? KodeArsip::cache()->get('all')->where('id', $kode)->first()->kode : null)
->dependsOn(['generate_st' , 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) {
->dependsOn(['generate_st', 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) {
if ($formData->generate_st) {
$field->rules('required')
->show()
->options(Helper::setOptionsKodeArsip($formData->tanggal_st));
->show()
->options(Helper::setOptionsKodeArsip($formData->tanggal_st));
}
}),

]),
Status::make('Status', 'status')
->loadingWhen(['dibuat','import','diubah'])
->loadingWhen(['dibuat', 'import', 'diubah'])
->failedWhen(['gagal'])->onlyOnIndex(),

Panel::make('Penanda Tangan', [
Expand Down Expand Up @@ -313,6 +312,4 @@ public function actions(NovaRequest $request)

return $actions;
}


}
1 change: 0 additions & 1 deletion app/Nova/SpesifikasiKerangkaAcuan.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use App\Nova\Actions\AddHasManyModel;
use Laravel\Nova\Fields\Currency;
use Laravel\Nova\Fields\FormData;
use Laravel\Nova\Fields\Hidden;
use Laravel\Nova\Fields\Number;
use Laravel\Nova\Fields\Text;
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/User.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public function fields(NovaRequest $request)
->placeholder('NIP Baru')
->creationRules('unique:users,nip')
->updateRules('unique:users,nip,{{resourceId}}')
->rules('required','size:18'),
->rules('required', 'size:18'),
]),
Tabs::make('Detail', [
HasMany::make('Data Pegawai'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public function up()
$table->after('nip', function (Blueprint $table) {
$table->string('rekening', 40)->nullable();
});

});
}

Expand Down