moe-lk / bulk-upload

app/Models/Institution_student_admission.php

Spacing +3 added lines, -3 removed lines

@@ -72,18 +72,18 @@
                 'institution_id' => $admissionInfo['instituion']->id,
                 'academic_period_id' => $admissionInfo['academic_period']->id,
                 'education_grade_id' => $admissionInfo['education_grade']->id,
-                'institution_class_id' => (($admissionInfo['instituion_class']  != []) && (count($admissionInfo['instituion_class'])==1)) ? $admissionInfo['instituion_class']['id'] : null,
+                'institution_class_id' => (($admissionInfo['instituion_class'] != []) && (count($admissionInfo['instituion_class']) == 1)) ? $admissionInfo['instituion_class']['id'] : null,
                 'comment' => 'Imported From Examination Data',
                 'updated_from' => 'doe',
                 'created_user_id' => 1
             ];
             self::create($data);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
 
-    public static function createAdmission($studentId,$row,$params,$file){
+    public static function createAdmission($studentId, $row, $params, $file) {
         self::create([
             'start_date' => $row['start_date_yyyy_mm_dd'],
             'start_year' => $row['start_date_yyyy_mm_dd']->format('Y'),

app/Models/Security_group.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group extends Model  {
+class Security_group extends Model {
 
     /**
      * The database table used by the model.
@@ -41,13 +41,13 @@ 
      */
     protected $dates = ['modified', 'created', 'created', 'created', 'modified', 'created'];
 
-    public function security_users(){
-        return $this->belongsTo('App\Models\Security_group_user','security_group_id');
+    public function security_users() {
+        return $this->belongsTo('App\Models\Security_group_user', 'security_group_id');
     }
 
 
-    public function security_group_institution(){
-        return $this->hasMany('App\Models\Security_group_institution','security_group_id');
+    public function security_group_institution() {
+        return $this->hasMany('App\Models\Security_group_institution', 'security_group_id');
     }
 
 }
\ No newline at end of file

app/Models/Student_guardian.php

Spacing +9 added lines, -9 removed lines

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

app/Models/Institution_class_subject.php

Spacing +26 added lines, -26 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class Institution_class_subject extends Base_Model  {
+class Institution_class_subject extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -42,19 +42,19 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function institutionMandatorySubject(){
-        return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id')
+    public function institutionMandatorySubject() {
+        return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id')
         ->with('institutionGradeSubject')
-        ->whereHas('institutionGradeSubject', function ($query) {
-                $query->where('auto_allocation',1);
+        ->whereHas('institutionGradeSubject', function($query) {
+                $query->where('auto_allocation', 1);
         });
     }
 
-    public function institutionOptionalSubject(){
-        return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id')
+    public function institutionOptionalSubject() {
+        return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id')
         ->with('institutionGradeSubject')
-        ->whereHas('institutionGradeSubject', function ($query) {
-                $query->where('auto_allocation',0);
+        ->whereHas('institutionGradeSubject', function($query) {
+                $query->where('auto_allocation', 0);
         });
 
     }
@@ -62,23 +62,23 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
         });
     }
 
-    public function institutionSubject(){
-        return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id')
+    public function institutionSubject() {
+        return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id')
         ->with('institutionGradeSubject');
     }
 
 
-    public static function getMandatorySubjects($institutionClass){
+    public static function getMandatorySubjects($institutionClass) {
         $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass)->first();
         $mandatorySubject = Institution_class_subject::with(['institutionSubject'])
-            ->whereHas('institutionSubject', function ($query) use ($institutionGrade) {
-                $query->whereHas('institutionGradeSubject',function($query){
-                    $query->where('auto_allocation',1);
+            ->whereHas('institutionSubject', function($query) use ($institutionGrade) {
+                $query->whereHas('institutionGradeSubject', function($query) {
+                    $query->where('auto_allocation', 1);
                 })->where('education_grade_id', $institutionGrade->education_grade_id);
             })
             ->where('institution_class_id', '=', $institutionClass)
@@ -86,9 +86,9 @@ 
         return $mandatorySubject;
     }
 
-    public static function getAllSubjects($institutionClass){
+    public static function getAllSubjects($institutionClass) {
         $allSubjects = Institution_class_subject::with(['institutionSubject'])
-        ->whereHas('institutionSubject', function ($query) use ($institutionClass) {
+        ->whereHas('institutionSubject', function($query) use ($institutionClass) {
             $query->whereHas('institutionGradeSubject')->where('education_grade_id', $institutionClass['education_grade_id']);
         })
         ->where('institution_class_id', '=', $institutionClass['id'])
@@ -100,9 +100,9 @@ 
         $data = [];
         foreach ($subjects as $subject) {
             $subjectId = Institution_class_subject::with(['institutionSubject'])
-                ->whereHas('institutionSubject', function ($query) use ($row, $subject, $student) {
-                    $query->whereHas('institutionGradeSubject',function($query){
-                        $query->where('auto_allocation',0);
+                ->whereHas('institutionSubject', function($query) use ($row, $subject, $student) {
+                    $query->whereHas('institutionGradeSubject', function($query) {
+                        $query->where('auto_allocation', 0);
                     })
                         ->where('name', '=', $row[$subject])
                         ->where('education_grade_id', '=', $student->education_grade_id);
@@ -115,15 +115,15 @@ 
         return $data;
     }
 
-    public function getInstitutionClassSubjects($academicPeriodId,$classIds){
+    public function getInstitutionClassSubjects($academicPeriodId, $classIds) {
         return self::query()
-            ->whereIn('institution_class_id',$classIds)
+            ->whereIn('institution_class_id', $classIds)
             ->get()
             ->toArray();
     }
 
-    public function isDuplicated($subject){
-        return self::query()->where('institution_subject_id',$subject['institution_subject_id'])
-            ->where('institution_class_id',$subject['institution_class_id'])->get()->toArray();
+    public function isDuplicated($subject) {
+        return self::query()->where('institution_subject_id', $subject['institution_subject_id'])
+            ->where('institution_class_id', $subject['institution_class_id'])->get()->toArray();
     }
 }

app/Models/User_body_mass.php

Spacing +11 added lines, -11 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class User_body_mass extends Base_Model  {
+class User_body_mass extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -48,17 +48,17 @@ 
     protected $dates = ['date', 'modified', 'created'];
 
 
-    public static function createOrUpdate($studentId,$row,$file){
+    public static function createOrUpdate($studentId, $row, $file) {
         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();
                 
-                $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id)
-                            ->where('security_user_id',$studentId)->count();
+                $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
+                            ->where('security_user_id', $studentId)->count();
                 $data = [
                     'height' => $row['bmi_height'],
                     'weight' => $row['bmi_weight'],
@@ -69,14 +69,14 @@ 
                     'created_user_id' => $file['security_user_id']
                 ];
                 // dd($data);
-                if($count == 0){
+                if ($count == 0) {
                     self::create($data);
-                }else{
-                    self::where('security_user_id',$studentId)
+                }else {
+                    self::where('security_user_id', $studentId)
                     ->update($data);
                 }         
-            } catch (\Throwable $th) {
-                \Log::error('User_body_mass:' . $th->getMessage());
+            }catch (\Throwable $th) {
+                \Log::error('User_body_mass:'.$th->getMessage());
             }
         }
     }

app/Models/Institution_class_student.php

Spacing +9 added lines, -9 removed lines

@@ -58,7 +58,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -71,15 +71,15 @@ 
 
     public  static function getStudentsCount($institution_class_id)
     {
-        $total_male_students = self::with(['student' => function ($query) {
+        $total_male_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 1);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 1);
         })->where('institution_class_id', '=', $institution_class_id)->count();
 
-        $total_female_students = self::with(['student' => function ($query) {
+        $total_female_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 2);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 2);
         })->where('institution_class_id', '=', $institution_class_id)->count();
 
@@ -109,8 +109,8 @@ 
             ->where('student_id', $student['student_id'])
             ->join('institution_classes', 'institution_class_students.institution_class_id', '=', 'institution_classes.id')
             ->where('institution_class_students.student_id', $student['student_id'])
-            ->where('institution_class_students.academic_period_id',$student['academic_period_id'])
-            ->where('institution_class_students.institution_id',$student['institution_id'])
+            ->where('institution_class_students.academic_period_id', $student['academic_period_id'])
+            ->where('institution_class_students.institution_id', $student['institution_id'])
             ->whereNull('institution_class_students.deleted_at')
             ->get()->first();
     }
@@ -134,12 +134,12 @@ 
                 'institution_id' => $admissionInfo['instituion']->id,
                 'student_status_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
 
-    public static function createOrUpdate($studentId,$params,$file){
+    public static function createOrUpdate($studentId, $params, $file) {
        return  self::create([
             'student_id' => $studentId,
             'institution_class_id' => $params['institution_class']->id,

app/Imports/UsersImport.php

Spacing +17 added lines, -17 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([]);
@@ -115,7 +115,7 @@ 
                 $row = $this->setGender($row);
                 $mandatorySubject = Institution_class_subject::getMandatorySubjects($this->file['institution_class_id']);
                 $subjects = getMatchingKeys($row);
-                $student = Security_user::createOrUpdateStudentProfile($row,'create',$this->file);  
+                $student = Security_user::createOrUpdateStudentProfile($row, 'create', $this->file);  
                 $academicPeriod = Academic_period::where('id', '=', $institutionClass->academic_period_id)->first();
                 $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass->id)->first();
                 $assignee_id = $institutionClass->staff_id ? $institutionClass->staff_id : $this->file['security_user_id'];
@@ -128,24 +128,24 @@ 
                     'institution_class' => $institutionClass
                 ];
 
-                Institution_student_admission::createAdmission($student->id,$row,$params,$this->file);
-                Institution_student::createOrUpdate($student->id,$row,$params,$this->file);
-                $student = Institution_class_student::createOrUpdate($student->id,$params,$this->file);
-                User_special_need::createOrUpdate($student->student_id,$row,$this->file);
-                User_body_mass::createOrUpdate($student->student_id,$row,$this->file);
+                Institution_student_admission::createAdmission($student->id, $row, $params, $this->file);
+                Institution_student::createOrUpdate($student->id, $row, $params, $this->file);
+                $student = Institution_class_student::createOrUpdate($student->id, $params, $this->file);
+                User_special_need::createOrUpdate($student->student_id, $row, $this->file);
+                User_body_mass::createOrUpdate($student->student_id, $row, $this->file);
 
-                $this->createOrUpdateGuardian($row,$student,'father');
-                $this->createOrUpdateGuardian($row,$student,'mother');
-                $this->createOrUpdateGuardian($row,$student,'guardian');
+                $this->createOrUpdateGuardian($row, $student, 'father');
+                $this->createOrUpdateGuardian($row, $student, 'mother');
+                $this->createOrUpdateGuardian($row, $student, 'guardian');
         
                 Institution_student::updateStudentArea($student->toArray());
 
-                $this->insertOrUpdateSubjects($row,$student,$institution);
+                $this->insertOrUpdateSubjects($row, $student, $institution);
 
                 $totalStudents = Institution_class_student::getStudentsCount($this->file['institution_class_id']);
                 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]);
@@ -154,7 +154,7 @@ 
                 $institutionClass = new Institution_class();
                 $institutionClass->updateClassCount($this->file);
             }
-        } 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);
@@ -169,7 +169,7 @@ 
             '*.full_name' => 'required|regex:/^[a-zA-Z .]*$/u|max:256',
             '*.preferred_name' => 'nullable|regex:/^[a-zA-Z .]*$/u|max:90',
             '*.gender_mf' => 'required|in:M,F',
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
             '*.address' => 'nullable',
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -178,8 +178,8 @@ 
             '*.identity_number' => 'nullable|identity:identity_type|required_with:*.identity_type',
             '*.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/Providers/ValidatorExtended.php

Spacing +35 added lines, -35 removed lines

@@ -70,17 +70,17 @@ 
             if (empty($value)) {
                 return false;
             } elseif ($gradeEntity !== null) {
-                $admissionAge = (($gradeEntity->admission_age) * 12) - 1;
+                $admissionAge = (($gradeEntity->admission_age)*12) - 1;
                 $to = $academicPeriod->start_date;
                 $diff_in_months = $to->diffInMonths($value);
                 $ageOfStudent = $diff_in_months;
                 $enrolmentMaximumAge = $admissionAge + 120;
                 return ($ageOfStudent <= $enrolmentMaximumAge) && ($ageOfStudent >= $admissionAge);
-            } else {
+            }else {
                 return false;
             }
-        } else {
-            $this->_custom_messages['admission_age'] = 'given' . $attribute . 'Not found';
+        }else {
+            $this->_custom_messages['admission_age'] = 'given'.$attribute.'Not found';
             $this->_set_custom_stuff();
             return false;
         }
@@ -91,16 +91,16 @@ 
 
         if (is_numeric($value)) {
             if ($value < 10) {
-                $this->_custom_messages['bmi'] =  $attribute . ' is must greater than 10';
+                $this->_custom_messages['bmi'] = $attribute.' is must greater than 10';
                 $this->_set_custom_stuff();
                 return false;
             } elseif ($value > 250) {
-                $this->_custom_messages['bmi'] =  $attribute . ' is must smaller than 250';
+                $this->_custom_messages['bmi'] = $attribute.' is must smaller than 250';
                 $this->_set_custom_stuff();
                 return false;
             }
-        } else {
-            $this->_custom_messages['bmi'] =  $attribute . ' is must a valid numeric';
+        }else {
+            $this->_custom_messages['bmi'] = $attribute.' is must a valid numeric';
             $this->_set_custom_stuff();
             return false;
         }
@@ -109,18 +109,18 @@ 
 
     protected function validateBmi($attribute, $value, $parameters)
     {
-        $bmiGrades =  ['G1', 'G4', 'G7', 'G10'];
+        $bmiGrades = ['G1', 'G4', 'G7', 'G10'];
         $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $parameters[0])
             ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id')
             ->first();
-        $educationGrade =  Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first();
+        $educationGrade = Education_grade::where('id', '=', $institutionGrade->education_grade_id)->first();
         if (in_array($institutionGrade->code, $bmiGrades)) {
             if (!empty($value)) {
                 if (($attribute == 'bmi_height') || ('bmi_weight')) {
                     return $this->validateHW($attribute, $value);
                 }
-            } else {
-                $this->_custom_messages['bmi'] =  $attribute . ' is required for ' . $educationGrade->name;
+            }else {
+                $this->_custom_messages['bmi'] = $attribute.' is required for '.$educationGrade->name;
                 $this->_set_custom_stuff();
                 return false;
             }
@@ -128,7 +128,7 @@ 
             if (($attribute == 'bmi_height') || ('bmi_weight')) {
                 return $this->validateHW($attribute, $value);
             }
-        } else {
+        }else {
             return true;
         }
     }
@@ -137,19 +137,19 @@ 
     {
         foreach ($validator->getData() as $data) {
             if ($data['identity_type'] == 'BC' && key_exists('birth_divisional_secretariat', $data)) {
-                $BirthDivision = Area_administrative::where('name', '=',  '%' . $data['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5); //
+                $BirthDivision = Area_administrative::where('name', '=', '%'.$data['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5); //
                 if ($BirthDivision->count() > 0) {
-                    $BirthArea = Area_administrative::where('name', '=', '%' . $value . '%') //$data['birth_registrar_office_as_in_birth_certificate']
+                    $BirthArea = Area_administrative::where('name', '=', '%'.$value.'%') //$data['birth_registrar_office_as_in_birth_certificate']
                         ->where('parent_id', '=', $BirthDivision->first()->id)->count();
-                    return $BirthArea  > 0;
+                    return $BirthArea > 0;
                 } elseif (key_exists('birth_divisional_secretariat', $data) && (!key_exists('birth_registrar_office_as_in_birth_certificate', $data))) {
                     $this->_custom_messages['birth_place'] = 'birth_registrar_office_as_in_birth_certificate required with BC';
                     $this->_set_custom_stuff();
                     return false;
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
@@ -157,16 +157,16 @@ 
 
     protected function validateIsStudentInClass($attribute, $value, $perameters, $validator)
     {
-        $student =  Security_user::where('openemis_no', '=', $value);
+        $student = Security_user::where('openemis_no', '=', $value);
         if ($student->count() > 0) {
             $student = $student->first()->toArray();
-            $check =  Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count();
+            $check = Institution_class_student::where('student_id', '=', $student['id'])->where('institution_class_id', '=', $perameters[0])->count();
             if ($check == 1) {
                 return true;
-            } else {
+            }else {
                 return false;
             }
-        } else {
+        }else {
             return false;
         }
     }
@@ -177,7 +177,7 @@ 
     {
         $valid = true;
         foreach ($validator->getData() as $data) {
-            switch($data[$perameters[0]]){
+            switch ($data[$perameters[0]]) {
                 case 'BC':
                     $valid = preg_match('/^([0-9]{11,12})/i', $value);
                     break;
@@ -190,11 +190,11 @@ 
         }
         
         if ($valid == 0) {
-            dd($data[$perameters[0]],$valid,$value);
-            $this->_custom_messages['identity'] = $attribute . ' is not valid  Please check the NIC number';
+            dd($data[$perameters[0]], $valid, $value);
+            $this->_custom_messages['identity'] = $attribute.' is not valid  Please check the NIC number';
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
@@ -202,7 +202,7 @@ 
     protected function validateUserUnique($attribute, $value, $perameters, $validator)
     {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if ($identityType !== null && ($value !== null)) {
                 if ($identityType->national_code === 'BC') {
                     return $this->checkUnique($value, $data, $identityType);
@@ -218,14 +218,14 @@ 
     protected function validateIsBc($attribute, $value, $perameters, $validator)
     {
         foreach ($validator->getData() as $data) {
-            $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+            $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
             if (($identityType !== null) && ($identityType !== "")) {
                 if (($identityType->national_code) === 'BC') {
                     return (strlen((string) $data['identity_number']) < 7);
-                } else {
+                }else {
                     return true;
                 }
-            } else {
+            }else {
                 return true;
             }
         }
@@ -235,24 +235,24 @@ 
     {
         $isUnique = Security_user::where('identity_number', '=', $value)->where('identity_type_id', '=', $identityType->id);
         if ($isUnique->count() > 0) {
-            $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : ' . $isUnique->first()->openemis_no;
+            $this->_custom_messages['user_unique'] = 'The identity number already in use. User ID is : '.$isUnique->first()->openemis_no;
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
 
     protected function IsBc($data, $value)
     {
-        $identityType = Identity_type::where('national_code', 'like', '%' . $data['identity_type'] . '%')->first();
+        $identityType = Identity_type::where('national_code', 'like', '%'.$data['identity_type'].'%')->first();
         if ($identityType !== null) {
             if (($identityType->national_code) === 'BC' && strlen((string) $value) < 8) {
                 return false;
-            } else {
+            }else {
                 return true;
             }
-        } else {
+        }else {
             return true;
         }
     }

app/Console/Commands/ImportStudents.php

Spacing +55 added lines, -55 removed lines

@@ -47,7 +47,7 @@ 
      */
     public function __construct()
     {
-        $this->output =  new \Symfony\Component\Console\Output\ConsoleOutput();
+        $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
         parent::__construct();
     }
 
@@ -69,18 +69,18 @@ 
                         $this->process($files);
                         unset($files);
                         exit();
-                    } else {
+                    }else {
                         $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                         $this->output->writeln('No files found,Waiting for files');
                         exit();
                     }
-                } catch (Exception $e) {
+                }catch (Exception $e) {
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
                     $this->output->writeln($e);
                     sleep(300);
                     $this->handle();
                 }
-            } else {
+            }else {
                 exit();
             }
         }
@@ -94,7 +94,7 @@ 
         $files[0]['node'] = $node;
         $this->processSheet($files[0]);
         $now = Carbon::now()->tz('Asia/Colombo');
-        $this->output->writeln('=============== Time taken to batch ' . $now->diffInMinutes($time));
+        $this->output->writeln('=============== Time taken to batch '.$now->diffInMinutes($time));
     }
 
     protected function getTerminatedFiles()
@@ -137,10 +137,10 @@ 
             ->join('contact_types', 'user_contacts.contact_type_id', '=', 'contact_types.id')
        
             ;
-            if(env('APP_ENV') == 'stage'){
+            if (env('APP_ENV') == 'stage') {
                 $query->where('contact_types.contact_option_id', '=', 5)
                 ->where('contact_types.name', '=', 'TestEmail');
-            }else{
+            }else {
                 $query->where('contact_types.contact_option_id', '!=', 5);
             }
             
@@ -170,13 +170,13 @@ 
     public function processSuccessEmail($file, $user, $subject)
     {
         $file['subject'] = $subject;
-        $this->output->writeln('Processing the file: ' . $file['filename']);
+        $this->output->writeln('Processing the file: '.$file['filename']);
         try {
             Mail::to($user->email)->send(new StudentImportSuccess($file));
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 1, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -192,7 +192,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -208,7 +208,7 @@ 
             DB::table('uploads')
                 ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-        } catch (\Exception $ex) {
+        }catch (\Exception $ex) {
             $this->output->writeln($ex->getMessage());
             DB::table('uploads')
                 ->where('id', $file['id'])
@@ -221,9 +221,9 @@ 
         $node = $this->argument('node');
         if ($node == $file['node']) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $this->output->writeln('Processing from:' . $node);
+            $this->output->writeln('Processing from:'.$node);
             return true;
-        } else {
+        }else {
             exit;
             return false;
         }
@@ -235,20 +235,20 @@ 
         $user = User::find($file['security_user_id']);
         $this->checkNode($file);
         $this->output->writeln('##########################################################################################################################');
-        $this->output->writeln('Processing the file: ' . $file['filename']);
+        $this->output->writeln('Processing the file: '.$file['filename']);
         if ($this->checkTime()) {
             try {
                 $this->import($file, 1, 'C');
                 sleep(10);
                 $this->import($file, 2, 'B');
-            } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+            }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
                 $this->output->writeln($e->getMessage());
                 try {
                     Mail::to($user->email)->send(new IncorrectTemplate($file));
                     DB::table('uploads')
                         ->where('id', $file['id'])
                         ->update(['is_processed' => 2, 'is_email_sent' => 1, 'updated_at' => now()]);
-                } catch (\Exception $ex) {
+                }catch (\Exception $ex) {
                     $this->output->writeln($e->getMessage());
                     $this->handle();
                     DB::table('uploads')
@@ -256,15 +256,15 @@ 
                         ->update(['is_processed' => 2, 'is_email_sent' => 2, 'updated_at' => now()]);
                 }
             }
-        } else {
+        }else {
             exit();
         }
     }
 
     protected function getType($file)
     {
-        $file =  storage_path() . '/app/sis-bulk-data-files/' . $file;
-        $inputFileType =  \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
+        $file = storage_path().'/app/sis-bulk-data-files/'.$file;
+        $inputFileType = \PhpOffice\PhpSpreadsheet\IOFactory::identify($file);
         return $inputFileType;
     }
 
@@ -322,7 +322,7 @@ 
             ini_set('memory_limit', '2048M');
             $this->getFileSize($file);
             $user = User::find($file['security_user_id']);
-            $excelFile = '/sis-bulk-data-files/' . $file['filename'];
+            $excelFile = '/sis-bulk-data-files/'.$file['filename'];
             $this->highestRow = $this->getHighestRow($file, $sheet, $column);
             switch ($sheet) {
                 case 1;
@@ -341,14 +341,14 @@ 
                                 ->update(['insert' => 3, 'updated_at' => now()]);
                             $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Partial Success ');
                             $this->stdOut('Insert Students', $this->highestRow);
-                        } else {
+                        }else {
                             DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['insert' => 1, 'updated_at' => now()]);
                             $this->processSuccessEmail($file, $user, 'Fresh Student Data Upload:Success ');
                             $this->stdOut('Insert Students', $this->highestRow);
                         }
-                    } else if (($this->getSheetName($file, 'Insert Students')) && $this->highestRow > 0) {
+                    }else if (($this->getSheetName($file, 'Insert Students')) && $this->highestRow > 0) {
                         DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2]);
@@ -367,14 +367,14 @@ 
                                 ->update(['update' => 3, 'is_processed' => 1, 'updated_at' => now()]);
                             $this->processFailedEmail($file, $user, 'Existing Student Data Update:Partial Success ');
                             $this->stdOut('Update Students', $this->highestRow);
-                        } else {
+                        }else {
                             DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['update' => 1, 'is_processed' => 1, 'updated_at' => now()]);
                             $this->processSuccessEmail($file, $user, 'Existing Student Data Update:Success ');
                             $this->stdOut('Update Students', $this->highestRow);
                         }
-                    } else if (($this->getSheetName($file, 'Update Students')) && $this->highestRow == 0) {
+                    }else if (($this->getSheetName($file, 'Update Students')) && $this->highestRow == 0) {
                         DB::table('uploads')
                             ->where('id', $file['id'])
                             ->update(['is_processed' => 2, 'updated_at' => now()]);
@@ -382,7 +382,7 @@ 
                     }
                     break;
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $this->output->writeln($e->getMessage());
             if ($sheet == 1) {
                 self::writeErrors($e, $file, 'Insert Students');
@@ -390,7 +390,7 @@ 
                     ->where('id', $file['id'])
                     ->update(['insert' => 2, 'updated_at' => now()]);
                 $this->processFailedEmail($file, $user, 'Fresh Student Data Upload:Failed');
-            } else if ($sheet == 2) {
+            }else if ($sheet == 2) {
                 self::writeErrors($e, $file, 'Update Students');
                 DB::table('uploads')
                     ->where('id', $file['id'])
@@ -398,7 +398,7 @@ 
                 $this->processFailedEmail($file, $user, 'Existing Student Data Update:Failed');
             }
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
         }
     }
@@ -416,14 +416,14 @@ 
 
     protected function  getFileSize($file)
     {
-        $excelFile =  '/sis-bulk-data-files/' . $file['filename'];
+        $excelFile = '/sis-bulk-data-files/'.$file['filename'];
         $size = Storage::disk('local')->size($excelFile);
         $user = User::find($file['security_user_id']);
         if ($size > 0) {
             return true;
-        } else {
+        }else {
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -433,21 +433,21 @@ 
     protected function setReader($file)
     {
         try {
-            $excelFile =  '/sis-bulk-data-files/processed/' . $file['filename'];
+            $excelFile = '/sis-bulk-data-files/processed/'.$file['filename'];
             $exists = Storage::disk('local')->exists($excelFile);
             if (!$exists) {
 
-                $excelFile =  "/sis-bulk-data-files/" . $file['filename'];
+                $excelFile = "/sis-bulk-data-files/".$file['filename'];
             }
-            $excelFile = storage_path() . "/app" . $excelFile;
+            $excelFile = storage_path()."/app".$excelFile;
             $reader = \PhpOffice\PhpSpreadsheet\IOFactory::createReader($this->getType($file['filename']));
-            $objPHPExcel =  $reader->load($excelFile);
+            $objPHPExcel = $reader->load($excelFile);
             return $objPHPExcel;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -458,12 +458,12 @@ 
     {
         try {;
             $objPHPExcel = $this->setReader($file);
-            return $objPHPExcel->getSheetByName($sheet)  !== null;
-        } catch (Exception $e) {
+            return $objPHPExcel->getSheetByName($sheet) !== null;
+        }catch (Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::table('uploads')
-                ->where('id',  $file['id'])
+                ->where('id', $file['id'])
                 ->update(['is_processed' => 2, 'updated_at' => now()]);
             $this->stdOut('No valid data found :Please re-upload the file', 0);
             $this->processEmptyEmail($file, $user, 'No valid data found :Please re-upload the file');
@@ -475,15 +475,15 @@ 
         try {
             $reader = $this->setReader($file);
             $highestRowCount = 0;
-            $sheet =  $reader->getSheet($sheet);
+            $sheet = $reader->getSheet($sheet);
             $highestRow = $sheet->getHighestDataRow($column); 
-            for ($row = 3; $row <= $highestRow; $row++){ 
-                $rowData = $sheet->rangeToArray('A' . $row . ':' . $column . $row,NULL,TRUE,FALSE);
-                if(isEmptyRow(reset($rowData))) { continue; } // skip empty row
+            for ($row = 3; $row <= $highestRow; $row++) { 
+                $rowData = $sheet->rangeToArray('A'.$row.':'.$column.$row, NULL, TRUE, FALSE);
+                if (isEmptyRow(reset($rowData))) { continue; } // skip empty row
                 $highestRowCount += 1;
             }
             return  $highestRowCount;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();
@@ -498,10 +498,10 @@ 
 
     protected function stdOut($title, $rows)
     {
-        $this->output->writeln($title . ' Process completed at . ' . ' ' . now());
+        $this->output->writeln($title.' Process completed at . '.' '.now());
         $now = Carbon::now()->tz('Asia/Colombo');
-        $this->output->writeln('Total Processed lines: ' . $rows);
-        $this->output->writeln('Time taken to process           : ' .   $now->diffInSeconds($this->startTime) . ' Seconds');
+        $this->output->writeln('Total Processed lines: '.$rows);
+        $this->output->writeln('Time taken to process           : '.$now->diffInSeconds($this->startTime).' Seconds');
         $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------');
     }
 
@@ -513,7 +513,7 @@ 
         $sheet = $reader->getActiveSheet();
         if (!in_array($row, $params['rows'])) {
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $this->output->writeln(' removing row . ' . ' ' . $row);
+            $this->output->writeln(' removing row . '.' '.$row);
             $reader->getActiveSheet()->getCellCollection()->removeRow($row);
         }
     }
@@ -536,7 +536,7 @@ 
             if (count($failures) > 0) {
                 $rows = array_map('rows', $failures);
                 $rows = array_unique($rows);
-                $rowIndex =   range(3, $this->highestRow + 2);
+                $rowIndex = range(3, $this->highestRow + 2);
                 $params = [
                     'rows' => $rows,
                     'reader' => $reader
@@ -545,17 +545,17 @@ 
                 array_walk($rowIndex, array($this, 'removeRows'), $params);
                 $objWriter = $this->getSheetWriter($file, $reader);
                 Storage::disk('local')->makeDirectory('sis-bulk-data-files/processed');
-                $objWriter->save(storage_path() . '/app/sis-bulk-data-files/processed/' . $file['filename']);
+                $objWriter->save(storage_path().'/app/sis-bulk-data-files/processed/'.$file['filename']);
                 $now = Carbon::now()->tz('Asia/Colombo');
-                $this->output->writeln($reader->getActiveSheet()->getTitle() . ' Process completed at . ' . ' ' . now());
-                $this->output->writeln('memory usage for the processes : ' . (memory_get_usage() - $baseMemory));
-                $this->output->writeln('Time taken to process           : ' .   $now->diffInSeconds($this->startTime) . ' Seconds');
-                $this->output->writeln(' errors reported               : ' . count($failures));
+                $this->output->writeln($reader->getActiveSheet()->getTitle().' Process completed at . '.' '.now());
+                $this->output->writeln('memory usage for the processes : '.(memory_get_usage() - $baseMemory));
+                $this->output->writeln('Time taken to process           : '.$now->diffInSeconds($this->startTime).' Seconds');
+                $this->output->writeln(' errors reported               : '.count($failures));
                 $this->output->writeln('--------------------------------------------------------------------------------------------------------------------------');
                 unset($objWriter);
                 unset($failures);
             }
-        } catch (Eception $e) {
+        }catch (Eception $e) {
             $this->output->writeln($e->getMessage());
             $user = User::find($file['security_user_id']);
             DB::beginTransaction();