Show dest or dept station on StationTimeTable based on selection (#20)

viliket · Sep 14, 2023 · 3310d41 · 3310d41
1 parent f6585d4
commit 3310d41
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json
@@ -9,6 +9,7 @@
   "no_results": "No results.",
   "train": "Train",
   "train_details": "Train details",
+  "from": "From",
   "destination": "Destination",
   "departure": "Departure",
   "departures": "Departures",

diff --git a/public/locales/fi/translation.json b/public/locales/fi/translation.json
@@ -9,6 +9,7 @@
   "no_results": "Ei tuloksia.",
   "train": "Juna",
   "train_details": "Junan tiedot",
+  "from": "Lähtöasema",
   "destination": "Määränpää",
   "departure": "Lähtee",
   "departures": "Lähtevät",

diff --git a/src/components/StationTimeTable.tsx b/src/components/StationTimeTable.tsx
@@ -55,7 +55,11 @@ function StationTimeTable({
         <TableHead>
           <TableRow>
             <TableCell>{t('train')}</TableCell>
-            <TableCell>{t('destination')}</TableCell>
+            <TableCell>
+              {timeTableType === TimeTableRowType.Departure
+                ? t('destination')
+                : t('from')}
+            </TableCell>
             <TableCell align="center">
               {timeTableType === TimeTableRowType.Departure
                 ? t('departure')

diff --git a/src/components/StationTimeTableRow.tsx b/src/components/StationTimeTableRow.tsx
@@ -16,7 +16,11 @@ import {
   TrainByStationFragment,
 } from '../graphql/generated/digitraffic';
 import getTimeTableRowForStation from '../utils/getTimeTableRowForStation';
-import { getTrainDestinationStationName } from '../utils/train';
+import {
+  getTrainDepartureStation,
+  getTrainDestinationStation,
+  getTrainStationName,
+} from '../utils/train';
 
 import TimeTableRowTime from './TimeTableRowTime';
 import VehicleTrackingIcon from './VehicleTrackingIcon';
@@ -41,7 +45,14 @@ function StationTimeTableRow({
   const trainName = train.commuterLineid
     ? train.commuterLineid
     : train.trainType.name + train.trainNumber;
-  const destinationStationName = getTrainDestinationStationName(train);
+  const deptOrDestStation =
+    timeTableType === TimeTableRowType.Departure
+      ? getTrainDestinationStation(train)
+      : getTrainDepartureStation(train);
+  const deptOrDestStationName = deptOrDestStation
+    ? getTrainStationName(deptOrDestStation)
+    : null;
+
   const stationRow = getTimeTableRowForStation(
     stationCode,
     train,
@@ -94,12 +105,12 @@ function StationTimeTableRow({
       <TableCell>
         <Link
           component={RouterLink}
-          href={`/${destinationStationName}`}
+          href={`/${deptOrDestStationName}`}
           color="inherit"
           underline="none"
           onClick={handleStationClick}
         >
-          {destinationStationName}
+          {deptOrDestStationName}
         </Link>
       </TableCell>
       <TableCell align="center">