Skip to content

Commit 363cdb1

Browse files
committed
versi 2.1
1 parent de0106b commit 363cdb1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2426
-1404
lines changed

Diff for: .devcontainer/docker/app/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM thecodingmachine/php:8.3-v4-apache-node20
2-
ENV PHP_EXTENSIONS="mysqli gd pdo_mysql intl imagick imap ldap xdebug msgpack pcov"
2+
ENV PHP_EXTENSIONS="mysqli gd pdo_mysql intl imagick imap ldap xdebug msgpack pcov bcmath"
33

44
WORKDIR /simpede
55

Diff for: app/Models/User.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ protected static function booted(): void
8787
$user->avatar = $user->avatar ?? 'G99ElrTEgEDRG4blE3m1xxMmFcfB0VVeLio0L3H6.jpg';
8888
});
8989
static::created(function (User $user) {
90-
$pengelola = new Pengelola();
90+
$pengelola = new Pengelola;
9191
$pengelola->role = 'anggota';
9292
$pengelola->user_id = $user->id;
9393
$pengelola->save();

Diff for: app/Nova/AnggaranKerangkaAcuan.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,6 @@ public function actions(NovaRequest $request)
133133
*/
134134
public static function redirectAfterUpdate(NovaRequest $request, $resource)
135135
{
136-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail=anggaran' : '/'.'resources'.'/'.'kerangka-acuans'.'/';
136+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'kerangka-acuans'.'/';
137137
}
138138
}

Diff for: app/Nova/ArsipDokumen.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
namespace App\Nova;
44

55
use App\Nova\Actions\AddHasManyModel;
6-
use DigitalCreative\Filepond\Filepond;
76
use Illuminate\Http\Request;
87
use Illuminate\Support\Facades\Storage;
98
use Illuminate\Support\Str;
@@ -12,6 +11,7 @@
1211
use Laravel\Nova\Fields\Text;
1312
use Laravel\Nova\Fields\URL;
1413
use Laravel\Nova\Http\Requests\NovaRequest;
14+
use Laravelwebdev\Filepond\Filepond;
1515

1616
class ArsipDokumen extends Resource
1717
{
@@ -160,6 +160,6 @@ public function actions(NovaRequest $request)
160160
*/
161161
public static function redirectAfterUpdate(NovaRequest $request, $resource)
162162
{
163-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail=arsip-dokumen' : '/'.'resources'.'/'.'kerangka-acuans'.'/';
163+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'kerangka-acuans'.'/';
164164
}
165165
}

Diff for: app/Nova/BastMitra.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use App\Models\NaskahDefault;
1010
use App\Nova\Actions\GenerateBastMitra;
1111
use App\Nova\Filters\StatusFilter;
12-
use DigitalCreative\Filepond\Filepond;
1312
use Illuminate\Http\Request;
1413
use Illuminate\Support\Facades\Storage;
1514
use Laravel\Nova\Fields\BelongsTo;
@@ -22,6 +21,7 @@
2221
use Laravel\Nova\Fields\URL;
2322
use Laravel\Nova\Http\Requests\NovaRequest;
2423
use Laravel\Nova\Panel;
24+
use Laravelwebdev\Filepond\Filepond;
2525

2626
class BastMitra extends Resource
2727
{

Diff for: app/Nova/DaftarHonorMitra.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,6 @@ public function actions(NovaRequest $request)
164164

165165
public static function redirectAfterUpdate(NovaRequest $request, $resource)
166166
{
167-
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Daftar%20Honor=daftar-honor-mitra';
167+
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId;
168168
}
169169
}

Diff for: app/Nova/DaftarHonorPegawai.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,11 +149,11 @@ public function actions(NovaRequest $request)
149149
*/
150150
public static function redirectAfterUpdate(NovaRequest $request, $resource)
151151
{
152-
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Daftar%20Honor=daftar-honor-pegawai';
152+
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId;
153153
}
154154

155155
public static function redirectAfterCreate(NovaRequest $request, $resource)
156156
{
157-
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Daftar%20Honor=daftar-honor-pegawai';
157+
return '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId;
158158
}
159159
}

Diff for: app/Nova/DaftarKegiatan.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
use Laravel\Nova\Http\Requests\ActionRequest;
2424
use Laravel\Nova\Http\Requests\NovaRequest;
2525
use Laravel\Nova\Panel;
26+
use Laravelwebdev\Repeatable\Repeatable;
2627
use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable;
2728

