Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

front: import opendata: correct data format #4850

Merged
merged 2 commits into from
Aug 22, 2023
Merged

front: import opendata: correct data format #4850

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0dfd69
front: import opendata: correct data format
nicolaswurtz Aug 18, 2023
8d28123
front: fix const typo & order locales json
nicolaswurtz Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions front/public/locales/en/operationalStudies/importTrainSchedule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"errorNoFrom": "You must fill in an origin.",
"errorNoTo": "You must fill in a destination.",
"errorSameFromTo": "Origin and destination must be different",
"errorImport": "Data conversion failed",
nicolaswurtz marked this conversation as resolved.
Show resolved Hide resolved
"unableToRetrievePathfinding": "Impossible to create a path",
"unableToRetrieveTrainSchedule": "Impossible to compute running time"
},
Expand Down
1 change: 1 addition & 0 deletions front/public/locales/fr/operationalStudies/importTrainSchedule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"endTime": "FIN",
"errorMessages": {
"error": "Une erreur est survenue",
"errorImport": "Impossible de convertir les données en TrainSchedule",
"errorNoDate": "Vous devez renseigner une date.",
"errorNoFrom": "Vous devez renseigner une origine.",
"errorNoTo": "Vous devez renseigner une destination.",
Expand Down
17 changes: 5 additions & 12 deletions ...lications/operationalStudies/components/ImportTrainSchedule/ImportTrainScheduleConfig.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,28 +91,21 @@ export default function ImportTrainScheduleConfig({
return true;
}
const hasInvalidteps = trainSchedule.steps.some((step) =>
nicolaswurtz marked this conversation as resolved.
Show resolved Hide resolved
[
'arrivalTime',
'departureTime',
'uic',
'yard',
'name',
'trigram',
'latitude',
'longitude',
].some((key) => !(key in step))
['arrivalTime', 'departureTime', 'uic', 'name', 'trigram', 'latitude', 'longitude'].some(
(key) => !(key in step)
)
);
return hasInvalidteps;
});
if (isInvalidTrainSchedules) {
dispatch(
setFailure({
name: t('errorMessages.error'),
message: 'Impossible de convertir les données en TrainSchedule',
message: t('errorMessage.errorImport'),
})
);
console.error(
'Invalid data format: can not convert response into TrainSchedules. Expected format : { trainNumber: string; rollingStock: string; departureTime: string; arrivalTime: string; departure: string; steps: ({uic: number; yard: string; name: string; trigram: string; latitude: number; longitude: number; arrivalTime: string; departureTime: string; })[]; transilienName?: string; }'
'Invalid data format: can not convert response into TrainSchedules. Expected format : { trainNumber: string; rollingStock: string; departureTime: string; arrivalTime: string; departure: string; steps: ({uic: number; yard?: string; name: string; trigram: string; latitude: number; longitude: number; arrivalTime: string; departureTime: string; })[]; transilienName?: string; }'
);
return null;
}
Expand Down