moe-lk / bulk-upload

app/Http/Controllers/CloneController.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
     public function array_walk($shift, $count, $params)
     {
         try{
-           DB::beginTransaction();
+            DB::beginTransaction();
             array_walk($shift, array($this, 'process'), $params);
             DB::commit();
         }catch(\Exception $e){

Braces +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
            DB::beginTransaction();
             array_walk($shift, array($this, 'process'), $params);
             DB::commit();
-        }catch(\Exception $e){
+        } catch(\Exception $e){
             $this->output->writeln('Terminating ' . $shift['institution_id']);
             DB::rollBack();
         }

Spacing +38 added lines, -38 removed lines

@@ -31,21 +31,21 @@ 
         $this->academic_period = new Academic_period();
         $this->institution_classes = new Institution_class();
         $this->institution_class_subjects = new Institution_class_subject();
-        $this->institution_subjects =  new Institution_subject();
+        $this->institution_subjects = new Institution_subject();
         $this->institution_grades = new Institution_grade();
-        $this->education_grade_subjects =  new Education_grades_subject();
+        $this->education_grade_subjects = new Education_grades_subject();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
 
 
     public function array_walk($shift, $count, $params)
     {
-        try{
+        try {
            DB::beginTransaction();
             array_walk($shift, array($this, 'process'), $params);
             DB::commit();
-        }catch(\Exception $e){
-            $this->output->writeln('Terminating ' . $shift['institution_id']);
+        }catch (\Exception $e) {
+            $this->output->writeln('Terminating '.$shift['institution_id']);
             DB::rollBack();
         }
     }
@@ -59,24 +59,24 @@ 
         $this->shifts->where(['cloned' => $academicPeriod->code])->update(['cloned' => $params['previous_academic_period']['code']]);
         $this->output->writeln('updated shifts');
 
-        $classIds =  $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
+        $classIds = $this->institution_classes->select('id')->where(['academic_period_id' => $academicPeriod->id])->get()->toArray();
         $this->institution_classes->where(['academic_period_id' => $academicPeriod->id])->delete();
         $this->output->writeln('cleaned classes');
 
         do {
             $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();
             $this->output->writeln('cleaned subjects');
-        }while($deleted > 0);
+        } while ($deleted > 0);
 
         do {
-            $deleted =  $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(10000)->delete();
+            $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(10000)->delete();
             $this->output->writeln('10000 institutions cleaned subjects');
         } while ($deleted > 0);
     }
 
     public function process($shift, $count, $params)
     {
-        echo ('[' . getmypid() . ']This Process executed at' . date("F d, Y h:i:s A") . "\n");
+        echo ('['.getmypid().']This Process executed at'.date("F d, Y h:i:s A")."\n");
         $year = $params['year'];
         $academicPeriod = $params['academic_period'];
         $previousAcademicPeriod = $params['previous_academic_period'];
@@ -94,14 +94,14 @@ 
 
 
         if ($mode) {
-            $institutionClasses = $this->institution_classes->getShiftClasses($shift,  $mode, $params);
+            $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode, $params);
             try {
                 array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params);
-                $this->output->writeln('updating from ' . $shift['institution_id']);
-            } catch (\Exception $e) {
+                $this->output->writeln('updating from '.$shift['institution_id']);
+            }catch (\Exception $e) {
                 Log::error($e->getMessage(), [$e]);
             }
