@@ -52,16 +52,16 @@ |
||
52 | 52 | } |
53 | 53 | |
54 | 54 | public function delete(){ |
55 | - try{ |
|
56 | - DB::statement("UPDATE student_guardians t1 |
|
55 | + try{ |
|
56 | + DB::statement("UPDATE student_guardians t1 |
|
57 | 57 | INNER JOIN student_guardians t2 |
58 | 58 | set t1.deleted_at=now() |
59 | 59 | WHERE |
60 | 60 | t1.id > t2.id AND |
61 | 61 | t1.student_id = t2.student_id AND |
62 | 62 | t1.guardian_id = t2.guardian_id"); |
63 | - }catch(\Exception $e){ |
|
64 | - dd($e); |
|
65 | - } |
|
63 | + }catch(\Exception $e){ |
|
64 | + dd($e); |
|
65 | + } |
|
66 | 66 | } |
67 | 67 | } |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | $this->output->writeln('############### Starting delete Duplication ################'); |
46 | 46 | Student_guardian::withTrashed()->restore(); |
47 | 47 | $this->delete(); |
48 | - $this->end_time = microtime(TRUE); |
|
49 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
50 | - } catch (\Throwable $th) { |
|
48 | + $this->end_time = microtime(TRUE); |
|
49 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
50 | + }catch (\Throwable $th) { |
|
51 | 51 | } |
52 | 52 | } |
53 | 53 | |
54 | - public function delete(){ |
|
55 | - try{ |
|
54 | + public function delete() { |
|
55 | + try { |
|
56 | 56 | DB::statement("UPDATE student_guardians t1 |
57 | 57 | INNER JOIN student_guardians t2 |
58 | 58 | set t1.deleted_at=now() |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | t1.id > t2.id AND |
61 | 61 | t1.student_id = t2.student_id AND |
62 | 62 | t1.guardian_id = t2.guardian_id"); |
63 | - }catch(\Exception $e){ |
|
63 | + }catch (\Exception $e) { |
|
64 | 64 | dd($e); |
65 | 65 | } |
66 | 66 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | t1.id > t2.id AND |
61 | 61 | t1.student_id = t2.student_id AND |
62 | 62 | t1.guardian_id = t2.guardian_id"); |
63 | - }catch(\Exception $e){ |
|
63 | + } catch(\Exception $e){ |
|
64 | 64 | dd($e); |
65 | 65 | } |
66 | 66 | } |
@@ -66,7 +66,7 @@ |
||
66 | 66 | if(count($shift) > 0){ |
67 | 67 | // processParallel($function,$shift, $this->argument('max'),$params); |
68 | 68 | array_walk($shift,$function,$params); |
69 | - }else{ |
|
69 | + } else{ |
|
70 | 70 | $this->output->writeln('Nothing to clone'); |
71 | 71 | } |
72 | 72 | $this->end_time = microtime(TRUE); |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
55 | 55 | $mode = $this->argument('mode') == 'AL' ? true : false; |
56 | 56 | $previousAcademicPeriodYear = $academicPeriod->order; |
57 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
58 | - $shift = $this->shifts->getShiftsToClone($previousAcademicPeriod->code,$this->argument(('max')),$mode); |
|
57 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
58 | + $shift = $this->shifts->getShiftsToClone($previousAcademicPeriod->code, $this->argument(('max')), $mode); |
|
59 | 59 | $params = [ |
60 | 60 | 'year' => $year, |
61 | 61 | 'academic_period' => $academicPeriod, |
@@ -64,17 +64,17 @@ discard block |
||
64 | 64 | ]; |
65 | 65 | |
66 | 66 | $function = array($this->clone, 'process'); |
67 | - if(count($shift) > 0){ |
|
67 | + if (count($shift) > 0) { |
|
68 | 68 | // processParallel($function,$shift, $this->argument('max'),$params); |
69 | - array_walk($shift,$function,$params); |
|
70 | - }else{ |
|
69 | + array_walk($shift, $function, $params); |
|
70 | + }else { |
|
71 | 71 | $this->output->writeln('Nothing to clone'); |
72 | 72 | } |
73 | 73 | $this->end_time = microtime(TRUE); |
74 | 74 | |
75 | 75 | |
76 | 76 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
77 | - $this->output->writeln('The cook took ' . ($this->end_time - $this->start_time) . ' seconds to complete'); |
|
77 | + $this->output->writeln('The cook took '.($this->end_time - $this->start_time).' seconds to complete'); |
|
78 | 78 | $this->output->writeln('$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$'); |
79 | 79 | } |
80 | 80 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | */ |
31 | 31 | public function __construct() |
32 | 32 | { |
33 | - $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
33 | + $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
|
34 | 34 | parent::__construct(); |
35 | 35 | } |
36 | 36 | |
@@ -41,13 +41,13 @@ discard block |
||
41 | 41 | */ |
42 | 42 | public function handle() |
43 | 43 | { |
44 | - $students = Security_user::where('is_student',true)->get()->toArray(); |
|
45 | - array_walk($students,array($this,'process')); |
|
44 | + $students = Security_user::where('is_student', true)->get()->toArray(); |
|
45 | + array_walk($students, array($this, 'process')); |
|
46 | 46 | } |
47 | 47 | |
48 | - public function process($student){ |
|
48 | + public function process($student) { |
|
49 | 49 | $student['student_id'] = $student['id']; |
50 | 50 | Institution_student::updateStudentArea($student); |
51 | - $this->output->writeln('area updated for student:'. $student['openemis_no']) ; |
|
51 | + $this->output->writeln('area updated for student:'.$student['openemis_no']); |
|
52 | 52 | } |
53 | 53 | } |
@@ -48,16 +48,16 @@ |
||
48 | 48 | $year = $this->argument('year'); |
49 | 49 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
50 | 50 | $previousAcademicPeriodYear = $academicPeriod->order; |
51 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
51 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
52 | 52 | |
53 | 53 | $params = [ |
54 | 54 | 'academic_period' => $academicPeriod, |
55 | 55 | 'previous_academic_period' => $previousAcademicPeriod |
56 | 56 | ]; |
57 | 57 | |
58 | - if($year == '2019' || $year == '2018/19'){ |
|
58 | + if ($year == '2019' || $year == '2018/19') { |
|
59 | 59 | die('Academic Year 2019 or earlier can`t be deleted'); |
60 | - }else{ |
|
60 | + }else { |
|
61 | 61 | $this->clone->cleanConfig($params); |
62 | 62 | } |
63 | 63 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | |
58 | 58 | if($year == '2019' || $year == '2018/19'){ |
59 | 59 | die('Academic Year 2019 or earlier can`t be deleted'); |
60 | - }else{ |
|
60 | + } else{ |
|
61 | 61 | $this->clone->cleanConfig($params); |
62 | 62 | } |
63 | 63 | } |
@@ -41,7 +41,7 @@ |
||
41 | 41 | public function array_walk($shift, $count, $params) |
42 | 42 | { |
43 | 43 | try{ |
44 | - DB::beginTransaction(); |
|
44 | + DB::beginTransaction(); |
|
45 | 45 | array_walk($shift, array($this, 'process'), $params); |
46 | 46 | DB::commit(); |
47 | 47 | }catch(\Exception $e){ |
@@ -44,7 +44,7 @@ |
||
44 | 44 | DB::beginTransaction(); |
45 | 45 | array_walk($shift, array($this, 'process'), $params); |
46 | 46 | DB::commit(); |
47 | - }catch(\Exception $e){ |
|
47 | + } catch(\Exception $e){ |
|
48 | 48 | $this->output->writeln('Terminating ' . $shift['institution_id']); |
49 | 49 | DB::rollBack(); |
50 | 50 | } |
@@ -31,21 +31,21 @@ discard block |
||
31 | 31 | $this->academic_period = new Academic_period(); |
32 | 32 | $this->institution_classes = new Institution_class(); |
33 | 33 | $this->institution_class_subjects = new Institution_class_subject(); |
34 | - $this->institution_subjects = new Institution_subject(); |
|
34 | + $this->institution_subjects = new Institution_subject(); |
|
35 | 35 | $this->institution_grades = new Institution_grade(); |
36 | - $this->education_grade_subjects = new Education_grades_subject(); |
|
36 | + $this->education_grade_subjects = new Education_grades_subject(); |
|
37 | 37 | $this->output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
38 | 38 | } |
39 | 39 | |
40 | 40 | |
41 | 41 | public function array_walk($shift, $count, $params) |
42 | 42 | { |
43 | - try{ |
|
43 | + try { |
|
44 | 44 | DB::beginTransaction(); |
45 | 45 | array_walk($shift, array($this, 'process'), $params); |
46 | 46 | DB::commit(); |
47 | - }catch(\Exception $e){ |
|
48 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
47 | + }catch (\Exception $e) { |
|
48 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
49 | 49 | DB::rollBack(); |
50 | 50 | } |
51 | 51 | } |
@@ -59,24 +59,24 @@ discard block |
||
59 | 59 | $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $params['previous_academic_period']['code']]); |
60 | 60 | $this->output->writeln('updated shifts'); |
61 | 61 | |
62 | - $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
62 | + $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray(); |
|
63 | 63 | $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete(); |
64 | 64 | $this->output->writeln('cleaned classes'); |
65 | 65 | |
66 | 66 | do { |
67 | 67 | $deleted = $this->institution_class_subjects->whereRaw("institution_class_id not in (select id from institution_classes where academic_period_id =".$academicPeriod->id." )")->limit(10000)->delete(); |
68 | 68 | $this->output->writeln('cleaned subjects'); |
69 | - }while($deleted > 0); |
|
69 | + } while ($deleted > 0); |
|
70 | 70 | |
71 | 71 | do { |
72 | - $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(10000)->delete(); |
|
72 | + $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(10000)->delete(); |
|
73 | 73 | $this->output->writeln('10000 institutions cleaned subjects'); |
74 | 74 | } while ($deleted > 0); |
75 | 75 | } |
76 | 76 | |
77 | 77 | public function process($shift, $count, $params) |
78 | 78 | { |
79 | - echo ('[' . getmypid() . ']This Process executed at' . date("F d, Y h:i:s A") . "\n"); |
|
79 | + echo ('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n"); |
|
80 | 80 | $year = $params['year']; |
81 | 81 | $academicPeriod = $params['academic_period']; |
82 | 82 | $previousAcademicPeriod = $params['previous_academic_period']; |
@@ -94,14 +94,14 @@ discard block |
||
94 | 94 | |
95 | 95 | |
96 | 96 | if ($mode) { |
97 | - $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode, $params); |
|
97 | + $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode, $params); |
|
98 | 98 | try { |
99 | 99 | array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params); |
100 | - $this->output->writeln('updating from ' . $shift['institution_id']); |
|
101 | - } catch (\Exception $e) { |
|
100 | + $this->output->writeln('updating from '.$shift['institution_id']); |
|
101 | + }catch (\Exception $e) { |
|
102 | 102 | Log::error($e->getMessage(), [$e]); |
103 | 103 | } |
104 | - } else { |
|
104 | + }else { |
|
105 | 105 | $institutionSubjects = $this->institution_grades->getGradeSubjects($shift['institution_id']); |
106 | 106 | try { |
107 | 107 | if ($data['created']) { |
@@ -112,32 +112,32 @@ discard block |
||
112 | 112 | try { |
113 | 113 | array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params); |
114 | 114 | $this->output->writeln('##########################################################################################################################'); |
115 | - $this->output->writeln('updating from = ' . $shift['institution_id']); |
|
116 | - } catch (\Exception $e) { |
|
117 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
115 | + $this->output->writeln('updating from = '.$shift['institution_id']); |
|
116 | + }catch (\Exception $e) { |
|
117 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
118 | 118 | DB::rollBack(); |
119 | 119 | Log::error($e->getMessage(), [$e]); |
120 | 120 | } |
121 | - } else { |
|
122 | - $this->output->writeln('no classes found ' . $shift['institution_id']); |
|
121 | + }else { |
|
122 | + $this->output->writeln('no classes found '.$shift['institution_id']); |
|
123 | 123 | } |
124 | - } else { |
|
124 | + }else { |
|
125 | 125 | try { |
126 | 126 | $shift['id'] = $shiftId; |
127 | 127 | $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode); |
128 | 128 | array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params); |
129 | 129 | $this->output->writeln('##########################################################################################################################'); |
130 | - $this->output->writeln('updating from ' . $shift['institution_id']); |
|
131 | - } catch (\Exception $e) { |
|
132 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
130 | + $this->output->writeln('updating from '.$shift['institution_id']); |
|
131 | + }catch (\Exception $e) { |
|
132 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
133 | 133 | DB::rollBack(); |
134 | 134 | Log::error($e->getMessage(), [$e]); |
135 | 135 | } |
136 | 136 | } |
137 | 137 | DB::commit(); |
138 | - } catch (\Exception $e) { |
|
138 | + }catch (\Exception $e) { |
|
139 | 139 | Log::error($e->getMessage(), [$e]); |
140 | - $this->output->writeln('Terminating ' . $shift['institution_id']); |
|
140 | + $this->output->writeln('Terminating '.$shift['institution_id']); |
|
141 | 141 | DB::rollBack(); |
142 | 142 | } |
143 | 143 | } |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | $subject['created'] = now(); |
157 | 157 | $subject['created_user_id'] = 1; |
158 | 158 | $this->institution_subjects->create($subject); |
159 | - } catch (\Exception $e) { |
|
159 | + }catch (\Exception $e) { |
|
160 | 160 | DB::rollBack(); |
161 | 161 | Log::error($e->getMessage(), [$e]); |
162 | 162 | } |
@@ -167,14 +167,14 @@ discard block |
||
167 | 167 | try { |
168 | 168 | if ($params['mode']) { |
169 | 169 | Institution_class::where('id', $class['id']) |
170 | - ->where('academic_period_id',$params['previous_academic_period_id']) |
|
170 | + ->where('academic_period_id', $params['previous_academic_period_id']) |
|
171 | 171 | ->update([ |
172 | 172 | 'institution_shift_id' => $params['shift_id'], |
173 | 173 | 'academic_period_id' => $params['academic_period_id'] |
174 | 174 | ]); |
175 | 175 | |
176 | 176 | Institution_class_student::where('institution_class_id', $class['id']) |
177 | - ->where('academic_period_id',$params['previous_academic_period_id']) |
|
177 | + ->where('academic_period_id', $params['previous_academic_period_id']) |
|
178 | 178 | ->update([ |
179 | 179 | 'academic_period_id' => $params['academic_period_id'], |
180 | 180 | 'modified' => now() |
@@ -183,12 +183,12 @@ discard block |
||
183 | 183 | $educationGrade = Institution_class_grade::select('education_grade_id')->where('institution_class_id', $class['id'])->get()->toArray(); |
184 | 184 | |
185 | 185 | Institution_student::whereIn('education_grade_id', $educationGrade) |
186 | - ->where('academic_period_id',$params['previous_academic_period_id']) |
|
186 | + ->where('academic_period_id', $params['previous_academic_period_id']) |
|
187 | 187 | ->update([ |
188 | 188 | 'academic_period_id' => $params['academic_period_id'] |
189 | 189 | ]); |
190 | 190 | } |
191 | - } catch (\Exception $e) { |
|
191 | + }catch (\Exception $e) { |
|
192 | 192 | DB::rollBack(); |
193 | 193 | Log::error($e->getMessage(), [$e]); |
194 | 194 | } |
@@ -218,8 +218,8 @@ discard block |
||
218 | 218 | $class['created'] = now(); |
219 | 219 | $class['institution_shift_id'] = $param['shift_id']; |
220 | 220 | // $class['created_user_id'] = |
221 | - $this->output->writeln('Create class:' . $class['name']); |
|
222 | - $class = Institution_class::create($class); |
|
221 | + $this->output->writeln('Create class:'.$class['name']); |
|
222 | + $class = Institution_class::create($class); |
|
223 | 223 | $institutionClassGrdaeObj['institution_class_id'] = $class->id; |
224 | 224 | $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae; |
225 | 225 | $institutionClassGrdaeObj['created_user_id'] = $class['created_user_id']; |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | ->toArray(); |
232 | 232 | $params['class'] = $class; |
233 | 233 | $this->insertInstitutionClassSubjects($institutionSubjects, $class); |
234 | - } catch (\Exception $e) { |
|
234 | + }catch (\Exception $e) { |
|
235 | 235 | DB::rollBack(); |
236 | 236 | Log::error($e->getMessage(), [$e]); |
237 | 237 | } |
@@ -242,8 +242,8 @@ discard block |
||
242 | 242 | if (!empty($subjects)) { |
243 | 243 | try { |
244 | 244 | array_walk($subjects, array($this, 'insertClassSubjects'), $class); |
245 | - $this->output->writeln('updating subjects ' . $class->name); |
|
246 | - } catch (\Exception $e) { |
|
245 | + $this->output->writeln('updating subjects '.$class->name); |
|
246 | + }catch (\Exception $e) { |
|
247 | 247 | DB::rollBack(); |
248 | 248 | Log::error($e->getMessage(), [$e]); |
249 | 249 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | if (!$this->institution_class_subjects->isDuplicated($subjectobj)) { |
265 | 265 | $this->institution_class_subjects->create($subjectobj); |
266 | 266 | } |
267 | - } catch (\Exception $e) { |
|
267 | + }catch (\Exception $e) { |
|
268 | 268 | DB::rollBack(); |
269 | 269 | Log::error($e->getMessage(), [$e]); |
270 | 270 | } |
@@ -312,19 +312,19 @@ discard block |
||
312 | 312 | unset($shift['id']); |
313 | 313 | unset($shift['created']); |
314 | 314 | unset($shift['modified']); |
315 | - $shift = $this->shifts->create((array)$shift); |
|
315 | + $shift = $this->shifts->create((array) $shift); |
|
316 | 316 | $data = [ |
317 | 317 | 'shift_id' => $shift->id, |
318 | 318 | 'created' => true |
319 | 319 | ]; |
320 | - } else { |
|
320 | + }else { |
|
321 | 321 | $data = [ |
322 | 322 | 'shift_id' => $exist->id, |
323 | 323 | 'created' => false |
324 | 324 | ]; |
325 | 325 | }; |
326 | 326 | return $data; |
327 | - } catch (\Exception $e) { |
|
327 | + }catch (\Exception $e) { |
|
328 | 328 | DB::rollBack(); |
329 | 329 | } |
330 | 330 | } |
@@ -48,21 +48,21 @@ |
||
48 | 48 | $mode = $this->argument('mode'); |
49 | 49 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
50 | 50 | $previousAcademicPeriodYear = $academicPeriod->order; |
51 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
52 | - $institutions = $this->instituion_grade->getInstitutionGradeList($previousAcademicPeriod->code,$limit,$mode); |
|
51 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
52 | + $institutions = $this->instituion_grade->getInstitutionGradeList($previousAcademicPeriod->code, $limit, $mode); |
|
53 | 53 | $params = [ |
54 | 54 | 'year' => $year, |
55 | 55 | 'mode'=> $mode |
56 | 56 | ]; |
57 | - if(in_array($mode,['AL','1-5','SP','6-11'])){ |
|
58 | - array_walk($institutions,array($this,'callPromotion'),$params); |
|
59 | - }else{ |
|
57 | + if (in_array($mode, ['AL', '1-5', 'SP', '6-11'])) { |
|
58 | + array_walk($institutions, array($this, 'callPromotion'), $params); |
|
59 | + }else { |
|
60 | 60 | die('The give mode not support'); |
61 | 61 | } |
62 | 62 | |
63 | 63 | } |
64 | 64 | |
65 | - protected function callPromotion($institution,$count,$params){ |
|
66 | - $this->call('promote:students',['year' => $params['year'],'institution' => $institution['code'],'mode' => $params['mode'] ]); |
|
65 | + protected function callPromotion($institution, $count, $params) { |
|
66 | + $this->call('promote:students', ['year' => $params['year'], 'institution' => $institution['code'], 'mode' => $params['mode']]); |
|
67 | 67 | } |
68 | 68 | } |
@@ -56,7 +56,7 @@ |
||
56 | 56 | ]; |
57 | 57 | if(in_array($mode,['AL','1-5','SP','6-11'])){ |
58 | 58 | array_walk($institutions,array($this,'callPromotion'),$params); |
59 | - }else{ |
|
59 | + } else{ |
|
60 | 60 | die('The give mode not support'); |
61 | 61 | } |
62 | 62 |
@@ -65,15 +65,15 @@ |
||
65 | 65 | $institution = $this->argument('institution'); |
66 | 66 | $academicPeriod = $this->academic_period->getAcademicPeriod($year); |
67 | 67 | $previousAcademicPeriodYear = $academicPeriod->order; |
68 | - $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first(); |
|
68 | + $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first(); |
|
69 | 69 | $mode = $this->argument('mode'); |
70 | - $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($previousAcademicPeriod->code,$institution,$mode); |
|
70 | + $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($previousAcademicPeriod->code, $institution, $mode); |
|
71 | 71 | $output->writeln('Start promoting:'.$institution); |
72 | 72 | $params = [ |
73 | 73 | 'academicPeriod' => $academicPeriod, |
74 | 74 | 'previousAcademicPeriod' => $previousAcademicPeriod |
75 | 75 | ]; |
76 | - (new BulkPromotion())->callback($institutionGrade,$params); |
|
76 | + (new BulkPromotion())->callback($institutionGrade, $params); |
|
77 | 77 | $output->writeln('Finished promoting:'.$institution); |
78 | 78 | } |
79 | 79 | } |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Education_grades_subject extends Model { |
|
7 | +class Education_grades_subject 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 = ['modified', 'created']; |
43 | 43 | |
44 | 44 | |
45 | - public function institutionGradeSubject(){ |
|
46 | - return $this->hasMany('App\Models\Institution_subject','education_grade_id','education_grade_id'); |
|
45 | + public function institutionGradeSubject() { |
|
46 | + return $this->hasMany('App\Models\Institution_subject', 'education_grade_id', 'education_grade_id'); |
|
47 | 47 | } |
48 | 48 | |
49 | - public function getGradeSubjects($educationGrade){ |
|
50 | - self::where('education_grade_id',$educationGrade['education_grade_id']) |
|
49 | + public function getGradeSubjects($educationGrade) { |
|
50 | + self::where('education_grade_id', $educationGrade['education_grade_id']) |
|
51 | 51 | ->get() |
52 | 52 | ->toArray(); |
53 | 53 | ; |
@@ -4,7 +4,7 @@ discard block |
||
4 | 4 | |
5 | 5 | use Illuminate\Database\Eloquent\Model; |
6 | 6 | |
7 | -class Institution_subject extends Base_Model { |
|
7 | +class Institution_subject extends Base_Model { |
|
8 | 8 | |
9 | 9 | /** |
10 | 10 | * The database table used by the model. |
@@ -42,29 +42,29 @@ discard block |
||
42 | 42 | protected $dates = ['modified', 'created', 'modified', 'created']; |
43 | 43 | |
44 | 44 | |
45 | - public function institutionGradeSubject(){ |
|
46 | - return $this->belongsTo('App\Models\Education_grades_subject','education_subject_id','education_subject_id'); |
|
45 | + public function institutionGradeSubject() { |
|
46 | + return $this->belongsTo('App\Models\Education_grades_subject', 'education_subject_id', 'education_subject_id'); |
|
47 | 47 | } |
48 | 48 | |
49 | - public function institutionOptionalGradeSubject(){ |
|
50 | - return $this->belongsTo('App\Models\Education_grades_subject','education_grade_id','education_grade_id'); |
|
49 | + public function institutionOptionalGradeSubject() { |
|
50 | + return $this->belongsTo('App\Models\Education_grades_subject', 'education_grade_id', 'education_grade_id'); |
|
51 | 51 | } |
52 | 52 | |
53 | - public function institutionMandatoryGradeSubject(){ |
|
54 | - return $this->belongsTo('App\Models\Education_grades_subject','education_grade_id','education_grade_id'); |
|
53 | + public function institutionMandatoryGradeSubject() { |
|
54 | + return $this->belongsTo('App\Models\Education_grades_subject', 'education_grade_id', 'education_grade_id'); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | |
58 | - public function institutionClassSubject(){ |
|
59 | - return $this->hasMany('App\Models\Institution_class_subject','institution_class_id','id'); |
|
58 | + public function institutionClassSubject() { |
|
59 | + return $this->hasMany('App\Models\Institution_class_subject', 'institution_class_id', 'id'); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | 63 | |
64 | - public function getInstitutionSubjects($institution_id,$academic_period_id){ |
|
65 | - $query = self::query()->where('institution_id',$institution_id) |
|
66 | - ->where('academic_period_id',$academic_period_id) |
|
67 | - ->join('education_grades_subjects','institution_subjects.education_subject_id','education_grades_subjects.id') |
|
64 | + public function getInstitutionSubjects($institution_id, $academic_period_id) { |
|
65 | + $query = self::query()->where('institution_id', $institution_id) |
|
66 | + ->where('academic_period_id', $academic_period_id) |
|
67 | + ->join('education_grades_subjects', 'institution_subjects.education_subject_id', 'education_grades_subjects.id') |
|
68 | 68 | ->join('education_grades', 'education_grades_subjects.education_grade_id', 'education_grades.id') |
69 | 69 | ->groupBy('education_grades_subjects.id'); |
70 | 70 | return $query->get()->toArray(); |
@@ -72,15 +72,15 @@ discard block |
||
72 | 72 | |
73 | 73 | public static function getStudentsCount($institution_subject_id) |
74 | 74 | { |
75 | - $total_male_students = self::with(['student' => function ($query) { |
|
75 | + $total_male_students = self::with(['student' => function($query) { |
|
76 | 76 | $query->where('student.gender_id', '=', 1); |
77 | - }])->whereHas('student', function ($query) { |
|
77 | + }])->whereHas('student', function($query) { |
|
78 | 78 | $query->where('gender_id', '=', 1); |
79 | 79 | })->where('institution_subject_id', '=', $institution_subject_id)->count(); |
80 | 80 | |
81 | - $total_female_students = self::with(['student' => function ($query) { |
|
81 | + $total_female_students = self::with(['student' => function($query) { |
|
82 | 82 | $query->where('student.gender_id', '=', 2); |
83 | - }])->whereHas('student', function ($query) { |
|
83 | + }])->whereHas('student', function($query) { |
|
84 | 84 | $query->where('gender_id', '=', 2); |
85 | 85 | })->where('institution_subject_id', '=', $institution_subject_id)->count(); |
86 | 86 |