diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index 3e04766..8ece8e6 100644 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -2,10 +2,6 @@ namespace App\Http\Controllers; -use App\Actions\Entries\GetEntrySeatingResult; -use App\Actions\Tabulation\CalculateEntryScore; -use App\Actions\Tabulation\RankAuditionEntries; -use App\Models\AuditionFlag; use App\Models\School; use App\Services\Invoice\InvoiceDataService; use Illuminate\Support\Facades\Auth; @@ -28,33 +24,8 @@ class DashboardController extends Controller } public function dashboard( - CalculateEntryScore $scoreCalc, - GetEntrySeatingResult $resultGenerator, - RankAuditionEntries $ranker ) { - - // Info for director results report - $entries = Auth::user()->entries; - $entries = $entries->filter(function ($entry) { - return $entry->audition->hasFlag('seats_published'); - }); - $entries = $entries->sortBy(function ($entry) { - return $entry->student->full_name(true); - }); - $scores = []; - $results = []; - $ranks = []; - foreach ($entries as $entry) { - $results[$entry->id] = $resultGenerator->getResult($entry); - if (! $entry->hasFlag('no_show') && ! $entry->hasFlag('failed_prelim')) { - $scores[$entry->id] = $scoreCalc->calculate('seating', $entry); - $auditionResults = $ranker->rank('seating', $entry->audition); - $ranks[$entry->id] = $auditionResults->firstWhere('id', $entry->id)->raw_rank; - } - } - $showRecapLink = AuditionFlag::where('flag_name', 'seats_published')->count() > 0; - - return view('dashboard.dashboard', compact('entries', 'scores', 'results', 'ranks', 'showRecapLink')); + return view('dashboard.dashboard'); // return view('dashboard.dashboard'); } diff --git a/app/Http/Controllers/Tabulation/SeatAuditionFormController.php b/app/Http/Controllers/Tabulation/SeatAuditionFormController.php index a01e3ed..5a0411f 100644 --- a/app/Http/Controllers/Tabulation/SeatAuditionFormController.php +++ b/app/Http/Controllers/Tabulation/SeatAuditionFormController.php @@ -7,6 +7,7 @@ use App\Actions\Tabulation\RankAuditionEntries; use App\Http\Controllers\Controller; use App\Models\Audition; use App\Models\Doubler; +use App\Models\Entry; use Illuminate\Http\Request; class SeatAuditionFormController extends Controller @@ -66,6 +67,14 @@ class SeatAuditionFormController extends Controller ); } + public function declineSeat(Audition $audition, Entry $entry) + { + $entry->addFlag('declined'); + + return redirect()->route('seating.audition', ['audition' => $audition->id])->with('success', + $entry->student->full_name().' has declined '.$audition->name); + } + protected function pickRightPanel(Audition $audition, array $seatable) { if ($audition->hasFlag('seats_published')) { diff --git a/resources/views/dashboard/dashboard.blade.php b/resources/views/dashboard/dashboard.blade.php index 7eda747..cf0a19c 100644 --- a/resources/views/dashboard/dashboard.blade.php +++ b/resources/views/dashboard/dashboard.blade.php @@ -27,24 +27,24 @@ @endif - @if($showRecapLink) - - - Audition Score Recaps - - - @endif +{{-- @if($showRecapLink)--}} +{{-- --}} +{{-- --}} +{{-- Audition Score Recaps--}} +{{-- --}} +{{-- --}} +{{-- @endif--}} - @if(Auth::user()->school_id) -
- - My Results - @include('dashboard.results-table') - -
- @endif +{{-- @if(Auth::user()->school_id)--}} +{{--
--}} +{{-- --}} +{{-- My Results--}} +{{-- @include('dashboard.results-table')--}} +{{-- --}} +{{--
--}} +{{-- @endif--}}
diff --git a/resources/views/tabulation/auditionSeating-doubler-block.blade.php b/resources/views/tabulation/auditionSeating-doubler-block.blade.php index 133b19a..e3c5a85 100644 --- a/resources/views/tabulation/auditionSeating-doubler-block.blade.php +++ b/resources/views/tabulation/auditionSeating-doubler-block.blade.php @@ -27,7 +27,9 @@ @endforeach
- Decline {{ $de->audition->name }} + + Decline {{ $de->audition->name }} +
@endif @endif diff --git a/resources/views/tabulation/auditionSeating.blade.php b/resources/views/tabulation/auditionSeating.blade.php index ba705b3..dd5c094 100644 --- a/resources/views/tabulation/auditionSeating.blade.php +++ b/resources/views/tabulation/auditionSeating.blade.php @@ -43,8 +43,18 @@ @elseif($entry->hasFlag('declined')) DECLINED @else - UNDECIDED + @if($request = $entry->student->doublerRequests()->where('event_id',$entry->audition->event_id)->first()) +
{{-- Begin block seating request --}} +
+ Request +
+
+

{{ $request->request }}

+
+
+ + @endif @foreach($entry->student->entriesForEvent($entry->audition->event_id) as $de) @include('tabulation.auditionSeating-doubler-block') @endforeach diff --git a/routes/tabulation.php b/routes/tabulation.php index 274f631..2633ad6 100644 --- a/routes/tabulation.php +++ b/routes/tabulation.php @@ -43,6 +43,7 @@ Route::middleware(['auth', 'verified', CheckIfCanTab::class])->group(function () Route::prefix('seating/')->group(function () { Route::get('/', SeatingStatusController::class)->name('seating.status'); Route::get('/{audition}', [SeatAuditionFormController::class, 'showForm'])->name('seating.audition'); + Route::post('/{audition}/{entry}/decline', [SeatAuditionFormController::class, 'declineSeat'])->name('seating.audition.decline'); Route::post('/{audition}/publish', [SeatingPublicationController::class, 'publishSeats'])->name('seating.audition.publish'); Route::post('/{audition}/unpublish',