moe-lk / auth_app

app/User.php

Spacing +12 added lines, -12 removed lines

@@ -119,23 +119,23 @@
         return $this->belongsTo('App\Institution_class_student', 'id', 'student_id');
     }
 
-    public function principal(){
-        return $this->hasMany('App\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\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(){
+    public function zonal_cordinator() {
         
-        return $this->hasMany('App\Security_group_user','security_user_id','id')
-            ->where('security_group_users.security_role_id','=',14)
-            ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
+        return $this->hasMany('App\Security_group_user', 'security_user_id', 'id')
+            ->where('security_group_users.security_role_id', '=', 14)
+            ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']);
     }
 
-    public function provincial_cordinator(){
+    public function provincial_cordinator() {
         
-        return $this->hasMany('App\Security_group_user','security_user_id','id')
-            ->where('security_group_users.security_role_id','=',13)
-            ->with(['security_group_institution','institution_staff','security_group'  , 'staff_class','institution_group' , 'roles']);
+        return $this->hasMany('App\Security_group_user', 'security_user_id', 'id')
+            ->where('security_group_users.security_role_id', '=', 13)
+            ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']);
     }
 }

app/Http/Controllers/GrafanaOauth.php

Spacing +4 added lines, -4 removed lines

@@ -158,7 +158,7 @@ 
                     "login" => 'Provinces',
                 ]
             ];
-        } elseif ($request->user() &&  (!($request->user()->principal->isEmpty()))  && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) {
+        } elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) {
             $data = $this->checkOrg($request);
             if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 2))) {
                 $request['data'] = $data;
@@ -177,7 +177,7 @@ 
                     "login" => 'Schools',
                 ]
             ];
-        } elseif ($request->user()  &&  (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) {
+        } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) {
             $data = $this->checkOrg($request);
             if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) {
                 $request['data'] = $data;
@@ -196,9 +196,9 @@ 
                     "login" => 'Zones',
                 ]
             ];
-        } elseif ($request->user() &&  (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) {
+        } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) {
             $data = $this->checkOrg($request);
-            if (empty($data)  || ((!empty($data['orgId']) && $data['orgId'] !== 5))) {
+            if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) {
                 $request['data'] = $data;
                 $data['user'] = $data;
                 $data['orgId'] = 5;