@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | use Maatwebsite\Excel\Concerns\WithHeadings; |
| 11 | 11 | use Carbon\Carbon; |
| 12 | 12 | |
| 13 | -class ExaminationStudentsExport implements FromQuery , WithHeadings |
|
| 13 | +class ExaminationStudentsExport implements FromQuery, WithHeadings |
|
| 14 | 14 | { |
| 15 | 15 | |
| 16 | 16 | use Exportable; |
@@ -44,6 +44,6 @@ discard block |
||
| 44 | 44 | { |
| 45 | 45 | return Examination_student::query()->whereNotNull('nsid') |
| 46 | 46 | ->distinct('nsid') |
| 47 | - ->whereDate('updated_at','>=',Carbon::today()); |
|
| 47 | + ->whereDate('updated_at', '>=', Carbon::today()); |
|
| 48 | 48 | } |
| 49 | 49 | } |
@@ -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; |
@@ -165,7 +165,7 @@ discard block |
||
| 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 |
||
| 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,13 +227,13 @@ discard block |
||
| 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); |
| 234 | 234 | |
| 235 | 235 | // if the first match missing do complete insertion |
| 236 | - $institution = Institution::where('code', '=', (int)$student['schoolid'])->first(); |
|
| 236 | + $institution = Institution::where('code', '=', (int) $student['schoolid'])->first(); |
|
| 237 | 237 | |
| 238 | 238 | if (!is_null($institution)) { |
| 239 | 239 | |
@@ -260,7 +260,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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,18 +378,18 @@ discard block |
||
| 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']); |
| 385 | 385 | unset($student['taking_al_exam']); |
| 386 | 386 | unset($student['taking_ol_exam']); |
| 387 | 387 | unset($student['total']); |
| 388 | - $students['updated_at'] = now(); |
|
| 388 | + $students['updated_at'] = now(); |
|
| 389 | 389 | $this->examination_student->where('st_no', $student['st_no'])->update($student); |
| 390 | 390 | unset($student['st_no']); |
| 391 | - $this->output->writeln('Updated to NSID' . $sis_student['openemis_no']); |
|
| 392 | - } catch (\Exception $th) { |
|
| 391 | + $this->output->writeln('Updated to NSID'.$sis_student['openemis_no']); |
|
| 392 | + }catch (\Exception $th) { |
|
| 393 | 393 | dd($th); |
| 394 | 394 | $this->output->writeln('error'); |
| 395 | 395 | Log::error($th); |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | try { |
| 408 | 408 | (new ExaminationStudentsExport)->store('examination/student_data_with_nsid.'.time().'.csv'); |
| 409 | 409 | (new ExportReady($adminUser)); |
| 410 | - } catch (\Throwable $th) { |
|
| 410 | + }catch (\Throwable $th) { |
|
| 411 | 411 | //throw $th; |
| 412 | 412 | dd($th); |
| 413 | 413 | } |
@@ -417,13 +417,13 @@ discard block |
||
| 417 | 417 | public function downloadErrors() |
| 418 | 418 | { |
| 419 | 419 | |
| 420 | - $file_path = storage_path() . '/app/examination/errors.csv'; |
|
| 420 | + $file_path = storage_path().'/app/examination/errors.csv'; |
|
| 421 | 421 | return Response::download($file_path); |
| 422 | 422 | } |
| 423 | 423 | |
| 424 | 424 | public function downloadProcessedFile() |
| 425 | 425 | { |
| 426 | - $file_path = storage_path() . '/app/examination/student_data_with_nsid.csv'; |
|
| 426 | + $file_path = storage_path().'/app/examination/student_data_with_nsid.csv'; |
|
| 427 | 427 | return Response::download($file_path); |
| 428 | 428 | } |
| 429 | 429 | } |
@@ -13,101 +13,101 @@ |
||
| 13 | 13 | |
| 14 | 14 | public function index() |
| 15 | 15 | { |
| 16 | - return Datatables::of(Upload::with(['classRoom'])->where('security_user_id','=',Auth::user()->id)) |
|
| 17 | - ->editColumn('is_processed', function ($data) { |
|
| 16 | + return Datatables::of(Upload::with(['classRoom'])->where('security_user_id', '=', Auth::user()->id)) |
|
| 17 | + ->editColumn('is_processed', function($data) { |
|
| 18 | 18 | |
| 19 | 19 | $nowTime = \Carbon\Carbon::now(); |
| 20 | 20 | $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime); |
| 21 | 21 | $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at); |
| 22 | 22 | $diff_in_hours = $to->diffInHours($from); |
| 23 | 23 | |
| 24 | - if($diff_in_hours >= 2 && $data->is_processed == 3){ |
|
| 24 | + if ($diff_in_hours >= 2 && $data->is_processed == 3) { |
|
| 25 | 25 | return "Terminated"; |
| 26 | 26 | } |
| 27 | 27 | elseif ($data->is_processed === 1) { |
| 28 | 28 | return "Success"; |
| 29 | - }elseif ($data->is_processed === 2){ |
|
| 29 | + }elseif ($data->is_processed === 2) { |
|
| 30 | 30 | return "Failed"; |
| 31 | - }elseif($diff_in_hours < 2 && $data->is_processed == 3){ |
|
| 31 | + }elseif ($diff_in_hours < 2 && $data->is_processed == 3) { |
|
| 32 | 32 | return "Processing"; |
| 33 | - }elseif ($data->is_processed == 4){ |
|
| 33 | + }elseif ($data->is_processed == 4) { |
|
| 34 | 34 | return "Process Paused"; |
| 35 | - }else{ |
|
| 35 | + }else { |
|
| 36 | 36 | return 'Pending'; |
| 37 | 37 | }; |
| 38 | 38 | |
| 39 | 39 | }) |
| 40 | - ->editColumn('is_email_sent', function ($data) { |
|
| 40 | + ->editColumn('is_email_sent', function($data) { |
|
| 41 | 41 | if ($data->is_email_sent == 1) { |
| 42 | 42 | return "Success"; |
| 43 | - }elseif($data->is_email_sent == 2 ){ |
|
| 43 | + }elseif ($data->is_email_sent == 2) { |
|
| 44 | 44 | return 'Failed'; |
| 45 | - }else{ |
|
| 45 | + }else { |
|
| 46 | 46 | return 'Pending'; |
| 47 | 47 | }; |
| 48 | 48 | |
| 49 | 49 | }) |
| 50 | - ->editColumn('update', function ($data) { |
|
| 51 | - if ((int)$data->update == 0) { |
|
| 50 | + ->editColumn('update', function($data) { |
|
| 51 | + if ((int) $data->update == 0) { |
|
| 52 | 52 | return "No Processes"; |
| 53 | - }elseif((int)$data->update == 1 ){ |
|
| 53 | + }elseif ((int) $data->update == 1) { |
|
| 54 | 54 | return 'Success'; |
| 55 | - }elseif((int)$data->update == 2 ){ |
|
| 55 | + }elseif ((int) $data->update == 2) { |
|
| 56 | 56 | return 'Failed'; |
| 57 | - }elseif((int)$data->update == 3 ){ |
|
| 57 | + }elseif ((int) $data->update == 3) { |
|
| 58 | 58 | return 'Partial Success'; |
| 59 | 59 | }; |
| 60 | 60 | |
| 61 | 61 | }) |
| 62 | - ->editColumn('insert', function ($data) { |
|
| 62 | + ->editColumn('insert', function($data) { |
|
| 63 | 63 | if ($data->insert == 0) { |
| 64 | 64 | return "No Processes"; |
| 65 | - }elseif($data->insert == 1 ){ |
|
| 65 | + }elseif ($data->insert == 1) { |
|
| 66 | 66 | return 'Success'; |
| 67 | - }elseif($data->insert == 2 ){ |
|
| 67 | + }elseif ($data->insert == 2) { |
|
| 68 | 68 | return 'Failed'; |
| 69 | - }elseif($data->insert == 3 ){ |
|
| 69 | + }elseif ($data->insert == 3) { |
|
| 70 | 70 | return 'Partial Success'; |
| 71 | 71 | }; |
| 72 | 72 | |
| 73 | 73 | }) |
| 74 | - ->editColumn('filename', function ($data) { |
|
| 75 | - if(\App::environment('local') || \App::environment('stage')){ |
|
| 74 | + ->editColumn('filename', function($data) { |
|
| 75 | + if (\App::environment('local') || \App::environment('stage')) { |
|
| 76 | 76 | return '<a href="/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 77 | 77 | |
| 78 | - }else{ |
|
| 78 | + }else { |
|
| 79 | 79 | return '<a href="/bulk-upload/download_file/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | }) |
| 83 | - ->editColumn('error', function ($data) { |
|
| 84 | - if(\App::environment('local') || \App::environment('stage')){ |
|
| 83 | + ->editColumn('error', function($data) { |
|
| 84 | + if (\App::environment('local') || \App::environment('stage')) { |
|
| 85 | 85 | return '<a href="/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 86 | 86 | |
| 87 | - }else{ |
|
| 87 | + }else { |
|
| 88 | 88 | return '<a href="/bulk-upload/download/'.$data->filename.'">'.$data->classRoom->name.'</a>'; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - })->editColumn('actions', function ($data) { |
|
| 91 | + })->editColumn('actions', function($data) { |
|
| 92 | 92 | |
| 93 | 93 | $nowTime = \Carbon\Carbon::now(); |
| 94 | 94 | $to = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $nowTime); |
| 95 | 95 | $from = \Carbon\Carbon::createFromFormat('Y-m-d H:s:i', $data->updated_at); |
| 96 | 96 | $diff_in_hours = $to->diffInHours($from); |
| 97 | 97 | |
| 98 | - if($diff_in_hours >= 2 && $data->is_processed == 3){ |
|
| 98 | + if ($diff_in_hours >= 2 && $data->is_processed == 3) { |
|
| 99 | 99 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-primary text-uppercase">reprocess</button>'; |
| 100 | - }elseif ($data->is_processed == 1){ |
|
| 100 | + }elseif ($data->is_processed == 1) { |
|
| 101 | 101 | return '<div><h6>Processing <span class="badge badge-success text-uppercase">Successful</span></h6></div>'; |
| 102 | - }elseif ($data->is_processed == 2){ |
|
| 102 | + }elseif ($data->is_processed == 2) { |
|
| 103 | 103 | return '<div><h6>Processing <span class="badge badge-danger text-uppercase">Failed</span></h6></div>'; |
| 104 | - }elseif ($data->is_processed == 0){ |
|
| 104 | + }elseif ($data->is_processed == 0) { |
|
| 105 | 105 | return '<button onclick="updateProcess('.($data->id).',200)" class="btn btn-block btn-warning text-uppercase">pause</button>'; |
| 106 | - }elseif ($data->is_processed == 4){ |
|
| 106 | + }elseif ($data->is_processed == 4) { |
|
| 107 | 107 | return '<button onclick="updateProcess('.($data->id).',100)" class="btn btn-block btn-success text-uppercase">resume</button>'; |
| 108 | 108 | } |
| 109 | 109 | }) |
| 110 | - ->rawColumns(['filename','error','actions']) |
|
| 110 | + ->rawColumns(['filename', 'error', 'actions']) |
|
| 111 | 111 | ->make(true); |
| 112 | 112 | } |
| 113 | 113 | |
@@ -38,7 +38,7 @@ |
||
| 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 | } |
@@ -39,7 +39,7 @@ |
||
| 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 | } |
@@ -40,7 +40,7 @@ |
||
| 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 | } |
@@ -75,7 +75,7 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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\/]+$/', |
@@ -48,24 +48,24 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 | } |
@@ -43,29 +43,29 @@ |
||
| 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 | } |