diff --git a/app/Events/AuditionChange.php b/app/Events/AuditionChange.php index 9e7f1e4..b8aa81a 100644 --- a/app/Events/AuditionChange.php +++ b/app/Events/AuditionChange.php @@ -17,7 +17,7 @@ class AuditionChange /** * Create a new event instance. */ - public function __construct(bool $refreshCache = true) + public function __construct(bool $refreshCache = false) { $this->refreshCache = $refreshCache; } diff --git a/app/Http/Controllers/Admin/AuditionController.php b/app/Http/Controllers/Admin/AuditionController.php index d34d09e..d707a47 100644 --- a/app/Http/Controllers/Admin/AuditionController.php +++ b/app/Http/Controllers/Admin/AuditionController.php @@ -60,7 +60,6 @@ class AuditionController extends Controller 'minimum_grade' => $validData['minimum_grade'], 'maximum_grade' => $validData['maximum_grade'], ]); - AuditionChange::dispatch(false); return redirect('/admin/auditions'); } @@ -94,7 +93,6 @@ class AuditionController extends Controller 'minimum_grade' => $validData['minimum_grade'], 'maximum_grade' => $validData['maximum_grade'], ]); - AuditionChange::dispatch(false); return redirect('/admin/auditions'); } @@ -106,7 +104,6 @@ class AuditionController extends Controller $audition = Audition::find($id); $audition->update(['score_order' => $index]); } - AuditionChange::dispatch(false); return response()->json(['status' => 'success']); } @@ -121,7 +118,6 @@ class AuditionController extends Controller 'order_in_room' => $audition['room_order'] ]); } - AuditionChange::dispatch(false); return response()->json(['status' => 'success']); } @@ -137,7 +133,6 @@ class AuditionController extends Controller return response()->json(['success' => true]); } - AuditionChange::dispatch(false); return response()->json(['success' => false], 404); } @@ -149,7 +144,6 @@ class AuditionController extends Controller return redirect()->route('adminAuditionIndex')->with('error', 'Cannot delete an audition with entries.'); } $audition->delete(); - AuditionChange::dispatch(false); return redirect('/admin/auditions'); } diff --git a/app/Http/Controllers/Admin/RoomController.php b/app/Http/Controllers/Admin/RoomController.php index b05852d..d3509cc 100644 --- a/app/Http/Controllers/Admin/RoomController.php +++ b/app/Http/Controllers/Admin/RoomController.php @@ -49,7 +49,6 @@ class RoomController extends Controller } else { return redirect('/admin/rooms/judging_assignments')->with('error', 'Invalid request method.'); } - AuditionChange::dispatch(false); return redirect('/admin/rooms/judging_assignments')->with('success',$message); } diff --git a/app/Http/Controllers/Admin/ScoringGuideController.php b/app/Http/Controllers/Admin/ScoringGuideController.php index 01240f7..ef97ddf 100644 --- a/app/Http/Controllers/Admin/ScoringGuideController.php +++ b/app/Http/Controllers/Admin/ScoringGuideController.php @@ -38,7 +38,6 @@ class ScoringGuideController extends Controller 'name' => request('name') ]); - AuditionChange::dispatch(false); return redirect('/admin/scoring'); } @@ -65,7 +64,6 @@ class ScoringGuideController extends Controller $guide->update([ 'name' => request('name') ]); - AuditionChange::dispatch(false); return redirect('/admin/scoring/guides/' . $guide->id . '/edit' )->with('success','Scoring guide updated'); } @@ -97,7 +95,6 @@ class ScoringGuideController extends Controller 'for_seating' => $for_seating, 'for_advance' => $for_advance, ]); - AuditionChange::dispatch(false); return redirect('/admin/scoring/guides/' . $guide->id . '/edit' )->with('success','Subscore added'); } @@ -109,7 +106,6 @@ class ScoringGuideController extends Controller $subscore = SubscoreDefinition::find($id); $subscore->update(['display_order' => $index]); } - AuditionChange::dispatch(false); return response()->json(['status'=>'success']); } @@ -122,7 +118,6 @@ class ScoringGuideController extends Controller $subscore = SubscoreDefinition::find($id); $subscore->update(['tiebreak_order' => $index]); } - AuditionChange::dispatch(false); return response()->json(['status'=>'success']); } diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 0c96bdb..ab5a1a6 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -58,7 +58,6 @@ class UserController extends Controller 'judging_preference' => request('judging_preference'), 'school_id' => request('school_id') ]); - AuditionChange::dispatch(false); return redirect('/admin/users'); } diff --git a/app/Http/Controllers/EntryController.php b/app/Http/Controllers/EntryController.php index 2aa6201..fedfc6a 100644 --- a/app/Http/Controllers/EntryController.php +++ b/app/Http/Controllers/EntryController.php @@ -36,7 +36,6 @@ class EntryController extends Controller 'student_id' => request('student_id'), 'audition_id' => request('audition_id') ]); - AuditionChange::dispatch(); return redirect('/entries'); } @@ -44,7 +43,6 @@ class EntryController extends Controller { if ($request->user()->cannot('delete', $entry)) abort(403); $entry->delete(); - AuditionChange::dispatch(); return redirect('/entries')->with('success','The ' . $entry->audition->name . 'entry for ' . $entry->student->full_name(). 'has been deleted.'); } diff --git a/app/Observers/AuditionObserver.php b/app/Observers/AuditionObserver.php new file mode 100644 index 0000000..4748957 --- /dev/null +++ b/app/Observers/AuditionObserver.php @@ -0,0 +1,49 @@ +