moe-lk / bulk-upload

app/Http/Controllers/ExaminationStudentsController.php

Braces +1 added lines, -1 removed lines

@@ -306,7 +306,7 @@
         // if the same gender same DOE has more than one 
         if(($doe_students > 1) || ($count > 1)){
             $studentData = $this->searchSimilarName($student, $sis_users,false);
-        }else{
+        } else{
             $studentData = $this->searchSimilarName($student, $sis_users);
         }   
         return $studentData;

Spacing +38 added lines, -38 removed lines

@@ -30,7 +30,7 @@ 
         $this->grade = $grade;
         $this->student = new Security_user();
         $this->examination_student = new Examination_student();
-        $this->academic_period =  Academic_period::where('code', '=', $this->year)->first();
+        $this->academic_period = Academic_period::where('code', '=', $this->year)->first();
         $this->education_grade = Education_grade::where('code', '=', $this->grade)->first();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
@@ -72,10 +72,10 @@ 
                     );
                     Session::flash('message', 'File upload successfully!');
                     // Redirect to index
-                } else {
+                }else {
                     Session::flash('message', 'File too large. File must be less than 20MB.');
                 }
-            } else {
+            }else {
                 Session::flash('message', 'Invalid File Extension.');
             }
         }
@@ -97,7 +97,7 @@ 
             $import->import($excelFile, 'local', \Maatwebsite\Excel\Excel::CSV);
             if ($import->failures()->count() > 0) {
                 $errors = $import->failures();
-                $columns =  [
+                $columns = [
                     'remarks',
                     'st_no',
                     'stu_no',
@@ -118,10 +118,10 @@ 
                 Storage::put($file, implode(',', $columns));
 
                 foreach ($errors as $error) {
-                    Storage::append($file, implode(':', $error->errors()) . ',' . implode(',', $error->values()));
+                    Storage::append($file, implode(':', $error->errors()).','.implode(',', $error->values()));
                 }
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
         }
     }
 
@@ -135,9 +135,9 @@ 
         $students = [];
         switch ($mode) {
             case 'duplicate':
-                $students =  DB::table('examination_students as es')
+                $students = DB::table('examination_students as es')
                     ->select(DB::raw('count(*) as total'), 'e2.*')
-                    ->join('examination_students as e2', 'es.nsid','e2.nsid')
+                    ->join('examination_students as e2', 'es.nsid', 'e2.nsid')
                     ->having('total', '>', 1)
                     ->groupBy('e2.st_no')
                     ->orderBy('e2.st_no')
@@ -145,18 +145,18 @@ 
                     ->limit($limit)
                     ->get()->toArray();
                 $students = (array) json_decode(json_encode($students));
-                $this->output->writeln(count($students) . 'students remaining duplicate');
+                $this->output->writeln(count($students).'students remaining duplicate');
                 array_walk($students, array($this, 'clone'));
                 $this->output->writeln('All are generated');
                 break;
             case 'empty';
                 $students = Examination_student::whereNull('nsid')
-                    ->orWhere('nsid','<>','')
+                    ->orWhere('nsid', '<>', '')
                     ->offset($offset)
                     ->limit($limit)
                     ->get()->toArray();
                 $students = (array) json_decode(json_encode($students));
-                $this->output->writeln(count($students) . 'students remaining empty');
+                $this->output->writeln(count($students).'students remaining empty');
                 array_walk($students, array($this, 'clone'));
                 $this->output->writeln('All are generated');
                 break;
@@ -165,7 +165,7 @@ 
                     whereRaw('CHAR_LENGTH(nsid) > 11')
                     ->get()->toArray();
                 $students = (array) json_decode(json_encode($students));
-                $this->output->writeln(count($students) . 'students remaining with wrong NSID');
+                $this->output->writeln(count($students).'students remaining with wrong NSID');
                 array_walk($students, array($this, 'clone'));
                 $this->output->writeln('All are generated');
                 break;
@@ -174,14 +174,14 @@ 
                 ->count();
                 $all = Examination_student::select('nsid')
                     ->count();
-                $this->output->writeln( $all. 'Total Unique nsid are: ' .$count);
+                $this->output->writeln($all.'Total Unique nsid are: '.$count);
                 break;
             default:
                 $students = Examination_student::offset($offset)
                     ->limit($limit)
                     ->get()->toArray();
                 $students = (array) json_decode(json_encode($students));
-                $this->output->writeln(count($students) . 'students remaining empty');
+                $this->output->writeln(count($students).'students remaining empty');
                 array_walk($students, array($this, 'clone'));
                 $this->output->writeln('All are generated');
         }
@@ -227,7 +227,7 @@ 
      */
     public function clone($student)
     {
-        $student = (array)json_decode(json_encode($student));
+        $student = (array) json_decode(json_encode($student));
         //get student matching with same dob and gender
 
         $matchedStudent = $this->getMatchingStudents($student);
@@ -260,7 +260,7 @@ 
 
                 //TODO implement insert student to admission table
                 $student['id'] = $sis_student['id'];
-                $sis_student['student_id'] =  $student['id'];
+                $sis_student['student_id'] = $student['id'];
 
                 $student = $this->setIsTakingExam($student);
                 if (count($institutionClass) == 1) {
@@ -268,13 +268,13 @@ 
                     Institution_student::createExaminationData($student, $admissionInfo);
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
                     Institution_class_student::createExaminationData($student, $admissionInfo);
-                } else {
+                }else {
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
                     Institution_student::createExaminationData($student, $admissionInfo);
                 }
                 $this->updateStudentId($student, $sis_student);
                 // update the matched student's data    
-            } else {
+            }else {
                 $student = $this->setIsTakingExam($student);
                 $studentData = $this->student->updateExaminationStudent($student, $matchedStudent);
                 $matchedStudent = array_merge((array) $student, $matchedStudent);
@@ -282,9 +282,9 @@ 
                 Institution_student::updateExaminationData($studentData, $admissionInfo);
                 $this->updateStudentId($student, $studentData);
             }
-        } else {
+        }else {
 
-            $this->output->writeln('Student ' . $student['st_no'] . ' not imorted' . $student['f_name']);
+            $this->output->writeln('Student '.$student['st_no'].' not imorted'.$student['f_name']);
         }
     }
 
