moe-lk / bulk-upload

app/Providers/AppServiceProvider.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
      *
      * @return void
      */
-     public function boot()
-     {
-         //
-         if(!(\App::environment('local'))) {
-             URL::forceScheme('https');
-         }
-     }
+        public function boot()
+        {
+            //
+            if(!(\App::environment('local'))) {
+                URL::forceScheme('https');
+            }
+        }
 }

Spacing +1 added lines, -1 removed lines

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

app/Models/Security_group_institution.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_institution extends Model  {
+class Security_group_institution extends Model {
 
 
     /**
@@ -44,21 +44,21 @@ 
 
 
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
-    public function institution_classes(){
-        return $this->hasMany('App\Models\Institution_class','institution_id','institution_id')
+    public function institution_classes() {
+        return $this->hasMany('App\Models\Institution_class', 'institution_id', 'institution_id')
         ->select('institution_classes.*')
-        ->join('academic_periods', function($query){
-            $query->on('institution_classes.academic_period_id','academic_periods.id');
-            $query->whereIn('academic_periods.code',['2020','2019/2020']);
+        ->join('academic_periods', function($query) {
+            $query->on('institution_classes.academic_period_id', 'academic_periods.id');
+            $query->whereIn('academic_periods.code', ['2020', '2019/2020']);
         });
     }
 
-    public function security_group(){
-        return $this->belongsTo('App\Models\Security_group','security_group_id');
+    public function security_group() {
+        return $this->belongsTo('App\Models\Security_group', 'security_group_id');
     }
 
 }
\ No newline at end of file

app/Models/Security_group_user.php

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_user extends Model  {
+class Security_group_user extends Model {
 
     public const CREATED_AT = 'created';
     public const UPDATED_AT = 'modified';
@@ -45,39 +45,39 @@ 
     protected $dates = ['modified', 'created', 'created'];
 
 
-    public function security_user(){
-        return $this->belongsToMany('App\Models\User','security_users');
+    public function security_user() {
+        return $this->belongsToMany('App\Models\User', 'security_users');
     }
 
-    public function security_group(){
-        return $this->hasMany('App\Models\Security_group' , 'id','security_group_id');
+    public function security_group() {
+        return $this->hasMany('App\Models\Security_group', 'id', 'security_group_id');
     }
 
-    public function security_group_institution(){
-        return $this->belongsTo('App\Models\Security_group_institution','security_group_id','security_group_id');
+    public function security_group_institution() {
+        return $this->belongsTo('App\Models\Security_group_institution', 'security_group_id', 'security_group_id');
     }
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','security_user_id')
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'security_user_id')
         ->select('institution_classes.*')
-        ->join('academic_periods',function($query){
-            $query->on('institution_classes.academic_period_id','academic_periods.id');
-            $query->whereIn('academic_periods.code',['2020','2019/2020']);
+        ->join('academic_periods', function($query) {
+            $query->on('institution_classes.academic_period_id', 'academic_periods.id');
+            $query->whereIn('academic_periods.code', ['2020', '2019/2020']);
         });
     }
 
-    public function institution_staff(){
-        return $this->belongsTo('App\Models\Institution_staff','security_user_id','staff_id');
+    public function institution_staff() {
+        return $this->belongsTo('App\Models\Institution_staff', 'security_user_id', 'staff_id');
     }
 
-    public function institution_group(){
-        return $this->hasMany('App\Models\Security_group_institution','security_group_id','security_group_id')
-            ->with(['institution','institution_classes']);
+    public function institution_group() {
+        return $this->hasMany('App\Models\Security_group_institution', 'security_group_id', 'security_group_id')
+            ->with(['institution', 'institution_classes']);
     }
 
 
-    public function roles(){
-        return $this->belongsTo('App\Models\Security_role','security_role_id','id');
+    public function roles() {
+        return $this->belongsTo('App\Models\Security_role', 'security_role_id', 'id');
     }
 
 

app/Models/Institution_staff.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_staff extends Model  {
+class Institution_staff extends Model {
 
     /**
      * The database table used by the model.
@@ -42,13 +42,13 @@ 
     protected $dates = ['start_date', 'end_date', 'modified', 'created'];
 
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','staff_id')
-        ->innerJoin('academic_periods','institution_classes.academic_period_id','academic_periods.id')
-        ->where('academic_periods.current',1);
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'staff_id')
+        ->innerJoin('academic_periods', 'institution_classes.academic_period_id', 'academic_periods.id')
+        ->where('academic_periods.current', 1);
     }
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 }
\ No newline at end of file

app/Providers/ValidatorExtended.php

Spacing +34 added lines, -34 removed lines

@@ -71,17 +71,17 @@ 
             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;
             }
-        } else {
-            $this->_custom_messages['admission_age'] = 'given' . $attribute . 'Not found';
+        }else {
+            $this->_custom_messages['admission_age'] = 'given'.$attribute.'Not found';
             $this->_set_custom_stuff();
             return false;
         }
@@ -92,16 +92,16 @@ 
 
         if (is_numeric($value)) {
             if ($value < 10) {
-                $this->_custom_messages['bmi'] =  $attribute . ' is must greater than 10';
+                $this->_custom_messages['bmi'] = $attribute.' is must greater than 10';
                 $this->_set_custom_stuff();
                 return false;
             } elseif ($value > 250) {
-                $this->_custom_messages['bmi'] =  $attribute . ' is must smaller than 250';
+                $this->_custom_messages['bmi'] = $attribute.' is must smaller than 250';
                 $this->_set_custom_stuff();
                 return false;
             }
-        } else {
-            $this->_custom_messages['bmi'] =  $attribute . ' is must a valid numeric';
+        }else {
+            $this->_custom_messages['bmi'] = $attribute.' is must a valid numeric';
             $this->_set_custom_stuff();
             return false;
         }
@@ -110,18 +110,18 @@ 
 
     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')
             ->first();
-        $educationGrade =  Education_grade::where('id', '=', $institutionGrade->education_grade_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')) {
                     return $this->validateHW($attribute, $value);
                 }
-            } 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;
             }
@@ -129,7 +129,7 @@ 
             if (($attribute == 'bmi_height') || ('bmi_weight')) {
                 return $this->validateHW($attribute, $value);
             }
-        } else {
+        }else {
             return true;
         }
     }
@@ -138,19 +138,19 @@ 
     {
         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); //
+                $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']
+                    $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;
             }
         }
@@ -158,16 +158,16 @@ 
 
     protected function validateIsStudentInClass($attribute, $value, $perameters, $validator)
     {
-        $student =  Security_user::where('openemis_no', '=', $value);
+        $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();
+            $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;
         }
     }
@@ -178,7 +178,7 @@ 
     {
         $valid = true;
         foreach ($validator->getData() as $data) {
-            switch($data[$perameters[0]]){
+            switch ($data[$perameters[0]]) {
                 case 'BC':
                     $valid = preg_match('/^([0-9]{10,12})$/i', $value);
                     break;
@@ -191,10 +191,10 @@ 
         }
         
         if (!$valid) {
-            $this->_custom_messages['nic'] = $attribute . ' is not valid,  Please check the NIC number';
+            $this->_custom_messages['nic'] = $attribute.' is not valid,  Please check the NIC number';
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
@@ -202,7 +202,7 @@ 
     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);
@@ -218,14 +218,14 @@ 
     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;
             }
         }
@@ -235,24 +235,24 @@ 
     {
         $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;
         }
     }

app/Imports/Import.php

Spacing +30 added lines, -30 removed lines

@@ -89,10 +89,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;
             }
         }
@@ -106,7 +106,7 @@ 
         $this->failures = [];
         if (($column !== "") && (!in_array($column, $columns))) {
             $this->isValidSheet = false;
-            $this->error[] = 'Unsupported column found ,remove:' . $column;
+            $this->error[] = 'Unsupported column found ,remove:'.$column;
             $this->failure = new Failure(3, 'remark', $this->error, [null]);
             $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
         }
@@ -119,13 +119,13 @@ 
     {
         $columns = Config::get('excel.columns');
         $optional_columns = Config::get('excel.optional_columns');
-        $columns = array_diff ($columns,$optional_columns);
+        $columns = array_diff($columns, $optional_columns);
         $error = \Illuminate\Validation\ValidationException::withMessages([]);
         $this->failures = [];
         foreach ($columns as  $column) {
                 if (($column !== "") && (!in_array($column, $existingColumns))) {
                     $this->isValidSheet = false;
-                    $this->error[] = 'Missing Column :' . $column . ' Not found';
+                    $this->error[] = 'Missing Column :'.$column.' Not found';
                     $this->failure = new Failure(3, 'remark', $this->error, [null]);
                     $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
                 }
@@ -142,16 +142,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;
         }
     }
@@ -176,17 +176,17 @@ 
                     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 ' . $row[$column] . ' Not a valid date formate'], [null]);
+            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         }
@@ -207,18 +207,18 @@ 
         $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
         $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
 
-        $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 (array_key_exists('identity_type', $row)) {
         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");
                 }
             }
 
@@ -231,9 +231,9 @@ 
     {
         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);
         };
@@ -268,11 +268,11 @@ 
         $exceededStudents = ($totalStudents + $this->limit()) > $institutionClass->no_of_students ? true : false;
         if ($exceededStudents == true) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
+            $failure = new Failure(3, 'remark', ['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]);
-        } else {
+        }else {
             return true;
         }
     }
@@ -331,20 +331,20 @@ 
         $this->updateSubjectCount($subject);
     }
 
-    public function createOrUpdateGuardian($row,$student,$param){
+    public function createOrUpdateGuardian($row, $student, $param) {
         if (!empty($row[$param.'s_full_name']) && ($row[$param.'s_date_of_birth_yyyy_mm_dd'] !== null)) {
             $guardian = Security_user::createOrUpdateGuardianProfile($row, $param, $this->file);
             if (!is_null($guardian)) {
                 Security_user::where('id', '=', $guardian->id)
                     ->update(['is_guardian' => 1]);
-                $guardian['guardian_relation_id'] = $this->setRelation($param,$guardian);
+                $guardian['guardian_relation_id'] = $this->setRelation($param, $guardian);
                 Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
             }      
         } 
     }
 
-    protected function setRelation($param,$guardian){
-        switch($param){
+    protected function setRelation($param, $guardian) {
+        switch ($param) {
             case 'father':
                 return 1;
             case 'mother':  
@@ -354,7 +354,7 @@ 
         }
     }
 
-    protected function setGender($row){
+    protected function setGender($row) {
         switch ($row['gender_mf']) {
             case 'M':
                 $row['gender_mf'] = 1;
@@ -368,17 +368,17 @@ 
         return $row;
     }
 
-    protected function insertOrUpdateSubjects($row,$student,$institution){
+    protected function insertOrUpdateSubjects($row, $student, $institution) {
         $mandatorySubject = Institution_class_subject::getMandatorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 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 = 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'));
                 }
     }

app/Imports/UsersImport.php

Spacing +17 added lines, -17 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([]);
@@ -115,7 +115,7 @@ 
                 $row = $this->setGender($row);
                 $mandatorySubject = Institution_class_subject::getMandatorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
-                $student = Security_user::createOrUpdateStudentProfile($row,'create',$this->file);  
+                $student = Security_user::createOrUpdateStudentProfile($row, 'create', $this->file);  
                 $academicPeriod = Academic_period::where('id', '=', $institutionClass->academic_period_id)->first();
                 $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass->id)->first();
                 $assignee_id = $institutionClass->staff_id ? $institutionClass->staff_id : $this->file['security_user_id'];
@@ -128,24 +128,24 @@ 
                     'institution_class' => $institutionClass
                 ];
 
-                Institution_student_admission::createAdmission($student->id,$row,$params,$this->file);
-                Institution_student::createOrUpdate($student->id,$row,$params,$this->file);
-                $student = Institution_class_student::createOrUpdate($student->id,$params,$this->file);
-                User_special_need::createOrUpdate($student->student_id,$row,$this->file);
-                User_body_mass::createOrUpdate($student->student_id,$row,$this->file);
+                Institution_student_admission::createAdmission($student->id, $row, $params, $this->file);
+                Institution_student::createOrUpdate($student->id, $row, $params, $this->file);
+                $student = Institution_class_student::createOrUpdate($student->id, $params, $this->file);
+                User_special_need::createOrUpdate($student->student_id, $row, $this->file);
+                User_body_mass::createOrUpdate($student->student_id, $row, $this->file);
 
-                $this->createOrUpdateGuardian($row,$student,'father');
-                $this->createOrUpdateGuardian($row,$student,'mother');
-                $this->createOrUpdateGuardian($row,$student,'guardian');
+                $this->createOrUpdateGuardian($row, $student, 'father');
+                $this->createOrUpdateGuardian($row, $student, 'mother');
+                $this->createOrUpdateGuardian($row, $student, 'guardian');
         
                 Institution_student::updateStudentArea($student->toArray());
 
-                $this->insertOrUpdateSubjects($row,$student,$institution);
+                $this->insertOrUpdateSubjects($row, $student, $institution);
                 
                 $totalStudents = Institution_class_student::getStudentsCount($this->file['institution_class_id']);
                 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]);
@@ -154,7 +154,7 @@ 
                 $institutionClass = new Institution_class();
                 $institutionClass->updateClassCount($this->file);
             }
-        } 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);
@@ -169,7 +169,7 @@ 
             '*.full_name' => 'required|regex:/^[a-zA-Z .]*$/u|max:256',
             '*.preferred_name' => 'nullable|regex:/^[a-zA-Z .]*$/u|max:90',
             '*.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',
@@ -178,8 +178,8 @@ 
             '*.identity_number' => 'nullable|identity:identity_type|required_with:identity_type',
             '*.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/Imports/StudentUpdate.php

Spacing +12 added lines, -12 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,
@@ -89,29 +89,29 @@ 
             $institution = $institutionClass->institution_id;
             if (!empty($institutionClass)) {
                 $this->setGender($row);
-                $studentInfo = Security_user::createOrUpdateStudentProfile($row,'update',$this->file);
+                $studentInfo = Security_user::createOrUpdateStudentProfile($row, 'update', $this->file);
                 $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first();
-                if(!empty($row['admission_no'])){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
+                if (!empty($row['admission_no'])) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
-                User_special_need::createOrUpdate($studentInfo->id,$row,$this->file);
-                User_body_mass::createOrUpdate($studentInfo->id,$row,$this->file);
+                User_special_need::createOrUpdate($studentInfo->id, $row, $this->file);
+                User_body_mass::createOrUpdate($studentInfo->id, $row, $this->file);
 
-                $this->createOrUpdateGuardian($row,$student,'father');
-                $this->createOrUpdateGuardian($row,$student,'mother');
-                $this->createOrUpdateGuardian($row,$student,'guardian');
+                $this->createOrUpdateGuardian($row, $student, 'father');
+                $this->createOrUpdateGuardian($row, $student, 'mother');
+                $this->createOrUpdateGuardian($row, $student, 'guardian');
 
                 Institution_student::updateStudentArea($student->toArray());
-                $this->insertOrUpdateSubjects($row,$student,$institution);
+                $this->insertOrUpdateSubjects($row, $student, $institution);
                 $totalStudents = Institution_class_student::getStudentsCount($this->file['institution_class_id']);
                 Institution_class::where('id', '=', $institutionClass->id)
                         ->update([
                             '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);

app/Models/Security_user.php

Spacing +23 added lines, -23 removed lines

@@ -204,7 +204,7 @@ 
             $studentData['id'] = $id;
             $this->uniqueUserId->updateOrInsertRecord($studentData);
             return $studentData;
-        } catch (\Exception $th) {
+        }catch (\Exception $th) {
             Log::error($th->getMessage());
             // in case of duplication of the Unique ID this will recursive.
             $sis_student['openemis_no'] = $this->uniqueUId::getUniqueAlphanumeric();
@@ -225,7 +225,7 @@ 
         $this->uniqueUserId = new Unique_user_id();
         $this->uniqueUId = new UniqueUid();
         // regenerate unique id if it's not available
-        $uniqueId = ($this->uniqueUId::isValidUniqueId($sis_student['openemis_no'], 9)) ?  $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
+        $uniqueId = ($this->uniqueUId::isValidUniqueId($sis_student['openemis_no'], 9)) ? $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
 
         $studentData = [
             'username' => str_replace('-', '', $uniqueId),
@@ -243,7 +243,7 @@ 
             $studentData['id'] = $sis_student['student_id'];
             $this->uniqueUserId->updateOrInsertRecord($studentData);
             return $studentData;
-        } catch (\Exception $th) {
+        }catch (\Exception $th) {
             Log::error($th);
             // in case of duplication of the Unique ID this will recursive.
             $sis_student['openemis_no'] = $this->uniqueUId::getUniqueAlphanumeric();
@@ -255,9 +255,9 @@ 
     {
         try {
             $uniqueUid = new UniqueUid();
-            $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();
             
             $date = $row['date_of_birth_yyyy_mm_dd'];
             $identityType = $identityType !== null ? $identityType->id : null;
@@ -289,7 +289,7 @@ 
                     ]);
                 case 'update':
                     if (!is_null($row['student_id'])) {
-                        $studentInfo =  Security_user::where('openemis_no',trim($row['student_id']))->first();
+                        $studentInfo = Security_user::where('openemis_no', trim($row['student_id']))->first();
                         self::query()->where('openemis_no', $row['student_id'])
                             ->update([
                                 'first_name' => $row['full_name'] ? $row['full_name'] : $studentInfo['first_name'], // here we save full name in the column of first name. re reduce breaks of the system.
@@ -310,7 +310,7 @@ 
                     }
                     break;
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             dd($e);
         }
     }
@@ -319,48 +319,48 @@ 
     {
         try {
             $uniqueUid = new UniqueUid();
-            $AddressArea = Area_administrative::where('name', 'like', '%' . $row[$prefix . 's_address_area'] . '%')->first();
-            $nationalityId = Nationality::where('name', 'like', '%' . $row[$prefix . 's_nationality'] . '%')->first();
-            $identityType = Identity_type::where('national_code', 'like', '%' . $row[$prefix . 's_identity_type'] . '%')->first();
+            $AddressArea = Area_administrative::where('name', 'like', '%'.$row[$prefix.'s_address_area'].'%')->first();
+            $nationalityId = Nationality::where('name', 'like', '%'.$row[$prefix.'s_nationality'].'%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$row[$prefix.'s_identity_type'].'%')->first();
             $openemisNo = $uniqueUid::getUniqueAlphanumeric();
 
             $identityType = ($identityType !== null) ? $identityType->id : null;
             $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
 
             $guardian = null;
-            if (!empty($row[$prefix . 's_identity_number'])) {
+            if (!empty($row[$prefix.'s_identity_number'])) {
                 $guardian = Security_user::where('identity_type_id', '=', $nationalityId)
-                    ->where('identity_number', '=', $row[$prefix . 's_identity_number'])->first();
+                    ->where('identity_number', '=', $row[$prefix.'s_identity_number'])->first();
             }
 
             if (is_null($guardian)) {
                 $guardian = self::create([
                     'username' => str_replace('-', '', $openemisNo),
                     'openemis_no' => $openemisNo,
-                    'first_name' => $row[$prefix . 's_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
-                    'last_name' => genNameWithInitials($row[$prefix . 's_full_name']),
+                    'first_name' => $row[$prefix.'s_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
+                    'last_name' => genNameWithInitials($row[$prefix.'s_full_name']),
                     'gender_id' => 1,
-                    'date_of_birth' => $row[$prefix . 's_date_of_birth_yyyy_mm_dd'],
-                    'address' => $row[$prefix . 's_address'],
+                    'date_of_birth' => $row[$prefix.'s_date_of_birth_yyyy_mm_dd'],
+                    'address' => $row[$prefix.'s_address'],
                     'address_area_id' => $AddressArea ? $AddressArea->id : null,
                     'nationality_id' => $nationalityId,
                     'identity_type_id' => $identityType,
-                    'identity_number' => $row[$prefix . 's_identity_number'],
+                    'identity_number' => $row[$prefix.'s_identity_number'],
                     'is_guardian' => 1,
                     'created_user_id' => $file['security_user_id']
                 ]);
 
 
                 $guardian['guardian_relation_id'] = 1;
-                if (array_key_exists($prefix . 's_phone', $row)) {
-                    $father['contact'] = $row[$prefix . 's_phone'];
+                if (array_key_exists($prefix.'s_phone', $row)) {
+                    $father['contact'] = $row[$prefix.'s_phone'];
                     User_contact::createOrUpdate($father, $file['security_user_id']);
                 }
-            } else {
-                Security_user::where('id', $guardian->id)->update(['address_area_id' => $AddressArea ? $AddressArea->id : null,]);
+            }else {
+                Security_user::where('id', $guardian->id)->update(['address_area_id' => $AddressArea ? $AddressArea->id : null, ]);
             }
             return $guardian;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }