diff --git a/app/Http/Controllers/Admin/StudentController.php b/app/Http/Controllers/Admin/StudentController.php index 9c0d9e3..0055604 100644 --- a/app/Http/Controllers/Admin/StudentController.php +++ b/app/Http/Controllers/Admin/StudentController.php @@ -7,6 +7,7 @@ use App\Models\Audition; use App\Models\AuditLogEntry; use App\Models\Entry; use App\Models\Event; +use App\Models\NominationEnsemble; use App\Models\School; use App\Models\Student; use Illuminate\Support\Facades\Auth; @@ -14,6 +15,8 @@ use Illuminate\Support\Facades\Auth; use function abort; use function auth; use function compact; +use function max; +use function min; use function request; use function to_route; use function view; @@ -54,8 +57,8 @@ class StudentController extends Controller if (! Auth::user()->is_admin) { abort(403); } - $minGrade = Audition::min('minimum_grade'); - $maxGrade = Audition::max('maximum_grade'); + $minGrade = min(Audition::min('minimum_grade'), NominationEnsemble::min('minimum_grade')); + $maxGrade = max(Audition::max('maximum_grade'), NominationEnsemble::max('maximum_grade')); $schools = School::orderBy('name')->get(); return view('admin.students.create', ['schools' => $schools, 'minGrade' => $minGrade, 'maxGrade' => $maxGrade]); @@ -105,8 +108,8 @@ class StudentController extends Controller if (! Auth::user()->is_admin) { abort(403); } - $minGrade = Audition::min('minimum_grade'); - $maxGrade = Audition::max('maximum_grade'); + $minGrade = min(Audition::min('minimum_grade'), NominationEnsemble::min('minimum_grade')); + $maxGrade = max(Audition::max('maximum_grade'), NominationEnsemble::max('maximum_grade')); $schools = School::orderBy('name')->get(); $student->loadCount('entries'); $entries = $student->entries; diff --git a/resources/views/students/index.blade.php b/resources/views/students/index.blade.php index b4c577a..5b9bd5f 100644 --- a/resources/views/students/index.blade.php +++ b/resources/views/students/index.blade.php @@ -1,4 +1,4 @@ -@php use App\Models\Audition;use Illuminate\Support\Facades\Auth; @endphp +@php use App\Models\Audition;use App\Models\NominationEnsemble;use Illuminate\Support\Facades\Auth; @endphp Students @@ -8,13 +8,13 @@ Add Student - + Grade - @php($n = Audition::min('minimum_grade')) - @php($maxGrade = Audition::max('maximum_grade')) + @php($n = min(Audition::min('minimum_grade'),NominationEnsemble::min('minimum_grade'))) + @php($maxGrade = max(Audition::max('maximum_grade'), NominationEnsemble::max('maximum_grade'))) @while($n <= $maxGrade) @php($n++); @@ -54,7 +54,7 @@ - + @foreach($students as $student) {{ $student->full_name(true) }} @@ -65,7 +65,8 @@ @if( $student->entries_count === 0) -
+ @csrf @method('DELETE')