✨ add plane for manual trips (#2704)

Traewelling · Jun 26, 2024 · 952f3c3 · 952f3c3
1 parent f75f3dd
commit 952f3c3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/app/Enum/HafasTravelType.php b/app/Enum/HafasTravelType.php
@@ -9,7 +9,7 @@
  * description="Category of transport. ",
  * type="string",
  * enum={"nationalExpress", "national", "regionalExp", "regional", "suburban", "bus", "ferry", "subway",
- * "tram", "taxi"},
+ * "tram", "taxi", "plane"},
  * example="suburban"
  * )
  */
@@ -25,6 +25,7 @@ enum HafasTravelType: string
  case SUBWAY = 'subway';
  case TRAM = 'tram';
  case TAXI = 'taxi';
+ case PLANE = 'plane';
 
  public function getEmoji(): string {
  return match ($this->value) {
@@ -36,6 +37,7 @@ public function getEmoji(): string {
  'subway' => '🚇',
  'tram' => '🚊',
  'taxi' => '🚖',
+ 'plane' => '✈️',
  default => '',
  };
  }

diff --git a/app/Enum/TravelType.php b/app/Enum/TravelType.php
@@ -4,11 +4,12 @@
 namespace App\Enum;
 
 /**
+ * @todo Mit HafasTravelType abgleichen - warum wird dieses Enum hier für HAFAS Requests genutzt und nicht das HafasTravelType?
+ *
  * @OA\Schema(
  * title="travelType",
  * type="string",
- * enum={"express", "regional", "suburban", "bus", "ferry", "subway", "tram", "taxi",
- * "tram", "taxi"},
+ * enum={"express", "regional", "suburban", "bus", "ferry", "subway", "tram", "taxi", "plane"},
  * example="suburban"
  * )
  */
@@ -22,4 +23,5 @@ enum TravelType: string
  case SUBWAY = 'subway';
  case TRAM = 'tram';
  case TAXI = 'taxi';
+ case PLANE = 'plane';
 }
diff --git a/resources/views/includes/status.blade.php b/resources/views/includes/status.blade.php
@@ -1,7 +1,7 @@
 @php
  use App\Enum\Business;
- use App\Http\Controllers\Backend\Transport\StationController;
- use App\Http\Controllers\Backend\User\ProfilePictureController;
+ use App\Http\Controllers\Backend\Helper\StatusHelper;use App\Http\Controllers\Backend\Transport\StationController;
+ use App\Http\Controllers\Backend\Transport\StatusController;use App\Http\Controllers\Backend\User\ProfilePictureController;use Illuminate\Support\Facades\Gate;
 @endphp
 <div class="card status mb-3" id="status-{{ $status->id }}"
  data-trwl-id="{{$status->id}}"
@@ -65,11 +65,13 @@ class="text-trwl clearfix">
 
  <p class="train-status text-muted">
  <span>
- @if (file_exists(public_path('img/' . $status->checkin->trip->category->value . '.svg')))
+ @if(file_exists(public_path('img/' . $status->checkin->trip->category->value . '.svg')))
  <img class="product-icon"
  src="{{ asset('img/' . $status->checkin->trip->category->value . '.svg') }}"
  alt="{{$status->checkin->trip->category->value}}"
  />
+ @elseif($status->checkin->trip->category->value == 'plane')
+ <i class="fa fa-plane d-inline" aria-hidden="true"></i>
  @elseif($status->checkin->trip->category->value == 'taxi')
  <i class="fa fa-taxi d-inline" aria-hidden="true"></i>
  @else
@@ -117,7 +119,7 @@ class="text-trwl clearfix">
 
  @if(!empty($status->body))
  <p class="status-body"><i class="fas fa-quote-right" aria-hidden="true"></i>
- {!! \App\Http\Controllers\Backend\Transport\StatusController::getPrintableEscapedBody($status) !!}
+ {!! StatusController::getPrintableEscapedBody($status) !!}
  </p>
  @endif
 
@@ -126,7 +128,7 @@ class="text-trwl clearfix">
  {{ __('stationboard.next-stop') }}
 
  @php
- $nextStation = \App\Http\Controllers\Backend\Transport\StatusController::getNextStationForStatus($status);
+ $nextStation = StatusController::getNextStationForStatus($status);
  @endphp
  <a href="{{route('trains.stationboard', ['stationId' => $nextStation?->id])}}"
  class="text-trwl clearfix">
@@ -200,7 +202,7 @@ class="like {{ auth()->user() && $status->likes->where('user_id', auth()->user()
  type="button"
  data-trwl-share-url="{{ route('status', ['id' => $status->id]) }}"
  @if(auth()->user() && $status->user_id == auth()->user()->id)
- data-trwl-share-text="{{ \App\Http\Controllers\Backend\Helper\StatusHelper::getSocialText($status) }}"
+ data-trwl-share-text="{{StatusHelper::getSocialText($status) }}"
  @else
  data-trwl-share-text="{{ $status->description }}"
  @endif

diff --git a/resources/vue/components/TripCreation/TripCreationForm.vue b/resources/vue/components/TripCreation/TripCreationForm.vue
@@ -37,6 +37,7 @@ export default {
  {value: "subway", text: "subway"},
  {value: "tram", text: "tram"},
  {value: "taxi", text: "taxi"},
+ {value: "plane", text: "plane"},
  ],
  };
  },