moe-lk / bulk-upload

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/Models/Unique_user_id.php

Indentation +5 added lines, -5 removed lines

@@ -54,7 +54,7 @@ 
 
     public  function updateOrInsertRecord($user)
     {
-       try {
+        try {
             // regenerate unique id if it's not available
         $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no'],9) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
 
@@ -69,10 +69,10 @@ 
             ]);
         }
         return $user;
-       } catch (\Exception $th) {
+        } catch (\Exception $th) {
             Log::error($th->getMessage());
-           $user['openemis_no'] = $this->uniqueUserId::getUniqueAlphanumeric();
-           $this->updateOrInsertRecord($user);
-       }
+            $user['openemis_no'] = $this->uniqueUserId::getUniqueAlphanumeric();
+            $this->updateOrInsertRecord($user);
+        }
     }
 }

Spacing +3 added lines, -3 removed lines

@@ -56,10 +56,10 @@ 
     {
        try {
             // regenerate unique id if it's not available
-        $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no'],9) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
+        $uniqueId = $this->uniqueUserId::isValidUniqueId($user['openemis_no'], 9) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
 
         //check if the user's entry exits ?
-        $exists = Unique_user_id::where('unique_id' , $uniqueId)->exists();
+        $exists = Unique_user_id::where('unique_id', $uniqueId)->exists();
 
         if (!$exists) {
             // try to feed unique user id
@@ -69,7 +69,7 @@ 
             ]);
         }
         return $user;
-       } catch (\Exception $th) {
+       }catch (\Exception $th) {
             Log::error($th->getMessage());
            $user['openemis_no'] = $this->uniqueUserId::getUniqueAlphanumeric();
            $this->updateOrInsertRecord($user);

app/Console/Commands/CleanExamData.php

Indentation +3 added lines, -3 removed lines

@@ -86,11 +86,11 @@
     }
 
     public function process($students,$count,$type){
-       if($type === 'duplicate'){
+        if($type === 'duplicate'){
         array_walk($students,array($this,'cleanData'));
-       }elseif($type === 'lock'){
+        }elseif($type === 'lock'){
         array_walk($students,array($this,'lockData'));
-       }
+        }
     }
 
     public function lockData($Student){

Spacing +25 added lines, -25 removed lines

@@ -48,24 +48,24 @@ 
     {
         $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('security_users')
             ->where('updated_from', 'doe')
             ->get()
             ->toArray();
             
-        }elseif($type == 'all'){
+        }elseif ($type == 'all') {
             $students = DB::table('examination_students')
-            ->where('nsid','<>','')
+            ->where('nsid', '<>', '')
             ->whereNotNull('nsid')
             ->get()
             ->toArray();
-        }elseif($type == 'lock'){
+        }elseif ($type == 'lock') {
             $students = DB::table('examination_students')
             ->whereNotNull('nsid')
             ->get()
@@ -73,46 +73,46 @@ 
         }
 
         $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'),$type);
-        }else{
+            processParallel($function, $students, $this->argument('max'), $type);
+        }else {
             $this->output->writeln('nothing to process, all are cleaned');
         }   
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
     }
 
