moe-lk / bulk-upload

app/Mail/StudentImportSuccess.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     public function build()
     {
         return $this->view('emails.mail')
-                ->from($this->from_address,$this->from_name)
+                ->from($this->from_address, $this->from_name)
                 ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Providers/ValidatorExtended.php

Spacing +19 added lines, -19 removed lines

@@ -100,58 +100,58 @@
     protected function validateBirthPlace($attribute, $value, $perameters, $validator) {
         foreach ($validator->getData() as $data) {
             if ($data['identity_type'] == 'BC' && key_exists('birth_divisional_secretariat', $data)) {
-                $BirthDivision = Area_administrative::where('name', '=',  '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); //
-                if ($BirthDivision->count() > 0 ) {
-                    $BirthArea = Area_administrative::where('name', '=', '%'. $value.'%') //$data['birth_registrar_office_as_in_birth_certificate']
+                $BirthDivision = Area_administrative::where('name', '=', '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); //
+                if ($BirthDivision->count() > 0) {
+                    $BirthArea = Area_administrative::where('name', '=', '%'.$value.'%') //$data['birth_registrar_office_as_in_birth_certificate']
                                     ->where('parent_id', '=', $BirthDivision->first()->id)->count();
-                    return $BirthArea  > 0;
+                    return $BirthArea > 0;
                 } elseif (key_exists('birth_divisional_secretariat', $data) && (!key_exists('birth_registrar_office_as_in_birth_certificate', $data))) {
                     $this->_custom_messages['birth_place'] = 'birth_registrar_office_as_in_birth_certificate required with BC';
                     $this->_set_custom_stuff();
                     return false;
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
     }
 
     protected function validateIsStudentInClass($attribute, $value, $perameters, $validator) {
-        $student =  Security_user::where('openemis_no', '=', $value);
-        if($student->count() > 0){
+        $student = Security_user::where('openemis_no', '=', $value);
+        if ($student->count() > 0) {
             $student = $student->first()->toArray();
-            $check =  Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id','=',$perameters[0])->count();
-            if($check == 1){
+            $check = Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count();
+            if ($check == 1) {
                 return true;
-            } else{
+            }else {
                 return false;
             }
-        } else{
+        }else {
             return false;
         }
 
     }
-    protected function validateNic($attribute, $value, $perameters, $validator){
+    protected function validateNic($attribute, $value, $perameters, $validator) {
         $valid = preg_match('/^([0-9]{9}[VX]|[0-9]{12})$/i', $value);
-        if(!$valid){
-                $this->_custom_messages['nic'] = $attribute. ' is not valid,  Please check the NIC number';
+        if (!$valid) {
+                $this->_custom_messages['nic'] = $attribute.' is not valid,  Please check the NIC number';
                 $this->_set_custom_stuff();
                 return false;
-        }else{
+        }else {
             return true;
         }
     }
 
     protected function validateUserUnique($attribute, $value, $perameters, $validator) {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if ($identityType !== null && ($value !== null)) {
                 if ($identityType->national_code === 'BC') {
-                    return $this->checkUnique($value, $data,$identityType);
+                    return $this->checkUnique($value, $data, $identityType);
                 } elseif ($identityType->national_code === 'NIC') {
-                    return $this->checkUnique($value, $data,$identityType);
+                    return $this->checkUnique($value, $data, $identityType);
                 }
             } elseif (($value == null) || $value == "") {
                 return true;

Braces +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
             $ageOfStudent = $diff_in_months;
             $enrolmentMaximumAge = $admissionAge + 120;
             return ($ageOfStudent <= $enrolmentMaximumAge) && ($ageOfStudent >= $admissionAge);
-        }else {
+        } else {
             return false;
         }
     }
@@ -87,12 +87,12 @@ 
                         }
                         return true;
                     }
-                }else {
+                } else {
                     $this->_custom_messages['bmi'] = $attribute.' is required for '.$educationGrade->name;
                     $this->_set_custom_stuff();
                     return false;
                 }
-            }else {
+            } else {
                 return true;
             }
     }
@@ -139,7 +139,7 @@ 
                 $this->_custom_messages['nic'] = $attribute. ' is not valid,  Please check the NIC number';
                 $this->_set_custom_stuff();
                 return false;
-        }else{
+        } else{
             return true;
         }
     }
@@ -165,10 +165,10 @@ 
             if (($identityType !== null) && ($identityType !== "")) {
                 if (($identityType->national_code) === 'BC') {
                     return  (strlen((string) $data['identity_number']) < 7);
-                }else {
+                } else {
                     return true;
                 }
-            }else {
+            } else {
                 return true;
             }
         }
@@ -180,7 +180,7 @@ 
             $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;
         }
     }
@@ -190,10 +190,10 @@ 
         if ($identityType !== null) {
             if (($identityType->national_code) === 'BC' && strlen((string) $value) < 8) {
                 return false;
-            }else {
+            } else {
                 return true;
             }
-        }else {
+        } else {
             return true;
         }
     }

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

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