2829
class DaftarKegiatan extends Resource
@@ -163,7 +164,7 @@ public function fields(NovaRequest $request)
163164
->show();
164165
}
165166
}),
166-
SimpleRepeatable::make('Waktu Reminder', 'waktu_reminder', [
167+
Repeatable::make('Waktu Reminder', 'waktu_reminder', [
167168
Number::make('H-', 'hari')
168169
->min(0)->max(30)
169170
->step(1)
@@ -175,7 +176,7 @@ public function fields(NovaRequest $request)
175176
->rules('required'),
176177
])
177178
->hide()
178-
->dependsOn(['jenis'], function (SimpleRepeatable $field, NovaRequest $request, FormData $formData) {
179+
->dependsOn(['jenis'], function (Repeatable $field, NovaRequest $request, FormData $formData) {
179180
if ($formData->jenis === 'Deadline') {
180181
$field
181182
->show()

Diff for: app/Nova/DaftarPenilaianReward.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public function actions(NovaRequest $request)
128128

129129
public static function redirectAfterUpdate(NovaRequest $request, $resource)
130130
{
131-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail=arsip-dokumen' : '/'.'resources'.'/'.'reward-pegawais'.'/';
131+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'reward-pegawais'.'/';
132132
}
133133

134134
public static $indexDefaultOrder = [

Diff for: app/Nova/DaftarPesertaPerjalanan.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Laravel\Nova\Http\Requests\NovaRequest;
1717
use Laravel\Nova\Panel;
1818
use Laravelwebdev\Numeric\Numeric;
19-
use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable;
19+
use Laravelwebdev\Repeatable\Repeatable;
2020

2121
class DaftarPesertaPerjalanan extends Resource
2222
{
@@ -76,7 +76,7 @@ public function fields(NovaRequest $request)
7676
->rules('required')
7777
->options(Helper::$jenis_angkutan)
7878
->displayUsingLabels(),
79-
SimpleRepeatable::make('Item Biaya', 'spesifikasi', [
79+
Repeatable::make('Item Biaya', 'spesifikasi', [
8080
Text::make('Item', 'item')
8181
->help('Misal: Uang Harian, Penginapan, Transportasi, dll')
8282
->rules('required'),

Diff for: app/Nova/DaftarSp2d.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use App\Helpers\Helper;
66
use App\Helpers\Policy;
7-
use DigitalCreative\Filepond\Filepond;
87
use Illuminate\Http\Request;
98
use Illuminate\Support\Facades\Storage;
109
use Laravel\Nova\Fields\BelongsToMany;
@@ -16,6 +15,7 @@
1615
use Laravel\Nova\Http\Requests\NovaRequest;
1716
use Laravel\Nova\Panel;
1817
use Laravel\Nova\Query\Search\SearchableText;
18+
use Laravelwebdev\Filepond\Filepond;
1919

2020
class DaftarSp2d extends Resource
2121
{

Diff for: app/Nova/Dashboards/Main.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
use App\Helpers\Helper;
66
use App\Helpers\Inspiring;
7-
use DigitalCreative\NovaWelcomeCard\WelcomeCard;
87
use Illuminate\Support\Facades\Auth;
98
use Illuminate\Support\Facades\Storage;
109
use Laravel\Nova\Dashboards\Main as Dashboard;
11-
use Orion\NovaGreeter\GreeterCard;
10+
use Laravelwebdev\Greeter\Greeter;
11+
use Laravelwebdev\Welcome\Welcome;
1212

1313
class Main extends Dashboard
1414
{
@@ -34,18 +34,18 @@ public function cards()
3434
}, session('role'));
3535

3636
return [
37-
GreeterCard::make()
37+
Greeter::make()
3838
->user(name: Auth::user()->name, title: Auth::user()->email)
3939
->message(text: __('Welcome Back!'))
4040
->avatar(url: Storage::disk('avatars')->url(Auth::user()->avatar))
4141
->verified(text: implode(', ', $values))
4242
->width('1/2'),
43-
GreeterCard::make()
43+
Greeter::make()
4444
->user(name: 'Quotes of the day', title: Inspiring::show())
4545
->message(text: '')
4646
->avatar(url: Storage::disk('images')->url('quotes.svg'))
4747
->width('1/2'),
48-
WelcomeCard::make()
48+
Welcome::make()
4949
->title('Permulaan') // optional
5050
->description('Selamat datang di Aplikasi Simpede. Berikut adalah fitur-fitur yang tersedia:') // optional
5151
->addItem(icon: 'document-text', title: 'Pengelolaan Kerangka Acuan Kerja', content: 'Fitur yang disediakan untuk membuat Kerangka Acuan Kerja yang dapat diunduh dalam format Microsoft Word dan mengarsipkan softcopy berkas-berkas terkait Kerangka Acuan Kerja.')

Diff for: app/Nova/DataPegawai.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,6 @@ public function actions(NovaRequest $request)
130130
*/
131131
public static function redirectAfterUpdate(NovaRequest $request, $resource)
132132
{
133-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail=data-pegawai' : '/'.'resources'.'/'.'users'.'/';
133+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'users'.'/';
134134
}
135135
}

Diff for: app/Nova/DerajatNaskah.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,6 @@ public function actions(NovaRequest $request)
118118
*/
119119
public static function redirectAfterUpdate(NovaRequest $request, $resource)
120120
{
121-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail%20Naskah=derajat-naskah' : '/'.'resources'.'/'.'tata-naskahs'.'/';
121+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'tata-naskahs'.'/';
122122
}
123123
}

Diff for: app/Nova/Dipa.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@
1313
use Laravel\Nova\Fields\Select;
1414
use Laravel\Nova\Fields\Text;
1515
use Laravel\Nova\Http\Requests\NovaRequest;
16-
use ShuvroRoy\NovaTabs\Tabs;
17-
use ShuvroRoy\NovaTabs\Traits\HasTabs;
16+
use Laravel\Nova\Tabs\Tab;
1817

1918
class Dipa extends Resource
2019
{
21-
use HasTabs;
2220

2321
public static function label()
2422
{
@@ -85,7 +83,7 @@ public function fields(NovaRequest $request)
8583
Date::make('Tanggal Data realisasi', 'tanggal_realisasi')
8684
->displayUsing(fn ($tanggal) => Helper::terbilangTanggal($tanggal))
8785
->exceptOnForms(),
88-
Tabs::make('Anggaran dan Target Serapan', [
86+
Tab::group('Anggaran dan Target Serapan', [
8987
HasMany::make('Mata Anggaran'),
9088
HasMany::make('Jenis Belanja'),
9189
]),

Diff for: app/Nova/DokumentasiKegiatan.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
namespace App\Nova;
44

55
use App\Helpers\Helper;
6-
use DigitalCreative\Filepond\Filepond;
76
use Illuminate\Http\Request;
87
use Illuminate\Support\Str;
98
use Laravel\Nova\Fields\Boolean;
109
use Laravel\Nova\Fields\Date;
1110
use Laravel\Nova\Fields\FormData;
1211
use Laravel\Nova\Fields\Text;
1312
use Laravel\Nova\Http\Requests\NovaRequest;
13+
use Laravelwebdev\Filepond\Filepond;
1414

1515
class DokumentasiKegiatan extends Resource
1616
{

Diff for: app/Nova/HonorKegiatan.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,10 @@
2727
use Laravel\Nova\Http\Requests\ActionRequest;
2828
use Laravel\Nova\Http\Requests\NovaRequest;
2929
use Laravel\Nova\Panel;
30-
use ShuvroRoy\NovaTabs\Tabs;
31-
use ShuvroRoy\NovaTabs\Traits\HasTabs;
30+
use Laravel\Nova\Tabs\Tab;
3231

3332
class HonorKegiatan extends Resource
3433
{
35-
use HasTabs;
36-
3734
public static $with = ['kerangkaAcuan.naskahKeluar', 'daftarHonorMitra', 'skNaskahKeluar', 'stNaskahKeluar', 'daftarHonorPegawai', 'jenisKontrak', 'mataAnggaran'];
3835

3936
/**
@@ -324,7 +321,7 @@ public function fields(NovaRequest $request)
324321
$field->options(Helper::setOptionPengelola('bendahara', Helper::createDateFromString($formData->tanggal_spj)));
325322
}),
326323
]),
327-
Tabs::make('Daftar Honor', [
324+
Tab::group('Daftar Honor', [
328325
HasMany::make('Daftar Honor Mitra'),
329326
HasMany::make('Daftar Honor Pegawai'),
330327
]),

Diff for: app/Nova/IzinKeluar.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use App\Helpers\Helper;
66
use Carbon\Carbon;
7-
use DigitalCreative\Filepond\Filepond;
87
use Illuminate\Http\Request;
98
use Illuminate\Support\Str;
109
use Laravel\Nova\Fields\BelongsTo;
@@ -13,7 +12,8 @@
1312
use Laravel\Nova\Fields\Text;
1413
use Laravel\Nova\Http\Requests\NovaRequest;
1514
use Laravel\Nova\Panel;
16-
use Oneduo\NovaTimeField\Time;
15+
use Laravelwebdev\Filepond\Filepond;
16+
use Laravelwebdev\Time\Time;
1717

1818
class IzinKeluar extends Resource
1919
{

Diff for: app/Nova/JenisNaskah.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
use App\Helpers\Policy;
66
use App\Nova\Actions\AddHasManyModel;
7-
use DigitalCreative\Filepond\Filepond;
87
use Illuminate\Support\Facades\Storage;
98
use Laravel\Nova\Fields\Text;
109
use Laravel\Nova\Fields\URL;
1110
use Laravel\Nova\Http\Requests\NovaRequest;
11+
use Laravelwebdev\Filepond\Filepond;
1212

1313
class JenisNaskah extends Resource
1414
{

Diff for: app/Nova/KerangkaAcuan.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@
2525
use Laravel\Nova\Http\Requests\NovaRequest;
2626
use Laravel\Nova\Panel;
2727
use Laravel\Nova\Query\Search\SearchableText;
28-
use ShuvroRoy\NovaTabs\Tabs;
29-
use ShuvroRoy\NovaTabs\Traits\HasTabs;
28+
use Laravel\Nova\Tabs\Tab;
3029

3130
class KerangkaAcuan extends Resource
3231
{
33-
use HasTabs;
34-
3532
public static $with = ['unitKerja', 'naskahKeluar', 'arsipDokumen', 'anggaranKerangkaAcuan', 'spesifikasiKerangkaAcuan', 'daftarSp2d'];
3633

3734
public static function label()
@@ -136,7 +133,7 @@ public function fields(NovaRequest $request)
136133
})
137134
->onlyOnDetail(),
138135
BelongsToMany::make('SP2D', 'daftarSp2d', 'App\Nova\DaftarSp2d'),
139-
Tabs::make('Detail', [
136+
Tab::group('Detail', [
140137
HasMany::make('Anggaran', 'anggaranKerangkaAcuan', 'App\Nova\AnggaranKerangkaAcuan'),
141138
HasMany::make('Spesifikasi', 'spesifikasiKerangkaAcuan', 'App\Nova\SpesifikasiKerangkaAcuan'),
142139
HasMany::make('Arsip Dokumen', 'arsipDokumen', 'App\Nova\ArsipDokumen'),

Diff for: app/Nova/KodeArsip.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ public function actions(NovaRequest $request)
131131
*/
132132
public static function redirectAfterUpdate(NovaRequest $request, $resource)
133133
{
134-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail%20Naskah=kode-arsip' : '/'.'resources'.'/'.'tata-naskahs'.'/';
134+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'tata-naskahs'.'/';
135135
}
136136
}

Diff for: app/Nova/KodeNaskah.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,6 @@ public function actions(NovaRequest $request)
129129
*/
130130
public static function redirectAfterUpdate(NovaRequest $request, $resource)
131131
{
132-
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId.'#Detail%20Naskah=kode-naskah' : '/'.'resources'.'/'.'tata-naskahs'.'/';
132+
return $request->viaResource ? '/'.'resources'.'/'.$request->viaResource.'/'.$request->viaResourceId : '/'.'resources'.'/'.'tata-naskahs'.'/';
133133
}
134134
}

Diff for: app/Nova/KontrakMitra.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use App\Models\NaskahDefault;
99
use App\Nova\Actions\GenerateKontrakMitra;
1010
use App\Nova\Filters\StatusFilter;
11-
use DigitalCreative\Filepond\Filepond;
1211
use Illuminate\Http\Request;
1312
use Illuminate\Support\Facades\Storage;
1413
use Laravel\Nova\Fields\BelongsTo;
@@ -21,6 +20,7 @@
2120
use Laravel\Nova\Fields\URL;
2221
use Laravel\Nova\Http\Requests\NovaRequest;
2322
use Laravel\Nova\Panel;
23+
use Laravelwebdev\Filepond\Filepond;
2424

2525
class KontrakMitra extends Resource
2626
{

Diff for: app/Nova/Lenses/PemeliharaanBarang.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Laravel\Nova\Http\Requests\LensRequest;
1515
use Laravel\Nova\Http\Requests\NovaRequest;
1616
use Laravel\Nova\Lenses\Lens;
17-
use Orion\NovaGreeter\GreeterCard;
17+
use Laravelwebdev\Greeter\Greeter;
1818

1919
class PemeliharaanBarang extends Lens
2020
{
@@ -127,17 +127,17 @@ public function fields(NovaRequest $request)
127127
public function cards(NovaRequest $request)
128128
{
129129
return [
130-
GreeterCard::make()
130+
Greeter::make()
131131
->user($this->getJumlahBarang().' Barang')
132132
->message(text: 'Inventori')
133133
->avatar(url: Storage::disk('images')->url('bar-chart.svg'))
134134
->width('1/3'),
135-
GreeterCard::make()
135+
Greeter::make()
136136
->user($this->getJumlahBarangDipelihara().' Barang')
137137
->message(text: 'Barang Dipelihara')
138138
->avatar(url: Storage::disk('images')->url('bar-chart.svg'))
139139
->width('1/3'),
140-
GreeterCard::make()
140+
Greeter::make()
141141
->user($this->getJumlahPemeliharaan().' Kegiatan')
142142
->message(text: 'Kegiatan Pemeliharaan')
143143
->avatar(url: Storage::disk('images')->url('bar-chart.svg'))

0 commit comments

Comments
 (0)