-    public function process($students,$count,$type){
-       if($type === 'duplicate'){
-        array_walk($students,array($this,'cleanData'));
-       }elseif($type === 'lock'){
-        array_walk($students,array($this,'lockData'));
+    public function process($students, $count, $type) {
+       if ($type === 'duplicate') {
+        array_walk($students, array($this, 'cleanData'));
+       }elseif ($type === 'lock') {
+        array_walk($students, array($this, 'lockData'));
        }
     }
 
-    public function lockData($Student){
-        $Student = json_decode(json_encode($Student),true);
-        $student = Security_user::where('openemis_no',(string)$Student['nsid'])->first();
-        if(!empty($student)){
+    public function lockData($Student) {
+        $Student = json_decode(json_encode($Student), true);
+        $student = Security_user::where('openemis_no', (string) $Student['nsid'])->first();
+        if (!empty($student)) {
             Institution_student::where('student_id', $student->id)->update(['updated_from' => 'doe']);
             Security_user::where('id', $student->id)->update(['updated_from' => 'doe']);
-            $this->output->writeln('Locked:'. (string)$Student['nsid'] .':' . $student['openemis_no']);
+            $this->output->writeln('Locked:'.(string) $Student['nsid'].':'.$student['openemis_no']);
         }
     }
 
 
     public function cleanData($Student)
     {
-        $exist = Examination_student::where('nsid','=',  (string)$Student->openemis_no)->count();
+        $exist = Examination_student::where('nsid', '=', (string) $Student->openemis_no)->count();
         if (!$exist) {
             Institution_student::where('student_id', $Student->id)->delete();
             Institution_class_student::where('student_id', $Student->id)->delete();
             Institution_student_admission::where('student_id', $Student->id)->delete();
             Security_user::where('id', $Student->id)->delete();
-            $this->output->writeln('cleaned:'.  (string)$Student->openemis_no);
-        }else{
+            $this->output->writeln('cleaned:'.(string) $Student->openemis_no);
+        }else {
             
             Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']);
             Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']);
@@ -132,12 +132,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 +6 added lines, -6 removed lines

@@ -53,19 +53,19 @@ 
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
             ->get()
             ->toArray();
-        }elseif($type == 'duplicate'){
+        } elseif($type == 'duplicate'){
             $students = DB::table('security_users')
             ->where('updated_from', 'doe')
             ->get()
             ->toArray();
             
-        }elseif($type == 'all'){
+        } elseif($type == 'all'){
             $students = DB::table('examination_students')
             ->where('nsid','<>','')
             ->whereNotNull('nsid')
             ->get()
             ->toArray();
-        }elseif($type == 'lock'){
+        } elseif($type == 'lock'){
             $students = DB::table('examination_students')
             ->whereNotNull('nsid')
             ->get()
@@ -78,7 +78,7 @@ 
             $students = array_chunk($students, $this->argument('chunk'));
             $function = array($this, 'process');
             processParallel($function,$students, $this->argument('max'),$type);
-        }else{
+        } else{
             $this->output->writeln('nothing to process, all are cleaned');
         }   
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
@@ -87,7 +87,7 @@ 
     public function process($students,$count,$type){
        if($type === 'duplicate'){
         array_walk($students,array($this,'cleanData'));
-       }elseif($type === 'lock'){
+       } elseif($type === 'lock'){
         array_walk($students,array($this,'lockData'));
        }
     }
@@ -112,7 +112,7 @@ 
             Institution_student_admission::where('student_id', $Student->id)->delete();
             Security_user::where('id', $Student->id)->delete();
             $this->output->writeln('cleaned:'.  (string)$Student->openemis_no);
-        }else{
+        } else{
             
             Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']);
             Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']);

app/Console/Commands/OpenTOPending.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
      */
     public function handle()
     {
-        Institution_student_admission::where('status_id',121)->update([
+        Institution_student_admission::where('status_id', 121)->update([
             'status_id' => 122
         ]);
     }

app/Console/Commands/RemoveDuplications.php

Braces +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
             ->toArray();
             if(count($duplicatedStudents)>0){
                 processParallel(array($this,'process'),$duplicatedStudents,10);
-            }else{
+            } else{
                 $this->output->writeln('Nothing to Process, all are clean');
             }
         } catch (\Throwable $th) {

Spacing +12 added lines, -12 removed lines

@@ -43,29 +43,29 @@
             $this->start_time = microtime(TRUE);
             $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $this->output->writeln('############### Starting delete Duplication ################');
-            $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id')
+            $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id')
             ->groupBy('student_id')
-            ->having('total','>',1)
+            ->having('total', '>', 1)
             ->orderBy('student_id')
             ->get()
             ->toArray();
-            if(count($duplicatedStudents)>0){
-                processParallel(array($this,'process'),$duplicatedStudents,10);
-            }else{
+            if (count($duplicatedStudents) > 0) {
+                processParallel(array($this, 'process'), $duplicatedStudents, 10);
+            }else {
                 $this->output->writeln('Nothing to Process, all are clean');
             }
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             dd($th);
         }
     }
   
-    public function process($Student){
-        Institution_student::where('institution_students.id','>',$Student['id'])
-        ->where('institution_students.student_id',$Student['student_id'])
-        ->where('institution_students.academic_period_id',$Student['academic_period_id'])
-        ->where('institution_students.education_grade_id',$Student['education_grade_id'])
+    public function process($Student) {
+        Institution_student::where('institution_students.id', '>', $Student['id'])
+        ->where('institution_students.student_id', $Student['student_id'])
+        ->where('institution_students.academic_period_id', $Student['academic_period_id'])
+        ->where('institution_students.education_grade_id', $Student['education_grade_id'])
         ->delete();
         $this->end_time = microtime(TRUE);    
-        $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');
     }
 }

app/Console/Commands/UpdatePreferredName.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
      */
     public function handle()
     {
-        Security_user::where('is_student',true)
+        Security_user::where('is_student', true)
         ->whereRaw('CHAR_LENGTH(first_name) <= 90')
         ->update(['preferred_name' =>  DB::raw('first_name')]);
     }

app/Console/Commands/UpdateDoeDataGrade.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
     public function handle()
     {
         Institution_student::where('updated_from', 'doe')
-            ->where('education_grade_id','<>', 4)
+            ->where('education_grade_id', '<>', 4)
             ->update(['education_grade_id' => 4]);
     }
 }

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,7 +114,7 @@ 
                 $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;
@@ -122,15 +122,15 @@ 
                         $this->maleStudentsCount += 1;
                         break;
                     case 'F':
-                        $genderId =  $row['gender_mf'] = 2;
+                        $genderId = $row['gender_mf'] = 2;
                         $genderId = 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();
 
 
@@ -150,7 +150,7 @@ 
                     if (array_key_exists('preferred_name', $row)) {
                     $preferred_name = $row['preferred_name'];
                 }
-                $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.
@@ -240,9 +240,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();
 
@@ -256,17 +256,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;
@@ -304,7 +304,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;
@@ -317,9 +317,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;
@@ -355,7 +355,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;
@@ -370,9 +370,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;
@@ -409,7 +409,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;
@@ -441,7 +441,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]);
@@ -453,7 +453,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();
@@ -469,7 +469,7 @@ 
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:256',
             '*.preferred_name' => 'nullable|regex:/^[\pL\s\-]+$/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',
@@ -479,8 +479,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/ImportStudents.php

Spacing +54 added lines, -54 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function __construct()
     {
-        $this->output =  new \Symfony\Component\Console\Output\ConsoleOutput();
+        $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
         parent::__construct();
     }
 
@@ -69,18 +69,18 @@ 
                         $this->process($files);
                         unset($files);
                         exit();
-                    } else {
+                    }else {
                         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                         $this->output->writeln('No files found,Waiting for files');
                         exit();
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $this->output->writeln($e);
                     sleep(300);
                     $this->handle();
                 }
-            } else {
+            }else {
                 exit();
             }
         }
