Merge branch 'main' of https://github.com/laravelwebdev/simpede

laravelwebdev · laravelwebdev · commit 35ce6e120a9c · 2025-04-16T06:00:54.000+08:00
diff --git a/app/Console/Commands/Update.php b/app/Console/Commands/Update.php
@@ -28,6 +28,7 @@ public function handle()
     {
         $error = false;
         try {
+            $this->call('maintenance', ['action' => 'start']);
             $process = new Process(['git', 'pull', 'origin', 'main']);
             $process->run();
             if (! $process->isSuccessful()) {
@@ -50,6 +51,7 @@ public function handle()
             }
         } finally {
             $error ? $this->error('Update Gagal!') : $this->info('Update Sukses! ');
+            $this->call('maintenance', ['action' => 'stop']);
         }
     }
 }
diff --git a/app/Nova/Actions/Download.php b/app/Nova/Actions/Download.php
@@ -29,7 +29,7 @@ class Download extends Action
 
     protected string $role;
 
-    protected string $filter;
+    protected string $filter = '';
 
     protected string $exceptionMessage;
 
@@ -75,7 +75,7 @@ public function name()
      */
     public function handle(ActionFields $fields, Collection $models)
     {
-        if ($this->filter) {
+        if (! empty($this->filter)) {
             if ($models->contains(function ($model) {
                 return empty($model->{$this->filter});
             })) {
diff --git a/app/Nova/Actions/GenerateNomorBastMitra.php b/app/Nova/Actions/GenerateNomorBastMitra.php
@@ -29,8 +29,8 @@ public function handle(ActionFields $fields, Collection $models)
     {
         $error = false;
         foreach ($models as $model) {
-            if ($model->akhir_kontrak >= Helper::createDateFromString($fields->tanggal_bast)) {
-                $model->tanggal_bast = Helper::createDateFromString($fields->tanggal_bast);
+            if ($model->akhir_kontrak >= $fields->date('tanggal_bast')) {
+                $model->tanggal_bast = $fields->date('tanggal_bast');
                 $model->bast_ppk_user_id = $fields->ppk_user_id;
                 $model->bast_kode_arsip_id = $fields->kode_arsip_id;
                 $model->save();
diff --git a/app/Nova/Actions/GenerateNomorKontrakMitra.php b/app/Nova/Actions/GenerateNomorKontrakMitra.php
@@ -28,9 +28,9 @@ class GenerateNomorKontrakMitra extends Action
     public function handle(ActionFields $fields, Collection $models)
     {
         foreach ($models as $model) {
-            $model->tanggal_spk = Helper::createDateFromString($fields->tanggal_spk);
-            $model->awal_kontrak = Helper::createDateFromString($fields->awal_kontrak);
-            $model->akhir_kontrak = Helper::createDateFromString($fields->akhir_kontrak);
+            $model->tanggal_spk = $fields->date('tanggal_spk');
+            $model->awal_kontrak = $fields->date('awal_kontrak');
+            $model->akhir_kontrak = $fields->date('akhir_kontrak');
             $model->spk_ppk_user_id = $fields->ppk_user_id;
             $model->spk_kode_arsip_id = $fields->kode_arsip_id;
             $model->save();
diff --git a/app/Nova/Actions/SinkronisasiDataAnggaran.php b/app/Nova/Actions/SinkronisasiDataAnggaran.php
@@ -62,7 +62,7 @@ public function handle(ActionFields $fields, Collection $models)
         move_uploaded_file($filePath, $newFilePath);
 
         MataAnggaran::cache()->disable();
-        MataAnggaran::where('dipa_id', $model->id)->where('is_manual', false)->update(['updated_at' => null]);
+        MataAnggaran::where('dipa_id', $model->id)->whereNull('is_manual')->update(['updated_at' => null]);
         $collections = (new FastExcel)->import($newFilePath);
         $index = 0;
         foreach ($collections as $row) {
diff --git a/app/Nova/DaftarKontrakMitra.php b/app/Nova/DaftarKontrakMitra.php
@@ -98,6 +98,14 @@ public function fields(NovaRequest $request)
                 ->sortable()
                 ->hideFromIndex($request->viaResource == 'kontrak-mitras')
                 ->hideFromDetail($request->viaResource == 'kontrak-mitras'),
+            Date::make('Tanggal Akhir Kontrak', 'akhir_kontrak')
+                ->readOnly()
+                ->displayUsing(function ($value) {
+                    return Helper::terbilangTanggal($value);
+                })
+                ->sortable()
+                ->hideFromIndex($request->viaResource == 'kontrak-mitras')
+                ->hideFromDetail($request->viaResource == 'kontrak-mitras'),
             Number::make('Jumlah Kegiatan', 'jumlah_kegiatan')
                 ->readOnly()
                 ->sortable(),
diff --git a/app/Nova/DaftarPesertaPerjalanan.php b/app/Nova/DaftarPesertaPerjalanan.php
@@ -102,18 +102,18 @@ public function fields(NovaRequest $request)
                     ->dependsOn('tanggal_kuitansi', function (Select $field, NovaRequest $request, FormData $formData) {
                         $field
                             ->rules('required')
-                            ->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi)))
-                            ->default(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_kuitansi)));
+                            ->options(Helper::setOptionPengelola('ppk', $formData->date('tanggal_kuitansi')))
+                            ->default(Helper::setDefaultPengelola('ppk', $formData->date('tanggal_kuitansi')));
                     }),
                 Select::make('Bendahara', 'bendahara_user_id')
                     ->searchable()
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_kuitansi', function (Select $field, NovaRequest $request, FormData $formData) {
                         $field
-                            ->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_kuitansi)))
+                            ->options(Helper::setOptionPengelola('bendahara', $formData->date('tanggal_kuitansi')))
                             ->rules('required')
-                            ->default(Helper::setDefaultPengelola('bendahara', Helper::createDateFromString($formData->tanggal_kuitansi)));
+                            ->default(Helper::setDefaultPengelola('bendahara', $formData->date('tanggal_kuitansi')));
                     }),
             ]),
         ];