@@ -301,18 +301,18 @@ 
         /**
          */
         $sis_student = $this->student->getMatches($student);
-        $doe_students =  Examination_student::where('gender',$student['gender'])
-            ->where('b_date',$student['b_date'])
-            ->where('schoolid',$student['schoolid'])
+        $doe_students = Examination_student::where('gender', $student['gender'])
+            ->where('b_date', $student['b_date'])
+            ->where('schoolid', $student['schoolid'])
             ->count();
         $count = $this->student->getStudentCount($student);
 
         $studentData = [];
-        $sis_users  = (array) json_decode(json_encode($sis_student), true);
+        $sis_users = (array) json_decode(json_encode($sis_student), true);
         // if the same gender same DOE has more than one 
-        if(($doe_students > 1) || ($count > 1)){
-            $studentData = $this->searchSimilarName($student, $sis_users,false);
-        }else{
+        if (($doe_students > 1) || ($count > 1)) {
+            $studentData = $this->searchSimilarName($student, $sis_users, false);
+        }else {
             $studentData = $this->searchSimilarName($student, $sis_users);
         }   
         return $studentData;
@@ -325,7 +325,7 @@ 
      * @param array $sis_students
      * @return array
      */
-    public function searchSimilarName($student, $sis_students,$surname_search = true)
+    public function searchSimilarName($student, $sis_students, $surname_search = true)
     {
         $highest = [];
         $minDistance = 0;
@@ -345,7 +345,7 @@ 
             }
         }
 