@@ -95,7 +95,7 @@ 
         $files[0]['node'] = $node;
         $this->processSheet($files[0]);
         $now = Carbon::now()->tz('Asia/Colombo');
-        $this->output->writeln('=============== Time taken to batch ' . $now->diffInMinutes($time));
+        $this->output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time));
     }
 
     protected function getTerminatedFiles()
@@ -138,10 +138,10 @@ 
             ->join('contact_types', 'user_contacts.contact_type_id', '=', 'contact_types.id')
        
             ;
-            if(env('APP_ENV') == 'stage'){
+            if (env('APP_ENV') == 'stage') {
                 $query->where('contact_types.contact_option_id', '=', 5)
                 ->where('contact_types.name', '=', 'TestEmail');
-            }else{
+            }else {
                 $query->where('contact_types.contact_option_id', '!=', 5);
             }
             
@@ -171,13 +171,13 @@ 
     public function processSuccessEmail($file, $user, $subject)
     {
         $file['subject'] = $subject;
-        $this->output->writeln('Processing the file: ' . $file['filename']);
+        $this->output->writeln('Processing the file: '.$file['filename']);
         try {
             Mail::to($user->email)->send(new StudentImportSuccess($file));
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -193,7 +193,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -209,7 +209,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -222,9 +222,9 @@ 
         $node = $this->argument('node');
         if ($node == $file['node']) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $this->output->writeln('Processing from:' . $node);
+            $this->output->writeln('Processing from:'.$node);
             return true;
-        } else {
+        }else {
             exit;
             return false;
         }
@@ -236,20 +236,20 @@ 
         $user = User::find($file['security_user_id']);
         $this->checkNode($file);
         $this->output->writeln('##########################################################################################################################');
-        $this->output->writeln('Processing the file: ' . $file['filename']);
+        $this->output->writeln('Processing the file: '.$file['filename']);
         if ($this->checkTime()) {
             try {
                 $this->import($file, 1, 'C');
                 sleep(10);
                 $this->import($file, 2, 'B');
-            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $this->output->writeln($e->getMessage());
                 try {
                     Mail::to($user->email)->send(new IncorrectTemplate($file));
                     DB::table('uploads')
                         ->where('id', $file['id'])
                         ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-                } catch (\Exception $ex) {
+                }catch (\Exception $ex) {
                     $this->output->writeln($e->getMessage());
                     $this->handle();
                     DB::table('uploads')
@@ -257,15 +257,15 @@ 
                         ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
                 }
             }
-        } else {
+        }else {
             exit();
         }
     }
 
     protected function getType($file)
     {
-        $file =  storage_path() . '/app/sis-bulk-data-files/' . $file;
-        $inputFileType =  \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
+        $file = storage_path().'/app/sis-bulk-data-files/'.$file;
+        $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
         return $inputFileType;
     }
 
@@ -323,7 +323,7 @@ 
             ini_set('memory_limit', '2048M');
             $this->getFileSize($file);
             $user = User::find($file['security_user_id']);
-            $excelFile = '/sis-bulk-data-files/' . $file['filename'];
+            $excelFile = '/sis-bulk-data-files/'.$file['filename'];
             $this->higestRow = $this->getHigestRow($file, $sheet, $column);
             switch ($sheet) {
                 case 1;
@@ -342,14 +342,14 @@ 
                                 ->update(['insert' => 3, 'updated_at' => now()]);
                             $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success ');
                             $this->stdOut('Insert Students', $this->higestRow);
-                        } else {
+                        }else {
                             DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['insert' => 1, 'updated_at' => now()]);
                             $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success ');
                             $this->stdOut('Insert Students', $this->higestRow);
                         }