app/Providers/ValidationExtensionServiceProvider.php

Spacing +4 added lines, -4 removed lines

@@ -10,10 +10,10 @@
     public function register() {}
 
     public function boot() {
-        $this->app->validator->resolver( function( $translator, $data, $rules,
-                                                    $messages = array(), $customAttributes = array() ) {
-            return new ValidatorExtended( $translator, $data, $rules, $messages,
-                $customAttributes );
+        $this->app->validator->resolver(function($translator, $data, $rules,
+                                                    $messages = array(), $customAttributes = array()) {
+            return new ValidatorExtended($translator, $data, $rules, $messages,
+                $customAttributes);
         } );
     }
 }

app/Console/Commands/RunAddApprovedStudents.php

Spacing +17 added lines, -17 removed lines

@@ -51,48 +51,48 @@ 
             'id' => $this->argument('institution')
         ])->first();
 
-        if(!is_null($institution)){
+        if (!is_null($institution)) {
             try {
-                $this->info('adding missing students to the admission ' . $institution->name);
+                $this->info('adding missing students to the admission '.$institution->name);
                 $allApprovedStudents = Institution_student_admission::where([
                     'status_id' => 124,
                     'institution_id' => $institution->id
                 ])->get()->toArray();
                 $allApprovedStudents = array_chunk($allApprovedStudents, 50);
                 array_walk($allApprovedStudents, array($this, 'addStudents'));
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Log::error($e);
             }
         }
     }
 
