Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

feature/COR-1837-update-archived-timeframes #4954

Merged
merged 2 commits into from
Dec 18, 2023
Merged

feature/COR-1837-update-archived-timeframes #4954

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
2343243
refactor(COR-1837): Refactor variables
ben-van-eekelen Dec 18, 2023
89792e1
feat(COR-1837): Set timeframe of archived graphs to max
ben-van-eekelen Dec 18, 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
8 changes: 4 additions & 4 deletions packages/app/src/domain/variants/variants-stacked-area-tile.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ interface VariantsStackedAreaTileProps {
}

export const VariantsStackedAreaTile = ({ text, values, variantColors, metadata }: VariantsStackedAreaTileProps) => {
const [variantTimeframe, setVariantTimeframe] = useState<TimeframeOption>(TimeframeOption.THREE_MONTHS);
const [variantStackedAreaTimeframe, setVariantStackedAreaTimeframe] = useState<TimeframeOption>(TimeframeOption.ALL);

const { list, toggle, clear } = useList<keyof VariantChartValue>(alwaysEnabled);

Expand Down Expand Up @@ -54,8 +54,8 @@ export const VariantsStackedAreaTile = ({ text, values, variantColors, metadata
description={text.toelichting}
metadata={metadata}
timeframeOptions={TimeframeOptionsList}
timeframeInitialValue={TimeframeOption.THREE_MONTHS}
onSelectTimeframe={setVariantTimeframe}
timeframeInitialValue={variantStackedAreaTimeframe}
onSelectTimeframe={setVariantStackedAreaTimeframe}
>
<InteractiveLegend helpText={text.legend_help_tekst} selectOptions={selectOptions} selection={list} onToggleItem={toggle} onReset={clear} />
<Spacer marginBottom={space[2]} />
Expand All @@ -64,7 +64,7 @@ export const VariantsStackedAreaTile = ({ text, values, variantColors, metadata
key: 'variants_stacked_area_over_time_chart',
}}
values={values}
timeframe={variantTimeframe}
timeframe={variantStackedAreaTimeframe}
seriesConfig={filteredConfig}
disableLegend
dataOptions={{
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/pages/gemeente/[code]/positieve-testen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const getStaticProps = createGetStaticProps(

function PositivelyTestedPeople(props: StaticProps<typeof getStaticProps>) {
const { pageText, selectedGmData: data, selectedArchivedGmData: archivedData, archivedChoropleth, municipalityName, content, lastGenerated } = props;
const [positivelyTestedPeopleTimeframe, setpositivelyTestedPeopleTimeframe] = useState<TimeframeOption>(TimeframeOption.SIX_MONTHS);
const [positivelyTestedPeopleTimeframe, setpositivelyTestedPeopleTimeframe] = useState<TimeframeOption>(TimeframeOption.ALL);
const { commonTexts, formatNumber, formatDateFromSeconds } = useIntl();
const reverseRouter = useReverseRouter();
const { textGm, textShared } = useDynamicLokalizeTexts<LokalizeTexts>(pageText, selectLokalizeTexts);
Expand Down
2 changes: 1 addition & 1 deletion packages/app/src/pages/landelijk/positieve-testen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export const getStaticProps = createGetStaticProps(
function PositivelyTestedPeople(props: StaticProps<typeof getStaticProps>) {
const { pageText, selectedArchivedNlData: data, archivedChoropleth, content, lastGenerated } = props;

const [confirmedCasesInfectedTimeframe, setConfirmedCasesInfectedTimeframe] = useState<TimeframeOption>(TimeframeOption.SIX_MONTHS);
const [confirmedCasesInfectedTimeframe, setConfirmedCasesInfectedTimeframe] = useState<TimeframeOption>(TimeframeOption.ALL);

const [confirmedCasesInfectedPercentageTimeframe, setConfirmedCasesInfectedPercentageTimeframe] = useState<TimeframeOption>(TimeframeOption.ALL);

Expand Down
Loading