@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | if (!empty($isAvailableforPromotion)) { |
64 | 64 | $this->process($institutionGrade, $nextGrade, $year, 1); |
65 | - } else { |
|
65 | + }else { |
|
66 | 66 | $this->process($institutionGrade, $nextGrade, $year, 3); |
67 | 67 | } |
68 | 68 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | |
97 | 97 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
98 | 98 | $output->writeln('##########################################################################################################################'); |
99 | - $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote)); |
|
99 | + $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote)); |
|
100 | 100 | |
101 | 101 | |
102 | 102 | if (!empty($parallelClasses)) { |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params); |
111 | 111 | array_walk($parallelClasses, array($this, 'updateStudentCount')); |
112 | 112 | } |
113 | - } catch (\Exception $e) { |
|
113 | + }catch (\Exception $e) { |
|
114 | 114 | dd($e); |
115 | 115 | Log::error($e->getMessage()); |
116 | 116 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | $nextAcademicPeriod = Academic_period::query()->where('code', $year)->get()->first(); |
146 | 146 | |
147 | 147 | $nextGradeObj = null; |
148 | - if ($nextGrade !== [] && !is_null($nextGrade)) { |
|
148 | + if ($nextGrade !== [] && !is_null($nextGrade)) { |
|
149 | 149 | $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $academicPeriod->id); |
150 | 150 | $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $nextAcademicPeriod->id); |
151 | 151 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | // promote parallel classes |
156 | 156 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1); |
157 | 157 | return 1; |
158 | - } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) { |
|
158 | + } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) { |
|
159 | 159 | // promote pool promotion |
160 | 160 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1); |
161 | 161 | return 2; |
@@ -163,12 +163,12 @@ discard block |
||
163 | 163 | // Promote matching class name with previous class |
164 | 164 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1); |
165 | 165 | return 1; |
166 | - } else { |
|
166 | + }else { |
|
167 | 167 | // default pool promotion |
168 | 168 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1); |
169 | 169 | return 2; |
170 | 170 | } |
171 | - } else { |
|
171 | + }else { |
|
172 | 172 | // default pool promotion |
173 | 173 | $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3); |
174 | 174 | return 2; |
@@ -204,10 +204,10 @@ discard block |
||
204 | 204 | ]; |
205 | 205 | |
206 | 206 | try { |
207 | - Institution_student::where('id', (string)$student['id'])->update($studentData); |
|
207 | + Institution_student::where('id', (string) $student['id'])->update($studentData); |
|
208 | 208 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
209 | - $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']); |
|
210 | - } catch (\Exception $e) { |
|
209 | + $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']); |
|
210 | + }catch (\Exception $e) { |
|
211 | 211 | dd($e); |
212 | 212 | Log::error($e->getMessage()); |
213 | 213 | } |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | $studentClass = $this->institution_class_students->getStudentNewClass($student); |
229 | 229 | if (!is_null($studentClass)) { |
230 | 230 | return array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name')); |
231 | - } else { |
|
231 | + }else { |
|
232 | 232 | return false; |
233 | 233 | } |
234 | 234 | } |
@@ -280,11 +280,11 @@ discard block |
||
280 | 280 | if (!$this->institution_class_students->isDuplicated($studentObj)) { |
281 | 281 | $this->institution_class_students->create($studentObj); |
282 | 282 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
283 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
284 | - } else { |
|
285 | - $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj); |
|
283 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
284 | + }else { |
|
285 | + $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj); |
|
286 | 286 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
287 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
287 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
288 | 288 | } |
289 | 289 | } |
290 | 290 | } |
@@ -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 |
@@ -37,8 +37,8 @@ |
||
37 | 37 | } |
38 | 38 | |
39 | 39 | /** |
40 | - * @return \Illuminate\Support\Collection |
|
41 | - */ |
|
40 | + * @return \Illuminate\Support\Collection |
|
41 | + */ |
|
42 | 42 | public function query() |
43 | 43 | { |
44 | 44 | return Examination_student::query(); |
@@ -9,7 +9,7 @@ |
||
9 | 9 | use Maatwebsite\Excel\Concerns\FromCollection; |
10 | 10 | use Maatwebsite\Excel\Concerns\WithHeadings; |
11 | 11 | |
12 | -class ExaminationStudentsExport implements FromQuery , WithHeadings |
|
12 | +class ExaminationStudentsExport implements FromQuery, WithHeadings |
|
13 | 13 | { |
14 | 14 | |
15 | 15 | use Exportable; |
@@ -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]; |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | public function registerEvents(): array |
76 | 76 | { |
77 | 77 | return [ |
78 | - BeforeSheet::class => function (BeforeSheet $event) { |
|
78 | + BeforeSheet::class => function(BeforeSheet $event) { |
|
79 | 79 | $this->sheetNames[] = $event->getSheet()->getTitle(); |
80 | 80 | $this->worksheet = $event->getSheet(); |
81 | 81 | $this->validateClass(); |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
88 | 88 | } |
89 | 89 | }, |
90 | - BeforeImport::class => function (BeforeImport $event) { |
|
90 | + BeforeImport::class => function(BeforeImport $event) { |
|
91 | 91 | $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C')); |
92 | 92 | if ($this->highestRow < 3) { |
93 | 93 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
@@ -124,9 +124,9 @@ discard block |
||
124 | 124 | break; |
125 | 125 | } |
126 | 126 | |
127 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first(); |
|
128 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first(); |
|
129 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first(); |
|
127 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first(); |
|
128 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first(); |
|
129 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first(); |
|
130 | 130 | $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first(); |
131 | 131 | |
132 | 132 | |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | |
143 | 143 | $openemisStudent = $this->uniqueUid::getUniqueAlphanumeric(); |
144 | 144 | \Log::debug('Security_user'); |
145 | - $student = Security_user::create([ |
|
145 | + $student = Security_user::create([ |
|
146 | 146 | 'username' => str_replace('-', '', $openemisStudent), |
147 | 147 | 'openemis_no' => $openemisStudent, |
148 | 148 | 'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system. |
@@ -239,9 +239,9 @@ discard block |
||
239 | 239 | if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) { |
240 | 240 | try { |
241 | 241 | // convert Meeter to CM |
242 | - $hight = $row['bmi_height'] / 100; |
|
242 | + $hight = $row['bmi_height']/100; |
|
243 | 243 | //calculate BMI |
244 | - $bodyMass = ($row['bmi_weight']) / pow($hight, 2); |
|
244 | + $bodyMass = ($row['bmi_weight'])/pow($hight, 2); |
|
245 | 245 | |
246 | 246 | $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first(); |
247 | 247 | |
@@ -255,17 +255,17 @@ discard block |
||
255 | 255 | 'security_user_id' => $student->student_id, |
256 | 256 | 'created_user_id' => $this->file['security_user_id'] |
257 | 257 | ]); |
258 | - } catch (\Throwable $th) { |
|
259 | - \Log::error('User_body_mass:' . $th->getMessage()); |
|
258 | + }catch (\Throwable $th) { |
|
259 | + \Log::error('User_body_mass:'.$th->getMessage()); |
|
260 | 260 | } |
261 | 261 | } |
262 | 262 | |
263 | 263 | |
264 | 264 | if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) { |
265 | 265 | |
266 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first(); |
|
267 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first(); |
|
268 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first(); |
|
266 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first(); |
|
267 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first(); |
|
268 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first(); |
|
269 | 269 | $openemisFather = $this->uniqueUid::getUniqueAlphanumeric(); |
270 | 270 | |
271 | 271 | $identityType = ($identityType !== null) ? $identityType->id : null; |
@@ -303,7 +303,7 @@ discard block |
||
303 | 303 | User_contact::createOrUpdate($father, $this->file['security_user_id']); |
304 | 304 | } |
305 | 305 | Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']); |
306 | - } else { |
|
306 | + }else { |
|
307 | 307 | Security_user::where('id', '=', $father->id) |
308 | 308 | ->update(['is_guardian' => 1]); |
309 | 309 | $father['guardian_relation_id'] = 1; |
@@ -316,9 +316,9 @@ discard block |
||
316 | 316 | } |
317 | 317 | |
318 | 318 | if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) { |
319 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first(); |
|
320 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first(); |
|
321 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first(); |
|
319 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first(); |
|
320 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first(); |
|
321 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first(); |
|
322 | 322 | $openemisMother = $this->uniqueUid::getUniqueAlphanumeric(); |
323 | 323 | |
324 | 324 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | User_contact::createOrUpdate($mother, $this->file['security_user_id']); |
355 | 355 | } |
356 | 356 | Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']); |
357 | - } else { |
|
357 | + }else { |
|
358 | 358 | Security_user::where('id', '=', $mother->id) |
359 | 359 | ->update(['is_guardian' => 1]); |
360 | 360 | $mother['guardian_relation_id'] = 2; |
@@ -369,9 +369,9 @@ discard block |
||
369 | 369 | |
370 | 370 | if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) { |
371 | 371 | $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2; |
372 | - $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first(); |
|
373 | - $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first(); |
|
374 | - $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first(); |
|
372 | + $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first(); |
|
373 | + $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first(); |
|
374 | + $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first(); |
|
375 | 375 | $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric(); |
376 | 376 | |
377 | 377 | $identityType = $identityType !== null ? $identityType->id : null; |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | User_contact::createOrUpdate($guardian, $this->file['security_user_id']); |
409 | 409 | } |
410 | 410 | Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']); |
411 | - } else { |
|
411 | + }else { |
|
412 | 412 | Security_user::where('id', '=', $guardian->id) |
413 | 413 | ->update(['is_guardian' => 1]); |
414 | 414 | $guardian['guardian_relation_id'] = 3; |
@@ -438,7 +438,7 @@ discard block |
||
438 | 438 | |
439 | 439 | if ($totalStudents['total'] > $institutionClass->no_of_students) { |
440 | 440 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
441 | - $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]); |
|
441 | + $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]); |
|
442 | 442 | $failures = [0 => $failure]; |
443 | 443 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
444 | 444 | Log::info('email-sent', [$this->file]); |
@@ -450,7 +450,7 @@ discard block |
||
450 | 450 | 'total_female_students' => $totalStudents['total_female_students'] |
451 | 451 | ]); |
452 | 452 | } |
453 | - } catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
453 | + }catch (\Maatwebsite\Excel\Validators\ValidationException $e) { |
|
454 | 454 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
455 | 455 | // $failure = new Failure(3, 'remark', [3 => ], [null]); |
456 | 456 | $failures = $e->failures(); |
@@ -465,7 +465,7 @@ discard block |
||
465 | 465 | return [ |
466 | 466 | '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:100', |
467 | 467 | '*.gender_mf' => 'required|in:M,F', |
468 | - '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'], |
|
468 | + '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'], |
|
469 | 469 | '*.address' => 'nullable', |
470 | 470 | '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place', |
471 | 471 | '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate', |
@@ -475,8 +475,8 @@ discard block |
||
475 | 475 | '*.academic_period' => 'required|exists:academic_periods,name', |
476 | 476 | '*.education_grade' => 'required', |
477 | 477 | '*.option_*' => 'nullable|exists:education_subjects,name', |
478 | - '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'], |
|
479 | - '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'], |
|
478 | + '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'], |
|
479 | + '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'], |
|
480 | 480 | '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].' |
481 | 481 | '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name', |
482 | 482 | '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/', |
@@ -88,10 +88,10 @@ discard block |
||
88 | 88 | $highestColumn = $this->worksheet->getHighestDataColumn(3); |
89 | 89 | $higestRow = 0; |
90 | 90 | for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { |
91 | - $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); |
|
91 | + $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); |
|
92 | 92 | if (isEmptyRow(reset($rowData))) { |
93 | 93 | continue; |
94 | - } else { |
|
94 | + }else { |
|
95 | 95 | $higestRow += 1; |
96 | 96 | } |
97 | 97 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | $this->failures = []; |
106 | 106 | if (($column !== "") && (!in_array($column, $columns))) { |
107 | 107 | $this->isValidSheet = false; |
108 | - $this->error[] = 'Unsupported column found ,remove:' . $column; |
|
108 | + $this->error[] = 'Unsupported column found ,remove:'.$column; |
|
109 | 109 | $this->failure = new Failure(3, 'remark', $this->error, [null]); |
110 | 110 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]); |
111 | 111 | } |
@@ -118,13 +118,13 @@ discard block |
||
118 | 118 | { |
119 | 119 | $columns = Config::get('excel.columns'); |
120 | 120 | $optional_columns = Config::get('excel.optional_columns'); |
121 | - $columns = array_diff ($columns,$optional_columns); |
|
121 | + $columns = array_diff($columns, $optional_columns); |
|
122 | 122 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
123 | 123 | $this->failures = []; |
124 | 124 | foreach ($columns as $column) { |
125 | 125 | if (($column !== "") && (!in_array($column, $existingColumns))) { |
126 | 126 | $this->isValidSheet = false; |
127 | - $this->error[] = 'Missing Column :' . $column . ' Not found'; |
|
127 | + $this->error[] = 'Missing Column :'.$column.' Not found'; |
|
128 | 128 | $this->failure = new Failure(3, 'remark', $this->error, [null]); |
129 | 129 | $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]); |
130 | 130 | } |
@@ -141,16 +141,16 @@ discard block |
||
141 | 141 | $highestColumn = $this->worksheet->getHighestDataColumn(3); |
142 | 142 | $higestRow = 1; |
143 | 143 | for ($row = $this->startRow(); $row <= $this->highestRow; $row++) { |
144 | - $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE); |
|
144 | + $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE); |
|
145 | 145 | if (isEmptyRow(reset($rowData))) { |
146 | 146 | continue; |
147 | - } else { |
|
147 | + }else { |
|
148 | 148 | $higestRow += 1; |
149 | 149 | } |
150 | 150 | } |
151 | 151 | if ($higestRow == 0) { |
152 | 152 | exit; |
153 | - } else { |
|
153 | + }else { |
|
154 | 154 | return $higestRow; |
155 | 155 | } |
156 | 156 | } |
@@ -175,17 +175,17 @@ discard block |
||
175 | 175 | case 'string': |
176 | 176 | $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]); |
177 | 177 | $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]); |
178 | - $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]); |
|
178 | + $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]); |
|
179 | 179 | break; |
180 | 180 | case 'double'; |
181 | - $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]); |
|
181 | + $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]); |
|
182 | 182 | break; |
183 | 183 | } |
184 | 184 | } |
185 | 185 | return $row; |
186 | - } catch (Exception $e) { |
|
186 | + }catch (Exception $e) { |
|
187 | 187 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
188 | - $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]); |
|
188 | + $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]); |
|
189 | 189 | $failures = [0 => $failure]; |
190 | 190 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
191 | 191 | } |
@@ -206,16 +206,16 @@ discard block |
||
206 | 206 | $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd'); |
207 | 207 | $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd'); |
208 | 208 | |
209 | - $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT); |
|
209 | + $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT); |
|
210 | 210 | if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) { |
211 | - $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
211 | + $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT); |
|
212 | 212 | // dd(($row['date_of_birth_yyyy_mm_dd'])); |
213 | - $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first(); |
|
213 | + $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first(); |
|
214 | 214 | if ($BirthDivision !== null) { |
215 | - $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%') |
|
215 | + $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%') |
|
216 | 216 | ->where('parent_id', '=', $BirthDivision->id)->first(); |
217 | 217 | if ($BirthArea !== null) { |
218 | - $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m"); |
|
218 | + $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m"); |
|
219 | 219 | } |
220 | 220 | } |
221 | 221 | } |
@@ -227,9 +227,9 @@ discard block |
||
227 | 227 | { |
228 | 228 | if (array_key_exists($key, $row)) { |
229 | 229 | return true; |
230 | - } else { |
|
230 | + }else { |
|
231 | 231 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
232 | - $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]); |
|
232 | + $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]); |
|
233 | 233 | $failures = [0 => $failure]; |
234 | 234 | new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
235 | 235 | }; |
@@ -265,11 +265,11 @@ discard block |
||
265 | 265 | |
266 | 266 | if ($exceededStudents == true) { |
267 | 267 | $error = \Illuminate\Validation\ValidationException::withMessages([]); |
268 | - $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]); |
|
268 | + $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]); |
|
269 | 269 | $failures = [0 => $failure]; |
270 | 270 | throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures); |
271 | 271 | Log::info('email-sent', [$this->file]); |
272 | - } else { |
|
272 | + }else { |
|
273 | 273 | return true; |
274 | 274 | } |
275 | 275 | } |
@@ -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); |