Skip to content

Commit de0106b

Browse files
Refactor indexQuery method in DokumentasiKegiatan and IzinKeluar to set default ordering when no orderBy parameter is provided
1 parent d0012b4 commit de0106b

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

app/Nova/DokumentasiKegiatan.php

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,14 +131,18 @@ public function actions(NovaRequest $request)
131131
return [];
132132
}
133133

134-
/**
135-
* Build an "index" query for the given resource.
136-
*
137-
* @param \Illuminate\Database\Eloquent\Builder $query
138-
* @return \Illuminate\Database\Eloquent\Builder
139-
*/
134+
public static $indexDefaultOrder = [
135+
'tanggal' => 'desc',
136+
];
137+
140138
public static function indexQuery(NovaRequest $request, $query)
141139
{
140+
if (empty($request->get('orderBy'))) {
141+
$query->getQuery()->orders = [];
142+
143+
return $query->orderBy(key(static::$indexDefaultOrder), reset(static::$indexDefaultOrder));
144+
}
145+
142146
return $query->whereYear('tanggal', session('year'));
143147
}
144148
}

app/Nova/IzinKeluar.php

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,20 @@ public function subtitle()
5757
'kegiatan', 'tanggal', 'user.name',
5858
];
5959

60-
/**
61-
* Build an "index" query for the given resource.
62-
*
63-
* @param \Illuminate\Database\Eloquent\Builder $query
64-
* @return \Illuminate\Database\Eloquent\Builder
65-
*/
60+
public static $indexDefaultOrder = [
61+
'tanggal' => 'desc',
62+
'keluar' => 'desc',
63+
];
64+
6665
public static function indexQuery(NovaRequest $request, $query)
6766
{
68-
$query->whereYear('tanggal', session('year'));
67+
if (empty($request->get('orderBy'))) {
68+
$query->getQuery()->orders = [];
69+
70+
return $query->orderBy(key(static::$indexDefaultOrder), reset(static::$indexDefaultOrder));
71+
}
72+
73+
return $query->whereYear('tanggal', session('year'));
6974
}
7075

7176
/**

0 commit comments

Comments
 (0)