@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | if (!empty($isAvailableforPromotion)) { |
65 | 65 | $this->process($institutionGrade, $nextGrade, $params); |
66 | 66 | DB::commit(); |
67 | - } else { |
|
67 | + }else { |
|
68 | 68 | DB::rollBack(); |
69 | 69 | } |
70 | 70 | //leave school levers |
@@ -72,7 +72,7 @@ discard block |
||
72 | 72 | // $this->process($institutionGrade, $nextGrade, $params); |
73 | 73 | // } |
74 | 74 | } |
75 | - } catch (\Exception $e) { |
|
75 | + }catch (\Exception $e) { |
|
76 | 76 | DB::rollBack(); |
77 | 77 | } |
78 | 78 | } |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | |
106 | 106 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
107 | 107 | $output->writeln('##########################################################################################################################'); |
108 | - $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote)); |
|
108 | + $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote)); |
|
109 | 109 | |
110 | 110 | |
111 | 111 | if (!empty($parallelClasses)) { |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | array_walk($parallelClasses, array($this, 'updateStudentCount')); |
121 | 121 | DB::commit(); |
122 | 122 | } |
123 | - } catch (\Exception $e) { |
|
123 | + }catch (\Exception $e) { |
|
124 | 124 | DB::rollBack(); |
125 | 125 | Log::error($e->getMessage()); |
126 | 126 | } |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | $previousAcademicPeriod = $params['previousAcademicPeriod']; |
156 | 156 | $nextGradeObj = null; |
157 | 157 | $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $previousAcademicPeriod->id); |
158 | - if ($nextGrade !== [] && !is_null($nextGrade)) { |
|
158 | + if ($nextGrade !== [] && !is_null($nextGrade)) { |
|
159 | 159 | $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $academicPeriod->id); |
160 | 160 | } |
161 | 161 | |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | // promote parallel classes |
165 | 165 | $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1); |
166 | 166 | return 1; |
167 | - } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) { |
|
167 | + } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) { |
|
168 | 168 | // promote pool promotion |
169 | 169 | $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1); |
170 | 170 | return 2; |
@@ -172,12 +172,12 @@ discard block |
||
172 | 172 | // Promote matching class name with previous class |
173 | 173 | $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1); |
174 | 174 | return 1; |
175 | - } else { |
|
175 | + }else { |
|
176 | 176 | // default pool promotion |
177 | 177 | $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1); |
178 | 178 | return 2; |
179 | 179 | } |
180 | - } else { |
|
180 | + }else { |
|
181 | 181 | // default pool promotion |
182 | 182 | $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 3); |
183 | 183 | return 2; |
@@ -213,10 +213,10 @@ discard block |
||
213 | 213 | ]; |
214 | 214 | |
215 | 215 | try { |
216 | - Institution_student::where('id', (string)$student['id'])->update($studentData); |
|
216 | + Institution_student::where('id', (string) $student['id'])->update($studentData); |
|
217 | 217 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
218 | - $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']); |
|
219 | - } catch (\Exception $e) { |
|
218 | + $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']); |
|
219 | + }catch (\Exception $e) { |
|
220 | 220 | Log::error($e->getMessage()); |
221 | 221 | } |
222 | 222 | } |
@@ -236,13 +236,13 @@ discard block |
||
236 | 236 | $studentClass = $this->institution_class_students->getStudentNewClass($student); |
237 | 237 | if (!is_null($studentClass)) { |
238 | 238 | $class = array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name')); |
239 | - if(!($class)){ |
|
240 | - $nextGradeName = explode(" ",$nextGrade->name)[0]; |
|
241 | - $educationGrade['name'] = explode(" ",$educationGrade['name'])[0]; |
|
239 | + if (!($class)) { |
|
240 | + $nextGradeName = explode(" ", $nextGrade->name)[0]; |
|
241 | + $educationGrade['name'] = explode(" ", $educationGrade['name'])[0]; |
|
242 | 242 | $class = array_search(str_replace($educationGrade['name'], $nextGradeName, $studentClass->name), array_column($classes, 'name')); |
243 | 243 | } |
244 | 244 | return $class; |
245 | - } else { |
|
245 | + }else { |
|
246 | 246 | return false; |
247 | 247 | } |
248 | 248 | } |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | $class = null; |
265 | 265 | if (count($classes) == 1) { |
266 | 266 | $class = $classes[0]; |
267 | - } else { |
|
267 | + }else { |
|
268 | 268 | $class = $this->getStudentClass($student, $educationGrade, $nextGrade, $classes); |
269 | 269 | if (is_numeric($class)) { |
270 | 270 | $class = $classes[$class]; |
@@ -296,13 +296,13 @@ discard block |
||
296 | 296 | // array_walk($allInsSubjects,array($this,'updateSubjectCount')); |
297 | 297 | // } |
298 | 298 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
299 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
300 | - } else { |
|
301 | - $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj); |
|
299 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
300 | + }else { |
|
301 | + $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj); |
|
302 | 302 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
303 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
303 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
304 | 304 | } |
305 | - } catch (\Exception $e) { |
|
305 | + }catch (\Exception $e) { |
|
306 | 306 | |
307 | 307 | Log::error($e->getMessage()); |
308 | 308 | } |
@@ -70,10 +70,10 @@ discard block |
||
70 | 70 | public function getParallelClasses($id, $institutionId, $educationGradeId, $academicPeriodId) |
71 | 71 | { |
72 | 72 | $data = self::find($id)->select('institution_grades.id as insGrade', 'institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id') |
73 | - ->join('institution_classes', function ($join) use ($educationGradeId, $academicPeriodId) { |
|
73 | + ->join('institution_classes', function($join) use ($educationGradeId, $academicPeriodId) { |
|
74 | 74 | $join->on('institution_classes.institution_id', '=', 'institution_grades.institution_id') |
75 | 75 | ->where('institution_classes.academic_period_id', $academicPeriodId) |
76 | - ->join('institution_class_grades', function ($join) use ($educationGradeId) { |
|
76 | + ->join('institution_class_grades', function($join) use ($educationGradeId) { |
|
77 | 77 | $join->on('institution_class_grades.institution_class_id', '=', 'institution_classes.id') |
78 | 78 | ->where('institution_class_grades.education_grade_id', $educationGradeId); |
79 | 79 | }) |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id') |
124 | 124 | // ->where('promoted', '=', $year) |
125 | 125 | ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id') |
126 | - ->join('institutions', function ($join) use ($year, $institution) { |
|
126 | + ->join('institutions', function($join) use ($year, $institution) { |
|
127 | 127 | $join->on('institutions.id', '=', 'institution_grades.institution_id') |
128 | 128 | ->where('institutions.code', '=', $institution); |
129 | 129 | }) |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | break; |
135 | 135 | case '6-11': |
136 | 136 | $query->whereIn('education_programmes.education_cycle_id', [2, 3]); |
137 | - $query->whereNotIn('education_grades.id',[29,34]); |
|
137 | + $query->whereNotIn('education_grades.id', [29, 34]); |
|
138 | 138 | break; |
139 | 139 | case 'AL': |
140 | 140 | $query->where('education_programmes.education_cycle_id', 4); |
@@ -152,21 +152,21 @@ discard block |
||
152 | 152 | * @param $year |
153 | 153 | * @return mixed |
154 | 154 | */ |
155 | - public function getInstitutionGradeList($year, $limit,$mode) |
|
155 | + public function getInstitutionGradeList($year, $limit, $mode) |
|
156 | 156 | { |
157 | 157 | $query = $this->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id') |
158 | 158 | // ->where('promoted', '=', $year) |
159 | 159 | ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id') |
160 | - ->join('institutions', function ($join) use ($year) { |
|
160 | + ->join('institutions', function($join) use ($year) { |
|
161 | 161 | $join->on('institutions.id', '=', 'institution_grades.institution_id'); |
162 | 162 | }) |
163 | 163 | ->join('education_programmes', 'education_grades.education_programme_id', 'education_programmes.id'); |
164 | 164 | switch ($mode) { |
165 | 165 | case '1-5': |
166 | - $query->whereIn('education_programmes.education_cycle_id', [1,2]); |
|
166 | + $query->whereIn('education_programmes.education_cycle_id', [1, 2]); |
|
167 | 167 | break; |
168 | 168 | case '6-11': |
169 | - $query->whereIn('education_programmes.education_cycle_id', [2,3,4]); |
|
169 | + $query->whereIn('education_programmes.education_cycle_id', [2, 3, 4]); |
|
170 | 170 | break; |
171 | 171 | case 'AL': |
172 | 172 | $query->where('education_programmes.education_cycle_id', 4); |
@@ -181,13 +181,13 @@ discard block |
||
181 | 181 | return $data; |
182 | 182 | } |
183 | 183 | |
184 | - public function getGradeSubjects($institutionId){ |
|
184 | + public function getGradeSubjects($institutionId) { |
|
185 | 185 | return self::query() |
186 | - ->select('institution_grades.institution_id','education_grades_subjects.education_grade_id','education_grades_subjects.education_subject_id','education_subjects.name') |
|
187 | - ->where('institution_grades.institution_id',$institutionId) |
|
186 | + ->select('institution_grades.institution_id', 'education_grades_subjects.education_grade_id', 'education_grades_subjects.education_subject_id', 'education_subjects.name') |
|
187 | + ->where('institution_grades.institution_id', $institutionId) |
|
188 | 188 | ->join('education_grades', 'institution_grades.education_grade_id', 'education_grades.id') |
189 | - ->join('education_grades_subjects','education_grades.id','education_grades_subjects.education_grade_id') |
|
190 | - ->join('education_subjects','education_grades_subjects.education_subject_id','education_subjects.id') |
|
189 | + ->join('education_grades_subjects', 'education_grades.id', 'education_grades_subjects.education_grade_id') |
|
190 | + ->join('education_subjects', 'education_grades_subjects.education_subject_id', 'education_subjects.id') |
|
191 | 191 | ->groupBy('education_grades_subjects.id') |
192 | 192 | ->get() |
193 | 193 | ->toArray(); |