@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | * `select total from students_count_view where institution_id = $id` |
16 | 16 | * `select male from students_count_view where institution_id = $id` |
17 | 17 | * `select female from students_count_view where institution_id = $id` |
18 | - **/ |
|
18 | + **/ |
|
19 | 19 | DashboardViews::createOrUpdateStudentCount(); |
20 | 20 | |
21 | 21 | /** |
@@ -48,10 +48,10 @@ discard block |
||
48 | 48 | */ |
49 | 49 | DashboardViews::createOrUpdateStudentsCountByGrade(); |
50 | 50 | |
51 | - /** |
|
52 | - * Students count by BMI |
|
53 | - * select * from students_count_by_bmi_view where institution_id = $id |
|
54 | - */ |
|
51 | + /** |
|
52 | + * Students count by BMI |
|
53 | + * select * from students_count_by_bmi_view where institution_id = $id |
|
54 | + */ |
|
55 | 55 | DashboardViews::createOrUpdateStudentCountByBMI(); |
56 | 56 | |
57 | 57 | /** |
@@ -8,7 +8,7 @@ |
||
8 | 8 | class DashboardViewsController extends Controller |
9 | 9 | { |
10 | 10 | |
11 | - public function callback(){ |
|
11 | + public function callback() { |
|
12 | 12 | |
13 | 13 | /** Total number of students by institutions |
14 | 14 | * In Grafana query to get total students count |
@@ -18,9 +18,9 @@ discard block |
||
18 | 18 | use Maatwebsite\Excel\Concerns\WithBatchInserts; |
19 | 19 | use Maatwebsite\Excel\Concerns\WithChunkReading; |
20 | 20 | |
21 | -class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts , WithValidation ,WithMapping, SkipsOnFailure, SkipsOnError |
|
21 | +class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts, WithValidation, WithMapping, SkipsOnFailure, SkipsOnError |
|
22 | 22 | { |
23 | - use Importable , SkipsFailures, SkipsErrors; |
|
23 | + use Importable, SkipsFailures, SkipsErrors; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @return int |
@@ -57,14 +57,14 @@ discard block |
||
57 | 57 | |
58 | 58 | private function transformDateTime(string $value, string $format = 'm/d/Y') |
59 | 59 | { |
60 | - try{ |
|
60 | + try { |
|
61 | 61 | $date = date_create_from_format('m/d/Y', $value); |
62 | - if(gettype($date)=='boolean'){ |
|
62 | + if (gettype($date) == 'boolean') { |
|
63 | 63 | $date = date_create_from_format('Y-m-d', $value); |
64 | 64 | } |
65 | 65 | $date = date_format($date, 'Y-m-d'); |
66 | 66 | return $date; |
67 | - }catch(\Exception $e){ |
|
67 | + }catch (\Exception $e) { |
|
68 | 68 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
69 | 69 | $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']); |
70 | 70 | $failures = [0 => $failure]; |
@@ -64,7 +64,7 @@ |
||
64 | 64 | } |
65 | 65 | $date = date_format($date, 'Y-m-d'); |
66 | 66 | return $date; |
67 | - }catch(\Exception $e){ |
|
67 | + } catch(\Exception $e){ |
|
68 | 68 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
69 | 69 | $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']); |
70 | 70 | $failures = [0 => $failure]; |
@@ -30,13 +30,13 @@ |
||
30 | 30 | */ |
31 | 31 | public function handle() |
32 | 32 | { |
33 | - try{ |
|
33 | + try { |
|
34 | 34 | ini_set('memory_limit', '-1'); |
35 | 35 | (new ExaminationStudentsExport)->queue('/examination/student_data_with_nsid.csv')->chain([ |
36 | 36 | (new ExportReady($this->user)) |
37 | 37 | ]); |
38 | 38 | |
39 | - }catch(\Exception $e){ |
|
39 | + }catch (\Exception $e) { |
|
40 | 40 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
41 | 41 | $output->writeln($e->getMessage()); |
42 | 42 | } |
@@ -36,7 +36,7 @@ |
||
36 | 36 | (new ExportReady($this->user)) |
37 | 37 | ]); |
38 | 38 | |
39 | - }catch(\Exception $e){ |
|
39 | + } catch(\Exception $e){ |
|
40 | 40 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
41 | 41 | $output->writeln($e->getMessage()); |
42 | 42 | } |
@@ -22,17 +22,17 @@ discard block |
||
22 | 22 | |
23 | 23 | $institution = Institution_class::find($file['institution_class_id']); |
24 | 24 | $this->user = User::find($file['security_user_id']); |
25 | - $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
25 | + $this->subject = 'SIS Bulk Upload: Process Terminated'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
26 | 26 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
27 | 27 | $this->from_name = 'SIS Bulk Uploader'; |
28 | 28 | $this->with = [ |
29 | 29 | 'name' => $this->user->first_name, |
30 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
30 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
31 | 31 | ]; |
32 | 32 | $this->viewData = [ |
33 | 33 | 'name'=>$this->user->first_name, "body" => "Apologize ,The process of you file has been terminated in the middle, |
34 | 34 | We advice you to check the student data and re-upload with only with correct data which are not in the system ", |
35 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
35 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
36 | 36 | ]; |
37 | 37 | } |
38 | 38 | |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | public function build() |
45 | 45 | { |
46 | 46 | return $this->view('emails.mail') |
47 | - ->from($this->from_address,$this->from_name) |
|
47 | + ->from($this->from_address, $this->from_name) |
|
48 | 48 | ->to($this->user->email) |
49 | 49 | ->subject($this->subject) |
50 | 50 | ->with($this->with); |
@@ -19,17 +19,17 @@ discard block |
||
19 | 19 | public function __construct($user) |
20 | 20 | { |
21 | 21 | $this->user = $user; |
22 | - $this->subject = 'The DoE data is ready to download '. date('Y:m:d H:i:s'); |
|
22 | + $this->subject = 'The DoE data is ready to download '.date('Y:m:d H:i:s'); |
|
23 | 23 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
24 | 24 | $this->from_name = 'SIS Bulk Uploader'; |
25 | 25 | $this->with = [ |
26 | 26 | 'name' => $this->user->first_name, |
27 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination' |
|
27 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination' |
|
28 | 28 | ]; |
29 | 29 | |
30 | 30 | $this->viewData = [ |
31 | 31 | 'name'=>$this->user->first_name, "body" =>'Your requested file is ready to download', |
32 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination' |
|
32 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/downloadExportexamination' : env('APP_URL').'/bulk-upload/downloadExportexamination' |
|
33 | 33 | ]; |
34 | 34 | } |
35 | 35 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | public function build() |
42 | 42 | { |
43 | 43 | return $this->view('emails.mail') |
44 | - ->from($this->from_address,$this->from_name) |
|
44 | + ->from($this->from_address, $this->from_name) |
|
45 | 45 | ->to($this->user->email) |
46 | 46 | ->subject($this->subject) |
47 | 47 | ->with($this->with); |
@@ -31,16 +31,16 @@ discard block |
||
31 | 31 | $institution = Institution_class::find($file['institution_class_id']); |
32 | 32 | |
33 | 33 | $this->user = User::find($file['security_user_id']); |
34 | - $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '. $institution->name . date('Y:m:d H:i:s'); |
|
34 | + $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '.$institution->name.date('Y:m:d H:i:s'); |
|
35 | 35 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
36 | 36 | $this->from_name = 'SIS Bulk Uploader'; |
37 | 37 | $this->with = [ |
38 | 38 | 'name' => $this->user->first_name, |
39 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
39 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
40 | 40 | ]; |
41 | 41 | $this->viewData = [ |
42 | 42 | 'name'=>$this->user->first_name, "body" => "The class you tried to import data is exceeded the student count limit.Please check the class / increase the student limit", |
43 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
43 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
44 | 44 | ]; |
45 | 45 | } |
46 | 46 | |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | public function build() |
53 | 53 | { |
54 | 54 | return $this->view('emails.mail') |
55 | - ->from($this->from_address,$this->from_name) |
|
55 | + ->from($this->from_address, $this->from_name) |
|
56 | 56 | ->to($this->user->email) |
57 | 57 | ->subject($this->subject) |
58 | 58 | ->with($this->with); |
@@ -24,17 +24,17 @@ discard block |
||
24 | 24 | |
25 | 25 | |
26 | 26 | $this->user = User::find($file['security_user_id']); |
27 | - $this->subject = 'SIS Bulk Upload: ' .$file['subject']. $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
27 | + $this->subject = 'SIS Bulk Upload: '.$file['subject'].$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
28 | 28 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
29 | 29 | $this->from_name = 'SIS Bulk Uploader'; |
30 | 30 | $this->with = [ |
31 | 31 | 'name' => $this->user->first_name, |
32 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
32 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
33 | 33 | ]; |
34 | 34 | $this->viewData = [ |
35 | - 'name'=>$this->user->first_name, "body" => "We found some errors on your data file ". $file['filename']. ' Pleas fix the errors and re-upload only with incorrect data, |
|
35 | + 'name'=>$this->user->first_name, "body" => "We found some errors on your data file ".$file['filename'].' Pleas fix the errors and re-upload only with incorrect data, |
|
36 | 36 | We uploaded the correct data to the system', |
37 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
37 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
38 | 38 | ]; |
39 | 39 | } |
40 | 40 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | public function build() |
47 | 47 | { |
48 | 48 | return $this->view('emails.mail') |
49 | - ->from($this->from_address,$this->from_name) |
|
49 | + ->from($this->from_address, $this->from_name) |
|
50 | 50 | ->to($this->user->email) |
51 | 51 | ->subject($this->subject) |
52 | 52 | ->with($this->with); |
@@ -25,16 +25,16 @@ discard block |
||
25 | 25 | |
26 | 26 | |
27 | 27 | $this->user = User::find($file['security_user_id']); |
28 | - $this->subject = 'SIS Bulk Upload: ' .$file['subject'].' Empty ' . $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
28 | + $this->subject = 'SIS Bulk Upload: '.$file['subject'].' Empty '.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
29 | 29 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
30 | 30 | $this->from_name = 'SIS Bulk Uploader'; |
31 | 31 | $this->with = [ |
32 | 32 | 'name' => $this->user->first_name, |
33 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
33 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
34 | 34 | ]; |
35 | 35 | $this->viewData = [ |
36 | - 'name'=>$this->user->first_name, "body" => "No data Found in ". $file['filename']. ' Please re-upload the file with data', |
|
37 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
36 | + 'name'=>$this->user->first_name, "body" => "No data Found in ".$file['filename'].' Please re-upload the file with data', |
|
37 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
38 | 38 | ]; |
39 | 39 | } |
40 | 40 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | public function build() |
47 | 47 | { |
48 | 48 | return $this->view('emails.mail') |
49 | - ->from($this->from_address,$this->from_name) |
|
49 | + ->from($this->from_address, $this->from_name) |
|
50 | 50 | ->to($this->user->email) |
51 | 51 | ->subject($this->subject) |
52 | 52 | ->with($this->with); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | DbSchema::dropIfExists('students_count_view_table'); |
37 | 37 | DB::statement('CREATE TABLE students_count_view_table AS (select * from students_count_view)'); |
38 | 38 | $output->writeln('creat : students_count_view'); |
39 | - } catch (\Throwable $th) { |
|
39 | + }catch (\Throwable $th) { |
|
40 | 40 | $output->writeln($th->getMessage()); |
41 | 41 | } |
42 | 42 | } |
@@ -103,17 +103,17 @@ discard block |
||
103 | 103 | ->leftJoin("education_grades as eg", "eg.id", "i.id") |
104 | 104 | ->leftJoin("institution_class_students as ics", "ist.student_id", "ics.student_id") |
105 | 105 | ->leftJoin("institution_classes as ic", "ic.id", "ics.institution_class_id") |
106 | - ->leftJoin("student_guardians as sgf", function ($join) { |
|
106 | + ->leftJoin("student_guardians as sgf", function($join) { |
|
107 | 107 | $join->on("sgf.student_id", "stu.id"); |
108 | 108 | $join->where("sgf.guardian_relation_id", 1); |
109 | 109 | }) |
110 | 110 | ->leftJoin("security_users as sufu", "sgf.guardian_id", "sufu.id") |
111 | - ->leftJoin("student_guardians as sgm", function ($join) { |
|
111 | + ->leftJoin("student_guardians as sgm", function($join) { |
|
112 | 112 | $join->on("sgm.student_id", "stu.id"); |
113 | 113 | $join->where("sgm.guardian_relation_id", 2); |
114 | 114 | }) |
115 | 115 | ->leftJoin("security_users as sumu", "sgm.guardian_id", "sumu.id") |
116 | - ->leftJoin("student_guardians as sg", function ($join) { |
|
116 | + ->leftJoin("student_guardians as sg", function($join) { |
|
117 | 117 | $join->on("sg.student_id", "stu.id"); |
118 | 118 | $join->where("sg.guardian_relation_id", 3); |
119 | 119 | }) |
@@ -132,27 +132,27 @@ discard block |
||
132 | 132 | ->leftJoin("academic_periods as acps", "acps.id", "ist.academic_period_id") |
133 | 133 | ->leftJoin("institution_subject_students as iss", "stu.id", "iss.student_id") |
134 | 134 | ->leftJoin("education_subjects as edus", "edus.id", "iss.education_subject_id") |
135 | - ->leftJoin("nationalities as natif", function ($join) { |
|
135 | + ->leftJoin("nationalities as natif", function($join) { |
|
136 | 136 | $join->on("sufu.nationality_id", "natif.id"); |
137 | 137 | $join->where("sgf.guardian_relation_id", 1); |
138 | 138 | }) |
139 | - ->leftJoin("nationalities as natim", function ($join) { |
|
139 | + ->leftJoin("nationalities as natim", function($join) { |
|
140 | 140 | $join->on("sumu.nationality_id", "natim.id"); |
141 | 141 | $join->where("sgm.guardian_relation_id", 2); |
142 | 142 | }) |
143 | - ->leftJoin("nationalities as natig", function ($join) { |
|
143 | + ->leftJoin("nationalities as natig", function($join) { |
|
144 | 144 | $join->on("sugu.nationality_id", "natig.id"); |
145 | 145 | $join->where("sg.guardian_relation_id", 3); |
146 | 146 | }) |
147 | - ->leftJoin("identity_types as idtf", function ($join) { |
|
147 | + ->leftJoin("identity_types as idtf", function($join) { |
|
148 | 148 | $join->on("sufu.nationality_id", "idtf.id"); |
149 | 149 | $join->where("sgf.guardian_relation_id", 1); |
150 | 150 | }) |
151 | - ->leftJoin("identity_types as idtm", function ($join) { |
|
151 | + ->leftJoin("identity_types as idtm", function($join) { |
|
152 | 152 | $join->on("sumu.nationality_id", "idtm.id"); |
153 | 153 | $join->where("sgm.guardian_relation_id", 2); |
154 | 154 | }) |
155 | - ->leftJoin("identity_types as idtg", function ($join) { |
|
155 | + ->leftJoin("identity_types as idtg", function($join) { |
|
156 | 156 | $join->on("sugu.nationality_id", "idtg.id"); |
157 | 157 | $join->where("sg.guardian_relation_id", 3); |
158 | 158 | }) |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | DB::statement('CREATE INDEX user_institution ON students_list_view_table (institution_id);'); |
167 | 167 | $output->writeln('created : students_list_view_table'); |
168 | 168 | $output->writeln('created : students_list_view'); |
169 | - } catch (\Throwable $th) { |
|
169 | + }catch (\Throwable $th) { |
|
170 | 170 | $output->writeln($th->getMessage()); |
171 | 171 | } |
172 | 172 | } |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | Schema::createOrReplaceView('upload_list_view', $query); |
227 | 227 | Schema::disableForeignKeyConstraints('upload_list_view'); |
228 | 228 | $output->writeln('created : upload_list_view'); |
229 | - } catch (\Throwable $th) { |
|
229 | + }catch (\Throwable $th) { |
|
230 | 230 | $output->writeln($th->getMessage()); |
231 | 231 | } |
232 | 232 | } |
@@ -261,7 +261,7 @@ discard block |
||
261 | 261 | Schema::dropIfExists("upload_count_view"); |
262 | 262 | Schema::createOrReplaceView("upload_count_view", $query); |
263 | 263 | $output->writeln('created : upload_count_view'); |
264 | - } catch (\Throwable $th) { |
|
264 | + }catch (\Throwable $th) { |
|
265 | 265 | $output->writeln($th->getMessage()); |
266 | 266 | } |
267 | 267 | } |
@@ -288,7 +288,7 @@ discard block |
||
288 | 288 | Schema::dropIfExists("institution_info_view"); |
289 | 289 | Schema::createOrReplaceView("institution_info_view", $query); |
290 | 290 | $output->writeln('created : institution_info_view'); |
291 | - } catch (\Throwable $th) { |
|
291 | + }catch (\Throwable $th) { |
|
292 | 292 | $output->writeln($th->getMessage()); |
293 | 293 | } |
294 | 294 | } |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | Schema::dropIfExists("students_count_by_grade_view"); |
327 | 327 | Schema::createOrReplaceView('students_count_by_grade_view', $query); |
328 | 328 | $output->writeln('created : students_count_by_grade_view'); |
329 | - } catch (\Throwable $th) { |
|
329 | + }catch (\Throwable $th) { |
|
330 | 330 | $output->writeln($th->getMessage()); |
331 | 331 | } |
332 | 332 | } |
@@ -351,7 +351,7 @@ discard block |
||
351 | 351 | "ist.created" |
352 | 352 | ) |
353 | 353 | ->join("institutions as i", "i.id", "ist.institution_id") |
354 | - ->join('user_body_masses as ubm', function ($join) { |
|
354 | + ->join('user_body_masses as ubm', function($join) { |
|
355 | 355 | $join->on('ubm.security_user_id', 'ist.student_id'); |
356 | 356 | $join->where('ubm.academic_period_id', 'ist.academic_period_id'); |
357 | 357 | }) |
@@ -359,7 +359,7 @@ discard block |
||
359 | 359 | Schema::dropIfExists("students_count_by_bmi_view"); |
360 | 360 | Schema::createOrReplaceView("students_count_by_bmi_view", $query); |
361 | 361 | $output->writeln('created : students_count_by_bmi_view'); |
362 | - } catch (\Throwable $th) { |
|
362 | + }catch (\Throwable $th) { |
|
363 | 363 | $output->writeln($th->getMessage()); |
364 | 364 | } |
365 | 365 | } |
@@ -392,7 +392,7 @@ discard block |
||
392 | 392 | Schema::dropIfExists("student_count_by_class_view"); |
393 | 393 | Schema::createOrReplaceView('student_count_by_class_view', $query); |
394 | 394 | $output->writeln('created : student_count_by_class_view'); |
395 | - } catch (\Throwable $th) { |
|
395 | + }catch (\Throwable $th) { |
|
396 | 396 | $output->writeln($th->getMessage()); |
397 | 397 | } |
398 | 398 | } |