Skip to content

Commit d0e16a1

Browse files
committed
front: wrap output table
Signed-off-by: nncluzu <[email protected]>
1 parent 2ece45f commit d0e16a1

File tree

5 files changed

+44
-35
lines changed

5 files changed

+44
-35
lines changed

front/src/applications/operationalStudies/components/Scenario/ScenarioContent.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ const ScenarioContent = ({
235235
projectionData={projectionData}
236236
conflicts={conflicts}
237237
timetableItemsWithDetails={timetableItemsWithDetails}
238+
activeBoards={activeBoards}
238239
updateTrainDepartureTime={updateTrainDepartureTime}
239240
isMapDisplayed={activeBoards.has('map')}
240241
/>

front/src/applications/operationalStudies/views/SimulationResults.tsx

Lines changed: 28 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import {
3737
import BoardWrapper from '../components/Scenario/BoardWrapper';
3838
import { useScenarioContext } from '../hooks/useScenarioContext';
3939
import useSimulationResults from '../hooks/useSimulationResults';
40+
import type { Board } from '../types';
4041

4142
const SPEED_SPACE_CHART_HEIGHT = 521.5;
4243
const HANDLE_TAB_RESIZE_HEIGHT = 20;
@@ -47,6 +48,7 @@ type SimulationResultsProps = {
4748
projectionData?: ProjectionData;
4849
timetableItemsWithDetails: TimetableItemWithDetails[];
4950
conflicts?: Conflict[];
51+
activeBoards: Set<Board>;
5052
updateTrainDepartureTime: (trainId: TimetableItemId, newDepartureTime: Date) => Promise<void>;
5153
isMapDisplayed?: boolean;
5254
};
@@ -56,6 +58,7 @@ const SimulationResults = ({
5658
projectionData,
5759
timetableItemsWithDetails,
5860
conflicts = [],
61+
activeBoards,
5962
updateTrainDepartureTime,
6063
isMapDisplayed,
6164
}: SimulationResultsProps) => {
@@ -289,30 +292,31 @@ const SimulationResults = ({
289292
</div>
290293
</BoardWrapper>
291294

292-
{/* TIME STOPS TABLE */}
293-
<div className="time-stop-outputs">
294-
<p className="mt-2 mb-3 ml-3 font-weight-bold">
295-
{t('simulationResults.timetableOutput')}
296-
</p>
297-
<TimesStopsOutput
298-
simulatedTimetableItem={simulationResults.simulation}
299-
simulationSummary={simulationSummary}
300-
operationalPoints={simulationResults.pathProperties.operationalPoints}
301-
selectedTrain={simulationResults.train}
302-
path={simulationResults.path}
303-
/>
304-
</div>
305-
306-
{/* SIMULATION EXPORT BUTTONS */}
307-
<SimulationResultExport
308-
path={simulationResults.path}
309-
scenarioData={scenarioData}
310-
train={simulationResults.train}
311-
simulation={simulationResults.simulation}
312-
pathProperties={simulationResults.pathProperties}
313-
rollingStock={simulationResults.rollingStock}
314-
mapCanvas={mapCanvas}
315-
/>
295+
<BoardWrapper
296+
hidden={!activeBoards.has('tables')}
297+
name={t('simulationResults.timetableOutput')}
298+
>
299+
<div className="time-stop-outputs">
300+
{/* TIME STOPS TABLE */}
301+
<TimesStopsOutput
302+
simulatedTimetableItem={simulationResults.simulation}
303+
simulationSummary={simulationSummary}
304+
operationalPoints={simulationResults.pathProperties.operationalPoints}
305+
selectedTrain={simulationResults.train}
306+
path={simulationResults.path}
307+
/>
308+
{/* SIMULATION EXPORT BUTTONS */}
309+
<SimulationResultExport
310+
path={simulationResults.path}
311+
scenarioData={scenarioData}
312+
train={simulationResults.train}
313+
simulation={simulationResults.simulation}
314+
pathProperties={simulationResults.pathProperties}
315+
rollingStock={simulationResults.rollingStock}
316+
mapCanvas={mapCanvas}
317+
/>
318+
</div>
319+
</BoardWrapper>
316320
</>
317321
)}
318322
</div>

front/src/modules/timesStops/styles/_timesStopsDatasheet.scss

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
11
.time-stops-datasheet {
2-
padding-bottom: 16px;
3-
border-radius: 10px;
4-
box-shadow:
5-
0px 1px 0px rgba(255, 255, 255, 1) inset,
6-
0px 4px 7px -3px rgba(255, 171, 88, 0.17),
7-
0px 2px 4px rgba(0, 0, 0, 0.22);
82
background-color: var(--ambientB15);
93
--dsg-cell-background-color: var(--white100);
104
--dsg-cell-disabled-background-color: var(--white100);
@@ -55,6 +49,8 @@
5549

5650
.dsg-cell.dsg-cell-header {
5751
font-size: 0.75rem;
52+
box-shadow: 0 1px 0 0 inset var(--white100);
53+
background-color: var(--ambientB15);
5854
}
5955

6056
.dsg-cell-gutter {

front/src/styles/scss/applications/operationalStudies/_scenario.scss

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,5 +686,8 @@
686686
position: relative;
687687
width: 100%;
688688
height: 100%;
689+
display: flex;
690+
flex-direction: column;
691+
gap: 16px;
689692
}
690693
}

front/src/styles/scss/applications/operationalStudies/_simulationresults.scss

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
flex-direction: column;
55
gap: 16px;
66

7+
> :last-child {
8+
margin-bottom: 16px;
9+
}
10+
711
.osrd-simulation-container {
812
position: relative;
913
border-radius: 4px;
@@ -20,10 +24,6 @@
2024
0 2px 4px rgba(0, 0, 0, 0.22);
2125
}
2226

23-
.time-stop-outputs {
24-
margin: 0 30px 28px 38px;
25-
}
26-
2727
.driver-train-schedule {
2828
background-color: white;
2929
padding: 16px;
@@ -34,7 +34,12 @@
3434
.simulation-sheet-container {
3535
display: flex;
3636
justify-content: space-between;
37-
padding: 0 33.5px 75px 42.5px;
37+
padding: 16px;
38+
width: 100%;
39+
box-shadow: 0 1px 0 0 inset var(--black10);
40+
border-radius: 0 0 8px 8px;
41+
background-color: var(--ambiantB15);
42+
3843
button {
3944
background-color: var(--black5);
4045
font-weight: 500;

0 commit comments

Comments
 (0)