moe-lk / bulk-upload

app/Console/Kernel.php

Indentation +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
      */
     protected function schedule(Schedule $schedule)
     {
-         $schedule->command('import:students')
-                  ->cron('* * * * * ');
+            $schedule->command('import:students')
+                    ->cron('* * * * * ');
     }
 
     /**

app/Exports/UsersExport.php

Spacing +3 added lines, -3 removed lines

@@ -31,12 +31,12 @@ 
     public function __construct($class) {
 
         $this->class = $class;
-        $this->_file_name = time() . '_' . Auth::user()->id . '_' . 'student_upload.xls';
+        $this->_file_name = time().'_'.Auth::user()->id.'_'.'student_upload.xls';
     }
 
     public function registerEvents(): array {
         return [
-        BeforeSheet::class => function(BeforeSheet $event){
+        BeforeSheet::class => function(BeforeSheet $event) {
 //          dd($event->crea)  
         },
             BeforeWriting::class => function(BeforeWriting $event) {
@@ -63,7 +63,7 @@ 
         $class = $this->class;
         return Security_user::select('openemis_no', 'first_name', 'gender_id', 'date_of_birth', 'address', 'birthplace_area_id')
                         ->with(['class', 'special_needs'])
-                        ->whereHas('class', function ($query) use ($class) {
+                        ->whereHas('class', function($query) use ($class) {
                             $query->where('institution_class_id', '=', $class);
                         })
                         ->get();

app/Models/User_body_mass.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class User_body_mass extends Base_Model  {
+class User_body_mass extends Base_Model {
 
     /**
      * The database table used by the model.

app/Models/Institution_staff.php

Spacing +5 added lines, -5 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,12 +42,12 @@ 
     protected $dates = ['start_date', 'end_date', 'modified', 'created'];
 
 
-    public function staff_class(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','staff_id');
+    public function staff_class() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'staff_id');
     }
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
 

app/Models/Nationality.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class Nationality extends Model  {
+class Nationality extends Model {
 
     /**
      * The database table used by the model.

app/Models/Workflow_transition.php

Spacing +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class Workflow_transition extends Model  {
+class Workflow_transition extends Model {
 
     public const CREATED_AT = 'created';
     public const UPDATED_AT = 'modified';

app/Models/Institution_grade.php

Indentation +2 added lines, -2 removed lines

@@ -107,8 +107,8 @@
      * @return mixed
      */
     public function getInstitutionGrade($institutionId, $gradeId){
-         return self::where('education_grade_id',$gradeId)
-             ->where('institution_id',$institutionId)->get()->first();
+            return self::where('education_grade_id',$gradeId)
+                ->where('institution_id',$institutionId)->get()->first();
     }
 
     /**

Braces +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
                 ->where('institution_grades.education_grade_id', $educationGradeId)
                 ->where('institution_grades.institution_id', $institutionId)
                 ->get();
-        }else{
+        } else{
             return null;
         }
     }

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_class_grade.php

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class Institution_class_grade extends Base_Model  {
+class Institution_class_grade extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -46,9 +46,9 @@ 
      *
      * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough
      */
-    public function educationSubject(){
-        return $this->hasManyThrough('App\Models\Education_grades_subject','App\Models\Institution_subject',
-            'education_subject_id' ,'education_subject_id');
+    public function educationSubject() {
+        return $this->hasManyThrough('App\Models\Education_grades_subject', 'App\Models\Institution_subject',
+            'education_subject_id', 'education_subject_id');
     }
 
     /**
@@ -70,7 +70,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
         });
     }
@@ -79,7 +79,7 @@ 
     /**
      * @return \Illuminate\Database\Eloquent\Relations\BelongsTo
      */
-    public function classes(){
-        return $this->belongsTo('App\Models\Institution_grade','institution_class_id','id');
+    public function classes() {
+        return $this->belongsTo('App\Models\Institution_grade', 'institution_class_id', 'id');
     }
 }

app/Models/Institution_class.php

Spacing +10 added lines, -10 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution_class extends Base_Model  {
+class Institution_class extends Base_Model {
 
     public const CREATED_AT = 'created';
     public const UPDATED_AT = 'modified';
@@ -48,22 +48,22 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function class_teacher(){
-        return $this->belongsTo('App\Models\Security_group_user','staff_id','security_user_id');
+    public function class_teacher() {
+        return $this->belongsTo('App\Models\Security_group_user', 'staff_id', 'security_user_id');
     }
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
 
-    public function getShiftClasses($shift){
+    public function getShiftClasses($shift) {
         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_shift_id',$shift)
+            ->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_shift_id', $shift)
 //            ->where('academic_period_id',$academicPeriod)
-            ->join('institution_class_grades','institution_classes.id','institution_class_grades.institution_class_id')
+            ->join('institution_class_grades', 'institution_classes.id', 'institution_class_grades.institution_class_id')
             ->groupBy('institution_classes.id')
             ->get()->toArray();
     }