moe-lk / bulk-upload

app/Console/Commands/ImportStudents.php

Spacing +54 added lines, -54 removed lines

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

Braces +1 added lines, -1 removed lines

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

app/Imports/StudentUpdate.php

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
                 if(!empty($row['admission_no'])){
                     Institution_student::where('student_id','=',$studentInfo->id)
                     ->where('institution_id','=', $institution)
-                   // ->where('academic_period_id','=',$academicPeriod->id)
+                    // ->where('academic_period_id','=',$academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
                 if (!empty($row['special_need'])) {

Spacing +38 added lines, -38 removed lines

@@ -55,7 +55,7 @@ 
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Concerns\RegistersEventListeners;
 
-class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{
+class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{
 
     use Importable,
         RegistersEventListeners,
@@ -110,9 +110,9 @@ 
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
                 //$academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first();
                 //$academicPeriod = Academic_period::where('name', '=',$row['academic_period'])->first();
 
@@ -161,9 +161,9 @@ 
                     ->update(['admission_id'=> $row['admission_no']]);
                 }*/
 
-                if(!empty($row['admission_no'])){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
+                if (!empty($row['admission_no'])) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
                    // ->where('academic_period_id','=',$academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
@@ -189,17 +189,17 @@ 
                 if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) {
 
                     // convert Meeter to CM
-                    $hight = $row['bmi_height'] / 100;
+                    $hight = $row['bmi_height']/100;
 
                     //calculate BMI
-                    $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                    $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                     $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
-                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id )
-                            ->where('security_user_id','=',$student->student_id)->count();
+                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
+                            ->where('security_user_id', '=', $student->student_id)->count();
 
                     \Log::debug('User_body_mass');
-                    if(!($count > 0)){
+                    if (!($count > 0)) {
                         User_body_mass::create([
                             'height' => $row['bmi_height'],
                             'weight' => $row['bmi_weight'],
@@ -213,10 +213,10 @@ 
                 }
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
-                    $openemisFather =  $this->uniqueUid::getUniqueAlphanumeric();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
+                    $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
                     $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
@@ -230,7 +230,7 @@ 
 
                     if ($father === null) {
                         $data = [
-                            'username' => str_replace('-','',$openemisFather),
+                            'username' => str_replace('-', '', $openemisFather),
                             'openemis_no' => $openemisFather,
                             'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                             'last_name' => genNameWithInitials($row['fathers_full_name']),
@@ -249,25 +249,25 @@ 
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                                 ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
                     }
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -282,7 +282,7 @@ 
 
                     if ($mother === null) {
                         $mother = Security_user::create([
-                                    'username' => str_replace('-','',$openemisMother),
+                                    'username' => str_replace('-', '', $openemisMother),
                                     'openemis_no' => $openemisMother,
                                     'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['mothers_full_name']),
@@ -300,16 +300,16 @@ 
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                                 ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
                     }
@@ -318,9 +318,9 @@ 
 
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -335,7 +335,7 @@ 
 
                     if ($guardian === null) {
                         $guardian = Security_user::create([
-                                    'username' => str_replace('-','',$openemisGuardian),
+                                    'username' => str_replace('-', '', $openemisGuardian),
                                     'openemis_no' => $openemisGuardian,
                                     'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['guardians_full_name']),
@@ -354,23 +354,23 @@ 
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                                 ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
                     }
                 }
                 Institution_student::updateStudentArea($student);
 
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
 
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 // $stundetSubjects = $this->getStudentSubjects($student);
@@ -379,10 +379,10 @@ 
                 if (!empty($allSubjects)) {
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
                     $this->student = $student;
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
                     // $allSubjects = array_unique($allSubjects,SORT_REGULAR);
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
-                    array_walk($allSubjects,array($this,'insertSubject'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
 
@@ -395,7 +395,7 @@ 
                             'total_male_students' => $totalStudents['total_male_students'],
                             'total_female_students' => $totalStudents['total_female_students']]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failures = $e->failures();
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);

app/Imports/Import.php

Spacing +21 added lines, -21 removed lines

@@ -88,10 +88,10 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 0;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
@@ -105,7 +105,7 @@ 
         $this->failures = [];
         if (($column !== "") && (!in_array($column, $columns))) {
             $this->isValidSheet = false;
-            $this->error[] = 'Unsupported column found ,remove:' . $column;
+            $this->error[] = 'Unsupported column found ,remove:'.$column;
             $this->failure = new Failure(3, 'remark', $this->error, [null]);
             $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
         }
@@ -118,13 +118,13 @@ 
     {
         $columns = Config::get('excel.columns');
         $optional_columns = Config::get('excel.optional_columns');
-        $columns = array_diff ($columns,$optional_columns);
+        $columns = array_diff($columns, $optional_columns);
         $error = \Illuminate\Validation\ValidationException::withMessages([]);
         $this->failures = [];
         foreach ($columns as  $column) {
                 if (($column !== "") && (!in_array($column, $existingColumns))) {
                     $this->isValidSheet = false;
-                    $this->error[] = 'Missing Column :' . $column . ' Not found';
+                    $this->error[] = 'Missing Column :'.$column.' Not found';
                     $this->failure = new Failure(3, 'remark', $this->error, [null]);
                     $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
                 }
@@ -141,16 +141,16 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 1;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
         if ($higestRow == 0) {
             exit;
-        } else {
+        }else {
             return $higestRow;
         }
     }
@@ -175,17 +175,17 @@ 
                     case 'string':
                         $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]);
                         $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);
-                        $row[$column] =  \Carbon\Carbon::createFromFormat($format, $row[$column]);
+                        $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);
                         break;
                     case 'double';
-                        $row[$column] =  \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
+                        $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
                         break;
                 }
             }
             return $row;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]);
+            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         }
@@ -206,18 +206,18 @@ 
         $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
         $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
 
-        $row['admission_no'] =  str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
+        $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
       
         if (array_key_exists('identity_type', $row)) {
         if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) {
-            $row['identity_number'] =  str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
+            $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
             // dd(($row['date_of_birth_yyyy_mm_dd']));
-            $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first();
+            $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first();
             if ($BirthDivision !== null) {
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')
                     ->where('parent_id', '=', $BirthDivision->id)->first();
                 if ($BirthArea !== null) {
-                    $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m");
+                    $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m");
                 }
             }
 
@@ -230,9 +230,9 @@ 
     {
         if (array_key_exists($key, $row)) {
             return true;
-        } else {
+        }else {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]);
+            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]);
             $failures = [0 => $failure];
             new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         };
@@ -268,11 +268,11 @@ 
 
         if ($exceededStudents == true) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
+            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
             Log::info('email-sent', [$this->file]);
-        } else {
+        }else {
             return true;
         }
     }

