front: rename driver train schedule margin option

SharglutDev · younesschrifi · commit 2e929d252603 · 2024-03-14T21:55:52.000+01:00
diff --git a/front/public/locales/en/operationalStudies/drivertrainschedule.json b/front/public/locales/en/operationalStudies/drivertrainschedule.json
@@ -1,27 +1,28 @@
 {
-    "actualspeed": "Actual",
-    "actualspeed-short": "Act.",
-    "averagespeed": "Mean",
-    "averagespeed-short": "Mean",
-    "composition": "Composition",
-    "dcmdetails": "Train path n°",
-    "destination": "Destination",
-    "energyconsumed-basic": "shortest running time",
-    "energyconsumed-eco": "energy saving running time",
-    "energydetails": "Energy consumption at the rim",
-    "mass": "Mass",
-    "numberoflines": "Number of lines",
-    "origin": "Origin",
-    "pk": "PK",
-    "place": "Facility",
-    "placeholderline": "No.",
-    "rollingstock": "Rolling stock",
-    "speed": "Speed",
-    "speedlimit": "Limit",
-    "speedlimit-short": "Lim.",
-    "speedLimitByTag": "Composition code",
-    "time": "Time",
-    "timetable": "Timetable",
-    "trackname": "Track",
-    "unknownStop": "Unknown"
+  "actualspeed": "Actual",
+  "actualspeed-short": "Act.",
+  "averagespeed": "Mean",
+  "averagespeed-short": "Mean",
+  "composition": "Composition",
+  "dcmdetails": "Train path n°",
+  "destination": "Destination",
+  "energyconsumed-basic": "shortest running time",
+  "energyconsumed-eco": "energy saving running time",
+  "energydetails": "Energy consumption at the rim",
+  "margin": "Margin",
+  "mass": "Mass",
+  "numberoflines": "Number of lines",
+  "origin": "Origin",
+  "pk": "PK",
+  "place": "Facility",
+  "placeholderline": "No.",
+  "rollingstock": "Rolling stock",
+  "speed": "Speed",
+  "speedlimit": "Limit",
+  "speedlimit-short": "Lim.",
+  "speedLimitByTag": "Composition code",
+  "time": "Time",
+  "timetable": "Timetable",
+  "trackname": "Track",
+  "unknownStop": "Unknown"
 }
diff --git a/front/public/locales/fr/operationalStudies/drivertrainschedule.json b/front/public/locales/fr/operationalStudies/drivertrainschedule.json
@@ -1,27 +1,28 @@
 {
-    "actualspeed": "Actuelle",
-    "actualspeed-short": "Act.",
-    "averagespeed": "Moyenne",
-    "averagespeed-short": "Moy.",
-    "composition": "Composition",
-    "dcmdetails": "Sillon n°",
-    "destination": "Destination",
-    "energyconsumed-basic": "base",
-    "energyconsumed-eco": "eco",
-    "energydetails": "Énergie consommée à la jante",
-    "mass": "Masse",
-    "numberoflines": "Nombre de lignes",
-    "origin": "Origine",
-    "pk": "PK",
-    "place": "Établissement",
-    "placeholderline": "N°",
-    "rollingstock": "Matériel roulant",
-    "speed": "Vitesse",
-    "speedlimit": "Limite",
-    "speedlimit-short": "Lim.",
-    "speedLimitByTag": "Code de composition",
-    "time": "Horaire",
-    "timetable": "Table horaire",
-    "trackname": "Voie",
-    "unknownStop": "Inconnu"
+  "actualspeed": "Actuelle",
+  "actualspeed-short": "Act.",
+  "averagespeed": "Moyenne",
+  "averagespeed-short": "Moy.",
+  "composition": "Composition",
+  "dcmdetails": "Sillon n°",
+  "destination": "Destination",
+  "energyconsumed-basic": "base",
+  "energyconsumed-eco": "eco",
+  "energydetails": "Énergie consommée à la jante",
+  "margin": "Marge",
+  "mass": "Masse",
+  "numberoflines": "Nombre de lignes",
+  "origin": "Origine",
+  "pk": "PK",
+  "place": "Établissement",
+  "placeholderline": "N°",
+  "rollingstock": "Matériel roulant",
+  "speed": "Vitesse",
+  "speedlimit": "Limite",
+  "speedlimit-short": "Lim.",
+  "speedLimitByTag": "Code de composition",
+  "time": "Horaire",
+  "timetable": "Table horaire",
+  "trackname": "Voie",
+  "unknownStop": "Inconnu"
 }
