Skip to content

Commit f0b8907

Browse files
laravelwebdevlaravelwebdev
authored
Merge pull request #75 from laravelwebdev/analysis-rrkPQZ
Apply fixes from StyleCI
2 parents 1b9248a + 7bde848 commit f0b8907

File tree

12 files changed

+39
-44
lines changed

12 files changed

+39
-44
lines changed

‎app/Helpers/Cetak.php‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ public static function getTemplate(string $jenis, $id, $template_id)
7070
foreach ($detailAnggarans as $detailAnggaran) {
7171
if (Str::of($data[$detailAnggaran])->contains('edit manual karena belum ada di POK')) {
7272
$detail = new TextRun();
73-
$detail ->addText(Str::of($data[$detailAnggaran])->before('edit manual karena belum ada di POK'));
74-
$detail->addText('edit manual karena belum ada di POK', array('color' => 'red'));
73+
$detail->addText(Str::of($data[$detailAnggaran])->before('edit manual karena belum ada di POK'));
74+
$detail->addText('edit manual karena belum ada di POK', ['color' => 'red']);
7575
$templateProcessor->setComplexValue($detailAnggaran, $detail);
7676
unset($data[$detailAnggaran]);
7777
}
78-
}
78+
}
7979

8080
unset($data['daftar_honor_mitra']);
8181
HonorKegiatan::where('id', $id)->update(['status' => 'selesai']);
@@ -158,12 +158,13 @@ public static function kak($id)
158158
public static function spj($id)
159159
{
160160
$data = HonorKegiatan::find($id);
161-
$kamus = KamusAnggaran::cache()->get('all')->where('id',$data->kamus_anggaran_id)->first();
161+
$kamus = KamusAnggaran::cache()->get('all')->where('id', $data->kamus_anggaran_id)->first();
162+
162163
return [
163164
'nama' => $data->judul_spj,
164165
'tanggal_spj' => Helper::terbilangTanggal($data->tanggal_spj),
165-
'detail' => $kamus == null ?'edit manual karena belum ada di POK':$kamus->detail,
166-
'bulan' => $data->bulan == '13'? Helper::terbilangTanggal($data->awal).' - '.Helper::terbilangTanggal($data->akhir) :Helper::terbilangBulan($data->bulan),
166+
'detail' => $kamus == null ? 'edit manual karena belum ada di POK' : $kamus->detail,
167+
'bulan' => $data->bulan == '13' ? Helper::terbilangTanggal($data->awal).' - '.Helper::terbilangTanggal($data->akhir) : Helper::terbilangBulan($data->bulan),
167168
'mak' => $data->mak,
168169
'kegiatan' => Helper::getDetailAnggaran($data->mak, 'kegiatan'),
169170
'kro' => Helper::getDetailAnggaran($data->mak, 'kro'),

‎app/Helpers/Helper.php‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -574,10 +574,9 @@ public static function isAkunHonor(string $mak): bool
574574
return in_array(substr($mak, -6), self::$akun_honor);
575575
}
576576

577-
578577
public static function isAkunHonorChanged($mak_old, $mak_new)
579578
{
580-
return (self::isAkunHonor($mak_old) && !self::isAkunHonor($mak_new)) ||(self::isAkunHonor($mak_old) && self::isAkunHonor($mak_new) && $mak_old != $mak_new) ;
579+
return (self::isAkunHonor($mak_old) && ! self::isAkunHonor($mak_new)) || (self::isAkunHonor($mak_old) && self::isAkunHonor($mak_new) && $mak_old != $mak_new);
581580
}
582581

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

715714
return $kode_prefix ? $kode[$level].$detail : $detail;
716715
}
@@ -791,7 +790,7 @@ public static function formatSpj($spesifikasi)
791790
if (isset($item['harga_satuan'])) {
792791
$item['harga_satuan'] = self::formatUang($item['harga_satuan']);
793792
}
794-
if (!isset($item['golongan'])) {
793+
if (! isset($item['golongan'])) {
795794
$item['golongan'] = '-';
796795
}
797796
if (isset($item['bruto'])) {
@@ -844,7 +843,7 @@ public static function getTemplatePathById($id)
844843
*/
845844
public static function getDipa($id)
846845
{
847-
return Dipa::cache()->get('all')->where('id', $id)->first()?? '';
846+
return Dipa::cache()->get('all')->where('id', $id)->first() ?? '';
848847
}
849848

850849
/**
@@ -856,13 +855,15 @@ public static function getDipa($id)
856855
public static function getLatestTataNaskahId($tanggal)
857856
{
858857
$tata_naskah = TataNaskah::cache()->get('all')->where('tanggal', '<=', $tanggal)->sortByDesc('tanggal')->first();
859-
return $tata_naskah == null ? '': $tata_naskah->id;
858+
859+
return $tata_naskah == null ? '' : $tata_naskah->id;
860860
}
861861

862862
public static function getLatestHargaSatuanId($tanggal)
863863
{
864864
$harga_satuan = HargaSatuan::cache()->get('all')->where('tanggal', '<=', $tanggal)->sortByDesc('tanggal')->first();
865-
return $harga_satuan == null ? null: $harga_satuan->id;
865+
866+
return $harga_satuan == null ? null : $harga_satuan->id;
866867
}
867868

868869
/**
@@ -997,6 +998,7 @@ public static function setOptionDipa()
997998
{
998999
return self::setOptions(Dipa::cache()->get('all')->whereBetween('tahun', [session('year'), session('year') + 1]), 'id', 'tahun');
9991000
}
1001+
10001002
public static function setOptionKepkaMitra($tahun)
10011003
{
10021004
return self::setOptions(KepkaMitra::cache()->get('all')->where('tahun', $tahun), 'id', 'nomor');

‎app/Imports/DaftarHonorMitraImport.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ public function __construct($id, $bulan, $jenis, $kepka_mitra_id)
2222
{
2323
$this->id = $id;
2424
$this->jenis = $jenis;
25-
$this->bulan = $bulan;
26-
$this->kepka_mitra_id = $kepka_mitra_id;
25+
$this->bulan = $bulan;
26+
$this->kepka_mitra_id = $kepka_mitra_id;
2727
}
2828

29-
3029
public function collection(Collection $rows)
3130
{
3231
foreach ($rows as $row) {

‎app/Imports/MataAnggaransImport.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function collection(Collection $rows)
4242
[
4343
'detail' => $row['Program/ Kegiatan/ KRO/ RO/ Komponen'],
4444
'updated_at' => now(),
45-
'satuan' => $row['Volume'] !=''? explode(' ', $row['Volume'])[1]:'',
45+
'satuan' => $row['Volume'] != '' ? explode(' ', $row['Volume'])[1] : '',
4646
]
4747
);
4848
}

‎app/Models/HonorKegiatan.php‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,15 +52,15 @@ public function DaftarHonorMitra(): HasMany
5252
protected static function booted(): void
5353
{
5454
static::saving(function (HonorKegiatan $honor) {
55-
if ($honor->isDirty()){
55+
if ($honor->isDirty()) {
5656
$honor->status = 'diubah';
57-
}
58-
if (!$honor->generate_sk) {
57+
}
58+
if (! $honor->generate_sk) {
5959
$honor->tanggal_sk = null;
6060
NaskahKeluar::destroy($honor->sk_naskah_keluar_id);
6161
$honor->sk_naskah_keluar_id = null;
6262
}
63-
if (!$honor->generate_st) {
63+
if (! $honor->generate_st) {
6464
$honor->tanggal_st = null;
6565
$honor->uraian_tugas = null;
6666
$honor->kode_arsip_id = null;
@@ -84,7 +84,7 @@ protected static function booted(): void
8484
->get('all')
8585
->where('kode', 'VS.220')
8686
->where('tata_naskah_id', Helper::getLatestTataNaskahId($honor->tanggal_sk))
87-
->first();
87+
->first();
8888
$naskahkeluar = new NaskahKeluar;
8989
$naskahkeluar->tanggal = $honor->tanggal_sk;
9090
$naskahkeluar->jenis_naskah_id = $jenis_naskah->id;
@@ -142,7 +142,6 @@ protected static function booted(): void
142142
NaskahKeluar::destroy([$honor->sk_naskah_keluar_id, $honor->st_naskah_keluar_id]);
143143
$DaftarHonorMitraIds = DaftarHonorMitra::where('honor_kegiatan_id', $honor->id)->pluck('id');
144144
DaftarHonorMitra::destroy($DaftarHonorMitraIds);
145-
146145
});
147146
static::creating(function (HonorKegiatan $honor) {
148147
$honor->status = 'dibuat';

‎app/Models/KerangkaAcuan.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected static function booted(): void
8181
$naskahkeluar->tanggal = $kak->tanggal;
8282
$naskahkeluar->perihal = 'Form Permintaan '.$kak->rincian;
8383
$naskahkeluar->save();
84-
if ($kak->isDirty('dipa_id')){
84+
if ($kak->isDirty('dipa_id')) {
8585
$anggaranKerangkaAcuanIds = AnggaranKerangkaAcuan::where('kerangka_acuan_id', $kak->id)->pluck('id');
8686
AnggaranKerangkaAcuan::destroy($anggaranKerangkaAcuanIds);
8787
}

‎app/Models/NaskahKeluar.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected static function booted(): void
2323
{
2424
static::saving(function (NaskahKeluar $naskah) {
2525
if ($naskah->isDirty(['kode_naskah_id', 'tanggal'])) {
26-
$unit_kerja_id = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal) == null? null : Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal)->unit_kerja_id;
26+
$unit_kerja_id = Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal) == null ? null : Helper::getDataPegawaiByUserId(Auth::user()->id, $naskah->tanggal)->unit_kerja_id;
2727
$nomor = Helper::nomor($naskah->tanggal, $naskah->jenis_naskah_id, $unit_kerja_id, $naskah->kode_arsip_id, $naskah->derajat);
2828
$naskah->nomor = $nomor['nomor'];
2929
$naskah->no_urut = $nomor['no_urut'];

‎app/Nova/Actions/ImportDaftarHonorMitra.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
use App\Helpers\Helper;
66
use App\Imports\DaftarHonorMitraImport;
77
use App\Models\DaftarHonorMitra;
8-
use App\Models\KepkaMitra;
98
use Illuminate\Bus\Queueable;
109
use Illuminate\Queue\InteractsWithQueue;
1110
use Illuminate\Support\Collection;
@@ -28,7 +27,6 @@ public function __construct($tahun)
2827
$this->tahun = $tahun;
2928
}
3029

31-
3230
/**
3331
* Perform the action on the given models.
3432
*
@@ -44,6 +42,7 @@ public function handle(ActionFields $fields, Collection $models)
4442
Excel::import(new DaftarHonorMitraImport($model->id, $model->bulan, $model->jenis, $fields->kepka_mitra_id), $fields->file);
4543
$model->status = 'import';
4644
$model->save();
45+
4746
return Action::message('File BOS sukses diimport!');
4847
}
4948

@@ -59,7 +58,7 @@ public function fields(NovaRequest $request)
5958
->rules('required', 'mimes:xlsx')->acceptedTypes('.xlsx'),
6059
Select::make('Kepka Mitra', 'kepka_mitra_id')
6160
->rules('required')
62-
->options(Helper::setOptionKepkaMitra($this->tahun))
61+
->options(Helper::setOptionKepkaMitra($this->tahun)),
6362
];
6463
}
6564
}

‎app/Nova/HonorKegiatan.php‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use App\Models\JenisKontrak;
88
use App\Models\KamusAnggaran;
99
use App\Models\KodeArsip;
10-
use App\Models\User;
1110
use App\Nova\Actions\Download;
1211
use App\Nova\Actions\ImportDaftarHonorMitra;
1312
use Illuminate\Database\Eloquent\Model;
@@ -25,7 +24,6 @@
2524
use Laravel\Nova\Http\Requests\ActionRequest;
2625
use Laravel\Nova\Http\Requests\NovaRequest;
2726
use Laravel\Nova\Panel;
28-
use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable;
2927

3028
class HonorKegiatan extends Resource
3129
{
@@ -137,8 +135,9 @@ public function fields(NovaRequest $request)
137135
->hideFromIndex()
138136
->help('Contoh Satuan Pembayaran: Dokumen, Ruta, BS')
139137
->dependsOn('kamus_anggaran_id', function (Text $field, NovaRequest $request, FormData $formData) {
140-
if (KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first())
141-
$field->setValue(KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()->satuan);
138+
if (KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()) {
139+
$field->setValue(KamusAnggaran::cache()->get('all')->where('id', $formData->kamus_anggaran_id)->first()->satuan);
140+
}
142141
}),
143142
Text::make('Tim Kerja', 'unit_kerja_id')
144143
->onlyOnIndex()
@@ -167,7 +166,7 @@ public function fields(NovaRequest $request)
167166
Boolean::make('Buat Surat Tugas', 'generate_st')
168167
->hideFromIndex(),
169168
Date::make('Tanggal Surat Tugas', 'tanggal_st')
170-
->hide()
169+
->hide()
171170
->dependsOn('generate_st', function (Date $field, NovaRequest $request, FormData $formData) {
172171
if ($formData->generate_st) {
173172
$field->show()
@@ -185,26 +184,26 @@ public function fields(NovaRequest $request)
185184
->dependsOn('generate_st', function (Text $field, NovaRequest $request, FormData $formData) {
186185
if ($formData->generate_st) {
187186
$field->show()
188-
->rules('required');
187+
->rules('required');
189188
}
190189
})
191190
->hideFromIndex(),
192191
Select::make('Klasifikasi Arsip', 'kode_arsip_id')
193192
->searchable()
194193
->hide()
195-
->hideFromIndex()
194+
->hideFromIndex()
196195
->displayUsing(fn ($kode) => $kode ? KodeArsip::cache()->get('all')->where('id', $kode)->first()->kode : null)
197-
->dependsOn(['generate_st' , 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) {
196+
->dependsOn(['generate_st', 'tanggal_st'], function (Select $field, NovaRequest $request, FormData $formData) {
198197
if ($formData->generate_st) {
199198
$field->rules('required')
200-
->show()
201-
->options(Helper::setOptionsKodeArsip($formData->tanggal_st));
199+
->show()
200+
->options(Helper::setOptionsKodeArsip($formData->tanggal_st));
202201
}
203202
}),
204203

205204
]),
206205
Status::make('Status', 'status')
207-
->loadingWhen(['dibuat','import','diubah'])
206+
->loadingWhen(['dibuat', 'import', 'diubah'])
208207
->failedWhen(['gagal'])->onlyOnIndex(),
209208

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

314313
return $actions;
315314
}
316-
317-
318315
}

‎app/Nova/SpesifikasiKerangkaAcuan.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use App\Nova\Actions\AddHasManyModel;
66
use Laravel\Nova\Fields\Currency;
7-
use Laravel\Nova\Fields\FormData;
87
use Laravel\Nova\Fields\Hidden;
98
use Laravel\Nova\Fields\Number;
109
use Laravel\Nova\Fields\Text;

0 commit comments

Comments
 (0)