@@ -78,41 +78,41 @@ |
||
78 | 78 | $this->count += 1; |
79 | 79 | $this->student = $student ; |
80 | 80 | try{ |
81 | - Institution_student::create([ |
|
82 | - 'student_status_id' => 1, |
|
83 | - 'student_id' => $student['student_id'], |
|
84 | - 'education_grade_id' => $student['education_grade_id'], |
|
85 | - 'academic_period_id' => $student['academic_period_id'], |
|
86 | - 'start_date' => $student['start_date'], |
|
87 | - 'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'), |
|
88 | - 'end_date' => $student['end_date'], |
|
89 | - 'end_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'), |
|
90 | - 'institution_id' => $student['institution_id'], |
|
91 | - 'admission_id' => $student['admission_id'], |
|
92 | - 'created_user_id' => $student['created_user_id'], |
|
93 | - ]); |
|
94 | - |
|
95 | - if(!is_null($student['institution_class_id'])){ |
|
96 | - Institution_class_student::create([ |
|
97 | - 'student_id' => $student['student_id'], |
|
98 | - 'institution_class_id' => $student['institution_class_id'], |
|
99 | - 'education_grade_id' => $student['education_grade_id'], |
|
100 | - 'academic_period_id' => $student['academic_period_id'], |
|
101 | - 'institution_id' =>$student['institution_id'], |
|
102 | - 'student_status_id' => 1, |
|
103 | - 'created_user_id' => $student['created_user_id'], |
|
104 | - ]); |
|
105 | - } |
|
81 | + Institution_student::create([ |
|
82 | + 'student_status_id' => 1, |
|
83 | + 'student_id' => $student['student_id'], |
|
84 | + 'education_grade_id' => $student['education_grade_id'], |
|
85 | + 'academic_period_id' => $student['academic_period_id'], |
|
86 | + 'start_date' => $student['start_date'], |
|
87 | + 'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'), |
|
88 | + 'end_date' => $student['end_date'], |
|
89 | + 'end_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'), |
|
90 | + 'institution_id' => $student['institution_id'], |
|
91 | + 'admission_id' => $student['admission_id'], |
|
92 | + 'created_user_id' => $student['created_user_id'], |
|
93 | + ]); |
|
94 | + |
|
95 | + if(!is_null($student['institution_class_id'])){ |
|
96 | + Institution_class_student::create([ |
|
97 | + 'student_id' => $student['student_id'], |
|
98 | + 'institution_class_id' => $student['institution_class_id'], |
|
99 | + 'education_grade_id' => $student['education_grade_id'], |
|
100 | + 'academic_period_id' => $student['academic_period_id'], |
|
101 | + 'institution_id' =>$student['institution_id'], |
|
102 | + 'student_status_id' => 1, |
|
103 | + 'created_user_id' => $student['created_user_id'], |
|
104 | + ]); |
|
105 | + } |
|
106 | 106 | $output->writeln(' |
107 | 107 | #################################################### |
108 | 108 | Total number of students updated : '.$this->count.' |
109 | 109 | # # |
110 | 110 | ####################################################' ); |
111 | 111 | // $output->writeln(); |
112 | - }catch (\Exception $e){ |
|
112 | + }catch (\Exception $e){ |
|
113 | 113 | // echo $e->getMessage(); |
114 | - $output->writeln( $e->getMessage()); |
|
115 | - } |
|
114 | + $output->writeln( $e->getMessage()); |
|
115 | + } |
|
116 | 116 | } |
117 | 117 | } |
118 | 118 |
@@ -51,48 +51,48 @@ discard block |
||
51 | 51 | 'id' => $this->argument('institution') |
52 | 52 | ])->first(); |
53 | 53 | |
54 | - if(!is_null($institution)){ |
|
54 | + if (!is_null($institution)) { |
|
55 | 55 | try { |
56 | - $this->info('adding missing students to the admission ' . $institution->name); |
|
56 | + $this->info('adding missing students to the admission '.$institution->name); |
|
57 | 57 | $allApprovedStudents = Institution_student_admission::where([ |
58 | 58 | 'status_id' => 124, |
59 | 59 | 'institution_id' => $institution->id |
60 | 60 | ])->get()->toArray(); |
61 | 61 | $allApprovedStudents = array_chunk($allApprovedStudents, 50); |
62 | 62 | array_walk($allApprovedStudents, array($this, 'addStudents')); |
63 | - } catch (\Exception $e) { |
|
63 | + }catch (\Exception $e) { |
|
64 | 64 | Log::error($e); |
65 | 65 | } |
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
69 | - protected function addStudents($students){ |
|
70 | - array_walk($students,array($this,'addStudent')); |
|
69 | + protected function addStudents($students) { |
|
70 | + array_walk($students, array($this, 'addStudent')); |
|
71 | 71 | } |
72 | 72 | |
73 | - protected function addStudent($student){ |
|
73 | + protected function addStudent($student) { |
|
74 | 74 | // dd(Institution_class_student::isDuplicated($student)); |
75 | 75 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
76 | 76 | sleep(1); |
77 | - if(!(Institution_class_student::isDuplicated($student) > 0)){ |
|
77 | + if (!(Institution_class_student::isDuplicated($student) > 0)) { |
|
78 | 78 | $this->count += 1; |
79 | - $this->student = $student ; |
|
80 | - try{ |
|
79 | + $this->student = $student; |
|
80 | + try { |
|
81 | 81 | Institution_student::create([ |
82 | 82 | 'student_status_id' => 1, |
83 | 83 | 'student_id' => $student['student_id'], |
84 | 84 | 'education_grade_id' => $student['education_grade_id'], |
85 | 85 | 'academic_period_id' => $student['academic_period_id'], |
86 | 86 | 'start_date' => $student['start_date'], |
87 | - 'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year , // $student['start_date']->format('Y'), |
|
87 | + 'start_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['start_date'])->year, // $student['start_date']->format('Y'), |
|
88 | 88 | 'end_date' => $student['end_date'], |
89 | - 'end_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year , //$student['end_date']->format('Y'), |
|
89 | + 'end_year' => \Carbon\Carbon::createFromFormat('Y-m-d H:i:s', $student['end_date'])->year, //$student['end_date']->format('Y'), |
|
90 | 90 | 'institution_id' => $student['institution_id'], |
91 | 91 | 'admission_id' => $student['admission_id'], |
92 | 92 | 'created_user_id' => $student['created_user_id'], |
93 | 93 | ]); |
94 | 94 | |
95 | - if(!is_null($student['institution_class_id'])){ |
|
95 | + if (!is_null($student['institution_class_id'])) { |
|
96 | 96 | Institution_class_student::create([ |
97 | 97 | 'student_id' => $student['student_id'], |
98 | 98 | 'institution_class_id' => $student['institution_class_id'], |
@@ -109,23 +109,23 @@ discard block |
||
109 | 109 | # # |
110 | 110 | ####################################################' ); |
111 | 111 | // $output->writeln(); |
112 | - }catch (\Exception $e){ |
|
112 | + }catch (\Exception $e) { |
|
113 | 113 | // echo $e->getMessage(); |
114 | - $output->writeln( $e->getMessage()); |
|
114 | + $output->writeln($e->getMessage()); |
|
115 | 115 | } |
116 | 116 | } |
117 | 117 | } |
118 | 118 | |
119 | 119 | |
120 | - protected function setSubjects($student){ |
|
120 | + protected function setSubjects($student) { |
|
121 | 121 | $allSubjects = Institution_class_subject::getMandetorySubjects($student['institution_class_id']); |
122 | 122 | |
123 | 123 | if (!empty($allSubjects)) { |
124 | 124 | $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id'); |
125 | 125 | $this->student = $student; |
126 | - $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects); |
|
126 | + $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects); |
|
127 | 127 | $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id'); |
128 | - array_walk($allSubjects,array($this,'insertSubject')); |
|
128 | + array_walk($allSubjects, array($this, 'insertSubject')); |
|
129 | 129 | } |
130 | 130 | |
131 | 131 | unset($allSubjects); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | } |
134 | 134 | |
135 | 135 | |
136 | - protected function setStudentSubjects($subject){ |
|
136 | + protected function setStudentSubjects($subject) { |
|
137 | 137 | return [ |
138 | 138 | 'id' => (string) Uuid::generate(4), |
139 | 139 | 'student_id' => $this->student->student_id, |
@@ -149,8 +149,8 @@ discard block |
||
149 | 149 | ]; |
150 | 150 | } |
151 | 151 | |
152 | - protected function insertSubject($subject){ |
|
153 | - if(!Institution_subject_student::isDuplicated($subject)){ |
|
152 | + protected function insertSubject($subject) { |
|
153 | + if (!Institution_subject_student::isDuplicated($subject)) { |
|
154 | 154 | Institution_subject_student::updateOrInsert($subject); |
155 | 155 | } |
156 | 156 | } |
@@ -109,7 +109,7 @@ |
||
109 | 109 | # # |
110 | 110 | ####################################################' ); |
111 | 111 | // $output->writeln(); |
112 | - }catch (\Exception $e){ |
|
112 | + } catch (\Exception $e){ |
|
113 | 113 | // echo $e->getMessage(); |
114 | 114 | $output->writeln( $e->getMessage()); |
115 | 115 | } |
@@ -39,17 +39,17 @@ |
||
39 | 39 | */ |
40 | 40 | public function handle() |
41 | 41 | { |
42 | - ini_set('memory_limit','2048'); |
|
42 | + ini_set('memory_limit', '2048'); |
|
43 | 43 | $institutions = $this->instituions->all()->chunk(50)->toArray(); |
44 | - array_walk($institutions,array($this,'addInstitutionStudents')); |
|
44 | + array_walk($institutions, array($this, 'addInstitutionStudents')); |
|
45 | 45 | } |
46 | 46 | |
47 | - protected function addInstitutionStudents($chunk){ |
|
48 | - array_walk($chunk,array($this,'callFunction')); |
|
47 | + protected function addInstitutionStudents($chunk) { |
|
48 | + array_walk($chunk, array($this, 'callFunction')); |
|
49 | 49 | |
50 | 50 | } |
51 | 51 | |
52 | - protected function callFunction($institution){ |
|
53 | - $this->call('admission:students',['institution' => $institution['code']]); |
|
52 | + protected function callFunction($institution) { |
|
53 | + $this->call('admission:students', ['institution' => $institution['code']]); |
|
54 | 54 | } |
55 | 55 | } |
@@ -25,8 +25,8 @@ |
||
25 | 25 | */ |
26 | 26 | protected function schedule(Schedule $schedule) |
27 | 27 | { |
28 | - $schedule->command('import:students') |
|
29 | - ->cron('* * * * * '); |
|
28 | + $schedule->command('import:students') |
|
29 | + ->cron('* * * * * '); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | /** |
@@ -31,12 +31,12 @@ discard block |
||
31 | 31 | public function __construct($class) { |
32 | 32 | |
33 | 33 | $this->class = $class; |
34 | - $this->_file_name = time() . '_' . Auth::user()->id . '_' . 'student_upload.xls'; |
|
34 | + $this->_file_name = time().'_'.Auth::user()->id.'_'.'student_upload.xls'; |
|
35 | 35 | } |
36 | 36 | |
37 | 37 | public function registerEvents(): array { |
38 | 38 | return [ |
39 | - BeforeSheet::class => function(BeforeSheet $event){ |
|
39 | + BeforeSheet::class => function(BeforeSheet $event) { |
|
40 | 40 | // dd($event->crea) |
41 | 41 | }, |
42 | 42 | BeforeWriting::class => function(BeforeWriting $event) { |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | $class = $this->class; |
64 | 64 | return Security_user::select('openemis_no', 'first_name', 'gender_id', 'date_of_birth', 'address', 'birthplace_area_id') |
65 | 65 | ->with(['class', 'special_needs']) |
66 | - ->whereHas('class', function ($query) use ($class) { |
|
66 | + ->whereHas('class', function($query) use ($class) { |
|
67 | 67 | $query->where('institution_class_id', '=', $class); |
68 | 68 | }) |
69 | 69 | ->get(); |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class User_body_mass extends Base_Model { |
|
7 | +class User_body_mass extends Base_Model { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * The database table used by the model. |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Institution_staff extends Model { |
|
7 | +class Institution_staff extends Model { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * The database table used by the model. |
@@ -42,12 +42,12 @@ discard block |
||
42 | 42 | protected $dates = ['start_date', 'end_date', 'modified', 'created']; |
43 | 43 | |
44 | 44 | |
45 | - public function staff_class(){ |
|
46 | - return $this->hasMany('App\Models\Institution_class','staff_id','staff_id'); |
|
45 | + public function staff_class() { |
|
46 | + return $this->hasMany('App\Models\Institution_class', 'staff_id', 'staff_id'); |
|
47 | 47 | } |
48 | 48 | |
49 | - public function institution(){ |
|
50 | - return $this->belongsTo('App\Models\Institution','institution_id'); |
|
49 | + public function institution() { |
|
50 | + return $this->belongsTo('App\Models\Institution', 'institution_id'); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Nationality extends Model { |
|
7 | +class Nationality extends Model { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * The database table used by the model. |
@@ -4,7 +4,7 @@ |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Workflow_transition extends Model { |
|
7 | +class Workflow_transition extends Model { |
|
8 | 8 | |
9 | 9 | public const CREATED_AT = 'created'; |
10 | 10 | public const UPDATED_AT = 'modified'; |
@@ -107,8 +107,8 @@ |
||
107 | 107 | * @return mixed |
108 | 108 | */ |
109 | 109 | public function getInstitutionGrade($institutionId, $gradeId){ |
110 | - return self::where('education_grade_id',$gradeId) |
|
111 | - ->where('institution_id',$institutionId)->get()->first(); |
|
110 | + return self::where('education_grade_id',$gradeId) |
|
111 | + ->where('institution_id',$institutionId)->get()->first(); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -83,7 +83,7 @@ |
||
83 | 83 | ->where('institution_grades.education_grade_id', $educationGradeId) |
84 | 84 | ->where('institution_grades.institution_id', $institutionId) |
85 | 85 | ->get(); |
86 | - }else{ |
|
86 | + } else{ |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | } |
@@ -71,11 +71,11 @@ discard block |
||
71 | 71 | { |
72 | 72 | if (!is_null($id)) { |
73 | 73 | return self::find($id) |
74 | - ->select('institution_grades.id as insGrade','institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id') |
|
75 | - ->join('institution_classes', function ($join) use ($educationGradeId, $academicPeriodId) { |
|
74 | + ->select('institution_grades.id as insGrade', 'institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id') |
|
75 | + ->join('institution_classes', function($join) use ($educationGradeId, $academicPeriodId) { |
|
76 | 76 | $join->on('institution_classes.institution_id', '=', 'institution_grades.institution_id') |
77 | 77 | ->where('institution_classes.academic_period_id', $academicPeriodId) |
78 | - ->join('institution_class_grades', function ($join) use ($educationGradeId) { |
|
78 | + ->join('institution_class_grades', function($join) use ($educationGradeId) { |
|
79 | 79 | $join->on('institution_class_grades.institution_class_id', '=', 'institution_classes.id') |
80 | 80 | ->where('institution_class_grades.education_grade_id', $educationGradeId); |
81 | 81 | }); |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | ->where('institution_grades.education_grade_id', $educationGradeId) |
84 | 84 | ->where('institution_grades.institution_id', $institutionId) |
85 | 85 | ->get(); |
86 | - }else{ |
|
86 | + }else { |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | } |
@@ -95,8 +95,8 @@ discard block |
||
95 | 95 | * @param $year |
96 | 96 | * @param $id |
97 | 97 | */ |
98 | - public function updatePromoted($year, $id){ |
|
99 | - self::where('id',$id)->update(['promoted'=>$year]); |
|
98 | + public function updatePromoted($year, $id) { |
|
99 | + self::where('id', $id)->update(['promoted'=>$year]); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | /** |
@@ -106,9 +106,9 @@ discard block |
||
106 | 106 | * @param $gradeId |
107 | 107 | * @return mixed |
108 | 108 | */ |
109 | - public function getInstitutionGrade($institutionId, $gradeId){ |
|
110 | - return self::where('education_grade_id',$gradeId) |
|
111 | - ->where('institution_id',$institutionId)->get()->first(); |
|
109 | + public function getInstitutionGrade($institutionId, $gradeId) { |
|
110 | + return self::where('education_grade_id', $gradeId) |
|
111 | + ->where('institution_id', $institutionId)->get()->first(); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -116,14 +116,14 @@ discard block |
||
116 | 116 | * @param null $institution |
117 | 117 | * @return mixed |
118 | 118 | */ |
119 | - public function getInstitutionGradeToPromoted($year, $institution = null){ |
|
119 | + public function getInstitutionGradeToPromoted($year, $institution = null) { |
|
120 | 120 | return self::query() |
121 | - ->select('education_grades.name','institutions.code','institutions.name as institution_name','institution_grades.id','institution_grades.institution_id','institution_grades.education_grade_id') |
|
122 | - ->where('promoted','=',$year-1) |
|
123 | - ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id') |
|
124 | - ->join('institutions', function($join) use ($year,$institution){ |
|
125 | - $join->on('institutions.id','=','institution_grades.institution_id') |
|
126 | - ->where('institutions.code','=',$institution); |
|
121 | + ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id') |
|
122 | + ->where('promoted', '=', $year - 1) |
|
123 | + ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id') |
|
124 | + ->join('institutions', function($join) use ($year, $institution){ |
|
125 | + $join->on('institutions.id', '=', 'institution_grades.institution_id') |
|
126 | + ->where('institutions.code', '=', $institution); |
|
127 | 127 | }) |
128 | 128 | ->orderBy('institution_id') |
129 | 129 | ->get()->toArray(); |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | * @param $year |
134 | 134 | * @return mixed |
135 | 135 | */ |
136 | - public function getInstitutionGradeList($year){ |
|
136 | + public function getInstitutionGradeList($year) { |
|
137 | 137 | return self::query() |
138 | - ->select('education_grades.name','institutions.code','institutions.name as institution_name','institution_grades.id','institution_grades.institution_id','institution_grades.education_grade_id') |
|
139 | - ->where('promoted','=',$year-1) |
|
140 | - ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id') |
|
138 | + ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id') |
|
139 | + ->where('promoted', '=', $year - 1) |
|
140 | + ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id') |
|
141 | 141 | ->join('institutions', function($join) use ($year){ |
142 | - $join->on('institutions.id','=','institution_grades.institution_id'); |
|
142 | + $join->on('institutions.id', '=', 'institution_grades.institution_id'); |
|
143 | 143 | }) |
144 | 144 | ->orderBy('institution_id') |
145 | 145 | ->get() |