-        } else {
+        }else {
             $institutionSubjects = $this->institution_grades->getGradeSubjects($shift['institution_id']);
             try {
                 if ($data['created']) {
@@ -112,32 +112,32 @@ 
                         try {
                             array_walk($newInstitutionClasses, array($this, 'insertInstitutionClasses'), $params);
                             $this->output->writeln('##########################################################################################################################');
-                            $this->output->writeln('updating from = ' . $shift['institution_id']);
-                        } catch (\Exception $e) {
-                            $this->output->writeln('Terminating ' . $shift['institution_id']);
+                            $this->output->writeln('updating from = '.$shift['institution_id']);
+                        }catch (\Exception $e) {
+                            $this->output->writeln('Terminating '.$shift['institution_id']);
                             DB::rollBack();
                             Log::error($e->getMessage(), [$e]);
                         }
-                    } else {
-                        $this->output->writeln('no classes found ' . $shift['institution_id']);
+                    }else {
+                        $this->output->writeln('no classes found '.$shift['institution_id']);
                     }
-                } else {
+                }else {
                     try {
                         $shift['id'] = $shiftId;
                         $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode);
                         array_walk($institutionClasses, array($this, 'updateInstitutionClasses'), $params);
                         $this->output->writeln('##########################################################################################################################');
-                        $this->output->writeln('updating from ' . $shift['institution_id']);
-                    } catch (\Exception $e) {
-                        $this->output->writeln('Terminating ' . $shift['institution_id']);
+                        $this->output->writeln('updating from '.$shift['institution_id']);
+                    }catch (\Exception $e) {
+                        $this->output->writeln('Terminating '.$shift['institution_id']);
                         DB::rollBack();
                         Log::error($e->getMessage(), [$e]);
                     }
                 }
                 DB::commit();
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Log::error($e->getMessage(), [$e]);
-                $this->output->writeln('Terminating ' . $shift['institution_id']);
+                $this->output->writeln('Terminating '.$shift['institution_id']);
                 DB::rollBack();
             }
         }
@@ -156,7 +156,7 @@ 
             $subject['created'] = now();
             $subject['created_user_id'] = 1;
             $this->institution_subjects->create($subject);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
             Log::error($e->getMessage(), [$e]);
         }
@@ -167,14 +167,14 @@ 
         try {
             if ($params['mode']) {
                 Institution_class::where('id', $class['id'])
-                    ->where('academic_period_id',$params['previous_academic_period_id'])
+                    ->where('academic_period_id', $params['previous_academic_period_id'])
                     ->update([
                         'institution_shift_id' => $params['shift_id'],
                         'academic_period_id' => $params['academic_period_id']
                     ]);
 
                 Institution_class_student::where('institution_class_id', $class['id'])
-                    ->where('academic_period_id',$params['previous_academic_period_id'])    
+                    ->where('academic_period_id', $params['previous_academic_period_id'])    
                     ->update([
                         'academic_period_id' => $params['academic_period_id'],
                         'modified' => now()
@@ -183,12 +183,12 @@ 
                 $educationGrade = Institution_class_grade::select('education_grade_id')->where('institution_class_id', $class['id'])->get()->toArray();
 
                 Institution_student::whereIn('education_grade_id', $educationGrade)
-                    ->where('academic_period_id',$params['previous_academic_period_id'])
+                    ->where('academic_period_id', $params['previous_academic_period_id'])
                     ->update([
                         'academic_period_id' => $params['academic_period_id']
                     ]);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
             Log::error($e->getMessage(), [$e]);
         }
@@ -218,8 +218,8 @@ 
             $class['created'] = now();
             $class['institution_shift_id'] = $param['shift_id'];
             // $class['created_user_id'] = 
-            $this->output->writeln('Create class:' . $class['name']);
-            $class =  Institution_class::create($class);
+            $this->output->writeln('Create class:'.$class['name']);
+            $class = Institution_class::create($class);
             $institutionClassGrdaeObj['institution_class_id'] = $class->id;
             $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae;
             $institutionClassGrdaeObj['created_user_id'] = $class['created_user_id'];
@@ -231,7 +231,7 @@ 
                 ->toArray();
             $params['class'] = $class;
             $this->insertInstitutionClassSubjects($institutionSubjects, $class);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
             Log::error($e->getMessage(), [$e]);
         }
@@ -242,8 +242,8 @@ 
         if (!empty($subjects)) {
             try {
                 array_walk($subjects, array($this, 'insertClassSubjects'), $class);
-                $this->output->writeln('updating subjects ' . $class->name);
-            } catch (\Exception $e) {
+                $this->output->writeln('updating subjects '.$class->name);
+            }catch (\Exception $e) {
                 DB::rollBack();
                 Log::error($e->getMessage(), [$e]);
             }
@@ -264,7 +264,7 @@ 
             if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
                 $this->institution_class_subjects->create($subjectobj);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
             Log::error($e->getMessage(), [$e]);
         }
@@ -312,19 +312,19 @@ 
                 unset($shift['id']);
                 unset($shift['created']);
                 unset($shift['modified']);
-                $shift = $this->shifts->create((array)$shift);
+                $shift = $this->shifts->create((array) $shift);
                 $data = [
                     'shift_id' => $shift->id,
                     'created' => true
                 ];
-            } else {
+            }else {
                 $data = [
                     'shift_id' => $exist->id,
                     'created' => false
                 ];
             };
             return $data;
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
         }
     }

