moe-lk / bulk-upload

app/Models/Institution_grade.php

Spacing +13 added lines, -13 removed lines

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

app/Providers/ValidatorExtended.php

Indentation +12 added lines, -12 removed lines

@@ -254,7 +254,7 @@ 
     protected function ValidateIdentity($attribute, $value, $perameters, $validator)
 
     {
-       // dd($value);
+        // dd($value);
        
         foreach ($validator->getData() as $data) {
            
@@ -263,16 +263,16 @@ 
             {
                 //dd(true);
                
-               if(!strcmp($data['identity_type'],"BC"))
-               {
+                if(!strcmp($data['identity_type'],"BC"))
+                {
                     $out = 1;
-               }
-               else 
-               {
-                   $out = 2;
-               }
+                }
+                else 
+                {
+                    $out = 2;
+                }
                
-               if(($out == 1)&&(preg_match('/^[0-9]{4}+$/',$value)))
+                if(($out == 1)&&(preg_match('/^[0-9]{4}+$/',$value)))
                 {
                     //dd(true);
                     return true;
@@ -280,7 +280,7 @@ 
                 }
                 
                 elseif (($out == 2) &&(preg_match('/^[0-9]{9}[VX]{1}+$/',$value)))
-                 {
+                    {
                     return true;
                 }
                 elseif (($out == 2) && (preg_match('/^[0-9]{12}+$/',$value)))
@@ -288,7 +288,7 @@ 
                     return true;
                 }
                 else {
-                   //dd(false);
+                    //dd(false);
                         $this ->_custom_messages['unmatch'] = $attribute." format does not match with Identity type";
                         $this->_set_custom_stuff();
                         return false;
@@ -307,7 +307,7 @@ 
                 }
                 
                 elseif (preg_match('/^[0-9]{9}[VX]{1}+$/',$value))
-                 {
+                    {
                     return true;
                 }
                 elseif (preg_match('/^[0-9]{12}+$/',$value))

Spacing +43 added lines, -43 removed lines

@@ -72,17 +72,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;
         }
@@ -93,16 +93,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;
         }
@@ -111,18 +111,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;
             }
@@ -130,7 +130,7 @@ 
             if (($attribute == 'bmi_height') || ('bmi_weight')) {
                 return $this->validateHW($attribute, $value);
             }
-        } else {
+        }else {
             return true;
         }
     }
@@ -139,19 +139,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;
             }
         }
@@ -159,22 +159,22 @@ 
 
     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;
         }
     }
     protected function validateNic($attribute, $value, $perameters, $validator)
     {
-        switch($data['identity_type']){
+        switch ($data['identity_type']) {
             case 'BC':
                 //inclde the bc validation
                 break;
@@ -184,10 +184,10 @@ 
         }
         $valid = preg_match('/^([0-9]{9}[VX]|[0-9]{12})$/i', $value);
         if (!$valid) {
-            $this->_custom_messages['nic'] = $attribute . ' is not valid,  Please check the NIC number';
+            $this->_custom_messages['nic'] = $attribute.' is not valid,  Please check the NIC number';
             $this->_set_custom_stuff();
             return false;
-        } else {
+        }else {
             return true;
         }
     }
@@ -195,7 +195,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);
@@ -211,14 +211,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;
             }
         }
@@ -228,24 +228,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;
         }
     }
@@ -259,11 +259,11 @@ 
         foreach ($validator->getData() as $data) {
            
             
-            if(($data['identity_type'] != null)&&($value != null))
+            if (($data['identity_type'] != null) && ($value != null))
             {
                 //dd(true);
                
-               if(!strcmp($data['identity_type'],"BC"))
+               if (!strcmp($data['identity_type'], "BC"))
                {
                     $out = 1;
                }
@@ -272,18 +272,18 @@ 
                    $out = 2;
                }
                
-               if(($out == 1)&&(preg_match('/^[0-9]{4}+$/',$value)))
+               if (($out == 1) && (preg_match('/^[0-9]{4}+$/', $value)))
                 {
                     //dd(true);
                     return true;
     
                 }
                 
-                elseif (($out == 2) &&(preg_match('/^[0-9]{9}[VX]{1}+$/',$value)))
+                elseif (($out == 2) && (preg_match('/^[0-9]{9}[VX]{1}+$/', $value)))
                  {
                     return true;
                 }
-                elseif (($out == 2) && (preg_match('/^[0-9]{12}+$/',$value)))
+                elseif (($out == 2) && (preg_match('/^[0-9]{12}+$/', $value)))
                 {
                     return true;
                 }
@@ -295,22 +295,22 @@ 
                        
                 }
             }
