@@ -41,10 +41,10 @@ |
||
| 41 | 41 | { |
| 42 | 42 | $year = $this->argument('year'); |
| 43 | 43 | $institutions = $this->instituion_grade->getInstitutionGradeList($year); |
| 44 | - array_walk($institutions,array($this,'callPromotion'),$year); |
|
| 44 | + array_walk($institutions, array($this, 'callPromotion'), $year); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - protected function callPromotion($institution,$count,$year){ |
|
| 48 | - $this->call('promote:students',['year' => $year,'institution' => $institution['code']]); |
|
| 47 | + protected function callPromotion($institution, $count, $year) { |
|
| 48 | + $this->call('promote:students', ['year' => $year, 'institution' => $institution['code']]); |
|
| 49 | 49 | } |
| 50 | 50 | } |
@@ -61,7 +61,7 @@ |
||
| 61 | 61 | { |
| 62 | 62 | $year = $this->argument('year'); |
| 63 | 63 | $institution = $this->argument('institution'); |
| 64 | - $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($year,$institution); |
|
| 65 | - (new BulkPromotion())->callback($institutionGrade,$year); |
|
| 64 | + $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($year, $institution); |
|
| 65 | + (new BulkPromotion())->callback($institutionGrade, $year); |
|
| 66 | 66 | } |
| 67 | 67 | } |
@@ -27,11 +27,11 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | protected $description = 'Update the students count male/female'; |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * Create a new command instance. |
|
| 32 | - * |
|
| 33 | - * @return void |
|
| 34 | - */ |
|
| 30 | + /** |
|
| 31 | + * Create a new command instance. |
|
| 32 | + * |
|
| 33 | + * @return void |
|
| 34 | + */ |
|
| 35 | 35 | public function __construct() |
| 36 | 36 | { |
| 37 | 37 | parent::__construct(); |
@@ -48,36 +48,36 @@ discard block |
||
| 48 | 48 | public function handle() |
| 49 | 49 | { |
| 50 | 50 | $this->output->writeln('#########################################'); |
| 51 | - if($this->argument('entity') == 'class'){ |
|
| 51 | + if ($this->argument('entity') == 'class') { |
|
| 52 | 52 | $classes = Institution_class::get()->toArray(); |
| 53 | - $func = array($this,'updateCount'); |
|
| 54 | - array_walk($subjects,array($this,'process')); |
|
| 55 | - $this->output->writeln('start updating:'. count($classes)); |
|
| 56 | - }elseif($this->argument('entity') == 'subject'){ |
|
| 53 | + $func = array($this, 'updateCount'); |
|
| 54 | + array_walk($subjects, array($this, 'process')); |
|
| 55 | + $this->output->writeln('start updating:'.count($classes)); |
|
| 56 | + }elseif ($this->argument('entity') == 'subject') { |
|
| 57 | 57 | $subjects = Institution_subject::get()->toArray(); |
| 58 | - $subjects = array_chunk($subjects,10000); |
|
| 59 | - $this->output->writeln('start updating:'. count($subjects)); |
|
| 60 | - array_walk($subjects,array($this,'process')); |
|
| 58 | + $subjects = array_chunk($subjects, 10000); |
|
| 59 | + $this->output->writeln('start updating:'.count($subjects)); |
|
| 60 | + array_walk($subjects, array($this, 'process')); |
|
| 61 | 61 | $this->output->writeln('#########################################'); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | - public function process($data){ |
|
| 67 | - if($this->argument('entity') == 'class'){ |
|
| 68 | - $func = array($this,'updateCount'); |
|
| 69 | - processParallel($func,$data,$this->argument('max')); |
|
| 70 | - $this->output->writeln('start updating calss count:'. count($data)); |
|
| 71 | - }elseif($this->argument('entity') == 'subject'){ |
|
| 72 | - $this->output->writeln('start updating subject count:'. count($data)); |
|
| 73 | - $func_subject = array($this,'updateSubjectCount'); |
|
| 74 | - processParallel($func_subject,$data,$this->argument('max')); |
|
| 66 | + public function process($data) { |
|
| 67 | + if ($this->argument('entity') == 'class') { |
|
| 68 | + $func = array($this, 'updateCount'); |
|
| 69 | + processParallel($func, $data, $this->argument('max')); |
|
| 70 | + $this->output->writeln('start updating calss count:'.count($data)); |
|
| 71 | + }elseif ($this->argument('entity') == 'subject') { |
|
| 72 | + $this->output->writeln('start updating subject count:'.count($data)); |
|
| 73 | + $func_subject = array($this, 'updateSubjectCount'); |
|
| 74 | + processParallel($func_subject, $data, $this->argument('max')); |
|
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - public function updateCount($class){ |
|
| 79 | - $this->output->writeln('updating class:'. $class['id']); |
|
| 80 | - $totalStudents = Institution_class_student::getStudentsCount($class['id']); |
|
| 78 | + public function updateCount($class) { |
|
| 79 | + $this->output->writeln('updating class:'.$class['id']); |
|
| 80 | + $totalStudents = Institution_class_student::getStudentsCount($class['id']); |
|
| 81 | 81 | Institution_class::where('id', '=', $class['id']) |
| 82 | 82 | ->update([ |
| 83 | 83 | 'total_male_students' => $totalStudents['total_male_students'], |
@@ -85,8 +85,8 @@ discard block |
||
| 85 | 85 | ]); |
| 86 | 86 | } |
| 87 | 87 | |
| 88 | - public function updateSubjectCount($subject){ |
|
| 89 | - $this->output->writeln('updating subject:'. $subject['id']); |
|
| 88 | + public function updateSubjectCount($subject) { |
|
| 89 | + $this->output->writeln('updating subject:'.$subject['id']); |
|
| 90 | 90 | $totalStudents = Institution_subject_student::getStudentsCount($subject['id']); |
| 91 | 91 | Institution_subject::where(['id' => $subject['id']]) |
| 92 | 92 | ->update([ |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | $func = array($this,'updateCount'); |
| 54 | 54 | array_walk($subjects,array($this,'process')); |
| 55 | 55 | $this->output->writeln('start updating:'. count($classes)); |
| 56 | - }elseif($this->argument('entity') == 'subject'){ |
|
| 56 | + } elseif($this->argument('entity') == 'subject'){ |
|
| 57 | 57 | $subjects = Institution_subject::get()->toArray(); |
| 58 | 58 | $subjects = array_chunk($subjects,10000); |
| 59 | 59 | $this->output->writeln('start updating:'. count($subjects)); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | $func = array($this,'updateCount'); |
| 69 | 69 | processParallel($func,$data,$this->argument('max')); |
| 70 | 70 | $this->output->writeln('start updating calss count:'. count($data)); |
| 71 | - }elseif($this->argument('entity') == 'subject'){ |
|
| 71 | + } elseif($this->argument('entity') == 'subject'){ |
|
| 72 | 72 | $this->output->writeln('start updating subject count:'. count($data)); |
| 73 | 73 | $func_subject = array($this,'updateSubjectCount'); |
| 74 | 74 | processParallel($func_subject,$data,$this->argument('max')); |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | */ |
| 40 | 40 | public function handle() |
| 41 | 41 | { |
| 42 | - $views = new DashboardViewsController(); |
|
| 43 | - $views->callback(); |
|
| 42 | + $views = new DashboardViewsController(); |
|
| 43 | + $views->callback(); |
|
| 44 | 44 | } |
| 45 | 45 | } |
@@ -52,9 +52,9 @@ |
||
| 52 | 52 | 'academic_period' => $academicPeriod |
| 53 | 53 | ]; |
| 54 | 54 | |
| 55 | - if($year <= 2019){ |
|
| 55 | + if ($year <= 2019) { |
|
| 56 | 56 | die('Academic Year 2019 or earlier can`t be deleted'); |
| 57 | - }else{ |
|
| 57 | + }else { |
|
| 58 | 58 | $this->clone->cleanConfig($params); |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -54,7 +54,7 @@ |
||
| 54 | 54 | |
| 55 | 55 | if($year <= 2019){ |
| 56 | 56 | die('Academic Year 2019 or earlier can`t be deleted'); |
| 57 | - }else{ |
|
| 57 | + } else{ |
|
| 58 | 58 | $this->clone->cleanConfig($params); |
| 59 | 59 | } |
| 60 | 60 | } |
@@ -152,12 +152,12 @@ |
||
| 152 | 152 | ->get()->toArray(); |
| 153 | 153 | } |
| 154 | 154 | |
| 155 | - /** |
|
| 156 | - * First level search for students |
|
| 157 | - * |
|
| 158 | - * @param array $student |
|
| 159 | - * @return array |
|
| 160 | - */ |
|
| 155 | + /** |
|
| 156 | + * First level search for students |
|
| 157 | + * |
|
| 158 | + * @param array $student |
|
| 159 | + * @return array |
|
| 160 | + */ |
|
| 161 | 161 | public function getStudentCount($student) |
| 162 | 162 | { |
| 163 | 163 | return $this |
@@ -149,9 +149,9 @@ discard block |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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 |
||
| 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(); |
@@ -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') |
@@ -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 | } |
@@ -306,7 +306,7 @@ |
||
| 306 | 306 | // if the same gender same DOE has more than one |
| 307 | 307 | if(($doe_students > 1) || ($count > 1)){ |
| 308 | 308 | $studentData = $this->searchSimilarName($student, $sis_users,false); |
| 309 | - }else{ |
|
| 309 | + } else{ |
|
| 310 | 310 | $studentData = $this->searchSimilarName($student, $sis_users); |
| 311 | 311 | } |
| 312 | 312 | return $studentData; |
@@ -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 | } |