app/Console/Commands/CallPromotionCommand.php

Spacing +7 added lines, -7 removed lines

@@ -48,21 +48,21 @@
         $mode = $this->argument('mode');
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
         $previousAcademicPeriodYear = $academicPeriod->order;
-        $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first();
-        $institutions = $this->instituion_grade->getInstitutionGradeList($previousAcademicPeriod->code,$limit,$mode);
+        $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first();
+        $institutions = $this->instituion_grade->getInstitutionGradeList($previousAcademicPeriod->code, $limit, $mode);
         $params = [
             'year' => $year,
             'mode'=> $mode
         ];
-        if(in_array($mode,['AL','1-5','SP','6-11'])){
-            array_walk($institutions,array($this,'callPromotion'),$params);
-        }else{
+        if (in_array($mode, ['AL', '1-5', 'SP', '6-11'])) {
+            array_walk($institutions, array($this, 'callPromotion'), $params);
+        }else {
             die('The give mode not support');
         }
        
     }
 
-    protected function callPromotion($institution,$count,$params){
-        $this->call('promote:students',['year' => $params['year'],'institution' => $institution['code'],'mode' => $params['mode'] ]);
+    protected function callPromotion($institution, $count, $params) {
+        $this->call('promote:students', ['year' => $params['year'], 'institution' => $institution['code'], 'mode' => $params['mode']]);
     }
 }

Braces +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
         ];
         if(in_array($mode,['AL','1-5','SP','6-11'])){
             array_walk($institutions,array($this,'callPromotion'),$params);
-        }else{
+        } else{
             die('The give mode not support');
         }
        

app/Console/Commands/PromoteStudents.php

Spacing +3 added lines, -3 removed lines

@@ -65,15 +65,15 @@
         $institution = $this->argument('institution');
         $academicPeriod = $this->academic_period->getAcademicPeriod($year);
         $previousAcademicPeriodYear = $academicPeriod->order;
-        $previousAcademicPeriod = Academic_period::where('order',$previousAcademicPeriodYear+1)->first();
+        $previousAcademicPeriod = Academic_period::where('order', $previousAcademicPeriodYear + 1)->first();
         $mode = $this->argument('mode');
-        $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($previousAcademicPeriod->code,$institution,$mode);
+        $institutionGrade = $this->instituion_grade->getInstitutionGradeToPromoted($previousAcademicPeriod->code, $institution, $mode);
         $output->writeln('Start promoting:'.$institution);
         $params = [
             'academicPeriod' => $academicPeriod,
             'previousAcademicPeriod' => $previousAcademicPeriod
         ];
-        (new BulkPromotion())->callback($institutionGrade,$params);
+        (new BulkPromotion())->callback($institutionGrade, $params);
         $output->writeln('Finished promoting:'.$institution);
     }
 }

