diff --git a/app/Helpers/Cetak.php b/app/Helpers/Cetak.php index db59ec616d03b3c5671cac6766f3bf8d01cbafb3..871be51591d48266a85cf22a16cdd323b3ae8957 100644 --- a/app/Helpers/Cetak.php +++ b/app/Helpers/Cetak.php @@ -258,7 +258,6 @@ public static function kuitansi($id) ]; } - /** * Format nilai SPJ. * diff --git a/app/Models/DaftarPemeliharaan.php b/app/Models/DaftarPemeliharaan.php index 25a32f500d152471a6feacc415a78178dba8ad64..f92406caf5c3da751884215ddeb19166d6ba3bcc 100644 --- a/app/Models/DaftarPemeliharaan.php +++ b/app/Models/DaftarPemeliharaan.php @@ -10,6 +10,7 @@ class DaftarPemeliharaan extends Model protected $casts = [ 'tanggal' => 'date', ]; + public function masterBarangPemeliharaan(): BelongsTo { return $this->belongsTo(MasterBarangPemeliharaan::class); @@ -28,10 +29,11 @@ protected static function booted(): void ]); }); static::deleted(function (DaftarPemeliharaan $daftar) { - if ($daftar->count() === 0) - $daftar->pemeliharaan->update([ - 'status' => 'outdated', - ]); + if ($daftar->count() === 0) { + $daftar->pemeliharaan->update([ + 'status' => 'outdated', + ]); + } }); } } diff --git a/app/Models/Dipa.php b/app/Models/Dipa.php index 3d4ccfd62a94ccbb828e93990a2efb90bc17fcb3..f174a613aee3d2b2ce74ac805a207e6839d856d4 100644 --- a/app/Models/Dipa.php +++ b/app/Models/Dipa.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Nova\Metrics\SerapanAnggaran; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Mostafaznv\LaraCache\CacheEntity; diff --git a/app/Models/KerangkaAcuan.php b/app/Models/KerangkaAcuan.php index 623bc230ae26178e06c68b0dc50b2a63f443e6f6..5237e74843ad9e35feee169f58865f1bb04b1689 100644 --- a/app/Models/KerangkaAcuan.php +++ b/app/Models/KerangkaAcuan.php @@ -3,8 +3,6 @@ namespace App\Models; use App\Helpers\Helper; -use App\Models\PembelianPersediaan; -use App\Models\Pemeliharaan; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -86,7 +84,6 @@ protected static function booted(): void $pemeliharaan->rincian = $kak->rincian; $pemeliharaan->save(); - $perjalanan = PerjalananDinas::where('kerangka_acuan_id', $kak->id)->first(); $perjalanan->tanggal_berangkat = $kak->awal; $perjalanan->tanggal_kembali = $kak->akhir; diff --git a/app/Models/MasterBarangPemeliharaan.php b/app/Models/MasterBarangPemeliharaan.php index 5309746a130c117065fccf4704cf05b805ccbd9d..1e1ecb8096eaee73f3b8c96326f3a95ab446d42a 100644 --- a/app/Models/MasterBarangPemeliharaan.php +++ b/app/Models/MasterBarangPemeliharaan.php @@ -29,16 +29,15 @@ public function user(): BelongsTo return $this->belongsTo(User::class); } - public function daftarPemeliharaan():HasMany + public function daftarPemeliharaan(): HasMany { return $this->hasMany(DaftarPemeliharaan::class); } - protected static function booted(): void { static::deleting(function (MasterBarangPemeliharaan $barang) { - $barang->daftarPemeliharaan->each->delete(); + $barang->daftarPemeliharaan->each->delete(); }); } } diff --git a/app/Models/Pemeliharaan.php b/app/Models/Pemeliharaan.php index 67f408e7e41da150c2ef697823fdbf1d03eb8ac7..426002babaa247b7ac7ca441670083eaecb2d591 100644 --- a/app/Models/Pemeliharaan.php +++ b/app/Models/Pemeliharaan.php @@ -32,7 +32,6 @@ protected static function booted(): void { static::creating(function (Pemeliharaan $pemeliharaan) { $pemeliharaan->status = 'dibuat'; - }); static::created(function (Pemeliharaan $pemeliharaan) { User::find(Auth::user()->id)->notify( @@ -44,7 +43,7 @@ protected static function booted(): void ); }); static::deleting(function (Pemeliharaan $pemeliharaan) { - $pemeliharaan->daftarPemeliharaan->each->delete(); + $pemeliharaan->daftarPemeliharaan->each->delete(); }); } } diff --git a/app/Models/PersediaanKeluar.php b/app/Models/PersediaanKeluar.php index edb7534bad5fb6b553f42ebb3062cadb1136df84..f8b898ae9f309657e12a8d9865e766ee7bf59121 100644 --- a/app/Models/PersediaanKeluar.php +++ b/app/Models/PersediaanKeluar.php @@ -18,7 +18,7 @@ public function daftarBarangPersediaans(): MorphMany return $this->morphMany(BarangPersediaan::class, 'barang_persediaanable'); } - public function naskahKeluar():BelongsTo + public function naskahKeluar(): BelongsTo { return $this->belongsTo(NaskahKeluar::class); } diff --git a/app/Nova/Actions/ImportMasterBarangPemeliharaan.php b/app/Nova/Actions/ImportMasterBarangPemeliharaan.php index fb7cb1aa376d19c64633f9462e6ac8b67db3ad5b..0f80a9805146094676085a939dcefebe3cb99846 100644 --- a/app/Nova/Actions/ImportMasterBarangPemeliharaan.php +++ b/app/Nova/Actions/ImportMasterBarangPemeliharaan.php @@ -2,12 +2,10 @@ namespace App\Nova\Actions; -use App\Helpers\Helper; use App\Models\MasterBarangPemeliharaan; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Storage; use Laravel\Nova\Actions\Action; use Laravel\Nova\Fields\ActionFields; use Laravel\Nova\Fields\File; @@ -32,27 +30,25 @@ public function handle(ActionFields $fields, Collection $models) MasterBarangPemeliharaan::query()->update(['updated_at' => null]); (new FastExcel)->import($fields->file, function ($row) { if ( - !empty($row['Kode Barang']) && - !empty($row['No PSP']) && + ! empty($row['Kode Barang']) && + ! empty($row['No PSP']) && ($row['Kondisi'] == 'Baik' || $row['Kondisi'] == 'Rusak Ringan') && substr($row['Kode Barang'], 0, 7) != '6010102' - ) - { + ) { + $MasterBarangPemeliharaan = MasterBarangPemeliharaan::firstOrNew( + [ + 'kode_barang' => $row['Kode Barang'], + 'nup' => $row['NUP'], + ] + ); + $MasterBarangPemeliharaan->nama_barang = $row['Nama Barang']; + $MasterBarangPemeliharaan->merk = $row['Nama']; + $MasterBarangPemeliharaan->nopol = $row['No Polisi']; + $MasterBarangPemeliharaan->kondisi = $row['Kondisi']; + $MasterBarangPemeliharaan->lokasi = $row['Lokasi Ruang']; + $MasterBarangPemeliharaan->updated_at = now(); - $MasterBarangPemeliharaan = MasterBarangPemeliharaan::firstOrNew( - [ - 'kode_barang' => $row['Kode Barang'], - 'nup' => $row['NUP'], - ] - ); - $MasterBarangPemeliharaan->nama_barang = $row['Nama Barang']; - $MasterBarangPemeliharaan->merk = $row['Nama']; - $MasterBarangPemeliharaan->nopol = $row['No Polisi']; - $MasterBarangPemeliharaan->kondisi = $row['Kondisi']; - $MasterBarangPemeliharaan->lokasi = $row['Lokasi Ruang']; - $MasterBarangPemeliharaan->updated_at = now(); - - $MasterBarangPemeliharaan->save(); + $MasterBarangPemeliharaan->save(); } }); $ids = MasterBarangPemeliharaan::where('updated_at', null)->get()->pluck('id'); diff --git a/app/Nova/Actions/ImportMataAnggaran.php b/app/Nova/Actions/ImportMataAnggaran.php index d1981060b6f77186ac3cfae91f4637b09204d65a..f1731de577f2d37dc80ef60c0d97b88b729e610e 100644 --- a/app/Nova/Actions/ImportMataAnggaran.php +++ b/app/Nova/Actions/ImportMataAnggaran.php @@ -39,7 +39,7 @@ public function handle(ActionFields $fields, Collection $models) MataAnggaran::where('dipa_id', $model->id)->update(['updated_at' => null]); $collections = (new FastExcel)->import($newFilePath); $index = 0; - foreach($collections as $row) { + foreach ($collections as $row) { $mataAnggaran = MataAnggaran::firstOrNew( [ 'coa_id' => $row['CONS_ITEM'], @@ -71,8 +71,8 @@ public function handle(ActionFields $fields, Collection $models) $mataAnggaran->rpd_12 = $row['POK_NILAI_12']; } - $mataAnggaran->updated_at = now(); - $index++; + $mataAnggaran->updated_at = now(); + $index++; $mataAnggaran->ordered = $index; $mataAnggaran->save(); } diff --git a/app/Nova/DaftarPemeliharaan.php b/app/Nova/DaftarPemeliharaan.php index d709b15ac8aa06fc11f4efc040b3cdee520cb161..043bc43bcdefac5ccb827edc883ecb5fc6d2eac0 100644 --- a/app/Nova/DaftarPemeliharaan.php +++ b/app/Nova/DaftarPemeliharaan.php @@ -116,7 +116,7 @@ public function actions(NovaRequest $request) { return []; } - + public static function redirectAfterUpdate(NovaRequest $request, $resource) { return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId; @@ -126,6 +126,7 @@ public static function redirectAfterCreate(NovaRequest $request, $resource) { return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId; } + public static function indexQuery(NovaRequest $request, $query) { return $query->whereYear('tanggal', session('year')); diff --git a/app/Nova/DaftarPesertaPerjalanan.php b/app/Nova/DaftarPesertaPerjalanan.php index b5703c83f2af90538eb54cf2c44127fb0422ea68..be7e9425135427337c2fa36716079bc091774398 100644 --- a/app/Nova/DaftarPesertaPerjalanan.php +++ b/app/Nova/DaftarPesertaPerjalanan.php @@ -101,7 +101,6 @@ public function fields(NovaRequest $request) $field ->rules('required') ->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi))); - }), Select::make('Bendahara', 'bendahara_user_id') ->searchable() @@ -111,7 +110,6 @@ public function fields(NovaRequest $request) $field ->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_kuitansi))) ->rules('required'); - }), ]), ]; diff --git a/app/Nova/Filters/BulanFilter.php b/app/Nova/Filters/BulanFilter.php index 15639319d1550764b9343b67bc0a343fd2627c62..a4ef48d96a9e69704139783d2009865f5fca4f57 100644 --- a/app/Nova/Filters/BulanFilter.php +++ b/app/Nova/Filters/BulanFilter.php @@ -36,11 +36,11 @@ public function apply(Request $request, $query, $value) return $query; } - return $this->isdate - ? $query->whereMonth($this->column, $value) + return $this->isdate + ? $query->whereMonth($this->column, $value) : $query->where($this->column, $value); } - + /** * Get the filter's available options. * @@ -49,7 +49,6 @@ public function apply(Request $request, $query, $value) public function options(Request $request) { return array_flip(Helper::$bulan); - } public function default() diff --git a/app/Nova/KodeNaskah.php b/app/Nova/KodeNaskah.php index 937b7bd4181fd8b39dcf491c54384d3af65ca5f2..0e4598fbe2be773d5a2e3bcc7fb078d5f42f4fdc 100644 --- a/app/Nova/KodeNaskah.php +++ b/app/Nova/KodeNaskah.php @@ -119,7 +119,7 @@ public function actions(NovaRequest $request) } return $actions; - } + } /** * Return the location to redirect the user after update. diff --git a/app/Nova/Lenses/RealisasiAnggaran.php b/app/Nova/Lenses/RealisasiAnggaran.php index aee186011ad3273c33492cbbf466211bc8f47269..a9993efe074106b87290147a80e41a8a2ebde772 100644 --- a/app/Nova/Lenses/RealisasiAnggaran.php +++ b/app/Nova/Lenses/RealisasiAnggaran.php @@ -31,7 +31,6 @@ class RealisasiAnggaran extends Lens public function name() { - return 'Realisasi SP2D per '.Helper::terbilangTanggal(Dipa::cache()->get('all')->where('tahun', session('year'))->first()->tanggal_realisasi); } @@ -76,7 +75,7 @@ public static function query(LensRequest $request, $query) ->orderBy('mak') ->orderBy('ordered'), 'realisasi_anggarans') - )); + )); } /** diff --git a/app/Nova/Lenses/RekapBarangPersediaan.php b/app/Nova/Lenses/RekapBarangPersediaan.php index 249b20eec961e4a8b1e011287b7104d1f54bdcb2..677655b27886a8536e58b86993ed01803ae3bf08 100644 --- a/app/Nova/Lenses/RekapBarangPersediaan.php +++ b/app/Nova/Lenses/RekapBarangPersediaan.php @@ -38,12 +38,12 @@ public function name() public static function query(LensRequest $request, $query) { $displayed = DB::table('barang_persediaans') - ->select('master_persediaan_id') - ->distinct() - ->whereYear('tanggal_transaksi', session('year')); + ->select('master_persediaan_id') + ->distinct() + ->whereYear('tanggal_transaksi', session('year')); + return $request->withOrdering($request->withFilters( - $query->fromSub(fn ($query) => - $query->from('master_persediaans')->select(self::columns()) + $query->fromSub(fn ($query) => $query->from('master_persediaans')->select(self::columns()) ->join('barang_persediaans', function ($join) { $join->on('master_persediaans.id', '=', @@ -53,8 +53,7 @@ public static function query(LensRequest $request, $query) ->groupBy('master_persediaans.id') ->joinSub($displayed, 'displayed', function (JoinClause $join) { $join->on('displayed.master_persediaan_id', '=', 'master_persediaans.id'); - }) - ,'master_persediaans') + }), 'master_persediaans') )); } diff --git a/app/Nova/Lenses/RekapHonorMitra.php b/app/Nova/Lenses/RekapHonorMitra.php index c0079b7d266b85a022fc6442c2548c8392915a3d..593d6af0b245e773a6b26339c496da36761912d6 100644 --- a/app/Nova/Lenses/RekapHonorMitra.php +++ b/app/Nova/Lenses/RekapHonorMitra.php @@ -41,6 +41,7 @@ public function name() public static function query(LensRequest $request, $query) { $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'mitras_filter', 'App\\Nova\\Filters\\BulanFilter', date('m')); + return $request->withoutTableOrderPrefix()->withOrdering( $query->select('bulan', 'jenis_kontrak_id', 'nama', 'mitra_id') ->addSelect([ @@ -52,7 +53,7 @@ public static function query(LensRequest $request, $query) $request->withFilters($query->select('id')->from('honor_kegiatans') ->where('tahun', session('year')) ->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) { - return $query->where('bulan', $filtered_bulan); + return $query->where('bulan', $filtered_bulan); }) ->where('jenis_honor', 'Kontrak Mitra Bulanan') ); diff --git a/app/Nova/Lenses/RencanaPenarikanDana.php b/app/Nova/Lenses/RencanaPenarikanDana.php index 979dd687b1c20dcd50fed81c3abfaea70829a64e..cbeceb62a7fc60e7c15c50b88eec6cf000ef429b 100644 --- a/app/Nova/Lenses/RencanaPenarikanDana.php +++ b/app/Nova/Lenses/RencanaPenarikanDana.php @@ -27,7 +27,6 @@ class RencanaPenarikanDana extends Lens public function name() { - return 'Monitoring RPD'; } diff --git a/app/Nova/MasterBarangPemeliharaan.php b/app/Nova/MasterBarangPemeliharaan.php index 6a8af575acef45f8c81b386ff1dd045e5287fd3c..8f50033c4d60819b5cbebde577e6aadc559f1018 100644 --- a/app/Nova/MasterBarangPemeliharaan.php +++ b/app/Nova/MasterBarangPemeliharaan.php @@ -39,7 +39,7 @@ public function title() public function subtitle() { - return 'Kode: '.$this->kode_barang. ' NUP: '.$this->nup.' Merk:'.$this->merk.' Nopol:'.$this->nopol.' Kondisi:'.$this->kondisi.' Lokasi:'.$this->lokasi; + return 'Kode: '.$this->kode_barang.' NUP: '.$this->nup.' Merk:'.$this->merk.' Nopol:'.$this->nopol.' Kondisi:'.$this->kondisi.' Lokasi:'.$this->lokasi; } /** @@ -48,7 +48,7 @@ public function subtitle() * @var array */ public static $search = [ - 'kode_barang', 'nup', 'nama_barang', 'merk', 'nopol', 'kondisi', 'lokasi', 'user.name' + 'kode_barang', 'nup', 'nama_barang', 'merk', 'nopol', 'kondisi', 'lokasi', 'user.name', ]; /** @@ -74,10 +74,10 @@ public function fields(NovaRequest $request) ->showWhenPeeking() ->readonly(), Text::make('Merk') - ->showWhenPeeking() + ->showWhenPeeking() ->readonly(), Text::make('Nopol') - ->showWhenPeeking() + ->showWhenPeeking() ->readonly(), Select::make('Kondisi') ->options([ @@ -99,7 +99,7 @@ public function fields(NovaRequest $request) ->searchable() ->withSubtitles(), HasMany::make('Daftar Pemeliharaan', 'daftarPemeliharaan', 'App\Nova\DaftarPemeliharaan'), - + ]; } @@ -147,7 +147,7 @@ public function lenses(NovaRequest $request) public function actions(NovaRequest $request) { $actions = []; - if (Policy::make()->allowedFor('admin,kasubbag,bmn')){ + if (Policy::make()->allowedFor('admin,kasubbag,bmn')) { $actions [] = ImportMasterBarangPemeliharaan::make() ->standalone() ->onlyOnIndex(); diff --git a/app/Nova/Metrics/RealisasiPerJenisBelanja.php b/app/Nova/Metrics/RealisasiPerJenisBelanja.php index 678569d9642cbc454ec4c274fbf9c94fe50a398d..dc8c234fbcae9f5136aba6b6ab77404d919e1cf7 100644 --- a/app/Nova/Metrics/RealisasiPerJenisBelanja.php +++ b/app/Nova/Metrics/RealisasiPerJenisBelanja.php @@ -18,7 +18,7 @@ public function __construct() { $header = collect(['Jenis Belanja', 'Target', 'Realisasi', 'Selisih']); $this->viewAll([ - 'label' => "Target Serapan Anggaran yang tercantum adalah target pada akhir triwulan berjalan", + 'label' => 'Target Serapan Anggaran yang tercantum adalah target pada akhir triwulan berjalan', 'link' => Nova::path().'/resources/realisasi-anggarans/lens/realisasi-anggaran', //URL to navigate when the link is clicked 'position' => 'top', //(Possible values `top` - `bottom`) 'style' => 'button', //(Possible values `link` - `button`) @@ -79,6 +79,5 @@ public function __construct() Cell::make(Helper::formatUang($data->selisih))->class('text-right'), ); })->toArray()); - } } diff --git a/app/Nova/Metrics/RencanaPenarikanPerJenisBelanja.php b/app/Nova/Metrics/RencanaPenarikanPerJenisBelanja.php index 483e3b135d8ccdfaaca183147e99331a59dff89d..ebd07dd2f4ac1878604b6b114356ea771c6578bf 100644 --- a/app/Nova/Metrics/RencanaPenarikanPerJenisBelanja.php +++ b/app/Nova/Metrics/RencanaPenarikanPerJenisBelanja.php @@ -4,8 +4,6 @@ use App\Helpers\Helper; use App\Models\Dipa; -use App\Models\JenisBelanja; -use App\Models\TargetSerapanAnggaran; use Illuminate\Support\Facades\DB; use Laravel\Nova\Nova; use Whitespacecode\TableCard\Table\Cell; @@ -44,7 +42,6 @@ public function __construct() ->orderBy('jenis_belanja') ->get() ->transform(function ($item) use ($dipaId, $bulan) { - $item->target = DB::table('mata_anggarans') ->where('jenis_belanja', $item->jenis_belanja) ->where('dipa_id', $dipaId) @@ -72,6 +69,5 @@ public function __construct() Cell::make($data->persen)->class('text-right'), ); })->toArray()); - } } diff --git a/app/Nova/Metrics/SerapanAnggaran.php b/app/Nova/Metrics/SerapanAnggaran.php index 9136fe53fa3c3f411476947524ef7e7c633c2001..eb15cb2771df2244e10f0f2ef37c343c21fa8021 100644 --- a/app/Nova/Metrics/SerapanAnggaran.php +++ b/app/Nova/Metrics/SerapanAnggaran.php @@ -13,9 +13,9 @@ class SerapanAnggaran extends Progress { protected $program; - protected static $kamusProgram =[ - "WA" => 'DUKMAN', - "GG" => "PPIS", + protected static $kamusProgram = [ + 'WA' => 'DUKMAN', + 'GG' => 'PPIS', ]; public function __construct($program = null) @@ -25,7 +25,7 @@ public function __construct($program = null) public function name() { - return $this->program ? 'Serapan Anggaran ' . self::$kamusProgram[$this->program] : 'Serapan Anggaran Total'; + return $this->program ? 'Serapan Anggaran '.self::$kamusProgram[$this->program] : 'Serapan Anggaran Total'; } /** @@ -39,41 +39,41 @@ public function calculate(NovaRequest $request) $dipa_id = Dipa::cache()->get('all')->where('tahun', session('year'))->first()->id; $filtered_ro = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'realisasi-anggarans_filter', 'App\\Nova\\Filters\\RoFilter'); $filtered_bulan = Helper::parseFilterFromUrl(request()->headers->get('referer'), 'realisasi-anggarans_filter', 'App\\Nova\\Filters\\BulanFilter'); - - return $this->program + + return $this->program ? $this->sum($request, RealisasiAnggaran::class, function ($query) use ($dipa_id, $filtered_bulan) { - return $query->whereRaw("SUBSTRING(mak,8,2) = '".$this->program."'") - ->where('realisasi_anggarans.dipa_id', $dipa_id) - ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) { - return $query->whereMonth('tanggal_sp2d', '<=', $filtered_bulan); - }) - ->join( - "mata_anggarans", - "realisasi_anggarans.mata_anggaran_id", - "=", - "mata_anggarans.id" - ); + return $query->whereRaw("SUBSTRING(mak,8,2) = '".$this->program."'") + ->where('realisasi_anggarans.dipa_id', $dipa_id) + ->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) { + return $query->whereMonth('tanggal_sp2d', '<=', $filtered_bulan); + }) + ->join( + 'mata_anggarans', + 'realisasi_anggarans.mata_anggaran_id', + '=', + 'mata_anggarans.id' + ); }, column: 'nilai', target: MataAnggaran::whereRaw("SUBSTRING(mak,8,2) = '".$this->program."'")->where('dipa_id', $dipa_id)->sum('total')) : $this->sum($request, RealisasiAnggaran::class, function ($query) use ($filtered_ro, $filtered_bulan, $dipa_id) { - return $query->when(!empty($filtered_ro), function ($query) use ($filtered_ro) { - return $query->whereRaw("SUBSTRING(mak,11,12) ='".$filtered_ro."'"); - })->where('realisasi_anggarans.dipa_id', $dipa_id) - ->when(!empty($filtered_bulan), function ($query) use ($filtered_bulan) { - return $query->whereMonth('tanggal_sp2d', '<=', $filtered_bulan); - }) - ->join( - "mata_anggarans", - "realisasi_anggarans.mata_anggaran_id", - "=", - "mata_anggarans.id" - ); - }, column: 'nilai', target: !empty($filtered_ro) ? MataAnggaran::whereRaw("SUBSTRING(mak,11,12) ='".$filtered_ro."'")->where('dipa_id', $dipa_id)->sum('total') : MataAnggaran::where('dipa_id', $dipa_id)->sum('total')); + return $query->when(! empty($filtered_ro), function ($query) use ($filtered_ro) { + return $query->whereRaw("SUBSTRING(mak,11,12) ='".$filtered_ro."'"); + })->where('realisasi_anggarans.dipa_id', $dipa_id) + ->when(! empty($filtered_bulan), function ($query) use ($filtered_bulan) { + return $query->whereMonth('tanggal_sp2d', '<=', $filtered_bulan); + }) + ->join( + 'mata_anggarans', + 'realisasi_anggarans.mata_anggaran_id', + '=', + 'mata_anggarans.id' + ); + }, column: 'nilai', target: ! empty($filtered_ro) ? MataAnggaran::whereRaw("SUBSTRING(mak,11,12) ='".$filtered_ro."'")->where('dipa_id', $dipa_id)->sum('total') : MataAnggaran::where('dipa_id', $dipa_id)->sum('total')); } /** * Determine the amount of time the results of the metric should be cached. * - * @return \DateTimeInterface|\DateInterval|float|int + * @return \DateTimeInterface|\DateInterval|float|int */ public function cacheFor() { @@ -87,6 +87,6 @@ public function cacheFor() */ public function uriKey() { - return 'serapan-anggaran-' . $this->program; + return 'serapan-anggaran-'.$this->program; } } diff --git a/app/Nova/PermintaanPersediaan.php b/app/Nova/PermintaanPersediaan.php index bb71b9da674218760c783cf77a4ede8fbfd13650..eb38bf48a7fe86ce5bde37f40157acf8c316918f 100644 --- a/app/Nova/PermintaanPersediaan.php +++ b/app/Nova/PermintaanPersediaan.php @@ -68,18 +68,18 @@ public function fields(NovaRequest $request) BelongsTo::make('Nomor', 'naskahKeluar', 'App\Nova\NaskahKeluar') ->exceptOnForms(), Date::make('Tanggal', 'naskahKeluar.tanggal') - ->displayUsing(fn ($value) => Helper::terbilangTanggal($value)) + ->displayUsing(fn ($value) => Helper::terbilangTanggal($value)), ]), Date::make('Tanggal Permintaan', 'tanggal_permintaan') - ->sortable() - ->filterable() - ->displayUsing(fn ($value) => Helper::terbilangTanggal($value)) - ->rules('required', 'before_or_equal:today') - ->onlyOnForms() - ->default(now()) - ->readonly(Policy::make() - ->allowedFor('bmn') - ->get()), + ->sortable() + ->filterable() + ->displayUsing(fn ($value) => Helper::terbilangTanggal($value)) + ->rules('required', 'before_or_equal:today') + ->onlyOnForms() + ->default(now()) + ->readonly(Policy::make() + ->allowedFor('bmn') + ->get()), Text::make('Untuk Kegiatan', 'kegiatan') ->rules('required') diff --git a/app/Nova/RealisasiAnggaran.php b/app/Nova/RealisasiAnggaran.php index 2f5b2ec4efb7ebca9eef65d8f8d60968a976faf7..aaec6cf89d157b7a8805f7e088cb61f0f99a4b99 100644 --- a/app/Nova/RealisasiAnggaran.php +++ b/app/Nova/RealisasiAnggaran.php @@ -3,7 +3,6 @@ namespace App\Nova; use App\Helpers\Helper; -use App\Nova\Filters\BulanFilter; use App\Nova\Lenses\RealisasiAnggaran as LensesRealisasiAnggaran; use App\Nova\Lenses\RencanaPenarikanDana; use Laravel\Nova\Fields\Currency; @@ -12,7 +11,6 @@ use Laravel\Nova\Fields\Text; use Laravel\Nova\Http\Requests\NovaRequest; use Laravel\Nova\Query\Search\SearchableText; -use SLASH2NL\NovaBackButton\NovaBackButton; class RealisasiAnggaran extends Resource { diff --git a/app/Policies/BarangPersediaanPolicy.php b/app/Policies/BarangPersediaanPolicy.php index 45e23655e275aeeac4cbb8babadcbc06e754ad83..f18128d70c7790afe9fa6776317fae3a8b9fb894 100644 --- a/app/Policies/BarangPersediaanPolicy.php +++ b/app/Policies/BarangPersediaanPolicy.php @@ -13,33 +13,31 @@ class BarangPersediaanPolicy */ public function viewAny(): bool { - { - return Nova::whenServing(function (NovaRequest $request) { - if ($request->viaResource == 'pembelian-persediaans' || str_contains(request()->url(), 'pembelian-persediaans')) { - return Policy::make() - ->allowedFor('pbj') - ->get(); - } - if ($request->viaResource == 'permintaan-persediaans' || str_contains(request()->url(), 'permintaan-persediaans')) { - return Policy::make() - ->allowedFor('koordinator,anggota,bmn') - ->get(); - } - - if ($request->viaResource == 'persediaan-keluars' || str_contains(request()->url(), 'persediaan-keluars')) { - return Policy::make() - ->allowedFor('bmn') - ->get(); - } - if ($request->viaResource == 'persediaan-masuks' || str_contains(request()->url(), 'persediaan-masuks')) { - return Policy::make() - ->allowedFor('bmn') - ->get(); - } - - return false; - }); - } + return Nova::whenServing(function (NovaRequest $request) { + if ($request->viaResource == 'pembelian-persediaans' || str_contains(request()->url(), 'pembelian-persediaans')) { + return Policy::make() + ->allowedFor('pbj') + ->get(); + } + if ($request->viaResource == 'permintaan-persediaans' || str_contains(request()->url(), 'permintaan-persediaans')) { + return Policy::make() + ->allowedFor('koordinator,anggota,bmn') + ->get(); + } + + if ($request->viaResource == 'persediaan-keluars' || str_contains(request()->url(), 'persediaan-keluars')) { + return Policy::make() + ->allowedFor('bmn') + ->get(); + } + if ($request->viaResource == 'persediaan-masuks' || str_contains(request()->url(), 'persediaan-masuks')) { + return Policy::make() + ->allowedFor('bmn') + ->get(); + } + + return false; + }); } /** diff --git a/app/Policies/DaftarPemeliharaanPolicy.php b/app/Policies/DaftarPemeliharaanPolicy.php index bdb352d20be0245fe7f3c6252723827420ed546a..53d36a9a7232102141581d271da9946112353620 100644 --- a/app/Policies/DaftarPemeliharaanPolicy.php +++ b/app/Policies/DaftarPemeliharaanPolicy.php @@ -16,7 +16,6 @@ public function viewAny(): bool return Policy::make() ->allowedFor('kasubbag,koordinator,anggota,bmn') ->get(); - } /** diff --git a/app/Policies/MasterBarangPemeliharaanPolicy.php b/app/Policies/MasterBarangPemeliharaanPolicy.php index 478262f89eb20246dfd8ce8376243083624a21c2..e1df39a586a2037523c6f0d31f3a3a9bb69ea121 100644 --- a/app/Policies/MasterBarangPemeliharaanPolicy.php +++ b/app/Policies/MasterBarangPemeliharaanPolicy.php @@ -40,7 +40,7 @@ public function create(): bool public function update(): bool { return Policy::make() - ->allowedFor('admin,kasubbag,bmn') + ->allowedFor('admin,kasubbag,bmn') ->get(); } @@ -50,7 +50,7 @@ public function update(): bool public function delete(): bool { return Policy::make() - ->allowedFor('admin,kasubbag,bmn') + ->allowedFor('admin,kasubbag,bmn') ->get(); } diff --git a/database/migrations/2024_11_19_163733_create_daftar_peserta_perjalanans_table.php b/database/migrations/2024_11_19_163733_create_daftar_peserta_perjalanans_table.php index 8df18a39a9ebab6b6ed85171b4cc501bc10e7e16..ce0516080d3b91be5cca4f3b528c2f69e7ee3f1f 100644 --- a/database/migrations/2024_11_19_163733_create_daftar_peserta_perjalanans_table.php +++ b/database/migrations/2024_11_19_163733_create_daftar_peserta_perjalanans_table.php @@ -15,7 +15,7 @@ public function up(): void $table->id(); $table->date('tanggal_kuitansi')->nullable(); $table->text('spesifikasi')->nullable(); - $table->string('angkutan',20)->nullable(); + $table->string('angkutan', 20)->nullable(); $table->date('tanggal_berangkat')->nullable(); $table->date('tanggal_kembali')->nullable(); $table->string('asal', 80)->nullable();