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
4 changes: 2 additions & 2 deletions app/Models/RealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
1 change: 0 additions & 1 deletion app/Nova/Actions/ImportRealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 1 addition & 2 deletions app/Nova/Lenses/RealisasiAnggaran.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion app/Nova/Lenses/RencanaPenarikanDana.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
'=',
Expand Down