Test Setup Failed
Pull Request — master (#566)
by Mohamed
11:56
created
app/Models/Institution_subject_student.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -70,21 +70,21 @@
 block discarded – undo
70 70
      */
71 71
     public static function  isDuplicated($inputs){
72 72
 
73
-       $exists = self::where('student_id','=',$inputs['student_id'])
74
-           ->where('institution_subject_id','=',$inputs['institution_subject_id'])
75
-           ->where('education_subject_id','=',$inputs['education_subject_id'])->count();
73
+        $exists = self::where('student_id','=',$inputs['student_id'])
74
+            ->where('institution_subject_id','=',$inputs['institution_subject_id'])
75
+            ->where('education_subject_id','=',$inputs['education_subject_id'])->count();
76 76
 
77 77
 
78 78
         return $exists ? true :false;
79 79
     }
80 80
 
81 81
     
82
-     public function student(){
82
+        public function student(){
83 83
         return $this->belongsTo('App\Models\Security_user','student_id');
84 84
     }
85 85
     
86 86
     public static function getStudentsCount($institution_subject_id){
87
-         $total_male_students = self::with(['student' => function($query) {
87
+            $total_male_students = self::with(['student' => function($query) {
88 88
                         $query->where('student.gender_id', '=', 1);
89 89
                     }])->whereHas('student', function ($query) {
90 90
                     $query->where('gender_id', '=', 1);
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -7,7 +7,7 @@  discard block
 block discarded – undo
7 7
 use Illuminate\Database\Eloquent\Model;
8 8
 use Illuminate\Database\Eloquent\SoftDeletes;
9 9
 
10
-class Institution_subject_student extends Model  {
10
+class Institution_subject_student extends Model {
11 11
 
12 12
 
13 13
     use SoftDeletes;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
     public static function boot()
57 57
     {
58 58
         parent::boot();
59
-        self::creating(function ($model) {
59
+        self::creating(function($model) {
60 60
             $model->id = (string) Uuid::generate(4);
61 61
         });
62 62
 
@@ -68,31 +68,31 @@  discard block
 block discarded – undo
68 68
      *
69 69
      *
70 70
      */
71
-    public static function  isDuplicated($inputs){
71
+    public static function  isDuplicated($inputs) {
72 72
 
73
-       $exists = self::where('student_id','=',$inputs['student_id'])
74
-           ->where('institution_subject_id','=',$inputs['institution_subject_id'])
75
-           ->where('education_subject_id','=',$inputs['education_subject_id'])->count();
73
+       $exists = self::where('student_id', '=', $inputs['student_id'])
74
+           ->where('institution_subject_id', '=', $inputs['institution_subject_id'])
75
+           ->where('education_subject_id', '=', $inputs['education_subject_id'])->count();
76 76
 
77 77
 
78 78
         return $exists ? true :false;
79 79
     }
80 80
 
81 81
     
82
-     public function student(){
83
-        return $this->belongsTo('App\Models\Security_user','student_id');
82
+     public function student() {
83
+        return $this->belongsTo('App\Models\Security_user', 'student_id');
84 84
     }
85 85
     
86
-    public static function getStudentsCount($institution_subject_id){
86
+    public static function getStudentsCount($institution_subject_id) {
87 87
          $total_male_students = self::with(['student' => function($query) {
88 88
                         $query->where('student.gender_id', '=', 1);
89
-                    }])->whereHas('student', function ($query) {
89
+                    }])->whereHas('student', function($query) {
90 90
                     $query->where('gender_id', '=', 1);
91 91
                 })->where('institution_subject_id', '=', $institution_subject_id)->count();
92 92
 
93 93
         $total_female_students = self::with(['student' => function($query) {
94 94
                         $query->where('student.gender_id', '=', 2);
95
-                    }])->whereHas('student', function ($query) {
95
+                    }])->whereHas('student', function($query) {
96 96
                     $query->where('gender_id', '=', 2);
97 97
                 })->where('institution_subject_id', '=', $institution_subject_id)->count();
98 98
 
Please login to merge, or discard this patch.
app/Models/Unique_user_id.php 2 patches
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 
55 55
     public  function updateOrInsertRecord($user)
56 56
     {
57
-       try {
57
+        try {
58 58
             // regenerate unique id if it's not available
59 59
         $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no'],9) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
60 60
 
@@ -69,10 +69,10 @@  discard block
 block discarded – undo
69 69
             ]);
70 70
         }
71 71
         return $user;
72
-       } catch (\Exception $th) {
72
+        } catch (\Exception $th) {
73 73
             Log::error($th->getMessage());
74
-           $user['openemis_no'] = $this->uniqueUserId::getUniqueAlphanumeric();
75
-           $this->updateOrInsertRecord($user);
76
-       }
74
+            $user['openemis_no'] = $this->uniqueUserId::getUniqueAlphanumeric();
75
+            $this->updateOrInsertRecord($user);
76
+        }
77 77
     }
78 78
 }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -56,10 +56,10 @@  discard block
 block discarded – undo
56 56
     {
57 57
        try {
58 58
             // regenerate unique id if it's not available
59
-        $uniqueId =  $this->uniqueUserId::isValidUniqueId($user['openemis_no'],9) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
59
+        $uniqueId = $this->uniqueUserId::isValidUniqueId($user['openemis_no'], 9) ? $this->uniqueUserId::getUniqueAlphanumeric() : $user['openemis_no'];
60 60
 
61 61
         //check if the user's entry exits ?
62
-        $exists = Unique_user_id::where('unique_id' , $uniqueId)->exists();
62
+        $exists = Unique_user_id::where('unique_id', $uniqueId)->exists();
63 63
 
64 64
         if (!$exists) {
65 65
             // try to feed unique user id
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
             ]);
70 70
         }
71 71
         return $user;
72
-       } catch (\Exception $th) {
72
+       }catch (\Exception $th) {
73 73
             Log::error($th->getMessage());
74 74
            $user['openemis_no'] = $this->uniqueUserId::getUniqueAlphanumeric();
75 75
            $this->updateOrInsertRecord($user);
Please login to merge, or discard this patch.
app/Console/Commands/CleanExamData.php 3 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -86,11 +86,11 @@
 block discarded – undo
86 86
     }
87 87
 
88 88
     public function process($students,$count,$type){
89
-       if($type === 'duplicate'){
89
+        if($type === 'duplicate'){
90 90
         array_walk($students,array($this,'cleanData'));
91
-       }elseif($type === 'lock'){
91
+        }elseif($type === 'lock'){
92 92
         array_walk($students,array($this,'lockData'));
93
-       }
93
+        }
94 94
     }
95 95
 
96 96
     public function lockData($Student){
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -48,24 +48,24 @@  discard block
 block discarded – undo
48 48
     {
49 49
         $type = $this->argument('type');
50 50
         $students = array();
51
-        if($type == 'invalid'){
51
+        if ($type == 'invalid') {
52 52
             $students = DB::table('examination_students as es')
53 53
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
54 54
             ->get()
55 55
             ->toArray();
56
-        }elseif($type == 'duplicate'){
56
+        }elseif ($type == 'duplicate') {
57 57
             $students = DB::table('security_users')
58 58
             ->where('updated_from', 'doe')
59 59
             ->get()
60 60
             ->toArray();
61 61
             
62
-        }elseif($type == 'all'){
62
+        }elseif ($type == 'all') {
63 63
             $students = DB::table('examination_students')
64
-            ->where('nsid','<>','')
64
+            ->where('nsid', '<>', '')
65 65
             ->whereNotNull('nsid')
66 66
             ->get()
67 67
             ->toArray();
68
-        }elseif($type == 'lock'){
68
+        }elseif ($type == 'lock') {
69 69
             $students = DB::table('examination_students')
70 70
             ->whereNotNull('nsid')
71 71
             ->get()
@@ -73,46 +73,46 @@  discard block
 block discarded – undo
73 73
         }
74 74
 
75 75
         $this->output->writeln('###########################################------Start cleanning exam records------###########################################');    
76
-        if(count($students) > 0){
77
-            $this->output->writeln('Total students to clean: '.  count($students));
76
+        if (count($students) > 0) {
77
+            $this->output->writeln('Total students to clean: '.count($students));
78 78
             $students = array_chunk($students, $this->argument('chunk'));
79 79
             $function = array($this, 'process');
80
-            processParallel($function,$students, $this->argument('max'),$type);
81
-        }else{
80
+            processParallel($function, $students, $this->argument('max'), $type);
81
+        }else {
82 82
             $this->output->writeln('nothing to process, all are cleaned');
83 83
         }   
84 84
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
85 85
     }
86 86
 
87
-    public function process($students,$count,$type){
88
-       if($type === 'duplicate'){
89
-        array_walk($students,array($this,'cleanData'));
90
-       }elseif($type === 'lock'){
91
-        array_walk($students,array($this,'lockData'));
87
+    public function process($students, $count, $type) {
88
+       if ($type === 'duplicate') {
89
+        array_walk($students, array($this, 'cleanData'));
90
+       }elseif ($type === 'lock') {
91
+        array_walk($students, array($this, 'lockData'));
92 92
        }
93 93
     }
94 94
 
95
-    public function lockData($Student){
96
-        $Student = json_decode(json_encode($Student),true);
97
-        $student = Security_user::where('openemis_no',(string)$Student['nsid'])->first();
98
-        if(!empty($student)){
95
+    public function lockData($Student) {
96
+        $Student = json_decode(json_encode($Student), true);
97
+        $student = Security_user::where('openemis_no', (string) $Student['nsid'])->first();
98
+        if (!empty($student)) {
99 99
             Institution_student::where('student_id', $student->id)->update(['updated_from' => 'doe']);
100 100
             Security_user::where('id', $student->id)->update(['updated_from' => 'doe']);
101
-            $this->output->writeln('Locked:'. (string)$Student['nsid'] .':' . $student['openemis_no']);
101
+            $this->output->writeln('Locked:'.(string) $Student['nsid'].':'.$student['openemis_no']);
102 102
         }
103 103
     }
104 104
 
105 105
 
106 106
     public function cleanData($Student)
107 107
     {
108
-        $exist = Examination_student::where('nsid','=',  (string)$Student->openemis_no)->count();
108
+        $exist = Examination_student::where('nsid', '=', (string) $Student->openemis_no)->count();
109 109
         if (!$exist) {
110 110
             Institution_student::where('student_id', $Student->id)->delete();
111 111
             Institution_class_student::where('student_id', $Student->id)->delete();
112 112
             Institution_student_admission::where('student_id', $Student->id)->delete();
113 113
             Security_user::where('id', $Student->id)->delete();
114
-            $this->output->writeln('cleaned:'.  (string)$Student->openemis_no);
115
-        }else{
114
+            $this->output->writeln('cleaned:'.(string) $Student->openemis_no);
115
+        }else {
116 116
             
117 117
             Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']);
118 118
             Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']);
@@ -132,12 +132,12 @@  discard block
 block discarded – undo
132 132
     public function cleanInvalidData($Student)
133 133
     {
134 134
         $Student = (array) $Student;
135
-        $exist = Examination_student::where('nsid',$Student['nsid'])->count();
135
+        $exist = Examination_student::where('nsid', $Student['nsid'])->count();
136 136
         
137 137
         $this->uniqueUId = new UniqueUid();
138 138
 
139
-        $nsid = ltrim(rtrim($Student['nsid'],'-'),'-');
140
-        if(!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')){
139
+        $nsid = ltrim(rtrim($Student['nsid'], '-'), '-');
140
+        if (!$this->uniqueUId::isValidUniqueId('DBY-898-3J2')) {
141 141
         }
142 142
     }
143 143
 }
Please login to merge, or discard this patch.
Braces   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -53,19 +53,19 @@  discard block
 block discarded – undo
53 53
             ->whereRaw('CHAR_LENGTH(nsid) > 11')
54 54
             ->get()
55 55
             ->toArray();
56
-        }elseif($type == 'duplicate'){
56
+        } elseif($type == 'duplicate'){
57 57
             $students = DB::table('security_users')
58 58
             ->where('updated_from', 'doe')
59 59
             ->get()
60 60
             ->toArray();
61 61
             
62
-        }elseif($type == 'all'){
62
+        } elseif($type == 'all'){
63 63
             $students = DB::table('examination_students')
64 64
             ->where('nsid','<>','')
65 65
             ->whereNotNull('nsid')
66 66
             ->get()
67 67
             ->toArray();
68
-        }elseif($type == 'lock'){
68
+        } elseif($type == 'lock'){
69 69
             $students = DB::table('examination_students')
70 70
             ->whereNotNull('nsid')
71 71
             ->get()
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
             $students = array_chunk($students, $this->argument('chunk'));
79 79
             $function = array($this, 'process');
80 80
             processParallel($function,$students, $this->argument('max'),$type);
81
-        }else{
81
+        } else{
82 82
             $this->output->writeln('nothing to process, all are cleaned');
83 83
         }   
84 84
         $this->output->writeln('###########################################------Finished cleaning exam records------###########################################');
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
     public function process($students,$count,$type){
88 88
        if($type === 'duplicate'){
89 89
         array_walk($students,array($this,'cleanData'));
90
-       }elseif($type === 'lock'){
90
+       } elseif($type === 'lock'){
91 91
         array_walk($students,array($this,'lockData'));
92 92
        }
93 93
     }
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
             Institution_student_admission::where('student_id', $Student->id)->delete();
113 113
             Security_user::where('id', $Student->id)->delete();
114 114
             $this->output->writeln('cleaned:'.  (string)$Student->openemis_no);
115
-        }else{
115
+        } else{
116 116
             
117 117
             Institution_student::where('student_id', $Student->id)->update(['updated_from' => 'doe']);
118 118
             Security_user::where('id', $Student->id)->update(['updated_from' => 'doe']);
Please login to merge, or discard this patch.
app/Console/Commands/OpenTOPending.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
      */
39 39
     public function handle()
40 40
     {
41
-        Institution_student_admission::where('status_id',121)->update([
41
+        Institution_student_admission::where('status_id', 121)->update([
42 42
             'status_id' => 122
43 43
         ]);
44 44
     }
Please login to merge, or discard this patch.
app/Console/Commands/RemoveDuplications.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
             ->toArray();
52 52
             if(count($duplicatedStudents)>0){
53 53
                 processParallel(array($this,'process'),$duplicatedStudents,10);
54
-            }else{
54
+            } else{
55 55
                 $this->output->writeln('Nothing to Process, all are clean');
56 56
             }
57 57
         } catch (\Throwable $th) {
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -43,29 +43,29 @@
 block discarded – undo
43 43
             $this->start_time = microtime(TRUE);
44 44
             $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
45 45
             $this->output->writeln('############### Starting delete Duplication ################');
46
-            $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'),'student_id','id','academic_period_id','education_grade_id')
46
+            $duplicatedStudents = Institution_student::select(DB::raw('count(*) as total'), 'student_id', 'id', 'academic_period_id', 'education_grade_id')
47 47
             ->groupBy('student_id')
48
-            ->having('total','>',1)
48
+            ->having('total', '>', 1)
49 49
             ->orderBy('student_id')
50 50
             ->get()
51 51
             ->toArray();
52
-            if(count($duplicatedStudents)>0){
53
-                processParallel(array($this,'process'),$duplicatedStudents,10);
54
-            }else{
52
+            if (count($duplicatedStudents) > 0) {
53
+                processParallel(array($this, 'process'), $duplicatedStudents, 10);
54
+            }else {
55 55
                 $this->output->writeln('Nothing to Process, all are clean');
56 56
             }
57
-        } catch (\Throwable $th) {
57
+        }catch (\Throwable $th) {
58 58
             dd($th);
59 59
         }
60 60
     }
61 61
   
62
-    public function process($Student){
63
-        Institution_student::where('institution_students.id','>',$Student['id'])
64
-        ->where('institution_students.student_id',$Student['student_id'])
65
-        ->where('institution_students.academic_period_id',$Student['academic_period_id'])
66
-        ->where('institution_students.education_grade_id',$Student['education_grade_id'])
62
+    public function process($Student) {
63
+        Institution_student::where('institution_students.id', '>', $Student['id'])
64
+        ->where('institution_students.student_id', $Student['student_id'])
65
+        ->where('institution_students.academic_period_id', $Student['academic_period_id'])
66
+        ->where('institution_students.education_grade_id', $Student['education_grade_id'])
67 67
         ->delete();
68 68
         $this->end_time = microtime(TRUE);    
69
-        $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete');
69
+        $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete');
70 70
     }
71 71
 }
Please login to merge, or discard this patch.
app/Console/Commands/UpdatePreferredName.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
      */
40 40
     public function handle()
41 41
     {
42
-        Security_user::where('is_student',true)
42
+        Security_user::where('is_student', true)
43 43
         ->whereRaw('CHAR_LENGTH(first_name) <= 90')
44 44
         ->update(['preferred_name' =>  DB::raw('first_name')]);
45 45
     }
Please login to merge, or discard this patch.
app/Console/Commands/UpdateDoeDataGrade.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
     public function handle()
41 41
     {
42 42
         Institution_student::where('updated_from', 'doe')
43
-            ->where('education_grade_id','<>', 4)
43
+            ->where('education_grade_id', '<>', 4)
44 44
             ->update(['education_grade_id' => 4]);
45 45
     }
46 46
 }
Please login to merge, or discard this patch.
app/Imports/UsersImport.php 1 patch
Spacing   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
     public function registerEvents(): array
76 76
     {
77 77
         return [
78
-            BeforeSheet::class => function (BeforeSheet $event) {
78
+            BeforeSheet::class => function(BeforeSheet $event) {
79 79
                 $this->sheetNames[] = $event->getSheet()->getTitle();
80 80
                 $this->worksheet = $event->getSheet();
81 81
                 $this->validateClass();
@@ -87,7 +87,7 @@  discard block
 block discarded – undo
87 87
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
88 88
                 }
89 89
             },
90
-            BeforeImport::class => function (BeforeImport $event) {
90
+            BeforeImport::class => function(BeforeImport $event) {
91 91
                 $this->highestRow = ($event->getReader()->getDelegate()->getActiveSheet()->getHighestDataRow('C'));
92 92
                 if ($this->highestRow < 3) {
93 93
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
                 $mandatorySubject = Institution_class_subject::getMandetorySubjects($this->file['institution_class_id']);
115 115
                 // dd($mandatorySubject);
116 116
                 $subjects = getMatchingKeys($row);
117
-                $genderId  = null;
117
+                $genderId = null;
118 118
                 switch ($row['gender_mf']) {
119 119
                     case 'M':
120 120
                         $genderId = $row['gender_mf'] = 1;
@@ -122,15 +122,15 @@  discard block
 block discarded – undo
122 122
                         $this->maleStudentsCount += 1;
123 123
                         break;
124 124
                     case 'F':
125
-                        $genderId =  $row['gender_mf'] = 2;
125
+                        $genderId = $row['gender_mf'] = 2;
126 126
                         $genderId = 2;
127 127
                         $this->femaleStudentsCount += 1;
128 128
                         break;
129 129
                 }
130 130
 
131
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
132
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
133
-                $identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
131
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
132
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
133
+                $identityType = Identity_type::where('national_code', 'like', '%'.$row['identity_type'].'%')->first();
134 134
                 $academicPeriod = Academic_period::where('name', '=', $row['academic_period'])->first();
135 135
 
136 136
 
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
                     if (array_key_exists('preferred_name', $row)) {
151 151
                     $preferred_name = $row['preferred_name'];
152 152
                 }
153
-                $student =  Security_user::create([
153
+                $student = Security_user::create([
154 154
                     'username' => str_replace('-', '', $openemisStudent),
155 155
                     'openemis_no' => $openemisStudent,
156 156
                     'first_name' => $row['full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
@@ -240,9 +240,9 @@  discard block
 block discarded – undo
240 240
                 if (!empty($row['bmi_weight']) && !empty($row['bmi_weight']) && !empty($row['bmi_date_yyyy_mm_dd'])) {
241 241
                     try {
242 242
                         // convert Meeter to CM
243
-                        $hight = $row['bmi_height'] / 100;
243
+                        $hight = $row['bmi_height']/100;
244 244
                         //calculate BMI
245
-                        $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
245
+                        $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
246 246
 
247 247
                         $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
248 248
 
@@ -256,17 +256,17 @@  discard block
 block discarded – undo
256 256
                             'security_user_id' => $student->student_id,
257 257
                             'created_user_id' => $this->file['security_user_id']
258 258
                         ]);
259
-                    } catch (\Throwable $th) {
260
-                        \Log::error('User_body_mass:' . $th->getMessage());
259
+                    }catch (\Throwable $th) {
260
+                        \Log::error('User_body_mass:'.$th->getMessage());
261 261
                     }
262 262
                 }
263 263
 
264 264
 
265 265
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
266 266
 
267
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
268
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
269
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
267
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
268
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
269
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
270 270
                     $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
271 271
 
272 272
                     $identityType = ($identityType !== null) ? $identityType->id : null;
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
                             User_contact::createOrUpdate($father, $this->file['security_user_id']);
305 305
                         }
306 306
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
307
-                    } else {
307
+                    }else {
308 308
                         Security_user::where('id', '=', $father->id)
309 309
                             ->update(['is_guardian' => 1]);
310 310
                         $father['guardian_relation_id'] = 1;
@@ -317,9 +317,9 @@  discard block
 block discarded – undo
317 317
                 }
318 318
 
319 319
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
320
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
321
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
322
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
320
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
321
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
322
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
323 323
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
324 324
 
325 325
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
                             User_contact::createOrUpdate($mother, $this->file['security_user_id']);
356 356
                         }
357 357
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
358
-                    } else {
358
+                    }else {
359 359
                         Security_user::where('id', '=', $mother->id)
360 360
                             ->update(['is_guardian' => 1]);
361 361
                         $mother['guardian_relation_id'] = 2;
@@ -370,9 +370,9 @@  discard block
 block discarded – undo
370 370
 
371 371
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
372 372
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
373
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
374
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
375
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
373
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
374
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
375
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
376 376
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
377 377
 
378 378
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
                             User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
410 410
                         }
411 411
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
412
-                    } else {
412
+                    }else {
413 413
                         Security_user::where('id', '=', $guardian->id)
414 414
                             ->update(['is_guardian' => 1]);
415 415
                         $guardian['guardian_relation_id'] = 3;
@@ -441,7 +441,7 @@  discard block
 block discarded – undo
441 441
 
442 442
                 if ($totalStudents['total'] > $institutionClass->no_of_students) {
443 443
                     $error = \Illuminate\Validation\ValidationException::withMessages([]);
444
-                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is ' . $institutionClass->no_of_students], [null]);
444
+                    $failure = new Failure(3, 'rows', [3 => 'Class student count exceeded! Max number of students is '.$institutionClass->no_of_students], [null]);
445 445
                     $failures = [0 => $failure];
446 446
                     throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
447 447
                     Log::info('email-sent', [$this->file]);
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
                         'total_female_students' => $totalStudents['total_female_students']
454 454
                     ]);
455 455
             }
456
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
456
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
457 457
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
458 458
             //            $failure = new Failure(3, 'remark', [3 => ], [null]);
459 459
             $failures = $e->failures();
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
             '*.full_name' => 'required|regex:/^[\pL\s\-]+$/u|max:256',
470 470
             '*.preferred_name' => 'nullable|regex:/^[\pL\s\-]+$/u|max:90',
471 471
             '*.gender_mf' => 'required|in:M,F',
472
-            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:' . $this->file['institution_class_id'],
472
+            '*.date_of_birth_yyyy_mm_dd' => 'date|required|admission_age:'.$this->file['institution_class_id'],
473 473
             '*.address' => 'nullable',
474 474
             '*.birth_registrar_office_as_in_birth_certificate' => 'nullable|exists:area_administratives,name|required_if:identity_type,BC|birth_place',
475 475
             '*.birth_divisional_secretariat' => 'nullable|exists:area_administratives,name|required_with:birth_registrar_office_as_in_birth_certificate',
@@ -479,8 +479,8 @@  discard block
 block discarded – undo
479 479
             '*.academic_period' => 'required|exists:academic_periods,name',
480 480
             '*.education_grade' => 'required',
481 481
             '*.option_*' => 'nullable|exists:education_subjects,name',
482
-            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:' . $this->file['institution_class_id'],
483
-            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:' . $this->file['institution_class_id'],
482
+            '*.bmi_height' => 'bail|required_with:*.bmi_weight|bmi:'.$this->file['institution_class_id'],
483
+            '*.bmi_weight' => 'bail|required_with:*.bmi_height|bmi:'.$this->file['institution_class_id'],
484 484
             '*.bmi_date_yyyy_mm_dd' => 'bail|required_with:*.bmi_height|date', //bmi:'. $this->file['institution_class_id'].'
485 485
             '*.bmi_academic_period' => 'bail|required_with:*.bmi_height|exists:academic_periods,name',
486 486
             '*.admission_no' => 'required|max:12|min:4|regex:/^[A-Za-z0-9\/]+$/',
Please login to merge, or discard this patch.
app/Imports/Import.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -88,10 +88,10 @@  discard block
 block discarded – undo
88 88
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
89 89
         $higestRow = 0;
90 90
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
91
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
91
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
92 92
             if (isEmptyRow(reset($rowData))) {
93 93
                 continue;
94
-            } else {
94
+            }else {
95 95
                 $higestRow += 1;
96 96
             }
97 97
         }
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
         $this->failures = [];
106 106
         if (($column !== "") && (!in_array($column, $columns))) {
107 107
             $this->isValidSheet = false;
108
-            $this->error[] = 'Unsupported column found ,remove:' . $column;
108
+            $this->error[] = 'Unsupported column found ,remove:'.$column;
109 109
             $this->failure = new Failure(3, 'remark', $this->error, [null]);
110 110
             $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
111 111
         }
@@ -118,13 +118,13 @@  discard block
 block discarded – undo
118 118
     {
119 119
         $columns = Config::get('excel.columns');
120 120
         $optional_columns = Config::get('excel.optional_columns');
121
-        $columns = array_diff ($columns,$optional_columns);
121
+        $columns = array_diff($columns, $optional_columns);
122 122
         $error = \Illuminate\Validation\ValidationException::withMessages([]);
123 123
         $this->failures = [];
124 124
         foreach ($columns as  $column) {
125 125
                 if (($column !== "") && (!in_array($column, $existingColumns))) {
126 126
                     $this->isValidSheet = false;
127
-                    $this->error[] = 'Missing Column :' . $column . ' Not found';
127
+                    $this->error[] = 'Missing Column :'.$column.' Not found';
128 128
                     $this->failure = new Failure(3, 'remark', $this->error, [null]);
129 129
                     $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
130 130
                 }
@@ -141,16 +141,16 @@  discard block
 block discarded – undo
141 141
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
142 142
         $higestRow = 1;
143 143
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
144
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
144
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
145 145
             if (isEmptyRow(reset($rowData))) {
146 146
                 continue;
147
-            } else {
147
+            }else {
148 148
                 $higestRow += 1;
149 149
             }
150 150
         }
151 151
         if ($higestRow == 0) {
152 152
             exit;
153
-        } else {
153
+        }else {
154 154
             return $higestRow;
155 155
         }
156 156
     }
@@ -175,17 +175,17 @@  discard block
 block discarded – undo
175 175
                     case 'string':
176 176
                         $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]);
177 177
                         $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);
178
-                        $row[$column] =  \Carbon\Carbon::createFromFormat($format, $row[$column]);
178
+                        $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);
179 179
                         break;
180 180
                     case 'double';
181
-                        $row[$column] =  \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
181
+                        $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
182 182
                         break;
183 183
                 }
184 184
             }
185 185
             return $row;
186
-        } catch (Exception $e) {
186
+        }catch (Exception $e) {
187 187
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
188
-            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]);
188
+            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]);
189 189
             $failures = [0 => $failure];
190 190
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
191 191
         }
@@ -206,18 +206,18 @@  discard block
 block discarded – undo
206 206
         $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
207 207
         $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
208 208
 
209
-        $row['admission_no'] =  str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
209
+        $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
210 210
         if (array_key_exists('identity_type', $row)) {
211 211
 
212 212
             if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) {
213
-                $row['identity_number'] =  str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
213
+                $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
214 214
                 // dd(($row['date_of_birth_yyyy_mm_dd']));
215
-                $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first();
215
+                $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first();
216 216
                 if ($BirthDivision !== null) {
217
-                    $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')
217
+                    $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')
218 218
                         ->where('parent_id', '=', $BirthDivision->id)->first();
219 219
                     if ($BirthArea !== null) {
220
-                        $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m");
220
+                        $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m");
221 221
                     }
222 222
                 }
223 223
             }
@@ -233,9 +233,9 @@  discard block
 block discarded – undo
233 233
     {
234 234
         if (array_key_exists($key, $row)) {
235 235
             return true;
236
-        } else {
236
+        }else {
237 237
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
238
-            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]);
238
+            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]);
239 239
             $failures = [0 => $failure];
240 240
             new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
241 241
         };
@@ -271,11 +271,11 @@  discard block
 block discarded – undo
271 271
 
272 272
         if ($exceededStudents == true) {
273 273
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
274
-            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
274
+            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]);
275 275
             $failures = [0 => $failure];
276 276
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
277 277
             Log::info('email-sent', [$this->file]);
278
-        } else {
278
+        }else {
279 279
             return true;
280 280
         }
281 281
     }
Please login to merge, or discard this patch.