diff --git a/app/Models/JenisBelanja.php b/app/Models/JenisBelanja.php index 9fb77c47..dd824654 100644 --- a/app/Models/JenisBelanja.php +++ b/app/Models/JenisBelanja.php @@ -11,7 +11,7 @@ class JenisBelanja extends Model { use LaraCache; - protected $fillable = ['kode', 'dipa_id']; + protected $fillable = ['kode', 'dipa_id']; public static function cacheEntities(): array { @@ -28,7 +28,6 @@ public function dipa(): BelongsTo return $this->belongsTo(Dipa::class); } - public function targetSerapanAnggaran(): HasMany { return $this->hasMany(TargetSerapanAnggaran::class); @@ -45,7 +44,7 @@ protected static function booted(): void }); static::created(function (JenisBelanja $jenis) { foreach (range(1, 12) as $bulan) { - $targetSerapan = New TargetSerapanAnggaran(); + $targetSerapan = new TargetSerapanAnggaran(); $targetSerapan->jenis_belanja_id = $jenis->id; $targetSerapan->bulan = $bulan; $targetSerapan->nilai = 100; diff --git a/app/Models/MataAnggaran.php b/app/Models/MataAnggaran.php index 39c8c25f..3001c758 100644 --- a/app/Models/MataAnggaran.php +++ b/app/Models/MataAnggaran.php @@ -2,7 +2,6 @@ namespace App\Models; -use App\Nova\Lenses\SerapanAnggaran; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Mostafaznv\LaraCache\CacheEntity; @@ -32,7 +31,6 @@ public function realisasiAnggaran(): HasMany return $this->hasMany(RealisasiAnggaran::class); } - protected static function booted(): void { static::deleting(function (MataAnggaran $mataAnggaran) { diff --git a/app/Models/RealisasiAnggaran.php b/app/Models/RealisasiAnggaran.php index ea7e1d6d..8c88495b 100644 --- a/app/Models/RealisasiAnggaran.php +++ b/app/Models/RealisasiAnggaran.php @@ -9,6 +9,5 @@ class RealisasiAnggaran extends Model protected $casts = [ 'tanggal_sp2d' => 'date', ]; - protected $fillable = ['dipa_id', 'mata_anggaran_id' ,'nomor_sp2d']; - + protected $fillable = ['dipa_id', 'mata_anggaran_id', 'nomor_sp2d']; } diff --git a/app/Models/TargetSerapanAnggaran.php b/app/Models/TargetSerapanAnggaran.php index 6dffe9d2..329be1eb 100644 --- a/app/Models/TargetSerapanAnggaran.php +++ b/app/Models/TargetSerapanAnggaran.php @@ -4,7 +4,6 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; -use Illuminate\Database\Eloquent\Relations\HasMany; use Mostafaznv\LaraCache\CacheEntity; use Mostafaznv\LaraCache\Traits\LaraCache; diff --git a/app/Nova/Actions/ImportMataAnggaran.php b/app/Nova/Actions/ImportMataAnggaran.php index 362d8637..5a54fc1a 100644 --- a/app/Nova/Actions/ImportMataAnggaran.php +++ b/app/Nova/Actions/ImportMataAnggaran.php @@ -114,7 +114,7 @@ public function fields(NovaRequest $request) Text::make('Kode Satker/Kementrian', 'kode') ->rules('required') ->default('054.01'), - Number::make('Revisi ke- ' , 'revisi') + Number::make('Revisi ke- ', 'revisi') ->rules('required', 'gt:0') ->step(1), Date::make('Tanggal Revisi', 'tanggal_revisi') diff --git a/app/Nova/Actions/ImportRealisasiAnggaran.php b/app/Nova/Actions/ImportRealisasiAnggaran.php index 6eaa95bb..49920e5b 100644 --- a/app/Nova/Actions/ImportRealisasiAnggaran.php +++ b/app/Nova/Actions/ImportRealisasiAnggaran.php @@ -2,12 +2,10 @@ namespace App\Nova\Actions; -use App\Helpers\Helper; use App\Models\MataAnggaran; use App\Models\RealisasiAnggaran; use Illuminate\Bus\Queueable; use Illuminate\Queue\InteractsWithQueue; -use Illuminate\Support\Carbon; use Illuminate\Support\Collection; use Laravel\Nova\Actions\Action; use Laravel\Nova\Fields\ActionFields; @@ -32,9 +30,9 @@ public function handle(ActionFields $fields, Collection $models) $model = $models->first(); RealisasiAnggaran::where('dipa_id', $model->id)->update(['updated_at' => null]); $mataAnggarans = MataAnggaran::cache() - ->get("all") - ->pluck("id", "coa_id") - ->all(); + ->get('all') + ->pluck('id', 'coa_id') + ->all(); (new FastExcel)->import($fields->file, function ($row) use ($model, $mataAnggarans) { $array_coa = explode('.', $row['KODE COA']); $coa_id = end($array_coa); @@ -52,7 +50,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(); $model->tanggal_realisasi = RealisasiAnggaran::max('tanggal_sp2d'); diff --git a/app/Nova/Filters/BulanFilter.php b/app/Nova/Filters/BulanFilter.php index 0c40029c..97093659 100644 --- a/app/Nova/Filters/BulanFilter.php +++ b/app/Nova/Filters/BulanFilter.php @@ -12,9 +12,9 @@ class BulanFilter extends Filter /** * Apply the filter to the given query. * - * @param \Illuminate\Http\Request $request - * @param \Illuminate\Database\Eloquent\Builder $query - * @param mixed $value + * @param \Illuminate\Http\Request $request + * @param \Illuminate\Database\Eloquent\Builder $query + * @param mixed $value * @return \Illuminate\Database\Eloquent\Builder */ public function apply(Request $request, $query, $value) @@ -46,4 +46,4 @@ public function options(Request $request) 'Desember' => '12', ]; } -} \ No newline at end of file +} diff --git a/app/Nova/MataAnggaran.php b/app/Nova/MataAnggaran.php index 4ac4ffa7..2a473cf6 100644 --- a/app/Nova/MataAnggaran.php +++ b/app/Nova/MataAnggaran.php @@ -4,7 +4,6 @@ use App\Helpers\Policy; use App\Nova\Actions\AddHasManyModel; -use App\Nova\Actions\ImportRealisasiAnggaran; use Illuminate\Validation\Rule; use Laravel\Nova\Fields\Text; use Laravel\Nova\Http\Requests\NovaRequest; @@ -106,7 +105,7 @@ public function lenses(NovaRequest $request) public function actions(NovaRequest $request) { $actions = []; - if (Policy::make()->allowedFor('koordinator,anggota')->get()) + if (Policy::make()->allowedFor('koordinator,anggota')->get()) { $actions[] = AddHasManyModel::make('MataAnggaran', 'Dipa', $request->viaResourceId) ->confirmButtonText('Tambah') @@ -114,10 +113,9 @@ public function actions(NovaRequest $request) ->standalone() ->onlyOnIndex() ->addFields($this->fields($request)); - + } return $actions; - } /** diff --git a/app/Nova/TargetSerapanAnggaran.php b/app/Nova/TargetSerapanAnggaran.php index 858e37c5..11edebbb 100644 --- a/app/Nova/TargetSerapanAnggaran.php +++ b/app/Nova/TargetSerapanAnggaran.php @@ -9,7 +9,6 @@ class TargetSerapanAnggaran extends Resource { - public static $with = ['jenisBelanja']; public static $globalSearchResults = 12; @@ -33,7 +32,7 @@ public function title() public function subtitle() { - return 'Target: '.$this->nilai. '%'; + return 'Target: '.$this->nilai.'%'; } /** @@ -44,6 +43,7 @@ public function subtitle() public static $search = [ 'jenisBelanja.kode', ]; + /** * Get the fields displayed by the resource. * diff --git a/database/migrations/2024_11_15_053439_create_jenis_belanjas_table.php b/database/migrations/2024_11_15_053439_create_jenis_belanjas_table.php index e15a0a0c..69e09d0a 100644 --- a/database/migrations/2024_11_15_053439_create_jenis_belanjas_table.php +++ b/database/migrations/2024_11_15_053439_create_jenis_belanjas_table.php @@ -13,7 +13,7 @@ public function up(): void { Schema::create('jenis_belanjas', function (Blueprint $table) { $table->id(); - $table->string('kode', 2)->nullable(); + $table->string('kode', 2)->nullable(); $table->mediumInteger('dipa_id')->nullable()->unsigned(); $table->timestamps(); });