Test Setup Failed
Pull Request — master (#480)
by Mohamed
06:34
created
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/Models/Security_user.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -149,9 +149,9 @@  discard block
 block discarded – undo
149 149
     public function getMatches($student)
150 150
     {
151 151
         return $this
152
-        ->where('gender_id',$student['gender'] + 1)
153
-        ->where('institutions.code',$student['schoolid'])
154
-        ->where('date_of_birth',$student['b_date'])
152
+        ->where('gender_id', $student['gender'] + 1)
153
+        ->where('institutions.code', $student['schoolid'])
154
+        ->where('date_of_birth', $student['b_date'])
155 155
             ->join('institution_students', 'security_users.id', 'institution_students.student_id')
156 156
             ->join('institutions', 'institution_students.institution_id', 'institutions.id')
157 157
             ->get()->toArray();
@@ -166,9 +166,9 @@  discard block
 block discarded – undo
166 166
     public function getStudentCount($student)
167 167
     {
168 168
         return $this
169
-        ->where('gender_id',$student['gender'] + 1)
170
-        ->where('institutions.code',$student['schoolid'])
171
-        ->where('date_of_birth',$student['b_date'])
169
+        ->where('gender_id', $student['gender'] + 1)
170
+        ->where('institutions.code', $student['schoolid'])
171
+        ->where('date_of_birth', $student['b_date'])
172 172
             ->join('institution_students', 'security_users.id', 'institution_students.student_id')
173 173
             ->join('institutions', 'institution_students.institution_id', 'institutions.id')
174 174
             ->count();
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
             $studentData['id'] = $id;
203 203
             $this->uniqueUserId->updateOrInsertRecord($studentData);
204 204
             return $studentData;
205
-        } catch (\Exception $th) {
205
+        }catch (\Exception $th) {
206 206
             Log::error($th->getMessage());
207 207
             // in case of duplication of the Unique ID this will recursive.
208 208
             $sis_student['openemis_no'] = $this->uniqueUId::getUniqueAlphanumeric();
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
         $this->uniqueUserId = new Unique_user_id();
224 224
         $this->uniqueUId = new UniqueUid();
225 225
         // regenerate unique id if it's not available
226
-        $uniqueId = ($this->uniqueUId::isValidUniqueId($sis_student['openemis_no'],9)) ?  $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
226
+        $uniqueId = ($this->uniqueUId::isValidUniqueId($sis_student['openemis_no'], 9)) ? $sis_student['openemis_no'] : $this->uniqueUId::getUniqueAlphanumeric();
227 227
 
228 228
         $studentData = [
229 229
             'username' => str_replace('-', '', $uniqueId),
@@ -237,11 +237,11 @@  discard block
 block discarded – undo
237 237
         ];
238 238
 
239 239
         try {
240
-            self::where( 'id'  , $sis_student['student_id'])->update($studentData);
240
+            self::where('id', $sis_student['student_id'])->update($studentData);
241 241
             $studentData['id'] = $sis_student['student_id'];
242 242
             $this->uniqueUserId->updateOrInsertRecord($studentData);
243 243
             return $studentData;
244
-        } catch (\Exception $th) {
244
+        }catch (\Exception $th) {
245 245
             Log::error($th);
246 246
             // in case of duplication of the Unique ID this will recursive.
247 247
             $sis_student['openemis_no'] = $this->uniqueUId::getUniqueAlphanumeric();
Please login to merge, or discard this patch.
app/Http/Controllers/ExaminationStudentsController.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
         $this->grade = $grade;
31 31
         $this->student = new Security_user();
32 32
         $this->examination_student = new Examination_student();
33
-        $this->academic_period =  Academic_period::where('code', '=', $this->year)->first();
33
+        $this->academic_period = Academic_period::where('code', '=', $this->year)->first();
34 34
         $this->education_grade = Education_grade::where('code', '=', $this->grade)->first();
35 35
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
36 36
     }
@@ -72,10 +72,10 @@  discard block
 block discarded – undo
72 72
                     );
73 73
                     Session::flash('message', 'File upload successfully!');
74 74
                     // Redirect to index
75
-                } else {
75
+                }else {
76 76
                     Session::flash('message', 'File too large. File must be less than 20MB.');
77 77
                 }
78
-            } else {
78
+            }else {
79 79
                 Session::flash('message', 'Invalid File Extension.');
80 80
             }
81 81
         }
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
             $import->import($excelFile, 'local', \Maatwebsite\Excel\Excel::CSV);
98 98
             if ($import->failures()->count() > 0) {
99 99
                 $errors = $import->failures();
100
-                $columns =  [
100
+                $columns = [
101 101
                     'remarks',
102 102
                     'st_no',
103 103
                     'stu_no',
@@ -118,10 +118,10 @@  discard block
 block discarded – undo
118 118
                 Storage::put($file, implode(',', $columns));
119 119
 
120 120
                 foreach ($errors as $error) {
121
-                    Storage::append($file, implode(':', $error->errors()) . ',' . implode(',', $error->values()));
121
+                    Storage::append($file, implode(':', $error->errors()).','.implode(',', $error->values()));
122 122
                 }
123 123
             }
124
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
124
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
125 125
         }
126 126
     }
