moe-lk / bulk-upload

app/Console/Commands/ImportStudents.php

Spacing +52 added lines, -52 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()
@@ -167,13 +167,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'])
@@ -189,7 +189,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -205,7 +205,7 @@ 
             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'])
@@ -218,9 +218,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;
         }
@@ -232,20 +232,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')
@@ -253,15 +253,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;
     }
 
@@ -319,7 +319,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;
@@ -338,14 +338,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]);
@@ -364,14 +364,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()]);
@@ -379,7 +379,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');
@@ -387,7 +387,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'])
@@ -395,7 +395,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()]);
         }
     }
@@ -413,14 +413,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');
@@ -430,21 +430,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');
@@ -455,12 +455,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');
@@ -473,17 +473,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();
@@ -498,10 +498,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('--------------------------------------------------------------------------------------------------------------------------');
     }
 
@@ -513,7 +513,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);
         }
     }
@@ -539,7 +539,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
@@ -548,17 +548,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();

app/Http/Controllers/FilesController.php

Spacing +32 added lines, -32 removed lines

@@ -13,101 +13,101 @@
 
     public function index()
     {
-        return Datatables::of(Upload::with(['classRoom'])->where('security_user_id','=',Auth::user()->id))
-            ->editColumn('is_processed', function ($data) {
+        return Datatables::of(Upload::with(['classRoom'])->where('security_user_id', '=', Auth::user()->id))
+            ->editColumn('is_processed', function($data) {
 
                 $nowTime = \Carbon\Carbon::now();
                 $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime);
                 $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at);
                 $diff_in_hours = $to->diffInHours($from);
 
-                if($diff_in_hours >= 2 && $data->is_processed == 3){
+                if ($diff_in_hours >= 2 && $data->is_processed == 3) {
                     return "Terminated";
                 }
                 elseif ($data->is_processed === 1) {
                     return "Success";
-                }elseif ($data->is_processed === 2){
+                }elseif ($data->is_processed === 2) {
                     return "Failed";
-                }elseif($diff_in_hours < 2 && $data->is_processed == 3){
+                }elseif ($diff_in_hours < 2 && $data->is_processed == 3) {
                     return "Processing";
-                }elseif ($data->is_processed == 4){
+                }elseif ($data->is_processed == 4) {
                     return "Process Paused";
-                }else{
+                }else {
                     return 'Pending';
                 };
 
             })
-            ->editColumn('is_email_sent', function ($data) {
+            ->editColumn('is_email_sent', function($data) {
                 if ($data->is_email_sent == 1) {
                     return "Success";
-                }elseif($data->is_email_sent == 2 ){
+                }elseif ($data->is_email_sent == 2) {
                     return 'Failed';
-                }else{
+                }else {
                     return 'Pending';
                 };
 
             })
-            ->editColumn('update', function ($data) {
-                if ((int)$data->update  == 0) {
+            ->editColumn('update', function($data) {
+                if ((int) $data->update == 0) {
                     return "No Processes";
-                }elseif((int)$data->update == 1 ){
+                }elseif ((int) $data->update == 1) {
                     return 'Success';
-                }elseif((int)$data->update == 2 ){
+                }elseif ((int) $data->update == 2) {
                     return 'Failed';
-                }elseif((int)$data->update == 3 ){
+                }elseif ((int) $data->update == 3) {
                     return 'Partial Success';
                 };
 
             })
-            ->editColumn('insert', function ($data) {
+            ->editColumn('insert', function($data) {
                 if ($data->insert == 0) {
                     return "No Processes";
-                }elseif($data->insert == 1 ){
+                }elseif ($data->insert == 1) {
                     return 'Success';
-                }elseif($data->insert == 2 ){
+                }elseif ($data->insert == 2) {
                     return 'Failed';
-                }elseif($data->insert == 3 ){
+                }elseif ($data->insert == 3) {
                     return 'Partial Success';
                 };
 
             })
-            ->editColumn('filename', function ($data) {
-                if(\App::environment('local') || \App::environment('stage')){
+            ->editColumn('filename', function($data) {
+                if (\App::environment('local') || \App::environment('stage')) {
                     return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 
-                }else{
+                }else {
                     return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>';
                 }
 
             })
-             ->editColumn('error', function ($data) {
-                if(\App::environment('local') || \App::environment('stage')){
+             ->editColumn('error', function($data) {
+                if (\App::environment('local') || \App::environment('stage')) {
                     return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
 
-                }else{
+                }else {
                     return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>';
                 }
 
-            })->editColumn('actions', function ($data) {
+            })->editColumn('actions', function($data) {
 
                 $nowTime = \Carbon\Carbon::now();
                 $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime);
                 $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at);
                 $diff_in_hours = $to->diffInHours($from);
 
-                if($diff_in_hours >= 2 && $data->is_processed == 3){
+                if ($diff_in_hours >= 2 && $data->is_processed == 3) {
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>';
-                }elseif ($data->is_processed == 1){
+                }elseif ($data->is_processed == 1) {
                     return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>';
-                }elseif ($data->is_processed == 2){
+                }elseif ($data->is_processed == 2) {
                     return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>';
-                }elseif ($data->is_processed == 0){
+                }elseif ($data->is_processed == 0) {
                     return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>';
-                }elseif ($data->is_processed == 4){
+                }elseif ($data->is_processed == 4) {
                     return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>';
                 }
             })
-            ->rawColumns(['filename','error','actions'])
+            ->rawColumns(['filename', 'error', 'actions'])
             ->make(true);
     }
 

app/Console/Commands/CleanExamData.php

Spacing +26 added lines, -26 removed lines

@@ -48,72 +48,72 @@ 
     {
         $type = $this->argument('type');
         $students = array();
-        if($type == 'invalid'){
+        if ($type == 'invalid') {
             $students = DB::table('examination_students as es')
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
             ->get()
             ->toArray();
-        }elseif($type == 'duplicate'){
+        }elseif ($type == 'duplicate') {
             $students = DB::table('security_users')
             ->where('updated_from', 'doe')
             ->get()
             ->toArray();
             
-        }elseif($type == 'all'){
+        }elseif ($type == 'all') {
             $students = DB::table('examination_students')
-            ->where('nsid','<>','')
+            ->where('nsid', '<>', '')
             ->whereNotNull('nsid')
             ->get()
             ->toArray();
-        }elseif($type == 'lock'){
+        }elseif ($type == 'lock') {
             $students = DB::table('examination_students')
-            ->where('nsid','<>','')
+            ->where('nsid', '<>', '')
             ->whereNotNull('nsid')
             ->get()
             ->toArray();
         }
 
         $this->output->writeln('###########################################------Start cleanning exam records------###########################################');    
-        if(count($students) > 0){
-            $this->output->writeln('Total students to clean: '.  count($students));
+        if (count($students) > 0) {
+            $this->output->writeln('Total students to clean: '.count($students));
             $students = array_chunk($students, $this->argument('chunk'));
             $function = array($this, 'process');
-            processParallel($function,$students, $this->argument('max'),$type);
-        }else{
+            processParallel($function, $students, $this->argument('max'), $type);
+        }else {
             $this->output->writeln('nothing to process, all are cleaned');
         }   
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
     }
 
-    public function process($students,$count,$type){
-       if($type === 'duplicate'){
-        array_walk($students,array($this,'cleanData'));
-       }elseif($type === 'lock'){
-        array_walk($students,array($this,'lockData'));
+    public function process($students, $count, $type) {
+       if ($type === 'duplicate') {
+        array_walk($students, array($this, 'cleanData'));
+       }elseif ($type === 'lock') {
+        array_walk($students, array($this, 'lockData'));
        }
     }
 
-    public function lockData($Student){
-        $Student = json_decode(json_encode($Student),true);
-        $student = Security_user::where('openemis_no',(string)$Student['nsid'])->first();
-        if(!empty($student)){
+    public function lockData($Student) {
+        $Student = json_decode(json_encode($Student), true);
+        $student = Security_user::where('openemis_no', (string) $Student['nsid'])->first();
+        if (!empty($student)) {
             Institution_student::where('student_id', $student->id)->update(['updated_from' => 'doe']);
             Security_user::where('id', $student->id)->update(['updated_from' => 'doe']);
-            $this->output->writeln('Locked:'. (string)$Student['nsid'] .':' . $student['openemis_no']);
+            $this->output->writeln('Locked:'.(string) $Student['nsid'].':'.$student['openemis_no']);
         }
     }
 
 
     public function cleanData($Student)
     {
-        $exist = Examination_student::where('nsid','=',  (string)$Student->openemis_no)->count();
+        $exist = Examination_student::where('nsid', '=', (string) $Student->openemis_no)->count();
         if (!$exist) {
             Institution_student::where('student_id', $Student->id)->delete();
             Institution_class_student::where('student_id', $Student->id)->delete();
             Institution_student_admission::where('student_id', $Student->id)->delete();
             Security_user::where('id', $Student->id)->delete();
-            $this->output->writeln('cleaned:'.  (string)$Student->openemis_no);
-        }else{
+            $this->output->writeln('cleaned:'.(string) $Student->openemis_no);
+        }else {
             Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']);
             Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']);
         }
@@ -122,12 +122,12 @@ 
     public function cleanInvalidData($Student)
     {
         $Student = (array) $Student;
-        $exist = Examination_student::where('nsid',$Student['nsid'])->count();
+        $exist = Examination_student::where('nsid', $Student['nsid'])->count();
         
         $this->uniqueUId = new UniqueUid();
 
-        $nsid = ltrim(rtrim($Student['nsid'],'-'),'-');
-        if(!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')){
+        $nsid = ltrim(rtrim($Student['nsid'], '-'), '-');
+        if (!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')) {
         }
     }
 }

app/Console/Commands/OpenTOPending.php

Spacing +1 added lines, -1 removed lines

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

app/Imports/StudentUpdate.php

Spacing +40 added lines, -40 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,
@@ -108,9 +108,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();
 
 
@@ -130,7 +130,7 @@ 
                         ->update([
                             'first_name' => $row['full_name'] ? $row['full_name'] : $studentInfo['first_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                             'last_name' => $row['full_name'] ? genNameWithInitials($row['full_name']) : genNameWithInitials($studentInfo['first_name']),
-                            'preferred_name' => $row['preferred_name'] ,
+                            'preferred_name' => $row['preferred_name'],
                             'gender_id' => $genderId ? $genderId : $studentInfo['gender_id'],
                             'date_of_birth' => $date ? $date : $studentInfo['date_of_birth'],
                             'address' => $row['address'] ? $row['address'] : $studentInfo['address'],
@@ -145,10 +145,10 @@ 
 
                 $student = Institution_class_student::where('student_id', '=', $studentInfo->id)->first();
 
-                if(!empty($row['admission_no']) && !empty($academicPeriod)){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
-                    ->where('academic_period_id','=',$academicPeriod->id)
+                if (!empty($row['admission_no']) && !empty($academicPeriod)) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
+                    ->where('academic_period_id', '=', $academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
                 
@@ -174,17 +174,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'],
@@ -198,10 +198,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;
@@ -215,7 +215,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']),
@@ -234,25 +234,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;
@@ -267,7 +267,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']),
@@ -285,16 +285,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']);
                     }
@@ -303,9 +303,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;
@@ -320,7 +320,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']),
@@ -339,22 +339,22 @@ 
                         $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']);
                     }
                 }
 
-                $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);
@@ -363,10 +363,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'));
                 }
 
@@ -379,7 +379,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/Http/Controllers/FileController.php

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function upload(Request $request){
+    public function upload(Request $request) {
 
 
 
@@ -75,7 +75,7 @@ 
         $institution = auth()->user()->permissions->isEmpty() ? auth()->user()->principal[0]->institution_group[0]->institution->code : auth()->user()->permissions[0]->institution_staff->institution->code;
 
 
-        $fileName = time().'_'.$institution.'_'.str_replace(' ','_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
+        $fileName = time().'_'.$institution.'_'.str_replace(' ', '_', clean($class->name)).'_'.auth()->user()->openemis_no.'_student_bulk_data.xlsx';
         Storage::disk('local')->putFileAs(
             'sis-bulk-data-files/',
             $uploadFile,
@@ -83,7 +83,7 @@ 
         );
 
         $upload = new Upload;
-        $upload->fileName =$fileName;
+        $upload->fileName = $fileName;
         $upload->model = 'Student';
         $upload->node = 'None';
         $upload->institution_class_id = $class->id;
@@ -94,8 +94,8 @@ 
         return redirect('/')->withSuccess('The file is uploaded, we will process and let you know by your email');
     }
 
-    public function updateQueueWithUnprocessedFiles($id, $action){
-        if($action == 100){
+    public function updateQueueWithUnprocessedFiles($id, $action) {
+        if ($action == 100) {
             DB::table('uploads')
                 ->where('id', $id)
                 ->update(['is_processed' => 0]);
@@ -107,14 +107,14 @@ 
     }
 
 
-    public function downloadTemplate(){
+    public function downloadTemplate() {
         $filename = 'censusNo_className_sis_students_bulk_upload';
         $version = '2007_V2.1.0_20200928.xlsx';
-        $file_path = storage_path() .'/app/public/'. $filename.'_'.$version;;
+        $file_path = storage_path().'/app/public/'.$filename.'_'.$version; ;
         if (file_exists($file_path))
         {
             return Response::download($file_path, Auth::user()->openemis_no.'_'.$filename.$version, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else
@@ -128,13 +128,13 @@ 
      * @param $filename
      * @return Processed excel file with error
      */
-    public function downloadErrorFile($filename){
+    public function downloadErrorFile($filename) {
 
-        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'. $filename;
+        $file_path = storage_path().'/app/sis-bulk-data-files/processed/'.$filename;
         if (file_exists($file_path))
         {
             return Response::download($file_path, $filename, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else
@@ -144,12 +144,12 @@ 
     }
 
 
-    public function downloadFile($filename){
-        $file_path = storage_path().'/app/sis-bulk-data-files/'. $filename;
+    public function downloadFile($filename) {
+        $file_path = storage_path().'/app/sis-bulk-data-files/'.$filename;
         if (file_exists($file_path))
         {
             return Response::download($file_path, $filename, [
-                'Content-Length: '. filesize($file_path)
+                'Content-Length: '.filesize($file_path)
             ]);
         }
         else

app/Console/Commands/RemoveDuplications.php

Spacing +7 added lines, -7 removed lines

@@ -43,18 +43,18 @@
             $this->start_time = microtime(TRUE);
             $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $this->output->writeln('############### Starting delete Duplication ################');
-            $duplicatedStudents =   DB::table('institution_students as ins')
-            ->select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id')
-            ->having('total','>',1)
+            $duplicatedStudents = DB::table('institution_students as ins')
+            ->select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id')
+            ->having('total', '>', 1)
             ->orderBy('student_id')
             ->get()
             ->toArray();
-            if(count($duplicatedStudents)>0){
-                processParallel(array($this,'process'),$duplicatedStudents,10);
-            }else{
+            if (count($duplicatedStudents) > 0) {
+                processParallel(array($this, 'process'), $duplicatedStudents, 10);
+            }else {
                 $this->output->writeln('Nothing to Process, all are clean');
             }
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             dd($th);
         }
     }

app/Imports/UsersImport.php

Spacing +30 added lines, -30 removed lines

@@ -75,7 +75,7 @@ 
     public function registerEvents(): array
     {
         return [
-            BeforeSheet::class => function (BeforeSheet $event) {
+            BeforeSheet::class => function(BeforeSheet $event) {
                 $this->sheetNames[] = $event->getSheet()->getTitle();
                 $this->worksheet = $event->getSheet();
                 $this->validateClass();
@@ -87,7 +87,7 @@ 
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                 }
             },
-            BeforeImport::class => function (BeforeImport $event) {
+            BeforeImport::class => function(BeforeImport $event) {
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C'));
                 if ($this->highestRow < 3) {
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -114,7 +114,7 @@ 
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
                 // dd($mandatorySubject);
                 $subjects = getMatchingKeys($row);
-                $genderId  = null;
+                $genderId = null;
                 switch ($row['gender_mf']) {
                     case 'M':
                         $genderId = $row['gender_mf'] = 1;
@@ -122,15 +122,15 @@ 
                         $this->maleStudentsCount += 1;
                         break;
                     case 'F':
-                        $genderId =  $row['gender_mf'] = 2;
+                        $genderId = $row['gender_mf'] = 2;
                         $genderId = 2;
                         $this->femaleStudentsCount += 1;
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
 
 
@@ -146,12 +146,12 @@ 
 
                 $openemisStudent = $this->uniqueUid::getUniqueAlphanumeric();
                 \Log::debug('Security_user');
-                $student =  Security_user::create([
+                $student = Security_user::create([
                     'username' => str_replace('-', '', $openemisStudent),
                     'openemis_no' => $openemisStudent,
                     'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                     'last_name' => genNameWithInitials($row['full_name']),
-                    'preferred_name' => $row['preferred_name'] ,
+                    'preferred_name' => $row['preferred_name'],
                     'gender_id' => $genderId,
                     'date_of_birth' => $date,
                     'address' => $row['address'],
@@ -236,9 +236,9 @@ 
                 if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) {
                     try {
                         // convert Meeter to CM
-                        $hight = $row['bmi_height'] / 100;
+                        $hight = $row['bmi_height']/100;
                         //calculate BMI
-                        $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                        $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                         $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
 
@@ -252,17 +252,17 @@ 
                             'security_user_id' => $student->student_id,
                             'created_user_id' => $this->file['security_user_id']
                         ]);
-                    } catch (\Throwable $th) {
-                        \Log::error('User_body_mass:' . $th->getMessage());
+                    }catch (\Throwable $th) {
+                        \Log::error('User_body_mass:'.$th->getMessage());
                     }
                 }
 
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
 
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
                     $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
@@ -300,7 +300,7 @@ 
                             User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                             ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
@@ -313,9 +313,9 @@ 
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -351,7 +351,7 @@ 
                             User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                             ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
@@ -366,9 +366,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;
@@ -405,7 +405,7 @@ 
                             User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                             ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
@@ -437,7 +437,7 @@ 
 
                 if ($totalStudents['total'] > $institutionClass->no_of_students) {
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
-                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]);
+                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]);
                     $failures = [0 => $failure];
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
                     Log::info('email-sent', [$this->file]);
@@ -449,7 +449,7 @@ 
                         'total_female_students' => $totalStudents['total_female_students']
                     ]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             //            $failure = new Failure(3, 'remark', [3 => ], [null]);
             $failures = $e->failures();
@@ -465,7 +465,7 @@ 
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:256',
             '*.preferred_name' => 'required|regex:/^[\pL\s\-]+$/u|max:90',
             '*.gender_mf' => 'required|in:M,F',
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
             '*.address' => 'nullable',
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -475,8 +475,8 @@ 
             '*.academic_period' => 'required|exists:academic_periods,name',
             '*.education_grade' => 'required',
             '*.option_*' => 'nullable|exists:education_subjects,name',
-            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'],
-            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'],
+            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'],
+            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'],
             '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].'
             '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name',
             '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/',