@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $output->writeln('###########################################------starting export------###########################################'); |
| 48 | 48 | $this->examinationController->export(); |
| 49 | 49 | $output->writeln('###########################################------Finished inserting file records------###########################################'); |
| 50 | - } else { |
|
| 50 | + }else { |
|
| 51 | 51 | $this->examinationController->doMatch($this->argument('offset'), $this->argument('limit'), $this->argument(('mode'))); |
| 52 | 52 | $this->examinationController->export(); |
| 53 | 53 | } |
@@ -37,8 +37,8 @@ |
||
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | - * @return \Illuminate\Support\Collection |
|
| 41 | - */ |
|
| 40 | + * @return \Illuminate\Support\Collection |
|
| 41 | + */ |
|
| 42 | 42 | public function query() |
| 43 | 43 | { |
| 44 | 44 | return Examination_student::query()->whereNotNull('nsid') |
@@ -42,19 +42,19 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $this->start_time = microtime(TRUE); |
| 44 | 44 | $count = DB::table('examination_students')->select('nsid')->distinct()->count(); |
| 45 | - $studentsIdsWithDuplication = DB::table('examination_students as es') |
|
| 46 | - ->select(DB::raw('count(*) as total'),'es.*') |
|
| 45 | + $studentsIdsWithDuplication = DB::table('examination_students as es') |
|
| 46 | + ->select(DB::raw('count(*) as total'), 'es.*') |
|
| 47 | 47 | ->whereNotNull('es.nsid') |
| 48 | - ->having('total','>',1) |
|
| 48 | + ->having('total', '>', 1) |
|
| 49 | 49 | ->groupBy('es.nsid') |
| 50 | 50 | ->orderBy('es.nsid') |
| 51 | - ->chunk($this->argument('limit'),function($Students){ |
|
| 51 | + ->chunk($this->argument('limit'), function($Students) { |
|
| 52 | 52 | foreach ($Students as $Student) { |
| 53 | - $count = Examination_student::where('nsid',$Student->nsid)->count(); |
|
| 54 | - if($count> 1){ |
|
| 55 | - Examination_student::where('nsid',$Student->nsid)->update(['nsid'=>'']); |
|
| 53 | + $count = Examination_student::where('nsid', $Student->nsid)->count(); |
|
| 54 | + if ($count > 1) { |
|
| 55 | + Examination_student::where('nsid', $Student->nsid)->update(['nsid'=>'']); |
|
| 56 | 56 | } |
| 57 | - $this->output->writeln($Student->nsid .'same ID' . $count . ' records removed'); |
|
| 57 | + $this->output->writeln($Student->nsid.'same ID'.$count.' records removed'); |
|
| 58 | 58 | } |
| 59 | 59 | }); |
| 60 | 60 | } |
@@ -30,7 +30,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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; |
@@ -167,14 +167,14 @@ discard block |
||
| 167 | 167 | ->count(); |
| 168 | 168 | $all = Examination_student::select('nsid') |
| 169 | 169 | ->count(); |
| 170 | - $this->output->writeln( $all. 'Total Unique nsid are: ' .$count); |
|
| 170 | + $this->output->writeln($all.'Total Unique nsid are: '.$count); |
|
| 171 | 171 | break; |
| 172 | 172 | default: |
| 173 | 173 | $students = Examination_student::offset($offset) |
| 174 | 174 | ->limit($limit) |
| 175 | 175 | ->get()->toArray(); |
| 176 | 176 | $students = (array) json_decode(json_encode($students)); |
| 177 | - $this->output->writeln(count($students) . 'students remaining empty'); |
|
| 177 | + $this->output->writeln(count($students).'students remaining empty'); |
|
| 178 | 178 | array_walk($students, array($this, 'clone')); |
| 179 | 179 | $this->output->writeln('All are generated'); |
| 180 | 180 | } |
@@ -220,7 +220,7 @@ discard block |
||
| 220 | 220 | */ |
| 221 | 221 | public function clone($student) |
| 222 | 222 | { |
| 223 | - $student = (array)json_decode(json_encode($student)); |
|
| 223 | + $student = (array) json_decode(json_encode($student)); |
|
| 224 | 224 | //get student matching with same dob and gender |
| 225 | 225 | |
| 226 | 226 | $matchedStudent = $this->getMatchingStudents($student); |
@@ -253,7 +253,7 @@ discard block |
||
| 253 | 253 | |
| 254 | 254 | //TODO implement insert student to admission table |
| 255 | 255 | $student['id'] = $sis_student['id']; |
| 256 | - $sis_student['student_id'] = $student['id']; |
|
| 256 | + $sis_student['student_id'] = $student['id']; |
|
| 257 | 257 | |
| 258 | 258 | $student = $this->setIsTakingExam($student); |
| 259 | 259 | if (count($institutionClass) == 1) { |
@@ -261,13 +261,13 @@ discard block |
||
| 261 | 261 | Institution_student::createExaminationData($student, $admissionInfo); |
| 262 | 262 | Institution_student_admission::createExaminationData($student, $admissionInfo); |
| 263 | 263 | Institution_class_student::createExaminationData($student, $admissionInfo); |
| 264 | - } else { |
|
| 264 | + }else { |
|
| 265 | 265 | Institution_student_admission::createExaminationData($student, $admissionInfo); |
| 266 | 266 | Institution_student::createExaminationData($student, $admissionInfo); |
| 267 | 267 | } |
| 268 | 268 | $this->updateStudentId($student, $sis_student); |
| 269 | 269 | // update the matched student's data |
| 270 | - } else { |
|
| 270 | + }else { |
|
| 271 | 271 | $student = $this->setIsTakingExam($student); |
| 272 | 272 | $studentData = $this->student->updateExaminationStudent($student, $matchedStudent); |
| 273 | 273 | $matchedStudent = array_merge((array) $student, $matchedStudent); |
@@ -275,9 +275,9 @@ discard block |
||
| 275 | 275 | Institution_student::updateExaminationData($studentData, $admissionInfo); |
| 276 | 276 | $this->updateStudentId($student, $studentData); |
| 277 | 277 | } |
| 278 | - } else { |
|
| 278 | + }else { |
|
| 279 | 279 | |
| 280 | - $this->output->writeln('Student ' . $student['st_no'] . ' not imorted' . $student['f_name']); |
|
| 280 | + $this->output->writeln('Student '.$student['st_no'].' not imorted'.$student['f_name']); |
|
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | |
@@ -297,18 +297,18 @@ discard block |
||
| 297 | 297 | ->where('date_of_birth',$student['b_date']) |
| 298 | 298 | */ |
| 299 | 299 | $sis_student = $this->student->getMatches($student); |
| 300 | - $doe_students = Examination_student::where('gender',$student['gender']) |
|
| 301 | - ->where('b_date',$student['b_date']) |
|
| 302 | - ->where('schoolid',$student['schoolid']) |
|
| 300 | + $doe_students = Examination_student::where('gender', $student['gender']) |
|
| 301 | + ->where('b_date', $student['b_date']) |
|
| 302 | + ->where('schoolid', $student['schoolid']) |
|
| 303 | 303 | ->count(); |
| 304 | 304 | $count = $this->student->getStudentCount($student); |
| 305 | 305 | |
| 306 | 306 | $studentData = []; |
| 307 | - $sis_users = (array) json_decode(json_encode($sis_student), true); |
|
| 307 | + $sis_users = (array) json_decode(json_encode($sis_student), true); |
|
| 308 | 308 | // if the same gender same DOE has more than one |
| 309 | - if($doe_students > 1){ |
|
| 310 | - $studentData = $this->searchSimilarName($student, $sis_users,false); |
|
| 311 | - }else{ |
|
| 309 | + if ($doe_students > 1) { |
|
| 310 | + $studentData = $this->searchSimilarName($student, $sis_users, false); |
|
| 311 | + }else { |
|
| 312 | 312 | $studentData = $this->searchSimilarName($student, $sis_users); |
| 313 | 313 | } |
| 314 | 314 | return $studentData; |
@@ -321,7 +321,7 @@ discard block |
||
| 321 | 321 | * @param array $sis_students |
| 322 | 322 | * @return array |
| 323 | 323 | */ |
| 324 | - public function searchSimilarName($student, $sis_students,$surname_search = true) |
|
| 324 | + public function searchSimilarName($student, $sis_students, $surname_search = true) |
|
| 325 | 325 | { |
| 326 | 326 | $highest = []; |
| 327 | 327 | $minDistance = 0; |
@@ -341,7 +341,7 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - if($surname_search){ |
|
| 344 | + if ($surname_search) { |
|
| 345 | 345 | if (empty($highest)) { |
| 346 | 346 | foreach ($sis_students as $key => $value) { |
| 347 | 347 | //search name with last name |
@@ -357,8 +357,8 @@ discard block |
||
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | - if(count($matches)>1){ |
|
| 361 | - $highest = $this->searchSimilarName($student, $sis_students,false); |
|
| 360 | + if (count($matches) > 1) { |
|
| 361 | + $highest = $this->searchSimilarName($student, $sis_students, false); |
|
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | return $highest; |
@@ -374,7 +374,7 @@ discard block |
||
| 374 | 374 | public function updateStudentId($student, $sis_student) |
| 375 | 375 | { |
| 376 | 376 | try { |
| 377 | - $student['nsid'] = $sis_student['openemis_no']; |
|
| 377 | + $student['nsid'] = $sis_student['openemis_no']; |
|
| 378 | 378 | // add new NSID to the examinations data set |
| 379 | 379 | unset($student['id']); |
| 380 | 380 | unset($student['taking_g5_exam']); |
@@ -383,8 +383,8 @@ discard block |
||
| 383 | 383 | unset($student['total']); |
| 384 | 384 | $this->examination_student->where('st_no', $student['st_no'])->update($student); |
| 385 | 385 | unset($student['st_no']); |
| 386 | - $this->output->writeln('Updated to NSID' . $sis_student['openemis_no']); |
|
| 387 | - } catch (\Exception $th) { |
|
| 386 | + $this->output->writeln('Updated to NSID'.$sis_student['openemis_no']); |
|
| 387 | + }catch (\Exception $th) { |
|
| 388 | 388 | dd($th); |
| 389 | 389 | $this->output->writeln('error'); |
| 390 | 390 | Log::error($th); |
@@ -402,7 +402,7 @@ discard block |
||
| 402 | 402 | try { |
| 403 | 403 | (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.'.time().'.csv'); |
| 404 | 404 | (new ExportReady($adminUser)); |
| 405 | - } catch (\Throwable $th) { |
|
| 405 | + }catch (\Throwable $th) { |
|
| 406 | 406 | //throw $th; |
| 407 | 407 | dd($th); |
| 408 | 408 | } |
@@ -412,13 +412,13 @@ discard block |
||
| 412 | 412 | public function downloadErrors() |
| 413 | 413 | { |
| 414 | 414 | |
| 415 | - $file_path = storage_path() . '/app/examination/errors.csv'; |
|
| 415 | + $file_path = storage_path().'/app/examination/errors.csv'; |
|
| 416 | 416 | return Response::download($file_path); |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | 419 | public function downloadProcessedFile() |
| 420 | 420 | { |
| 421 | - $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv'; |
|
| 421 | + $file_path = storage_path().'/app/examination/student_data_with_nsid.csv'; |
|
| 422 | 422 | return Response::download($file_path); |
| 423 | 423 | } |
| 424 | 424 | } |
@@ -308,7 +308,7 @@ |
||
| 308 | 308 | // if the same gender same DOE has more than one |
| 309 | 309 | if($doe_students > 1){ |
| 310 | 310 | $studentData = $this->searchSimilarName($student, $sis_users,false); |
| 311 | - }else{ |
|
| 311 | + } else{ |
|
| 312 | 312 | $studentData = $this->searchSimilarName($student, $sis_users); |
| 313 | 313 | } |
| 314 | 314 | return $studentData; |