moe-lk / bulk-upload

app/Http/Middleware/Authenticate.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
      */
     protected function redirectTo($request)
     {
-        if (! $request->expectsJson()) {
+        if (!$request->expectsJson()) {
             return route('login');
         }
     }

app/Http/Controllers/FileController.php

Spacing +14 added lines, -14 removed lines

@@ -34,7 +34,7 @@ 
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function upload(Request $request){
+    public function upload(Request $request) {
 
 
 
@@ -76,7 +76,7 @@ 
         $institution = auth()->user()->permissions->isEmpty() ? auth()->user()->principal[0]->institution_group[0]->institution->code : auth()->user()->permissions[0]->institution_staff->institution->code;
 
 
-        $fileName = time().'_'.$institution.'_'.str_replace(' ','_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
+        $fileName = time().'_'.$institution.'_'.str_replace(' ', '_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
         Storage::disk('local')->putFileAs(
             'sis-bulk-data-files/',
             $uploadFile,
@@ -84,7 +84,7 @@ 
         );
 
         $upload = new Upload;
-        $upload->fileName =$fileName;
+        $upload->fileName = $fileName;
         $upload->model = 'Student';
         $upload->node = 'None';
         $upload->institution_class_id = $class->id;
@@ -95,8 +95,8 @@ 
         return redirect('/')->withSuccess('The file is uploaded, we will process and let you know by your email');
     }
 
-    public function updateQueueWithUnprocessedFiles($id, $action){
-        if($action == 100){
+    public function updateQueueWithUnprocessedFiles($id, $action) {
+        if ($action == 100) {
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 0]);
@@ -108,14 +108,14 @@ 
     }
 
 
-    public function downloadTemplate(){
+    public function downloadTemplate() {
         $filename = 'censusNo_className_sis_students_bulk_upload';
         $version = '2007_V1.7_20200510.xlsx';
-        $file_path = storage_path() .'/app/public/'. $filename.'_'.$version;;
+        $file_path = storage_path().'/app/public/'.$filename.'_'.$version; ;
         if (file_exists($file_path))
         {
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else
@@ -129,13 +129,13 @@ 
      * @param $filename
      * @return Processed excel file with error
      */
-    public function downloadErrorFile($filename){
+    public function downloadErrorFile($filename) {
 
-        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'. $filename;
+        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'.$filename;
         if (file_exists($file_path))
         {
             return Response::download($file_path, $filename, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else
@@ -145,12 +145,12 @@ 
     }
 
 
-    public function downloadFile($filename){
-        $file_path = storage_path().'/app/sis-bulk-data-files/'. $filename;
+    public function downloadFile($filename) {
+        $file_path = storage_path().'/app/sis-bulk-data-files/'.$filename;
         if (file_exists($file_path))
         {
             return Response::download($file_path, $filename, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else

Braces +4 added lines, -7 removed lines

@@ -100,7 +100,7 @@ 
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 0]);
-        }elseif ($action == 200) {
+        } elseif ($action == 200) {
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 4]);
@@ -117,8 +117,7 @@ 
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             return View::make('errors.404');
         }
@@ -137,8 +136,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
             abort(404, 'We did not found an error file.');
         }
@@ -152,8 +150,7 @@ 
             return Response::download($file_path, $filename, [
                 'Content-Length: '. filesize($file_path)
             ]);
-        }
-        else
+        } else
         {
 
             abort(404, 'We did not found an error file.');

app/Http/Controllers/Auth/LoginController.php

Spacing +3 added lines, -3 removed lines

@@ -54,10 +54,10 @@ 
     /**
      * @return string
      */
-    public function findUsername(){
+    public function findUsername() {
         $login = request()->input('username');
 
-        $fieldType  = filter_var($login,FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
+        $fieldType = filter_var($login, FILTER_VALIDATE_EMAIL) ? 'email' : 'username';
 
         request()->merge([$fieldType => $login]);
 
@@ -67,7 +67,7 @@ 
     /**
      * @return string
      */
-    public function username(){
+    public function username() {
         return $this->username;
     }
 }

app/Permissions/HasPermissionsTrait.php

Spacing +3 added lines, -3 removed lines

@@ -7,12 +7,12 @@
 
 trait HasPermissionsTrait
 {
-    public function roles(){
-        return $this->belongsToMany(Security_group_user::class,'security_group_users');
+    public function roles() {
+        return $this->belongsToMany(Security_group_user::class, 'security_group_users');
     }
 
 
-    public function hasRole( ... $roles ) {
+    public function hasRole(... $roles) {
         foreach ($roles as $role) {
             if ($this->roles->contains('code', $role)) {
                 return true;

app/Imports/Import.php

Spacing +38 added lines, -38 removed lines

@@ -84,10 +84,10 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 0;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
@@ -96,7 +96,7 @@ 
 
     public function validateColumns($column) {
         $columns = Config::get('excel.columns');
-        if ( ($column !== "") && (!in_array($column,$columns))) {
+        if (($column !== "") && (!in_array($column, $columns))) {
 
             $this->isValidSheet = false;
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -111,16 +111,16 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 1;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
         if ($higestRow == 0) {
             exit;
-        } else {
+        }else {
             return $higestRow;
         }
     }
@@ -135,22 +135,22 @@ 
     }
 
 
-    protected function formateDate($row,$column,$format = 'Y-m-d'){
+    protected function formateDate($row, $column, $format = 'Y-m-d') {
         try {
-            if(!empty($row[$column]) && ($row[$column] !== null)){
-                switch (gettype($row[$column])){
+            if (!empty($row[$column]) && ($row[$column] !== null)) {
+                switch (gettype($row[$column])) {
                     case 'string':
                         $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]);
                         $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);
-                        $row[$column] =  \Carbon\Carbon::createFromFormat($format, $row[$column]);
+                        $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);
                         break;
                     case 'double';
-                        $row[$column] =  \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
+                        $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
                         break;
                 }
             }
             return $row;
-        }catch (Exception $e){
+        }catch (Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
             $failures = [0 => $failure];
@@ -160,32 +160,32 @@ 
     }
 
 
-    protected function mapFields($row){
+    protected function mapFields($row) {
 
         $keys = array_keys($row);
 
-        array_walk($keys,array($this,'validateColumns'));
-            $row = $this->formateDate($row,'date_of_birth_yyyy_mm_dd');
-            $row = $this->formateDate($row,'bmi_date_yyyy_mm_dd');
-            $row = $this->formateDate($row,'start_date_yyyy_mm_dd');
-            $row = $this->formateDate($row,'fathers_date_of_birth_yyyy_mm_dd');
-            $row = $this->formateDate($row,'mothers_date_of_birth_yyyy_mm_dd');
-            $row = $this->formateDate($row,'guardians_date_of_birth_yyyy_mm_dd');
+        array_walk($keys, array($this, 'validateColumns'));
+            $row = $this->formateDate($row, 'date_of_birth_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'bmi_date_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'start_date_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'fathers_date_of_birth_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
+            $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
             $columns = Config::get('excel.columns');
-            if(!$this->template) {
+            if (!$this->template) {
                 array_walk($columns, array($this, 'checkKeys'), $row);
                 $this->template = true;
             }
-            $row['admission_no'] =  str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
+            $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
             if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) {
-                $row['identity_number'] =  str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
+                $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
                 // dd(($row['date_of_birth_yyyy_mm_dd']));
-                $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first();
+                $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first();
                 if ($BirthDivision !== null) {
-                    $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')
+                    $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')
                         ->where('parent_id', '=', $BirthDivision->id)->first();
                     if ($BirthArea !== null) {
-                        $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");
+                        $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");
                     }
                 }
             }
@@ -193,12 +193,12 @@ 
         return $row;
     }
 
-    protected function checkKeys($key,$count,$row){
-       if(array_key_exists($key,$row)){
+    protected function checkKeys($key, $count, $row) {
+       if (array_key_exists($key, $row)) {
            return true;
-       }else{
+       }else {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $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]);
+            $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]);
             $failures = [0 => $failure];
             new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         };
@@ -217,7 +217,7 @@ 
     public function map($row): array {
         try {
          $row = $this->mapFields($row);
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $error = \Illuminate\Validation\ValidationException::withMessages([]);
                 $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
                 $failures = [0 => $failure];
@@ -239,19 +239,19 @@ 
         if ($exceededStudents == true) {
             try {
                 $error = \Illuminate\Validation\ValidationException::withMessages([]);
-                $failure = new Failure(3, 'remark', [3 => 'Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
+                $failure = new Failure(3, 'remark', [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]);
-            } catch (Exception $e) {
+            }catch (Exception $e) {
                 Log::info('email-sending-failed', [$e]);
             }
-        } else {
+        }else {
             return true;
         }
     }
 
-    public function getNode(){
+    public function getNode() {
         return $this->file['node'];
     }
 
@@ -305,7 +305,7 @@ 
     /**
      *
      */
-    protected function setStudentSubjects($subject){
+    protected function setStudentSubjects($subject) {
         return [
             'id' => (string) Uuid::generate(4),
             'student_id' => $this->student->student_id,
@@ -321,8 +321,8 @@ 
         ];
     }
 
-    protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject)){
+    protected function insertSubject($subject) {
+        if (!Institution_subject_student::isDuplicated($subject)) {
             Institution_subject_student::updateOrInsert($subject);
         }
     }

Braces +2 added lines, -2 removed lines

@@ -150,7 +150,7 @@ 
                 }
             }
             return $row;
-        }catch (Exception $e){
+        } catch (Exception $e){
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system'], [null]);
             $failures = [0 => $failure];
@@ -196,7 +196,7 @@ 
     protected function checkKeys($key,$count,$row){
        if(array_key_exists($key,$row)){
            return true;
-       }else{
+       } else{
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $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]);
             $failures = [0 => $failure];

app/Imports/StudentUpdate.php

Braces +3 added lines, -2 removed lines

@@ -423,8 +423,9 @@
     }
 
     protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject))
-                Institution_subject_student::updateOrInsert($subject);
+        if(!Institution_subject_student::isDuplicated($subject)) {
+                        Institution_subject_student::updateOrInsert($subject);
+        }
     }
 
 

Spacing +41 added lines, -41 removed lines

@@ -54,7 +54,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,
@@ -79,7 +79,7 @@ 
                 $worksheet = $event->getSheet();
                 $this->highestRow = $worksheet->getHighestDataRow('B');
             },
-            BeforeImport::class => function (BeforeImport $event) {
+            BeforeImport::class => function(BeforeImport $event) {
                 $event->getReader()->getDelegate()->setActiveSheetIndex(2);
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('B'));
                 if ($this->highestRow < 3) {
@@ -108,7 +108,7 @@ 
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
                 $genderId = null;
-                if($row['gender_mf'] !== null){
+                if ($row['gender_mf'] !== null) {
                     $genderId = $row['gender_mf'] == 'M' ? 1 : 2;
                 }
                 switch ($row['gender_mf']) {
@@ -120,9 +120,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();
 
 
@@ -191,17 +191,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'],
@@ -215,10 +215,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;
@@ -232,7 +232,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']),
@@ -251,25 +251,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;
@@ -284,7 +284,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']),
@@ -302,16 +302,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']);
                     }
@@ -320,9 +320,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;
@@ -337,7 +337,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']),
@@ -356,22 +356,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);
@@ -380,10 +380,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'));
                     // Institution_subject_student::insert((array) $allSubjects);
 //                    array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
@@ -394,7 +394,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]);
@@ -406,7 +406,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);
@@ -420,8 +420,8 @@ 
                         ->where('institution_class_id', '=', $student->institution_class_id)->get()->toArray();
     }
 
-    protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject))
+    protected function insertSubject($subject) {
+        if (!Institution_subject_student::isDuplicated($subject))
                 Institution_subject_student::updateOrInsert($subject);
     }
 
@@ -450,7 +450,7 @@ 
             '*.admission_no' => 'nullable|max:12|min:4',
             '*.start_date_yyyy_mm_dd' => 'nullable|date',
             '*.special_need_type' => 'nullable',
-            '*.special_need' => 'nullable|exists:special_need_difficulties,name|required_if:special_need_type,Differantly Able',//|exists:special_need_difficulties,name
+            '*.special_need' => 'nullable|exists:special_need_difficulties,name|required_if:special_need_type,Differantly Able', //|exists:special_need_difficulties,name
             '*.fathers_full_name' => 'nullable|regex:/^[\pL\s\-]+$/u',
             '*.fathers_date_of_birth_yyyy_mm_dd' => 'nullable|required_with:*.fathers_full_name',
             '*.fathers_address' => 'required_with:*.fathers_full_name',

app/Imports/StudentImport.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
         // TODO: Implement registerEvents() method.
 
         return [
-            BeforeSheet::class => function(BeforeSheet $event){
+            BeforeSheet::class => function(BeforeSheet $event) {
                 $this->sheetNames[] = $event->getSheet()->getTitle();
 
             }

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      public function boot()
      {
          //
-         if((\App::environment('dev')) |  (\App::environment('stage')) | (\App::environment('prod'))) {
+         if ((\App::environment('dev')) | (\App::environment('stage')) | (\App::environment('prod'))) {
              URL::forceScheme('https');
          }
      }

app/Providers/ValidatorExtended.php

Spacing +41 added lines, -41 removed lines

@@ -56,43 +56,43 @@ 
         if (empty($value)) {
             return false;
         } elseif ($gradeEntity !== null) {
-            $admissionAge = (($gradeEntity->admission_age)*12)-1;
+            $admissionAge = (($gradeEntity->admission_age)*12) - 1;
             $to = $academicPeriod->start_date;
             $diff_in_months = $to->diffInMonths($value);
             $ageOfStudent = $diff_in_months;
             $enrolmentMaximumAge = $admissionAge + 120;
             return ($ageOfStudent <= $enrolmentMaximumAge) && ($ageOfStudent >= $admissionAge);
-        } else {
+        }else {
             return false;
         }
     }
 
     protected function validateBmi($attribute, $value, $parameters)
     {
-        $bmiGrades =  ['G1','G4','G7','G10'];
+        $bmiGrades = ['G1', 'G4', 'G7', 'G10'];
         $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $parameters[0])
-        ->join('education_grades','institution_class_grades.education_grade_id','education_grades.id')
+        ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id')
         ->first();
-        $educationGrade =  Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first();
-            if(in_array($institutionGrade->code,$bmiGrades)){
-                if(!empty($value)){
-                    if(($attribute == 'bmi_height') || ('bmi_weight')){
+        $educationGrade = Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first();
+            if (in_array($institutionGrade->code, $bmiGrades)) {
+                if (!empty($value)) {
+                    if (($attribute == 'bmi_height') || ('bmi_weight')) {
                         $v = Validator::make([$attribute => $value], [
                             $attribute => 'number|min:10|max:200'
                             ]);
-                        if($v->fails()) {
-                            $this->_custom_messages['bmi'] =  $attribute.' is not a valid input';
+                        if ($v->fails()) {
+                            $this->_custom_messages['bmi'] = $attribute.' is not a valid input';
                             $this->_set_custom_stuff();
                             return false;
                         }
                         return true;
                     }
-                }else{
-                    $this->_custom_messages['bmi'] =  $attribute.' is required for '. $educationGrade->name;
+                }else {
+                    $this->_custom_messages['bmi'] = $attribute.' is required for '.$educationGrade->name;
                     $this->_set_custom_stuff();
                     return false;
                 }
-            }else{
+            }else {
                 return true;
             }
     }
@@ -100,58 +100,58 @@ 
     protected function validateBirthPlace($attribute, $value, $perameters, $validator) {
         foreach ($validator->getData() as $data) {
             if ($data['identity_type'] == 'BC' && key_exists('birth_divisional_secretariat', $data)) {
-                $BirthDivision = Area_administrative::where('name', '=',  '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); //
-                if ($BirthDivision->count() > 0 ) {
-                    $BirthArea = Area_administrative::where('name', '=', '%'. $value.'%') //$data['birth_registrar_office_as_in_birth_certificate']
+                $BirthDivision = Area_administrative::where('name', '=', '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); //
+                if ($BirthDivision->count() > 0) {
+                    $BirthArea = Area_administrative::where('name', '=', '%'.$value.'%') //$data['birth_registrar_office_as_in_birth_certificate']
                                     ->where('parent_id', '=', $BirthDivision->first()->id)->count();
-                    return $BirthArea  > 0;
+                    return $BirthArea > 0;
                 } elseif (key_exists('birth_divisional_secretariat', $data) && (!key_exists('birth_registrar_office_as_in_birth_certificate', $data))) {
                     $this->_custom_messages['birth_place'] = 'birth_registrar_office_as_in_birth_certificate required with BC';
                     $this->_set_custom_stuff();
                     return false;
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
     }
 
     protected function validateIsStudentInClass($attribute, $value, $perameters, $validator) {
-        $student =  Security_user::where('openemis_no', '=', $value);
-        if($student->count() > 0){
+        $student = Security_user::where('openemis_no', '=', $value);
+        if ($student->count() > 0) {
             $student = $student->first()->toArray();
-            $check =  Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id','=',$perameters[0])->count();
-            if($check == 1){
+            $check = Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count();
+            if ($check == 1) {
                 return true;
-            }else{
+            }else {
                 return false;
             }
-        }else{
+        }else {
             return false;
         }
 
     }
-    protected function validateNic($attribute, $value, $perameters, $validator){
+    protected function validateNic($attribute, $value, $perameters, $validator) {
         $valid = preg_match('/^([0-9]{9}[VX]|[0-9]{12})$/i', $value);
-       if(!$valid){
-             $this->_custom_messages['nic'] = $attribute. ' is not valid,  Please check the NIC number';
+       if (!$valid) {
+             $this->_custom_messages['nic'] = $attribute.' is not valid,  Please check the NIC number';
              $this->_set_custom_stuff();
              return false;
-       }else{
+       }else {
            return true;
        }
     }
 
     protected function validateUserUnique($attribute, $value, $perameters, $validator) {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if ($identityType !== null && ($value !== null)) {
                 if ($identityType->national_code === 'BC') {
-                    return $this->checkUnique($value, $data,$identityType);
+                    return $this->checkUnique($value, $data, $identityType);
                 } elseif ($identityType->national_code === 'NIC') {
-                    return $this->checkUnique($value, $data,$identityType);
+                    return $this->checkUnique($value, $data, $identityType);
                 }
             } elseif (($value == null) || $value == "") {
                 return true;
@@ -161,39 +161,39 @@ 
 
     protected function validateIsBc($attribute, $value, $perameters, $validator) {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if (($identityType !== null) && ($identityType !== "")) {
                 if (($identityType->national_code) === 'BC') {
                     return  (strlen((string) $data['identity_number']) < 7);
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
     }
 
-    protected function checkUnique($value, $data,$identityType) {
+    protected function checkUnique($value, $data, $identityType) {
         $isUnique = Security_user::where('identity_number', '=', $value)->where('identity_type_id', '=', $identityType->id);
         if ($isUnique->count() > 0) {
-            $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : ' . $isUnique->first()->openemis_no;
+            $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : '.$isUnique->first()->openemis_no;
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
 
     protected function IsBc($data, $value) {
-        $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+        $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
         if ($identityType !== null) {
             if (($identityType->national_code) === 'BC' && strlen((string) $value) < 8) {
                 return false;
-            } else {
+            }else {
                 return true;
             }
-        } else {
+        }else {
             return true;
         }
     }

Braces +5 added lines, -5 removed lines

@@ -87,12 +87,12 @@ 
                         }
                         return true;
                     }
-                }else{
+                } else{
                     $this->_custom_messages['bmi'] =  $attribute.' is required for '. $educationGrade->name;
                     $this->_set_custom_stuff();
                     return false;
                 }
-            }else{
+            } else{
                 return true;
             }
     }
@@ -125,10 +125,10 @@ 
             $check =  Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id','=',$perameters[0])->count();
             if($check == 1){
                 return true;
-            }else{
+            } else{
                 return false;
             }
-        }else{
+        } else{
             return false;
         }
 
@@ -139,7 +139,7 @@ 
              $this->_custom_messages['nic'] = $attribute. ' is not valid,  Please check the NIC number';
              $this->_set_custom_stuff();
              return false;
-       }else{
+       } else{
            return true;
        }
     }