moe-lk / bulk-upload

app/Console/Commands/callAddApprovedStudents.php

Spacing +6 added lines, -6 removed lines

@@ -39,17 +39,17 @@
      */
     public function handle()
     {
-        ini_set('memory_limit','2048');
+        ini_set('memory_limit', '2048');
         $institutions = $this->instituions->all()->chunk(50)->toArray();
-        array_walk($institutions,array($this,'addInstitutionStudents'));
+        array_walk($institutions, array($this, 'addInstitutionStudents'));
     }
 
-    protected function addInstitutionStudents($chunk){
-        array_walk($chunk,array($this,'callFunction'));
+    protected function addInstitutionStudents($chunk) {
+        array_walk($chunk, array($this, 'callFunction'));
 
     }
 
-    protected function callFunction($institution){
-        $this->call('admission:students',['institution' => $institution['code']]);
+    protected function callFunction($institution) {
+        $this->call('admission:students', ['institution' => $institution['code']]);
     }
 }

app/Console/Commands/CloneConfigData.php

Indentation +17 added lines, -17 removed lines

@@ -76,9 +76,9 @@ 
         $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('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
+        $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
+        $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
+        $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
 
     }
 
@@ -113,13 +113,13 @@ 
                     $this->output->writeln('updating from '. $shiftId);
 
                 }catch (\Exception $e){
-                     Log::error($e->getMessage(),[$e]);
+                        Log::error($e->getMessage(),[$e]);
                 }
             }
 //            DB::commit();
         }catch (\Exception $e){
 //            DB::rollBack();
-             Log::error($e->getMessage(),[$e]);
+                Log::error($e->getMessage(),[$e]);
         }
     }
 
@@ -130,16 +130,16 @@ 
      * @param $academicPeriod
      */
     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){
+        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]);
-       }
+        }
     }
 
 
@@ -181,7 +181,7 @@ 
                 $this->insertInstitutionClassSubjects($institutionSubjects,$class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
             }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+                    Log::error($e->getMessage(),[$e]);
             }
     }
 
@@ -191,7 +191,7 @@ 
                 array_walk($subjects,array($this,'insertClassSubjects'),$class);
                 $this->output->writeln('updating subjects '. $class->name);
             }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+                    Log::error($e->getMessage(),[$e]);
             }
         };
     }
@@ -209,7 +209,7 @@ 
                 $this->institution_class_subjects->create($subjectobj);
             }
         }catch (\Exception $e){
-             Log::error($e->getMessage(),[$e]);
+                Log::error($e->getMessage(),[$e]);
         }
     }
 

Spacing +52 added lines, -52 removed lines

@@ -48,8 +48,8 @@ 
         $this->academic_period = new Academic_period();
         $this->institution_classes = new Institution_class();
         $this->institution_class_subjects = new Institution_class_subject();
-        $this->institution_subjects =  new Institution_subject();
-        $this->education_grade_subjects =  new Education_grades_subject();
+        $this->institution_subjects = new Institution_subject();
+        $this->education_grade_subjects = new Education_grades_subject();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
 
@@ -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]);
         }
     }
 
@@ -221,15 +221,15 @@ 
      * @param $academicPeriod
      * @return array
      */
-    public function generateNewClass($classes,$shiftId,$academicPeriod){
+    public function generateNewClass($classes, $shiftId, $academicPeriod) {
         $newClasses = [];
-        foreach ( $classes as $class) {
+        foreach ($classes as $class) {
             $noOfStudents = $class['no_of_students'] == 0 ? 40 : $class['no_of_students'];
             $class['academic_period_id'] = $academicPeriod;
             $class['no_of_students'] = $noOfStudents;
             $class['created'] = now();
             $class['institution_shift_id'] = $shiftId;
-            array_push($newClasses,$class);
+            array_push($newClasses, $class);
         }
         return $newClasses;
     }
@@ -240,11 +240,11 @@ 
      * @param $shift
      * @return mixed
      */
-    public function updateShifts($year,$shift){
+    public function updateShifts($year, $shift) {
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
-        $this->shifts->where('id',$shift['id'])->update(['cloned' => '2020']);
+        $this->shifts->where('id', $shift['id'])->update(['cloned' => '2020']);
         $shift['academic_period_id'] = $academicPeriod->id;
         $exist = $this->shifts->shiftExists($shift);
-        return $this->shifts->create((array)$shift)->id;
+        return $this->shifts->create((array) $shift)->id;
     }
 }

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

Indentation +19 added lines, -19 removed lines

@@ -286,8 +286,8 @@ 
 
 
     protected function getSheetCount($file){
-       $objPHPExcel = $this->setReader($file);
-       return $objPHPExcel->getSheetCount();
+        $objPHPExcel = $this->setReader($file);
+        return $objPHPExcel->getSheetCount();
     }
 
 
@@ -298,8 +298,8 @@ 
      * @param $column
      */
     protected function import($file, $sheet, $column){
-             try {
-                 ini_set('memory_limit', '2048M');
+                try {
+                    ini_set('memory_limit', '2048M');
                 $this->getFileSize($file);
                 $user = User::find($file['security_user_id']);
                 $excelFile = '/sis-bulk-data-files/' . $file['filename'];
@@ -360,23 +360,23 @@ 
                         break;
                 }
             }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
-                 $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->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');
-                     DB::table('uploads')
-                         ->where('id', $file['id'])
-                         ->update(['update' => 2,'updated_at' => now()]);
+                    }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');
-                 }
-                 DB::table('uploads')
-                     ->where('id',  $file['id'])
-                     ->update(['is_processed' =>2 , 'updated_at' => now()]);
+                    }
+                    DB::table('uploads')
+                        ->where('id',  $file['id'])
+                        ->update(['is_processed' =>2 , 'updated_at' => now()]);
 
             }
 

