moe-lk / bulk-upload

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_20200610.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/Http/Controllers/CloneController.php

Spacing +57 added lines, -57 removed lines

@@ -28,17 +28,17 @@ 
         $this->academic_period = new Academic_period();
         $this->institution_classes = new Institution_class();
         $this->institution_class_subjects = new Institution_class_subject();
-        $this->institution_subjects =  new Institution_subject();
-        $this->education_grade_subjects =  new Education_grades_subject();
+        $this->institution_subjects = new Institution_subject();
+        $this->education_grade_subjects = new Education_grades_subject();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
 
 
-    public function array_walk($shift,$count,$params){
-        array_walk($shift,array($this,'process'),$params);
+    public function array_walk($shift, $count, $params) {
+        array_walk($shift, array($this, 'process'), $params);
     }
 
-    public function cleanConfig($params){
+    public function cleanConfig($params) {
         $academicPeriod = $params['academic_period'];
         $this->shifts->where(['academic_period_id' => $academicPeriod->id])->delete();
         $this->output->writeln('cleaned shifts');
@@ -46,31 +46,31 @@ 
         $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $academicPeriod->code - 1]);
         $this->output->writeln('updated shifts');
 
-        $classIds =  $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
+        $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
         $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete();
         $this->output->writeln('cleaned classes');
 
-        $this->institution_class_subjects->whereNotIn( 'institution_class_id' , $classIds)->delete();
+        $this->institution_class_subjects->whereNotIn('institution_class_id', $classIds)->delete();
         $this->output->writeln('cleaned subjects');
 
-        do{
-          $deleted =  $this->institution_subjects->where('academic_period_id',$academicPeriod->id)->limit(100000)->delete();
+        do {
+          $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
           $this->output->writeln('100000 institutions cleaned shifts');
-        }while($deleted > 0);
+        } while ($deleted > 0);
     }
 
-    public function process($shift,$count,$params){
+    public function process($shift, $count, $params) {
         $year = $params['year'];
         $academicPeriod = $params['academic_period'];
         $previousAcademicPeriod = $params['previous_academic_period'];
-        try{
+        try {
             $shiftId = $this->updateShifts($year, $shift);
             $institutionClasses = $this->institution_classes->getShiftClasses($shift['id']);
-            $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'],$previousAcademicPeriod->id);
-            array_walk($institutionSubjects , array($this,'insertInstitutionSubjects'),$academicPeriod);
-            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod) ) {
+            $institutionSubjects = $this->institution_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id);
+            array_walk($institutionSubjects, array($this, 'insertInstitutionSubjects'), $academicPeriod);
+            if (!empty($institutionClasses) && !is_null($shiftId) && !is_null($academicPeriod)) {
 
-                $newInstitutionClasses = $this->generateNewClass($institutionClasses,$shiftId,$academicPeriod->id);
+                $newInstitutionClasses = $this->generateNewClass($institutionClasses, $shiftId, $academicPeriod->id);
 
                 $params = [
                     'previous_academic_period_id' => $previousAcademicPeriod->id,
@@ -78,21 +78,21 @@ 
                     'shift_id' =>$shiftId
                 ];
 
-                try{
-                    array_walk($newInstitutionClasses,array($this,'insertInstitutionClasses'),$params);
+                try {
+                    array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params);
                     $newInstitutionClasses = $this->institution_classes->getShiftClasses($shiftId);
                     $this->output->writeln('##########################################################################################################################');
-                    $this->output->writeln('updating from '. $shiftId);
+                    $this->output->writeln('updating from '.$shiftId);
 
-                }catch (\Exception $e){
+                }catch (\Exception $e) {
                     dd($e);
-                     Log::error($e->getMessage(),[$e]);
+                     Log::error($e->getMessage(), [$e]);
                 }
             }
 //            DB::commit();
-        }catch (\Exception $e){
+        }catch (\Exception $e) {
 //            DB::rollBack();
-             Log::error($e->getMessage(),[$e]);
+             Log::error($e->getMessage(), [$e]);
         }
     }
 
@@ -102,31 +102,31 @@ 
      * @param $count
      * @param $academicPeriod
      */
