@@ -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 | |
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | use Illuminate\Database\Eloquent\Model; |
| 6 | 6 | |
| 7 | -class Education_grade extends Model { |
|
| 7 | +class Education_grade extends Model { |
|
| 8 | 8 | |
| 9 | 9 | /** |
| 10 | 10 | * The database table used by the model. |
@@ -41,17 +41,17 @@ discard block |
||
| 41 | 41 | */ |
| 42 | 42 | protected $dates = ['modified', 'created']; |
| 43 | 43 | |
| 44 | - public function getNextGrade($gradeId,$getNextProgrammeGrades = false, $firstGradeOnly = false){ |
|
| 44 | + public function getNextGrade($gradeId, $getNextProgrammeGrades = false, $firstGradeOnly = false) { |
|
| 45 | 45 | if (!empty($gradeId)) { |
| 46 | 46 | $gradeObj = $this->find($gradeId); |
| 47 | 47 | $programmeId = $gradeObj->education_programme_id; |
| 48 | 48 | $order = $gradeObj->order; |
| 49 | - $gradeOptions = self::where( 'education_programme_id',$programmeId |
|
| 50 | - )->where('order',$order+1)->get()->first(); |
|
| 49 | + $gradeOptions = self::where('education_programme_id', $programmeId |
|
| 50 | + )->where('order', $order + 1)->get()->first(); |
|
| 51 | 51 | $nextProgramme = self::getNextProgrammeList($programmeId); |
| 52 | - if(is_null($gradeOptions) && !is_null($nextProgramme)){ |
|
| 53 | - $programmeId = $nextProgramme->next_programme_id; |
|
| 54 | - $gradeOptions = self::where( 'education_programme_id',$programmeId |
|
| 52 | + if (is_null($gradeOptions) && !is_null($nextProgramme)) { |
|
| 53 | + $programmeId = $nextProgramme->next_programme_id; |
|
| 54 | + $gradeOptions = self::where('education_programme_id', $programmeId |
|
| 55 | 55 | ) |
| 56 | 56 | ->orderBy('order') |
| 57 | 57 | ->get()->first(); |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | // $results = $gradeOptions; |
| 69 | 69 | // } |
| 70 | 70 | return $gradeOptions; |
| 71 | - } else { |
|
| 71 | + }else { |
|
| 72 | 72 | return null; |
| 73 | 73 | } |
| 74 | 74 | } |
@@ -80,15 +80,15 @@ discard block |
||
| 80 | 80 | |
| 81 | 81 | foreach ($nextProgrammeList as $nextProgrammeId) { |
| 82 | 82 | $nextProgrammeGradeResults = self:: |
| 83 | - where('education_programme_id',$nextProgrammeId->next_programme_id)->get()->toArray(); |
|
| 83 | + where('education_programme_id', $nextProgrammeId->next_programme_id)->get()->toArray(); |
|
| 84 | 84 | |
| 85 | 85 | $results = $results + [key($nextProgrammeGradeResults) => current($nextProgrammeGradeResults)]; |
| 86 | 86 | } |
| 87 | - } else { |
|
| 87 | + }else { |
|
| 88 | 88 | $results = []; |
| 89 | 89 | } |
| 90 | 90 | |
| 91 | - return (object)$results; |
|
| 91 | + return (object) $results; |
|
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | |
@@ -102,9 +102,9 @@ discard block |
||
| 102 | 102 | |
| 103 | 103 | $nextProgrammeList = $this->getNextProgrammeList($id); |
| 104 | 104 | if (!empty($nextProgrammeList)) { |
| 105 | - $results = self::whereIn('education_programme_id',$nextProgrammeList) |
|
| 105 | + $results = self::whereIn('education_programme_id', $nextProgrammeList) |
|
| 106 | 106 | ->get()->toArray(); |
| 107 | - } else { |
|
| 107 | + }else { |
|
| 108 | 108 | $results = []; |
| 109 | 109 | } |
| 110 | 110 | |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | * @return array List of next education programmes id |
| 119 | 119 | */ |
| 120 | 120 | public function getNextProgrammeList($id) { |
| 121 | - return Education_programmes_next_programme::where('education_programme_id',$id) |
|
| 121 | + return Education_programmes_next_programme::where('education_programme_id', $id) |
|
| 122 | 122 | ->get()->first(); |
| 123 | 123 | } |
| 124 | 124 | |
@@ -58,7 +58,7 @@ discard block |
||
| 58 | 58 | public static function boot() |
| 59 | 59 | { |
| 60 | 60 | parent::boot(); |
| 61 | - self::creating(function ($model) { |
|
| 61 | + self::creating(function($model) { |
|
| 62 | 62 | $model->id = (string) Uuid::generate(4); |
| 63 | 63 | $model->created = now(); |
| 64 | 64 | }); |
@@ -71,15 +71,15 @@ discard block |
||
| 71 | 71 | |
| 72 | 72 | public static function getStudentsCount($institution_class_id) |
| 73 | 73 | { |
| 74 | - $total_male_students = self::with(['student' => function ($query) { |
|
| 74 | + $total_male_students = self::with(['student' => function($query) { |
|
| 75 | 75 | $query->where('student.gender_id', '=', 1); |
| 76 | - }])->whereHas('student', function ($query) { |
|
| 76 | + }])->whereHas('student', function($query) { |
|
| 77 | 77 | $query->where('gender_id', '=', 1); |
| 78 | 78 | })->where('institution_class_id', '=', $institution_class_id)->count(); |
| 79 | 79 | |
| 80 | - $total_female_students = self::with(['student' => function ($query) { |
|
| 80 | + $total_female_students = self::with(['student' => function($query) { |
|
| 81 | 81 | $query->where('student.gender_id', '=', 2); |
| 82 | - }])->whereHas('student', function ($query) { |
|
| 82 | + }])->whereHas('student', function($query) { |
|
| 83 | 83 | $query->where('gender_id', '=', 2); |
| 84 | 84 | })->where('institution_class_id', '=', $institution_class_id)->count(); |
| 85 | 85 | |
@@ -109,8 +109,8 @@ discard block |
||
| 109 | 109 | ->where('student_id', $student['student_id']) |
| 110 | 110 | ->join('institution_classes', 'institution_class_students.institution_class_id', '=', 'institution_classes.id') |
| 111 | 111 | ->where('institution_class_students.student_id', $student['student_id']) |
| 112 | - ->where('institution_class_students.academic_period_id',$student['academic_period_id']) |
|
| 113 | - ->where('institution_class_students.institution_id',$student['institution_id']) |
|
| 112 | + ->where('institution_class_students.academic_period_id', $student['academic_period_id']) |
|
| 113 | + ->where('institution_class_students.institution_id', $student['institution_id']) |
|
| 114 | 114 | ->whereNull('institution_class_students.deleted_at') |
| 115 | 115 | ->get()->first(); |
| 116 | 116 | } |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | 'institution_id' => $admissionInfo['instituion']->id, |
| 135 | 135 | 'student_status_id' => 1 |
| 136 | 136 | ]); |
| 137 | - } catch (\Throwable $th) { |
|
| 137 | + }catch (\Throwable $th) { |
|
| 138 | 138 | Log::error($th); |
| 139 | 139 | } |
| 140 | 140 | } |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | |
| 75 | 75 | public function process($student) |
| 76 | 76 | { |
| 77 | - try{ |
|
| 77 | + try{ |
|
| 78 | 78 | $wrongStudentsClass = Institution_class_student::where('institution_id', $student['institution_id']) |
| 79 | 79 | ->whereRaw('institution_class_id not in (select id from institution_classes where institution_id ='.$student['institution_id'].' )') |
| 80 | 80 | ->orWhere('institution_class_id', 0) |
@@ -143,8 +143,8 @@ discard block |
||
| 143 | 143 | $this->output->writeln("student record :".$student['student_id'] ); |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | - }catch(\Exception $e){ |
|
| 146 | + }catch(\Exception $e){ |
|
| 147 | 147 | dd($e); |
| 148 | - } |
|
| 148 | + } |
|
| 149 | 149 | } |
| 150 | 150 | } |
@@ -51,10 +51,10 @@ discard block |
||
| 51 | 51 | |
| 52 | 52 | if ($this->argument('code') !== 'All') { |
| 53 | 53 | $institutions = Institution::where('code', $this->argument('code'))->get()->toArray(); |
| 54 | - processParallel(array($this,'processInstitution'),$institutions,$this->argument('max')); |
|
| 55 | - } else { |
|
| 54 | + processParallel(array($this, 'processInstitution'), $institutions, $this->argument('max')); |
|
| 55 | + }else { |
|
| 56 | 56 | $institutions = Institution::where('institution_status_id', 1)->get()->toArray(); |
| 57 | - processParallel(array($this,'processInstitution'),$institutions,$this->argument('max')); |
|
| 57 | + processParallel(array($this, 'processInstitution'), $institutions, $this->argument('max')); |
|
| 58 | 58 | } |
| 59 | 59 | } |
| 60 | 60 | |
@@ -65,16 +65,16 @@ discard block |
||
| 65 | 65 | ->where('institutions.id', $institution['id']) |
| 66 | 66 | ->get()->toArray(); |
| 67 | 67 | if (count($students) > 0) { |
| 68 | - array_walk($students,array($this, 'process')); |
|
| 69 | - $this->output->writeln("institution :" .$institution['code']. ' cleaned'); |
|
| 70 | - } else { |
|
| 71 | - $this->output->writeln("all records are cleaned at :".$institution['code'] ); |
|
| 68 | + array_walk($students, array($this, 'process')); |
|
| 69 | + $this->output->writeln("institution :".$institution['code'].' cleaned'); |
|
| 70 | + }else { |
|
| 71 | + $this->output->writeln("all records are cleaned at :".$institution['code']); |
|
| 72 | 72 | } |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | public function process($student) |
| 76 | 76 | { |
| 77 | - try{ |
|
| 77 | + try { |
|
| 78 | 78 | $wrongStudentsClass = Institution_class_student::where('institution_id', $student['institution_id']) |
| 79 | 79 | ->whereRaw('institution_class_id not in (select id from institution_classes where institution_id ='.$student['institution_id'].' )') |
| 80 | 80 | ->orWhere('institution_class_id', 0) |
@@ -88,7 +88,7 @@ discard block |
||
| 88 | 88 | |
| 89 | 89 | array_walk($wrongStudentsClass, array($this->class, 'updateClassCount')); |
| 90 | 90 | |
| 91 | - $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'], $student['institution_id']); |
|
| 91 | + $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'], $student['institution_id']); |
|
| 92 | 92 | |
| 93 | 93 | if (count($institutionClass) == 1) { |
| 94 | 94 | $start_date = new Carbon($student['start_date']); |
@@ -140,10 +140,10 @@ discard block |
||
| 140 | 140 | ]); |
| 141 | 141 | $institutionClassStudent = [$institutionClassStudent]; |
| 142 | 142 | array_walk($institutionClassStudent, array($this->class, 'updateClassCount')); |
| 143 | - $this->output->writeln("student record :".$student['student_id'] ); |
|
| 143 | + $this->output->writeln("student record :".$student['student_id']); |
|
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | - }catch(\Exception $e){ |
|
| 146 | + }catch (\Exception $e) { |
|
| 147 | 147 | dd($e); |
| 148 | 148 | } |
| 149 | 149 | } |
@@ -143,7 +143,7 @@ |
||
| 143 | 143 | $this->output->writeln("student record :".$student['student_id'] ); |
| 144 | 144 | } |
| 145 | 145 | } |
| 146 | - }catch(\Exception $e){ |
|
| 146 | + } catch(\Exception $e){ |
|
| 147 | 147 | dd($e); |
| 148 | 148 | } |
| 149 | 149 | } |
@@ -68,12 +68,12 @@ |
||
| 68 | 68 | ->where('academic_periods.code', $year); |
| 69 | 69 | |
| 70 | 70 | if ($mode) { |
| 71 | - $query->whereIn('institution_shifts.cloned',['2020']); |
|
| 72 | - } else { |
|
| 73 | - $query->whereNotIn('institution_shifts.cloned',['2020','2019/2020']); |
|
| 71 | + $query->whereIn('institution_shifts.cloned', ['2020']); |
|
| 72 | + }else { |
|
| 73 | + $query->whereNotIn('institution_shifts.cloned', ['2020', '2019/2020']); |
|
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - $data = $query->groupBy('institution_shifts.id') |
|
| 76 | + $data = $query->groupBy('institution_shifts.id') |
|
| 77 | 77 | ->limit($limit) |
| 78 | 78 | ->get() |
| 79 | 79 | ->toArray(); |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | |
| 63 | - public function getShiftClasses($shift, $al , $param = []) |
|
| 63 | + public function getShiftClasses($shift, $al, $param = []) |
|
| 64 | 64 | { |
| 65 | 65 | $query = self::query() |
| 66 | 66 | ->select( |
@@ -75,20 +75,20 @@ 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) { |
| 84 | 84 | $query->where('education_programmes.education_cycle_id', 4) |
| 85 | 85 | ->where('institution_shift_id', $shift['id']) |
| 86 | - ->where('institution_classes.academic_period_id',$param['previous_academic_period_id']); |
|
| 86 | + ->where('institution_classes.academic_period_id', $param['previous_academic_period_id']); |
|
| 87 | 87 | $data = $query |
| 88 | 88 | ->groupBy('institution_classes.id') |
| 89 | 89 | ->get()->toArray(); |
| 90 | 90 | return $data; |
| 91 | - } else { |
|
| 91 | + }else { |
|
| 92 | 92 | $query |
| 93 | 93 | // ->where('education_programmes.education_cycle_id','<>',4) |
| 94 | 94 | ->where('institution_shift_id', $shift['id']); |
@@ -99,13 +99,13 @@ discard block |
||
| 99 | 99 | } |
| 100 | 100 | } |
| 101 | 101 | |
| 102 | - public static function getGradeClasses($education_grade_id,$institution_id){ |
|
| 102 | + public static function getGradeClasses($education_grade_id, $institution_id) { |
|
| 103 | 103 | return self::query() |
| 104 | - ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id', |
|
| 105 | - 'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id') |
|
| 106 | - ->where('institution_class_grades.education_grade_id',$education_grade_id) |
|
| 107 | - ->where('institution_classes.institution_id',$institution_id) |
|
| 108 | - ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id') |
|
| 104 | + ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id', |
|
| 105 | + 'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id') |
|
| 106 | + ->where('institution_class_grades.education_grade_id', $education_grade_id) |
|
| 107 | + ->where('institution_classes.institution_id', $institution_id) |
|
| 108 | + ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id') |
|
| 109 | 109 | ->get()->toArray(); |
| 110 | 110 | } |
| 111 | 111 | |