Updated Registration Column name and distance achievement units

resources/js/Components/FlightsGoneBy/AchievementCard.vue

@@ -9,8 +9,6 @@ import ButtonLink from "@/Components/FlightsGoneBy/ButtonLink.vue";
 import Distance from "@/Components/Distance.vue";
 import FormattedNumber from "@/Components/FormattedNumber.vue";
 
-const distanceAchievementCategoryId = 6
-
 const props = defineProps<{
     achievement: Achievement
     userAchievement?: UserAchievement
@@ -18,6 +16,20 @@ const props = defineProps<{
     distanceUnit? : "mi" | "km" | "nm"
 }>()
 
+const dynamicDistanceUnit = computed(() => {
+    if(props.achievement.internal_name == 'distance.million_miles'){
+        return 'mi'
+    }
+
+    if(props.achievement.internal_name == 'distance.million_kilometers'){
+        return 'km'
+    }
+
+    return props.distanceUnit ?? 'km';
+})
+
+
+
 const progress = computed(() => {
     if (!props.achievement.progressive || !props.achievement.threshold) return null
     const current = props.userAchievement?.progress ?? 0
@@ -88,9 +100,9 @@ const unlocked = computed(() => {
 
                     <template v-if="achievement.progressive && progress">
                         <div class="progress-label">
-                            <span v-if="achievement.achievement_category_id == distanceAchievementCategoryId">
-                                <Distance :unit="distanceUnit" :showUnits="false" :value="Math.min(progress.current, progress.threshold)" /> /
-                                <Distance :unit="distanceUnit" :value="progress.threshold" />
+                            <span v-if="achievement.category?.internal_name == 'distance'">
+                                <Distance :unit="dynamicDistanceUnit" :showUnits="false" :value="Math.min(progress.current, progress.threshold)" /> /
+                                <Distance :unit="dynamicDistanceUnit" :value="progress.threshold" />
                             </span>
                             <span v-else>
                                 <FormattedNumber :value="Math.min(progress.current, progress.threshold)" /> /

resources/js/Components/FlightsGoneBy/DepartureBoard.vue

@@ -17,11 +17,9 @@ const props = defineProps<{
 const page = usePage<SharedProps>().props
 const ITEMS_PER_PAGE = 25
 
-const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'registration', 'class_seat_combined', 'note']
+const defaultColumns = ['airline', 'flight_number', 'departure_airport', 'arrival_airport', 'departure_date', 'departure_time', 'arrival_time', 'duration', 'distance', 'aircraft', 'aircraft_registration', 'class_seat_combined', 'note']
 const columnsToShow = computed(() => page.auth.user?.resolved_settings?.departure_board_columns ?? defaultColumns)
-const showColumn = (column: string) =>
-    columnsToShow.value.includes(column) ||
-    (column === 'aircraft_registration' && columnsToShow.value.includes('registration'))
+const showColumn = (column: string) => columnsToShow.value.includes(column)
 
 const allHeaders = [
     { title: '', key: 'airline', sortable: true, resizable: false},

resources/js/Components/FlightsGoneBy/DepartureBoardTableRow.vue

@@ -137,7 +137,7 @@ const showColumn = (column: string) => props.columnsToShow.includes(column)
             </AircraftToolTip>
         </td>
 
-        <td v-if="showColumn('registration')" class="v-data-table__td registration-cell">
+        <td v-if="showColumn('aircraft_registration')" class="v-data-table__td registration-cell">
             <Mono muted smaller v-if="flight.aircraft_registration">{{ flight.aircraft_registration }}</Mono>
         </td>