@@ -26,8 +26,8 @@ |
||
26 | 26 | public function scopeOrderedList($query) |
27 | 27 | { |
28 | 28 | return $query->orderBy('year', 'asc') |
29 | - ->orderBy('semester', 'asc') |
|
30 | - ->orderBy('name', 'asc'); |
|
29 | + ->orderBy('semester', 'asc') |
|
30 | + ->orderBy('name', 'asc'); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -14,11 +14,11 @@ |
||
14 | 14 | */ |
15 | 15 | public function index() |
16 | 16 | { |
17 | - $courses = DB::transaction(function () { |
|
17 | + $courses = DB::transaction(function() { |
|
18 | 18 | return Course::orderedList()->get(); |
19 | 19 | }); |
20 | 20 | |
21 | - $courses = $courses->groupBy(function ($course) { |
|
21 | + $courses = $courses->groupBy(function($course) { |
|
22 | 22 | return $course->present()->getOrdinalYear(); |
23 | 23 | }); |
24 | 24 |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | public function store(Request $request) |
30 | 30 | { |
31 | 31 | try { |
32 | - $course = DB::transaction(function () use ($request) { |
|
32 | + $course = DB::transaction(function() use ($request) { |
|
33 | 33 | $this->validate($request, [ |
34 | 34 | 'course_id' => 'exists:courses,id', |
35 | 35 | ]); |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | */ |
59 | 59 | public function destroy(Request $request) |
60 | 60 | { |
61 | - $course = DB::transaction(function () use ($request) { |
|
61 | + $course = DB::transaction(function() use ($request) { |
|
62 | 62 | $this->validate($request, [ |
63 | 63 | 'course_id' => 'exists:courses,id', |
64 | 64 | ]); |
@@ -42,7 +42,7 @@ |
||
42 | 42 | public function __construct() |
43 | 43 | { |
44 | 44 | $this->middleware('guest') |
45 | - ->except(['confirm', 'resendConfirmationEmail']); |
|
45 | + ->except(['confirm', 'resendConfirmationEmail']); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | /** |
@@ -68,7 +68,7 @@ |
||
68 | 68 | */ |
69 | 69 | protected function create(array $data) |
70 | 70 | { |
71 | - $user = DB::transaction(function () use ($data) { |
|
71 | + $user = DB::transaction(function() use ($data) { |
|
72 | 72 | $user = User::make([ |
73 | 73 | 'name' => $data['name'], |
74 | 74 | 'email' => $data['student_number'].'@alunos.uminho.pt', |
@@ -37,13 +37,13 @@ discard block |
||
37 | 37 | */ |
38 | 38 | protected function adminDashboard() |
39 | 39 | { |
40 | - $courses = DB::transaction(function () { |
|
40 | + $courses = DB::transaction(function() { |
|
41 | 41 | return Course::withCount('enrollments') |
42 | 42 | ->orderedList() |
43 | 43 | ->get(); |
44 | 44 | }); |
45 | 45 | |
46 | - $courses = $courses->groupBy(function ($course) { |
|
46 | + $courses = $courses->groupBy(function($course) { |
|
47 | 47 | return $course->present()->getOrdinalYear(); |
48 | 48 | }); |
49 | 49 | |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | */ |
58 | 58 | protected function studentDashboard() |
59 | 59 | { |
60 | - $data = DB::transaction(function () { |
|
60 | + $data = DB::transaction(function() { |
|
61 | 61 | $student = Auth::user()->student; |
62 | 62 | $data['enrollments'] = $student |
63 | 63 | ->enrollments() |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | // Group all enrollments by the year of their associated course, so |
74 | 74 | // the enrollments listing is organized by year. This will allow |
75 | 75 | // a better experience, since it matches the official order. |
76 | - $data['enrollments'] = $data['enrollments']->groupBy(function ($enrollment) { |
|
76 | + $data['enrollments'] = $data['enrollments']->groupBy(function($enrollment) { |
|
77 | 77 | return $enrollment->course->present()->getOrdinalYear(); |
78 | 78 | }); |
79 | 79 |
@@ -27,7 +27,7 @@ |
||
27 | 27 | */ |
28 | 28 | public function update(UpdateRequest $request) |
29 | 29 | { |
30 | - DB::transaction(function () use ($request) { |
|
30 | + DB::transaction(function() use ($request) { |
|
31 | 31 | $settings = Settings::first(); |
32 | 32 | $settings->update($request->input()); |
33 | 33 | }); |
@@ -25,8 +25,8 @@ |
||
25 | 25 | // Get the list of students enrolled on each course |
26 | 26 | $enrollments = DB::transaction(function () { |
27 | 27 | $enrollments = Enrollment::with(['student', 'course']) |
28 | - ->get() |
|
29 | - ->sortByDesc('courses.name'); |
|
28 | + ->get() |
|
29 | + ->sortByDesc('courses.name'); |
|
30 | 30 | |
31 | 31 | return $enrollments; |
32 | 32 | }); |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | public function export() |
24 | 24 | { |
25 | 25 | // Get the list of students enrolled on each course |
26 | - $enrollments = DB::transaction(function () { |
|
26 | + $enrollments = DB::transaction(function() { |
|
27 | 27 | $enrollments = Enrollment::with(['student', 'course']) |
28 | 28 | ->get() |
29 | 29 | ->sortByDesc('courses.name'); |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | }); |
33 | 33 | |
34 | 34 | // Export to CSV |
35 | - $result = Excel::create('enrollments', function ($excel) use ($enrollments) { |
|
36 | - $excel->sheet('Enrollments', function ($sheet) use ($enrollments) { |
|
35 | + $result = Excel::create('enrollments', function($excel) use ($enrollments) { |
|
36 | + $excel->sheet('Enrollments', function($sheet) use ($enrollments) { |
|
37 | 37 | $sheet->loadView('enrollments.export', compact('enrollments')); |
38 | 38 | }); |
39 | 39 | }); |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | $file = $request->enrollments; |
55 | 55 | $path = $file->path(); |
56 | 56 | |
57 | - Excel::load($path, function ($reader) { |
|
58 | - DB::transaction(function () use ($reader) { |
|
57 | + Excel::load($path, function($reader) { |
|
58 | + DB::transaction(function() use ($reader) { |
|
59 | 59 | // Loop for all the rows of the table |
60 | - $reader->each(function ($row, $index) { |
|
60 | + $reader->each(function($row, $index) { |
|
61 | 61 | $index += 2; // Skip header |
62 | 62 | |
63 | 63 | // Get the models of the given ids |
@@ -14,7 +14,7 @@ |
||
14 | 14 | */ |
15 | 15 | public function boot() |
16 | 16 | { |
17 | - View::composer('*', function ($view) { |
|
17 | + View::composer('*', function($view) { |
|
18 | 18 | $view->with('settings', app('settings')); |
19 | 19 | }); |
20 | 20 | } |
@@ -52,8 +52,8 @@ discard block |
||
52 | 52 | protected function mapWebRoutes() |
53 | 53 | { |
54 | 54 | Route::middleware('web') |
55 | - ->namespace($this->namespace) |
|
56 | - ->group(base_path('routes/web.php')); |
|
55 | + ->namespace($this->namespace) |
|
56 | + ->group(base_path('routes/web.php')); |
|
57 | 57 | } |
58 | 58 | |
59 | 59 | /** |
@@ -66,8 +66,8 @@ discard block |
||
66 | 66 | protected function mapApiRoutes() |
67 | 67 | { |
68 | 68 | Route::prefix('api') |
69 | - ->middleware('api') |
|
70 | - ->namespace($this->namespace) |
|
71 | - ->group(base_path('routes/api.php')); |
|
69 | + ->middleware('api') |
|
70 | + ->namespace($this->namespace) |
|
71 | + ->group(base_path('routes/api.php')); |
|
72 | 72 | } |
73 | 73 | } |