@@ -15,7 +15,7 @@ |
||
| 15 | 15 | protected function redirectTo($request) |
| 16 | 16 | { |
| 17 | 17 | |
| 18 | - if (! ($request->expectsJson() || collect($request->route()->middleware())->contains('api'))) { |
|
| 18 | + if (!($request->expectsJson() || collect($request->route()->middleware())->contains('api'))) { |
|
| 19 | 19 | return route('login'); |
| 20 | 20 | } |
| 21 | 21 | |
@@ -104,9 +104,9 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | public function getUserOrg(Request $request) |
| 106 | 106 | { |
| 107 | - if ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
| 107 | + if ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
| 108 | 108 | $data = $this->checkOrg($request); |
| 109 | - if (empty($data) || ( (!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
| 109 | + if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
| 110 | 110 | $request['data'] = $data; |
| 111 | 111 | $data['user'] = $data; |
| 112 | 112 | $data['orgId'] = 2; |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | "login" => 'schools', |
| 123 | 123 | ] |
| 124 | 124 | ]; |
| 125 | - } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
| 125 | + } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
| 126 | 126 | $data = $this->checkOrg($request); |
| 127 | 127 | if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 3))) { |
| 128 | 128 | $request['data'] = $data; |
@@ -140,9 +140,9 @@ discard block |
||
| 140 | 140 | "login" => 'zone', |
| 141 | 141 | ] |
| 142 | 142 | ]; |
| 143 | - } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
| 143 | + } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
| 144 | 144 | $data = $this->checkOrg($request); |
| 145 | - if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) { |
|
| 145 | + if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) { |
|
| 146 | 146 | $request['data'] = $data; |
| 147 | 147 | $data['user'] = $data; |
| 148 | 148 | $data['orgId'] = 4; |
@@ -73,11 +73,11 @@ discard block |
||
| 73 | 73 | public function userOrg(Request $request) |
| 74 | 74 | { |
| 75 | 75 | $client = new Client(['base_uri' => env('GRAFANA_URL').'/api/']); |
| 76 | - if ($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles) { |
|
| 76 | + if ($request->user() && (!($request->user()->principal->isEmpty())) && $request->user()->principal[0]->roles) { |
|
| 77 | 77 | dd($request->user()->principal[0]->roles->code); |
| 78 | 78 | switch ($request->user()->principal[0]->roles->code) { |
| 79 | 79 | case 'PRINCIPAL': |
| 80 | - $response = $client->request('post','orgs/2/users',[ |
|
| 80 | + $response = $client->request('post', 'orgs/2/users', [ |
|
| 81 | 81 | 'headers' => [ |
| 82 | 82 | 'Authorization' => 'Bearer '.env('GRAFANA_KEY'), |
| 83 | 83 | 'Accept' => 'application/json', |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | ] |
| 90 | 90 | ]); |
| 91 | 91 | dd($response); |
| 92 | - if($response){ |
|
| 92 | + if ($response) { |
|
| 93 | 93 | $data = |
| 94 | 94 | [ |
| 95 | 95 | [ |
@@ -119,23 +119,23 @@ |
||
| 119 | 119 | return $this->belongsTo('App\Institution_class_student', 'id', 'student_id'); |
| 120 | 120 | } |
| 121 | 121 | |
| 122 | - public function principal(){ |
|
| 123 | - return $this->hasMany('App\Security_group_user','security_user_id','id') |
|
| 124 | - ->where('security_group_users.security_role_id','=',4) |
|
| 125 | - ->with(['security_group_institution','institution_staff','security_group' , 'staff_class','institution_group' , 'roles']); |
|
| 122 | + public function principal() { |
|
| 123 | + return $this->hasMany('App\Security_group_user', 'security_user_id', 'id') |
|
| 124 | + ->where('security_group_users.security_role_id', '=', 4) |
|
| 125 | + ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - public function zonal_cordinator(){ |
|
| 128 | + public function zonal_cordinator() { |
|
| 129 | 129 | |
| 130 | - return $this->hasMany('App\Security_group_user','security_user_id','id') |
|
| 131 | - ->where('security_group_users.security_role_id','=',14) |
|
| 132 | - ->with(['security_group_institution','institution_staff','security_group' , 'staff_class','institution_group' , 'roles']); |
|
| 130 | + return $this->hasMany('App\Security_group_user', 'security_user_id', 'id') |
|
| 131 | + ->where('security_group_users.security_role_id', '=', 14) |
|
| 132 | + ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - public function provincial_cordinator(){ |
|
| 135 | + public function provincial_cordinator() { |
|
| 136 | 136 | |
| 137 | - return $this->hasMany('App\Security_group_user','security_user_id','id') |
|
| 138 | - ->where('security_group_users.security_role_id','=',13) |
|
| 139 | - ->with(['security_group_institution','institution_staff','security_group' , 'staff_class','institution_group' , 'roles']); |
|
| 137 | + return $this->hasMany('App\Security_group_user', 'security_user_id', 'id') |
|
| 138 | + ->where('security_group_users.security_role_id', '=', 13) |
|
| 139 | + ->with(['security_group_institution', 'institution_staff', 'security_group', 'staff_class', 'institution_group', 'roles']); |
|
| 140 | 140 | } |
| 141 | 141 | } |