moe-lk / bulk-upload

app/Models/Security_group.php

Spacing +5 added lines, -5 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group extends Model  {
+class Security_group extends Model {
 
     /**
      * The database table used by the model.
@@ -45,13 +45,13 @@ 
 //        return $this->hasMany( User::class);
 //    }
 
-    public function security_users(){
-        return $this->belongsTo('App\Models\Security_group_user','security_group_id');
+    public function security_users() {
+        return $this->belongsTo('App\Models\Security_group_user', 'security_group_id');
     }
 
 
-    public function security_group_institution(){
-        return $this->hasMany('App\Models\Security_group_institution','security_group_id');
+    public function security_group_institution() {
+        return $this->hasMany('App\Models\Security_group_institution', 'security_group_id');
     }
 
 }
\ No newline at end of file

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) {

app/Models/Security_group_institution.php

Spacing +7 added lines, -7 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Security_group_institution extends Model  {
+class Security_group_institution extends Model {
 
 
     /**
@@ -44,16 +44,16 @@ 
 
 
 
-    public function institution(){
-        return $this->belongsTo('App\Models\Institution','institution_id');
+    public function institution() {
+        return $this->belongsTo('App\Models\Institution', 'institution_id');
     }
 
-    public function institution_classes(){
-        return $this->hasMany('App\Models\Institution_class','institution_id','institution_id');
+    public function institution_classes() {
+        return $this->hasMany('App\Models\Institution_class', 'institution_id', 'institution_id');
     }
 
-    public function security_group(){
-        return $this->belongsTo('App\Models\Security_group','security_group_id');
+    public function security_group() {
+        return $this->belongsTo('App\Models\Security_group', 'security_group_id');
     }
 
 }
\ No newline at end of file

app/Models/Import_mapping.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 use Illuminate\Database\Eloquent\Model;
 
-class Import_mapping extends Model  {
+class Import_mapping extends Model {
 
     /**
      * The database table used by the model.
@@ -42,7 +42,7 @@ 
     protected $dates = [];
 
 
-    public static  function getSheetColumns($model = null){
+    public static  function getSheetColumns($model = null) {
         $columns = Import_mapping::where('model', '=', $model)
             ->orderBy('order')
             ->get()->toArray();

app/Models/Education_programmes_next_programme.php

Spacing +1 added lines, -1 removed lines

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

app/Mail/StudentImportSuccess.php

Indentation +2 added lines, -2 removed lines

@@ -45,8 +45,8 @@
     public function build()
     {
         return $this->view('emails.mail')
-             ->from($this->from_address,$this->from_name)
-             ->to($this->user->email)
+                ->from($this->from_address,$this->from_name)
+                ->to($this->user->email)
             ->subject($this->subject)
             ->with($this->with);
     }

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
         $institution = Institution_class::find($file['institution_class_id']);
 
         $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 = [
@@ -45,7 +45,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);