127 127
 
@@ -135,9 +135,9 @@  discard block
 block discarded – undo
135 135
         $students = [];
136 136
         switch ($mode) {
137 137
             case 'duplicate':
138
-                $students =  DB::table('examination_students as es')
138
+                $students = DB::table('examination_students as es')
139 139
                     ->select(DB::raw('count(*) as total'), 'e2.*')
140
-                    ->join('examination_students as e2', 'es.nsid','e2.nsid')
140
+                    ->join('examination_students as e2', 'es.nsid', 'e2.nsid')
141 141
                     ->having('total', '>', 1)
142 142
                     ->groupBy('e2.st_no')
143 143
                     ->orderBy('e2.st_no')
@@ -145,18 +145,18 @@  discard block
 block discarded – undo
145 145
                     ->limit($limit)
146 146
                     ->get()->toArray();
147 147
                 $students = (array) json_decode(json_encode($students));
148
-                $this->output->writeln(count($students) . 'students remaining duplicate');
148
+                $this->output->writeln(count($students).'students remaining duplicate');
149 149
                 array_walk($students, array($this, 'clone'));
150 150
                 $this->output->writeln('All are generated');
151 151
                 break;
152 152
             case 'empty';
153 153
                 $students = Examination_student::whereNull('nsid')
154
-                    ->orWhere('nsid','<>','')
154
+                    ->orWhere('nsid', '<>', '')
155 155
                     ->offset($offset)
156 156
                     ->limit($limit)
157 157
                     ->get()->toArray();
158 158
                 $students = (array) json_decode(json_encode($students));
159
-                $this->output->writeln(count($students) . 'students remaining empty');
159
+                $this->output->writeln(count($students).'students remaining empty');
160 160
                 array_walk($students, array($this, 'clone'));
161 161
                 $this->output->writeln('All are generated');
162 162
                 break;
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
                     whereRaw('CHAR_LENGTH(nsid) > 11')
166 166
                     ->get()->toArray();
167 167
                 $students = (array) json_decode(json_encode($students));
168
-                $this->output->writeln(count($students) . 'students remaining with wrong NSID');
168
+                $this->output->writeln(count($students).'students remaining with wrong NSID');
169 169
                 array_walk($students, array($this, 'clone'));
170 170
                 $this->output->writeln('All are generated');
171 171
                 break;
@@ -174,14 +174,14 @@  discard block
 block discarded – undo
174 174
                 ->count();
175 175
                 $all = Examination_student::select('nsid')
176 176
                     ->count();
177
-                $this->output->writeln( $all. 'Total Unique nsid are: ' .$count);
177
+                $this->output->writeln($all.'Total Unique nsid are: '.$count);
178 178
                 break;
179 179
             default:
180 180
                 $students = Examination_student::offset($offset)
181 181
                     ->limit($limit)
182 182
                     ->get()->toArray();
183 183
                 $students = (array) json_decode(json_encode($students));
184
-                $this->output->writeln(count($students) . 'students remaining empty');
184
+                $this->output->writeln(count($students).'students remaining empty');
185 185
                 array_walk($students, array($this, 'clone'));
186 186
                 $this->output->writeln('All are generated');
187 187
         }
@@ -227,7 +227,7 @@  discard block
 block discarded – undo
227 227
      */
228 228
     public function clone($student)
229 229
     {
230
-        $student = (array)json_decode(json_encode($student));
230
+        $student = (array) json_decode(json_encode($student));
231 231
         //get student matching with same dob and gender
232 232
 
233 233
         $matchedStudent = $this->getMatchingStudents($student);
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 
261 261
                 //TODO implement insert student to admission table
262 262
                 $student['id'] = $sis_student['id'];
263
-                $sis_student['student_id'] =  $student['id'];
263
+                $sis_student['student_id'] = $student['id'];
264 264
 
265 265
                 $student = $this->setIsTakingExam($student);
266 266
                 if (count($institutionClass) == 1) {
@@ -268,13 +268,13 @@  discard block
 block discarded – undo
268 268
                     Institution_student::createExaminationData($student, $admissionInfo);
269 269
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
270 270
                     Institution_class_student::createExaminationData($student, $admissionInfo);
271
-                } else {
271
+                }else {
272 272
                     Institution_student_admission::createExaminationData($student, $admissionInfo);
273 273
                     Institution_student::createExaminationData($student, $admissionInfo);
274 274
                 }
275 275
                 $this->updateStudentId($student, $sis_student);
276 276
                 // update the matched student's data    
277
-            } else {
277
+            }else {
278 278
                 $student = $this->setIsTakingExam($student);
279 279
                 $studentData = $this->student->updateExaminationStudent($student, $matchedStudent);
280 280
                 $matchedStudent = array_merge((array) $student, $matchedStudent);
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
                 Institution_student::updateExaminationData($studentData, $admissionInfo);
283 283
                 $this->updateStudentId($student, $studentData);
284 284
             }
