moe-lk / bulk-upload

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_shift_id', $shift['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();
     }
 

app/Models/Education_grades_subject.php

Spacing +5 added lines, -5 removed lines

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

app/Models/Institution_subject.php

Spacing +17 added lines, -17 removed lines

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

app/Models/Education_grade.php

Spacing +14 added lines, -14 removed lines

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

app/Models/Institution_class_student.php

Spacing +8 added lines, -8 removed lines

@@ -58,7 +58,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
             $model->created = now();
         });
@@ -71,15 +71,15 @@ 
 
     public  static function getStudentsCount($institution_class_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_class_id', '=', $institution_class_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_class_id', '=', $institution_class_id)->count();
 
@@ -109,8 +109,8 @@ 
             ->where('student_id', $student['student_id'])
             ->join('institution_classes', 'institution_class_students.institution_class_id', '=', 'institution_classes.id')
             ->where('institution_class_students.student_id', $student['student_id'])
-            ->where('institution_class_students.academic_period_id',$student['academic_period_id'])
-            ->where('institution_class_students.institution_id',$student['institution_id'])
+            ->where('institution_class_students.academic_period_id', $student['academic_period_id'])
+            ->where('institution_class_students.institution_id', $student['institution_id'])
             ->whereNull('institution_class_students.deleted_at')
             ->get()->first();
     }
@@ -134,7 +134,7 @@ 
                 'institution_id' => $admissionInfo['instituion']->id,
                 'student_status_id' => 1
             ]);
-        } catch (\Throwable $th) {
+        }catch (\Throwable $th) {
             Log::error($th);
         }
     }

app/Models/Institution_grade.php

Spacing +9 added lines, -9 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);
             })
@@ -157,7 +157,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) {
+            ->join('institutions', function($join) use ($year) {
                 $join->on('institutions.id', '=', 'institution_grades.institution_id');
             })
             ->orderBy('institution_id')
@@ -167,13 +167,13 @@ 
             ->toArray();
     }
 
-    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();