moe-lk / bulk-upload

app/Models/Institution_class.php

Spacing +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
     }
 
 
-    public function getShiftClasses($shift, $al , $param = [])
+    public function getShiftClasses($shift, $al, $param = [])
     {
         $query = self::query()
             ->select(
@@ -75,20 +75,20 @@ 
 
             )
             ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id')
-            ->join('education_grades','institution_class_grades.education_grade_id','education_grades.id')  
+            ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id')  
             ->join('education_programmes', 'education_grades.education_programme_id', 'education_programmes.id')
-            ->join('education_cycles', 'education_programmes.education_cycle_id','education_cycles.id')
+            ->join('education_cycles', 'education_programmes.education_cycle_id', 'education_cycles.id')
             ->groupBy('institution_classes.id');
 
         if ($al == true) {
             $query->where('education_programmes.education_cycle_id', 4)
             ->where('institution_shift_id', $shift['id'])
-            ->where('institution_classes.academic_period_id',$param['previous_academic_period_id']);
+            ->where('institution_classes.academic_period_id', $param['previous_academic_period_id']);
             $data = $query
             ->groupBy('institution_classes.id')
             ->get()->toArray();
             return $data;
-        } else {
+        }else {
             $query
             // ->where('education_programmes.education_cycle_id','<>',4)
             ->where('institution_shift_id', $shift['id']);
@@ -99,13 +99,13 @@ 
         }
     }
 
-    public static function getGradeClasses($education_grade_id,$institution_id){
+    public static function getGradeClasses($education_grade_id, $institution_id) {
         return self::query()
-        ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id',
-            'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id')
-        ->where('institution_class_grades.education_grade_id',$education_grade_id)
-        ->where('institution_classes.institution_id',$institution_id)
-        ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id')
+        ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id',
+            'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id')
+        ->where('institution_class_grades.education_grade_id', $education_grade_id)
+        ->where('institution_classes.institution_id', $institution_id)
+        ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id')
         ->get()->toArray();
     }
 

app/Http/Controllers/BulkPromotion.php

Spacing +21 added lines, -21 removed lines

@@ -64,7 +64,7 @@ 
                 if (!empty($isAvailableforPromotion)) {
                     $this->process($institutionGrade, $nextGrade, $params);
                     DB::commit();
-                } else {
+                }else {
                     DB::rollBack();
                 }
                 //leave school levers
@@ -72,7 +72,7 @@ 
                 //     $this->process($institutionGrade, $nextGrade, $params);
                 // }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
         }
     }
@@ -105,7 +105,7 @@ 
 
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln('##########################################################################################################################');
-            $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote));
+            $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote));
 
 
             if (!empty($parallelClasses)) {
@@ -120,7 +120,7 @@ 
                 array_walk($parallelClasses, array($this, 'updateStudentCount'));
                 DB::commit();
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
             Log::error($e->getMessage());
         }
@@ -155,7 +155,7 @@ 
         $previousAcademicPeriod = $params['previousAcademicPeriod'];
         $nextGradeObj = null;
         $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $previousAcademicPeriod->id);
-        if ($nextGrade !== []  && !is_null($nextGrade)) {
+        if ($nextGrade !== [] && !is_null($nextGrade)) {
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $academicPeriod->id);
         }
 
@@ -164,7 +164,7 @@ 
                 // promote parallel classes
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())) {
+            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
                 // promote pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1);
                 return 2;
@@ -172,12 +172,12 @@ 
                 // Promote matching class name with previous class
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } else {
+            }else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1);
                 return 2;
             }
-        } else {
+        }else {
             // default pool promotion
             $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 3);
             return 2;
@@ -213,10 +213,10 @@ 
         ];
 
         try {
-            Institution_student::where('id', (string)$student['id'])->update($studentData);
+            Institution_student::where('id', (string) $student['id'])->update($studentData);
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']);
-        } catch (\Exception $e) {
+            $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']);
+        }catch (\Exception $e) {
             Log::error($e->getMessage());
         }
     }
