@@ -37,7 +37,7 @@ discard block |
||
| 37 | 37 | |
| 38 | 38 | $series->save(); |
| 39 | 39 | |
| 40 | - return redirect()->route('association.series', ['association' => Association::find($request->association_id)]); |
|
| 40 | + return redirect()->route('association.series', [ 'association' => Association::find($request->association_id) ]); |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | public function edit(Series $series) { |
@@ -95,13 +95,13 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | $series->save(); |
| 97 | 97 | |
| 98 | - $request->session()->flash('message', __('Successfully updated series :series!', ['series' => $series->name])); |
|
| 98 | + $request->session()->flash('message', __('Successfully updated series :series!', [ 'series' => $series->name ])); |
|
| 99 | 99 | |
| 100 | - return redirect()->route('series.view', ['series' => $series]); |
|
| 100 | + return redirect()->route('series.view', [ 'series' => $series ]); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | public function schedules(Series $series) { |
| 104 | - return view('series.schedules', ['series' => $series]); |
|
| 104 | + return view('series.schedules', [ 'series' => $series ]); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $match->save(); |
| 83 | 83 | } |
| 84 | 84 | |
| 85 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 85 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 86 | 86 | } |
| 87 | 87 | |
| 88 | 88 | /** |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | $request->session()->flash('message', __('Successfully updated round')); |
| 141 | 141 | |
| 142 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 142 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 143 | 143 | } |
| 144 | 144 | |
| 145 | 145 | public function deleteConfirm(Schedule $schedule, Round $round) { |
@@ -157,6 +157,6 @@ discard block |
||
| 157 | 157 | $round->delete(); |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | - return redirect()->route('schedule.rounds', ['schedule' => $schedule]); |
|
| 160 | + return redirect()->route('schedule.rounds', [ 'schedule' => $schedule ]); |
|
| 161 | 161 | } |
| 162 | 162 | } |
@@ -14,13 +14,13 @@ discard block |
||
| 14 | 14 | { |
| 15 | 15 | |
| 16 | 16 | public function view(Schedule $schedule) { |
| 17 | - return view('schedule.view', ['schedule' => $schedule]); |
|
| 17 | + return view('schedule.view', [ 'schedule' => $schedule ]); |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | public function create(Series $series) { |
| 21 | 21 | $association_id = $series->association_id; |
| 22 | - $available_series = \App\Series::where(['association_id' => $series->association_id])->get()->all(); |
|
| 23 | - $available_divisions = \App\Division::orderBy('sequence' , 'ASC')->where(['association_id' => $series->association_id])->get()->all(); |
|
| 22 | + $available_series = \App\Series::where([ 'association_id' => $series->association_id ])->get()->all(); |
|
| 23 | + $available_divisions = \App\Division::orderBy('sequence', 'ASC')->where([ 'association_id' => $series->association_id ])->get()->all(); |
|
| 24 | 24 | |
| 25 | 25 | return view('schedule.create', [ |
| 26 | 26 | 'association_id' => $association_id, |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | $schedule->start_date = $start_date; |
| 65 | 65 | $schedule->end_date = $end_date; |
| 66 | 66 | |
| 67 | - $division = Division::where(['id' => $division_id])->first(); |
|
| 67 | + $division = Division::where([ 'id' => $division_id ])->first(); |
|
| 68 | 68 | |
| 69 | 69 | if (!empty($division)) { |
| 70 | 70 | $schedule->name = $division->name; |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | $days = $days_interval->format('%a'); |
| 86 | 86 | |
| 87 | - $association = Association::where(['id' => $association_id])->first(); |
|
| 87 | + $association = Association::where([ 'id' => $association_id ])->first(); |
|
| 88 | 88 | $venues = $association->venues; |
| 89 | 89 | |
| 90 | 90 | $round_number = 1; |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | $start_datetime->add(new \DateInterval('P1D')); |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - return redirect()->route('series.schedules', ['series' => $series]); |
|
| 132 | + return redirect()->route('series.schedules', [ 'series' => $series ]); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | public function update(Request $request) { |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | |
| 159 | 159 | $request->session()->flash('message', __('Successfully updated schedule')); |
| 160 | 160 | |
| 161 | - return redirect()->route('schedule.view', ['schedule' => $schedule]); |
|
| 161 | + return redirect()->route('schedule.view', [ 'schedule' => $schedule ]); |
|
| 162 | 162 | |
| 163 | 163 | } |
| 164 | 164 | |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function view(Association $association) { |
| 28 | - return view('association.view', ['association' => $association]); |
|
| 28 | + return view('association.view', [ 'association' => $association ]); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | public function edit(Association $association) { |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | public function home() { |
| 47 | 47 | if (!empty($this->association)) { |
| 48 | - return view('association.home', ['association' => $this->association]); |
|
| 48 | + return view('association.home', [ 'association' => $this->association ]); |
|
| 49 | 49 | } |
| 50 | 50 | else { |
| 51 | 51 | abort(404); |
@@ -53,27 +53,27 @@ discard block |
||
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | public function divisions(Association $association) { |
| 56 | - return view('association.divisions', ['association' => $association]); |
|
| 56 | + return view('association.divisions', [ 'association' => $association ]); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | public function teams(Association $association) { |
| 60 | - return view('association.teams', ['association' => $association]); |
|
| 60 | + return view('association.teams', [ 'association' => $association ]); |
|
| 61 | 61 | } |
| 62 | 62 | |
| 63 | 63 | public function venues(Association $association) { |
| 64 | - return view('association.venues', ['association' => $association]); |
|
| 64 | + return view('association.venues', [ 'association' => $association ]); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function series(Association $association) { |
| 68 | - return view('association.series', ['association' => $association]); |
|
| 68 | + return view('association.series', [ 'association' => $association ]); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | public function users(Association $association) { |
| 72 | - return view('association.users', ['association' => $association]); |
|
| 72 | + return view('association.users', [ 'association' => $association ]); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | public function editUser(Association $association, User $user) { |
| 76 | - return view('association.user.edit', ['association' => $association, 'user' => $user]); |
|
| 76 | + return view('association.user.edit', [ 'association' => $association, 'user' => $user ]); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | public function updateUser(Request $request, Association $association, User $user) { |
@@ -93,12 +93,12 @@ discard block |
||
| 93 | 93 | return redirect($url)->with('success', 'Data saved successfully!'); |
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 96 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 97 | 97 | |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | public function addUser(Association $association) { |
| 101 | - return view('association.user.add', ['association' => $association]); |
|
| 101 | + return view('association.user.add', [ 'association' => $association ]); |
|
| 102 | 102 | } |
| 103 | 103 | |
| 104 | 104 | public function submitScoreBegin(Request $request) { |
@@ -110,13 +110,13 @@ discard block |
||
| 110 | 110 | |
| 111 | 111 | // get rounds with start_date < today, but greater than today - 1 week |
| 112 | 112 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
| 113 | - ->where('start_date','>=', date('Y-m-d', strtotime('-1 week'))) |
|
| 113 | + ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
|
| 114 | 114 | ->where('start_date', '<=', date('Y-m-d', strtotime("today")))->get(); |
| 115 | 115 | |
| 116 | 116 | $divisions = Division::whereIn('id', $rounds->pluck('division_id'))->get(); |
| 117 | 117 | |
| 118 | 118 | if (count($divisions) === 1) { |
| 119 | - $request->division_id = $divisions[0]->id; |
|
| 119 | + $request->division_id = $divisions[ 0 ]->id; |
|
| 120 | 120 | |
| 121 | 121 | return $this->submitScoreStep2($request); |
| 122 | 122 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $rounds = Round::whereIn('schedule_id', $schedules->pluck('id')) |
| 147 | 147 | ->where('start_date', '>=', date('Y-m-d', strtotime('-1 week'))) |
| 148 | 148 | ->where('start_date', '<=', date('Y-m-d', strtotime("today"))) |
| 149 | - ->where(function ($query) { |
|
| 149 | + ->where(function($query) { |
|
| 150 | 150 | $query->where('scores_closed', 0); |
| 151 | 151 | $query->orWhereNull('scores_closed'); |
| 152 | 152 | }) |
@@ -210,11 +210,11 @@ discard block |
||
| 210 | 210 | } |
| 211 | 211 | |
| 212 | 212 | public function standings() { |
| 213 | - return view('association.standings', ['association' => $this->association]); |
|
| 213 | + return view('association.standings', [ 'association' => $this->association ]); |
|
| 214 | 214 | } |
| 215 | 215 | |
| 216 | 216 | public function schedule() { |
| 217 | - return view('association.schedule', ['association' => $this->association]); |
|
| 217 | + return view('association.schedule', [ 'association' => $this->association ]); |
|
| 218 | 218 | } |
| 219 | 219 | |
| 220 | 220 | public function css() { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | $association->save(); |
| 240 | 240 | |
| 241 | 241 | // TODO: Do not necessarily "onboard" for certain roles? |
| 242 | - return redirect()->route('onboard.association', ['association' => $association]); |
|
| 242 | + return redirect()->route('onboard.association', [ 'association' => $association ]); |
|
| 243 | 243 | } |
| 244 | 244 | else { |
| 245 | 245 | return view('denied'); |
@@ -275,13 +275,13 @@ discard block |
||
| 275 | 275 | return redirect($url)->with('success', 'Data saved successfully!'); |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - return redirect()->route('user', ['id' => \Auth::user()->id]); |
|
| 278 | + return redirect()->route('user', [ 'id' => \Auth::user()->id ]); |
|
| 279 | 279 | |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | public function create() { |
| 283 | 283 | if (Bouncer::can('create', Association::class)) { |
| 284 | - return view('association.create', ['current_user' => \Auth::user()]); |
|
| 284 | + return view('association.create', [ 'current_user' => \Auth::user() ]); |
|
| 285 | 285 | } |
| 286 | 286 | else { |
| 287 | 287 | return view('denied'); |
@@ -289,7 +289,7 @@ discard block |
||
| 289 | 289 | } |
| 290 | 290 | |
| 291 | 291 | public function deleteConfirm(Association $association) { |
| 292 | - return view('association.delete', ['association' => $association]); |
|
| 292 | + return view('association.delete', [ 'association' => $association ]); |
|
| 293 | 293 | } |
| 294 | 294 | |
| 295 | 295 | public function delete(Association $association) { |
@@ -299,13 +299,13 @@ discard block |
||
| 299 | 299 | } |
| 300 | 300 | |
| 301 | 301 | public function undeleteConfirm(Association $association) { |
| 302 | - return view('association.undelete', ['association' => $association]); |
|
| 302 | + return view('association.undelete', [ 'association' => $association ]); |
|
| 303 | 303 | } |
| 304 | 304 | |
| 305 | 305 | public function undelete(Association $association) { |
| 306 | 306 | $association->restore(); |
| 307 | 307 | |
| 308 | - return redirect()->route('user', ['user' => \Auth::user()])->with('success', 'Association restored successfully.'); |
|
| 308 | + return redirect()->route('user', [ 'user' => \Auth::user() ])->with('success', 'Association restored successfully.'); |
|
| 309 | 309 | } |
| 310 | 310 | |
| 311 | 311 | |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | public function activeRounds() { |
| 47 | 47 | return $this->rounds() |
| 48 | 48 | ->where('rounds.start_date', '>=', date('Y-m-d', strtotime('today'))) |
| 49 | - ->where('rounds.start_date', '<=', date('Y-m-d', strtotime('now +7 days')) ); |
|
| 49 | + ->where('rounds.start_date', '<=', date('Y-m-d', strtotime('now +7 days'))); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | 52 | public function users() { |