diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php index eb6530e..7314e33 100644 --- a/app/Http/Controllers/PagesController.php +++ b/app/Http/Controllers/PagesController.php @@ -374,15 +374,15 @@ class PagesController extends Controller ->orderBy('bidder_assigned_number') ->get(); return view('winningbidderlist', ['winning_bidders' => $winnerlist_results]); - } public function judgingentry(Request $judgingentry_req) { $judges = \App\Models\Judges::all(); - $vehicles = \App\Models\Vehicles::with('vehicleOwner') - ->join('bidders', 'vehicles.owner', '=', 'bidders.bidder_assigned_number') - ->orderByRaw('CAST(bidder_assigned_number AS UNSIGNED) ASC') + $vehicles = \App\Models\Vehicles::select('vehicles.*') + ->leftJoin('bidders', 'vehicles.owner', '=', 'bidders.bidder_assigned_number') + ->orderByRaw('CAST(bidders.bidder_assigned_number AS UNSIGNED) ASC') ->get(); - \Log::info("Judges count: " . $judges->count()); + + if ($judgingentry_req->isMethod('post')) { \Log::info("Vehicles count: " . $vehicles->count()); if ($judgingentry_req->isMethod('post')) { diff --git a/resources/views/components/tomselect.blade.php b/resources/views/components/tomselect.blade.php index 5035c54..b569ca7 100644 --- a/resources/views/components/tomselect.blade.php +++ b/resources/views/components/tomselect.blade.php @@ -39,14 +39,7 @@ dropdownParent: 'body', controlInput: '', maxOptions: null, - sortField: [{ - 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'}); - } - }] + sortField: [] // Respect server-side order }); }); };