diff --git a/app/Nova/HonorKegiatan.php b/app/Nova/HonorKegiatan.php
@@ -231,8 +231,8 @@ public function fields(NovaRequest $request)
                         if ($formData->generate_sk) {
                             $field->show()
                                 ->rules('required')
-                                ->options(Helper::setOptionPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk)))
-                                ->default(Helper::setDefaultPengelola('kpa', Helper::createDateFromString($formData->tanggal_sk)));
+                                ->options(Helper::setOptionPengelola('kpa', $formData->date('tanggal_sk')))
+                                ->default(Helper::setDefaultPengelola('kpa', $formData->date('tanggal_sk')));
                         }
                     }),
             ]),
@@ -288,8 +288,8 @@ public function fields(NovaRequest $request)
                         if ($formData->generate_st) {
                             $field->show()
                                 ->rules('required')
-                                ->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)))
-                                ->default(Helper::setDefaultPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
+                                ->options(Helper::setOptionPengelola('kepala', $formData->date('tanggal_st')))
+                                ->default(Helper::setDefaultPengelola('kepala', $formData->date('tanggal_st')));
                         }
                     }),
             ]),
@@ -304,26 +304,26 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_spj', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('koordinator', Helper::createDateFromString($formData->tanggal_spj)))
-                            ->default(Helper::setDefaultPengelola('koordinator', Helper::createDateFromString($formData->tanggal_spj)));
+                        $field->options(Helper::setOptionPengelola('koordinator', $formData->date('tanggal_spj')))
+                            ->default(Helper::setDefaultPengelola('koordinator', $formData->date('tanggal_spj')));
                     }),
                 Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
                     ->rules('required')
                     ->searchable()
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_spj', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spj)))
-                            ->default(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_spj)));
+                        $field->options(Helper::setOptionPengelola('ppk', $formData->date('tanggal_spj')))
+                            ->default(Helper::setDefaultPengelola('ppk', $formData->date('tanggal_spj')));
                     }),
                 Select::make('Bendahara', 'bendahara_user_id')
                     ->rules('required')
                     ->searchable()
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_spj', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_spj)))
-                            ->default(Helper::setDefaultPengelola('bendahara', Helper::createDateFromString($formData->tanggal_spj)));
+                        $field->options(Helper::setOptionPengelola('bendahara', $formData->date('tanggal_spj')))
+                            ->default(Helper::setDefaultPengelola('bendahara', $formData->date('tanggal_spj')));
                     }),
             ]),
             Tab::group('Daftar Honor', [
diff --git a/app/Nova/KerangkaAcuan.php b/app/Nova/KerangkaAcuan.php
@@ -338,16 +338,16 @@ public function pengelolaFields()
                 ->searchable()
                 ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                 ->dependsOn('tanggal', function (Select $field, NovaRequest $request, FormData $formData) {
-                    $field->options(Helper::setOptionPengelola('koordinator', Helper::createDateFromString($formData->tanggal)))
-                        ->default(Helper::setDefaultPengelola('koordinator', Helper::createDateFromString($formData->tanggal)));
+                    $field->options(Helper::setOptionPengelola('koordinator', $formData->date('tanggal')))
+                        ->default(Helper::setDefaultPengelola('koordinator', $formData->date('tanggal')));
                 }),
             Select::make('Pejabat Pembuat Komitmen', 'ppk_user_id')
                 ->rules('required')
                 ->searchable()
                 ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                 ->dependsOn('tanggal', function (Select $field, NovaRequest $request, FormData $formData) {
-                    $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal)))
-                        ->default(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal)));
+                    $field->options(Helper::setOptionPengelola('ppk', $formData->date('tanggal')))
+                        ->default(Helper::setDefaultPengelola('ppk', $formData->date('tanggal')));
                 }),
 
         ];
