matt
/
auditionadmin
1
0
Fork 0
Code Issues 16 Pull Requests Packages Projects Releases Wiki Activity

Rewrite tabulation #14

Merged
okorpheus merged 43 commits from rewrite-tabulation into master 2024-07-14 05:36:29 +00:00
Conversation 0 Commits 43 Files Changed 101 +6 -14
8 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 120eaedeb5 - Show all commits

2
app/Actions/CalculateScoreSheetTotal.php → app/Actions/Tabulation/CalculateScoreSheetTotal.php
View File

@ -2,7 +2,7 @@
/** @noinspection PhpUnhandledExceptionInspection */ /** @noinspection PhpUnhandledExceptionInspection */
namespace App\Actions; namespace App\Actions\Tabulation;
use App\Exceptions\TabulationException; use App\Exceptions\TabulationException;
use App\Models\Entry; use App\Models\Entry;

2
app/Actions/EnterScore.php → app/Actions/Tabulation/EnterScore.php
View File

@ -4,7 +4,7 @@
/** @noinspection PhpMissingReturnTypeInspection */ /** @noinspection PhpMissingReturnTypeInspection */
namespace App\Actions; namespace App\Actions\Tabulation;
use App\Exceptions\ScoreEntryException; use App\Exceptions\ScoreEntryException;
use App\Models\Entry; use App\Models\Entry;

7
app/Services/ScoreService.php
View File

@ -21,11 +21,4 @@ class ScoreService
return $requiredJudges === $scoreSheets; return $requiredJudges === $scoreSheets;
} }
public function scoreSheetTotal(string $mode, User $judge, Entry $entry): float
{
}
} }

2
app/helpers.php
View File

@ -1,6 +1,6 @@
<?php <?php
use App\Actions\EnterScore; use App\Actions\Tabulation\EnterScore;
use App\Exceptions\ScoreEntryException; use App\Exceptions\ScoreEntryException;
use App\Models\Entry; use App\Models\Entry;
use App\Models\User; use App\Models\User;

2
tests/Feature/Actions/CalculateScoreSheetTotalTest.php
View File

@ -2,7 +2,7 @@
/** @noinspection PhpUnhandledExceptionInspection */ /** @noinspection PhpUnhandledExceptionInspection */
use App\Actions\CalculateScoreSheetTotal; use App\Actions\Tabulation\CalculateScoreSheetTotal;
use App\Exceptions\TabulationException; use App\Exceptions\TabulationException;
use App\Models\Entry; use App\Models\Entry;
use App\Models\Room; use App\Models\Room;

2
tests/Feature/Actions/EnterScoreTest.php
View File

@ -2,7 +2,7 @@
/** @noinspection PhpUnhandledExceptionInspection */ /** @noinspection PhpUnhandledExceptionInspection */
use App\Actions\EnterScore; use App\Actions\Tabulation\EnterScore;
use App\Exceptions\ScoreEntryException; use App\Exceptions\ScoreEntryException;
use App\Models\Entry; use App\Models\Entry;
use App\Models\Room; use App\Models\Room;

2
tests/Feature/Pages/EntriesIndexTest.php
View File

@ -48,7 +48,7 @@ it('has appropriate students in JS array for select', function () {
'id: ', 'id: ',
$student->id, $student->id,
'name: ', 'name: ',
$student->full_name(true), e($student->full_name(true)),
], false); // The false parameter makes the assertion case-sensitive and allows for HTML tags ], false); // The false parameter makes the assertion case-sensitive and allows for HTML tags
}); });

1
tests/Feature/Services/ScoreServiceTest.php
View File

@ -7,7 +7,6 @@ use App\Models\ScoreSheet;
use App\Models\User; use App\Models\User;
use App\Services\ScoreService; use App\Services\ScoreService;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use function Pest\Laravel\artisan;
uses(RefreshDatabase::class); uses(RefreshDatabase::class);