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

Auditionadmin 20 - Bonus scores are fully functional #25

Merged
okorpheus merged 16 commits from auditionadmin-20 into master 2024-07-16 08:04:08 +00:00
Conversation 0 Commits 16 Files Changed 51 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cd877db36c - Show all commits

2
app/Http/Controllers/Admin/BonusScoreDefinitionController.php
View File

@ -84,7 +84,7 @@ class BonusScoreDefinitionController extends Controller
public function judges() public function judges()
{ {
$bonusScores = BonusScoreDefinition::all(); $bonusScores = BonusScoreDefinition::all();
$users = User::all(); $users = User::orderBy('last_name')->orderBy('first_name')->get();
return view('admin.bonus-scores.judge-assignments', compact('bonusScores', 'users')); return view('admin.bonus-scores.judge-assignments', compact('bonusScores', 'users'));
} }

2
app/Models/User.php
View File

@ -129,7 +129,7 @@ class User extends Authenticatable implements MustVerifyEmail
public function isJudge(): bool public function isJudge(): bool
{ {
return $this->judgingAssignments()->count() > 0; return $this->judgingAssignments()->count() > 0 || $this->bonusJudgingAssignments()->count() > 0;
} }
/** /**