moe-lk / bulk-upload

app/Http/Controllers/CloneController.php

Spacing +27 added lines, -27 removed lines

@@ -30,8 +30,8 @@ 
         $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->education_grade_subjects =  new Education_grades_subject();
+        $this->institution_subjects = new Institution_subject();
+        $this->education_grade_subjects = new Education_grades_subject();
         $this->output = new \Symfony\Component\Console\Output\ConsoleOutput();
     }
 
@@ -50,7 +50,7 @@ 
         $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');
 
@@ -58,14 +58,14 @@ 
         $this->output->writeln('cleaned subjects');
 
         do {
-            $deleted =  $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
+            $deleted = $this->institution_subjects->where('academic_period_id', $academicPeriod->id)->limit(100000)->delete();
             $this->output->writeln('100000 institutions cleaned shifts');
         } 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'];
@@ -83,14 +83,14 @@ 
 
 
         if ($mode) {
-            $institutionClasses = $this->institution_classes->getShiftClasses($shift,  $mode);
+            $institutionClasses = $this->institution_classes->getShiftClasses($shift, $mode);
             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_subjects->getInstitutionSubjects($shift['institution_id'], $previousAcademicPeriod->id, $mode);
             try {
                 if ($data['created']) {
@@ -101,25 +101,25 @@ 
                         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('updating from '.$shift['institution_id']);
+                        }catch (\Exception $e) {
                             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('updating from '.$shift['institution_id']);
+                    }catch (\Exception $e) {
                         Log::error($e->getMessage(), [$e]);
                     }
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 Log::error($e->getMessage(), [$e]);
             }
         }
@@ -140,7 +140,7 @@ 
             unset($subjects['total_female_students']);
             unset($subjects['id']);
             $this->institution_subjects->create($subjects);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -168,7 +168,7 @@ 
                         'academic_period_id' => $params['academic_period_id']
                     ]);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -197,7 +197,7 @@ 
             $class['created'] = now();
             $class['institution_shift_id'] = $param['shift_id'];
             // $class['created_user_id'] = 
-            $this->output->writeln('Create class:' . $class['name']);
+            $this->output->writeln('Create class:'.$class['name']);
             $class = Institution_class::create($class);
             $institutionClassGrdaeObj['institution_class_id'] = $class->id;
             $institutionClassGrdaeObj['education_grade_id'] = $educationGrdae;
@@ -212,7 +212,7 @@ 
             $params['class'] = $class;
             $this->insertInstitutionClassSubjects($institutionSubjects, $class);
             //                array_walk($classSubjects,array($this,'insertInstitutionClassSubjects'),$params);
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -222,8 +222,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) {
                 Log::error($e->getMessage(), [$e]);
             }
         };
@@ -243,7 +243,7 @@ 
             if (!$this->institution_class_subjects->isDuplicated($subjectobj)) {
                 $this->institution_class_subjects->create($subjectobj);
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             Log::error($e->getMessage(), [$e]);
         }
     }
@@ -290,19 +290,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) {
             dd($e);
         }
     }

app/Http/Controllers/BulkPromotion.php

Spacing +14 added lines, -14 removed lines

@@ -96,7 +96,7 @@ 
 
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
             $output->writeln('##########################################################################################################################');
-            $output->writeln('Promoting from ' . $institutionGrade['name'] . ' IN ' . $institution->name . ' No of Students: ' . count($studentListToPromote));
+            $output->writeln('Promoting from '.$institutionGrade['name'].' IN '.$institution->name.' No of Students: '.count($studentListToPromote));
 
 
             if (!empty($parallelClasses)) {
@@ -110,7 +110,7 @@ 
                 array_walk($studentListToPromote, array($this, 'assingeToClasses'), $params);
                 array_walk($parallelClasses, array($this, 'updateStudentCount'));
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             dd($e);
             Log::error($e->getMessage());
         }
@@ -144,7 +144,7 @@ 
         $academicPeriod = $params['academicPeriod'];
         $previousAcademicPeriod = $params['previousAcademicPeriod'];
         $nextGradeObj = null;
-        if ($nextGrade !== []  && !is_null($nextGrade)) {
+        if ($nextGrade !== [] && !is_null($nextGrade)) {
             $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $previousAcademicPeriod->id);
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $academicPeriod->id);
         }