app/Models/Student_guardian.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Webpatser\Uuid\Uuid;
 
-class Student_guardian extends Base_Model  {
+class Student_guardian extends Base_Model {
 
     use SoftDeletes;
 
@@ -59,19 +59,19 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created_user_id = 1;
         });
     }
 
-    public static function createStudentGuardian($student,$guardian,$user){
+    public static function createStudentGuardian($student, $guardian, $user) {
      
         $exist = self::where('student_id', $student->student_id)
         ->where('guardian_relation_id', $guardian->guardian_relation_id)
         ->exists();
 
-        $totalGuardians = self::where('student_id',$student->student_id)->count();
+        $totalGuardians = self::where('student_id', $student->student_id)->count();
 
         $data = [
             'student_id' => $student->student_id,
@@ -79,13 +79,13 @@ 
             'guardian_relation_id' => $guardian->guardian_relation_id,
             'created_user_id' => $user
         ];
-        if(!$exist){
+        if (!$exist) {
             $data['created'] = now();
             self::create($data);
-        }else{
+        }else {
             $data['modified'] = now();
-            self::where('student_id' , $student->student_id)
-            ->where('guardian_relation_id',$guardian->guardian_relation_id)
+            self::where('student_id', $student->student_id)
+            ->where('guardian_relation_id', $guardian->guardian_relation_id)
             ->update($data);
         }
     }

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         if(!$exist){
             $data['created'] = now();
             self::create($data);
-        }else{
+        } else{
             $data['modified'] = now();
             self::where('student_id' , $student->student_id)
             ->where('guardian_relation_id',$guardian->guardian_relation_id)

app/Models/Institution_student.php

Braces +7 added lines, -7 removed lines

@@ -226,25 +226,25 @@
         if(!is_null($father) && is_null($mother) && is_null($guardian)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $father->address_area_id]);
-        }elseif(!is_null($mother)  && (is_null($father) && is_null($guardian))){
+        } elseif(!is_null($mother)  && (is_null($father) && is_null($guardian))){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && is_null($father) && is_null($mother)){
+        } elseif(!is_null($guardian) && is_null($father) && is_null($mother)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id ==  $mother->address_area_id)){
+        } elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id ==  $mother->address_area_id)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id !==  $mother->address_area_id) && !is_null($guardian)){
+        } elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id !==  $mother->address_area_id) && !is_null($guardian)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($father) && $father->address == $student['address']){
+        } elseif(!is_null($father) && $father->address == $student['address']){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother) && $mother->address == $student['address']){
+        } elseif(!is_null($mother) && $mother->address == $student['address']){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && $guardian->address == $student['address']){
+        } elseif(!is_null($guardian) && $guardian->address == $student['address']){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
         }

