diff --git a/app/Http/Controllers/PagesController.php b/app/Http/Controllers/PagesController.php index e641288..f89e1a0 100644 --- a/app/Http/Controllers/PagesController.php +++ b/app/Http/Controllers/PagesController.php @@ -502,7 +502,8 @@ class PagesController extends Controller public function awardcategories(Request $category_req) { if (!$category_req->category) { - return view('awardcategories'); + $categories = CarShowCategory::all(); + return view('awardcategories', ['categories' => $categories]); } $category = $category_req->category; if ($category_req->has('vehtype')) { diff --git a/app/Models/CarShowWinner.php b/app/Models/CarShowWinner.php index d3cb170..d31cfef 100644 --- a/app/Models/CarShowWinner.php +++ b/app/Models/CarShowWinner.php @@ -24,11 +24,11 @@ class CarShowWinner extends Model public function awardVehicle() { - return $this->hasMany('App\Models\Vehicles', 'id', 'vehicle'); + return $this->belongsTo('App\Models\Vehicles', 'vehicle', 'id'); } public function awardCategory() { - return $this->hasMany('App\Models\CarShowCategory', 'id', 'category'); + return $this->belongsTo('App\Models\CarShowCategory', 'category', 'id'); } } diff --git a/app/Models/VehicleScores.php b/app/Models/VehicleScores.php index 4d17177..338706b 100644 --- a/app/Models/VehicleScores.php +++ b/app/Models/VehicleScores.php @@ -30,6 +30,6 @@ class VehicleScores extends Model public function scoredVehicle() { - return $this->hasMany('App\Models\Vehicles', 'id', 'vehicle'); + return $this->belongsTo('App\Models\Vehicles', 'vehicle', 'id'); } } diff --git a/resources/views/awardcategories.blade.php b/resources/views/awardcategories.blade.php index 8690c7b..3168efc 100644 --- a/resources/views/awardcategories.blade.php +++ b/resources/views/awardcategories.blade.php @@ -26,7 +26,7 @@ @foreach($categories as $category) - {{ $category->cat_name }} + {{ $category->category_name }} @endforeach diff --git a/resources/views/carshowscores.blade.php b/resources/views/carshowscores.blade.php index acf06d3..078430f 100644 --- a/resources/views/carshowscores.blade.php +++ b/resources/views/carshowscores.blade.php @@ -21,16 +21,14 @@ Vehicle Name - Judge - Score + Total Score @foreach($scores_results as $score) - {{ $score->vehicles->make }} {{ $score->vehicles->model }} - {{ $score->judges->judge_name }} - {{ $score->score }} + {{ $score->scoredVehicle->make }} {{ $score->scoredVehicle->model }} + {{ $score->totalscore }} @endforeach diff --git a/resources/views/carshowwinners.blade.php b/resources/views/carshowwinners.blade.php index ea14afa..febfb78 100644 --- a/resources/views/carshowwinners.blade.php +++ b/resources/views/carshowwinners.blade.php @@ -26,7 +26,7 @@ @foreach($winners as $winner) - {{ $winner->awardCategory->cat_name }} + {{ $winner->awardCategory->category_name }} {{ $winner->awardVehicle->make }} {{ $winner->awardVehicle->model }} @endforeach