app/Models/Education_grades_subject.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Education_grades_subject extends Model  {
+class Education_grades_subject extends Model {
 
     /**
      * The database table used by the model.
@@ -42,12 +42,12 @@ 
     protected $dates = ['modified', 'created'];
 
 
-    public function institutionGradeSubject(){
-        return $this->hasMany('App\Models\Institution_subject','education_grade_id','education_grade_id');
+    public function institutionGradeSubject() {
+        return $this->hasMany('App\Models\Institution_subject', 'education_grade_id', 'education_grade_id');
     }
 
-    public function getGradeSubjects($educationGrade){
-        self::where('education_grade_id',$educationGrade['education_grade_id'])
+    public function getGradeSubjects($educationGrade) {
+        self::where('education_grade_id', $educationGrade['education_grade_id'])
         ->get()
         ->toArray();
         ;

app/Models/Institution_subject.php

Spacing +17 added lines, -17 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_subject extends Base_Model  {
+class Institution_subject extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -42,29 +42,29 @@ 
     protected $dates = ['modified', 'created', 'modified', 'created'];
 
 
-    public  function institutionGradeSubject(){
-        return $this->belongsTo('App\Models\Education_grades_subject','education_subject_id','education_subject_id');
+    public  function institutionGradeSubject() {
+        return $this->belongsTo('App\Models\Education_grades_subject', 'education_subject_id', 'education_subject_id');
     }
 
-    public  function institutionOptionalGradeSubject(){
-        return $this->belongsTo('App\Models\Education_grades_subject','education_grade_id','education_grade_id');
+    public  function institutionOptionalGradeSubject() {
+        return $this->belongsTo('App\Models\Education_grades_subject', 'education_grade_id', 'education_grade_id');
     }
 
-    public  function institutionMandatoryGradeSubject(){
-        return $this->belongsTo('App\Models\Education_grades_subject','education_grade_id','education_grade_id');
+    public  function institutionMandatoryGradeSubject() {
+        return $this->belongsTo('App\Models\Education_grades_subject', 'education_grade_id', 'education_grade_id');
     }
 
 
-    public  function institutionClassSubject(){
-        return $this->hasMany('App\Models\Institution_class_subject','institution_class_id','id');
+    public  function institutionClassSubject() {
+        return $this->hasMany('App\Models\Institution_class_subject', 'institution_class_id', 'id');
     }
 
 
 
-    public function getInstitutionSubjects($institution_id,$academic_period_id){
-        $query =  self::query()->where('institution_id',$institution_id)
-            ->where('academic_period_id',$academic_period_id)
-            ->join('education_grades_subjects','institution_subjects.education_subject_id','education_grades_subjects.id')
+    public function getInstitutionSubjects($institution_id, $academic_period_id) {
+        $query = self::query()->where('institution_id', $institution_id)
+            ->where('academic_period_id', $academic_period_id)
+            ->join('education_grades_subjects', 'institution_subjects.education_subject_id', 'education_grades_subjects.id')
             ->join('education_grades', 'education_grades_subjects.education_grade_id', 'education_grades.id')
             ->groupBy('education_grades_subjects.id');
         return $query->get()->toArray();
@@ -72,15 +72,15 @@ 
 
     public  static function getStudentsCount($institution_subject_id)
     {
-        $total_male_students = self::with(['student' => function ($query) {
+        $total_male_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 1);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 1);
         })->where('institution_subject_id', '=', $institution_subject_id)->count();
 
-        $total_female_students = self::with(['student' => function ($query) {
+        $total_female_students = self::with(['student' => function($query) {
             $query->where('student.gender_id', '=', 2);
-        }])->whereHas('student', function ($query) {
+        }])->whereHas('student', function($query) {
             $query->where('gender_id', '=', 2);
         })->where('institution_subject_id', '=', $institution_subject_id)->count();
 

app/Models/Education_grade.php

Spacing +14 added lines, -14 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Education_grade extends Model  {
+class Education_grade extends Model {
 
     /**
      * The database table used by the model.
@@ -41,17 +41,17 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function getNextGrade($gradeId,$getNextProgrammeGrades = false, $firstGradeOnly = false){
+    public function getNextGrade($gradeId, $getNextProgrammeGrades = false, $firstGradeOnly = false) {
         if (!empty($gradeId)) {
             $gradeObj = $this->find($gradeId);
             $programmeId = $gradeObj->education_programme_id;
             $order = $gradeObj->order;
-            $gradeOptions = self::where( 'education_programme_id',$programmeId
-            )->where('order',$order+1)->get()->first();
+            $gradeOptions = self::where('education_programme_id', $programmeId
+            )->where('order', $order + 1)->get()->first();
             $nextProgramme = self::getNextProgrammeList($programmeId);
-            if(is_null($gradeOptions) && !is_null($nextProgramme)){
-                $programmeId =  $nextProgramme->next_programme_id;
-                $gradeOptions = self::where( 'education_programme_id',$programmeId
+            if (is_null($gradeOptions) && !is_null($nextProgramme)) {
+                $programmeId = $nextProgramme->next_programme_id;
+                $gradeOptions = self::where('education_programme_id', $programmeId
                 )
                 ->orderBy('order')
                 ->get()->first();
@@ -68,7 +68,7 @@ 
 //                $results = $gradeOptions;
 //            }
             return $gradeOptions;
-        } else {
+        }else {
             return null;
         }
     }
@@ -80,15 +80,15 @@ 
 
             foreach ($nextProgrammeList as $nextProgrammeId) {
                 $nextProgrammeGradeResults = self::
-                    where('education_programme_id',$nextProgrammeId->next_programme_id)->get()->toArray();
+                    where('education_programme_id', $nextProgrammeId->next_programme_id)->get()->toArray();
 
                 $results = $results + [key($nextProgrammeGradeResults) => current($nextProgrammeGradeResults)];
             }
-        } else {
+        }else {
             $results = [];
         }
 
-        return (object)$results;
+        return (object) $results;
     }
 
 
@@ -102,9 +102,9 @@ 
 
         $nextProgrammeList = $this->getNextProgrammeList($id);
         if (!empty($nextProgrammeList)) {
-            $results = self::whereIn('education_programme_id',$nextProgrammeList)
+            $results = self::whereIn('education_programme_id', $nextProgrammeList)
                 ->get()->toArray();
-        } else {
+        }else {
             $results = [];
         }
 
@@ -118,7 +118,7 @@ 
      * @return array List of next education programmes id
      */
     public function getNextProgrammeList($id) {
-        return Education_programmes_next_programme::where('education_programme_id',$id)
+        return Education_programmes_next_programme::where('education_programme_id', $id)
             ->get()->first();
     }
 

app/Console/Commands/UpdateClassEntriyWithZeroId.php

Indentation +3 added lines, -3 removed lines

@@ -74,7 +74,7 @@ 
 
     public function process($student)
     {
-       try{
+        try{
         $wrongStudentsClass = Institution_class_student::where('institution_id', $student['institution_id'])
             ->whereRaw('institution_class_id not in (select id from institution_classes where institution_id ='.$student['institution_id'].' )')
             ->orWhere('institution_class_id', 0)
@@ -143,8 +143,8 @@ 
                 $this->output->writeln("student record  :".$student['student_id'] );
             }
         }
-       }catch(\Exception $e){
+        }catch(\Exception $e){
             dd($e);
-       }
+        }
     }
 }

