moe-lk / bulk-upload

app/Models/Institution_class_subject.php

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;
     }

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 getMandatorySubjects($institutionClass){
+    public static function getMandatorySubjects($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('institution_class_id', '=', $institutionClass)
@@ -86,9 +86,9 @@ 
         return $mandatorySubject;
     }
 
-    public static function getAllSubjects($institutionClass){
+    public static function getAllSubjects($institutionClass) {
         $allSubjects = Institution_class_subject::with(['institutionSubject'])
-        ->whereHas('institutionSubject', function ($query) use ($institutionClass) {
+        ->whereHas('institutionSubject', function($query) use ($institutionClass) {
             $query->whereHas('institutionGradeSubject')->where('education_grade_id', $institutionClass['education_grade_id']);
         })
         ->where('institution_class_id', '=', $institutionClass['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'])->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();
     }
 }

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.

app/Models/Security_role.php

Spacing +3 added lines, -3 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_role extends Model  {
+class Security_role extends Model {
 
     /**
      * The database table used by the model.
@@ -42,8 +42,8 @@ 
     protected $dates = ['modified', 'created'];
 
 
-    public function securityUsers(){
-        return $this->belongsToMany(Security_group_user::class,'security_group_users','security_group_id','security_group_id');
+    public function securityUsers() {
+        return $this->belongsToMany(Security_group_user::class, 'security_group_users', 'security_group_id', 'security_group_id');
     }
 
 

app/Models/User_identity.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class User_identity extends Model  {
+class User_identity extends Model {
     
     public const CREATED_AT = 'created';
     public const UPDATED_AT = 'modified';

app/Models/Institution_subjects_room.php

Spacing +1 added lines, -1 removed lines

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

app/Models/User_nationality.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class User_nationality extends Base_Model  {
+class User_nationality extends Base_Model {
 
     /**
      * The database table used by the model.
@@ -47,7 +47,7 @@ 
     public static function boot()
     {
         parent::boot();
-        self::creating(function ($model) {
+        self::creating(function($model) {
             $model->id = (string) Uuid::generate(4);
         });
 

app/Models/Area_administrative.php

Spacing +1 added lines, -1 removed lines

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

app/Models/Institution.php

Indentation +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
     protected $dates = ['date_opened', 'date_closed', 'modified', 'created'];
 
     public function isActive($id){
-       return  self::query()->find($id)->get()->first()->institution_status_id == 1;
+        return  self::query()->find($id)->get()->first()->institution_status_id == 1;
     }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Institution extends Model  {
+class Institution extends Model {
 
     /**
      * The database table used by the model.
@@ -41,7 +41,7 @@ 
      */
     protected $dates = ['date_opened', 'date_closed', 'modified', 'created'];
 
-    public function isActive($id){
+    public function isActive($id) {
        return  self::query()->find($id)->get()->first()->institution_status_id == 1;
     }
 

app/Models/User.php

Indentation +2 added lines, -2 removed lines

@@ -71,8 +71,8 @@
 
     public function permissions(){
         return $this->hasMany('App\Models\Security_group_user','security_user_id','id')
-             ->where('security_group_users.security_role_id','=',5)
-             ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
+                ->where('security_group_users.security_role_id','=',5)
+                ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
     }
 
     public function principal(){

Spacing +17 added lines, -17 removed lines

@@ -7,7 +7,7 @@ 
 use Laravel\Passport\HasApiTokens;
 
 
-class User extends Authenticatable   {
+class User extends Authenticatable {
 
     use HasApiTokens, Notifiable;
 
@@ -69,32 +69,32 @@ 
     protected $dates = ['email_verified_at'];
 
 
-    public function permissions(){
-        return $this->hasMany('App\Models\Security_group_user','security_user_id','id')
-             ->where('security_group_users.security_role_id','=',5)
-             ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
+    public function permissions() {
+        return $this->hasMany('App\Models\Security_group_user', 'security_user_id', 'id')
+             ->where('security_group_users.security_role_id', '=', 5)
+             ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']);
     }
 
-    public function principal(){
-        return $this->hasMany('App\Models\Security_group_user','security_user_id','id')
-            ->where('security_group_users.security_role_id','=',4)
-            ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
+    public function principal() {
+        return $this->hasMany('App\Models\Security_group_user', 'security_user_id', 'id')
+            ->where('security_group_users.security_role_id', '=', 4)
+            ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']);
     }
 
-    public function zonal_cordinator(){
-        return $this->hasMany('App\Models\Security_group_user','security_user_id','id')
-            ->where('security_group_users.security_role_id','=',3)
-            ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
+    public function zonal_cordinator() {
+        return $this->hasMany('App\Models\Security_group_user', 'security_user_id', 'id')
+            ->where('security_group_users.security_role_id', '=', 3)
+            ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']);
     }
 
 
-    public function institution_class_teacher(){
-        return $this->hasMany('App\Models\Institution_staff','staff_id','id')
+    public function institution_class_teacher() {
+        return $this->hasMany('App\Models\Institution_staff', 'staff_id', 'id')
             ->with(['staff_class']);
     }
 
-    public function teacher_classes(){
-        return $this->hasMany('App\Models\Institution_class','staff_id','id');
+    public function teacher_classes() {
+        return $this->hasMany('App\Models\Institution_class', 'staff_id', 'id');
     }
 
     public function findForPassport($username) {