moe-lk / bulk-upload

app/Models/Area.php

Spacing +1 added lines, -1 removed lines

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

app/Models/User_contact.php

Spacing +6 added lines, -6 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class User_contact extends Base_Model  {
+class User_contact extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -41,14 +41,14 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public static function createOrUpdate($data,$user){
+    public static function createOrUpdate($data, $user) {
 
-        if(!is_null($data['contact'])){
+        if (!is_null($data['contact'])) {
             $exists = self::where('security_user_id', $data->id)
-                ->where('value',$data['contact']) 
+                ->where('value', $data['contact']) 
                 ->first(); 
 
-            if(is_null($exists)){
+            if (is_null($exists)) {
                 $data = [
                     'security_user_id' => $data->id,
                     'value' => $data['contact'],
@@ -58,7 +58,7 @@ 
                     'preferred' => 1
                 ];
                 self::updateOrCreate($data);
-            }else{
+            }else {
                 $exists = $exists->toArray();
                 $exists['preferred'] = 1;   
                 $exists['value'] = $data['contact'];

Braces +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
                     'preferred' => 1
                 ];
                 self::updateOrCreate($data);
-            }else{
+            } else{
                 $exists = $exists->toArray();
                 $exists['preferred'] = 1;   
                 $exists['value'] = $data['contact'];

app/Models/Upload.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Upload extends Model  {
+class Upload extends Model {
 
     /**
      * The database table used by the model.
@@ -43,12 +43,12 @@ 
 
     public $timestamps = true;
 
-    public function user(){
-        return $this->belongsTo('App\Models\Security_user','security_user_id');
+    public function user() {
+        return $this->belongsTo('App\Models\Security_user', 'security_user_id');
     }
 
-    public function classRoom(){
-        return $this->belongsTo('App\Models\Institution_class','institution_class_id');
+    public function classRoom() {
+        return $this->belongsTo('App\Models\Institution_class', 'institution_class_id');
     }
 
 }

app/Models/Academic_period.php

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Academic_period extends Base_Model  {
+class Academic_period extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -41,8 +41,8 @@ 
      */
     protected $dates = ['start_date', 'end_date', 'modified', 'created'];
 
-    public function getAcademicPeriod($year){
-        return self::query()->where('code',$year)->first();
+    public function getAcademicPeriod($year) {
+        return self::query()->where('code', $year)->first();
     }
 
 }

app/Models/Identity_type.php

Spacing +1 added lines, -1 removed lines

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

app/Models/Education_grade.php

Spacing +12 added lines, -12 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Education_grade extends Model  {
+class Education_grade extends Model {
 
     /**
      * The database table used by the model.
@@ -41,17 +41,17 @@ 
      */
     protected $dates = ['modified', 'created'];
 
-    public function getNextGrade($gradeId,$getNextProgrammeGrades = false, $firstGradeOnly = false){
+    public function getNextGrade($gradeId, $getNextProgrammeGrades = false, $firstGradeOnly = false) {
         if (!empty($gradeId)) {
             $gradeObj = $this->find($gradeId);
             $programmeId = $gradeObj->education_programme_id;
             $order = $gradeObj->order;
-            $gradeOptions = self::where( 'education_programme_id',$programmeId
-            )->where('order',$order+1)->get()->first();
+            $gradeOptions = self::where('education_programme_id', $programmeId
+            )->where('order', $order + 1)->get()->first();
             $nextProgramme = self::getNextProgrammeList($programmeId);
-            if(empty($gradeOptions) && !is_null($nextProgramme)){
+            if (empty($gradeOptions) && !is_null($nextProgramme)) {
                 $programmeId = $nextProgramme->next_programme_id;
-                $gradeOptions = self::where( 'education_programme_id',$programmeId
+                $gradeOptions = self::where('education_programme_id', $programmeId
                 )->get()->first();
             }
             // Default is to get the list of grades with the next programme grades
@@ -66,7 +66,7 @@ 
 //                $results = $gradeOptions;
 //            }
             return $gradeOptions;
-        } else {
+        }else {
             return null;
         }
     }
@@ -78,11 +78,11 @@ 
 
             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 = [];
         }
 
@@ -100,9 +100,9 @@ 
 
         $nextProgrammeList = $this->getNextProgrammeList($id);
         if (!empty($nextProgrammeList)) {
-            $results = self::whereIn('education_programme_id',$nextProgrammeList)
+            $results = self::whereIn('education_programme_id', $nextProgrammeList)
                 ->get()->toArray();
-        } else {
+        }else {
             $results = [];
         }
 
@@ -116,7 +116,7 @@ 
      * @return array List of next education programmes id
      */
     public function getNextProgrammeList($id) {
-        return Education_programmes_next_programme::where('education_programme_id',$id)
+        return Education_programmes_next_programme::where('education_programme_id', $id)
             ->get()->first();
     }
 

app/Models/Base_Model.php

Spacing +3 added lines, -3 removed lines

@@ -6,7 +6,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
-class Base_Model extends Model{
+class Base_Model extends Model {
 
 
 
@@ -18,10 +18,10 @@ 
     {
 
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->created = Carbon::now();
         });
-        self::updating(function ($model) {
+        self::updating(function($model) {
             $model->modified = Carbon::now();
         });
     }

app/Models/Institution_class_subject.php

Spacing +24 added lines, -24 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,11 +42,11 @@ 
      */
     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);
         });
         // ->using('App\Models\Institution_subject','institution_subjects.education_subject_id','education_grades_subjects.education_subject_id');
         // return $this->belongsToMany('App\Models\Education_grades_subject','institution_subjects','education_subject_id')
@@ -59,11 +59,11 @@ 
             // });
     }
 
-    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);
         });
 
     }
@@ -71,23 +71,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);
             })
@@ -100,9 +100,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);
@@ -115,15 +115,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'])->exists();
+    public function isDuplicated($subject) {
+        return self::query()->where('institution_subject_id', $subject['institution_subject_id'])
+            ->where('institution_class_id', $subject['institution_class_id'])->exists();
     }
 }

Braces +3 added lines, -2 removed lines

@@ -109,8 +109,9 @@
                 })
                 ->where('institution_class_id', '=', $student->institution_class_id)
                 ->get()->toArray();
-            if (!empty($subjectId))
-                $data[] = $subjectId[0];
+            if (!empty($subjectId)) {
+                            $data[] = $subjectId[0];
+            }
         }
         return $data;
     }

app/Models/Special_need_difficulty.php

Spacing +1 added lines, -1 removed lines

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