diff --git a/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainSchedule.tsx
@@ -15,14 +15,14 @@ export default function DriverTrainSchedule({
   rollingStock: LightRollingStock;
 }) {
   const [baseOrEco, setBaseOrEco] = useState<BaseOrEcoType>(
-    train.eco ? BaseOrEco.eco : BaseOrEco.base
+    train.eco ? BaseOrEco.margin : BaseOrEco.base
   );
 
   useEffect(() => {
-    if (baseOrEco === BaseOrEco.eco && !train[baseOrEco]) {
+    if (baseOrEco === BaseOrEco.margin && !train.eco) {
       setBaseOrEco(BaseOrEco.base);
     } else {
-      setBaseOrEco(BaseOrEco.eco);
+      setBaseOrEco(BaseOrEco.margin);
     }
   }, [train]);
 
diff --git a/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleHeader.tsx
@@ -20,25 +20,25 @@ type Props = {
   setBaseOrEco: (baseOrEco: BaseOrEcoType) => void;
 };
 
-const baseOrEcoOptions = [
-  {
-    label: BaseOrEco.base,
-    value: BaseOrEco.base,
-  },
-  {
-    label: BaseOrEco.eco,
-    value: BaseOrEco.eco,
-  },
-];
-
 export default function DriverTrainScheduleHeader({
   train,
   rollingStock,
   baseOrEco,
   setBaseOrEco,
 }: Props) {
   const { t } = useTranslation(['operationalStudies/drivertrainschedule']);
-  const trainRegime = train[baseOrEco];
+  const trainRegime = baseOrEco === BaseOrEco.margin ? train.eco : train.base;
+
+  const baseOrEcoOptions = [
+    {
+      label: t(BaseOrEco.base),
+      value: BaseOrEco.base,
+    },
+    {
+      label: t(BaseOrEco.margin),
+      value: BaseOrEco.margin,
+    },
+  ];
 
   if (!trainRegime) return null;
 
diff --git a/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleStopList.tsx
@@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next';
 import type { Train } from 'reducers/osrdsimulation/types';
 
 import DriverTrainScheduleStop from './DriverTrainScheduleStop';
-import type { BaseOrEcoType } from './DriverTrainScheduleTypes';
+import { BaseOrEco, type BaseOrEcoType } from './DriverTrainScheduleTypes';
 
 type Props = {
   train: Train;
@@ -14,7 +14,7 @@ type Props = {
 
 export default function DriverTrainScheduleStopList({ train, baseOrEco }: Props) {
   const { t } = useTranslation(['operationalStudies/drivertrainschedule']);
-  const trainRegime = train[baseOrEco];
+  const trainRegime = baseOrEco === BaseOrEco.margin ? train.eco : train.base;
 
   if (!trainRegime) return null;
   return (
diff --git a/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleTypes.tsx b/front/src/modules/trainschedule/components/DriverTrainSchedule/DriverTrainScheduleTypes.tsx
@@ -1,6 +1,6 @@
 export enum BaseOrEco {
   base = 'base',
-  eco = 'eco',
+  margin = 'margin',
 }
 
 export type BaseOrEcoType = keyof typeof BaseOrEco;
diff --git a/front/src/modules/trainschedule/components/DriverTrainSchedule/driverTrainScheduleExportCSV.ts b/front/src/modules/trainschedule/components/DriverTrainSchedule/driverTrainScheduleExportCSV.ts
@@ -7,7 +7,7 @@ import type {
   Train,
 } from 'reducers/osrdsimulation/types';
 
-import type { BaseOrEcoType } from './DriverTrainScheduleTypes';
+import { BaseOrEco, type BaseOrEcoType } from './DriverTrainScheduleTypes';
 
 /**
  * CSV Export of trainschedule
@@ -133,7 +133,8 @@ function createFakeLinkWithData(train: Train, baseOrEco: BaseOrEcoType, csvData:
 }
 
 export default function driverTrainScheduleExportCSV(train: Train, baseOrEco: BaseOrEcoType) {
-  const trainRegime = train[baseOrEco];
+  const trainRegime = baseOrEco === BaseOrEco.margin ? train.eco : train.base;
+
   if (trainRegime) {
     const speedsWithOPsAndSpeedLimits = overloadWithOPsAndSpeedLimits(trainRegime, train.vmax);
     const steps = speedsWithOPsAndSpeedLimits.map((speed) => ({

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`export enum BaseOrEco {`
`2`	`2`	`base = 'base',`
`3`		`- eco = 'eco',`
	`3`	`+ margin = 'margin',`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`export type BaseOrEcoType = keyof typeof BaseOrEco;`