@@ -154,7 +154,7 @@ 
                 // promote parallel classes
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !==  $currentGradeObj->count())) {
+            } elseif (($nextGradeObj->count() > 1) && ($nextGradeObj->count() !== $currentGradeObj->count())) {
                 // promote pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1);
                 return 2;
@@ -162,12 +162,12 @@ 
                 // Promote matching class name with previous class
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, $nextGradeObj->toArray(), 1);
                 return 1;
-            } else {
+            }else {
                 // default pool promotion
                 $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 1);
                 return 2;
             }
-        } else {
+        }else {
             // default pool promotion
             $this->promotion($institutionGrade, $nextGrade, $previousAcademicPeriod, $academicPeriod, [], 3);
             return 2;
@@ -203,10 +203,10 @@ 
         ];
 
         try {
-            Institution_student::where('id', (string)$student['id'])->update($studentData);
+            Institution_student::where('id', (string) $student['id'])->update($studentData);
             $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-            $output->writeln('----------------- ' . $student['admission_id'] . ' to ' . $studentData['education_grade_id']);
-        } catch (\Exception $e) {
+            $output->writeln('----------------- '.$student['admission_id'].' to '.$studentData['education_grade_id']);
+        }catch (\Exception $e) {
             dd($e);
             Log::error($e->getMessage());
         }
@@ -227,7 +227,7 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             return  array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-        } else {
+        }else {
             return false;
         }
     }
@@ -279,11 +279,11 @@ 
                 if (!$this->institution_class_students->isDuplicated($studentObj)) {
                     $this->institution_class_students->create($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
-                } else {
-                    $this->institution_class_students->where('id', (string)$student['id'])->update($studentObj);
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
+                }else {
+                    $this->institution_class_students->where('id', (string) $student['id'])->update($studentObj);
                     $output = new \Symfony\Component\Console\Output\ConsoleOutput();
-                    $output->writeln('----------------- ' . $student['student_id'] . 'to ' . $class['name']);
+                    $output->writeln('----------------- '.$student['student_id'].'to '.$class['name']);
                 }
             }
         }

app/Imports/StudentUpdate.php