-            else if(($data['identity_type'] != null)&&($value == null)){
+            else if (($data['identity_type'] != null) && ($value == null)) {
                 return true;
             }
             else {
-                if(preg_match('/^[0-9]{4}+$/',$value))
+                if (preg_match('/^[0-9]{4}+$/', $value))
                 {
                     //dd(true);
                     return true;
     
                 }
                 
-                elseif (preg_match('/^[0-9]{9}[VX]{1}+$/',$value))
+                elseif (preg_match('/^[0-9]{9}[VX]{1}+$/', $value))
                  {
                     return true;
                 }
-                elseif (preg_match('/^[0-9]{12}+$/',$value))
+                elseif (preg_match('/^[0-9]{12}+$/', $value))
                 {
                     return true;
                 }

Braces +9 added lines, -20 removed lines

@@ -266,8 +266,7 @@ 
                if(!strcmp($data['identity_type'],"BC"))
                {
                     $out = 1;
-               }
-               else 
+               } else 
                {
                    $out = 2;
                }
@@ -277,44 +276,34 @@ 
                     //dd(true);
                     return true;
     
-                }
-                
-                elseif (($out == 2) &&(preg_match('/^[0-9]{9}[VX]{1}+$/',$value)))
+                } elseif (($out == 2) &&(preg_match('/^[0-9]{9}[VX]{1}+$/',$value)))
                  {
                     return true;
-                }
-                elseif (($out == 2) && (preg_match('/^[0-9]{12}+$/',$value)))
+                } elseif (($out == 2) && (preg_match('/^[0-9]{12}+$/',$value)))
                 {
                     return true;
-                }
-                else {
+                } else {
                    //dd(false);
                         $this ->_custom_messages['unmatch'] = $attribute." format does not match with Identity type";
                         $this->_set_custom_stuff();
                         return false;
                        
                 }
-            }
-            else if(($data['identity_type'] != null)&&($value == null)){
+            } else if(($data['identity_type'] != null)&&($value == null)){
                 return true;
-            }
-            else {
+            } else {
                 if(preg_match('/^[0-9]{4}+$/',$value))
                 {
                     //dd(true);
                     return true;
     
-                }
-                
-                elseif (preg_match('/^[0-9]{9}[VX]{1}+$/',$value))
+                } elseif (preg_match('/^[0-9]{9}[VX]{1}+$/',$value))
                  {
                     return true;
-                }
-                elseif (preg_match('/^[0-9]{12}+$/',$value))
+                } elseif (preg_match('/^[0-9]{12}+$/',$value))
                 {
                     return true;
-                }
-                else {
+                } else {
                     $this ->_custom_messages['idnum'] = $attribute." format is invalild";
                     $this->_set_custom_stuff();
                     return false;

app/Providers/AppServiceProvider.php

Indentation +7 added lines, -7 removed lines

@@ -25,11 +25,11 @@
      *
      * @return void
      */
-     public function boot()
-     {
-         //
-         if(!(\App::environment('local'))) {
-             URL::forceScheme('https');
-         }
-     }
+        public function boot()
+        {
+            //
+            if(!(\App::environment('local'))) {
+                URL::forceScheme('https');
+            }
+        }
 }

Spacing +1 added lines, -1 removed lines

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

app/Models/Security_group_institution.php

Spacing +10 added lines, -10 removed lines

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

app/Models/Security_group_user.php

Spacing +19 added lines, -19 removed lines

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

app/Models/Institution_staff.php

Spacing +7 added lines, -7 removed lines

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