@@ -110,39 +110,39 @@ discard block |
||
| 110 | 110 | 'name' => 'from_to', |
| 111 | 111 | 'label'=> __('Date range'), |
| 112 | 112 | ], |
| 113 | - false, |
|
| 114 | - function ($value) { // if the filter is active, apply these constraints |
|
| 115 | - $dates = json_decode($value); |
|
| 116 | - |
|
| 117 | - if ($dates->from) { |
|
| 118 | - CRUD::addClause('where', 'start', '>=', $dates->from); |
|
| 119 | - } |
|
| 120 | - if ($dates->to) { |
|
| 121 | - CRUD::addClause('where', 'start', '<=', $dates->to.' 23:59:59'); |
|
| 122 | - } |
|
| 123 | - }); |
|
| 113 | + false, |
|
| 114 | + function ($value) { // if the filter is active, apply these constraints |
|
| 115 | + $dates = json_decode($value); |
|
| 116 | + |
|
| 117 | + if ($dates->from) { |
|
| 118 | + CRUD::addClause('where', 'start', '>=', $dates->from); |
|
| 119 | + } |
|
| 120 | + if ($dates->to) { |
|
| 121 | + CRUD::addClause('where', 'start', '<=', $dates->to.' 23:59:59'); |
|
| 122 | + } |
|
| 123 | + }); |
|
| 124 | 124 | |
| 125 | 125 | CRUD::addFilter([ |
| 126 | 126 | 'type' => 'simple', |
| 127 | 127 | 'name' => 'orphan', |
| 128 | 128 | 'label'=> __('Events with no course'), |
| 129 | 129 | ], |
| 130 | - false, |
|
| 131 | - function ($value) { // if the filter is active, apply these constraints |
|
| 132 | - $this->crud->query->where('course_id', null); |
|
| 133 | - }, |
|
| 134 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 135 | - }); |
|
| 130 | + false, |
|
| 131 | + function ($value) { // if the filter is active, apply these constraints |
|
| 132 | + $this->crud->query->where('course_id', null); |
|
| 133 | + }, |
|
| 134 | + function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 135 | + }); |
|
| 136 | 136 | |
| 137 | 137 | CRUD::addFilter([ |
| 138 | 138 | 'type' => 'simple', |
| 139 | 139 | 'name' => 'unassigned', |
| 140 | 140 | 'label'=> __('Events with no teacher'), |
| 141 | 141 | ], |
| 142 | - false, |
|
| 143 | - function ($value) { // if the filter is active, apply these constraints |
|
| 144 | - $this->crud->query->where('teacher_id', null); |
|
| 145 | - }); |
|
| 142 | + false, |
|
| 143 | + function ($value) { // if the filter is active, apply these constraints |
|
| 144 | + $this->crud->query->where('teacher_id', null); |
|
| 145 | + }); |
|
| 146 | 146 | |
| 147 | 147 | CRUD::addFilter([ // select2 filter |
| 148 | 148 | 'name' => 'teacher_id', |
@@ -153,8 +153,8 @@ discard block |
||
| 153 | 153 | }, function ($value) { // if the filter is active |
| 154 | 154 | CRUD::addClause('where', 'teacher_id', $value); |
| 155 | 155 | }, |
| 156 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 157 | - }); |
|
| 156 | + function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 157 | + }); |
|
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | public function store(Request $request) |
@@ -105,13 +105,13 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | ]); |
| 107 | 107 | |
| 108 | - CRUD::addFilter([ // daterange filter |
|
| 108 | + CRUD::addFilter([// daterange filter |
|
| 109 | 109 | 'type' => 'date_range', |
| 110 | 110 | 'name' => 'from_to', |
| 111 | 111 | 'label'=> __('Date range'), |
| 112 | 112 | ], |
| 113 | 113 | false, |
| 114 | - function ($value) { // if the filter is active, apply these constraints |
|
| 114 | + function($value) { // if the filter is active, apply these constraints |
|
| 115 | 115 | $dates = json_decode($value); |
| 116 | 116 | |
| 117 | 117 | if ($dates->from) { |
@@ -128,10 +128,10 @@ discard block |
||
| 128 | 128 | 'label'=> __('Events with no course'), |
| 129 | 129 | ], |
| 130 | 130 | false, |
| 131 | - function ($value) { // if the filter is active, apply these constraints |
|
| 131 | + function($value) { // if the filter is active, apply these constraints |
|
| 132 | 132 | $this->crud->query->where('course_id', null); |
| 133 | 133 | }, |
| 134 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 134 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 135 | 135 | }); |
| 136 | 136 | |
| 137 | 137 | CRUD::addFilter([ |
@@ -140,20 +140,20 @@ discard block |
||
| 140 | 140 | 'label'=> __('Events with no teacher'), |
| 141 | 141 | ], |
| 142 | 142 | false, |
| 143 | - function ($value) { // if the filter is active, apply these constraints |
|
| 143 | + function($value) { // if the filter is active, apply these constraints |
|
| 144 | 144 | $this->crud->query->where('teacher_id', null); |
| 145 | 145 | }); |
| 146 | 146 | |
| 147 | - CRUD::addFilter([ // select2 filter |
|
| 147 | + CRUD::addFilter([// select2 filter |
|
| 148 | 148 | 'name' => 'teacher_id', |
| 149 | 149 | 'type' => 'select2', |
| 150 | 150 | 'label'=> __('Teacher'), |
| 151 | - ], function () { |
|
| 151 | + ], function() { |
|
| 152 | 152 | return \App\Models\Teacher::all()->pluck('name', 'id')->toArray(); |
| 153 | - }, function ($value) { // if the filter is active |
|
| 153 | + }, function($value) { // if the filter is active |
|
| 154 | 154 | CRUD::addClause('where', 'teacher_id', $value); |
| 155 | 155 | }, |
| 156 | - function () { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 156 | + function() { // if the filter is NOT active (the GET parameter "checkbox" does not exit) |
|
| 157 | 157 | }); |
| 158 | 158 | } |
| 159 | 159 | |
@@ -136,11 +136,11 @@ |
||
| 136 | 136 | ], function () { |
| 137 | 137 | return EnrollmentStatusType::all()->pluck('name', 'id')->toArray(); |
| 138 | 138 | }, |
| 139 | - function ($values) { // if the filter is active |
|
| 140 | - foreach (json_decode($values) as $key => $value) { |
|
| 141 | - CRUD::addClause('orWhere', 'status_id', $value); |
|
| 142 | - } |
|
| 143 | - }); |
|
| 139 | + function ($values) { // if the filter is active |
|
| 140 | + foreach (json_decode($values) as $key => $value) { |
|
| 141 | + CRUD::addClause('orWhere', 'status_id', $value); |
|
| 142 | + } |
|
| 143 | + }); |
|
| 144 | 144 | |
| 145 | 145 | CRUD::addFilter([ |
| 146 | 146 | 'name' => 'period_id', |
@@ -69,9 +69,9 @@ discard block |
||
| 69 | 69 | 'name' => 'user.lastname', |
| 70 | 70 | 'label' => __('Last Name'), |
| 71 | 71 | 'type' => 'text', |
| 72 | - 'searchLogic' => function ($query, $column, $searchTerm) { |
|
| 73 | - $query->orWhereHas('student', function ($q) use ($searchTerm) { |
|
| 74 | - $q->whereHas('user', function ($q) use ($searchTerm) { |
|
| 72 | + 'searchLogic' => function($query, $column, $searchTerm) { |
|
| 73 | + $query->orWhereHas('student', function($q) use ($searchTerm) { |
|
| 74 | + $q->whereHas('user', function($q) use ($searchTerm) { |
|
| 75 | 75 | $q->where('lastname', 'like', '%'.$searchTerm.'%'); |
| 76 | 76 | }); |
| 77 | 77 | }); |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | 'name' => 'user.firstname', |
| 83 | 83 | 'label' => __('First Name'), |
| 84 | 84 | 'type' => 'text', |
| 85 | - 'searchLogic' => function ($query, $column, $searchTerm) { |
|
| 86 | - $query->orWhereHas('student', function ($q) use ($searchTerm) { |
|
| 87 | - $q->whereHas('user', function ($q) use ($searchTerm) { |
|
| 85 | + 'searchLogic' => function($query, $column, $searchTerm) { |
|
| 86 | + $query->orWhereHas('student', function($q) use ($searchTerm) { |
|
| 87 | + $q->whereHas('user', function($q) use ($searchTerm) { |
|
| 88 | 88 | $q->where('firstname', 'like', '%'.$searchTerm.'%'); |
| 89 | 89 | }); |
| 90 | 90 | }); |
@@ -133,10 +133,10 @@ discard block |
||
| 133 | 133 | 'name' => 'status_id', |
| 134 | 134 | 'type' => 'select2_multiple', |
| 135 | 135 | 'label'=> __('Status'), |
| 136 | - ], function () { |
|
| 136 | + ], function() { |
|
| 137 | 137 | return EnrollmentStatusType::all()->pluck('name', 'id')->toArray(); |
| 138 | 138 | }, |
| 139 | - function ($values) { // if the filter is active |
|
| 139 | + function($values) { // if the filter is active |
|
| 140 | 140 | foreach (json_decode($values) as $key => $value) { |
| 141 | 141 | CRUD::addClause('orWhere', 'status_id', $value); |
| 142 | 142 | } |
@@ -146,9 +146,9 @@ discard block |
||
| 146 | 146 | 'name' => 'period_id', |
| 147 | 147 | 'type' => 'select2', |
| 148 | 148 | 'label'=> __('Period'), |
| 149 | - ], function () { |
|
| 149 | + ], function() { |
|
| 150 | 150 | return Period::all()->pluck('name', 'id')->toArray(); |
| 151 | - }, function ($value) { // if the filter is active |
|
| 151 | + }, function($value) { // if the filter is active |
|
| 152 | 152 | CRUD::addClause('period', $value); |
| 153 | 153 | }); |
| 154 | 154 | } |
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | protected function schedule(Schedule $schedule) |
| 31 | 31 | { |
| 32 | - $schedule->call(function () { |
|
| 32 | + $schedule->call(function() { |
|
| 33 | 33 | Log::info('Sending attendance reminders'); |
| 34 | 34 | (new Attendance)->remindPendingAttendance(); |
| 35 | 35 | })->dailyAt('08:15'); |
| 36 | 36 | |
| 37 | - $schedule->call(function () { |
|
| 37 | + $schedule->call(function() { |
|
| 38 | 38 | Log::info('Checking default periods'); |
| 39 | 39 | |
| 40 | 40 | // when we finish the current period; remove the manual override to automatically fallbackto the next one |
@@ -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 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | |
| 21 | 21 | $this->hideSensitiveRequestDetails(); |
| 22 | 22 | |
| 23 | - Telescope::filter(function (IncomingEntry $entry) { |
|
| 23 | + Telescope::filter(function(IncomingEntry $entry) { |
|
| 24 | 24 | if ($this->app->isLocal()) { |
| 25 | 25 | return true; |
| 26 | 26 | } |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | protected function gate() |
| 63 | 63 | { |
| 64 | - Gate::define('viewTelescope', function ($user) { |
|
| 64 | + Gate::define('viewTelescope', function($user) { |
|
| 65 | 65 | return in_array($user->email, [ |
| 66 | 66 | // |
| 67 | 67 | ]); |
@@ -37,7 +37,7 @@ |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | View::composer( |
| 40 | - ['partials.create_new_contact', 'students.edit-contact'], function ($view) { |
|
| 40 | + ['partials.create_new_contact', 'students.edit-contact'], function($view) { |
|
| 41 | 41 | $view->with('contact_types', ContactRelationship::all()); |
| 42 | 42 | }); |
| 43 | 43 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | * a user is allowed to view the course attendance sheet if they are the teacher for this course, |
| 30 | 30 | * or if they have explicit permission to view all course attendance sheets |
| 31 | 31 | */ |
| 32 | - Gate::define('view-course-attendance', function ($user, $course) { |
|
| 32 | + Gate::define('view-course-attendance', function($user, $course) { |
|
| 33 | 33 | return ($user->teacher_id == $course->teacher_id) || $user->can('attendance.view'); |
| 34 | 34 | }); |
| 35 | 35 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | * if they are the teacher for this course, |
| 39 | 39 | * or if they have explicit permission to view all event attendance sheets |
| 40 | 40 | */ |
| 41 | - Gate::define('view-event-attendance', function ($user, $event) { |
|
| 41 | + Gate::define('view-event-attendance', function($user, $event) { |
|
| 42 | 42 | return $event->teacher_id == $user->teacher_id || $event->course->teacher_id == $user->teacher_id || $user->can('attendance.view'); |
| 43 | 43 | }); |
| 44 | 44 | |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | * if they are the teacher for the course, |
| 48 | 48 | * or if they have explicit permission to edit any attendance sheets |
| 49 | 49 | */ |
| 50 | - Gate::define('edit-attendance', function ($user, $event) { |
|
| 50 | + Gate::define('edit-attendance', function($user, $event) { |
|
| 51 | 51 | return $event->teacher_id == $user->teacher_id || $event->course->teacher_id == $user->teacher_id || $user->can('attendance.edit'); |
| 52 | 52 | }); |
| 53 | 53 | |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | * teachers are allowed to view their own calendar, |
| 56 | 56 | * and users with explicit permission can view all calendars |
| 57 | 57 | */ |
| 58 | - Gate::define('view-teacher-calendar', function ($user, $teacher) { |
|
| 58 | + Gate::define('view-teacher-calendar', function($user, $teacher) { |
|
| 59 | 59 | return $user->teacher_id == $teacher->id || $user->can('calendars.view'); |
| 60 | 60 | }); |
| 61 | 61 | |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | * teachers are allowed to view their own courses, |
| 64 | 64 | * and users with explicit permission can view all courses |
| 65 | 65 | */ |
| 66 | - Gate::define('view-course', function ($user, $course) { |
|
| 66 | + Gate::define('view-course', function($user, $course) { |
|
| 67 | 67 | return $user->teacher_id == $course->teacher_id || $user->can('courses.view'); |
| 68 | 68 | }); |
| 69 | 69 | |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | * if they are a teacher |
| 73 | 73 | * of if they have explicit permission to view any result |
| 74 | 74 | */ |
| 75 | - Gate::define('view-enrollment', function ($user, $enrollment) { |
|
| 75 | + Gate::define('view-enrollment', function($user, $enrollment) { |
|
| 76 | 76 | return $user->student_id == $enrollment->student_id || $user->isTeacher() || $user->can('evaluation.view'); |
| 77 | 77 | }); |
| 78 | 78 | |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | * if the user is the teacher of the course |
| 81 | 81 | * of if they have explicit permission to enroll students |
| 82 | 82 | */ |
| 83 | - Gate::define('enroll-in-course', function ($user, $course) { |
|
| 83 | + Gate::define('enroll-in-course', function($user, $course) { |
|
| 84 | 84 | return ($course->teacher_id == $user->teacher_id) || $user->can('enrollments.edit'); |
| 85 | 85 | }); |
| 86 | 86 | |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | * if the user is a teacher |
| 89 | 89 | * of if they have explicit permission to enroll students |
| 90 | 90 | */ |
| 91 | - Gate::define('enroll-students', function ($user) { |
|
| 91 | + Gate::define('enroll-students', function($user) { |
|
| 92 | 92 | return $user->isTeacher() || $user->can('enrollments.edit'); |
| 93 | 93 | }); |
| 94 | 94 | |
@@ -96,7 +96,7 @@ discard block |
||
| 96 | 96 | * teachers are allowed to view their own hours, |
| 97 | 97 | * and users with explicit permission can view all hours |
| 98 | 98 | */ |
| 99 | - Gate::define('view-teacher-hours', function ($user, $teacher) { |
|
| 99 | + Gate::define('view-teacher-hours', function($user, $teacher) { |
|
| 100 | 100 | return $user->teacher_id == $teacher->id || $user->can('hr.view'); |
| 101 | 101 | }); |
| 102 | 102 | |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * teachers are allowed to edit results for their own students |
| 105 | 105 | * as well as users with explicit permission to edit any result |
| 106 | 106 | */ |
| 107 | - Gate::define('edit-result', function ($user, $enrollment) { |
|
| 107 | + Gate::define('edit-result', function($user, $enrollment) { |
|
| 108 | 108 | return $user->teacher_id == $enrollment->course->teacher_id || $user->can('evaluation.edit'); |
| 109 | 109 | }); |
| 110 | 110 | } |
@@ -18,9 +18,9 @@ discard block |
||
| 18 | 18 | public function __invoke(Builder $query, $value, string $property) |
| 19 | 19 | { |
| 20 | 20 | $value = collect($value)->toArray(); |
| 21 | - $query->where(function (Builder $query) use ($value) { |
|
| 21 | + $query->where(function(Builder $query) use ($value) { |
|
| 22 | 22 | $query->whereIn('level_id', $value) |
| 23 | - ->orWhereHas('children', function (Builder $query) use ($value) { |
|
| 23 | + ->orWhereHas('children', function(Builder $query) use ($value) { |
|
| 24 | 24 | $query->whereIn('level_id', $value); |
| 25 | 25 | }); |
| 26 | 26 | }); |
@@ -55,7 +55,7 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function search() |
| 57 | 57 | { |
| 58 | - return QueryBuilder::for(Course::class)->where('campus_id', 1) |
|
| 58 | + return QueryBuilder::for (Course::class)->where('campus_id', 1) |
|
| 59 | 59 | ->with('room')->withCount('events')->withCount('children')->withCount('enrollments') |
| 60 | 60 | ->allowedFilters([ |
| 61 | 61 | 'name', |
@@ -55,7 +55,8 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | public function search() |
| 57 | 57 | { |
| 58 | - return QueryBuilder::for(Course::class)->where('campus_id', 1) |
|
| 58 | + return QueryBuilder::for(Course::class) { |
|
| 59 | + ->where('campus_id', 1) |
|
| 59 | 60 | ->with('room')->withCount('events')->withCount('children')->withCount('enrollments') |
| 60 | 61 | ->allowedFilters([ |
| 61 | 62 | 'name', |
@@ -64,5 +65,6 @@ discard block |
||
| 64 | 65 | AllowedFilter::custom('searchable_levels', new FiltersSearchableLevels), |
| 65 | 66 | 'teacher_id', ]) |
| 66 | 67 | ->get(); |
| 68 | + } |
|
| 67 | 69 | } |
| 68 | 70 | } |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | parent::boot(); |
| 32 | 32 | |
| 33 | 33 | // when deleting a student, also delete any enrollments, grades and attendance related to this student |
| 34 | - static::deleting(function (self $student) { |
|
| 34 | + static::deleting(function(self $student) { |
|
| 35 | 35 | Attendance::where('student_id', $student->id)->delete(); |
| 36 | 36 | Enrollment::where('student_id', $student->id)->delete(); |
| 37 | 37 | }); |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | return $this->hasMany(Attendance::class) |
| 70 | 70 | ->where('attendance_type_id', 4) // absence |
| 71 | - ->whereHas('event', function ($q) use ($period) { |
|
| 72 | - return $q->whereHas('course', function ($c) use ($period) { |
|
| 71 | + ->whereHas('event', function($q) use ($period) { |
|
| 72 | + return $q->whereHas('course', function($c) use ($period) { |
|
| 73 | 73 | return $c->where('period_id', $period->id); |
| 74 | 74 | }); |
| 75 | 75 | }); |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | return $this->hasMany(Attendance::class) |
| 85 | - ->whereHas('event', function ($q) use ($period) { |
|
| 86 | - return $q->whereHas('course', function ($c) use ($period) { |
|
| 85 | + ->whereHas('event', function($q) use ($period) { |
|
| 86 | + return $q->whereHas('course', function($c) use ($period) { |
|
| 87 | 87 | return $c->where('period_id', $period->id); |
| 88 | 88 | }); |
| 89 | 89 | }); |
@@ -175,7 +175,7 @@ discard block |
||
| 175 | 175 | public function getIsEnrolledAttribute() |
| 176 | 176 | { |
| 177 | 177 | // if the student is currently enrolled |
| 178 | - if ($this->enrollments()->whereHas('course', function ($q) { |
|
| 178 | + if ($this->enrollments()->whereHas('course', function($q) { |
|
| 179 | 179 | return $q->where('period_id', $this->currentPeriod); |
| 180 | 180 | })->count() > 0) { |
| 181 | 181 | return 1; |