Spacing +11 added lines, -11 removed lines

@@ -51,10 +51,10 @@ 
 
         if ($this->argument('code') !== 'All') {
             $institutions = Institution::where('code', $this->argument('code'))->get()->toArray();
-            processParallel(array($this,'processInstitution'),$institutions,$this->argument('max'));
-        } else {
+            processParallel(array($this, 'processInstitution'), $institutions, $this->argument('max'));
+        }else {
             $institutions = Institution::where('institution_status_id', 1)->get()->toArray();
-            processParallel(array($this,'processInstitution'),$institutions,$this->argument('max'));
+            processParallel(array($this, 'processInstitution'), $institutions, $this->argument('max'));
         }
     }
 
@@ -65,16 +65,16 @@ 
             ->where('institutions.id', $institution['id'])
             ->get()->toArray();
         if (count($students) > 0) {
-            array_walk($students,array($this, 'process'));
-            $this->output->writeln("institution :" .$institution['code']. ' cleaned');
-        } else {
-            $this->output->writeln("all records are cleaned at  :".$institution['code'] );
+            array_walk($students, array($this, 'process'));
+            $this->output->writeln("institution :".$institution['code'].' cleaned');
+        }else {
+            $this->output->writeln("all records are cleaned at  :".$institution['code']);
         }
     }
 
     public function process($student)
     {
-       try{
+       try {
         $wrongStudentsClass = Institution_class_student::where('institution_id', $student['institution_id'])
             ->whereRaw('institution_class_id not in (select id from institution_classes where institution_id ='.$student['institution_id'].' )')
             ->orWhere('institution_class_id', 0)
@@ -88,7 +88,7 @@ 
 
             array_walk($wrongStudentsClass, array($this->class, 'updateClassCount'));
 
-            $institutionClass =  Institution_class::getGradeClasses($student['education_grade_id'], $student['institution_id']);
+            $institutionClass = Institution_class::getGradeClasses($student['education_grade_id'], $student['institution_id']);
 
             if (count($institutionClass) == 1) {
                 $start_date = new Carbon($student['start_date']);
@@ -140,10 +140,10 @@ 
                 ]);
                 $institutionClassStudent = [$institutionClassStudent];
                 array_walk($institutionClassStudent, array($this->class, 'updateClassCount'));
-                $this->output->writeln("student record  :".$student['student_id'] );
+                $this->output->writeln("student record  :".$student['student_id']);
             }
         }
