Skip to content
This repository has been archived by the owner on Oct 20, 2024. It is now read-only.

Alexcaussades/issue134 #137

Merged
merged 4 commits into from
Dec 2, 2023
Merged

Alexcaussades/issue134 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b85b0b8
fix: Bug: Add friend for page #134
alexcaussades Nov 26, 2023
4765c21
Change and update FPL
alexcaussades Nov 27, 2023
8cb1c44
change
alexcaussades Dec 2, 2023
9539fcb
Merge branch 'master' into alexcaussades/issue134
alexcaussades Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/views/pirep/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

@for ($i = 0; $i < count($pireps); $i++) <tr>
<td scope="row">{{Carbon::parse($pireps[$i]["eobt"])->format("Y-m-d H:m")}}</td>
<td>{{$pireps[$i]["departureId"]}} / {{$pireps[$i]["arrivalId"]}}</td>
<td>{{$pireps[$i]["departureId"] ?? "N.C"}} / {{$pireps[$i]["arrivalId"] ?? "N.C"}}</td>
<td>{{$pireps[$i]["callsign"]}}</td>
<td>
<form action="{{Route("pirep.show", ["id" => $pireps[$i]["id"]])}}" method="get">
Expand Down
40 changes: 23 additions & 17 deletions resources/views/pirep/show.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,26 @@
<div class="form-group">
<div class="row">
<div class="col">
<label for="number" class="text-primary d-flex justify-content-start">Identification : <p class="text-dark ms-2"> {{$json["callsign"]?? ''}}</p></label>
<label for="number" class="text-primary d-flex justify-content-start">Identification : <p class="text-dark ms-2"> {{$json["callsign"] ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="flightRules" class="text-primary d-flex justify-content-start">Flight Rules :<p class="text-dark ms-2">{{$json["flightRules"]}}</p></label>
<label for="flightRules" class="text-primary d-flex justify-content-start">Flight Rules :<p class="text-dark ms-2">{{$json["flightRules"] ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="typeOfFlight" class="text-primary d-flex justify-content-start">Type of Flight :<p class="text-dark ms-2">{{$json["flightType"]}}</p></label>
<label for="typeOfFlight" class="text-primary d-flex justify-content-start">Type of Flight :<p class="text-dark ms-2">{{$json["flightType"] ?? "N.C"}}</p></label>

</div>
</div>
<hr>
<div class="row">
<div class="col">
<label for="aircraftType" class="text-primary d-flex justify-content-start">Aircraft Type :<p class="text-dark ms-2">{{$json["aircraftId"]}}</p></label>
<label for="aircraftType" class="text-primary d-flex justify-content-start">Aircraft Type :<p class="text-dark ms-2">{{$json["aircraftId"] ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="wakeTurbulence" class="text-primary d-flex justify-content-start">Wake Turbulence :<p class="text-dark ms-2">{{$json["aircraftWakeTurbulence"]}}</p></label>
<label for="wakeTurbulence" class="text-primary d-flex justify-content-start">Wake Turbulence :<p class="text-dark ms-2">{{$json["aircraftWakeTurbulence"] ?? "N.C"}}</p></label>

</div>
<div class="col">
Expand All @@ -55,11 +55,12 @@
<hr>
<div class="row">
<div class="col">
<label for="departureAerodrome" class="text-primary d-flex justify-content-start">Departure Aerodrome :<p class="text-dark ms-2">{{$json["departureId"]}}</p></label>

<label for="departureAerodrome" class="text-primary d-flex justify-content-start">Departure Aerodrome :<p class="text-dark ms-2">{{$json["departureId"] ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="departureTime" class="text-primary d-flex justify-content-start">Departure Time :<p class="text-dark ms-2"> {{Carbon::parse($json["departureTime"])->format('H:i') }}</p></label>
<label for="departureTime" class="text-primary d-flex justify-content-start">Departure Time :<p class="text-dark ms-2"> {{Carbon::parse($json["departureTime"])->format('H:i') ?? "N.C" }}</p></label>

</div>
</div>
Expand All @@ -68,58 +69,63 @@
<div class="col">
<label for="departureTime" class="text-primary d-flex justify-content-start">Speed
<div class="input-group mb-3">
<p class="text-dark ms-2">{{$json["cruisingSpeedType"] }} {{$json["cruisingSpeed"] }}</p>
<p class="text-dark ms-2">{{$json["cruisingSpeedType"] }} {{$json["cruisingSpeed"] ?? "N.C"}}</p>

</div>
</label>
</div>
<div class="col">
<label for="departureTime" class="text-primary d-flex justify-content-start">Level
<div class="input-group mb-3">
<p class="text-dark ms-2"> {{$json["altitudeType"]}} {{$json["cruisingSpeed"]}} </p>
<p class="text-dark ms-2"> {{$json["altitudeType"]}} {{$json["cruisingSpeed"] ?? "N.C"}} </p>

</div>
</label>
</div>
</div>
<hr>
<div class="row">
<div class="col">
<label for="Route" class="text-primary d-flex justify-content-start">Route :<p class="text-dark ms-2">{{$json["route"]}}</p></label>
<label for="Route" class="text-primary d-flex justify-content-start">Route :<p class="text-dark ms-2">{{$json["route"] ?? "N.C"}}</p></label>


</div>
</div>
<hr>
<div class="row">
<div class="col">
<label for="destinationAerodrome" class="text-primary d-flex justify-content-start">Destination Aerodrome :<p class="text-dark ms-2"> {{$json["arrivalId"]}}</p></label>
<label for="destinationAerodrome" class="text-primary d-flex justify-content-start">Destination Aerodrome :<p class="text-dark ms-2"> {{$json["arrivalId"] ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="destinationTime" class="text-primary d-flex justify-content-start">Total EET :<p class="text-dark ms-2">{{Carbon::parse($json["eet"])->format('H:i')}}</p></label>
<label for="destinationTime" class="text-primary d-flex justify-content-start">Total EET :<p class="text-dark ms-2">{{Carbon::parse($json["eet"])->format('H:i') ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="destinationTime" class="text-primary d-flex justify-content-start">Alternate Aerodrome :<p class="text-dark ms-2">{{$json["alternativeId"]}}</p></label>
<label for="destinationTime" class="text-primary d-flex justify-content-start">Alternate Aerodrome :<p class="text-dark ms-2">{{$json["alternativeId"] ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="destinationTime" class="text-primary d-flex justify-content-start">2nd Alternate Aerodrome :<p class="text-dark ms-2">{{$json["alternative2Id"]}}</p></label>
<label for="destinationTime" class="text-primary d-flex justify-content-start">2nd Alternate Aerodrome :<p class="text-dark ms-2">{{$json["alternative2Id"] ?? "N.C"}}</p></label>

</div>
</div>
<hr>
<div class="row">
<div class="col">
<label for="Route" class="text-primary d-flex justify-content-start">Other Information :<p class="text-dark ms-2">{{$json["remarks"]}}</p</label>
<label for="Route" class="text-primary d-flex justify-content-start">Other Information :<p class="text-dark ms-2">{{$json["remarks"] ?? "N.C"}}</p</label>

</div>
</div>
<hr>
<div class="row">
<div class="col">
<label for="Route" class="text-primary d-flex justify-content-start">Endurance :<p class="text-dark ms-2">{{Carbon::parse($json["endurance"])->format('H:i')}}</p></label>
<label for="Route" class="text-primary d-flex justify-content-start">Endurance :<p class="text-dark ms-2">{{Carbon::parse($json["endurance"])->format('H:i') ?? "N.C"}}</p></label>

</div>
<div class="col">
<label for="Route" class="text-primary d-flex justify-content-start">Persons on Board :<p class="text-dark ms-2"> {{$json["pob"]}}</p></label>
<label for="Route" class="text-primary d-flex justify-content-start">Persons on Board :<p class="text-dark ms-2"> {{$json["pob"] ?? "N.C"}}</p></label>


</div>
</div>
Expand Down
Loading