-                    } else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) {
+                    }else if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) {
                         DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2]);
@@ -368,14 +368,14 @@ 
                                 ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]);
                             $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success ');
                             $this->stdOut('Update Students', $this->higestRow);
-                        } else {
+                        }else {
                             DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]);
                             $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success ');
                             $this->stdOut('Update Students', $this->higestRow);
                         }
-                    } else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) {
+                    }else if (($this->getSheetName($file, 'Update Students')) && $this->higestRow == 0) {
                         DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2, 'updated_at' => now()]);
@@ -383,7 +383,7 @@ 
                     }
                     break;
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $this->output->writeln($e->getMessage());
             if ($sheet == 1) {
                 self::writeErrors($e, $file, 'Insert Students');
@@ -391,7 +391,7 @@ 
                     ->where('id', $file['id'])
                     ->update(['insert' => 2, 'updated_at' => now()]);
                 $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed');
-            } else if ($sheet == 2) {
+            }else if ($sheet == 2) {
                 self::writeErrors($e, $file, 'Update Students');
                 DB::table('uploads')
                     ->where('id', $file['id'])
@@ -399,7 +399,7 @@ 
                 $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed');
             }
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
         }
     }
@@ -417,14 +417,14 @@ 
 
     protected function  getFileSize($file)
     {
-        $excelFile =  '/sis-bulk-data-files/' . $file['filename'];
+        $excelFile = '/sis-bulk-data-files/'.$file['filename'];
         $size = Storage::disk('local')->size($excelFile);
         $user = User::find($file['security_user_id']);
         if ($size > 0) {
             return true;
-        } else {
+        }else {
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -434,21 +434,21 @@ 
     protected function setReader($file)
     {
         try {
-            $excelFile =  '/sis-bulk-data-files/processed/' . $file['filename'];
+            $excelFile = '/sis-bulk-data-files/processed/'.$file['filename'];
             $exists = Storage::disk('local')->exists($excelFile);
             if (!$exists) {
 
-                $excelFile =  "/sis-bulk-data-files/" . $file['filename'];
+                $excelFile = "/sis-bulk-data-files/".$file['filename'];
             }
-            $excelFile = storage_path() . "/app" . $excelFile;
+            $excelFile = storage_path()."/app".$excelFile;
             $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename']));
-            $objPHPExcel =  $reader->load($excelFile);
+            $objPHPExcel = $reader->load($excelFile);
             return $objPHPExcel;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -459,12 +459,12 @@ 
     {
         try {;
             $objPHPExcel = $this->setReader($file);
-            return $objPHPExcel->getSheetByName($sheet)  !== null;
-        } catch (Exception $e) {
+            return $objPHPExcel->getSheetByName($sheet) !== null;
+        }catch (Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -477,17 +477,17 @@ 
             $reader = $this->setReader($file);
             $reader->setActiveSheetIndex($sheet);
             $higestRow = 0;
-            $highestRow =  $reader->getActiveSheet()->getHighestRow($column);
+            $highestRow = $reader->getActiveSheet()->getHighestRow($column);
             for ($row = 3; $row <= $highestRow; $row++) {
-                $rowData = $reader->getActiveSheet()->getCell($column . $row)->getValue();
+                $rowData = $reader->getActiveSheet()->getCell($column.$row)->getValue();
                 if (empty($rowData) || $rowData == null) {
                     continue;
-                } else {
+                }else {
                     $higestRow += 1;
                 }
             }
             return $higestRow;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();
@@ -502,10 +502,10 @@ 
 
     protected function stdOut($title, $rows)
     {
-        $this->output->writeln($title . ' Process completed at . ' . ' ' . now());
+        $this->output->writeln($title.' Process completed at . '.' '.now());
         $now = Carbon::now()->tz('Asia/Colombo');
-        $this->output->writeln('Total Processed lines: ' . $rows);
-        $this->output->writeln('Time taken to process           : ' .   $now->diffInSeconds($this->startTime) . ' Seconds');
+        $this->output->writeln('Total Processed lines: '.$rows);
+        $this->output->writeln('Time taken to process           : '.$now->diffInSeconds($this->startTime).' Seconds');
         $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------');
     }
 
@@ -517,7 +517,7 @@ 
         $sheet = $reader->getActiveSheet();
         if (!in_array($row, $params['rows'])) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $this->output->writeln(' removing row . ' . ' ' . $row);
+            $this->output->writeln(' removing row . '.' '.$row);
             $reader->getActiveSheet()->getCellCollection()->removeRow($row);
         }
     }
@@ -543,7 +543,7 @@ 
             if (count($failures) > 0) {
                 $rows = array_map('rows', $failures);
                 $rows = array_unique($rows);
-                $rowIndex =   range(3, $this->higestRow + 2);
+                $rowIndex = range(3, $this->higestRow + 2);
                 $params = [
                     'rows' => $rows,
                     'reader' => $reader
@@ -552,17 +552,17 @@ 
                 array_walk($rowIndex, array($this, 'removeRows'), $params);
                 $objWriter = $this->getSheetWriter($file, $reader);
                 Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed');
-                $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']);
+                $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']);
                 $now = Carbon::now()->tz('Asia/Colombo');
-                $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now());
-                $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory));
-                $this->output->writeln('Time taken to process           : ' .   $now->diffInSeconds($this->startTime) . ' Seconds');
-                $this->output->writeln(' errors reported               : ' . count($failures));
+                $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now());
+                $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory));
+                $this->output->writeln('Time taken to process           : '.$now->diffInSeconds($this->startTime).' Seconds');
+                $this->output->writeln(' errors reported               : '.count($failures));
                 $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------');
                 unset($objWriter);
                 unset($failures);
             }
-        } catch (Eception $e) {
+        }catch (Eception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();

Braces +1 added lines, -1 removed lines

@@ -141,7 +141,7 @@
             if(env('APP_ENV') == 'stage'){
                 $query->where('contact_types.contact_option_id', '=', 5)
                 ->where('contact_types.name', '=', 'TestEmail');
-            }else{
+            } else{
                 $query->where('contact_types.contact_option_id', '!=', 5);
             }