@@ -131,7 +131,7 @@ |
||
| 131 | 131 | "login" => 'Provinces', |
| 132 | 132 | ] |
| 133 | 133 | ]; |
| 134 | - }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
| 134 | + } elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
| 135 | 135 | $data = $this->checkOrg($request); |
| 136 | 136 | if (empty($data) || ( (!empty($data['orgId']) && $data['orgId'] !== 2))) { |
| 137 | 137 | $request['data'] = $data; |
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | ])->getBody(); |
| 29 | 29 | $data = json_decode($response, true); |
| 30 | 30 | } catch (\Throwable $th) { |
| 31 | - $this->createGrafanaUser($request); |
|
| 32 | - $data = $this->checkOrg($request); |
|
| 31 | + $this->createGrafanaUser($request); |
|
| 32 | + $data = $this->checkOrg($request); |
|
| 33 | 33 | } |
| 34 | 34 | return $data; |
| 35 | 35 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | public function removeUserMainOrg($data) |
| 86 | 86 | { |
| 87 | - try { |
|
| 87 | + try { |
|
| 88 | 88 | $header = [ |
| 89 | 89 | 'Accept' => 'application/json', |
| 90 | 90 | 'Content-Type' => 'application/json', |
@@ -95,8 +95,8 @@ discard block |
||
| 95 | 95 | 'headers' => $header, |
| 96 | 96 | ]); |
| 97 | 97 | $client->delete("/api/orgs/1/users/{$data['user']['id']}"); |
| 98 | - } catch (\Throwable $th) { |
|
| 99 | - } |
|
| 98 | + } catch (\Throwable $th) { |
|
| 99 | + } |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | public function getUserOrg(Request $request) |
@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | 'headers' => $header |
| 47 | 47 | ]); |
| 48 | 48 | try { |
| 49 | - $client->post( "/api/orgs/{$data['orgId']}/users", [ |
|
| 49 | + $client->post("/api/orgs/{$data['orgId']}/users", [ |
|
| 50 | 50 | 'json' => [ |
| 51 | 51 | 'role' => 'Viewer', |
| 52 | 52 | 'loginOrEmail' => $data['user']['login'] |
@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | public function getUserOrg(Request $request) |
| 103 | 103 | { |
| 104 | - if($request->user()->super_admin){ |
|
| 104 | + if ($request->user()->super_admin) { |
|
| 105 | 105 | $data = [ |
| 106 | 106 | [ |
| 107 | 107 | "orgId" => 2, |
@@ -128,9 +128,9 @@ discard block |
||
| 128 | 128 | "login" => 'Provinces', |
| 129 | 129 | ] |
| 130 | 130 | ]; |
| 131 | - }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
| 131 | + }elseif ($request->user() && (!($request->user()->principal->isEmpty())) && !is_null($request->user()->principal) && ($request->user()->principal[0]->roles->code == 'PRINCIPAL')) { |
|
| 132 | 132 | $data = $this->checkOrg($request); |
| 133 | - if (empty($data) || ( (!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
| 133 | + if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
| 134 | 134 | $request['data'] = $data; |
| 135 | 135 | $data['user'] = $data; |
| 136 | 136 | $data['orgId'] = 2; |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | "login" => 'Schools', |
| 148 | 148 | ] |
| 149 | 149 | ]; |
| 150 | - } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
| 150 | + } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
| 151 | 151 | $data = $this->checkOrg($request); |
| 152 | 152 | if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) { |
| 153 | 153 | $request['data'] = $data; |
@@ -166,9 +166,9 @@ discard block |
||
| 166 | 166 | "login" => 'Zones', |
| 167 | 167 | ] |
| 168 | 168 | ]; |
| 169 | - } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
| 169 | + } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
| 170 | 170 | $data = $this->checkOrg($request); |
| 171 | - if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
| 171 | + if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
| 172 | 172 | $request['data'] = $data; |
| 173 | 173 | $data['user'] = $data; |
| 174 | 174 | $data['orgId'] = 5; |