-        if($surname_search){
+        if ($surname_search) {
             if (empty($highest)) {
                 foreach ($sis_students as $key => $value) {
                     //search name with last name
@@ -361,8 +361,8 @@ 
             }
         }
 
-        if(count($matches)>1){
-            $highest =  $this->searchSimilarName($student, $sis_students,false);
+        if (count($matches) > 1) {
+            $highest = $this->searchSimilarName($student, $sis_students, false);
         }
 
         return $highest;
@@ -378,18 +378,18 @@ 
     public function updateStudentId($student, $sis_student)
     {
         try {
-            $student['nsid'] =  $sis_student['openemis_no'];
+            $student['nsid'] = $sis_student['openemis_no'];
             // add new NSID to the examinations data set
             unset($student['id']);
             unset($student['taking_g5_exam']);
             unset($student['taking_al_exam']);
             unset($student['taking_ol_exam']);
             unset($student['total']);
-            $students['updated_at'] =  now();
+            $students['updated_at'] = now();
             $this->examination_student->where('st_no', $student['st_no'])->update($student);
             unset($student['st_no']);
-            $this->output->writeln('Updated  to NSID' . $sis_student['openemis_no']);
-        } catch (\Exception $th) {
+            $this->output->writeln('Updated  to NSID'.$sis_student['openemis_no']);
+        }catch (\Exception $th) {
             dd($th);
             $this->output->writeln('error');
             Log::error($th);
@@ -407,7 +407,7 @@ 
         try {
             (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.'.time().'.csv');
             (new ExportReady($adminUser));
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             //throw $th;
             dd($th);
         }
@@ -417,13 +417,13 @@ 
     public function downloadErrors()
     {
 
-        $file_path = storage_path() . '/app/examination/errors.csv';
+        $file_path = storage_path().'/app/examination/errors.csv';
         return Response::download($file_path);
     }
 
     public function downloadProcessedFile()
     {
-        $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv';
+        $file_path = storage_path().'/app/examination/student_data_with_nsid.csv';
         return Response::download($file_path);
     }
 }

app/Console/Commands/ExaminationCheck.php

Spacing +8 added lines, -8 removed lines

@@ -44,21 +44,21 @@
         $this->start_time = microtime(TRUE);
         $count = DB::table('examination_students')->select('nsid')->distinct()->count();
         $this->examinationController = new ExaminationStudentsController($this->argument('year'), $this->argument('grade'));
-        $studentsIdsWithDuplication =   DB::table('examination_students as es')
-        ->select(DB::raw('count(*) as total'),'es.*')
+        $studentsIdsWithDuplication = DB::table('examination_students as es')
+        ->select(DB::raw('count(*) as total'), 'es.*')
         ->whereNotNull('es.nsid')
-        ->having('total','>',1)
+        ->having('total', '>', 1)
         ->groupBy('es.nsid')
         ->orderBy('es.nsid')
-        ->chunk($this->argument('limit'),function($Students){
+        ->chunk($this->argument('limit'), function($Students) {
             foreach ($Students as $Student) {
-                $count = Examination_student::where('nsid',$Student->nsid)->count();
-                if($count> 1){
-                    Examination_student::where('nsid',$Student->nsid)->update(['nsid'=>'']);
+                $count = Examination_student::where('nsid', $Student->nsid)->count();
+                if ($count > 1) {
+                    Examination_student::where('nsid', $Student->nsid)->update(['nsid'=>'']);
                     $students = (array) json_decode(json_encode($Students), true);
                     array_walk($students, array($this->examinationController, 'clone'));
                 }
-                $this->output->writeln($Student->nsid .'same ID' . $count . ' records removed');
+                $this->output->writeln($Student->nsid.'same ID'.$count.' records removed');
             }
         });  
     }

app/Imports/UsersImport.php

Spacing +29 added lines, -29 removed lines

@@ -75,7 +75,7 @@ 
     public function registerEvents(): array
     {
         return [
-            BeforeSheet::class => function (BeforeSheet $event) {
+            BeforeSheet::class => function(BeforeSheet $event) {
                 $this->sheetNames[] = $event->getSheet()->getTitle();
                 $this->worksheet = $event->getSheet();
                 $this->validateClass();
@@ -87,7 +87,7 @@ 
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                 }
             },
-            BeforeImport::class => function (BeforeImport $event) {
+            BeforeImport::class => function(BeforeImport $event) {
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C'));
                 if ($this->highestRow < 3) {
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -114,21 +114,21 @@ 
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
                 // dd($mandatorySubject);
                 $subjects = getMatchingKeys($row);
-                $genderId  = null;
+                $genderId = null;
                 switch ($row['gender_mf']) {
                     case 'M':
                         $genderId = $row['gender_mf'] = 1;
                         $this->maleStudentsCount += 1;
                         break;
                     case 'F':
-                        $genderId =  $row['gender_mf'] = 2;
+                        $genderId = $row['gender_mf'] = 2;
                         $this->femaleStudentsCount += 1;
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
 
 
@@ -144,7 +144,7 @@ 
 
                 $openemisStudent = $this->uniqueUid::getUniqueAlphanumeric();
                 \Log::debug('Security_user');
-                $student =  Security_user::create([
+                $student = Security_user::create([
                     'username' => str_replace('-', '', $openemisStudent),
                     'openemis_no' => $openemisStudent,
                     'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
@@ -241,9 +241,9 @@ 
                 if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) {
                     try {
                         // convert Meeter to CM
-                        $hight = $row['bmi_height'] / 100;
+                        $hight = $row['bmi_height']/100;
                         //calculate BMI
-                        $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                        $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                         $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
 
@@ -257,17 +257,17 @@ 
                             'security_user_id' => $student->student_id,
                             'created_user_id' => $this->file['security_user_id']
                         ]);
-                    } catch (\Throwable $th) {
-                        \Log::error('User_body_mass:' . $th->getMessage());
+                    }catch (\Throwable $th) {
+                        \Log::error('User_body_mass:'.$th->getMessage());
                     }
                 }
 
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
 
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
                     $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
@@ -305,7 +305,7 @@ 
                             User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                             ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
@@ -318,9 +318,9 @@ 
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -356,7 +356,7 @@ 
                             User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                             ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
@@ -371,9 +371,9 @@ 
 
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -410,7 +410,7 @@ 
                             User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                             ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
@@ -440,7 +440,7 @@ 
 
                 if ($totalStudents['total'] > $institutionClass->no_of_students) {
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
-                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]);
+                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]);
                     $failures = [0 => $failure];
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                     Log::info('email-sent', [$this->file]);
@@ -452,7 +452,7 @@ 
                         'total_female_students' => $totalStudents['total_female_students']
                     ]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             //            $failure = new Failure(3, 'remark', [3 => ], [null]);
             $failures = $e->failures();
@@ -467,7 +467,7 @@ 
         return [
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:100',
             '*.gender_mf' => 'required|in:M,F',
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
             '*.address' => 'nullable',
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -477,8 +477,8 @@ 
             '*.academic_period' => 'required|exists:academic_periods,name',
             '*.education_grade' => 'required',
             '*.option_*' => 'nullable|exists:education_subjects,name',
-            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'],
-            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'],
+            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'],
+            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'],
             '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].'
             '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name',
             '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/',

app/Console/Commands/CloneConfigData.php

Spacing +2 added lines, -2 removed lines

@@ -61,12 +61,12 @@
         // dd($shift);
         $function = array($this->clone, 'process');
         // array_walk($shift,$function,$params);
-        processParallel($function,$shift, $this->argument('max'),$params);
+        processParallel($function, $shift, $this->argument('max'), $params);
         $this->end_time = microtime(TRUE);
 
 
         $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
-        $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
+        $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete');
         $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
     }  
 }

app/Console/Commands/CleanExamData.php

Indentation +3 added lines, -3 removed lines

@@ -85,11 +85,11 @@
 
     public function process($students){
         $type = $this->argument('type');
-       if($type == 'duplication'){
+        if($type == 'duplication'){
         array_walk($students,array($this,'cleanData'));
-       }elseif($type == 'invalid' || 'all'){
+        }elseif($type == 'invalid' || 'all'){
         array_walk($students,array($this,'cleanInvalidData'));
-       }
+        }
     }
 
 

Spacing +17 added lines, -17 removed lines

@@ -48,12 +48,12 @@ 
     {
         $type = $this->argument('type');
         $students = array();
-        if($type == 'invalid'){
+        if ($type == 'invalid') {
             $students = DB::table('examination_students as es')
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
             ->get()
             ->toArray();
-        }elseif($type == 'duplicate'){
+        }elseif ($type == 'duplicate') {
             $students = DB::table('institution_students as is')
             ->join('security_users as su', 'su.id', 'is.student_id')
             ->where('is.updated_from', 'doe')
@@ -63,39 +63,39 @@ 
             ->get()
             ->toArray();
             
-        }elseif('all'){
+        }elseif ('all') {
             $students = DB::table('examination_students')
-            ->where('nsid','<>','')
+            ->where('nsid', '<>', '')
             ->whereNotNull('nsid')
             ->get()
             ->toArray();
         }
 
         $this->output->writeln('###########################################------Start cleanning exam records------###########################################');    
-        if(count($students) > 0){
-            $this->output->writeln('Total students to clean: '.  count($students));
+        if (count($students) > 0) {
+            $this->output->writeln('Total students to clean: '.count($students));
             $students = array_chunk($students, $this->argument('chunk'));
             $function = array($this, 'process');
-            processParallel($function,$students, $this->argument('max'));
-        }else{
+            processParallel($function, $students, $this->argument('max'));
+        }else {
             $this->output->writeln('nothing to process, all are cleaned');
         }   
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
     }
 
-    public function process($students){
+    public function process($students) {
         $type = $this->argument('type');
-       if($type == 'duplication'){
-        array_walk($students,array($this,'cleanData'));
-       }elseif($type == 'invalid' || 'all'){
-        array_walk($students,array($this,'cleanInvalidData'));
+       if ($type == 'duplication') {
+        array_walk($students, array($this, 'cleanData'));
+       }elseif ($type == 'invalid' || 'all') {
+        array_walk($students, array($this, 'cleanInvalidData'));
        }
     }
 
 
     public function cleanData($Student)
     {
-        $exist = Examination_student::where('nsid','=',  $Student->openemis_no)->count();
+        $exist = Examination_student::where('nsid', '=', $Student->openemis_no)->count();
 
         if (!$exist) {
             Institution_student::where('student_id', $Student->student_id)->delete();
@@ -108,12 +108,12 @@ 
     public function cleanInvalidData($Student)
     {
         $Student = (array) $Student;
-        $exist = Examination_student::where('nsid',$Student['nsid'])->count();
+        $exist = Examination_student::where('nsid', $Student['nsid'])->count();
         
         $this->uniqueUId = new UniqueUid();
 
-        $nsid = ltrim(rtrim($Student['nsid'],'-'),'-');
-        if(!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')){
+        $nsid = ltrim(rtrim($Student['nsid'], '-'), '-');
+        if (!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')) {
         }
     }
 }

Braces +4 added lines, -4 removed lines

@@ -53,7 +53,7 @@ 
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
             ->get()
             ->toArray();
-        }elseif($type == 'duplicate'){
+        } elseif($type == 'duplicate'){
             $students = DB::table('institution_students as is')
             ->join('security_users as su', 'su.id', 'is.student_id')
             ->where('is.updated_from', 'doe')
@@ -63,7 +63,7 @@ 
             ->get()
             ->toArray();
             
-        }elseif('all'){
+        } elseif('all'){
             $students = DB::table('examination_students')
             ->where('nsid','<>','')
             ->whereNotNull('nsid')
@@ -77,7 +77,7 @@ 
             $students = array_chunk($students, $this->argument('chunk'));
             $function = array($this, 'process');
             processParallel($function,$students, $this->argument('max'));
-        }else{
+        } else{
             $this->output->writeln('nothing to process, all are cleaned');
         }   
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
@@ -87,7 +87,7 @@ 
         $type = $this->argument('type');
        if($type == 'duplication'){
         array_walk($students,array($this,'cleanData'));
-       }elseif($type == 'invalid' || 'all'){
+       } elseif($type == 'invalid' || 'all'){
         array_walk($students,array($this,'cleanInvalidData'));
        }
     }

app/Console/Commands/StudentsIdGen.php

Spacing +9 added lines, -9 removed lines

@@ -36,7 +36,7 @@ 
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
         $this->students = new Security_user();
         $this->uniqueUId = new UniqueUid();
-        $this->max  = 0;
+        $this->max = 0;
         $this->child = 0;
         parent::__construct();
     }
@@ -60,19 +60,19 @@ 
     public function processParallel(array $arr, $procs = 4)
     {
         // Break array up into $procs chunks.
-        $chunks   = array_chunk($arr, ceil((count($arr) / $procs)));
+        $chunks   = array_chunk($arr, ceil((count($arr)/$procs)));
         $pid      = -1;
         $children = array();
         foreach ($chunks as $items) {
             $pid = pcntl_fork();
             if ($pid === -1) {
                 die('could not fork');
-            } else if ($pid === 0) {
-                $this->output->writeln('started processes: ' . count($children));
+            }else if ($pid === 0) {
+                $this->output->writeln('started processes: '.count($children));
                 // We are the child process. Pass a chunk of items to process.
                 array_walk($items, array($this, 'process'));
                 exit(0);
-            } else {
+            }else {
                 // We are the parent.
                 $children[] = $pid;
             }
@@ -104,17 +104,17 @@ 
 
                 $newId = $this->uniqueUId::getUniqueAlphanumeric();
                 $student['openemis_no'] = $newId;
-                $student =  $this->uniqueUserId->updateOrInsertRecord($student);
+                $student = $this->uniqueUserId->updateOrInsertRecord($student);
                 // $this->output->writeln('New NSID generated for :' . $student['id']);
                 Security_user::query()->where('id', $student['id'])
                     ->update(['openemis_no' => $newId, 'username' => str_replace('-', '', $newId)]);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
             }
-        } else {
+        }else {
             try {
                 // $this->output->writeln('Updating student:' . $student['id']);
                 $this->uniqueUserId->updateOrInsertRecord($student);
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 dd($e);
             }
         }

app/Models/Institution_subject.php

Spacing +16 added lines, -16 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_subject extends Base_Model  {
+class Institution_subject extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -42,42 +42,42 @@ 
     protected $dates = ['modified', 'created', 'modified', 'created'];
 
 
-    public  function institutionGradeSubject(){
-        return $this->belongsTo('App\Models\Education_grades_subject','education_subject_id','education_subject_id');
+    public  function institutionGradeSubject() {
+        return $this->belongsTo('App\Models\Education_grades_subject', 'education_subject_id', 'education_subject_id');
     }
 
-    public  function institutionOptionalGradeSubject(){
-        return $this->belongsTo('App\Models\Education_grades_subject','education_grade_id','education_grade_id');
+    public  function institutionOptionalGradeSubject() {
+        return $this->belongsTo('App\Models\Education_grades_subject', 'education_grade_id', 'education_grade_id');
     }
 
-    public  function institutionMandatoryGradeSubject(){
-        return $this->belongsTo('App\Models\Education_grades_subject','education_grade_id','education_grade_id');
+    public  function institutionMandatoryGradeSubject() {
+        return $this->belongsTo('App\Models\Education_grades_subject', 'education_grade_id', 'education_grade_id');
     }
 
 
-    public  function institutionClassSubject(){
-        return $this->hasMany('App\Models\Institution_class_subject','institution_class_id','id');
+    public  function institutionClassSubject() {
+        return $this->hasMany('App\Models\Institution_class_subject', 'institution_class_id', 'id');
     }
 
 
 
-    public function getInstitutionSubjects($institution_id,$academic_period_id){
-        return self::query()->where('institution_id',$institution_id)
-            ->where('academic_period_id',$academic_period_id)
+    public function getInstitutionSubjects($institution_id, $academic_period_id) {
+        return self::query()->where('institution_id', $institution_id)
+            ->where('academic_period_id', $academic_period_id)
             ->get()->toArray();
     }
 
     public  static function getStudentsCount($institution_subject_id)
     {
-        $total_male_students = self::with(['student' => function ($query) {
+        $total_male_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 1);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 1);
         })->where('institution_subject_id', '=', $institution_subject_id)->count();
 
-        $total_female_students = self::with(['student' => function ($query) {
+        $total_female_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 2);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 2);
         })->where('institution_subject_id', '=', $institution_subject_id)->count();
 

app/Models/Institution_subject_student.php

Indentation +5 added lines, -5 removed lines

@@ -70,21 +70,21 @@
      */
     public static function  isDuplicated($inputs){
 
-       $exists = self::where('student_id','=',$inputs['student_id'])
-           ->where('institution_subject_id','=',$inputs['institution_subject_id'])
-           ->where('education_subject_id','=',$inputs['education_subject_id'])->count();
+        $exists = self::where('student_id','=',$inputs['student_id'])
+            ->where('institution_subject_id','=',$inputs['institution_subject_id'])
+            ->where('education_subject_id','=',$inputs['education_subject_id'])->count();
 
 
         return $exists ? true :false;
     }
 
     
-     public function student(){
+        public function student(){
         return $this->belongsTo('App\Models\Security_user','student_id');
     }
     
     public static function getStudentsCount($institution_subject_id){
-         $total_male_students = self::with(['student' => function($query) {
+            $total_male_students = self::with(['student' => function($query) {
                         $query->where('student.gender_id', '=', 1);
                     }])->whereHas('student', function ($query) {
                     $query->where('gender_id', '=', 1);

Spacing +11 added lines, -11 removed lines

@@ -7,7 +7,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Institution_subject_student extends Model  {
+class Institution_subject_student extends Model {
 
 
     use SoftDeletes;
@@ -56,7 +56,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
         });
 
@@ -68,31 +68,31 @@ 
      *
      *
      */
-    public static function  isDuplicated($inputs){
+    public static function  isDuplicated($inputs) {
 
-       $exists = self::where('student_id','=',$inputs['student_id'])
-           ->where('institution_subject_id','=',$inputs['institution_subject_id'])
-           ->where('education_subject_id','=',$inputs['education_subject_id'])->count();
+       $exists = self::where('student_id', '=', $inputs['student_id'])
+           ->where('institution_subject_id', '=', $inputs['institution_subject_id'])
+           ->where('education_subject_id', '=', $inputs['education_subject_id'])->count();
 
 
         return $exists ? true :false;
     }
 
     
-     public function student(){
-        return $this->belongsTo('App\Models\Security_user','student_id');
+     public function student() {
+        return $this->belongsTo('App\Models\Security_user', 'student_id');
     }
     
-    public static function getStudentsCount($institution_subject_id){
+    public static function getStudentsCount($institution_subject_id) {
          $total_male_students = self::with(['student' => function($query) {
                         $query->where('student.gender_id', '=', 1);
-                    }])->whereHas('student', function ($query) {
+                    }])->whereHas('student', function($query) {
                     $query->where('gender_id', '=', 1);
                 })->where('institution_subject_id', '=', $institution_subject_id)->count();
 
         $total_female_students = self::with(['student' => function($query) {
                         $query->where('student.gender_id', '=', 2);
-                    }])->whereHas('student', function ($query) {
+                    }])->whereHas('student', function($query) {
                     $query->where('gender_id', '=', 2);
                 })->where('institution_subject_id', '=', $institution_subject_id)->count();
 

app/Imports/StudentUpdate.php

Spacing +39 added lines, -39 removed lines

@@ -55,7 +55,7 @@ 
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Concerns\RegistersEventListeners;
 
-class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{
+class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{
 
     use Importable,
         RegistersEventListeners,
@@ -108,9 +108,9 @@ 
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
 
 
@@ -144,10 +144,10 @@ 
 
                 $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first();
 
-                if(!empty($row['admission_no']) && !empty($academicPeriod)){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
-                    ->where('academic_period_id','=',$academicPeriod->id)
+                if (!empty($row['admission_no']) && !empty($academicPeriod)) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
+                    ->where('academic_period_id', '=', $academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
                 
@@ -173,17 +173,17 @@ 
                 if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) {
 
                     // convert Meeter to CM
-                    $hight = $row['bmi_height'] / 100;
+                    $hight = $row['bmi_height']/100;
 
                     //calculate BMI
-                    $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                    $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                     $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
-                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id )
-                            ->where('security_user_id','=',$student->student_id)->count();
+                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
+                            ->where('security_user_id', '=', $student->student_id)->count();
 
                     \Log::debug('User_body_mass');
-                    if(!($count > 0)){
+                    if (!($count > 0)) {
                         User_body_mass::create([
                             'height' => $row['bmi_height'],
                             'weight' => $row['bmi_weight'],
@@ -197,10 +197,10 @@ 
                 }
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
-                    $openemisFather =  $this->uniqueUid::getUniqueAlphanumeric();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
+                    $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
                     $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
@@ -214,7 +214,7 @@ 
 
                     if ($father === null) {
                         $data = [
-                            'username' => str_replace('-','',$openemisFather),
+                            'username' => str_replace('-', '', $openemisFather),
                             'openemis_no' => $openemisFather,
                             'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                             'last_name' => genNameWithInitials($row['fathers_full_name']),
@@ -233,25 +233,25 @@ 
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                                 ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
                     }
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -266,7 +266,7 @@ 
 
                     if ($mother === null) {
                         $mother = Security_user::create([
-                                    'username' => str_replace('-','',$openemisMother),
+                                    'username' => str_replace('-', '', $openemisMother),
                                     'openemis_no' => $openemisMother,
                                     'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['mothers_full_name']),
@@ -284,16 +284,16 @@ 
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }   
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                                 ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
                     }
@@ -302,9 +302,9 @@ 
 
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -319,7 +319,7 @@ 
 
                     if ($guardian === null) {
                         $guardian = Security_user::create([
-                                    'username' => str_replace('-','',$openemisGuardian),
+                                    'username' => str_replace('-', '', $openemisGuardian),
                                     'openemis_no' => $openemisGuardian,
                                     'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['guardians_full_name']),
@@ -338,22 +338,22 @@ 
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }  
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                                 ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         } 
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
                     }
                 }
 
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
 
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 // $stundetSubjects = $this->getStudentSubjects($student);
@@ -362,10 +362,10 @@ 
                 if (!empty($allSubjects)) {
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
                     $this->student = $student;
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
                     // $allSubjects = array_unique($allSubjects,SORT_REGULAR);
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
-                    array_walk($allSubjects,array($this,'insertSubject'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
 
@@ -378,7 +378,7 @@ 
                             'total_male_students' => $totalStudents['total_male_students'],
                             'total_female_students' => $totalStudents['total_female_students']]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failures = $e->failures();
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);