@@ -236,13 +236,13 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             $class = array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-            if(!($class)){
-                $nextGradeName = explode(" ",$nextGrade->name)[0];
-                $educationGrade['name'] = explode(" ",$educationGrade['name'])[0];
+            if (!($class)) {
+                $nextGradeName = explode(" ", $nextGrade->name)[0];
+                $educationGrade['name'] = explode(" ", $educationGrade['name'])[0];
                 $class = array_search(str_replace($educationGrade['name'], $nextGradeName, $studentClass->name), array_column($classes, 'name'));
             }
             return $class;
-        } else {
+        }else {
             return false;
         }
     }
@@ -264,7 +264,7 @@ 
         $class = null;
         if (count($classes) == 1) {
             $class = $classes[0];
-        } else {
+        }else {
             $class = $this->getStudentClass($student, $educationGrade, $nextGrade, $classes);
             if (is_numeric($class)) {
                 $class = $classes[$class];
@@ -296,13 +296,13 @@ 
                     //     array_walk($allInsSubjects,array($this,'updateSubjectCount'));
                     // }
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
-                } else {
-                    $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj);
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
+                }else {
+                    $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 
                 Log::error($e->getMessage());
             }

app/Models/Institution_grade.php

Spacing +13 added lines, -13 removed lines

@@ -70,10 +70,10 @@ 
     public function getParallelClasses($id, $institutionId, $educationGradeId, $academicPeriodId)
     {
         $data = self::find($id)->select('institution_grades.id as insGrade', 'institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id')
-            ->join('institution_classes', function ($join) use ($educationGradeId, $academicPeriodId) {
+            ->join('institution_classes', function($join) use ($educationGradeId, $academicPeriodId) {
                 $join->on('institution_classes.institution_id', '=', 'institution_grades.institution_id')
                     ->where('institution_classes.academic_period_id', $academicPeriodId)
-                    ->join('institution_class_grades', function ($join) use ($educationGradeId) {
+                    ->join('institution_class_grades', function($join) use ($educationGradeId) {
                         $join->on('institution_class_grades.institution_class_id', '=', 'institution_classes.id')
                             ->where('institution_class_grades.education_grade_id', $educationGradeId);
                     })
@@ -123,7 +123,7 @@ 
             ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
             // ->where('promoted', '=', $year)
             ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
-            ->join('institutions', function ($join) use ($year, $institution) {
+            ->join('institutions', function($join) use ($year, $institution) {
                 $join->on('institutions.id', '=', 'institution_grades.institution_id')
                     ->where('institutions.code', '=', $institution);
             })
@@ -134,7 +134,7 @@ 
                 break;
             case '6-11':
                 $query->whereIn('education_programmes.education_cycle_id', [2, 3]);
-                $query->whereNotIn('education_grades.id',[29,34]);
+                $query->whereNotIn('education_grades.id', [29, 34]);
                 break;
             case 'AL':
                 $query->where('education_programmes.education_cycle_id', 4);
@@ -152,21 +152,21 @@ 
      * @param $year
      * @return mixed
      */
-    public function getInstitutionGradeList($year, $limit,$mode)
+    public function getInstitutionGradeList($year, $limit, $mode)
     {
         $query = $this->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
             // ->where('promoted', '=', $year)
             ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
-            ->join('institutions', function ($join) use ($year) {
+            ->join('institutions', function($join) use ($year) {
                 $join->on('institutions.id', '=', 'institution_grades.institution_id');
             })
             ->join('education_programmes', 'education_grades.education_programme_id', 'education_programmes.id');
             switch ($mode) {
                 case '1-5':
-                    $query->whereIn('education_programmes.education_cycle_id', [1,2]);
+                    $query->whereIn('education_programmes.education_cycle_id', [1, 2]);
                     break;
                 case '6-11':
-                    $query->whereIn('education_programmes.education_cycle_id', [2,3,4]);
+                    $query->whereIn('education_programmes.education_cycle_id', [2, 3, 4]);
                     break;
                 case 'AL':
                     $query->where('education_programmes.education_cycle_id', 4);
@@ -181,13 +181,13 @@ 
             return $data;
     }
 
-    public function getGradeSubjects($institutionId){
+    public function getGradeSubjects($institutionId) {
         return self::query()
-        ->select('institution_grades.institution_id','education_grades_subjects.education_grade_id','education_grades_subjects.education_subject_id','education_subjects.name')
-        ->where('institution_grades.institution_id',$institutionId)
+        ->select('institution_grades.institution_id', 'education_grades_subjects.education_grade_id', 'education_grades_subjects.education_subject_id', 'education_subjects.name')
+        ->where('institution_grades.institution_id', $institutionId)
         ->join('education_grades', 'institution_grades.education_grade_id', 'education_grades.id')
-        ->join('education_grades_subjects','education_grades.id','education_grades_subjects.education_grade_id')
-        ->join('education_subjects','education_grades_subjects.education_subject_id','education_subjects.id')
+        ->join('education_grades_subjects', 'education_grades.id', 'education_grades_subjects.education_grade_id')
+        ->join('education_subjects', 'education_grades_subjects.education_subject_id', 'education_subjects.id')
         ->groupBy('education_grades_subjects.id')
         ->get()
         ->toArray();

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

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

app/Models/Security_group_institution.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_institution extends Model  {
+class Security_group_institution extends Model {
 
 
     /**
@@ -44,21 +44,21 @@ 
 
 
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
-    public function institution_classes(){
-        return $this->hasMany('App\Models\Institution_class','institution_id','institution_id')
+    public function institution_classes() {
+        return $this->hasMany('App\Models\Institution_class', 'institution_id', 'institution_id')
         ->select('institution_classes.*')
-        ->join('academic_periods', function($query){
-            $query->on('institution_classes.academic_period_id','academic_periods.id');
-            $query->whereIn('academic_periods.code',['2020','2019/2020']);
+        ->join('academic_periods', function($query) {
+            $query->on('institution_classes.academic_period_id', 'academic_periods.id');
+            $query->whereIn('academic_periods.code', ['2020', '2019/2020']);
         });
     }
 
-    public function security_group(){
-        return $this->belongsTo('App\Models\Security_group','security_group_id');
+    public function security_group() {
+        return $this->belongsTo('App\Models\Security_group', 'security_group_id');
     }
 
 }
\ No newline at end of file

app/Models/Security_group_user.php

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_user extends Model  {
+class Security_group_user extends Model {
 
     public const CREATED_AT = 'created';
     public const UPDATED_AT = 'modified';
@@ -45,39 +45,39 @@ 
     protected $dates = ['modified', 'created', 'created'];
 
 
-    public function security_user(){
-        return $this->belongsToMany('App\Models\User','security_users');
+    public function security_user() {
+        return $this->belongsToMany('App\Models\User', 'security_users');
     }
 
-    public function security_group(){
-        return $this->hasMany('App\Models\Security_group' , 'id','security_group_id');
+    public function security_group() {
+        return $this->hasMany('App\Models\Security_group', 'id', 'security_group_id');
     }
 
-    public function security_group_institution(){
-        return $this->belongsTo('App\Models\Security_group_institution','security_group_id','security_group_id');
+    public function security_group_institution() {
+        return $this->belongsTo('App\Models\Security_group_institution', 'security_group_id', 'security_group_id');
     }
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','security_user_id')
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'security_user_id')
         ->select('institution_classes.*')
-        ->join('academic_periods',function($query){
-            $query->on('institution_classes.academic_period_id','academic_periods.id');
-            $query->whereIn('academic_periods.code',['2020','2019/2020']);
+        ->join('academic_periods', function($query) {
+            $query->on('institution_classes.academic_period_id', 'academic_periods.id');
+            $query->whereIn('academic_periods.code', ['2020', '2019/2020']);
         });
     }
 
-    public function institution_staff(){
-        return $this->belongsTo('App\Models\Institution_staff','security_user_id','staff_id');
+    public function institution_staff() {
+        return $this->belongsTo('App\Models\Institution_staff', 'security_user_id', 'staff_id');
     }
 
-    public function institution_group(){
-        return $this->hasMany('App\Models\Security_group_institution','security_group_id','security_group_id')
-            ->with(['institution','institution_classes']);
+    public function institution_group() {
+        return $this->hasMany('App\Models\Security_group_institution', 'security_group_id', 'security_group_id')
+            ->with(['institution', 'institution_classes']);
     }
 
 
-    public function roles(){
-        return $this->belongsTo('App\Models\Security_role','security_role_id','id');
+    public function roles() {
+        return $this->belongsTo('App\Models\Security_role', 'security_role_id', 'id');
     }
 
 

app/Models/Institution_staff.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_staff extends Model  {
+class Institution_staff extends Model {
 
     /**
      * The database table used by the model.
@@ -42,13 +42,13 @@ 
     protected $dates = ['start_date', 'end_date', 'modified', 'created'];
 
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','staff_id')
-        ->innerJoin('academic_periods','institution_classes.academic_period_id','academic_periods.id')
-        ->where('academic_periods.current',1);
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'staff_id')
+        ->innerJoin('academic_periods', 'institution_classes.academic_period_id', 'academic_periods.id')
+        ->where('academic_periods.current', 1);
     }
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 }
\ No newline at end of file

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.0.2_20201211.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/Imports/Import.php

Spacing +30 added lines, -30 removed lines

@@ -89,10 +89,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;
             }
         }
@@ -106,7 +106,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]);
         }
@@ -119,13 +119,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]);
                 }
@@ -142,16 +142,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;
         }
     }
@@ -176,17 +176,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);
         }
@@ -207,18 +207,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");
                 }
             }
 
@@ -231,9 +231,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 @@ 
         $exceededStudents = ($totalStudents + $this->limit()) > $institutionClass->no_of_students ? true : false;
         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;
         }
     }
@@ -331,20 +331,20 @@ 
         $this->updateSubjectCount($subject);
     }
 
-    public function createOrUpdateGuardian($row,$student,$param){
+    public function createOrUpdateGuardian($row, $student, $param) {
         if (!empty($row[$param.'s_full_name']) && ($row[$param.'s_date_of_birth_yyyy_mm_dd'] !== null)) {
             $guardian = Security_user::createOrUpdateGuardianProfile($row, $param, $this->file);
             if (!is_null($guardian)) {
                 Security_user::where('id', '=', $guardian->id)
                     ->update(['is_guardian' => 1]);
-                $guardian['guardian_relation_id'] = $this->setRelation($param,$guardian);
+                $guardian['guardian_relation_id'] = $this->setRelation($param, $guardian);
                 Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
             }      
         } 
     }
 
-    protected function setRelation($param,$guardian){
-        switch($param){
+    protected function setRelation($param, $guardian) {
+        switch ($param) {
             case 'father':
                 return 1;
             case 'mother':  
@@ -354,7 +354,7 @@ 
         }
     }
 
-    protected function setGender($row){
+    protected function setGender($row) {
         switch ($row['gender_mf']) {
             case 'M':
                 $row['gender_mf'] = 1;
@@ -368,17 +368,17 @@ 
         return $row;
     }
 
-    protected function insertOrUpdateSubjects($row,$student,$institution){
+    protected function insertOrUpdateSubjects($row, $student, $institution) {
         $mandatorySubject = Institution_class_subject::getMandatorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 if (!empty($allSubjects)) {
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
                     $this->student = $student;
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
-                    array_walk($allSubjects,array($this,'insertSubject'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
     }