Maj CCR and whazzup (#73)

* Feedback connect Github and discord * Correction Metar * f * correctif * Maj metar icao * Correctif serveur * correctif * error 500 page * MAJ API IVAO * Onlive CTR and whazzup
alexcaussades · Sep 10, 2023 · 6187ee1 · 6187ee1
1 parent 54c69f9
commit 6187ee1
Show file tree

Hide file tree

Showing 5 changed files with 132 additions and 28 deletions.
diff --git a/app/Http/Controllers/myOnlineServeurController.php b/app/Http/Controllers/myOnlineServeurController.php
@@ -58,18 +58,57 @@ public function VerrifOnlineServeur()
     public function getVerrifOnlineServeur()
     {
         $q = $this->VerrifOnlineServeur();
-        $whazzup = new whazzupController();
+        $whazzupp = new whazzupController();
+
+        if ($q['atc'][0]['atcSession']['position'] == "CTR" ){
+            $ivao_session = $whazzupp->track_session_id($q['atc'][0]['id']);
+            $ivao_session_decode = json_decode($ivao_session, true);
+            $time = Carbon::parse($ivao_session_decode["time"])->format('H:i');
+            $metar = new metarController();
+            $ident = $q['atc'][0]['callsign'];
+            $ident = explode("_", $ident);
+            $ident[0] = substr($ident[0], 0, -1);
+            $metar = $metar->getFirAtc($ident[0]);
+            //différence entre les deux array pour avoir les callsign des atc online
+            // $metar = array_diff_key($metar, $ident);  
+            // $metar = array_values($metar);                 
+            $atc_online = [];
+            for ($i = 0; $i < count($metar); $i++) {
+                $atc_online[$i]["icao"] = $metar[$i][0]["callsign"];
+                $atc_online[$i]["icao"] = explode("_", $atc_online[$i]["icao"]);
+                $atc_online[$i]["icao"] = $atc_online[$i]["icao"][0];
+                $atc_online[$i]["callsign"] = $metar[$i][0]["callsign"];
+                $atc_online[$i]["frequency"] = $metar[$i][0]["atcSession"]["frequency"];
+                $atc_online[$i]["time"] = Carbon::parse($metar[$i][0]["time"])->format('H:i');
+                $atc_online[$i]["metar"] = $whazzupp->Get_metar($atc_online[$i]["icao"])->json();
+                $atc_online[$i]["metar"] = $atc_online[$i]["metar"]["metar"] ?? null;
+                $atc_online[$i]["taf"] = $whazzupp->Get_taf($atc_online[$i]["icao"])->json();
+                $atc_online[$i]["revision"] = $metar[$i][0]["atis"]["revision"];
+            }
+
+            $atc = [
+                "callsign" => $ivao_session_decode['callsign'],
+                "id_session" => $ivao_session_decode['id'],
+                "frequency" => $ivao_session_decode["atcSession"]['frequency'],
+                "rating" =>$ivao_session_decode["user"]['rating']["atcRating"]["shortName"],
+                "time" => $time,
+                "revision" => $q['atc'][0]['atis']['revision'],
+            ];
+
+            return view("myoline.ccr", ["atc" => $atc, "atc_online" => $atc_online]);
+        }
         if ($q['atc'] != null) {
-            $ivao_session = $whazzup->track_session_id($q['atc'][0]['id']);
+            $ivao_session = $whazzupp->track_session_id($q['atc'][0]['id']);
             $ivao_session_decode = json_decode($ivao_session, true);
             $time = Carbon::parse($ivao_session_decode["time"])->format('H:i');
             $new_icao = $ivao_session_decode['callsign'];
             $new_icao = explode("_", $new_icao);
             $new_icao = $new_icao[0];
-            $r = $whazzup->get_rwy($new_icao);
-            $metar = $whazzup->Get_metar($new_icao);
-            $taf = $whazzup->Get_taf($new_icao);
-            $atc_online = $whazzup->ckeck_online_atc($new_icao);
+            $r = $whazzupp->get_rwy($new_icao);
+            $metar = $whazzupp->Get_metar($new_icao);
+            $taf = $whazzupp->Get_taf($new_icao);
+            $atc_online = $whazzupp->ckeck_online_atc($new_icao);
+
             $atis = $q['atc'][0]['atis']['lines'] ?? null;
             $callsign = $q['atc'][0]['callsign'];
             $callsign = explode("_", $callsign);
@@ -106,22 +145,23 @@ public function getVerrifOnlineServeur()
             return view("myoline.atc", ["atc" => $atc, "atis" => $atis, "plateform" => $plateform, "fly" => $fly]);
         }
         elseif ($q['pilot'] != null) {
-            $ivao_session = $whazzup->track_session_id($q['pilot'][0]['id']);
+            $ivao_session = $whazzupp->track_session_id($q['pilot'][0]['id']);
             $ivao_session_decode = json_decode($ivao_session, true);
-            $fp_session = $whazzup->get_flightPlans($ivao_session_decode["id"]);
+            $fp_session = $whazzupp->get_flightPlans($ivao_session_decode["id"]);
             $fp_session = $fp_session[0];
             //dd($fp_session);
-            $atc_online_departure = $whazzup->ckeck_online_atc($fp_session['departureId']);
-            $atc_online_arrival = $whazzup->ckeck_online_atc($fp_session['arrivalId']);
+            $atc_online_departure = $whazzupp->ckeck_online_atc($fp_session['departureId']);
+            $atc_online_arrival = $whazzupp->ckeck_online_atc($fp_session['arrivalId']);
             $q = $q['pilot'];
 
             $distance_arrival = $q[0]['lastTrack']['arrivalDistance'] ?? null;
             $distance_arrival = explode(".", $distance_arrival);
             $speed = $q[0]['lastTrack']['groundSpeed'] / 60 ?? 1;
-            $metar_dep = $whazzup->Get_metar($fp_session["departureId"]);
-            $metar_arr = $whazzup->Get_metar($fp_session["arrivalId"]);
-            $taf_dep = $whazzup->Get_taf($fp_session["departureId"]);
-            $taf_arr = $whazzup->Get_taf($fp_session["arrivalId"]);
+            $metar_dep = $whazzupp->Get_metar($fp_session["departureId"]);
+            $metar_arr = $whazzupp->Get_metar($fp_session["arrivalId"]);
+            $taf_dep = $whazzupp->Get_taf($fp_session["departureId"]);
+            $taf_arr = $whazzupp->Get_taf($fp_session["arrivalId"]);
+
 
             if ($speed <= 0) {
                 $speed = 1;

diff --git a/app/Http/Controllers/whazzupController.php b/app/Http/Controllers/whazzupController.php
@@ -22,21 +22,22 @@ public function getwhazzup()
 
     public function donwload_whazzup()
     {
-        $whazzup = Http::get('https://api.ivao.aero/v2/tracker/whazzup');
+        $whazzup = $this->whazzup_api_traker();
         return $whazzup;
     }
 
     public function store_file_whazzup()
     {
         $wha = $this->donwload_whazzup();
-        $date = json_decode($wha);
+        $date = $wha["updatedAt"];
+        $wha = json_encode($wha);
         $name = Str::random(15);
         $sto = Storage::put('public/whazzup/' . $name . '.json', $wha);
         $sto = Storage::url('public/whazzup/' . $name . '.json', $wha);
         //$review = Storage::get('public/whazzup/'.$name.'.json');
         $r = [
             "name" => $name,
-            "date" => $date->updatedAt,
+            "date" => $date,
             "url" => $sto
         ];
         //$a = json_decode($r["review"]);

diff --git a/resources/views/myoline/ccr.blade.php b/resources/views/myoline/ccr.blade.php
@@ -0,0 +1,59 @@
+@extends("metar-base")
+
+@section("title", "Online")
+
+
+@include("navbar")
+
+@section('content')
+
+<div class="container mt-5">
+    <h2>{{$atc["callsign"]}} </h2>
+    <div class="text-muted">Tracker Id : {{$atc['id_session']}}</div>
+
+    <div class="card text-white bg-dark">
+        <div class="card-body">
+            <h4 class="card-title d-flex align-items-center">On Live <span class="material-symbols-outlined text-danger ms-2 blink">radio_button_checked</span></h4>
+            <p class="card-text">
+            <div class="row">
+                <div class="col"> <span class="text-info">Frequency :</span> {{ $atc["frequency"] }} Mhz </div>
+                <div class="col"> <span class="text-info">Time Online :</span> {{ $atc["time"] }}</div>
+                <div class="col"> <span class="text-info">Revision :</span> {{ $atc["revision"] }}</div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="container">
+    <hr>
+    <h2>ATC ONLINE</h2>
+    <div class="row">
+        @foreach ($atc_online as $atcs)
+        @if ($atcs["callsign"] != $atc["callsign"])
+        <div class="col-4 mt-2">
+            <div class="card text-white bg-dark">
+                <div class="card-body">
+                    <h4 class="card-title">{{ $atcs["callsign"] }}</h4>
+                    <p class="card-text">
+                        <span class="text-info">Frequency:</span> {{ $atcs["frequency"] }} Mhz <br>
+                        <span class="text-info">Time Online:</span> {{ $atcs["time"] }} <br>
+                        <span class="text-info">Revision:</span> {{ $atcs["revision"] }} <br>
+                        @if ($atcs["metar"] != null)
+                        <span class="text-info">Metar:</span> {{ $atcs["metar"] }} <br>
+                        @endif
+                    </p>
+                </div>
+            </div>
+        </div>
+        @endif
+
+        @endforeach
+    </div>
+
+</div>
+
+@if (ENV('APP_ENV') == 'local')
+<script src="{{ asset("asset/js/update_friend.js") }}"></script>
+@else
+<script src="{{ asset("public/asset/js/update_friend.js") }}"></script>
+@endif
diff --git a/resources/views/myoline/pilot.blade.php b/resources/views/myoline/pilot.blade.php
@@ -33,8 +33,10 @@
             <div class="card text-white bg-dark">
                 <div class="card-body">
                     <p class="card-text">
-                    <span class="text-info"> Departure : </span> {{ $pilot["flightPlan"]['departureId'] }} <br>
-                    <span class="text-info"> METAR : </span> {{ $metar["departure"]["metar"] }} <br>
+                    <span class="text-info"> Departure : </span> {{ $pilot["flightPlan"]['departureId'] }}
+                    <hr>
+                    <span class="text-info"> METAR : </span> {{ $metar["departure"]["metar"] }}
+                    <hr>
                     <span class="text-info"> TAF : </span>{{ $metar["departure"]["taf"] }}
                     </p>
                 </div>
@@ -44,8 +46,11 @@
             <div class="card text-white bg-dark">
                 <div class="card-body">
                     <p class="card-text">
-                    <span class="text-info"> Arrival : </span> {{ $pilot["flightPlan"]['arrivalId'] }} <br>
-                    <span class="text-info"> METAR : </span>{{ $metar["arrival"]["metar"] }} <br>
+
+                    <span class="text-info"> Arrival : </span> {{ $pilot["flightPlan"]['arrivalId'] }}
+                    <hr>
+                    <span class="text-info"> METAR : </span>{{ $metar["arrival"]["metar"] }}
+                    <hr>
                     <span class="text-info"> TAF : </span>{{ $metar["arrival"]["taf"] }}
                     </p>
                 </div>

diff --git a/routes/web.php b/routes/web.php
@@ -72,9 +72,11 @@
     /** creation d'un cookie sur laravel */
     $users = $usersController->autentification_via_cookie();
     $whazzup = new whazzupController();
+    $whazzup->getwhazzup();
     $whazzup = $whazzup->connexion();
     $bddid = new whazzupController();
     $idlast = $bddid->bddid();
+
     $heurechange = $bddid->heurechange();
     return response()->view('welcome', ["whazzup" => $whazzup, "idlast" => $idlast, "heurechange" => $heurechange]);
 })->where('client', '[0-9]+')->name("home");
@@ -674,18 +676,15 @@
 })->middleware(["auth:web"]);
 
 Route::get("test", function (Request $request) {
-
-    $online = new myOnlineServeurController("1", "709972");
+    $online = new myOnlineServeurController("1", "437050");
     $online = $online->getVerrifOnlineServeur();
     return $online;
 })->name("test");
 
 Route::get("test2", function (Request $request) {
-
-    $whazzup = new whazzupController();
-    $whazzup->API_request_session();
-    $u = $whazzup->track_session_id('53227334');
-    return $u->json();
+    $metar = new metarController();
+    $metar = $metar->getFirAtc("LFBO");
+    dd($metar);
 })->name("test2");
 
 Route::get("test3", function (Request $request) {