Spacing +164 added lines, -164 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();
     }
 
@@ -62,64 +62,64 @@ 
 //        if(empty($files)){
 //            $files = $this->getTerminatedFiles();
 //        }
-        while ($this->checkTime()){
-            if($this->checkTime()){
+        while ($this->checkTime()) {
+            if ($this->checkTime()) {
                 try {
-                    if(!empty($files)){
+                    if (!empty($files)) {
                         $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();
             }
         }
     }
 
 
-    protected function  process($files){
+    protected function  process($files) {
         $time = Carbon::now()->tz('Asia/Colombo');
 //        array_walk($files, array($this,'processSheet'));
         $node = $this->argument('node');
         $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(){
+    protected function getTerminatedFiles() {
         $files = Upload::where('is_processed', '=', 3)
             ->where('updated_at', '<=', Carbon::now()->tz('Asia/Colombo')->subHours(3))
             ->limit(1)
-            ->orderBy('updated_at','desc')
+            ->orderBy('updated_at', 'desc')
             ->get()->toArray();
-        if(!empty($files)){
+        if (!empty($files)) {
             $this->output->writeln('******************* Processing a terminated file **********************');
             DB::beginTransaction();
             DB::table('uploads')
                 ->where('id', $files[0]['id'])
-                ->update(['is_processed' => 4,'updated_at' => now()]);
+                ->update(['is_processed' => 4, 'updated_at' => now()]);
             DB::commit();
         }
         return $files;
     }
 
-    protected function getFiles(){
+    protected function getFiles() {
         $files = Upload::where('is_processed', '=', 0)
             ->select('uploads.id', 'uploads.security_user_id', 'uploads.institution_class_id', 'uploads.model',
                 'uploads.filename', 'uploads.is_processed', 'uploads.deleted_at', 'uploads.created_at',
@@ -133,85 +133,85 @@ 
             ->limit(1)
             ->get()->toArray();
         $node = $this->argument('node');
-        if(!empty($files)){
+        if (!empty($files)) {
             DB::beginTransaction();
             DB::table('uploads')
                 ->where('id', $files[0]['id'])
-                ->update(['is_processed' => 3,'updated_at' => now(),'node' => $node]);
+                ->update(['is_processed' => 3, 'updated_at' => now(), 'node' => $node]);
             DB::commit();
         }
         return $files;
     }
 
-    protected function checkTime(){
+    protected function checkTime() {
         $time = Carbon::now()->tz('Asia/Colombo');
-        $morning = Carbon::create($time->year, $time->month, $time->day, env('CRON_START_TIME',0), 29, 0)->tz('Asia/Colombo')->setHour(0); //set time to 05:59
+        $morning = Carbon::create($time->year, $time->month, $time->day, env('CRON_START_TIME', 0), 29, 0)->tz('Asia/Colombo')->setHour(0); //set time to 05:59
 
-        $evening = Carbon::create($time->year, $time->month, $time->day, env('CRON_END_TIME',0), 30, 0)->tz('Asia/Colombo')->setHour(23); //set time to 18:00
+        $evening = Carbon::create($time->year, $time->month, $time->day, env('CRON_END_TIME', 0), 30, 0)->tz('Asia/Colombo')->setHour(23); //set time to 18:00
 
-        $check = $time->between($morning,$evening, true);
+        $check = $time->between($morning, $evening, true);
         return true;
     }
 
-    public function processSuccessEmail($file,$user,$subject) {
+    public function processSuccessEmail($file, $user, $subject) {
         $file['subject'] = $subject;
         $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) {
-            $this->output->writeln( $ex->getMessage());
+                    ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]);
+        }catch (\Exception $ex) {
+            $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                     ->where('id', $file['id'])
-                    ->update(['is_processed' => 1, 'is_email_sent' => 2,'updated_at' => now()]);
+                    ->update(['is_processed' => 1, 'is_email_sent' => 2, 'updated_at' => now()]);
         }
     }
 
-    public function processFailedEmail($file,$user,$subject) {
+    public function processFailedEmail($file, $user, $subject) {
         $file['subject'] = $subject;
         try {
             Mail::to($user->email)->send(new StudentImportFailure($file));
             DB::table('uploads')
                     ->where('id', $file['id'])
-                    ->update(['is_processed' => 2, 'is_email_sent' => 1,'updated_at' => now()]);
-        } catch (\Exception $ex) {
-            $this->output->writeln( $ex->getMessage());
+                    ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
+        }catch (\Exception $ex) {
+            $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                     ->where('id', $file['id'])
-                    ->update(['is_processed' => 2, 'is_email_sent' => 2,'updated_at' => now()]);
+                    ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
         }
     }
 
-    public function processEmptyEmail($file,$user,$subject) {
+    public function processEmptyEmail($file, $user, $subject) {
         $file['subject'] = $subject;
         try {
             Mail::to($user->email)->send(new EmptyFile($file));
             DB::table('uploads')
                 ->where('id', $file['id'])
-                ->update(['is_processed' => 2, 'is_email_sent' => 1,'updated_at' => now()]);
-        } catch (\Exception $ex) {
-            $this->output->writeln( $ex->getMessage());
+                ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
+        }catch (\Exception $ex) {
+            $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
-                ->update(['is_processed' => 2, 'is_email_sent' => 2,'updated_at' => now()]);
+                ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
         }
     }
 
-    protected function checkNode($file){
+    protected function checkNode($file) {
         $node = $this->argument('node');
-        if($node == $file['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;
         }
     }
 
-    protected function processSheet($file){
+    protected function processSheet($file) {
         $this->startTime = Carbon::now()->tz('Asia/Colombo');
         $user = User::find($file['security_user_id']);
         $this->checkNode($file);
@@ -219,39 +219,39 @@ 
         $this->output->writeln('Processing the file: '.$file['filename']);
         if ($this->checkTime()) {
             try {
-                $this->import($file,1,'C');
+                $this->import($file, 1, 'C');
                 sleep(10);
-                $this->import($file,2,'B');
+                $this->import($file, 2, 'B');
 
-            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
-                $this->output->writeln( $e->getMessage());
+            }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) {
-                    $this->output->writeln( $e->getMessage());
+                            ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
+                }catch (\Exception $ex) {
+                    $this->output->writeln($e->getMessage());
                     $this->handle();
                     DB::table('uploads')
                             ->where('id', $file['id'])
-                            ->update(['is_processed' => 2, 'is_email_sent' => 2 ,'updated_at' => now()]);
+                            ->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);
+    protected function getType($file) {
+        $file = storage_path().'/app/sis-bulk-data-files/'.$file;
+        $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
         return $inputFileType;
     }
 
 
-    protected function getSheetWriter($file,$reader){
-        switch ($this->getType($file['filename'])){
+    protected function getSheetWriter($file, $reader) {
+        switch ($this->getType($file['filename'])) {
             case 'Xlsx':
                 return new \PhpOffice\PhpSpreadsheet\Writer\Xlsx($reader);
                 break;
@@ -267,8 +267,8 @@ 
         }
     }
 
-    protected function getSheetType($file){
-        switch ($this->getType($file)){
+    protected function getSheetType($file) {
+        switch ($this->getType($file)) {
             case 'Xlsx':
                 return \Maatwebsite\Excel\Excel::XLSX;
                 break;
@@ -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();
@@ -510,39 +510,39 @@ 
             $reader = $this->setReader($file);
             $reader->setActiveSheetIndexByName($sheet);
 
-            $failures = gettype($failures) == 'object' ? array_map(array($this,'processErrors'),iterator_to_array($failures)) : array_map(array($this,'processErrors'),($failures));
-            if(count($failures) > 0){
-                $rows = array_map('rows',$failures);
+            $failures = gettype($failures) == 'object' ? array_map(array($this, 'processErrors'), iterator_to_array($failures)) : array_map(array($this, 'processErrors'), ($failures));
+            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
                 ];
-                array_walk($failures , 'append_errors_to_excel',$reader);
-                array_walk($rowIndex , array($this,'removeRows'),$params);
-                $objWriter = $this->getSheetWriter($file,$reader);
+                array_walk($failures, 'append_errors_to_excel', $reader);
+                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($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('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){
-            $this->output->writeln( $e->getMessage());
+        }catch (Eception $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();
         }
     }

Braces +15 added lines, -15 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();
             }
         }
@@ -205,7 +205,7 @@ 
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $this->output->writeln('Processing from:' . $node);
             return true;
-        }else{
+        } else{
             exit;
             return false;
         }
@@ -321,11 +321,11 @@ 
                                     ->update(['insert' => 3,'updated_at' => now()]);
                                 $this->processFailedEmail($file,$user,'Fresh Student Data Upload:Partial Success ');
                                 $this->stdOut('Insert Students',$this->higestRow);
-                            }else{
+                            } 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]);
@@ -347,11 +347,11 @@ 
                                     ->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{
                                 $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()]);
@@ -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'])
@@ -399,7 +399,7 @@ 
         $user = User::find($file['security_user_id']);
         if( $size > 0){
             return true;
-        }else{
+        } else{
             DB::table('uploads')
                 ->where('id',  $file['id'])
                 ->update(['is_processed' =>2 , 'updated_at' => now()]);
@@ -420,7 +420,7 @@ 
             $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename']));
             $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')
@@ -435,7 +435,7 @@ 
         try{;
             $objPHPExcel = $this->setReader($file);
             return $objPHPExcel->getSheetByName($sheet)  !== null;
-        }catch (Exception $e){
+        } catch (Exception $e){
             $this->output->writeln( $e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
@@ -461,7 +461,7 @@ 
                 }
             }
             return $higestRow;
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $this->output->writeln( $e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();
@@ -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/CallPromotionCommand.php

Spacing +1 added lines, -1 removed lines

@@ -41,6 +41,6 @@
     {
         $year = $this->argument('year');
         $institution = $this->instituion_grade->getInstitutionGradeList($year);
-        $this->call('promote:students',['year' => $year,'institution' => $institution->code]);
+        $this->call('promote:students', ['year' => $year, 'institution' => $institution->code]);
     }
 }

app/Console/Kernel.php

Indentation +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
      */
     protected function schedule(Schedule $schedule)
     {
-         $schedule->command('import:students')
-                  ->cron('* * * * * ');
+            $schedule->command('import:students')
+                    ->cron('* * * * * ');
     }
 
     /**

app/Exports/UsersExport.php

Spacing +3 added lines, -3 removed lines

@@ -31,12 +31,12 @@ 
     public function __construct($class) {
 
         $this->class = $class;
-        $this->_file_name = time() . '_' . Auth::user()->id . '_' . 'student_upload.xls';
+        $this->_file_name = time().'_'.Auth::user()->id.'_'.'student_upload.xls';
     }
 
     public function registerEvents(): array {
         return [
-        BeforeSheet::class => function(BeforeSheet $event){
+        BeforeSheet::class => function(BeforeSheet $event) {
 //          dd($event->crea)  
         },
             BeforeWriting::class => function(BeforeWriting $event) {
@@ -63,7 +63,7 @@ 
         $class = $this->class;
         return Security_user::select('openemis_no', 'first_name', 'gender_id', 'date_of_birth', 'address', 'birthplace_area_id')
                         ->with(['class', 'special_needs'])
-                        ->whereHas('class', function ($query) use ($class) {
+                        ->whereHas('class', function($query) use ($class) {
                             $query->where('institution_class_id', '=', $class);
                         })
                         ->get();

app/Models/User_body_mass.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class User_body_mass extends Base_Model  {
+class User_body_mass extends Base_Model {
 
     /**
      * The database table used by the model.

app/Models/Institution_staff.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_staff extends Model  {
+class Institution_staff extends Model {
 
     /**
      * The database table used by the model.
@@ -42,12 +42,12 @@ 
     protected $dates = ['start_date', 'end_date', 'modified', 'created'];
 
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','staff_id');
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'staff_id');
     }
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
 

app/Models/Nationality.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class Nationality extends Model  {
+class Nationality extends Model {
 
     /**
      * The database table used by the model.