diff --git a/front/src/modules/timesStops/hooks/useTimeStopsColumns.tsx b/front/src/modules/timesStops/hooks/useTimeStopsColumns.tsx
index 2fde7f0df75..26aed1cb091 100644
--- a/front/src/modules/timesStops/hooks/useTimeStopsColumns.tsx
+++ b/front/src/modules/timesStops/hooks/useTimeStopsColumns.tsx
@@ -103,11 +103,13 @@ export const useTimeStopsColumns = <T extends TimeStopsRow>(
{
...keyColumn('trackName', createTextColumn()),
title: t('trackName'),
- component: ({ rowData }) => (
- <span title={rowData.trackName} className="ml-2 text-nowrap overflow-hidden">
- {rowData.trackName}
- </span>
- ),
+ ...(isOutputTable && {
+ component: ({ rowData }) => (
+ <span title={rowData.trackName} className="ml-2 text-nowrap overflow-hidden">
+ {rowData.trackName}
+ </span>
+ ),
+ }),
disabled: true,
...fixedWidth(70),
},
diff --git a/front/tests/assets/operationStudies/simulationSettings/allSettings.json b/front/tests/assets/operationStudies/simulationSettings/allSettings.json
index 8447a80c4e3..ea82661daa9 100644
--- a/front/tests/assets/operationStudies/simulationSettings/allSettings.json
+++ b/front/tests/assets/operationStudies/simulationSettings/allSettings.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoOFF.json b/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoOFF.json
index d1228895f7c..16e90cbeea0 100644
--- a/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoOFF.json
+++ b/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoOFF.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoON.json b/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoON.json
index f59ba41d1b1..17e640d2342 100644
--- a/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoON.json
+++ b/front/tests/assets/operationStudies/simulationSettings/codeCompo/codeCompoON.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileOFF.json b/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileOFF.json
index d1228895f7c..16e90cbeea0 100644
--- a/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileOFF.json
+++ b/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileOFF.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileON.json b/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileON.json
index dbfbdff8b37..34bb1e776fb 100644
--- a/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileON.json
+++ b/front/tests/assets/operationStudies/simulationSettings/electricalProfiles/electricalProfileON.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/simulationSettings/margin/linearMargin.json b/front/tests/assets/operationStudies/simulationSettings/margin/linearMargin.json
index 6699850d98e..010b0e76634 100644
--- a/front/tests/assets/operationStudies/simulationSettings/margin/linearMargin.json
+++ b/front/tests/assets/operationStudies/simulationSettings/margin/linearMargin.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/simulationSettings/margin/marecoMargin.json b/front/tests/assets/operationStudies/simulationSettings/margin/marecoMargin.json
index 2c8c65f8caa..1a6cd673439 100644
--- a/front/tests/assets/operationStudies/simulationSettings/margin/marecoMargin.json
+++ b/front/tests/assets/operationStudies/simulationSettings/margin/marecoMargin.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "",
@@ -34,6 +36,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "124",
@@ -50,6 +53,7 @@
{
"stationName": "South_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/timesAndStops/expectedInputsCellsData.json b/front/tests/assets/operationStudies/timesAndStops/expectedInputsCellsData.json
index e11dc07070c..0d672d544fa 100644
--- a/front/tests/assets/operationStudies/timesAndStops/expectedInputsCellsData.json
+++ b/front/tests/assets/operationStudies/timesAndStops/expectedInputsCellsData.json
@@ -1,18 +1,18 @@
[
{
"row": 1,
- "values": ["West_station", "BV", "11:22:40", "", "", "5%"]
+ "values": ["West_station", "BV", "V2", "11:22:40", "", "", "5%"]
},
{
"row": 2,
- "values": ["Mid_West_station", "BV", "11:47:40", "300", "11:52:40", "1min/100km"]
+ "values": ["Mid_West_station", "BV", "V1", "11:47:40", "300", "11:52:40", "1min/100km"]
},
{
"row": 3,
- "values": ["Mid_East_station", "BV", "12:05:21", "124", "12:07:25", ""]
+ "values": ["Mid_East_station", "BV", "V1", "12:05:21", "124", "12:07:25", ""]
},
{
"row": 4,
- "values": ["North_East_station", "BV", "", "0", "", ""]
+ "values": ["North_East_station", "BV", "V2", "", "0", "", ""]
}
]
diff --git a/front/tests/assets/operationStudies/timesAndStops/expectedOutputsCellsData.json b/front/tests/assets/operationStudies/timesAndStops/expectedOutputsCellsData.json
index a4a41d5d553..558b5e0967d 100644
--- a/front/tests/assets/operationStudies/timesAndStops/expectedOutputsCellsData.json
+++ b/front/tests/assets/operationStudies/timesAndStops/expectedOutputsCellsData.json
@@ -2,6 +2,7 @@
{
"stationName": "West_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "11:22:40",
"requestedDeparture": "",
"stopTime": "",
@@ -18,6 +19,7 @@
{
"stationName": "Mid_West_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "11:47:40",
"requestedDeparture": "11:52:40",
"stopTime": "300",
@@ -35,6 +37,7 @@
{
"stationName": "Mid_East_station",
"stationCh": "BV",
+ "trackName": "V1",
"requestedArrival": "12:05:21",
"requestedDeparture": "12:07:25",
"stopTime": "124",
@@ -51,6 +54,7 @@
{
"stationName": "North_East_station",
"stationCh": "BV",
+ "trackName": "V2",
"requestedArrival": "",
"requestedDeparture": "",
"stopTime": "0",
diff --git a/front/tests/assets/operationStudies/timesAndStops/updatedInputsCellsData.json b/front/tests/assets/operationStudies/timesAndStops/updatedInputsCellsData.json
index 51c6db076b2..bebefde2fbd 100644
--- a/front/tests/assets/operationStudies/timesAndStops/updatedInputsCellsData.json
+++ b/front/tests/assets/operationStudies/timesAndStops/updatedInputsCellsData.json
@@ -1,18 +1,18 @@
[
{
"row": 1,
- "values": ["West_station", "BV", "11:22:40", "", "", "3%"]
+ "values": ["West_station", "BV", "V2", "11:22:40", "", "", "3%"]
},
{
"row": 2,
- "values": ["Mid_West_station", "BV", "", "", "", ""]
+ "values": ["Mid_West_station", "BV", "V1", "", "", "", ""]
},
{
"row": 3,
- "values": ["Mid_East_station", "BV", "13:58:19", "21", "13:58:40", ""]
+ "values": ["Mid_East_station", "BV", "V1", "13:58:19", "21", "13:58:40", ""]
},
{
"row": 4,
- "values": ["North_East_station", "BV", "", "0", "", ""]
+ "values": ["North_East_station", "BV", "V2", "", "0", "", ""]
}
]
diff --git a/front/tests/pages/op-output-table-page-model.ts b/front/tests/pages/op-output-table-page-model.ts
index f4725ee7f2a..789909be16b 100644
--- a/front/tests/pages/op-output-table-page-model.ts
+++ b/front/tests/pages/op-output-table-page-model.ts
@@ -53,6 +53,7 @@ class OperationalStudiesOutputTablePage extends OperationalStudiesTimetablePage
const [
stationName,
stationCh,
+ trackName,
requestedArrival,
requestedDeparture,
stopTime,
@@ -70,6 +71,10 @@ class OperationalStudiesOutputTablePage extends OperationalStudiesTimetablePage
false
),
OperationalStudiesOutputTablePage.getCellValue(cells.nth(headerIndexMap[translations.ch])),
+ OperationalStudiesOutputTablePage.getCellValue(
+ cells.nth(headerIndexMap[translations.trackName]),
+ false
+ ),
OperationalStudiesOutputTablePage.getCellValue(
cells.nth(headerIndexMap[translations.arrivalTime]),
false
@@ -114,6 +119,7 @@ class OperationalStudiesOutputTablePage extends OperationalStudiesTimetablePage
actualTableData.push({
stationName,
stationCh,
+ trackName,
requestedArrival,
requestedDeparture,
stopTime,
diff --git a/front/tests/utils/dataNormalizer.ts b/front/tests/utils/dataNormalizer.ts
index 1cca0c5da40..5f73a4e3a7c 100644
--- a/front/tests/utils/dataNormalizer.ts
+++ b/front/tests/utils/dataNormalizer.ts
@@ -8,6 +8,7 @@ interface Margin {
export interface StationData {
stationName: string;
stationCh: string;
+ trackName: string;
requestedArrival: string;
requestedDeparture: string;
stopTime: string;
@@ -58,6 +59,7 @@ export function normalizeData(data: StationData[]): StationData[] {
return data.map((item) => ({
stationName: cleanWhitespace(item.stationName),
stationCh: cleanWhitespace(item.stationCh),
+ trackName: cleanWhitespace(item.trackName),
requestedArrival: cleanWhitespace(item.requestedArrival),
requestedDeparture: cleanWhitespace(item.requestedDeparture),
stopTime: cleanWhitespace(item.stopTime),