@@ -23,16 +23,16 @@ discard block |
||
| 23 | 23 | |
| 24 | 24 | |
| 25 | 25 | $this->user = User::find($file['security_user_id']); |
| 26 | - $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
| 26 | + $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
| 27 | 27 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
| 28 | 28 | $this->from_name = 'SIS Bulk Uploader'; |
| 29 | 29 | $this->with = [ |
| 30 | 30 | 'name' => $this->user->first_name, |
| 31 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
| 31 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
| 32 | 32 | ]; |
| 33 | 33 | $this->viewData = [ |
| 34 | 34 | 'name'=>$this->user->first_name, "body" => "The Template you used for upload having some issues, please reconfirm and re-upload with correct template", |
| 35 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename'] |
|
| 35 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename'] |
|
| 36 | 36 | ]; |
| 37 | 37 | } |
| 38 | 38 | |
@@ -44,7 +44,7 @@ discard block |
||
| 44 | 44 | public function build() |
| 45 | 45 | { |
| 46 | 46 | return $this->view('emails.mail') |
| 47 | - ->from($this->from_address,$this->from_name) |
|
| 47 | + ->from($this->from_address, $this->from_name) |
|
| 48 | 48 | ->to($this->user->email) |
| 49 | 49 | ->subject($this->subject) |
| 50 | 50 | ->with($this->with); |
@@ -25,16 +25,16 @@ discard block |
||
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | $this->user = User::find($file['security_user_id']); |
| 28 | - $this->subject = 'SIS Bulk Upload: ' .$file['subject'].' Empty ' . $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s'); |
|
| 28 | + $this->subject = 'SIS Bulk Upload: '.$file['subject'].' Empty '.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s'); |
|
| 29 | 29 | $this->from_address = env('MAIL_FROM_ADDRESS'); |
| 30 | 30 | $this->from_name = 'SIS Bulk Uploader'; |
| 31 | 31 | $this->with = [ |
| 32 | 32 | 'name' => $this->user->first_name, |
| 33 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
| 33 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
| 34 | 34 | ]; |
| 35 | 35 | $this->viewData = [ |
| 36 | - 'name'=>$this->user->first_name, "body" => "No data Found in ". $file['filename']. ' Please re-upload the file with data', |
|
| 37 | - 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
| 36 | + 'name'=>$this->user->first_name, "body" => "No data Found in ".$file['filename'].' Please re-upload the file with data', |
|
| 37 | + 'link' => \App::environment('local') || \App::environment('stage') ? env('APP_URL') : env('APP_URL').'/bulk-upload/' |
|
| 38 | 38 | ]; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | public function build() |
| 47 | 47 | { |
| 48 | 48 | return $this->view('emails.mail') |
| 49 | - ->from($this->from_address,$this->from_name) |
|
| 49 | + ->from($this->from_address, $this->from_name) |
|
| 50 | 50 | ->to($this->user->email) |
| 51 | 51 | ->subject($this->subject) |
| 52 | 52 | ->with($this->with); |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | DbSchema::dropIfExists('students_count_view_table'); |
| 37 | 37 | DB::statement('CREATE TABLE students_count_view_table AS (select * from students_count_view)'); |
| 38 | 38 | $output->writeln('creat : students_count_view'); |
| 39 | - } catch (\Throwable $th) { |
|
| 39 | + }catch (\Throwable $th) { |
|
| 40 | 40 | $output->writeln($th->getMessage()); |
| 41 | 41 | } |
| 42 | 42 | } |
@@ -103,17 +103,17 @@ discard block |
||
| 103 | 103 | ->leftJoin("education_grades as eg", "eg.id", "i.id") |
| 104 | 104 | ->leftJoin("institution_class_students as ics", "ist.student_id", "ics.student_id") |
| 105 | 105 | ->leftJoin("institution_classes as ic", "ic.id", "ics.institution_class_id") |
| 106 | - ->leftJoin("student_guardians as sgf", function ($join) { |
|
| 106 | + ->leftJoin("student_guardians as sgf", function($join) { |
|
| 107 | 107 | $join->on("sgf.student_id", "stu.id"); |
| 108 | 108 | $join->where("sgf.guardian_relation_id", 1); |
| 109 | 109 | }) |
| 110 | 110 | ->leftJoin("security_users as sufu", "sgf.guardian_id", "sufu.id") |
| 111 | - ->leftJoin("student_guardians as sgm", function ($join) { |
|
| 111 | + ->leftJoin("student_guardians as sgm", function($join) { |
|
| 112 | 112 | $join->on("sgm.student_id", "stu.id"); |
| 113 | 113 | $join->where("sgm.guardian_relation_id", 2); |
| 114 | 114 | }) |
| 115 | 115 | ->leftJoin("security_users as sumu", "sgm.guardian_id", "sumu.id") |
| 116 | - ->leftJoin("student_guardians as sg", function ($join) { |
|
| 116 | + ->leftJoin("student_guardians as sg", function($join) { |
|
| 117 | 117 | $join->on("sg.student_id", "stu.id"); |
| 118 | 118 | $join->where("sg.guardian_relation_id", 3); |
| 119 | 119 | }) |
@@ -132,27 +132,27 @@ discard block |
||
| 132 | 132 | ->leftJoin("academic_periods as acps", "acps.id", "ist.academic_period_id") |
| 133 | 133 | ->leftJoin("institution_subject_students as iss", "stu.id", "iss.student_id") |
| 134 | 134 | ->leftJoin("education_subjects as edus", "edus.id", "iss.education_subject_id") |
| 135 | - ->leftJoin("nationalities as natif", function ($join) { |
|
| 135 | + ->leftJoin("nationalities as natif", function($join) { |
|
| 136 | 136 | $join->on("sufu.nationality_id", "natif.id"); |
| 137 | 137 | $join->where("sgf.guardian_relation_id", 1); |
| 138 | 138 | }) |
| 139 | - ->leftJoin("nationalities as natim", function ($join) { |
|
| 139 | + ->leftJoin("nationalities as natim", function($join) { |
|
| 140 | 140 | $join->on("sumu.nationality_id", "natim.id"); |
| 141 | 141 | $join->where("sgm.guardian_relation_id", 2); |
| 142 | 142 | }) |
| 143 | - ->leftJoin("nationalities as natig", function ($join) { |
|
| 143 | + ->leftJoin("nationalities as natig", function($join) { |
|
| 144 | 144 | $join->on("sugu.nationality_id", "natig.id"); |
| 145 | 145 | $join->where("sg.guardian_relation_id", 3); |
| 146 | 146 | }) |
| 147 | - ->leftJoin("identity_types as idtf", function ($join) { |
|
| 147 | + ->leftJoin("identity_types as idtf", function($join) { |
|
| 148 | 148 | $join->on("sufu.nationality_id", "idtf.id"); |
| 149 | 149 | $join->where("sgf.guardian_relation_id", 1); |
| 150 | 150 | }) |
| 151 | - ->leftJoin("identity_types as idtm", function ($join) { |
|
| 151 | + ->leftJoin("identity_types as idtm", function($join) { |
|
| 152 | 152 | $join->on("sumu.nationality_id", "idtm.id"); |
| 153 | 153 | $join->where("sgm.guardian_relation_id", 2); |
| 154 | 154 | }) |
| 155 | - ->leftJoin("identity_types as idtg", function ($join) { |
|
| 155 | + ->leftJoin("identity_types as idtg", function($join) { |
|
| 156 | 156 | $join->on("sugu.nationality_id", "idtg.id"); |
| 157 | 157 | $join->where("sg.guardian_relation_id", 3); |
| 158 | 158 | }) |
@@ -166,7 +166,7 @@ discard block |
||
| 166 | 166 | DB::statement('CREATE INDEX user_institution ON students_list_view_table (institution_id);'); |
| 167 | 167 | $output->writeln('created : students_list_view_table'); |
| 168 | 168 | $output->writeln('created : students_list_view'); |
| 169 | - } catch (\Throwable $th) { |
|
| 169 | + }catch (\Throwable $th) { |
|
| 170 | 170 | $output->writeln($th->getMessage()); |
| 171 | 171 | } |
| 172 | 172 | } |
@@ -226,7 +226,7 @@ discard block |
||
| 226 | 226 | Schema::createOrReplaceView('upload_list_view', $query); |
| 227 | 227 | Schema::disableForeignKeyConstraints('upload_list_view'); |
| 228 | 228 | $output->writeln('created : upload_list_view'); |
| 229 | - } catch (\Throwable $th) { |
|
| 229 | + }catch (\Throwable $th) { |
|
| 230 | 230 | $output->writeln($th->getMessage()); |
| 231 | 231 | } |
| 232 | 232 | } |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | Schema::dropIfExists("upload_count_view"); |
| 262 | 262 | Schema::createOrReplaceView("upload_count_view", $query); |
| 263 | 263 | $output->writeln('created : upload_count_view'); |
| 264 | - } catch (\Throwable $th) { |
|
| 264 | + }catch (\Throwable $th) { |
|
| 265 | 265 | $output->writeln($th->getMessage()); |
| 266 | 266 | } |
| 267 | 267 | } |
@@ -288,7 +288,7 @@ discard block |
||
| 288 | 288 | Schema::dropIfExists("institution_info_view"); |
| 289 | 289 | Schema::createOrReplaceView("institution_info_view", $query); |
| 290 | 290 | $output->writeln('created : institution_info_view'); |
| 291 | - } catch (\Throwable $th) { |
|
| 291 | + }catch (\Throwable $th) { |
|
| 292 | 292 | $output->writeln($th->getMessage()); |
| 293 | 293 | } |
| 294 | 294 | } |
@@ -326,7 +326,7 @@ discard block |
||
| 326 | 326 | Schema::dropIfExists("students_count_by_grade_view"); |
| 327 | 327 | Schema::createOrReplaceView('students_count_by_grade_view', $query); |
| 328 | 328 | $output->writeln('created : students_count_by_grade_view'); |
| 329 | - } catch (\Throwable $th) { |
|
| 329 | + }catch (\Throwable $th) { |
|
| 330 | 330 | $output->writeln($th->getMessage()); |
| 331 | 331 | } |
| 332 | 332 | } |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | "ist.created" |
| 352 | 352 | ) |
| 353 | 353 | ->join("institutions as i", "i.id", "ist.institution_id") |
| 354 | - ->join('user_body_masses as ubm', function ($join) { |
|
| 354 | + ->join('user_body_masses as ubm', function($join) { |
|
| 355 | 355 | $join->on('ubm.security_user_id', 'ist.student_id'); |
| 356 | 356 | $join->where('ubm.academic_period_id', 'ist.academic_period_id'); |
| 357 | 357 | }) |
@@ -359,7 +359,7 @@ discard block |
||
| 359 | 359 | Schema::dropIfExists("students_count_by_bmi_view"); |
| 360 | 360 | Schema::createOrReplaceView("students_count_by_bmi_view", $query); |
| 361 | 361 | $output->writeln('created : students_count_by_bmi_view'); |
| 362 | - } catch (\Throwable $th) { |
|
| 362 | + }catch (\Throwable $th) { |
|
| 363 | 363 | $output->writeln($th->getMessage()); |
| 364 | 364 | } |
| 365 | 365 | } |
@@ -392,7 +392,7 @@ discard block |
||
| 392 | 392 | Schema::dropIfExists("student_count_by_class_view"); |
| 393 | 393 | Schema::createOrReplaceView('student_count_by_class_view', $query); |
| 394 | 394 | $output->writeln('created : student_count_by_class_view'); |
| 395 | - } catch (\Throwable $th) { |
|
| 395 | + }catch (\Throwable $th) { |
|
| 396 | 396 | $output->writeln($th->getMessage()); |
| 397 | 397 | } |
| 398 | 398 | } |
@@ -20,7 +20,7 @@ |
||
| 20 | 20 | */ |
| 21 | 21 | public function __construct($user) |
| 22 | 22 | { |
| 23 | - $this->user = $user; |
|
| 23 | + $this->user = $user; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
@@ -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 | } |
@@ -44,21 +44,21 @@ |
||
| 44 | 44 | $this->start_time = microtime(TRUE); |
| 45 | 45 | $count = DB::table('examination_students')->select('nsid')->distinct()->count(); |
| 46 | 46 | $this->examinationController = new ExaminationStudentsController($this->argument('year'), $this->argument('grade')); |
| 47 | - $studentsIdsWithDuplication = DB::table('examination_students as es') |
|
| 48 | - ->select(DB::raw('count(*) as total'),'es.*') |
|
| 47 | + $studentsIdsWithDuplication = DB::table('examination_students as es') |
|
| 48 | + ->select(DB::raw('count(*) as total'), 'es.*') |
|
| 49 | 49 | ->whereNotNull('es.nsid') |
| 50 | - ->having('total','>',1) |
|
| 50 | + ->having('total', '>', 1) |
|
| 51 | 51 | ->groupBy('es.nsid') |
| 52 | 52 | ->orderBy('es.nsid') |
| 53 | - ->chunk($this->argument('limit'),function($Students){ |
|
| 53 | + ->chunk($this->argument('limit'), function($Students) { |
|
| 54 | 54 | foreach ($Students as $Student) { |
| 55 | - $count = Examination_student::where('nsid',$Student->nsid)->count(); |
|
| 56 | - if($count> 1){ |
|
| 57 | - Examination_student::where('nsid',$Student->nsid)->update(['nsid'=>'']); |
|
| 55 | + $count = Examination_student::where('nsid', $Student->nsid)->count(); |
|
| 56 | + if ($count > 1) { |
|
| 57 | + Examination_student::where('nsid', $Student->nsid)->update(['nsid'=>'']); |
|
| 58 | 58 | $students = (array) json_decode(json_encode($Students), true); |
| 59 | 59 | array_walk($students, array($this->examinationController, 'clone')); |
| 60 | 60 | } |
| 61 | - $this->output->writeln($Student->nsid .'same ID' . $count . ' records removed'); |
|
| 61 | + $this->output->writeln($Student->nsid.'same ID'.$count.' records removed'); |
|
| 62 | 62 | } |
| 63 | 63 | }); |
| 64 | 64 | } |
@@ -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([ |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
| 37 | 37 | $this->students = new Security_user(); |
| 38 | 38 | $this->uniqueUId = new UniqueUid(); |
| 39 | - $this->max = 0; |
|
| 39 | + $this->max = 0; |
|
| 40 | 40 | $this->child = 0; |
| 41 | 41 | parent::__construct(); |
| 42 | 42 | } |
@@ -60,19 +60,19 @@ discard block |
||
| 60 | 60 | public function processParallel(array $arr, $procs = 4) |
| 61 | 61 | { |
| 62 | 62 | // Break array up into $procs chunks. |
| 63 | - $chunks = array_chunk($arr, ceil((count($arr) / $procs))); |
|
| 63 | + $chunks = array_chunk($arr, ceil((count($arr)/$procs))); |
|
| 64 | 64 | $pid = -1; |
| 65 | 65 | $children = array(); |
| 66 | 66 | foreach ($chunks as $items) { |
| 67 | 67 | $pid = pcntl_fork(); |
| 68 | 68 | if ($pid === -1) { |
| 69 | 69 | die('could not fork'); |
| 70 | - } else if ($pid === 0) { |
|
| 71 | - $this->output->writeln('started processes: ' . count($children)); |
|
| 70 | + }else if ($pid === 0) { |
|
| 71 | + $this->output->writeln('started processes: '.count($children)); |
|
| 72 | 72 | // We are the child process. Pass a chunk of items to process. |
| 73 | 73 | array_walk($items, array($this, 'process')); |
| 74 | 74 | exit(0); |
| 75 | - } else { |
|
| 75 | + }else { |
|
| 76 | 76 | // We are the parent. |
| 77 | 77 | $children[] = $pid; |
| 78 | 78 | } |
@@ -104,17 +104,17 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | $newId = $this->uniqueUId::getUniqueAlphanumeric(); |
| 106 | 106 | $student['openemis_no'] = $newId; |
| 107 | - $student = $this->uniqueUserId->updateOrInsertRecord($student); |
|
| 107 | + $student = $this->uniqueUserId->updateOrInsertRecord($student); |
|
| 108 | 108 | // $this->output->writeln('New NSID generated for :' . $student['id']); |
| 109 | 109 | Security_user::query()->where('id', $student['id']) |
| 110 | 110 | ->update(['openemis_no' => $newId, 'username' => str_replace('-', '', $newId)]); |
| 111 | - } catch (\Exception $e) { |
|
| 111 | + }catch (\Exception $e) { |
|
| 112 | 112 | } |
| 113 | - } else { |
|
| 113 | + }else { |
|
| 114 | 114 | try { |
| 115 | 115 | // $this->output->writeln('Updating student:' . $student['id']); |
| 116 | 116 | $this->uniqueUserId->updateOrInsertRecord($student); |
| 117 | - } catch (\Exception $e) { |
|
| 117 | + }catch (\Exception $e) { |
|
| 118 | 118 | dd($e); |
| 119 | 119 | } |
| 120 | 120 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | use Illuminate\Database\Eloquent\Model; |
| 8 | 8 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 9 | 9 | |
| 10 | -class Institution_subject_student extends Model { |
|
| 10 | +class Institution_subject_student extends Model { |
|
| 11 | 11 | |
| 12 | 12 | |
| 13 | 13 | use SoftDeletes; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | public static function boot() |
| 57 | 57 | { |
| 58 | 58 | parent::boot(); |
| 59 | - self::creating(function ($model) { |
|
| 59 | + self::creating(function($model) { |
|
| 60 | 60 | $model->id = (string) Uuid::generate(4); |
| 61 | 61 | }); |
| 62 | 62 | |
@@ -68,31 +68,31 @@ discard block |
||
| 68 | 68 | * |
| 69 | 69 | * |
| 70 | 70 | */ |
| 71 | - public static function isDuplicated($inputs){ |
|
| 71 | + public static function isDuplicated($inputs) { |
|
| 72 | 72 | |
| 73 | - $exists = self::where('student_id','=',$inputs['student_id']) |
|
| 74 | - ->where('institution_subject_id','=',$inputs['institution_subject_id']) |
|
| 75 | - ->where('education_subject_id','=',$inputs['education_subject_id'])->count(); |
|
| 73 | + $exists = self::where('student_id', '=', $inputs['student_id']) |
|
| 74 | + ->where('institution_subject_id', '=', $inputs['institution_subject_id']) |
|
| 75 | + ->where('education_subject_id', '=', $inputs['education_subject_id'])->count(); |
|
| 76 | 76 | |
| 77 | 77 | |
| 78 | 78 | return $exists ? true :false; |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | |
| 82 | - public function student(){ |
|
| 83 | - return $this->belongsTo('App\Models\Security_user','student_id'); |
|
| 82 | + public function student() { |
|
| 83 | + return $this->belongsTo('App\Models\Security_user', 'student_id'); |
|
| 84 | 84 | } |
| 85 | 85 | |
| 86 | - public static function getStudentsCount($institution_subject_id){ |
|
| 86 | + public static function getStudentsCount($institution_subject_id) { |
|
| 87 | 87 | $total_male_students = self::with(['student' => function($query) { |
| 88 | 88 | $query->where('student.gender_id', '=', 1); |
| 89 | - }])->whereHas('student', function ($query) { |
|
| 89 | + }])->whereHas('student', function($query) { |
|
| 90 | 90 | $query->where('gender_id', '=', 1); |
| 91 | 91 | })->where('institution_subject_id', '=', $institution_subject_id)->count(); |
| 92 | 92 | |
| 93 | 93 | $total_female_students = self::with(['student' => function($query) { |
| 94 | 94 | $query->where('student.gender_id', '=', 2); |
| 95 | - }])->whereHas('student', function ($query) { |
|
| 95 | + }])->whereHas('student', function($query) { |
|
| 96 | 96 | $query->where('gender_id', '=', 2); |
| 97 | 97 | })->where('institution_subject_id', '=', $institution_subject_id)->count(); |
| 98 | 98 | |