-    public function insertInstitutionSubjects($subjects, $count,$academicPeriod){
-       try{
+    public function insertInstitutionSubjects($subjects, $count, $academicPeriod) {
+       try {
            $subjects['academic_period_id'] = $academicPeriod->id;
            $subjects['created'] = now();
            unset($subjects['total_male_students']);
            unset($subjects['total_female_students']);
            unset($subjects['id']);
            $this->institution_subjects->create($subjects);
-       }catch (\Exception $e){
-            Log::error($e->getMessage(),[$e]);
+       }catch (\Exception $e) {
+            Log::error($e->getMessage(), [$e]);
        }
     }
 
 
-    public function  insertInstitutionClasses($class,$count,$param){
-            try{
+    public function  insertInstitutionClasses($class, $count, $param) {
+            try {
 
                 $academicPeriod = $param['academic_period_id'];
                 $educationGrdae = $class['education_grade_id'];
 
                 $classId = $class['id'];
                 unset($class['id']);
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$class['education_grade_id'])
-                    ->where('institution_id',$class['institution_id'])
-                    ->where('academic_period_id',$academicPeriod)->get()->toArray();
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $class['education_grade_id'])
+                    ->where('institution_id', $class['institution_id'])
+                    ->where('academic_period_id', $academicPeriod)->get()->toArray();
                 $params = [
                     'class'=>$class,
                     'subjects'=>$institutionSubjects,
@@ -139,39 +139,39 @@ 
                 $class['no_of_students'] = $noOfStudents;
                 $class['created'] = now();
                 $class['institution_shift_id'] = $param['shift_id'];
-                $this->output->writeln('Create class:'. $class['name']);
+                $this->output->writeln('Create class:'.$class['name']);
                 $class = Institution_class::create($class);
                 $institutionClassGrdaeObj['institution_class_id'] = $class->id;
                 $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae;
                 Institution_class_grade::create($institutionClassGrdaeObj);
-                $institutionSubjects = Institution_subject::query()->where('education_grade_id',$educationGrdae)
-                    ->where('institution_id',$class->institution_id)
-                    ->where('academic_period_id',$academicPeriod)
+                $institutionSubjects = Institution_subject::query()->where('education_grade_id', $educationGrdae)
+                    ->where('institution_id', $class->institution_id)
+                    ->where('academic_period_id', $academicPeriod)
                     ->groupBy('education_subject_id')
                     ->get()
                     ->toArray();
                 $params['class'] = $class;
-                $this->insertInstitutionClassSubjects($institutionSubjects,$class);
+                $this->insertInstitutionClassSubjects($institutionSubjects, $class);
 //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-            }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+            }catch (\Exception $e) {
+                 Log::error($e->getMessage(), [$e]);
             }
     }
 
-    public function insertInstitutionClassSubjects($subjects,$class){
-        if(!empty($subjects)){
-            try{
-                array_walk($subjects,array($this,'insertClassSubjects'),$class);
-                $this->output->writeln('updating subjects '. $class->name);
-            }catch (\Exception $e){
-                 Log::error($e->getMessage(),[$e]);
+    public function insertInstitutionClassSubjects($subjects, $class) {
+        if (!empty($subjects)) {
+            try {
+                array_walk($subjects, array($this, 'insertClassSubjects'), $class);
+                $this->output->writeln('updating subjects '.$class->name);
+            }catch (\Exception $e) {
+                 Log::error($e->getMessage(), [$e]);
             }
         };
     }
 
   
-    public function insertClassSubjects($subject,$count,$newClassId){
-        try{
+    public function insertClassSubjects($subject, $count, $newClassId) {
+        try {
             $subjectobj['status'] = 1;
             $subjectobj['created_user_id'] = 1;
             $subjectobj['created'] = now();
@@ -179,11 +179,11 @@ 
             $subjectobj['institution_class_id'] = $newClassId->id;
             $subjectobj['institution_subject_id'] = $subject['id'];
 
-            if(!$this->institution_class_subjects->isDuplicated($subjectobj)){
+            if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
                 $this->institution_class_subjects->create($subjectobj);
             }
-        }catch (\Exception $e){
-             Log::error($e->getMessage(),[$e]);
+        }catch (\Exception $e) {
+             Log::error($e->getMessage(), [$e]);
         }
     }
 
@@ -195,15 +195,15 @@ 
      * @param $academicPeriod
      * @return array
      */
-    public function generateNewClass($classes,$shiftId,$academicPeriod){
+    public function generateNewClass($classes, $shiftId, $academicPeriod) {
         $newClasses = [];
-        foreach ( $classes as $class) {
+        foreach ($classes as $class) {
             $noOfStudents = $class['no_of_students'] == 0 ? 40 : $class['no_of_students'];
             $class['academic_period_id'] = $academicPeriod;
             $class['no_of_students'] = $noOfStudents;
             $class['created'] = now();
             $class['institution_shift_id'] = $shiftId;
-            array_push($newClasses,$class);
+            array_push($newClasses, $class);
         }
         return $newClasses;
     }
@@ -214,11 +214,11 @@ 
      * @param $shift
      * @return mixed
      */
-    public function updateShifts($year,$shift){
+    public function updateShifts($year, $shift) {
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
-        $this->shifts->where('id',$shift['id'])->update(['cloned' => $year]);
+        $this->shifts->where('id', $shift['id'])->update(['cloned' => $year]);
         $shift['academic_period_id'] = $academicPeriod->id;
         $exist = $this->shifts->shiftExists($shift);
-        return $this->shifts->create((array)$shift)->id;
+        return $this->shifts->create((array) $shift)->id;
     }
 }

app/Http/Controllers/FilesController.php

Spacing +31 added lines, -31 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) {
+            ->editColumn('update', function($data) {
                 if ($data->update === 0) {
                     return "No Processes";
-                }elseif($data->update === 1 ){
+                }elseif ($data->update === 1) {
                     return 'Success';
-                }elseif($data->update === 3 ){
+                }elseif ($data->update === 3) {
                     return 'Partial Success';
-                }else{
+                }else {
                     return 'Failed';
                 };
 
             })
-            ->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 === 3 ){
+                }elseif ($data->insert === 3) {
                     return 'Partial Success';
-                }else{
+                }else {
                     return 'Failed';
                 };
 
             })
-            ->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/Http/Controllers/BulkPromotion.php

Spacing +15 added lines, -15 removed lines

@@ -62,7 +62,7 @@ 
 
             if (!empty($isAvailableforPromotion)) {
                 $this->process($institutionGrade, $nextGrade, $year, 1);
-            } else {
+            }else {
                 $this->process($institutionGrade, $nextGrade, $year, 3);
             }
         }
@@ -96,7 +96,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)) {
@@ -110,7 +110,7 @@ 
                 array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params);
                 array_walk($parallelClasses, array($this, 'updateStudentCount'));
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             dd($e);
             Log::error($e->getMessage());
         }
@@ -145,7 +145,7 @@ 
         $nextAcademicPeriod = Academic_period::query()->where('code', $year)->get()->first();
 
         $nextGradeObj = null;
-        if ($nextGrade !== []  && !is_null($nextGrade)) {
+        if ($nextGrade !== [] && !is_null($nextGrade)) {
             $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $academicPeriod->id);
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $nextAcademicPeriod->id);
         }
@@ -155,7 +155,7 @@ 
                 // promote parallel classes
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())) {
+            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
                 // promote pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                 return 2;
@@ -163,12 +163,12 @@ 
                 // Promote matching class name with previous class
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } else {
+            }else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 1);
                 return 2;
             }
