@@ -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 | } |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | |
| 86 | 86 | public function removeUserMainOrg($data) |
| 87 | 87 | { |
| 88 | - try { |
|
| 88 | + try { |
|
| 89 | 89 | $header = [ |
| 90 | 90 | 'Accept' => 'application/json', |
| 91 | 91 | 'Content-Type' => 'application/json', |
@@ -98,8 +98,8 @@ discard block |
||
| 98 | 98 | 'auth' => [env('GRAFANA_USER'), env('GRAFANA_PASSWORD')], |
| 99 | 99 | 'headers' => $header |
| 100 | 100 | ]); |
| 101 | - } catch (\Throwable $th) { |
|
| 102 | - } |
|
| 101 | + } catch (\Throwable $th) { |
|
| 102 | + } |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | public function getUserOrg(Request $request) |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | public function getUserOrg(Request $request) |
| 106 | 106 | { |
| 107 | - if($request->user()->super_admin){ |
|
| 107 | + if ($request->user()->super_admin) { |
|
| 108 | 108 | $data = [ |
| 109 | 109 | [ |
| 110 | 110 | "orgId" => 2, |
@@ -131,9 +131,9 @@ discard block |
||
| 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 | - if (empty($data) || ( (!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
| 136 | + if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 2))) { |
|
| 137 | 137 | $request['data'] = $data; |
| 138 | 138 | $data['user'] = $data; |
| 139 | 139 | $data['orgId'] = 2; |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | "login" => 'Schools', |
| 150 | 150 | ] |
| 151 | 151 | ]; |
| 152 | - } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
| 152 | + } elseif ($request->user() && (!($request->user()->zonal_cordinator->isEmpty())) && !is_null($request->user()->zonal_cordinator) && ($request->user()->zonal_cordinator[0]->roles->code == 'ZONAL_COORDINATOR')) { |
|
| 153 | 153 | $data = $this->checkOrg($request); |
| 154 | 154 | if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 4))) { |
| 155 | 155 | $request['data'] = $data; |
@@ -167,9 +167,9 @@ discard block |
||
| 167 | 167 | "login" => 'Zones', |
| 168 | 168 | ] |
| 169 | 169 | ]; |
| 170 | - } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
| 170 | + } elseif ($request->user() && (!($request->user()->provincial_cordinator->isEmpty())) && !is_null($request->user()->provincial_cordinator) && ($request->user()->provincial_cordinator[0]->roles->code == 'PROVINCIAL_COORDINATOR')) { |
|
| 171 | 171 | $data = $this->checkOrg($request); |
| 172 | - if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
| 172 | + if (empty($data) || ((!empty($data['orgId']) && $data['orgId'] !== 5))) { |
|
| 173 | 173 | $request['data'] = $data; |
| 174 | 174 | $data['user'] = $data; |
| 175 | 175 | $data['orgId'] = 5; |