285
-        } else {
285
+        }else {
286 286
 
287
-            $this->output->writeln('Student ' . $student['st_no'] . ' not imorted' . $student['f_name']);
287
+            $this->output->writeln('Student '.$student['st_no'].' not imorted'.$student['f_name']);
288 288
         }
289 289
     }
290 290
 
@@ -301,18 +301,18 @@  discard block
 block discarded – undo
301 301
         /**
302 302
          */
303 303
         $sis_student = $this->student->getMatches($student);
304
-        $doe_students =  Examination_student::where('gender',$student['gender'])
305
-            ->where('b_date',$student['b_date'])
306
-            ->where('schoolid',$student['schoolid'])
304
+        $doe_students = Examination_student::where('gender', $student['gender'])
305
+            ->where('b_date', $student['b_date'])
306
+            ->where('schoolid', $student['schoolid'])
307 307
             ->count();
308 308
         $count = $this->student->getStudentCount($student);
309 309
 
310 310
         $studentData = [];
311
-        $sis_users  = (array) json_decode(json_encode($sis_student), true);
311
+        $sis_users = (array) json_decode(json_encode($sis_student), true);
312 312
         // if the same gender same DOE has more than one 
313
-        if(($doe_students > 1) || ($count > 1)){
314
-            $studentData = $this->searchSimilarName($student, $sis_users,false);
315
-        }else{
313
+        if (($doe_students > 1) || ($count > 1)) {
314
+            $studentData = $this->searchSimilarName($student, $sis_users, false);
315
+        }else {
316 316
             $studentData = $this->searchSimilarName($student, $sis_users);
317 317
         }   
318 318
         return $studentData;
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
      * @param array $sis_students
326 326
      * @return array
327 327
      */
328
-    public function searchSimilarName($student, $sis_students,$surname_search = true)
328
+    public function searchSimilarName($student, $sis_students, $surname_search = true)
329 329
     {
330 330
         $highest = [];
331 331
         $minDistance = 0;
@@ -345,7 +345,7 @@  discard block
 block discarded – undo
345 345
             }
346 346
         }
347 347
 
348
-        if($surname_search){
348
+        if ($surname_search) {
349 349
             if (empty($highest)) {
350 350
                 foreach ($sis_students as $key => $value) {
351 351
                     //search name with last name
@@ -361,8 +361,8 @@  discard block
 block discarded – undo
361 361
             }
362 362
         }
363 363
 
364
-        if(count($matches)>1){
365
-            $highest =  $this->searchSimilarName($student, $sis_students,false);
364
+        if (count($matches) > 1) {
365
+            $highest = $this->searchSimilarName($student, $sis_students, false);
366 366
         }
367 367
 
368 368
         return $highest;
@@ -378,7 +378,7 @@  discard block
 block discarded – undo
378 378
     public function updateStudentId($student, $sis_student)
379 379
     {
380 380
         try {
381
-            $student['nsid'] =  $sis_student['openemis_no'];
381
+            $student['nsid'] = $sis_student['openemis_no'];
382 382
             // add new NSID to the examinations data set
383 383
             unset($student['id']);
384 384
             unset($student['taking_g5_exam']);
@@ -387,8 +387,8 @@  discard block
 block discarded – undo
387 387
             unset($student['total']);
388 388
             $this->examination_student->where('st_no', $student['st_no'])->update($student);
389 389
             unset($student['st_no']);
390
-            $this->output->writeln('Updated  to NSID' . $sis_student['openemis_no']);
391
-        } catch (\Exception $th) {
390
+            $this->output->writeln('Updated  to NSID'.$sis_student['openemis_no']);
391
+        }catch (\Exception $th) {
392 392
             dd($th);
393 393
             $this->output->writeln('error');
394 394
             Log::error($th);
@@ -406,7 +406,7 @@  discard block
 block discarded – undo
406 406
         try {
407 407
             (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.'.time().'.csv');
408 408
             (new ExportReady($adminUser));
409
-        } catch (\Throwable $th) {
409
+        }catch (\Throwable $th) {
410 410
             //throw $th;
411 411
             dd($th);
412 412
         }
@@ -416,13 +416,13 @@  discard block
 block discarded – undo
416 416
     public function downloadErrors()
417 417
     {
418 418
 
419
-        $file_path = storage_path() . '/app/examination/errors.csv';
419
+        $file_path = storage_path().'/app/examination/errors.csv';
420 420
         return Response::download($file_path);
421 421
     }
422 422
 
423 423
     public function downloadProcessedFile()
424 424
     {
425
-        $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv';
425
+        $file_path = storage_path().'/app/examination/student_data_with_nsid.csv';
426 426
         return Response::download($file_path);
427 427
     }
428 428
 }
Please login to merge, or discard this patch.