-        } else {
+        }else {
             // default pool promotion
             $this->promotion($institutionGrade, $nextGrade, $academicPeriod, $nextAcademicPeriod, [], 3);
             return 2;
@@ -204,10 +204,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) {
             dd($e);
             Log::error($e->getMessage());
         }
@@ -228,7 +228,7 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             return  array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-        } else {
+        }else {
             return false;
         }
     }
@@ -280,11 +280,11 @@ 
                 if (!$this->institution_class_students->isDuplicated($studentObj)) {
                     $this->institution_class_students->create($studentObj);
                     $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']);
                 }
             }
         }

app/Http/Controllers/DashboardViewsController.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 class DashboardViewsController extends Controller
 {
     
-    public function callback(){
+    public function callback() {
         
         /** Total number of students by institutions
          *  In Grafana query to get total students count 

app/Exports/ExaminationStudentsExport.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 use Maatwebsite\Excel\Concerns\FromCollection;
 use Maatwebsite\Excel\Concerns\WithHeadings;
 
-class ExaminationStudentsExport implements FromQuery , WithHeadings  
+class ExaminationStudentsExport implements FromQuery, WithHeadings  
 {
 
     use Exportable;

app/Imports/ExaminationStudentsImport.php

Spacing +5 added lines, -5 removed lines

@@ -18,9 +18,9 @@ 
 use Maatwebsite\Excel\Concerns\WithBatchInserts;
 use Maatwebsite\Excel\Concerns\WithChunkReading;
 
-class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts , WithValidation ,WithMapping, SkipsOnFailure, SkipsOnError
+class ExaminationStudentsImport implements ToModel, WithStartRow, WithHeadingRow, WithChunkReading, WithBatchInserts, WithValidation, WithMapping, SkipsOnFailure, SkipsOnError
 {
-    use Importable , SkipsFailures, SkipsErrors;
+    use Importable, SkipsFailures, SkipsErrors;
 
     /**
      * @return int
@@ -57,14 +57,14 @@ 
 
     private function transformDateTime(string $value, string $format = 'm/d/Y')
     {
-        try{
+        try {
             $date = date_create_from_format('m/d/Y', $value);
-            if(gettype($date)=='boolean'){
+            if (gettype($date) == 'boolean') {
                 $date = date_create_from_format('Y-m-d', $value);
             }
             $date = date_format($date, 'Y-m-d');
             return  $date;
-        }catch(\Exception $e){
+        }catch (\Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failure = new Failure(2, 'remark', [0 => 'The given date is wrong']);
             $failures = [0 => $failure];

app/Imports/UsersImport.php

Spacing +27 added lines, -27 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([]);
@@ -124,9 +124,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', '=', $row['academic_period'])->first();
 
 
@@ -142,7 +142,7 @@ 
 
                 $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.
@@ -239,9 +239,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();
 
@@ -255,17 +255,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;
@@ -303,7 +303,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;
@@ -316,9 +316,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;
@@ -354,7 +354,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;
@@ -369,9 +369,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;
@@ -408,7 +408,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;
@@ -438,7 +438,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]);
@@ -450,7 +450,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 @@ 
         return [
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:100',
             '*.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\/]+$/',

app/Imports/StudentUpdate.php

Spacing +44 added lines, -44 removed lines

@@ -54,7 +54,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,
@@ -77,7 +77,7 @@ 
                 $worksheet = $event->getSheet();
                 $this->highestRow = $worksheet->getHighestDataRow('B');
             },
-            BeforeImport::class => function (BeforeImport $event) {
+            BeforeImport::class => function(BeforeImport $event) {
                 $event->getReader()->getDelegate()->setActiveSheetIndex(2);
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('B'));
                 if ($this->highestRow < 3) {
@@ -106,7 +106,7 @@ 
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
                 $genderId = null;
-                if($row['gender_mf'] !== null){
+                if ($row['gender_mf'] !== null) {
                     $genderId = $row['gender_mf'] == 'M' ? 1 : 2;
                 }
                 switch ($row['gender_mf']) {
@@ -118,9 +118,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', '=', $row['academic_period'])->first();
 
 
@@ -154,10 +154,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']]);
                 }
                 
@@ -183,17 +183,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'],
@@ -207,10 +207,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;
@@ -224,7 +224,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']),
@@ -243,25 +243,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;
@@ -276,7 +276,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']),
@@ -294,16 +294,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']);
                     }
@@ -312,9 +312,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;
@@ -329,7 +329,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']),
@@ -348,22 +348,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);
@@ -372,10 +372,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'));
                     // Institution_subject_student::insert((array) $allSubjects);
 //                    array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
@@ -386,7 +386,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]);
@@ -398,7 +398,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);
@@ -412,8 +412,8 @@ 
                         ->where('institution_class_id', '=', $student->institution_class_id)->get()->toArray();
     }
 
-    protected function insertSubject($subject){
-        if(!Institution_subject_student::isDuplicated($subject))
+    protected function insertSubject($subject) {
+        if (!Institution_subject_student::isDuplicated($subject))
                 Institution_subject_student::updateOrInsert($subject);
     }