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

Nwz/corrections on tabs for add edit trains #4315

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Nwz/corrections on tabs for add edit trains #4315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54136d0
front: correct translation for train number, name
nicolaswurtz Jun 8, 2023
95b9ce2
front: correct adding settings place
nicolaswurtz Jun 8, 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
2 changes: 1 addition & 1 deletion front/public/locales/en/operationalStudies/manageTrainSchedule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"trainScheduleDelta": "Gap",
"trainScheduleDepartureTime": "Departure time",
"trainScheduleInitialSpeed": "Initial velocity",
"trainScheduleName": "Name",
"trainScheduleName": "Number, name",
"trainScheduleStep": "Increment step",
"trainUpdated": "Updated train",
"updateTrainSchedule": "Edit train",
Expand Down
2 changes: 1 addition & 1 deletion front/public/locales/fr/operationalStudies/manageTrainSchedule.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"trainScheduleDelta": "Intervalle",
"trainScheduleDepartureTime": "Heure de départ",
"trainScheduleInitialSpeed": "Vitesse initiale",
"trainScheduleName": "Nom",
"trainScheduleName": "Numéro, nom",
"trainScheduleStep": "Pas d'incrément",
"trainUpdated": "Train modifié",
"updateTrainSchedule": "Modifier le train",
Expand Down
2 changes: 1 addition & 1 deletion ...rc/applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default function TrainAddingSettings() {
}, [debouncedTrainDelta]);

return (
<div className="osrd-config-item-container d-flex align-items-start mb-2">
<div className="osrd-config-item-container d-flex align-items-start">
<span className="mr-2">
<InputSNCF
type="number"
Expand Down
41 changes: 23 additions & 18 deletions .../src/applications/operationalStudies/components/Scenario/TimetableManageTrainSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { updateTrainScheduleIDsToModify } from 'reducers/osrdconf';
import DotsLoader from 'common/DotsLoader/DotsLoader';
import { useDispatch, useSelector } from 'react-redux';
import { getTrainScheduleIDsToModify } from 'reducers/osrdconf/selectors';
import TrainAddingSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings';
import submitConfAddTrainSchedules from '../ManageTrainSchedule/helpers/submitConfAddTrainSchedules';
import submitConfUpdateTrainSchedules from '../ManageTrainSchedule/helpers/submitConfUpdateTrainSchedules';

Expand Down Expand Up @@ -53,31 +54,35 @@ export default function TimetableManageTrainSchedule({
</button>
)}

{displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add &&
(isWorking ? (
<button className="btn btn-primary disabled" type="button">
<DotsLoader />
</button>
) : (
<button
className="btn btn-primary"
type="button"
onClick={() => submitConfAddTrainSchedules(dispatch, t, setIsWorking)}
>
<span className="mr-2">
<FaPlus />
</span>
{t('addTrainSchedule')}
</button>
))}
{displayTrainScheduleManagement === MANAGE_TRAIN_SCHEDULE_TYPES.add && (
<>
{isWorking ? (
<button className="btn btn-primary disabled mb-2" type="button">
<DotsLoader />
</button>
) : (
<button
className="btn btn-primary mb-2"
type="button"
onClick={() => submitConfAddTrainSchedules(dispatch, t, setIsWorking)}
>
<span className="mr-2">
<FaPlus />
</span>
{t('addTrainSchedule')}
</button>
)}
<TrainAddingSettings />
</>
)}
</div>
<div
className="scenario-timetable-managetrainschedule-body"
role="button"
tabIndex={0}
onClick={leaveManageTrainSchedule}
>
<button className="btn btn-secondary btn-block mt-2" type="button">
<button className="btn btn-secondary btn-block" type="button">
<i className="icons-arrow-prev mr-2" />
{t('returnToSimulationResults')}
</button>
Expand Down
19 changes: 1 addition & 18 deletions front/src/applications/operationalStudies/views/ManageTrainSchedule.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next';
import { useDispatch, useSelector } from 'react-redux';

import TrainSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainSettings';
import TrainAddingSettings from 'applications/operationalStudies/components/ManageTrainSchedule/TrainAddingSettings';
import Itinerary from 'applications/operationalStudies/components/ManageTrainSchedule/Itinerary';
import Map from 'applications/operationalStudies/components/ManageTrainSchedule/Map';
import SpeedLimitByTagSelector from 'common/SpeedLimitByTagSelector/SpeedLimitByTagSelector';
Expand All @@ -24,7 +23,6 @@ import Tabs from 'common/Tabs';
import rollingStockPic from 'assets/pictures/components/train.svg';
import pahtFindingPic from 'assets/pictures/components/pathfinding.svg';
import simulationSettings from 'assets/pictures/components/simulationSettings.svg';
import addingSettingsPic from 'assets/pictures/components/addingSettings.svg';

export default function ManageTrainSchedule() {
const dispatch = useDispatch();
Expand Down Expand Up @@ -116,17 +114,6 @@ export default function ManageTrainSchedule() {
content: 'marges',
}; */

const tabAddingSettings = {
title: (
<>
<img src={addingSettingsPic} alt="adding settings" height={24} />
<span className="ml-2">{t('tabs.addingSettings')}</span>
</>
),
label: t('tabs.addingSettings'),
content: !trainScheduleIDsToModify && <TrainAddingSettings />,
};

useEffect(() => {
if (trainScheduleIDsToModify && trainScheduleIDsToModify.length > 0)
getTrainScheduleById({ id: trainScheduleIDsToModify[0] })
Expand Down Expand Up @@ -163,11 +150,7 @@ export default function ManageTrainSchedule() {
<TrainSettings />
</div>

<Tabs
pills
fullWidth
tabs={[tabRollingStock, tabPathFinding, tabSimulationSettings, tabAddingSettings]}
/>
<Tabs pills fullWidth tabs={[tabRollingStock, tabPathFinding, tabSimulationSettings]} />
</>
);
}
1 change: 0 additions & 1 deletion front/src/assets/pictures/components/addingSettings.svg
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions front/src/styles/scss/applications/operationalStudies/_scenario.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@
.scenario-timetable-managetrainschedule-header {
display: flex;
flex-direction: column;
height: 3rem;
padding: 0.5rem;
padding: 0.5rem 0.5rem 0;
}
.scenario-timetable-managetrainschedule-body {
padding: 0.5rem;
Expand Down