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

fix edition of effort curve #6614

Merged
merged 1 commit into from
Feb 13, 2024
+50 −37
Merged

fix edition of effort curve #6614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion front/src/modules/rollingStock/components/RollingStockEditor/CurveSpreadsheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import formatCurve from './formatSpreadSheetCurve';
type CurveSpreadsheetProps = {
selectedCurve: ConditionalEffortCurveForm;
selectedCurveIndex: number;
selectedTractionModeCurves: ConditionalEffortCurveForm[];
effortCurves: EffortCurveForms | null;
setEffortCurves: Dispatch<SetStateAction<EffortCurveForms | null>>;
selectedTractionMode: string | null;
Expand All @@ -20,6 +21,7 @@ type CurveSpreadsheetProps = {
const CurveSpreadsheet = ({
selectedCurve,
selectedCurveIndex,
selectedTractionModeCurves,
effortCurves,
setEffortCurves,
selectedTractionMode,
Expand Down Expand Up @@ -51,7 +53,6 @@ const CurveSpreadsheet = ({
const updateRollingStockCurve = (e: Matrix<{ value: string }>) => {
if (!selectedTractionMode || !effortCurves) return;
const formattedCurve = formatCurve(e);
const selectedTractionModeCurves = effortCurves[selectedTractionMode].curves;

const updatedSelectedCurve = {
...selectedCurve,
Expand Down
84 changes: 48 additions & 36 deletions front/src/modules/rollingStock/components/RollingStockEditor/RollingStockEditorCurves.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ const RollingStockEditorCurves = ({
}
};

const { selectedCurveIndex, selectedCurve } = useMemo(() => {
const { selectedCurveIndex, selectedCurve, selectedTractionModeCurves } = useMemo(() => {
if (!selectedTractionMode || !effortCurves || !effortCurves[selectedTractionMode])
return { selectedCurveIndex: null, selectedCurve: null };
return { selectedCurveIndex: null, selectedCurve: null, selectedTractionModeCurves: null };

const isElectric = selectedTractionMode !== THERMAL_TRACTION_IDENTIFIER;
const modeCurves = effortCurves[selectedTractionMode].curves.filter(
Expand All @@ -94,10 +94,18 @@ const RollingStockEditorCurves = ({
curve.cond.electrical_profile_level === selectedParams.electricalProfile &&
curve.cond.power_restriction_code === selectedParams.powerRestriction
);
return { selectedCurveIndex: index, selectedCurve: modeCurves[index] };
return {
selectedCurveIndex: index,
selectedCurve: modeCurves[index],
selectedTractionModeCurves: modeCurves,
};
}

return { selectedCurveIndex: 0, selectedCurve: modeCurves[0] };
return {
selectedCurveIndex: 0,
selectedCurve: modeCurves[0],
selectedTractionModeCurves: modeCurves,
};
}, [effortCurves, selectedTractionMode, selectedParams]);

const [hoveredRollingstockParam, setHoveredRollingstockParam] = useState<string | null>();
Expand Down Expand Up @@ -200,39 +208,43 @@ const RollingStockEditorCurves = ({
}}
selectedParamsSetter={updateSelectedParams}
/>
{selectedTractionMode && selectedCurve && selectedCurveIndex !== null && (
<div className="rollingstock-editor-curves d-flex p-3">
<CurveSpreadsheet
selectedCurve={selectedCurve}
selectedCurveIndex={selectedCurveIndex}
effortCurves={effortCurves}
selectedTractionMode={selectedTractionMode}
setEffortCurves={setEffortCurves}
isDefaultCurve={
selectedParams.comfortLevel === STANDARD_COMFORT_LEVEL &&
selectedParams.electricalProfile === null &&
selectedParams.powerRestriction === null
}
/>
<div className="rollingstock-card-body">
{!isEmpty(curvesToDisplay[selectedTractionMode]?.curves) && (
<RollingStockCurve
curvesComfortList={[selectedParams.comfortLevel]}
data={curvesToDisplay}
isOnEditionMode
showPowerRestriction={showPowerRestriction}
hoveredElectricalParam={hoveredRollingstockParam}
selectedElectricalParam={
showPowerRestriction
? selectedParams.powerRestriction
: selectedParams.electricalProfile
}
/>
)}
{children}
{selectedTractionMode &&
selectedCurve &&
selectedCurveIndex !== null &&
selectedTractionModeCurves && (
<div className="rollingstock-editor-curves d-flex p-3">
<CurveSpreadsheet
selectedCurve={selectedCurve}
selectedCurveIndex={selectedCurveIndex}
selectedTractionModeCurves={selectedTractionModeCurves}
effortCurves={effortCurves}
selectedTractionMode={selectedTractionMode}
setEffortCurves={setEffortCurves}
isDefaultCurve={
selectedParams.comfortLevel === STANDARD_COMFORT_LEVEL &&
selectedParams.electricalProfile === null &&
selectedParams.powerRestriction === null
}
/>
<div className="rollingstock-card-body">
{!isEmpty(curvesToDisplay[selectedTractionMode]?.curves) && (
<RollingStockCurve
curvesComfortList={[selectedParams.comfortLevel]}
data={curvesToDisplay}
isOnEditionMode
showPowerRestriction={showPowerRestriction}
hoveredElectricalParam={hoveredRollingstockParam}
selectedElectricalParam={
showPowerRestriction
? selectedParams.powerRestriction
: selectedParams.electricalProfile
}
/>
)}
{children}
</div>
</div>
</div>
)}
)}
</>
);
};
Expand Down
Loading