Progress
This commit is contained in:
parent
b21902fc9a
commit
8900503556
|
|
@ -4,20 +4,15 @@ namespace App\Http\Controllers\Tabulation;
|
|||
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Models\Audition;
|
||||
use App\Models\Entry;
|
||||
use App\Models\ScoreSheet;
|
||||
use App\Services\DoublerService;
|
||||
use App\Services\TabulationService;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Session;
|
||||
|
||||
use function compact;
|
||||
use function dd;
|
||||
use function dump;
|
||||
use function redirect;
|
||||
|
||||
class TabulationController extends Controller
|
||||
{
|
||||
protected $tabulationService;
|
||||
|
||||
protected $doublerService;
|
||||
|
||||
public function __construct(TabulationService $tabulationService, DoublerService $doublerService)
|
||||
|
|
@ -26,18 +21,17 @@ class TabulationController extends Controller
|
|||
$this->doublerService = $doublerService;
|
||||
}
|
||||
|
||||
|
||||
public function status()
|
||||
{
|
||||
$auditions = $this->tabulationService->getAuditionsWithStatus();
|
||||
return view('tabulation.status',compact('auditions'));
|
||||
|
||||
return view('tabulation.status', compact('auditions'));
|
||||
}
|
||||
|
||||
public function auditionSeating(Audition $audition)
|
||||
{
|
||||
$entries = $this->tabulationService->auditionEntries($audition->id);
|
||||
$entries = $this->tabulationService->auditionEntries($audition->id);
|
||||
|
||||
return view('tabulation.auditionSeating',compact('audition','entries'));
|
||||
return view('tabulation.auditionSeating', compact('audition', 'entries'));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,18 +3,18 @@
|
|||
namespace App\Services;
|
||||
|
||||
use App\Models\Entry;
|
||||
use App\Models\ScoreSheet;
|
||||
use App\Models\User;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Illuminate\Support\Facades\Session;
|
||||
|
||||
|
||||
class TabulationService
|
||||
{
|
||||
protected AuditionCacheService $auditionCacheService;
|
||||
|
||||
protected EntryCacheService $entryCacheService;
|
||||
|
||||
protected ScoreService $scoreService;
|
||||
|
||||
/**
|
||||
* Create a new class instance.
|
||||
*/
|
||||
|
|
@ -30,23 +30,24 @@ class TabulationService
|
|||
|
||||
/**
|
||||
* Returns the rank of the entry in its audition
|
||||
* @param Entry $entry
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function entryRank(Entry $entry) {
|
||||
public function entryRank(Entry $entry)
|
||||
{
|
||||
return $this->auditionEntries($entry->audition_id)[$entry->id]->rank;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a collection of entries including their calculated final_score_array and ranked
|
||||
* based upon their scores.
|
||||
* @param Int $auditionId
|
||||
*
|
||||
* @return \Illuminate\Support\Collection|mixed
|
||||
*/
|
||||
public function auditionEntries(Int $auditionId)
|
||||
public function auditionEntries(int $auditionId)
|
||||
{
|
||||
static $cache = [];
|
||||
if(isset($cache[$auditionId])) {
|
||||
if (isset($cache[$auditionId])) {
|
||||
return $cache[$auditionId];
|
||||
}
|
||||
|
||||
|
|
@ -56,7 +57,7 @@ class TabulationService
|
|||
|
||||
foreach ($entries as $entry) {
|
||||
$entry->final_score_array = $this->scoreService->entryTotalScores($entry);
|
||||
$entry->scoring_complete = $this->scoreService->entryScoreSheetCounts()[$entry->id] ?? 0 == $audition->judges_count;
|
||||
$entry->scoring_complete = $this->scoreService->entryScoreSheetCounts()[$entry->id] ?? $audition->judges_count == 0;
|
||||
}
|
||||
// Sort the array $entries by the first element in the final_score_array on each entry, then by the second element in that array continuing through each element in the final_score_array for each entry
|
||||
$entries = $entries->sort(function ($a, $b) {
|
||||
|
|
@ -65,41 +66,51 @@ class TabulationService
|
|||
return $b->final_score_array[$i] > $a->final_score_array[$i] ? 1 : -1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
});
|
||||
|
||||
//TODO verify this actually sorts by subscores correctly
|
||||
$n = 1;
|
||||
/** @var Entry $entry */
|
||||
foreach ($entries as $entry) {
|
||||
$entry->rank = $n;
|
||||
$n++;
|
||||
if (! $entry->hasFlag('declined')) {
|
||||
$entry->rank = $n;
|
||||
$n++;
|
||||
} else {
|
||||
$entry->rank = 'declined';
|
||||
}
|
||||
}
|
||||
$cache[$auditionId] = $entries->keyBy('id');
|
||||
|
||||
return $entries->keyBy('id');
|
||||
}
|
||||
|
||||
|
||||
public function entryScoreSheetsAreValid(Entry $entry): bool {
|
||||
public function entryScoreSheetsAreValid(Entry $entry): bool
|
||||
{
|
||||
//TODO consider making this move the invalid score to another database for further investigation
|
||||
$validJudges = $this->auditionCacheService->getAudition($entry->audition_id)->judges;
|
||||
foreach ($entry->scoreSheets as $sheet) {
|
||||
if (! $validJudges->contains($sheet->user_id)) {
|
||||
$invalidJudge = User::find($sheet->user_id);
|
||||
Session::flash('error','Invalid scores for entry ' . $entry->id . ' exist from ' . $invalidJudge->full_name());
|
||||
Session::flash('error', 'Invalid scores for entry '.$entry->id.' exist from '.$invalidJudge->full_name());
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the number of un-scored entries for the audition with the given ID.
|
||||
* @param $auditionId
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function remainingEntriesForAudition($auditionId)
|
||||
{
|
||||
$audition = $this->getAuditionsWithStatus()[$auditionId];
|
||||
|
||||
return $audition->entries_count - $audition->scored_entries_count;
|
||||
}
|
||||
|
||||
|
|
@ -107,26 +118,28 @@ class TabulationService
|
|||
* Get the array of all auditions from the cache. For each one, set a property
|
||||
* scored_entries_count that indicates the number of entries for that audition that
|
||||
* have a number of score sheets equal to the number of judges for that audition.
|
||||
*
|
||||
* @return mixed
|
||||
*/
|
||||
public function getAuditionsWithStatus()
|
||||
{
|
||||
return Cache::remember('auditionsWithStatus',30,function() {
|
||||
return Cache::remember('auditionsWithStatus', 30, function () {
|
||||
|
||||
// Retrieve auditions from the cache and load entry IDs
|
||||
$auditions = $this->auditionCacheService->getAuditions();
|
||||
|
||||
// Iterate over the auditions and calculate the scored_entries_count
|
||||
foreach($auditions as $audition) {
|
||||
foreach ($auditions as $audition) {
|
||||
$scored_entries_count = 0;
|
||||
foreach ($this->entryCacheService->getEntriesForAudition($audition->id) as $entry) {
|
||||
if ($this->scoreService->entryScoreSheetCounts()[$entry->id] ?? 0 == $audition->judges_count) {
|
||||
if ($this->scoreService->entryScoreSheetCounts()[$entry->id] ?? $audition->judges_count == 0) {
|
||||
$scored_entries_count++;
|
||||
}
|
||||
}
|
||||
|
||||
$audition->scored_entries_count = $scored_entries_count;
|
||||
}
|
||||
|
||||
return $auditions;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,48 +2,49 @@
|
|||
<x-layout.app>
|
||||
<x-slot:page_title>Audition Seating - {{ $audition->name }}</x-slot:page_title>
|
||||
|
||||
<x-table.table>
|
||||
<thead>
|
||||
<tr>
|
||||
<x-table.th>Rank</x-table.th>
|
||||
<x-table.th>ID</x-table.th>
|
||||
<x-table.th>Draw #</x-table.th>
|
||||
<x-table.th>Student Name</x-table.th>
|
||||
<x-table.th>Doubler</x-table.th>
|
||||
{{-- @foreach($judges as $judge)--}}
|
||||
{{-- <x-table.th>{{ $judge->short_name() }}</x-table.th>--}}
|
||||
{{-- @endforeach--}}
|
||||
<x-table.th>Total Score</x-table.th>
|
||||
<x-table.th>All Scores?</x-table.th>
|
||||
</tr>
|
||||
</thead>
|
||||
<x-card.card class="px-3">
|
||||
<x-table.table>
|
||||
<thead>
|
||||
<tr>
|
||||
<x-table.th>Rank</x-table.th>
|
||||
<x-table.th>ID</x-table.th>
|
||||
<x-table.th>Draw #</x-table.th>
|
||||
<x-table.th>Student Name</x-table.th>
|
||||
<x-table.th>Doubler</x-table.th>
|
||||
{{-- @foreach($judges as $judge)--}}
|
||||
{{-- <x-table.th>{{ $judge->short_name() }}</x-table.th>--}}
|
||||
{{-- @endforeach--}}
|
||||
<x-table.th>Total Score</x-table.th>
|
||||
<x-table.th>All Scores?</x-table.th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
||||
<x-table.body>
|
||||
@foreach($entries as $entry)
|
||||
<tr>
|
||||
<x-table.td>{{ $entry->rank }}</x-table.td>
|
||||
<x-table.td>{{ $entry->id }}</x-table.td>
|
||||
<x-table.td>{{ $entry->draw_number }}</x-table.td>
|
||||
<x-table.td>
|
||||
<span>{{ $entry->student->full_name() }}, </span>
|
||||
<span class="text-xs text-gray-400">{{ $entry->student->school->name }}</span>
|
||||
</x-table.td>
|
||||
<x-table.td>
|
||||
@if($doublerService->studentIsDoubler($entry->student_id))
|
||||
<x-doubler-block :doublerEntryInfo="$doublerService->getDoublerInfo($entry->student_id)" />
|
||||
@endif
|
||||
|
||||
{{-- @if($entry->is_doubler)--}}
|
||||
{{-- <x-doubler-block :studentID="$entry->student->id" />--}}
|
||||
{{-- @endif--}}
|
||||
</x-table.td>
|
||||
<x-table.td>{{ number_format($entry->final_score_array[0] ?? 0,4) }}</x-table.td>
|
||||
<x-table.td>@if($entry->scoring_complete) <x-icons.checkmark color="green" /> @endif</x-table.td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</x-table.body>
|
||||
</x-table.table>
|
||||
<x-table.body>
|
||||
@foreach($entries as $entry)
|
||||
<tr>
|
||||
<x-table.td>{{ $entry->rank }}</x-table.td>
|
||||
<x-table.td>{{ $entry->id }}</x-table.td>
|
||||
<x-table.td>{{ $entry->draw_number }}</x-table.td>
|
||||
<x-table.td>
|
||||
<span>{{ $entry->student->full_name() }}, </span>
|
||||
<span class="text-xs text-gray-400">{{ $entry->student->school->name }}</span>
|
||||
</x-table.td>
|
||||
<x-table.td>
|
||||
@if($doublerService->studentIsDoubler($entry->student_id))
|
||||
<x-doubler-block :doublerEntryInfo="$doublerService->getDoublerInfo($entry->student_id)" />
|
||||
@endif
|
||||
|
||||
{{-- @if($entry->is_doubler)--}}
|
||||
{{-- <x-doubler-block :studentID="$entry->student->id" />--}}
|
||||
{{-- @endif--}}
|
||||
</x-table.td>
|
||||
<x-table.td>{{ number_format($entry->final_score_array[0] ?? 0,4) }}</x-table.td>
|
||||
<x-table.td>@if($entry->scoring_complete) <x-icons.checkmark color="green" /> @endif</x-table.td>
|
||||
</tr>
|
||||
@endforeach
|
||||
</x-table.body>
|
||||
</x-table.table>
|
||||
</x-card.card>
|
||||
|
||||
|
||||
</x-layout.app>
|
||||
|
|
|
|||
Loading…
Reference in New Issue