-    protected function addStudents($students){
-        array_walk($students,array($this,'addStudent'));
+    protected function addStudents($students) {
+        array_walk($students, array($this, 'addStudent'));
     }
 
-    protected function addStudent($student){
+    protected function addStudent($student) {
 //        dd(Institution_class_student::isDuplicated($student));
         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
         sleep(1);
-        if(!(Institution_class_student::isDuplicated($student) > 0)){
+        if (!(Institution_class_student::isDuplicated($student) > 0)) {
             $this->count += 1;
-            $this->student = $student ;
-            try{
+            $this->student = $student;
+            try {
                 Institution_student::create([
                     'student_status_id' => 1,
                     'student_id' => $student['student_id'],
                     'education_grade_id' => $student['education_grade_id'],
                     'academic_period_id' => $student['academic_period_id'],
                     'start_date' => $student['start_date'],
-                    'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'),
+                    'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year, // $student['start_date']->format('Y'),
                     'end_date' => $student['end_date'],
-                    'end_year' =>  \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'),
+                    'end_year' =>  \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year, //$student['end_date']->format('Y'),
                     'institution_id' => $student['institution_id'],
                     'admission_id' => $student['admission_id'],
                     'created_user_id' => $student['created_user_id'],
                 ]);
 
-                if(!is_null($student['institution_class_id'])){
+                if (!is_null($student['institution_class_id'])) {
                     Institution_class_student::create([
                         'student_id' => $student['student_id'],
                         'institution_class_id' => $student['institution_class_id'],
@@ -109,23 +109,23 @@ 
         #                                                  #
         ####################################################' );
 //        $output->writeln();
-            }catch (\Exception $e){
+            }catch (\Exception $e) {
 //               echo $e->getMessage();
-                $output->writeln( $e->getMessage());
+                $output->writeln($e->getMessage());
             }
         }
     }
 
 
-    protected  function  setSubjects($student){
+    protected  function  setSubjects($student) {
         $allSubjects = Institution_class_subject::getMandetorySubjects($student['institution_class_id']);
 
         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'));
         }
 
         unset($allSubjects);

Braces +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
         #                                                  #
         ####################################################' );
 //        $output->writeln();
-            }catch (\Exception $e){
+            } catch (\Exception $e){
 //               echo $e->getMessage();
                 $output->writeln( $e->getMessage());
             }

app/Console/Commands/CloneConfigData.php

Spacing +44 added lines, -44 removed lines

@@ -72,33 +72,33 @@ 
             'previous_academic_period' => $previousAcademicPeriod
         ];
         // dd($shift);
-        array_walk($shift,array($this,'process'),$params);
+        array_walk($shift, array($this, 'process'), $params);
         $this->end_time = microtime(TRUE);
 
 
         $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
-        $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
+        $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete');
         $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
 
     }
 
-    public function array_walk($shift,$count,$params){
-        array_walk($shift,array($this,'process'),$params);
+    public function array_walk($shift, $count, $params) {
+        array_walk($shift, array($this, 'process'), $params);
     }
 
-    public function process($shift,$count,$params){
+    public function process($shift, $count, $params) {
         $year = $params['year'];
         $academicPeriod = $params['academic_period'];
         $previousAcademicPeriod = $params['previous_academic_period'];
 //        DB::beginTransaction();
-        try{
+        try {
             $shiftId = $this->updateShifts($year, $shift);
             $institutionClasses = $this->institution_classes->getShiftClasses($shift['id']);
             $institutionSubjects = $this->education_grade_subjects->getInstitutionSubjects($shift['institution_id']);
-            array_walk($institutionSubjects , array($this,'insertInstitutionSubjects'),$academicPeriod);
-            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod) ) {
+            array_walk($institutionSubjects, array($this, 'insertInstitutionSubjects'), $academicPeriod);
+            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod)) {
 
-                $newInstitutionClasses = $this->generateNewClass($institutionClasses,$shiftId,$academicPeriod->id);
+                $newInstitutionClasses = $this->generateNewClass($institutionClasses, $shiftId, $academicPeriod->id);
 
                 $params = [
                     'previous_academic_period_id' => $previousAcademicPeriod->id,
@@ -106,20 +106,20 @@ 
                     'shift_id' =>$shiftId
                 ];
 
-                try{
-                    array_walk($newInstitutionClasses,array($this,'insertInstitutionClasses'),$params);
+                try {
+                    array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params);
                     $newInstitutionClasses = $this->institution_classes->getShiftClasses($shiftId);
                     $this->output->writeln('##########################################################################################################################');
-                    $this->output->writeln('updating from '. $shiftId);
+                    $this->output->writeln('updating from '.$shiftId);
 
-                }catch (\Exception $e){
-                        Log::error($e->getMessage(),[$e]);
+                }catch (\Exception $e) {
+                        Log::error($e->getMessage(), [$e]);
                 }
             }
 //            DB::commit();
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
 //            DB::rollBack();
-                Log::error($e->getMessage(),[$e]);
+                Log::error($e->getMessage(), [$e]);
         }
     }
 
@@ -129,31 +129,31 @@ 
      * @param $count
      * @param $academicPeriod
      */
-    public function insertInstitutionSubjects($subjects, $count,$academicPeriod){
-        try{
+    public function insertInstitutionSubjects($subjects, $count, $academicPeriod) {
+        try {
             $subjects['academic_period_id'] = $academicPeriod->id;
             $subjects['created'] = now();
             unset($subjects['total_male_students']);
             unset($subjects['total_female_students']);
             unset($subjects['id']);
             $classSubject = Institution_subject::create($subjects);
-        }catch (\Exception $e){
-            Log::error($e->getMessage(),[$e]);
+        }catch (\Exception $e) {
+            Log::error($e->getMessage(), [$e]);
         }
     }
 
 
-    public function  insertInstitutionClasses($class,$count,$param){
-            try{
+    public function  insertInstitutionClasses($class, $count, $param) {
+            try {
 
                 $academicPeriod = $param['academic_period_id'];
                 $educationGrdae = $class['education_grade_id'];
 
                 $classId = $class['id'];
                 unset($class['id']);
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$class['education_grade_id'])
-                    ->where('institution_id',$class['institution_id'])
-                    ->where('academic_period_id',$academicPeriod)->get()->toArray();
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $class['education_grade_id'])
+                    ->where('institution_id', $class['institution_id'])
+                    ->where('academic_period_id', $academicPeriod)->get()->toArray();
                 $params = [
                     'class'=>$class,
                     'subjects'=>$institutionSubjects,
@@ -166,38 +166,38 @@ 
                 $class['no_of_students'] = $noOfStudents;
                 $class['created'] = now();
                 $class['institution_shift_id'] = $param['shift_id'];
-                $this->output->writeln('Create class:'. $class['name']);
+                $this->output->writeln('Create class:'.$class['name']);
                 $class = Institution_class::create($class);
                 $institutionClassGrdaeObj['institution_class_id'] = $class->id;
                 $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae;
                 Institution_class_grade::create($institutionClassGrdaeObj);
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$educationGrdae)
-                    ->where('institution_id',$class->institution_id)
-                    ->where('academic_period_id',$academicPeriod)
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $educationGrdae)
+                    ->where('institution_id', $class->institution_id)
+                    ->where('academic_period_id', $academicPeriod)
                     ->groupBy('education_subject_id')
                     ->get()
                     ->toArray();
                 $params['class'] = $class;
-                $this->insertInstitutionClassSubjects($institutionSubjects,$class);
+                $this->insertInstitutionClassSubjects($institutionSubjects, $class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-            }catch (\Exception $e){
-                    Log::error($e->getMessage(),[$e]);
+            }catch (\Exception $e) {
+                    Log::error($e->getMessage(), [$e]);
             }
     }
 
-    public function insertInstitutionClassSubjects($subjects,$class){
-        if(!empty($subjects)){
-            try{
-                array_walk($subjects,array($this,'insertClassSubjects'),$class);
-                $this->output->writeln('updating subjects '. $class->name);
-            }catch (\Exception $e){
-                    Log::error($e->getMessage(),[$e]);
+    public function insertInstitutionClassSubjects($subjects, $class) {
+        if (!empty($subjects)) {
+            try {
+                array_walk($subjects, array($this, 'insertClassSubjects'), $class);
+                $this->output->writeln('updating subjects '.$class->name);
+            }catch (\Exception $e) {
+                    Log::error($e->getMessage(), [$e]);
             }
         };
     }
 
-    public function insertClassSubjects($subject,$count,$newClassId){
-        try{
+    public function insertClassSubjects($subject, $count, $newClassId) {
+        try {
             $subjectobj['status'] = 1;
             $subjectobj['created_user_id'] = 1;
             $subjectobj['created'] = now();
@@ -205,11 +205,11 @@ 
             $subjectobj['institution_class_id'] = $newClassId->id;
             $subjectobj['institution_subject_id'] = $subject['id'];
 
-            if(!$this->institution_class_subjects->isDuplicated($subjectobj)){
+            if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
                 $this->institution_class_subjects->create($subjectobj);
             }
-        }catch (\Exception $e){
-                Log::error($e->getMessage(),[$e]);
+        }catch (\Exception $e) {
+                Log::error($e->getMessage(), [$e]);
         }
     }
 

Braces +6 added lines, -6 removed lines

@@ -112,12 +112,12 @@ 
                     $this->output->writeln('##########################################################################################################################');
                     $this->output->writeln('updating from '. $shiftId);
 
-                }catch (\Exception $e){
+                } catch (\Exception $e){
                         Log::error($e->getMessage(),[$e]);
                 }
             }
 //            DB::commit();
-        }catch (\Exception $e){
+        } catch (\Exception $e){
 //            DB::rollBack();
                 Log::error($e->getMessage(),[$e]);
         }
@@ -137,7 +137,7 @@ 
             unset($subjects['total_female_students']);
             unset($subjects['id']);
             $classSubject = Institution_subject::create($subjects);
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             Log::error($e->getMessage(),[$e]);
         }
     }
@@ -180,7 +180,7 @@ 
                 $params['class'] = $class;
                 $this->insertInstitutionClassSubjects($institutionSubjects,$class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                     Log::error($e->getMessage(),[$e]);
             }
     }
@@ -190,7 +190,7 @@ 
             try{
                 array_walk($subjects,array($this,'insertClassSubjects'),$class);
                 $this->output->writeln('updating subjects '. $class->name);
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                     Log::error($e->getMessage(),[$e]);
             }
         };
@@ -208,7 +208,7 @@ 
             if(!$this->institution_class_subjects->isDuplicated($subjectobj)){
                 $this->institution_class_subjects->create($subjectobj);
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e){
                 Log::error($e->getMessage(),[$e]);
         }
     }

app/Console/Commands/ImportStudents.php

Spacing +94 added lines, -94 removed lines

@@ -285,7 +285,7 @@ 
     }
 
 
-    protected function getSheetCount($file){
+    protected function getSheetCount($file) {
         $objPHPExcel = $this->setReader($file);
         return $objPHPExcel->getSheetCount();
     }
@@ -297,205 +297,205 @@ 
      * @param $sheet
      * @param $column
      */
-    protected function import($file, $sheet, $column){
+    protected function import($file, $sheet, $column) {
                 try {
                     ini_set('memory_limit', '2048M');
                 $this->getFileSize($file);
                 $user = User::find($file['security_user_id']);
-                $excelFile = '/sis-bulk-data-files/' . $file['filename'];
-                $this->higestRow = $this->getHigestRow($file, $sheet,$column);
-                switch ($sheet){
+                $excelFile = '/sis-bulk-data-files/'.$file['filename'];
+                $this->higestRow = $this->getHigestRow($file, $sheet, $column);
+                switch ($sheet) {
                     case 1;
-                        $this->output->writeln( 'Trying to insert Students');
-                        if (($this->getSheetName($file,'Insert Students')) && $this->higestRow > 0)  { //
+                        $this->output->writeln('Trying to insert Students');
+                        if (($this->getSheetName($file, 'Insert Students')) && $this->higestRow > 0) { //
                             $import = new UsersImport($file);
-                            $import->import($excelFile,'local',$this->getSheetType($file['filename']));
+                            $import->import($excelFile, 'local', $this->getSheetType($file['filename']));
 //                            Excel::import($import, $excelFile, 'local');
                             DB::table('uploads')
                                 ->where('id', $file['id'])
-                                ->update(['insert' => 1,'is_processed' => 1,'updated_at' => now()]);
-                            if($import->failures()->count() > 0){
-                                self::writeErrors($import,$file,'Insert Students');
+                                ->update(['insert' => 1, 'is_processed' => 1, 'updated_at' => now()]);
+                            if ($import->failures()->count() > 0) {
+                                self::writeErrors($import, $file, 'Insert Students');
                                 DB::table('uploads')
                                     ->where('id', $file['id'])
-                                    ->update(['insert' => 3,'updated_at' => now()]);
-                                $this->processFailedEmail($file,$user,'Fresh Student Data Upload:Partial Success ');
-                                $this->stdOut('Insert Students',$this->higestRow);
-                            } else{
-                                $this->processSuccessEmail($file,$user,'Fresh Student Data Upload:Success ');
-                                $this->stdOut('Insert Students',$this->higestRow);
+                                    ->update(['insert' => 3, 'updated_at' => now()]);
+                                $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success ');
+                                $this->stdOut('Insert Students', $this->higestRow);
+                            }else {
+                                $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]);
-                            $this->processEmptyEmail($file,$user, 'Fresh Student Data Upload ');
+                            $this->processEmptyEmail($file, $user, 'Fresh Student Data Upload ');
                         }
                         break;
                     case 2;
-                        $this->output->writeln( 'Trying to update Students');
-                        if (($this->getSheetName($file,'Update Students')) && $this->higestRow > 0) {
+                        $this->output->writeln('Trying to update Students');
+                        if (($this->getSheetName($file, 'Update Students')) && $this->higestRow > 0) {
                             $import = new StudentUpdate($file);
-                            $import->import($excelFile,'local',$this->getSheetType($file['filename']));
+                            $import->import($excelFile, 'local', $this->getSheetType($file['filename']));
                             DB::table('uploads')
                                 ->where('id', $file['id'])
-                                ->update(['update' => 1,'is_processed' => 1,'updated_at' => now()]);
-                            if($import->failures()->count() > 0){
-                                self::writeErrors($import,$file,'Update Students');
+                                ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]);
+                            if ($import->failures()->count() > 0) {
+                                self::writeErrors($import, $file, 'Update Students');
                                 DB::table('uploads')
                                     ->where('id', $file['id'])
-                                    ->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{
-                                $this->processSuccessEmail($file,$user, 'Existing Student Data Update:Success ');
-                                $this->stdOut('Update Students',$this->higestRow);
+                                    ->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 {
+                                $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()]);
-                            $this->processEmptyEmail($file,$user, 'Existing Student Data Update');
+                                ->update(['is_processed' => 2, 'updated_at' => now()]);
+                            $this->processEmptyEmail($file, $user, 'Existing Student Data Update');
                         }
                         break;
                 }
             }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
-                    $this->output->writeln( $e->getMessage());
-                    if($sheet == 1){
-                        self::writeErrors($e,$file,'Insert Students');
+                    $this->output->writeln($e->getMessage());
+                    if ($sheet == 1) {
+                        self::writeErrors($e, $file, 'Insert Students');
                         DB::table('uploads')
                             ->where('id', $file['id'])
-                            ->update(['insert' => 2,'updated_at' => now()]);
-                    $this->processFailedEmail($file,$user,'Fresh Student Data Upload:Failed');
-                    }else if($sheet == 2){
-                        self::writeErrors($e,$file,'Update Students');
+                            ->update(['insert' => 2, 'updated_at' => now()]);
+                    $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed');
+                    }else if ($sheet == 2) {
+                        self::writeErrors($e, $file, 'Update Students');
                         DB::table('uploads')
                             ->where('id', $file['id'])
-                            ->update(['update' => 2,'updated_at' => now()]);
-                    $this->processFailedEmail($file,$user, 'Existing Student Data Update:Failed');
+                            ->update(['update' => 2, 'updated_at' => now()]);
+                    $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed');
                     }
                     DB::table('uploads')
-                        ->where('id',  $file['id'])
-                        ->update(['is_processed' =>2 , 'updated_at' => now()]);
+                        ->where('id', $file['id'])
+                        ->update(['is_processed' =>2, 'updated_at' => now()]);
 
             }
 
     }
 
-    protected function processErrors($failure){
-            $error_mesg = implode(',',$failure->errors());
+    protected function processErrors($failure) {
+            $error_mesg = implode(',', $failure->errors());
             $failure = [
                 'row'=> $failure->row(),
-                'errors' => [ $error_mesg],
+                'errors' => [$error_mesg],
                 'attribute' => $failure->attribute()
             ];
             return $failure;
 
     }
 
-    protected function  getFileSize($file){
-        $excelFile =  '/sis-bulk-data-files/' . $file['filename'];
+    protected function  getFileSize($file) {
+        $excelFile = '/sis-bulk-data-files/'.$file['filename'];
         $size = Storage::disk('local')->size($excelFile);
         $user = User::find($file['security_user_id']);
-        if( $size > 0){
+        if ($size > 0) {
             return true;
-        } else{
+        }else {
             DB::table('uploads')
-                ->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');
+                ->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');
         }
     }
 
-    protected function setReader($file){
-        try{
-            $excelFile =  '/sis-bulk-data-files/processed/' . $file['filename'];
+    protected function setReader($file) {
+        try {
+            $excelFile = '/sis-bulk-data-files/processed/'.$file['filename'];
             $exists = Storage::disk('local')->exists($excelFile);
-            if(!$exists){
+            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){
-            $this->output->writeln( $e->getMessage());
+        }catch (Exception $e) {
+            $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->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');
+                ->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');
         }
     }
 
-    protected function  getSheetName($file,$sheet){
-        try{;
+    protected function  getSheetName($file, $sheet) {
+        try {;
             $objPHPExcel = $this->setReader($file);
-            return $objPHPExcel->getSheetByName($sheet)  !== null;
-        } catch (Exception $e){
-            $this->output->writeln( $e->getMessage());
+            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'])
-                ->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');
+                ->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');
         }
     }
 
-    protected function getHigestRow($file,$sheet,$column){
-        try{
+    protected function getHigestRow($file, $sheet, $column) {
+        try {
             $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();
                 if (empty($rowData) || $rowData == null) {
                     continue;
-                } else {
+                }else {
                     $higestRow += 1;
                 }
             }
             return $higestRow;
-        } catch(\Exception $e){
-            $this->output->writeln( $e->getMessage());
+        }catch (\Exception $e) {
+            $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();
             DB::table('uploads')
                 ->where('id', $file['id'])
-                ->update(['is_processed' => 2,'updated_at' => now()]);
+                ->update(['is_processed' => 2, 'updated_at' => now()]);
             DB::commit();
-            $this->processEmptyEmail($file,$user, 'No valid data found');
+            $this->processEmptyEmail($file, $user, 'No valid data found');
             exit();
         }
     }
 
-    protected function stdOut($title,$rows){
-        $this->output->writeln(   $title. ' Process completed at . '.' '. now());
+    protected function stdOut($title, $rows) {
+        $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('--------------------------------------------------------------------------------------------------------------------------');
     }
 
 
 
-    protected function removeRows($row,$count,$params){
+    protected function removeRows($row, $count, $params) {
         $reader = $params['reader'];
         $sheet = $reader->getActiveSheet();
-        if(!in_array($row,$params['rows'])){
+        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);
         }
     }
 
 
-    protected function writeErrors($e,$file,$sheet){
+    protected function writeErrors($e, $file, $sheet) {
         try {
             ini_set('memory_limit', '2048M');
             $baseMemory = memory_get_usage();

Braces +13 added lines, -13 removed lines

@@ -70,21 +70,21 @@ 
                         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();
             }
         }
@@ -161,7 +161,7 @@ 
             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'])
@@ -176,7 +176,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'])
@@ -191,7 +191,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'])
@@ -205,7 +205,7 @@ 
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $this->output->writeln('Processing from:'.$node);
             return true;
-        }else {
+        } else {
             exit;
             return false;
         }
@@ -223,14 +223,14 @@ 
                 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')
@@ -238,7 +238,7 @@ 
                             ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
                 }
             }
-        }else {
+        } else {
             exit();
         }
     }
@@ -359,7 +359,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');
@@ -367,7 +367,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'])
@@ -534,7 +534,7 @@ 
                 unset($failures);
             }
 
-        }catch (Eception $e) {
+        } catch (Eception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();

app/Console/Commands/PromoteStudents.php

Spacing +6 added lines, -6 removed lines

@@ -204,19 +204,19 @@
                 'education_grade_id' => $nextGrade !== null ? $nextGrade->id : $student['education_grade_id'],
                 'academic_period_id' => $academicPeriod->id,
                 'start_date' => $academicPeriod->start_date,
-                'start_year' =>$academicPeriod->start_year ,
+                'start_year' =>$academicPeriod->start_year,
                 'end_date' => $academicPeriod->end_date,
-                'end_year' =>   $academicPeriod->end_year ,
+                'end_year' =>   $academicPeriod->end_year,
                 'institution_id' => $student['institution_id'],
                 'admission_id' => $student['admission_id'],
                 'created_user_id' => $student['created_user_id']
             ];
-            try{
-                Institution_student::where('id',(string)$student['id'])->update($studentData);
+            try {
+                Institution_student::where('id', (string) $student['id'])->update($studentData);
                 $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                $output->writeln('----------------- '. $student['admission_id'] . ' to ' . $studentData['education_grade_id']);
+                $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']);
 
-            } catch (\Exception $e){
+            }catch (\Exception $e) {
                 dd($e);
                 Log::error($e->getMessage());
             }

Braces +8 added lines, -8 removed lines

@@ -80,7 +80,7 @@ 
 
             if (!empty($isAvailableforPromotion)) {
                 $this->process($institutionGrade, $nextGrade, $year, 1);
-            }else {
+            } else {
                 $this->process($institutionGrade, $nextGrade, $year, 3);
             }
         }
@@ -127,7 +127,7 @@ 
                     array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params);
                     array_walk($parallelClasses, array($this, 'updateStudentCount'));
                 }
-            }catch (\Exception $e) {
+            } catch (\Exception $e) {
                 dd($e);
                 Log::error($e->getMessage());
             }
@@ -166,20 +166,20 @@ 
                     // promote parallel classes
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                     return 1;
-                }elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
+                } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
                     // promote pool promotion
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                     return 2;
-                }elseif (($nextGradeObj->count() > 1) && $currentGradeObj->count() == $nextGradeObj->count()) {
+                } elseif (($nextGradeObj->count() > 1) && $currentGradeObj->count() == $nextGradeObj->count()) {
                     // Promote matching class name with previous class
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                     return 1;
-                }else {
+                } else {
                     // default pool promotion
                     $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                     return 2;
                 }
-            }else {
+            } else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3);
                 return 2;
@@ -236,7 +236,7 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             return  array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-        }else {
+        } else {
             return false;
         }
 
@@ -280,7 +280,7 @@ 
                     $this->institution_class_students->create($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
-                }else {
+                } else {
                     $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);

app/Console/Commands/ProcessTerminatedFiles.php

Braces +3 added lines, -3 removed lines

@@ -50,14 +50,14 @@ 
                     unset($files);
                     exit();
 
-                }else {
+                } else {
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $output->writeln('No files found,Waiting for files');
                     exit();
 
                 }
 
-            }catch (Exception $e) {
+            } catch (Exception $e) {
                 $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                 $output->writeln($e);
                 sleep(300);
@@ -96,7 +96,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 3, 'is_email_sent' => 1, 'updated_at' => now()]);
-        }else {
+        } else {
             exit();
         }
     }