Indentation +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
                 if(!empty($row['admission_no'])){
                     Institution_student::where('student_id','=',$studentInfo->id)
                     ->where('institution_id','=', $institution)
-                   // ->where('academic_period_id','=',$academicPeriod->id)
+                    // ->where('academic_period_id','=',$academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
                 if (!empty($row['special_need'])) {

Spacing +37 added lines, -37 removed lines

@@ -55,7 +55,7 @@ 
 use Maatwebsite\Excel\Concerns\WithMultipleSheets;
 use Maatwebsite\Excel\Concerns\RegistersEventListeners;
 
-class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation , SkipsOnFailure , SkipsOnError{
+class StudentUpdate extends Import implements  ToModel, WithStartRow, WithHeadingRow, WithMultipleSheets, WithEvents, WithMapping, WithLimit, WithBatchInserts, WithValidation, SkipsOnFailure, SkipsOnError{
 
     use Importable,
         RegistersEventListeners,
@@ -110,8 +110,8 @@ 
                         break;
                 }
 
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')->first();
-                $nationalityId = Nationality::where('name', 'like', '%' . $row['nationality'] . '%')->first();
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')->first();
+                $nationalityId = Nationality::where('name', 'like', '%'.$row['nationality'].'%')->first();
                 //$identityType = Identity_type::where('national_code', 'like', '%' . $row['identity_type'] . '%')->first();
                 //$academicPeriod = Academic_period::where('name', '=', $institutionClass->academic_period_id)->first();
                 //$academicPeriod = Academic_period::where('name', '=',$row['academic_period'])->first();
@@ -161,9 +161,9 @@ 
                     ->update(['admission_id'=> $row['admission_no']]);
                 }*/
 
-                if(!empty($row['admission_no'])){
-                    Institution_student::where('student_id','=',$studentInfo->id)
-                    ->where('institution_id','=', $institution)
+                if (!empty($row['admission_no'])) {
+                    Institution_student::where('student_id', '=', $studentInfo->id)
+                    ->where('institution_id', '=', $institution)
                    // ->where('academic_period_id','=',$academicPeriod->id)
                     ->update(['admission_id'=> $row['admission_no']]);
                 }
@@ -189,17 +189,17 @@ 
                 if (!empty($row['bmi_height']) && (!empty($row['bmi_weight']))) {
 
                     // convert Meeter to CM
-                    $hight = $row['bmi_height'] / 100;
+                    $hight = $row['bmi_height']/100;
 
                     //calculate BMI
-                    $bodyMass = ($row['bmi_weight']) / pow($hight, 2);
+                    $bodyMass = ($row['bmi_weight'])/pow($hight, 2);
 
                     $bmiAcademic = Academic_period::where('name', '=', $row['bmi_academic_period'])->first();
-                    $count = User_body_mass::where('academic_period_id' ,'=',$bmiAcademic->id )
-                            ->where('security_user_id','=',$student->student_id)->count();
+                    $count = User_body_mass::where('academic_period_id', '=', $bmiAcademic->id)
+                            ->where('security_user_id', '=', $student->student_id)->count();
 
                     \Log::debug('User_body_mass');
-                    if(!($count > 0)){
+                    if (!($count > 0)) {
                         User_body_mass::create([
                             'height' => $row['bmi_height'],
                             'weight' => $row['bmi_weight'],
@@ -213,10 +213,10 @@ 
                 }
 
                 if (!empty($row['fathers_full_name']) && ($row['fathers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['fathers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['fathers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['fathers_identity_type'] . '%')->first();
-                    $openemisFather =  $this->uniqueUid::getUniqueAlphanumeric();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['fathers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['fathers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['fathers_identity_type'].'%')->first();
+                    $openemisFather = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = ($identityType !== null) ? $identityType->id : null;
                     $nationalityId = $nationalityId !== null ? $nationalityId->id : null;
@@ -230,7 +230,7 @@ 
 
                     if ($father === null) {
                         $data = [
-                            'username' => str_replace('-','',$openemisFather),
+                            'username' => str_replace('-', '', $openemisFather),
                             'openemis_no' => $openemisFather,
                             'first_name' => $row['fathers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                             'last_name' => genNameWithInitials($row['fathers_full_name']),
@@ -249,25 +249,25 @@ 
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $father->id)
                                 ->update(['is_guardian' => 1]);
                         $father['guardian_relation_id'] = 1;
                         if (array_key_exists('fathers_phone', $row)) {
                             $father['contact'] = $row['fathers_phone'];
-                            User_contact::createOrUpdate($father,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($father, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $father, $this->file['security_user_id']);
                     }
                 }
 
                 if (!empty($row['mothers_full_name']) && ($row['mothers_date_of_birth_yyyy_mm_dd'] !== null)) {
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['mothers_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['mothers_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['mothers_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['mothers_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['mothers_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['mothers_identity_type'].'%')->first();
                     $openemisMother = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -282,7 +282,7 @@ 
 
                     if ($mother === null) {
                         $mother = Security_user::create([
-                                    'username' => str_replace('-','',$openemisMother),
+                                    'username' => str_replace('-', '', $openemisMother),
                                     'openemis_no' => $openemisMother,
                                     'first_name' => $row['mothers_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['mothers_full_name']),
@@ -300,16 +300,16 @@ 
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $mother->id)
                                 ->update(['is_guardian' => 1]);
                         $mother['guardian_relation_id'] = 2;
                         if (array_key_exists('mothers_phone', $row)) {
                             $mother['contact'] = $row['mothers_phone'];
-                            User_contact::createOrUpdate($mother,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($mother, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $mother, $this->file['security_user_id']);
                     }
@@ -318,9 +318,9 @@ 
 
                 if (!empty($row['guardians_full_name']) && ($row['guardians_date_of_birth_yyyy_mm_dd'] !== null)) {
                     $genderId = $row['guardians_gender_mf'] == 'M' ? 1 : 2;
-                    $AddressArea = Area_administrative::where('name', 'like', '%' . $row['guardians_address_area'] . '%')->first();
-                    $nationalityId = Nationality::where('name', 'like', '%' . $row['guardians_nationality'] . '%')->first();
-                    $identityType = Identity_type::where('national_code', 'like', '%' . $row['guardians_identity_type'] . '%')->first();
+                    $AddressArea = Area_administrative::where('name', 'like', '%'.$row['guardians_address_area'].'%')->first();
+                    $nationalityId = Nationality::where('name', 'like', '%'.$row['guardians_nationality'].'%')->first();
+                    $identityType = Identity_type::where('national_code', 'like', '%'.$row['guardians_identity_type'].'%')->first();
                     $openemisGuardian = $this->uniqueUid::getUniqueAlphanumeric();
 
                     $identityType = $identityType !== null ? $identityType->id : null;
@@ -335,7 +335,7 @@ 
 
                     if ($guardian === null) {
                         $guardian = Security_user::create([
-                                    'username' => str_replace('-','',$openemisGuardian),
+                                    'username' => str_replace('-', '', $openemisGuardian),
                                     'openemis_no' => $openemisGuardian,
                                     'first_name' => $row['guardians_full_name'], // here we save full name in the column of first name. re reduce breaks of the system.
                                     'last_name' => genNameWithInitials($row['guardians_full_name']),
@@ -354,23 +354,23 @@ 
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
-                    } else {
+                    }else {
                         Security_user::where('id', '=', $guardian->id)
                                 ->update(['is_guardian' => 1]);
                         $guardian['guardian_relation_id'] = 3;
                         if (array_key_exists('guardians_phone', $row)) {
                             $guardian['contact'] = $row['guardians_phone'];
-                            User_contact::createOrUpdate($guardian,$this->file['security_user_id']);
+                            User_contact::createOrUpdate($guardian, $this->file['security_user_id']);
                         }
                         Student_guardian::createStudentGuardian($student, $guardian, $this->file['security_user_id']);
                     }
                 }
                 Institution_student::updateStudentArea($student);
 
-                $optionalSubjects =  Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
+                $optionalSubjects = Institution_class_subject::getStudentOptionalSubject($subjects, $student, $row, $institution);
 
                 $allSubjects = array_merge_recursive($optionalSubjects, $mandatorySubject);
                 // $stundetSubjects = $this->getStudentSubjects($student);
@@ -379,10 +379,10 @@ 
                 if (!empty($allSubjects)) {
                     $allSubjects = unique_multidim_array($allSubjects, 'institution_subject_id');
                     $this->student = $student;
-                    $allSubjects = array_map(array($this,'setStudentSubjects'),$allSubjects);
+                    $allSubjects = array_map(array($this, 'setStudentSubjects'), $allSubjects);
                     // $allSubjects = array_unique($allSubjects,SORT_REGULAR);
                     $allSubjects = unique_multidim_array($allSubjects, 'education_subject_id');
-                    array_walk($allSubjects,array($this,'insertSubject'));
+                    array_walk($allSubjects, array($this, 'insertSubject'));
                     array_walk($allSubjects, array($this, 'updateSubjectCount'));
                 }
 
@@ -395,7 +395,7 @@ 
                             'total_male_students' => $totalStudents['total_male_students'],
                             'total_female_students' => $totalStudents['total_female_students']]);
             }
-        } catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
+        }catch (\Maatwebsite\Excel\Validators\ValidationException $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
             $failures = $e->failures();
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);

app/Imports/Import.php

Spacing +21 added lines, -21 removed lines

@@ -88,10 +88,10 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 0;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
@@ -105,7 +105,7 @@ 
         $this->failures = [];
         if (($column !== "") && (!in_array($column, $columns))) {
             $this->isValidSheet = false;
-            $this->error[] = 'Unsupported column found ,remove:' . $column;
+            $this->error[] = 'Unsupported column found ,remove:'.$column;
             $this->failure = new Failure(3, 'remark', $this->error, [null]);
             $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
         }
@@ -118,13 +118,13 @@ 
     {
         $columns = Config::get('excel.columns');
         $optional_columns = Config::get('excel.optional_columns');
-        $columns = array_diff ($columns,$optional_columns);
+        $columns = array_diff($columns, $optional_columns);
         $error = \Illuminate\Validation\ValidationException::withMessages([]);
         $this->failures = [];
         foreach ($columns as  $column) {
                 if (($column !== "") && (!in_array($column, $existingColumns))) {
                     $this->isValidSheet = false;
-                    $this->error[] = 'Missing Column :' . $column . ' Not found';
+                    $this->error[] = 'Missing Column :'.$column.' Not found';
                     $this->failure = new Failure(3, 'remark', $this->error, [null]);
                     $this->failures = new \Maatwebsite\Excel\Validators\ValidationException($error, [$this->failure]);
                 }
@@ -141,16 +141,16 @@ 
         $highestColumn = $this->worksheet->getHighestDataColumn(3);
         $higestRow = 1;
         for ($row = $this->startRow(); $row <= $this->highestRow; $row++) {
-            $rowData = $this->worksheet->rangeToArray('A' . $row . ':' . $highestColumn . $row, NULL, TRUE, FALSE);
+            $rowData = $this->worksheet->rangeToArray('A'.$row.':'.$highestColumn.$row, NULL, TRUE, FALSE);
             if (isEmptyRow(reset($rowData))) {
                 continue;
-            } else {
+            }else {
                 $higestRow += 1;
             }
         }
         if ($higestRow == 0) {
             exit;
-        } else {
+        }else {
             return $higestRow;
         }
     }
@@ -175,17 +175,17 @@ 
                     case 'string':
                         $row[$column] = preg_replace('/[^A-Za-z0-9\-]/', '-', $row[$column]);
                         $row[$column] = date($format, strtotime($row[$column])); //date($row[$column]);
-                        $row[$column] =  \Carbon\Carbon::createFromFormat($format, $row[$column]);
+                        $row[$column] = \Carbon\Carbon::createFromFormat($format, $row[$column]);
                         break;
                     case 'double';
-                        $row[$column] =  \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
+                        $row[$column] = \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($row[$column]);
                         break;
                 }
             }
             return $row;
-        } catch (Exception $e) {
+        }catch (Exception $e) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $row[$column] . ' Not a valid date formate'], [null]);
+            $failure = new Failure(3, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$row[$column].' Not a valid date formate'], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         }
@@ -206,18 +206,18 @@ 
         $row = $this->formateDate($row, 'mothers_date_of_birth_yyyy_mm_dd');
         $row = $this->formateDate($row, 'guardians_date_of_birth_yyyy_mm_dd');
 
-        $row['admission_no'] =  str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
+        $row['admission_no'] = str_pad($row['admission_no'], 4, '0', STR_PAD_LEFT);
       
         if (array_key_exists('identity_type', $row)) {
         if ($row['identity_type'] == 'BC' && (!empty($row['birth_divisional_secretariat'])) && ($row['identity_number'] !== null) && $row['date_of_birth_yyyy_mm_dd'] !== null) {
-            $row['identity_number'] =  str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
+            $row['identity_number'] = str_pad($row['identity_number'], 4, '0', STR_PAD_LEFT);
             // dd(($row['date_of_birth_yyyy_mm_dd']));
-            $BirthDivision = Area_administrative::where('name', 'like', '%' . $row['birth_divisional_secretariat'] . '%')->where('area_administrative_level_id', '=', 5)->first();
+            $BirthDivision = Area_administrative::where('name', 'like', '%'.$row['birth_divisional_secretariat'].'%')->where('area_administrative_level_id', '=', 5)->first();
             if ($BirthDivision !== null) {
-                $BirthArea = Area_administrative::where('name', 'like', '%' . $row['birth_registrar_office_as_in_birth_certificate'] . '%')
+                $BirthArea = Area_administrative::where('name', 'like', '%'.$row['birth_registrar_office_as_in_birth_certificate'].'%')
                     ->where('parent_id', '=', $BirthDivision->id)->first();
                 if ($BirthArea !== null) {
-                    $row['identity_number'] = $BirthArea->id . '' . $row['identity_number'] . '' . substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2) . '' . $row['date_of_birth_yyyy_mm_dd']->format("m");
+                    $row['identity_number'] = $BirthArea->id.''.$row['identity_number'].''.substr($row['date_of_birth_yyyy_mm_dd']->format("yy"), -2).''.$row['date_of_birth_yyyy_mm_dd']->format("m");
                 }
             }
 
@@ -230,9 +230,9 @@ 
     {
         if (array_key_exists($key, $row)) {
             return true;
-        } else {
+        }else {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system ' . $key, ' Is missing form the template'], [null]);
+            $failure = new Failure($count, 'remark', [0 => 'Template is not valid for upload, use the template given in the system '.$key, ' Is missing form the template'], [null]);
             $failures = [0 => $failure];
             new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
         };
@@ -268,11 +268,11 @@ 
 
         if ($exceededStudents == true) {
             $error = \Illuminate\Validation\ValidationException::withMessages([]);
-            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is' . $institutionClass->no_of_students], [null]);
+            $failure = new Failure(3, 'remark', ['Class student count exceeded! Max number of students is'.$institutionClass->no_of_students], [null]);
             $failures = [0 => $failure];
             throw new \Maatwebsite\Excel\Validators\ValidationException($error, $failures);
             Log::info('email-sent', [$this->file]);
-        } else {
+        }else {
             return true;
         }
     }

app/Models/Student_guardian.php

Spacing +8 added lines, -8 removed lines

@@ -7,7 +7,7 @@ 
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Webpatser\Uuid\Uuid;
 
-class Student_guardian extends Base_Model  {
+class Student_guardian extends Base_Model {
 
     use SoftDeletes;
 
@@ -59,19 +59,19 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created_user_id = 1;
         });
     }
 
-    public static function createStudentGuardian($student,$guardian,$user){
+    public static function createStudentGuardian($student, $guardian, $user) {
      
         $exist = self::where('student_id', $student->student_id)
         ->where('guardian_relation_id', $guardian->guardian_relation_id)
         ->exists();
 
-        $totalGuardians = self::where('student_id',$student->student_id)->count();
+        $totalGuardians = self::where('student_id', $student->student_id)->count();
 
         $data = [
             'student_id' => $student->student_id,
@@ -79,13 +79,13 @@ 
             'guardian_relation_id' => $guardian->guardian_relation_id,
             'created_user_id' => $user
         ];
-        if(!$exist){
+        if (!$exist) {
             $data['created'] = now();
             self::create($data);
-        }else{
+        }else {
             $data['modified'] = now();
-            self::where('student_id' , $student->student_id)
-            ->where('guardian_relation_id',$guardian->guardian_relation_id)
+            self::where('student_id', $student->student_id)
+            ->where('guardian_relation_id', $guardian->guardian_relation_id)
             ->update($data);
         }
     }

Braces +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
         if(!$exist){
             $data['created'] = now();
             self::create($data);
-        }else{
+        } else{
             $data['modified'] = now();
             self::where('student_id' , $student->student_id)
             ->where('guardian_relation_id',$guardian->guardian_relation_id)

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(empty($gradeOptions) && !is_null($nextProgramme)){
-                $programmeId =  $nextProgramme->next_programme_id;
-                $gradeOptions = self::where( 'education_programme_id',$programmeId
+            if (empty($gradeOptions) && !is_null($nextProgramme)) {
+                $programmeId = $nextProgramme->next_programme_id;
+                $gradeOptions = self::where('education_programme_id', $programmeId
                 )->get()->first();
             }
             // Default is to get the list of grades with the next programme grades
@@ -66,7 +66,7 @@ 
 //                $results = $gradeOptions;
 //            }
             return $gradeOptions;
-        } else {
+        }else {
             return null;
         }
     }
@@ -78,15 +78,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;
     }
 
 
@@ -100,9 +100,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 = [];
         }
 
@@ -116,7 +116,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/Models/Institution_student.php

Spacing +31 added lines, -31 removed lines

@@ -71,7 +71,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -142,7 +142,7 @@ 
      */
     public static function createExaminationData($student, $admissionInfo)
     {
-        $student['sp_center'] = gettype((int)$student['sp_center']) == 'integer' ?  $student['sp_center'] : 0;
+        $student['sp_center'] = gettype((int) $student['sp_center']) == 'integer' ? $student['sp_center'] : 0;
         try {
             self::create([
                 'id' => (string) Uuid::generate(4),
@@ -167,7 +167,7 @@ 
                 'created' => now(),
                 'created_user_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
@@ -181,7 +181,7 @@ 
      */
     public static function updateExaminationData($student, $admissionInfo)
     {
-        $student['sp_center'] = gettype((int)$student['sp_center']) == 'integer' ?  $student['sp_center'] : 0;
+        $student['sp_center'] = gettype((int) $student['sp_center']) == 'integer' ? $student['sp_center'] : 0;
         try {
             self::where([
                 'student_id' => $student['student_id'],
@@ -202,50 +202,50 @@ 
                     'modified_user_id' => 1
                 ]
             );
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }
 
-    public static function updateStudentArea(array $student){
-        $father = Student_guardian::where('student_id',$student['student_id'])
-        ->join('security_users as sg','guardian_id', 'sg.id')
-        ->where('guardian_relation_id',1)
+    public static function updateStudentArea(array $student) {
+        $father = Student_guardian::where('student_id', $student['student_id'])
+        ->join('security_users as sg', 'guardian_id', 'sg.id')
+        ->where('guardian_relation_id', 1)
         ->get()->first();
 
-        $mother = Student_guardian::where('student_id',$student['student_id'])
-        ->join('security_users as sg','guardian_id', 'sg.id')
-        ->where('guardian_relation_id',2)
+        $mother = Student_guardian::where('student_id', $student['student_id'])
+        ->join('security_users as sg', 'guardian_id', 'sg.id')
+        ->where('guardian_relation_id', 2)
         ->get()->first();
 
-        $guardian = Student_guardian::where('student_id',$student['student_id'])
-        ->join('security_users as sg','guardian_id', 'sg.id')
-        ->where('guardian_relation_id',3)
+        $guardian = Student_guardian::where('student_id', $student['student_id'])
+        ->join('security_users as sg', 'guardian_id', 'sg.id')
+        ->where('guardian_relation_id', 3)
         ->get()->first();
 
-        if(!is_null($father) && is_null($mother) && is_null($guardian)){
-            Security_user::where('id',$student['student_id'])
+        if (!is_null($father) && is_null($mother) && is_null($guardian)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $father->address_area_id]);
-        }elseif(!is_null($mother)  && (is_null($father) && is_null($guardian))){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && (is_null($father) && is_null($guardian))) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && is_null($father) && is_null($mother)){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($guardian) && is_null($father) && is_null($mother)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id ==  $mother->address_area_id)){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && !is_null($father) && ($father->address_area_id == $mother->address_area_id)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id !==  $mother->address_area_id) && !is_null($guardian)){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && !is_null($father) && ($father->address_area_id !== $mother->address_area_id) && !is_null($guardian)) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($father) && $father->address == $student['address']){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($father) && $father->address == $student['address']) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother) && $mother->address == $student['address']){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($mother) && $mother->address == $student['address']) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && $guardian->address == $student['address']){
-            Security_user::where('id',$student['student_id'])
+        }elseif (!is_null($guardian) && $guardian->address == $student['address']) {
+            Security_user::where('id', $student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
         }
     }

Braces +7 added lines, -7 removed lines

@@ -226,25 +226,25 @@
         if(!is_null($father) && is_null($mother) && is_null($guardian)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $father->address_area_id]);
-        }elseif(!is_null($mother)  && (is_null($father) && is_null($guardian))){
+        } elseif(!is_null($mother)  && (is_null($father) && is_null($guardian))){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && is_null($father) && is_null($mother)){
+        } elseif(!is_null($guardian) && is_null($father) && is_null($mother)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id ==  $mother->address_area_id)){
+        } elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id ==  $mother->address_area_id)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id !==  $mother->address_area_id) && !is_null($guardian)){
+        } elseif(!is_null($mother)  && !is_null($father) && ($father->address_area_id !==  $mother->address_area_id) && !is_null($guardian)){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($father) && $father->address == $student['address']){
+        } elseif(!is_null($father) && $father->address == $student['address']){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
-        }elseif(!is_null($mother) && $mother->address == $student['address']){
+        } elseif(!is_null($mother) && $mother->address == $student['address']){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $mother->address_area_id]);
-        }elseif(!is_null($guardian) && $guardian->address == $student['address']){
+        } elseif(!is_null($guardian) && $guardian->address == $student['address']){
             Security_user::where('id',$student['student_id'])
             ->update(['address_area_id' => $guardian->address_area_id]);
         }

app/Models/Institution_subject.php

Spacing +21 added lines, -21 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,52 +42,52 @@ 
     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, $al = false){
-        $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, $al = false) {
+        $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')
             ->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');
 
         if ($al == true) {
-            $query->whereIn('education_programmes.education_cycle_id', [4,5]);
-        } else {
-            $query->whereNotIn('education_programmes.education_cycle_id', [4,5]);
+            $query->whereIn('education_programmes.education_cycle_id', [4, 5]);
+        }else {
+            $query->whereNotIn('education_programmes.education_cycle_id', [4, 5]);
         }
         return $query->get()->toArray();
     }
 
     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/Institution_class.php

Spacing +10 added lines, -10 removed lines

@@ -75,9 +75,9 @@ 
 
             )
             ->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) {
@@ -87,8 +87,8 @@ 
             ->groupBy('institution_classes.id')
             ->get()->toArray();
             return $data;
-        } else {
-            $query->where('education_programmes.education_cycle_id','<>',4)
+        }else {
+            $query->where('education_programmes.education_cycle_id', '<>', 4)
             ->where('institution_id', $shift['institution_id']);
             $data = $query
             ->groupBy('institution_classes.id')
@@ -97,13 +97,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();
     }