forked from TFMM/silent-auction
fix: restore natural sorting for vehicles by bidder assigned number
This commit is contained in:
@@ -374,15 +374,15 @@ class PagesController extends Controller
|
|||||||
->orderBy('bidder_assigned_number')
|
->orderBy('bidder_assigned_number')
|
||||||
->get();
|
->get();
|
||||||
return view('winningbidderlist', ['winning_bidders' => $winnerlist_results]);
|
return view('winningbidderlist', ['winning_bidders' => $winnerlist_results]);
|
||||||
}
|
|
||||||
public function judgingentry(Request $judgingentry_req)
|
public function judgingentry(Request $judgingentry_req)
|
||||||
{
|
{
|
||||||
$judges = \App\Models\Judges::all();
|
$judges = \App\Models\Judges::all();
|
||||||
$vehicles = \App\Models\Vehicles::with('vehicleOwner')
|
$vehicles = \App\Models\Vehicles::select('vehicles.*')
|
||||||
->join('bidders', 'vehicles.owner', '=', 'bidders.bidder_assigned_number')
|
->leftJoin('bidders', 'vehicles.owner', '=', 'bidders.bidder_assigned_number')
|
||||||
->orderByRaw('CAST(bidder_assigned_number AS UNSIGNED) ASC')
|
->orderByRaw('CAST(bidders.bidder_assigned_number AS UNSIGNED) ASC')
|
||||||
->get();
|
->get();
|
||||||
\Log::info("Judges count: " . $judges->count());
|
|
||||||
|
if ($judgingentry_req->isMethod('post')) {
|
||||||
\Log::info("Vehicles count: " . $vehicles->count());
|
\Log::info("Vehicles count: " . $vehicles->count());
|
||||||
|
|
||||||
if ($judgingentry_req->isMethod('post')) {
|
if ($judgingentry_req->isMethod('post')) {
|
||||||
|
|||||||
@@ -39,14 +39,7 @@
|
|||||||
dropdownParent: 'body',
|
dropdownParent: 'body',
|
||||||
controlInput: '<input>',
|
controlInput: '<input>',
|
||||||
maxOptions: null,
|
maxOptions: null,
|
||||||
sortField: [{
|
sortField: [] // Respect server-side order
|
||||||
field: 'text',
|
|
||||||
direction: 'asc',
|
|
||||||
func: function(a, b) {
|
|
||||||
// Natural sort for bidder/car numbers
|
|
||||||
return a.text.localeCompare(b.text, undefined, {numeric: true, sensitivity: 'base'});
|
|
||||||
}
|
|
||||||
}]
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user