-       }catch(\Exception $e){
+       }catch (\Exception $e) {
             dd($e);
        }
     }

Braces +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
                 $this->output->writeln("student record  :".$student['student_id'] );
             }
         }
-       }catch(\Exception $e){
+       } catch(\Exception $e){
             dd($e);
        }
     }

app/Models/Institution_shift.php

Spacing +4 added lines, -4 removed lines

@@ -68,12 +68,12 @@
             ->where('academic_periods.code', $year);
 
         if ($mode) {
-            $query->whereIn('institution_shifts.cloned',['2020']);
-        } else {
-            $query->whereNotIn('institution_shifts.cloned',['2020','2019/2020']);
+            $query->whereIn('institution_shifts.cloned', ['2020']);
+        }else {
+            $query->whereNotIn('institution_shifts.cloned', ['2020', '2019/2020']);
         }
         
-        $data =    $query->groupBy('institution_shifts.id')
+        $data = $query->groupBy('institution_shifts.id')
             ->limit($limit)
             ->get()
             ->toArray();

app/Models/Institution_class.php

Spacing +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
     }
 
 
-    public function getShiftClasses($shift, $al , $param = [])
+    public function getShiftClasses($shift, $al, $param = [])
     {
         $query = self::query()
             ->select(
@@ -75,20 +75,20 @@ 
 
             )
             ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id')
-            ->join('education_grades','institution_class_grades.education_grade_id','education_grades.id')  
+            ->join('education_grades', 'institution_class_grades.education_grade_id', 'education_grades.id')  
             ->join('education_programmes', 'education_grades.education_programme_id', 'education_programmes.id')
-            ->join('education_cycles', 'education_programmes.education_cycle_id','education_cycles.id')
+            ->join('education_cycles', 'education_programmes.education_cycle_id', 'education_cycles.id')
             ->groupBy('institution_classes.id');
 
         if ($al == true) {
             $query->where('education_programmes.education_cycle_id', 4)
             ->where('institution_shift_id', $shift['id'])
-            ->where('institution_classes.academic_period_id',$param['previous_academic_period_id']);
+            ->where('institution_classes.academic_period_id', $param['previous_academic_period_id']);
             $data = $query
             ->groupBy('institution_classes.id')
             ->get()->toArray();
             return $data;
-        } else {
+        }else {
             $query
             // ->where('education_programmes.education_cycle_id','<>',4)
             ->where('institution_shift_id', $shift['id']);
@@ -99,13 +99,13 @@ 
         }
     }
 
-    public static function getGradeClasses($education_grade_id,$institution_id){
+    public static function getGradeClasses($education_grade_id, $institution_id) {
         return self::query()
-        ->select('institution_classes.id','institution_classes.institution_id','institution_classes.institution_shift_id',
-            'institution_classes.name','institution_classes.no_of_students','institution_classes.class_number','institution_class_grades.education_grade_id')
-        ->where('institution_class_grades.education_grade_id',$education_grade_id)
-        ->where('institution_classes.institution_id',$institution_id)
-        ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id')
+        ->select('institution_classes.id', 'institution_classes.institution_id', 'institution_classes.institution_shift_id',
+            'institution_classes.name', 'institution_classes.no_of_students', 'institution_classes.class_number', 'institution_class_grades.education_grade_id')
+        ->where('institution_class_grades.education_grade_id', $education_grade_id)
+        ->where('institution_classes.institution_id', $institution_id)
+        ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id')
         ->get()->toArray();
     }