diff --git a/app/Nova/PembelianPersediaan.php b/app/Nova/PembelianPersediaan.php
@@ -110,8 +110,8 @@ public function fields(NovaRequest $request)
                     ->searchable()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_bast', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)))
-                            ->default(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_bast)));
+                        $field->options(Helper::setOptionPengelola('ppk', $formData->date('tanggal_bast')))
+                            ->default(Helper::setDefaultPengelola('ppk', $formData->date('tanggal_bast')));
                     })
                     ->canSee(fn () => Policy::make()
                         ->allowedFor('bmn')
@@ -124,8 +124,8 @@ public function fields(NovaRequest $request)
                     ->searchable()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_bast', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('bmn', Helper::createDateFromString($formData->tanggal_bast)))
-                            ->default(Helper::setDefaultPengelola('bmn', Helper::createDateFromString($formData->tanggal_bast)));
+                        $field->options(Helper::setOptionPengelola('bmn', $formData->date('tanggal_bast')))
+                            ->default(Helper::setDefaultPengelola('bmn', $formData->date('tanggal_bast')));
                     })
                     ->canSee(fn () => Policy::make()
                         ->allowedFor('bmn,arsiparis')
diff --git a/app/Nova/PerjalananDinas.php b/app/Nova/PerjalananDinas.php
@@ -132,8 +132,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_st', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)))
-                            ->default(Helper::setDefaultPengelola('kepala', Helper::createDateFromString($formData->tanggal_st)));
+                        $field->options(Helper::setOptionPengelola('kepala', $formData->date('tanggal_st')))
+                            ->default(Helper::setDefaultPengelola('kepala', $formData->date('tanggal_st')));
                     }),
             ]),
             Panel::make('Surat Perjalanan Dinas', [
@@ -155,8 +155,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_spd', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('ppk', Helper::createDateFromString($formData->tanggal_spd)))
-                            ->default(Helper::setDefaultPengelola('ppk', Helper::createDateFromString($formData->tanggal_spd)));
+                        $field->options(Helper::setOptionPengelola('ppk', $formData->date('tanggal_spd')))
+                            ->default(Helper::setDefaultPengelola('ppk', $formData->date('tanggal_spd')));
                     }),
             ]),
             Date::make('Tanggal Berangkat', 'tanggal_berangkat')
