moe-lk / bulk-upload

app/Mail/StudentCountExceeded.php

Spacing +4 added lines, -4 removed lines

@@ -31,16 +31,16 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '. $institution->name . date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: Upload Failed '.$institution->institution->code.': '.$institution->name.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>   \App::environment('local') || \App::environment('stage')    ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The class you tried to import data is exceeded the student count limit.Please check the class / increase the student limit",
-            'link' =>   \App::environment('local') || \App::environment('stage')    ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>   \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -52,7 +52,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/StudentImportFailure.php

Spacing +5 added lines, -5 removed lines

@@ -24,17 +24,17 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: ' .$file['subject']. $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: '.$file['subject'].$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' =>  \App::environment('local') || \App::environment('stage')  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
-            'name'=>$this->user->first_name, "body" => "We found some errors on your data file ". $file['filename']. ' Pleas fix the errors and re-upload  only with incorrect data,
+            'name'=>$this->user->first_name, "body" => "We found some errors on your data file ".$file['filename'].' Pleas fix the errors and re-upload  only with incorrect data,
             We uploaded the correct data to the system',
-            'link' =>  \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -46,7 +46,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/IncorrectTemplate.php

Spacing +4 added lines, -4 removed lines

@@ -23,16 +23,16 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: IncorrectTemplate'.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' => \App::environment('local') || \App::environment('stage')  ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
         $this->viewData = [
             'name'=>$this->user->first_name, "body" => "The Template you used for upload having some issues, please reconfirm and re-upload with correct template",
-            'link' =>  \App::environment('local') || \App::environment('stage')   ?  env('APP_URL').'/download/' .$file['filename'] : env('APP_URL').'/bulk-upload/download/' .$file['filename']
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL').'/download/'.$file['filename'] : env('APP_URL').'/bulk-upload/download/'.$file['filename']
         ];
     }
 
@@ -44,7 +44,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Mail/EmptyFile.php

Spacing +5 added lines, -5 removed lines

@@ -25,16 +25,16 @@ 
 
 
         $this->user = User::find($file['security_user_id']);
-        $this->subject = 'SIS Bulk Upload: ' .$file['subject'].' Empty ' . $institution->institution->code.': '. $institution->name.' '. date('Y:m:d H:i:s');
+        $this->subject = 'SIS Bulk Upload: '.$file['subject'].' Empty '.$institution->institution->code.': '.$institution->name.' '.date('Y:m:d H:i:s');
         $this->from_address = env('MAIL_FROM_ADDRESS');
         $this->from_name = 'SIS Bulk Uploader';
         $this->with = [
             'name' => $this->user->first_name,
-            'link' => \App::environment('local') || \App::environment('stage')   ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
+            'link' => \App::environment('local') || \App::environment('stage') ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
         ];
         $this->viewData = [
-            'name'=>$this->user->first_name, "body" => "No data Found in ". $file['filename']. ' Please re-upload the file with data',
-            'link' =>  \App::environment('local') || \App::environment('stage')   ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
+            'name'=>$this->user->first_name, "body" => "No data Found in ".$file['filename'].' Please re-upload the file with data',
+            'link' =>  \App::environment('local') || \App::environment('stage') ?  env('APP_URL') : env('APP_URL').'/bulk-upload/'
         ];
     }
 
@@ -46,7 +46,7 @@ 
     public function build()
     {
         return $this->view('emails.mail')
-            ->from($this->from_address,$this->from_name)
+            ->from($this->from_address, $this->from_name)
             ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);

app/Models/Institution_grade.php

Spacing +21 added lines, -21 removed lines

@@ -71,11 +71,11 @@ 
     {
         if (!is_null($id)) {
             return 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) {
+                ->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->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);
                         });
@@ -83,7 +83,7 @@ 
                 ->where('institution_grades.education_grade_id', $educationGradeId)
                 ->where('institution_grades.institution_id', $institutionId)
                 ->get();
-        }else{
+        }else {
             return null;
         }
     }
@@ -95,8 +95,8 @@ 
      * @param $year
      * @param $id
      */
