diff --git a/app/Models/RealisasiAnggaran.php b/app/Models/RealisasiAnggaran.php index be4c448f..763e2ed1 100644 --- a/app/Models/RealisasiAnggaran.php +++ b/app/Models/RealisasiAnggaran.php @@ -9,12 +9,12 @@ class RealisasiAnggaran extends Model { protected $fillable = ['dipa_id', 'mata_anggaran_id', 'daftar_sp2d_id']; - public function daftarSp2d() : BelongsTo + public function daftarSp2d(): BelongsTo { return $this->belongsTo(DaftarSp2d::class); } - public function mataAnggaran() : BelongsTo + public function mataAnggaran(): BelongsTo { return $this->belongsTo(MataAnggaran::class); } diff --git a/app/Nova/Actions/ImportRealisasiAnggaran.php b/app/Nova/Actions/ImportRealisasiAnggaran.php index dd431b3e..9afb38dd 100644 --- a/app/Nova/Actions/ImportRealisasiAnggaran.php +++ b/app/Nova/Actions/ImportRealisasiAnggaran.php @@ -61,7 +61,6 @@ public function handle(ActionFields $fields, Collection $models) $realisasiAnggaran->nilai = $row['NILAI RUPIAH']; $realisasiAnggaran->updated_at = now(); $realisasiAnggaran->save(); - }); RealisasiAnggaran::where('updated_at', null)->delete(); DaftarSp2d::where('updated_at', null)->delete(); diff --git a/app/Nova/Lenses/RealisasiAnggaran.php b/app/Nova/Lenses/RealisasiAnggaran.php index ffc9a6f1..9754e248 100644 --- a/app/Nova/Lenses/RealisasiAnggaran.php +++ b/app/Nova/Lenses/RealisasiAnggaran.php @@ -12,7 +12,6 @@ use Laravel\Nova\Fields\Line; use Laravel\Nova\Fields\Number; use Laravel\Nova\Fields\Stack; -use Laravel\Nova\Fields\Text; use Laravel\Nova\Http\Requests\LensRequest; use Laravel\Nova\Http\Requests\NovaRequest; use Laravel\Nova\Lenses\Lens; @@ -59,7 +58,7 @@ public static function query(LensRequest $request, $query) CASE WHEN SUM(nilai) IS NULL THEN 0 ELSE round(100*sum(nilai)/total,2) END as persen, CASE WHEN SUM(nilai) IS NULL THEN total-blokir ELSE total- SUM(nilai)-blokir END as sisa' ) - ->join('daftar_sp2ds', 'realisasi_anggarans.daftar_sp2d_id', '=', 'daftar_sp2ds.id') + ->join('daftar_sp2ds', 'realisasi_anggarans.daftar_sp2d_id', '=', 'daftar_sp2ds.id') ->rightJoin('mata_anggarans', function ($join) use ($filtered_bulan) { $join->on('realisasi_anggarans.mata_anggaran_id', diff --git a/app/Nova/Lenses/RencanaPenarikanDana.php b/app/Nova/Lenses/RencanaPenarikanDana.php index a4b34a7c..11900209 100644 --- a/app/Nova/Lenses/RencanaPenarikanDana.php +++ b/app/Nova/Lenses/RencanaPenarikanDana.php @@ -51,7 +51,7 @@ public static function query(LensRequest $request, $query) CASE WHEN SUM(nilai) IS NULL THEN 0 ELSE SUM(nilai) END as realisasi, CASE WHEN SUM(nilai) IS NULL THEN rpd_'.$filtered_bulan.' ELSE rpd_'.$filtered_bulan.' - SUM(nilai) END as deviasi' ) - ->join('daftar_sp2ds', 'realisasi_anggarans.daftar_sp2d_id', '=', 'daftar_sp2ds.id') + ->join('daftar_sp2ds', 'realisasi_anggarans.daftar_sp2d_id', '=', 'daftar_sp2ds.id') ->rightJoin('mata_anggarans', function ($join) use ($filtered_bulan) { $join->on('realisasi_anggarans.mata_anggaran_id', '=',