moe-lk / bulk-upload

app/Http/Controllers/CloneController.php

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/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();
     }
 

app/Http/Controllers/BulkPromotion.php

Spacing +21 added lines, -21 removed lines

@@ -64,7 +64,7 @@ 
                 if (!empty($isAvailableforPromotion)) {
                     $this->process($institutionGrade, $nextGrade, $params);
                     DB::commit();
-                } else {
+                }else {
                     DB::rollBack();
                 }
                 //leave school levers
@@ -72,7 +72,7 @@ 
                 //     $this->process($institutionGrade, $nextGrade, $params);
                 // }
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
         }
     }
@@ -105,7 +105,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)) {
@@ -120,7 +120,7 @@ 
                 array_walk($parallelClasses, array($this, 'updateStudentCount'));
                 DB::commit();
             }
-        } catch (\Exception $e) {
+        }catch (\Exception $e) {
             DB::rollBack();
             Log::error($e->getMessage());
         }
@@ -155,7 +155,7 @@ 
         $previousAcademicPeriod = $params['previousAcademicPeriod'];
         $nextGradeObj = null;
         $currentGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $institutionGrade['education_grade_id'], $previousAcademicPeriod->id);
-        if ($nextGrade !== []  && !is_null($nextGrade)) {
+        if ($nextGrade !== [] && !is_null($nextGrade)) {
             $nextGradeObj = $this->instituion_grade->getParallelClasses($institutionGrade['id'], $institutionGrade['institution_id'], $nextGrade->id, $academicPeriod->id);
         }
 
@@ -164,7 +164,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;
@@ -172,12 +172,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;
@@ -213,10 +213,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) {
             Log::error($e->getMessage());
         }
     }
@@ -236,13 +236,13 @@ 
         $studentClass = $this->institution_class_students->getStudentNewClass($student);
         if (!is_null($studentClass)) {
             $class = array_search(str_replace($educationGrade['name'], $nextGrade->name, $studentClass->name), array_column($classes, 'name'));
-            if(!($class)){
-                $nextGradeName = explode(" ",$nextGrade->name)[0];
-                $educationGrade['name'] = explode(" ",$educationGrade['name'])[0];
+            if (!($class)) {
+                $nextGradeName = explode(" ", $nextGrade->name)[0];
+                $educationGrade['name'] = explode(" ", $educationGrade['name'])[0];
                 $class = array_search(str_replace($educationGrade['name'], $nextGradeName, $studentClass->name), array_column($classes, 'name'));
             }
             return $class;
-        } else {
+        }else {
             return false;
         }
     }
@@ -264,7 +264,7 @@ 
         $class = null;
         if (count($classes) == 1) {
             $class = $classes[0];
-        } else {
+        }else {
             $class = $this->getStudentClass($student, $educationGrade, $nextGrade, $classes);
             if (is_numeric($class)) {
                 $class = $classes[$class];
@@ -296,13 +296,13 @@ 
                     //     array_walk($allInsSubjects,array($this,'updateSubjectCount'));
                     // }
                     $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']);
                 }
-            } catch (\Exception $e) {
+            }catch (\Exception $e) {
                 
                 Log::error($e->getMessage());
             }

app/Models/Institution_grade.php

Spacing +13 added lines, -13 removed lines