diff --git a/app/Nova/PermintaanPersediaan.php b/app/Nova/PermintaanPersediaan.php
@@ -116,9 +116,9 @@ public function fields(NovaRequest $request)
                 ->hideWhenCreating()
                 ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                 ->dependsOn('tanggal_persetujuan', function (Select $field, NovaRequest $request, FormData $formData) {
-                    $field->options(Helper::setOptionPengelola('bmn', Helper::createDateFromString($formData->tanggal_persetujuan)))
+                    $field->options(Helper::setOptionPengelola('bmn', $formData->date('tanggal_persetujuan')))
                         ->rules('required')
-                        ->default(Helper::setDefaultPengelola('bmn', Helper::createDateFromString($formData->tanggal_persetujuan)));
+                        ->default(Helper::setDefaultPengelola('bmn', $formData->date('tanggal_persetujuan')));
                 })
                 ->canSee(fn () => Policy::make()
                     ->allowedFor('bmn')
diff --git a/app/Nova/RapatInternal.php b/app/Nova/RapatInternal.php
@@ -117,8 +117,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('kepala', Helper::createDateFromString($formData->tanggal)))
-                            ->default(Helper::setDefaultPengelola('kepala', Helper::createDateFromString($formData->tanggal)));
+                        $field->options(Helper::setOptionPengelola('kepala', $formData->date('tanggal')))
+                            ->default(Helper::setDefaultPengelola('kepala', $formData->date('tanggal')));
                     }),
             ]),
             Panel::make('Daftar Hadir', [
@@ -133,8 +133,8 @@ public function fields(NovaRequest $request)
                     ->hideFromIndex()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_rapat', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('kasubbag', Helper::createDateFromString($formData->tanggal_rapat)))
-                            ->default(Helper::setDefaultPengelola('kasubbag', Helper::createDateFromString($formData->tanggal_rapat)));
+                        $field->options(Helper::setOptionPengelola('kasubbag', $formData->date('tanggal_rapat')))
+                            ->default(Helper::setDefaultPengelola('kasubbag', $formData->date('tanggal_rapat')));
                     }),
             ]),
             Panel::make('Notula', [
@@ -144,15 +144,15 @@ public function fields(NovaRequest $request)
                     ->hideWhenCreating()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_rapat', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('anggota', Helper::createDateFromString($formData->tanggal_rapat)));
+                        $field->options(Helper::setOptionPengelola('anggota', $formData->date('tanggal_rapat')));
                     }),
                 Select::make('Notulis', 'notulis_user_id')
                     ->searchable()
                     ->hideFromIndex()
                     ->hideWhenCreating()
                     ->displayUsing(fn ($id) => optional(Helper::getPegawaiByUserId($id))->name)
                     ->dependsOn('tanggal_rapat', function (Select $field, NovaRequest $request, FormData $formData) {
-                        $field->options(Helper::setOptionPengelola('anggota', Helper::createDateFromString($formData->tanggal_rapat)));
+                        $field->options(Helper::setOptionPengelola('anggota', $formData->date('tanggal_rapat')));
                     }),
                 Repeatable::make('Peserta Hadir', 'peserta', [
                     Select::make('Nama', 'peserta_user_id')
diff --git a/composer.json b/composer.json
@@ -67,6 +67,7 @@
             "@php artisan nova:publish --ansi",
             "@php artisan optimize:clear",
             "@php artisan optimize",
+            "@php artisan simpede:cache",
             "@php artisan storage:link"
         ],
         "post-root-package-install": [
@@ -100,5 +101,5 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "version": "2.10.0"
+    "version": "2.10.1"
 }

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@ public function handle()`
`28`	`28`	`{`
`29`	`29`	`$error = false;`
`30`	`30`	`try {`
	`31`	`+ $this->call('maintenance', ['action' => 'start']);`
`31`	`32`	`$process = new Process(['git', 'pull', 'origin', 'main']);`
`32`	`33`	`$process->run();`
`33`	`34`	`if (! $process->isSuccessful()) {`
`@@ -50,6 +51,7 @@ public function handle()`
`50`	`51`	`}`
`51`	`52`	`} finally {`
`52`	`53`	`$error ? $this->error('Update Gagal!') : $this->info('Update Sukses! ');`
	`54`	`+ $this->call('maintenance', ['action' => 'stop']);`
`53`	`55`	`}`
`54`	`56`	`}`
`55`	`57`	`}`