Skip to content

Commit 9b61ae5

Browse files
committed
Remove filterable option from Pemegang field and enhance sorting capabilities in multiple lenses
1 parent 8bc35ff commit 9b61ae5

File tree

3 files changed

+21
-22
lines changed

3 files changed

+21
-22
lines changed

app/Nova/Lenses/PemeliharaanBarang.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ public function fields(NovaRequest $request)
113113
->readonly(),
114114
BelongsTo::make('Pemegang', 'user', 'App\Nova\User')
115115
->searchable()
116-
->filterable()
117116
->withSubtitles(),
118117
Number::make('Pemeliharaan', 'jumlah')
119118
->sortable(),

app/Nova/Lenses/RealisasiAnggaran.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ public static function query(LensRequest $request, $query)
6969
});
7070
})
7171
->where('mata_anggarans.dipa_id', $dipa_id)
72-
->groupBy('mak', 'item', 'id_mata_anggaran', 'blokir', 'total', 'ordered')
73-
->orderBy('mak')
74-
->orderBy('ordered'),
72+
->groupBy('mak', 'item', 'id_mata_anggaran', 'blokir', 'total', 'ordered'),
7573
'realisasi_anggarans')
76-
));
74+
), fn ($query) => $query->orderBy('mak')
75+
->orderBy('ordered'));
7776
}
7877

7978
/**
@@ -84,25 +83,30 @@ public static function query(LensRequest $request, $query)
8483
public function fields(NovaRequest $request)
8584
{
8685
return [
87-
Stack::make('RO/Komponen', [
86+
Stack::make('RO/Komponen', 'mak', [
8887
Line::make('RO', 'mak')
8988
->displayUsing(fn ($value) => Helper::getDetailAnggaran($value, 'ro'))->asSubTitle(),
9089
Line::make('Komponen', 'mak')
9190
->displayUsing(fn ($value) => Helper::getDetailAnggaran($value, 'komponen'))->asSmall(),
92-
]),
93-
Stack::make('Akun/Detil', [
91+
])->sortable(),
92+
Stack::make('Akun/Detil', 'mak', [
9493
Line::make('Akun', 'mak')
9594
->displayUsing(fn ($value) => Helper::getDetailAnggaran($value))->asSubTitle(),
9695
Line::make('Item', 'item')->asSmall(),
97-
]),
96+
])->sortable(),
9897
Number::make('Total', 'total')
98+
->sortable()
9999
->displayUsing(fn ($value) => Helper::formatUang($value)),
100100
Number::make('Realisasi', 'realisasi')
101+
->sortable()
101102
->displayUsing(fn ($value) => Helper::formatUang($value)),
102-
Number::make('% Realisasi', 'persen'),
103+
Number::make('% Realisasi', 'persen')
104+
->sortable(),
103105
Number::make('Blokir', 'blokir')
106+
->sortable()
104107
->displayUsing(fn ($value) => Helper::formatUang($value)),
105108
Number::make('Sisa', 'sisa')
109+
->sortable()
106110
->displayUsing(fn ($value) => Helper::formatUang($value)),
107111
URL::make('Detail', function () {
108112
$filter = base64_encode(

app/Nova/Lenses/RencanaPenarikanDana.php

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,9 @@ public static function query(LensRequest $request, $query)
5959
->whereMonth('tanggal_sp2d', $filtered_bulan);
6060
})
6161
->where('mata_anggarans.dipa_id', $dipa_id)
62-
63-
->groupBy('mak')
64-
->groupBy('ordered')
65-
->groupBy('item')
66-
->groupBy('target')
67-
->orderBy('mak')
68-
->orderBy('ordered'), 'realisasi_anggarans')
69-
));
62+
->groupBy('mak', 'ordered', 'item', 'target'), 'realisasi_anggarans')
63+
), fn ($query) => $query->orderBy('mak')
64+
->orderBy('ordered'));
7065
}
7166

7267
/**
@@ -77,20 +72,21 @@ public static function query(LensRequest $request, $query)
7772
public function fields(NovaRequest $request)
7873
{
7974
return [
80-
Stack::make('RO/Komponen', [
75+
Stack::make('RO/Komponen', 'mak', [
8176
Line::make('RO', 'mak')
8277
->displayUsing(fn ($value) => Helper::getDetailAnggaran($value, 'ro'))->asSubTitle(),
8378
Line::make('Komponen', 'mak')
8479
->displayUsing(fn ($value) => Helper::getDetailAnggaran($value, 'komponen'))->asSmall(),
85-
]),
86-
Stack::make('Akun/Detil', [
80+
])->sortabel(),
81+
Stack::make('Akun/Detil', 'mak', [
8782
Line::make('Akun', 'mak')
8883
->displayUsing(fn ($value) => Helper::getDetailAnggaran($value))->asSubTitle(),
8984
Line::make('Item', 'item')->asSmall(),
90-
]),
85+
])->sortable(),
9186
Number::make('Target', 'target')
9287
->displayUsing(fn ($value) => Helper::formatUang($value)),
9388
Number::make('Realisasi', 'realisasi')
89+
->sortable()
9490
->displayUsing(fn ($value) => Helper::formatUang($value)),
9591
Number::make('Deviasi', 'deviasi')
9692
->sortable()

0 commit comments

Comments
 (0)