@@ -70,10 +70,10 @@ 
     public function getParallelClasses($id, $institutionId, $educationGradeId, $academicPeriodId)
     {
         $data = self::find($id)->select('institution_grades.id as insGrade', 'institution_classes.id', 'institution_classes.name', 'institution_grades.education_grade_id')
-            ->join('institution_classes', function ($join) use ($educationGradeId, $academicPeriodId) {
+            ->join('institution_classes', function($join) use ($educationGradeId, $academicPeriodId) {
                 $join->on('institution_classes.institution_id', '=', 'institution_grades.institution_id')
                     ->where('institution_classes.academic_period_id', $academicPeriodId)
-                    ->join('institution_class_grades', function ($join) use ($educationGradeId) {
+                    ->join('institution_class_grades', function($join) use ($educationGradeId) {
                         $join->on('institution_class_grades.institution_class_id', '=', 'institution_classes.id')
                             ->where('institution_class_grades.education_grade_id', $educationGradeId);
                     })
@@ -123,7 +123,7 @@ 
             ->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
             // ->where('promoted', '=', $year)
             ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
-            ->join('institutions', function ($join) use ($year, $institution) {
+            ->join('institutions', function($join) use ($year, $institution) {
                 $join->on('institutions.id', '=', 'institution_grades.institution_id')
                     ->where('institutions.code', '=', $institution);
             })
@@ -134,7 +134,7 @@ 
                 break;
             case '6-11':
                 $query->whereIn('education_programmes.education_cycle_id', [2, 3]);
-                $query->whereNotIn('education_grades.id',[29,34]);
+                $query->whereNotIn('education_grades.id', [29, 34]);
                 break;
             case 'AL':
                 $query->where('education_programmes.education_cycle_id', 4);
@@ -152,21 +152,21 @@ 
      * @param $year
      * @return mixed
      */
-    public function getInstitutionGradeList($year, $limit,$mode)
+    public function getInstitutionGradeList($year, $limit, $mode)
     {
         $query = $this->select('education_grades.name', 'institutions.code', 'institutions.name as institution_name', 'institution_grades.id', 'institution_grades.institution_id', 'institution_grades.education_grade_id')
             // ->where('promoted', '=', $year)
             ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
-            ->join('institutions', function ($join) use ($year) {
+            ->join('institutions', function($join) use ($year) {
                 $join->on('institutions.id', '=', 'institution_grades.institution_id');
             })
             ->join('education_programmes', 'education_grades.education_programme_id', 'education_programmes.id');
             switch ($mode) {
                 case '1-5':
-                    $query->whereIn('education_programmes.education_cycle_id', [1,2]);
+                    $query->whereIn('education_programmes.education_cycle_id', [1, 2]);
                     break;
                 case '6-11':
-                    $query->whereIn('education_programmes.education_cycle_id', [2,3,4]);
+                    $query->whereIn('education_programmes.education_cycle_id', [2, 3, 4]);
                     break;
                 case 'AL':
                     $query->where('education_programmes.education_cycle_id', 4);
@@ -181,13 +181,13 @@ 
             return $data;
     }
 
-    public function getGradeSubjects($institutionId){
+    public function getGradeSubjects($institutionId) {
         return self::query()
-        ->select('institution_grades.institution_id','education_grades_subjects.education_grade_id','education_grades_subjects.education_subject_id','education_subjects.name')
-        ->where('institution_grades.institution_id',$institutionId)
+        ->select('institution_grades.institution_id', 'education_grades_subjects.education_grade_id', 'education_grades_subjects.education_subject_id', 'education_subjects.name')
+        ->where('institution_grades.institution_id', $institutionId)
         ->join('education_grades', 'institution_grades.education_grade_id', 'education_grades.id')
-        ->join('education_grades_subjects','education_grades.id','education_grades_subjects.education_grade_id')
-        ->join('education_subjects','education_grades_subjects.education_subject_id','education_subjects.id')
+        ->join('education_grades_subjects', 'education_grades.id', 'education_grades_subjects.education_grade_id')
+        ->join('education_subjects', 'education_grades_subjects.education_subject_id', 'education_subjects.id')
         ->groupBy('education_grades_subjects.id')
         ->get()
         ->toArray();

app/Providers/AppServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
      public function boot()
      {
          //
-         if(!(\App::environment('local'))) {
+         if (!(\App::environment('local'))) {
              URL::forceScheme('https');
          }
      }

app/Models/Security_group_institution.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_institution extends Model  {
+class Security_group_institution extends Model {
 
 
     /**
@@ -44,21 +44,21 @@ 
 
 
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
-    public function institution_classes(){
-        return $this->hasMany('App\Models\Institution_class','institution_id','institution_id')
+    public function institution_classes() {
+        return $this->hasMany('App\Models\Institution_class', 'institution_id', 'institution_id')
         ->select('institution_classes.*')
-        ->join('academic_periods', function($query){
-            $query->on('institution_classes.academic_period_id','academic_periods.id');
-            $query->whereIn('academic_periods.code',['2020','2019/2020']);
+        ->join('academic_periods', function($query) {
+            $query->on('institution_classes.academic_period_id', 'academic_periods.id');
+            $query->whereIn('academic_periods.code', ['2020', '2019/2020']);
         });
     }
 
-    public function security_group(){
-        return $this->belongsTo('App\Models\Security_group','security_group_id');
+    public function security_group() {
+        return $this->belongsTo('App\Models\Security_group', 'security_group_id');
     }
 
 }
\ No newline at end of file

app/Models/Security_group_user.php

Spacing +19 added lines, -19 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_user extends Model  {
+class Security_group_user extends Model {
 
     public const CREATED_AT = 'created';
     public const UPDATED_AT = 'modified';
@@ -45,39 +45,39 @@ 
     protected $dates = ['modified', 'created', 'created'];
 
 
-    public function security_user(){
-        return $this->belongsToMany('App\Models\User','security_users');
+    public function security_user() {
+        return $this->belongsToMany('App\Models\User', 'security_users');
     }
 
-    public function security_group(){
-        return $this->hasMany('App\Models\Security_group' , 'id','security_group_id');
+    public function security_group() {
+        return $this->hasMany('App\Models\Security_group', 'id', 'security_group_id');
     }
 
-    public function security_group_institution(){
-        return $this->belongsTo('App\Models\Security_group_institution','security_group_id','security_group_id');
+    public function security_group_institution() {
+        return $this->belongsTo('App\Models\Security_group_institution', 'security_group_id', 'security_group_id');
     }
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','security_user_id')
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'security_user_id')
         ->select('institution_classes.*')
-        ->join('academic_periods',function($query){
-            $query->on('institution_classes.academic_period_id','academic_periods.id');
-            $query->whereIn('academic_periods.code',['2020','2019/2020']);
+        ->join('academic_periods', function($query) {
+            $query->on('institution_classes.academic_period_id', 'academic_periods.id');
+            $query->whereIn('academic_periods.code', ['2020', '2019/2020']);
         });
     }
 
-    public function institution_staff(){
-        return $this->belongsTo('App\Models\Institution_staff','security_user_id','staff_id');
+    public function institution_staff() {
+        return $this->belongsTo('App\Models\Institution_staff', 'security_user_id', 'staff_id');
     }
 
-    public function institution_group(){
-        return $this->hasMany('App\Models\Security_group_institution','security_group_id','security_group_id')
-            ->with(['institution','institution_classes']);
+    public function institution_group() {
+        return $this->hasMany('App\Models\Security_group_institution', 'security_group_id', 'security_group_id')
+            ->with(['institution', 'institution_classes']);
     }
 
 
-    public function roles(){
-        return $this->belongsTo('App\Models\Security_role','security_role_id','id');
+    public function roles() {
+        return $this->belongsTo('App\Models\Security_role', 'security_role_id', 'id');
     }
 
 

app/Models/Institution_staff.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_staff extends Model  {
+class Institution_staff extends Model {
 
     /**
      * The database table used by the model.
@@ -42,13 +42,13 @@ 
     protected $dates = ['start_date', 'end_date', 'modified', 'created'];
 
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','staff_id')
-        ->innerJoin('academic_periods','institution_classes.academic_period_id','academic_periods.id')
-        ->where('academic_periods.current',1);
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'staff_id')
+        ->innerJoin('academic_periods', 'institution_classes.academic_period_id', 'academic_periods.id')
+        ->where('academic_periods.current', 1);
     }
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 }
\ No newline at end of file