Spacing +33 added lines, -33 removed lines

@@ -71,7 +71,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -129,9 +129,9 @@ 
                 'institution_students.admission_id'
             )
             ->where('institution_students.institution_id', $institutionGrade['institution_id'])
-            ->where('institution_students.student_status_id',1)
+            ->where('institution_students.student_status_id', 1)
             ->where('institution_students.education_grade_id', $institutionGrade['education_grade_id'])
-            ->where('institution_students.deleted_at',null)
+            ->where('institution_students.deleted_at', null)
             ->where('institution_students.academic_period_id', $academicPeriod->id)->get()->toArray();
     }
 
@@ -144,7 +144,7 @@ 
      */
     public static function createExaminationData($student, $admissionInfo)
     {
-        $student['sp_center'] = gettype((int)$student['sp_center']) == 'integer' ?  $student['sp_center'] : 0;
+        $student['sp_center'] = gettype((int) $student['sp_center']) == 'integer' ? $student['sp_center'] : 0;
         try {
             self::create([
                 'id' => (string) Uuid::generate(4),
@@ -169,7 +169,7 @@ 
                 'created' => now(),
                 'created_user_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
@@ -183,7 +183,7 @@ 
      */
     public static function updateExaminationData($student, $admissionInfo)
     {
-        $student['sp_center'] = gettype((int)$student['sp_center']) == 'integer' ?  $student['sp_center'] : 0;
+        $student['sp_center'] = gettype((int) $student['sp_center']) == 'integer' ? $student['sp_center'] : 0;
         try {
             self::where([
                 'student_id' => $student['student_id'],
@@ -204,50 +204,50 @@ 
                     'modified_user_id' => 1
                 ]
             );
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
 
-    public static function updateStudentArea(array $student){
-        $father = Student_guardian::where('student_id',$student['student_id'])
-        ->join('security_users as sg','guardian_id', 'sg.id')
-        ->where('guardian_relation_id',1)
+    public static function updateStudentArea(array $student) {
+        $father = Student_guardian::where('student_id', $student['student_id'])
+        ->join('security_users as sg', 'guardian_id', 'sg.id')
+        ->where('guardian_relation_id', 1)
         ->get()->first();
 
-        $mother = Student_guardian::where('student_id',$student['student_id'])
-        ->join('security_users as sg','guardian_id', 'sg.id')
-        ->where('guardian_relation_id',2)
+        $mother = Student_guardian::where('student_id', $student['student_id'])
+        ->join('security_users as sg', 'guardian_id', 'sg.id')
+        ->where('guardian_relation_id', 2)
         ->get()->first();
 
-        $guardian = Student_guardian::where('student_id',$student['student_id'])
-        ->join('security_users as sg','guardian_id', 'sg.id')
-        ->where('guardian_relation_id',3)
+        $guardian = Student_guardian::where('student_id', $student['student_id'])
+        ->join('security_users as sg', 'guardian_id', 'sg.id')
+        ->where('guardian_relation_id', 3)
         ->get()->first();
 
-        if(!is_null($father) && is_null($mother) && is_null($guardian)){
-            Security_user::where('id',$student['student_id'])
+        if (!is_null($father) && is_null($mother) && is_null($guardian)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $father->address_area_id]);
-        }elseif(!is_null($mother)  && (is_null($father) && is_null($guardian))){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && (is_null($father) && is_null($guardian))) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && is_null($father) && is_null($mother)){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($guardian) && is_null($father) && is_null($mother)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id ==  $mother->address_area_id)){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && !is_null($father) && ($father->address_area_id == $mother->address_area_id)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id !==  $mother->address_area_id) && !is_null($guardian)){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && !is_null($father) && ($father->address_area_id !== $mother->address_area_id) && !is_null($guardian)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($father) && $father->address == $student['address']){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($father) && $father->address == $student['address']) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother) && $mother->address == $student['address']){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && $mother->address == $student['address']) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && $guardian->address == $student['address']){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($guardian) && $guardian->address == $student['address']) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
         }
     }

app/Console/Commands/RemoveDuplicatedGuardians.php

Indentation +5 added lines, -5 removed lines

