@@ -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 | } |
@@ -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 | dd($e); |
| 221 | 221 | Log::error($e->getMessage()); |
| 222 | 222 | } |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | $studentClass = $this->institution_class_students->getStudentNewClass($student); |
| 238 | 238 | if (!is_null($studentClass)) { |
| 239 | 239 | return array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name')); |
| 240 | - } else { |
|
| 240 | + }else { |
|
| 241 | 241 | return false; |
| 242 | 242 | } |
| 243 | 243 | } |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | $class = null; |
| 260 | 260 | if (count($classes) == 1) { |
| 261 | 261 | $class = $classes[0]; |
| 262 | - } else { |
|
| 262 | + }else { |
|
| 263 | 263 | $class = $this->getStudentClass($student, $educationGrade, $nextGrade, $classes); |
| 264 | 264 | if (is_numeric($class)) { |
| 265 | 265 | $class = $classes[$class]; |
@@ -288,16 +288,16 @@ discard block |
||
| 288 | 288 | $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects); |
| 289 | 289 | $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id'); |
| 290 | 290 | array_walk($allSubjects, array($this, 'insertSubject')); |
| 291 | - array_walk($allInsSubjects,array($this,'updateSubjectCount')); |
|
| 291 | + array_walk($allInsSubjects, array($this, 'updateSubjectCount')); |
|
| 292 | 292 | } |
| 293 | 293 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
| 294 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
| 295 | - } else { |
|
| 296 | - $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj); |
|
| 294 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
| 295 | + }else { |
|
| 296 | + $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj); |
|
| 297 | 297 | $output = new \Symfony\Component\Console\Output\ConsoleOutput(); |
| 298 | - $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']); |
|
| 298 | + $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']); |
|
| 299 | 299 | } |
| 300 | - } catch (\Exception $e) { |
|
| 300 | + }catch (\Exception $e) { |
|
| 301 | 301 | dd($e); |
| 302 | 302 | } |
| 303 | 303 | } |
@@ -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); |
|
| 97 | + $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode); |
|
| 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 | } |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | 'academic_period_id' => $params['academic_period_id'] |
| 186 | 186 | ]); |
| 187 | 187 | } |
| 188 | - } catch (\Exception $e) { |
|
| 188 | + }catch (\Exception $e) { |
|
| 189 | 189 | DB::rollBack(); |
| 190 | 190 | Log::error($e->getMessage(), [$e]); |
| 191 | 191 | } |
@@ -215,8 +215,8 @@ discard block |
||
| 215 | 215 | $class['created'] = now(); |
| 216 | 216 | $class['institution_shift_id'] = $param['shift_id']; |
| 217 | 217 | // $class['created_user_id'] = |
| 218 | - $this->output->writeln('Create class:' . $class['name']); |
|
| 219 | - $class = Institution_class::create($class); |
|
| 218 | + $this->output->writeln('Create class:'.$class['name']); |
|
| 219 | + $class = Institution_class::create($class); |
|
| 220 | 220 | $institutionClassGrdaeObj['institution_class_id'] = $class->id; |
| 221 | 221 | $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae; |
| 222 | 222 | $institutionClassGrdaeObj['created_user_id'] = $class['created_user_id']; |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | ->toArray(); |
| 229 | 229 | $params['class'] = $class; |
| 230 | 230 | $this->insertInstitutionClassSubjects($institutionSubjects, $class); |
| 231 | - } catch (\Exception $e) { |
|
| 231 | + }catch (\Exception $e) { |
|
| 232 | 232 | DB::rollBack(); |
| 233 | 233 | Log::error($e->getMessage(), [$e]); |
| 234 | 234 | } |
@@ -239,8 +239,8 @@ discard block |
||
| 239 | 239 | if (!empty($subjects)) { |
| 240 | 240 | try { |
| 241 | 241 | array_walk($subjects, array($this, 'insertClassSubjects'), $class); |
| 242 | - $this->output->writeln('updating subjects ' . $class->name); |
|
| 243 | - } catch (\Exception $e) { |
|
| 242 | + $this->output->writeln('updating subjects '.$class->name); |
|
| 243 | + }catch (\Exception $e) { |
|
| 244 | 244 | DB::rollBack(); |
| 245 | 245 | Log::error($e->getMessage(), [$e]); |
| 246 | 246 | } |
@@ -261,7 +261,7 @@ discard block |
||
| 261 | 261 | if (!$this->institution_class_subjects->isDuplicated($subjectobj)) { |
| 262 | 262 | $this->institution_class_subjects->create($subjectobj); |
| 263 | 263 | } |
| 264 | - } catch (\Exception $e) { |
|
| 264 | + }catch (\Exception $e) { |
|
| 265 | 265 | DB::rollBack(); |
| 266 | 266 | Log::error($e->getMessage(), [$e]); |
| 267 | 267 | } |
@@ -309,19 +309,19 @@ discard block |
||
| 309 | 309 | unset($shift['id']); |
| 310 | 310 | unset($shift['created']); |
| 311 | 311 | unset($shift['modified']); |
| 312 | - $shift = $this->shifts->create((array)$shift); |
|
| 312 | + $shift = $this->shifts->create((array) $shift); |
|
| 313 | 313 | $data = [ |
| 314 | 314 | 'shift_id' => $shift->id, |
| 315 | 315 | 'created' => true |
| 316 | 316 | ]; |
| 317 | - } else { |
|
| 317 | + }else { |
|
| 318 | 318 | $data = [ |
| 319 | 319 | 'shift_id' => $exist->id, |
| 320 | 320 | 'created' => false |
| 321 | 321 | ]; |
| 322 | 322 | }; |
| 323 | 323 | return $data; |
| 324 | - } catch (\Exception $e) { |
|
| 324 | + }catch (\Exception $e) { |
|
| 325 | 325 | DB::rollBack(); |
| 326 | 326 | } |
| 327 | 327 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 Institution_shift extends Base_Model { |
|
| 7 | +class Institution_shift extends Base_Model { |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * The database table used by the model. |
@@ -41,40 +41,40 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | protected $dates = ['modified', 'created']; |
| 43 | 43 | |
| 44 | - public function shiftExists($shift){ |
|
| 44 | + public function shiftExists($shift) { |
|
| 45 | 45 | return self::query() |
| 46 | - ->where('institution_id',$shift['institution_id']) |
|
| 47 | - ->where('location_institution_id',$shift['location_institution_id']) |
|
| 48 | - ->where('shift_option_id',$shift['shift_option_id']) |
|
| 49 | - ->where('academic_period_id',$shift['academic_period_id'])->exists(); |
|
| 46 | + ->where('institution_id', $shift['institution_id']) |
|
| 47 | + ->where('location_institution_id', $shift['location_institution_id']) |
|
| 48 | + ->where('shift_option_id', $shift['shift_option_id']) |
|
| 49 | + ->where('academic_period_id', $shift['academic_period_id'])->exists(); |
|
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - public function getShift($shift){ |
|
| 52 | + public function getShift($shift) { |
|
| 53 | 53 | return self::query() |
| 54 | - ->where('institution_id',$shift['institution_id']) |
|
| 55 | - ->where('location_institution_id',$shift['location_institution_id']) |
|
| 56 | - ->where('shift_option_id',$shift['shift_option_id']) |
|
| 57 | - ->where('academic_period_id',$shift['academic_period_id'])->first(); |
|
| 54 | + ->where('institution_id', $shift['institution_id']) |
|
| 55 | + ->where('location_institution_id', $shift['location_institution_id']) |
|
| 56 | + ->where('shift_option_id', $shift['shift_option_id']) |
|
| 57 | + ->where('academic_period_id', $shift['academic_period_id'])->first(); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | - public function getShiftsToClone(string $year,$limit,$mode){ |
|
| 60 | + public function getShiftsToClone(string $year, $limit, $mode) { |
|
| 61 | 61 | return self::query() |
| 62 | 62 | ->select('institution_shifts.*') |
| 63 | - ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id') |
|
| 64 | - ->where('academic_periods.code',$year) |
|
| 65 | - ->whereNotIn('institution_shifts.cloned',[ '2020' , '2018/2019']) |
|
| 63 | + ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id') |
|
| 64 | + ->where('academic_periods.code', $year) |
|
| 65 | + ->whereNotIn('institution_shifts.cloned', ['2020', '2018/2019']) |
|
| 66 | 66 | ->groupBy('institution_shifts.id') |
| 67 | 67 | ->limit($limit) |
| 68 | 68 | ->get() |
| 69 | 69 | ->toArray(); |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - public function getShiftsTodelete(string $year,$academic_period_id){ |
|
| 72 | + public function getShiftsTodelete(string $year, $academic_period_id) { |
|
| 73 | 73 | return self::query() |
| 74 | 74 | // ->select('institution_shifts.*','academic_periods.academic_period_id') |
| 75 | - ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id') |
|
| 76 | - ->where('academic_period_id',$academic_period_id) |
|
| 77 | - ->where('institution_shifts.cloned',$year) |
|
| 75 | + ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id') |
|
| 76 | + ->where('academic_period_id', $academic_period_id) |
|
| 77 | + ->where('institution_shifts.cloned', $year) |
|
| 78 | 78 | ->get()->toArray(); |
| 79 | 79 | } |
| 80 | 80 | } |
@@ -75,9 +75,9 @@ discard block |
||
| 75 | 75 | |
| 76 | 76 | ) |
| 77 | 77 | ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
| 78 | - ->join('education_grades','institution_class_grades.education_grade_id','education_grades.id') |
|
| 78 | + ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id') |
|
| 79 | 79 | ->join('education_programmes', 'education_grades.education_programme_id', 'education_programmes.id') |
| 80 | - ->join('education_cycles', 'education_programmes.education_cycle_id','education_cycles.id') |
|
| 80 | + ->join('education_cycles', 'education_programmes.education_cycle_id', 'education_cycles.id') |
|
| 81 | 81 | ->groupBy('institution_classes.id'); |
| 82 | 82 | |
| 83 | 83 | if ($al == true) { |
@@ -87,8 +87,8 @@ discard block |
||
| 87 | 87 | ->groupBy('institution_classes.id') |
| 88 | 88 | ->get()->toArray(); |
| 89 | 89 | return $data; |
| 90 | - } else { |
|
| 91 | - $query->where('education_programmes.education_cycle_id','<>',4) |
|
| 90 | + }else { |
|
| 91 | + $query->where('education_programmes.education_cycle_id', '<>', 4) |
|
| 92 | 92 | ->where('institution_shift_id', $shift['id']); |
| 93 | 93 | $data = $query |
| 94 | 94 | ->groupBy('institution_classes.id') |
@@ -97,13 +97,13 @@ discard block |
||
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - public static function getGradeClasses($education_grade_id,$institution_id){ |
|
| 100 | + public static function getGradeClasses($education_grade_id, $institution_id) { |
|
| 101 | 101 | return self::query() |
| 102 | - ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
| 103 | - 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
| 104 | - ->where('institution_class_grades.education_grade_id',$education_grade_id) |
|
| 105 | - ->where('institution_classes.institution_id',$institution_id) |
|
| 106 | - ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
| 102 | + ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
| 103 | + 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
| 104 | + ->where('institution_class_grades.education_grade_id', $education_grade_id) |
|
| 105 | + ->where('institution_classes.institution_id', $institution_id) |
|
| 106 | + ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
| 107 | 107 | ->get()->toArray(); |
| 108 | 108 | } |
| 109 | 109 | |
@@ -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 | ; |