-    public function updatePromoted($year, $id){
-        self::where('id',$id)->update(['promoted'=>$year]);
+    public function updatePromoted($year, $id) {
+        self::where('id', $id)->update(['promoted'=>$year]);
     }
 
     /**
@@ -106,9 +106,9 @@ 
      * @param $gradeId
      * @return mixed
      */
-    public function getInstitutionGrade($institutionId, $gradeId){
-         return self::where('education_grade_id',$gradeId)
-             ->where('institution_id',$institutionId)->get()->first();
+    public function getInstitutionGrade($institutionId, $gradeId) {
+         return self::where('education_grade_id', $gradeId)
+             ->where('institution_id', $institutionId)->get()->first();
     }
 
     /**
@@ -116,14 +116,14 @@ 
      * @param null $institution
      * @return mixed
      */
-    public function getInstitutionGradeToPromoted($year, $institution = null){
+    public function getInstitutionGradeToPromoted($year, $institution = null) {
         return self::query()
-            ->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-1)
-            ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id')
-            ->join('institutions', function($join) use ($year,$institution){
-                $join->on('institutions.id','=','institution_grades.institution_id')
-                    ->where('institutions.code','=',$institution);
+            ->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 - 1)
+            ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
+            ->join('institutions', function($join) use ($year, $institution){
+                $join->on('institutions.id', '=', 'institution_grades.institution_id')
+                    ->where('institutions.code', '=', $institution);
             })
                 ->orderBy('institution_id')
             ->get()->toArray();
@@ -133,13 +133,13 @@ 
      * @param $year
      * @return mixed
      */
-    public function getInstitutionGradeList($year){
+    public function getInstitutionGradeList($year) {
         return self::query()
-            ->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-1)
-            ->join('education_grades','institution_grades.education_grade_id','=','education_grades.id')
+            ->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 - 1)
+            ->join('education_grades', 'institution_grades.education_grade_id', '=', 'education_grades.id')
             ->join('institutions', function($join) use ($year){
-                $join->on('institutions.id','=','institution_grades.institution_id');
+                $join->on('institutions.id', '=', 'institution_grades.institution_id');
             })
             ->orderBy('institution_id')
             ->get()

app/Models/Institution_shift.php

Spacing +13 added lines, -13 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_shift extends Base_Model  {
+class Institution_shift extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -41,29 +41,29 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function shiftExists($shift){
+    public function shiftExists($shift) {
        return self::query()
-            ->where('institution_id',$shift['institution_id'])
-            ->where('location_institution_id',$shift['location_institution_id'])
-            ->where('shift_option_id',$shift['shift_option_id'])
-            ->where('academic_period_id',$shift['academic_period_id'])->exists();
+            ->where('institution_id', $shift['institution_id'])
+            ->where('location_institution_id', $shift['location_institution_id'])
+            ->where('shift_option_id', $shift['shift_option_id'])
+            ->where('academic_period_id', $shift['academic_period_id'])->exists();
     }
 
-    public function getShiftsToClone(int $year){
+    public function getShiftsToClone(int $year) {
         return self::query()
             ->select('institution_shifts.*')
-            ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id')
+            ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id')
             // ->where('academic_periods.code',$year)
-            ->where('institution_shifts.cloned',$year)
+            ->where('institution_shifts.cloned', $year)
             ->get()->toArray();
     }
 
-    public function getShiftsTodelete(int $year,$academic_period_id){
+    public function getShiftsTodelete(int $year, $academic_period_id) {
         return self::query()
             ->select('institution_shifts.*')
-            ->join('academic_periods','academic_periods.id','=','institution_shifts.academic_period_id')
-            ->where('academic_period_id',$academic_period_id)
-            ->where('institution_shifts.cloned',$year)
+            ->join('academic_periods', 'academic_periods.id', '=', 'institution_shifts.academic_period_id')
+            ->where('academic_period_id', $academic_period_id)
+            ->where('institution_shifts.cloned', $year)
             ->get()->toArray();
     }
 }

app/Models/Education_grades_subject.php

Spacing +3 added lines, -3 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,8 +42,8 @@ 
     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');
     }
 
 }
\ No newline at end of file

app/Models/DashboardViews.php

Spacing +18 added lines, -18 removed lines

@@ -36,7 +36,7 @@ 
             DbSchema::dropIfExists('students_count_view_table');
             DB::statement('CREATE TABLE students_count_view_table AS  (select * from students_count_view)');
             $output->writeln('creat : students_count_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -103,17 +103,17 @@ 
                 ->leftJoin("education_grades as eg", "eg.id", "i.id")
                 ->leftJoin("institution_class_students as ics", "ist.student_id", "ics.student_id")
                 ->leftJoin("institution_classes  as ic", "ic.id", "ics.institution_class_id")
-                ->leftJoin("student_guardians  as sgf", function ($join) {
+                ->leftJoin("student_guardians  as sgf", function($join) {
                     $join->on("sgf.student_id", "stu.id");
                     $join->where("sgf.guardian_relation_id", 1);
                 })
                 ->leftJoin("security_users  as sufu", "sgf.guardian_id", "sufu.id")
-                ->leftJoin("student_guardians  as sgm", function ($join) {
+                ->leftJoin("student_guardians  as sgm", function($join) {
                     $join->on("sgm.student_id", "stu.id");
                     $join->where("sgm.guardian_relation_id", 2);
                 })
                 ->leftJoin("security_users  as sumu", "sgm.guardian_id", "sumu.id")
-                ->leftJoin("student_guardians  as sg", function ($join) {
+                ->leftJoin("student_guardians  as sg", function($join) {
                     $join->on("sg.student_id", "stu.id");
                     $join->where("sg.guardian_relation_id", 3);
                 })
@@ -132,27 +132,27 @@ 
                 ->leftJoin("academic_periods as acps", "acps.id", "ist.academic_period_id")
                 ->leftJoin("institution_subject_students as iss", "stu.id", "iss.student_id")
                 ->leftJoin("education_subjects as edus", "edus.id", "iss.education_subject_id")
-                ->leftJoin("nationalities as natif", function ($join) {
+                ->leftJoin("nationalities as natif", function($join) {
                     $join->on("sufu.nationality_id", "natif.id");
                     $join->where("sgf.guardian_relation_id", 1);
                 })
-                ->leftJoin("nationalities as natim", function ($join) {
+                ->leftJoin("nationalities as natim", function($join) {
                     $join->on("sumu.nationality_id", "natim.id");
                     $join->where("sgm.guardian_relation_id", 2);
                 })
-                ->leftJoin("nationalities as natig", function ($join) {
+                ->leftJoin("nationalities as natig", function($join) {
                     $join->on("sugu.nationality_id", "natig.id");
                     $join->where("sg.guardian_relation_id", 3);
                 })
-                ->leftJoin("identity_types as idtf", function ($join) {
+                ->leftJoin("identity_types as idtf", function($join) {
                     $join->on("sufu.nationality_id", "idtf.id");
                     $join->where("sgf.guardian_relation_id", 1);
                 })
-                ->leftJoin("identity_types as idtm", function ($join) {
+                ->leftJoin("identity_types as idtm", function($join) {
                     $join->on("sumu.nationality_id", "idtm.id");
                     $join->where("sgm.guardian_relation_id", 2);
                 })
-                ->leftJoin("identity_types as idtg", function ($join) {
+                ->leftJoin("identity_types as idtg", function($join) {
                     $join->on("sugu.nationality_id", "idtg.id");
                     $join->where("sg.guardian_relation_id", 3);
                 })
@@ -166,7 +166,7 @@ 
             DB::statement('CREATE INDEX user_institution ON students_list_view_table (institution_id);');
             $output->writeln('created : students_list_view_table');
             $output->writeln('created : students_list_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -226,7 +226,7 @@ 
             Schema::createOrReplaceView('upload_list_view', $query);
             Schema::disableForeignKeyConstraints('upload_list_view');
             $output->writeln('created : upload_list_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -261,7 +261,7 @@ 
             Schema::dropIfExists("upload_count_view");
             Schema::createOrReplaceView("upload_count_view", $query);
             $output->writeln('created : upload_count_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -288,7 +288,7 @@ 
             Schema::dropIfExists("institution_info_view");
             Schema::createOrReplaceView("institution_info_view", $query);
             $output->writeln('created : institution_info_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -326,7 +326,7 @@ 
             Schema::dropIfExists("students_count_by_grade_view");
             Schema::createOrReplaceView('students_count_by_grade_view', $query);
             $output->writeln('created : students_count_by_grade_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -351,7 +351,7 @@ 
                     "ist.created"
                 )
                 ->join("institutions as i", "i.id", "ist.institution_id")
-                ->join('user_body_masses as ubm', function ($join) {
+                ->join('user_body_masses as ubm', function($join) {
                     $join->on('ubm.security_user_id', 'ist.student_id');
                     $join->where('ubm.academic_period_id', 'ist.academic_period_id');
                 })
@@ -359,7 +359,7 @@ 
             Schema::dropIfExists("students_count_by_bmi_view");
             Schema::createOrReplaceView("students_count_by_bmi_view", $query);
             $output->writeln('created : students_count_by_bmi_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }
@@ -392,7 +392,7 @@ 
             Schema::dropIfExists("student_count_by_class_view");
             Schema::createOrReplaceView('student_count_by_class_view', $query);
             $output->writeln('created : student_count_by_class_view');
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             $output->writeln($th->getMessage());
         }
     }

app/Models/Institution_class_subject.php

Spacing +26 added lines, -26 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class Institution_class_subject extends Base_Model  {
+class Institution_class_subject extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -42,19 +42,19 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function institutionMandatorySubject(){
-        return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id')
+    public function institutionMandatorySubject() {
+        return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id')
         ->with('institutionGradeSubject')
-        ->whereHas('institutionGradeSubject', function ($query) {
-                $query->where('auto_allocation',1);
+        ->whereHas('institutionGradeSubject', function($query) {
+                $query->where('auto_allocation', 1);
         });
     }
 
-    public function institutionOptionalSubject(){
-        return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id')
+    public function institutionOptionalSubject() {
+        return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id')
         ->with('institutionGradeSubject')
-        ->whereHas('institutionGradeSubject', function ($query) {
-                $query->where('auto_allocation',0);
+        ->whereHas('institutionGradeSubject', function($query) {
+                $query->where('auto_allocation', 0);
         });
 
     }
@@ -62,23 +62,23 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
         });
     }
 
-    public function institutionSubject(){
-        return $this->belongsTo('App\Models\Institution_subject','institution_subject_id','id')
+    public function institutionSubject() {
+        return $this->belongsTo('App\Models\Institution_subject', 'institution_subject_id', 'id')
         ->with('institutionGradeSubject');
     }
 
 
-    public static function getMandetorySubjects($institutionClass){
+    public static function getMandetorySubjects($institutionClass) {
         $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass)->first();
         $mandatorySubject = Institution_class_subject::with(['institutionSubject'])
-            ->whereHas('institutionSubject', function ($query) use ($institutionGrade) {
-                $query->whereHas('institutionGradeSubject',function($query){
-                    $query->where('auto_allocation',1);
+            ->whereHas('institutionSubject', function($query) use ($institutionGrade) {
+                $query->whereHas('institutionGradeSubject', function($query) {
+                    $query->where('auto_allocation', 1);
                 })->where('education_grade_id', $institutionGrade->education_grade_id);
                 // ->where('auto_allocation', $institutionGrade->education_grade_id);
             })
@@ -87,10 +87,10 @@ 
         return $mandatorySubject;
     }
 
-    public static function getAllSubjects($institutionClass){
+    public static function getAllSubjects($institutionClass) {
         $institutionGrade = Institution_class_grade::where('institution_class_id', '=', $institutionClass)->first();
         $allSubjects = Institution_class_subject::with(['institutionSubject'])
-        ->whereHas('institutionSubject', function ($query) use ($institutionGrade) {
+        ->whereHas('institutionSubject', function($query) use ($institutionGrade) {
             $query->whereHas('institutionGradeSubject')->where('education_grade_id', $institutionGrade->education_grade_id);
         })
         ->where('institution_class_id', '=', $institutionClass)
@@ -102,9 +102,9 @@ 
         $data = [];
         foreach ($subjects as $subject) {
             $subjectId = Institution_class_subject::with(['institutionSubject'])
-                ->whereHas('institutionSubject', function ($query) use ($row, $subject, $student) {
-                    $query->whereHas('institutionGradeSubject',function($query){
-                        $query->where('auto_allocation',0);
+                ->whereHas('institutionSubject', function($query) use ($row, $subject, $student) {
+                    $query->whereHas('institutionGradeSubject', function($query) {
+                        $query->where('auto_allocation', 0);
                     })
                         ->where('name', '=', $row[$subject])
                         ->where('education_grade_id', '=', $student->education_grade_id);
@@ -117,15 +117,15 @@ 
         return $data;
     }
 
-    public function getInstitutionClassSubjects($academicPeriodId,$classIds){
+    public function getInstitutionClassSubjects($academicPeriodId, $classIds) {
         return self::query()
-            ->whereIn('institution_class_id',$classIds)
+            ->whereIn('institution_class_id', $classIds)
             ->get()
             ->toArray();
     }
 
-    public function isDuplicated($subject){
-        return self::query()->where('institution_subject_id',$subject['institution_subject_id'])
-            ->where('institution_class_id',$subject['institution_class_id'])->get()->toArray();
+    public function isDuplicated($subject) {
+        return self::query()->where('institution_subject_id', $subject['institution_subject_id'])
+            ->where('institution_class_id', $subject['institution_class_id'])->get()->toArray();
     }
 }