@@ -52,16 +52,16 @@
     }
 
     public function delete(){
-       try{
-           DB::statement("UPDATE  student_guardians t1
+        try{
+            DB::statement("UPDATE  student_guardians t1
            INNER JOIN student_guardians t2 
                set t1.deleted_at=now() 
            WHERE 
                t1.id > t2.id AND
                t1.student_id = t2.student_id AND
                t1.guardian_id = t2.guardian_id");
-       }catch(\Exception $e){
-           dd($e);
-       }
+        }catch(\Exception $e){
+            dd($e);
+        }
     }
 }

Spacing +6 added lines, -6 removed lines

@@ -45,14 +45,14 @@ 
             $this->output->writeln('############### Starting delete Duplication ################');
             Student_guardian::withTrashed()->restore();
             $this->delete();
-            $this->end_time  = microtime(TRUE);
-            $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
-        } catch (\Throwable $th) {
+            $this->end_time = microtime(TRUE);
+            $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete');
+        }catch (\Throwable $th) {
         }
     }
 
-    public function delete(){
-       try{
+    public function delete() {
+       try {
            DB::statement("UPDATE  student_guardians t1
            INNER JOIN student_guardians t2 
                set t1.deleted_at=now() 
@@ -60,7 +60,7 @@ 
                t1.id > t2.id AND
                t1.student_id = t2.student_id AND
                t1.guardian_id = t2.guardian_id");
-       }catch(\Exception $e){
+       }catch (\Exception $e) {
            dd($e);
        }
     }

Braces +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
                t1.id > t2.id AND
                t1.student_id = t2.student_id AND
                t1.guardian_id = t2.guardian_id");
-       }catch(\Exception $e){
+       } catch(\Exception $e){
            dd($e);
        }
     }

app/Console/Commands/CloneConfigData.php

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         if(count($shift) > 0){
             // processParallel($function,$shift, $this->argument('max'),$params);
             array_walk($shift,$function,$params);
-        }else{
+        } else{
             $this->output->writeln('Nothing to clone');
         }
         $this->end_time = microtime(TRUE);

Spacing +6 added lines, -6 removed lines

@@ -54,8 +54,8 @@ 
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
         $mode = $this->argument('mode') == 'AL' ? true : false; 
         $previousAcademicPeriodYear = $academicPeriod->order;
-        $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first();
-        $shift = $this->shifts->getShiftsToClone($previousAcademicPeriod->code,$this->argument(('max')),$mode);
+        $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first();
+        $shift = $this->shifts->getShiftsToClone($previousAcademicPeriod->code, $this->argument(('max')), $mode);
         $params = [
             'year' => $year,
             'academic_period' => $academicPeriod,
@@ -64,17 +64,17 @@ 
         ];
 
         $function = array($this->clone, 'process');
-        if(count($shift) > 0){
+        if (count($shift) > 0) {
             // processParallel($function,$shift, $this->argument('max'),$params);
-            array_walk($shift,$function,$params);
-        }else{
+            array_walk($shift, $function, $params);
+        }else {
             $this->output->writeln('Nothing to clone');
         }
         $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('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$');
     }  
 }

app/Console/Commands/MapStudentArea.php

Spacing +5 added lines, -5 removed lines

@@ -30,7 +30,7 @@ 
      */
     public function __construct()
     {
-        $this->output =  new \Symfony\Component\Console\Output\ConsoleOutput();
+        $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
         parent::__construct();
     }
 
@@ -41,13 +41,13 @@ 
      */
     public function handle()
     {
-        $students = Security_user::where('is_student',true)->get()->toArray();
-        array_walk($students,array($this,'process'));
+        $students = Security_user::where('is_student', true)->get()->toArray();
+        array_walk($students, array($this, 'process'));
     }
 
-    public function process($student){
+    public function process($student) {
         $student['student_id'] = $student['id'];
         Institution_student::updateStudentArea($student);
-        $this->output->writeln('area updated for student:'. $student['openemis_no']) ;
+        $this->output->writeln('area updated for student:'.$student['openemis_no']);
     }
 }

app/Console/Commands/cleanConfig.php

Spacing +3 added lines, -3 removed lines

@@ -48,16 +48,16 @@
         $year = $this->argument('year');
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
         $previousAcademicPeriodYear = $academicPeriod->order;
-        $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first();
+        $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first();
 
         $params = [
             'academic_period' => $academicPeriod,
             'previous_academic_period' => $previousAcademicPeriod
         ];
 
-        if($year == '2019' || $year == '2018/19'){
+        if ($year == '2019' || $year == '2018/19') {
             die('Academic Year 2019 or earlier can`t be deleted');
-        }else{
+        }else {
             $this->clone->cleanConfig($params);
         }
     }

Braces +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
         if($year == '2019' || $year == '2018/19'){
             die('Academic Year 2019 or earlier can`t be deleted');
-        }else{
+        } else{
             $this->clone->cleanConfig($params);
         }
     }