test new pages

This commit is contained in:
2026-04-16 15:50:03 -04:00
parent 330e210fde
commit e7c539e4ef
5 changed files with 182 additions and 25 deletions
+25 -25
View File
@@ -118,52 +118,52 @@ class TabulateWinners extends Command
return $zeroTo43Query->vehicle;
}
function fortyThreeToSixtyEightWinner()
function fortyThreeToSixtyNineWinner()
{
$fortyThreeToSixtyEightQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
$fortyThreeToSixtyNineQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
->groupBy('vehicles.id')
->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
->whereNotIn('vehicle_scores.vehicle', function($query){
$query->select('vehicle')->from('car_show_winners');
})
->where('vehicles.year', '>=', 1943)
->where('vehicles.year', '<=', 1968)
->where('vehicles.year', '<=', 1969)
->where('vehicles.doNotJudge', '=', 0)
->orderBy('totalscore','desc')
->first();
return $fortyThreeToSixtyEightQuery->vehicle;
return $fortyThreeToSixtyNineQuery->vehicle;
}
function sixtyNineToNinetyNineWinner()
function seventyToTwoThousandWinner()
{
$sixtyNineToNinetyNineQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
$seventyToTwoThousandQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
->groupBy('vehicles.id')
->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
->whereNotIn('vehicle_scores.vehicle', function($query){
$query->select('vehicle')->from('car_show_winners');
})
->where('vehicles.year', '>=', 1969)
->where('vehicles.year', '<=', 1999)
->where('vehicles.year', '>=', 1970)
->where('vehicles.year', '<=', 2000)
->where('vehicles.doNotJudge', '=', 0)
->orderBy('totalscore','desc')
->first();
return $sixtyNineToNinetyNineQuery->vehicle;
return $seventyToTwoThousandQuery->vehicle;
}
function TwoThousandToCurrentWinner()
function TwoThousandOneToCurrentWinner()
{
$TwoThousandToCurrentQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
$TwoThousandOneToCurrentQuery = VehicleScores::join('vehicles', 'vehicle_scores.vehicle', '=', 'vehicles.id')
->groupBy('vehicles.id')
->selectRaw('*, sum(vehicle_scores.overall_score) as totalscore')
->whereNotIn('vehicle_scores.vehicle', function($query){
$query->select('vehicle')->from('car_show_winners');
})
->where('vehicles.year', '>=', 2000)
->where('vehicles.year', '>=', 2001)
//->where('vehicles.year', '<=', 1997)
->where('vehicles.doNotJudge', '=', 0)
->orderBy('totalscore','desc')
->first();
return $TwoThousandToCurrentQuery->vehicle;
return $TwoThousandOneToCurrentQuery->vehicle;
}
// Truncate table first
@@ -219,14 +219,14 @@ class TabulateWinners extends Command
'vehicle' => zeroTo42Winner()
]
);
//1943-1967
//1943-1969
CarShowWinner::updateOrCreate(
[
'category' => '18',
'place' => 'first'
],
[
'vehicle' => fortyThreeToSixtyEightWinner()
'vehicle' => fortyThreeToSixtyNineWinner()
]
);
CarShowWinner::updateOrCreate(
@@ -235,7 +235,7 @@ class TabulateWinners extends Command
'place' => 'second'
],
[
'vehicle' => fortyThreeToSixtyEightWinner()
'vehicle' => fortyThreeToSixtyNineWinner()
]
);
CarShowWinner::updateOrCreate(
@@ -244,18 +244,18 @@ class TabulateWinners extends Command
'place' => 'third'
],
[
'vehicle' => fortyThreeToSixtyEightWinner()
'vehicle' => fortyThreeToSixtyNineWinner()
]
);
//1968-1997
//1970-2000
CarShowWinner::updateOrCreate(
[
'category' => '20',
'place' => 'first'
],
[
'vehicle' => sixtyNineToNinetyNineWinner()
'vehicle' => seventyToTwoThousandWinner()
]
);
CarShowWinner::updateOrCreate(
@@ -264,7 +264,7 @@ class TabulateWinners extends Command
'place' => 'second'
],
[
'vehicle' => sixtyNineToNinetyNineWinner()
'vehicle' => seventyToTwoThousandWinner()
]
);
CarShowWinner::updateOrCreate(
@@ -273,18 +273,18 @@ class TabulateWinners extends Command
'place' => 'third'
],
[
'vehicle' => sixtyNineToNinetyNineWinner()
'vehicle' => seventyToTwoThousandWinner()
]
);
//1998-Current
//2001-Current
CarShowWinner::updateOrCreate(
[
'category' => '19',
'place' => 'first'
],
[
'vehicle' => TwoThousandToCurrentWinner()
'vehicle' => TwoThousandOneToCurrentWinner()
]
);
CarShowWinner::updateOrCreate(
@@ -293,7 +293,7 @@ class TabulateWinners extends Command
'place' => 'second'
],
[
'vehicle' => TwoThousandToCurrentWinner()
'vehicle' => TwoThousandOneToCurrentWinner()
]
);
CarShowWinner::updateOrCreate(
@@ -302,7 +302,7 @@ class TabulateWinners extends Command
'place' => 'third'
],
[
'vehicle' => TwoThousandToCurrentWinner()
'vehicle' => TwoThousandOneToCurrentWinner()
]
);
}