Skip to content

Commit

Permalink
🪲 Fix reference day.
Browse files Browse the repository at this point in the history
  • Loading branch information
JonasGilg committed Jan 21, 2025
1 parent c673433 commit 682d706
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 13 deletions.
2 changes: 0 additions & 2 deletions frontend/src/components/LineChartContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ export default function LineChartContainer() {
});
});

console.log(lines);

return lines;
});
}, [lineChartData, scenarios, scenariosState]);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export default function CompartmentsRows({
id={index}
selected={selected}
compartment={{id, name}}
value={GetFormattedAndTranslatedValues(compartmentValues ? compartmentValues[name] : null)}
value={GetFormattedAndTranslatedValues(compartmentValues ? compartmentValues[id] : null)}
compartmentsExpanded={compartmentsExpanded}
setSelectedCompartment={setSelectedCompartment}
minCompartmentsRows={minCompartmentsRows}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
// SPDX-License-Identifier: Apache-2.0

import Box from '@mui/material/Box';
import {Dispatch, SetStateAction} from 'react';
import React, {Dispatch} from 'react';
import dayjs, {Dayjs} from 'dayjs';
import {DatePicker} from '@mui/x-date-pickers';
import {LocalizationProvider} from '@mui/x-date-pickers/LocalizationProvider';
import {AdapterDayjs} from '@mui/x-date-pickers/AdapterDayjs';
import React from 'react';
import {Localization} from 'types/localization';
import {useTranslation} from 'react-i18next';
import {dateToISOString} from 'util/util';
Expand All @@ -17,7 +16,7 @@ interface DatePickerProps {
startDay: string | null;

/** Function used to set the new start date */
setStartDay: Dispatch<SetStateAction<string | null>>;
setStartDay: Dispatch<string | null>;

/** Minimum date pickable for which some data are provided */
minDate: string | null;
Expand All @@ -37,7 +36,11 @@ export default function ReferenceDatePicker({
setStartDay,
minDate,
maxDate,
localization = {formatNumber: (value: number) => value.toString(), customLang: 'global', overrides: {}},
localization = {
formatNumber: (value: number) => value.toString(),
customLang: 'global',
overrides: {},
},
}: DatePickerProps) {
// Function used to update the starting date
const {t: defaultT} = useTranslation();
Expand Down
11 changes: 6 additions & 5 deletions frontend/src/components/ScenarioComponents/ScenarioContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,14 @@

import Box from '@mui/material/Box';
import {darken, useTheme} from '@mui/material/';
import React, {useContext, useEffect, useMemo, useState} from 'react';
import React, {useContext, useEffect, useMemo} from 'react';
import {NumberFormatter} from 'util/hooks';
import {useTranslation} from 'react-i18next';
import {
selectCompartment,
selectScenario,
setGroupFilters,
setStartDate,
toggleCompartmentExpansion,
updateScenario,
} from 'store/DataSelectionSlice';
Expand All @@ -25,6 +26,7 @@ import GeneralButton from './ExpandedButtonComponents/ExpandedButton';
import ReferenceDatePicker from './ReferenceDatePickerComponents.tsx/ReferenceDatePicker';
import {useAppDispatch, useAppSelector} from 'store/hooks';
import ScenarioLibrary from './ScenarioLibrary';
import {dateToISOString} from '../../util/util';

interface ScenarioContainerProps {
/** The minimum number of compartment rows.*/
Expand Down Expand Up @@ -59,9 +61,8 @@ export default function ScenarioContainer({minCompartmentsRows = 4, maxCompartme
const selectedCompartment = useAppSelector((state) => state.dataSelection.compartment);
const scenariosState = useAppSelector((state) => state.dataSelection.scenarios);
const selectedScenario = useAppSelector((state) => state.dataSelection.scenario);
const storeStartDay = useAppSelector((state) => state.dataSelection.simulationStart);
const referenceDay = useAppSelector((state) => state.dataSelection.simulationStart);

const [startDay, setStartDay] = useState<string | null>(storeStartDay ?? '2024-07-08');
const [resizeRef, resizeBoundingRect] = useBoundingclientrectRef();

const scenarios = useMemo(() => {
Expand Down Expand Up @@ -202,8 +203,8 @@ export default function ScenarioContainer({minCompartmentsRows = 4, maxCompartme
}}
>
<ReferenceDatePicker
startDay={startDay}
setStartDay={setStartDay}
startDay={referenceDay}
setStartDay={(day) => dispatch(setStartDate(day ?? dateToISOString(new Date())))}
minDate={useAppSelector((state) => state.dataSelection.minDate)}
maxDate={useAppSelector((state) => state.dataSelection.maxDate)}
localization={localization}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/store/UserPreferenceSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface UserPreference {
const initialState: UserPreference = {
// Heatmaps are initialized in the HeatLegendEdit Component
selectedHeatmap: {
name: 'uninitialized',
name: 'Default',
isNormalized: true,
steps: [
{color: 'rgb(255,255,255)', value: 0},
Expand Down

0 comments on commit 682d706

Please sign in to comment.