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

feature/COR-1901-rwzi-municipal-pages #4977

Merged
merged 4 commits into from
Feb 7, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
feat(COR-1901): Change RWZI line visually
ben-van-eekelen committed Feb 5, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 9c42467e4169817df218066d2b1dfbb099f99787
41 changes: 21 additions & 20 deletions packages/app/src/domain/sewer/sewer-chart/sewer-chart.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import { colors, NlSewer, SewerPerInstallationData, TimeframeOption, TimeframeOptionsList } from '@corona-dashboard/common';
import { useRouter } from 'next/router';
import { useEffect, useMemo, useState } from 'react';
import { isPresent } from 'ts-is-present';
import { Warning } from '@corona-dashboard/icons';
import { AccessibilityDefinition } from '~/utils/use-accessibility-annotations';
import { Box } from '~/components/base';
import { Text } from '~/components/typography';
import { ChartTile } from '~/components/chart-tile';
import { ChartTimeControls } from '~/components/chart-time-controls';
import { colors, NlSewer, SewerPerInstallationData, TimeframeOption, TimeframeOptionsList } from '@corona-dashboard/common';
import { isPresent } from 'ts-is-present';
import { mediaQueries, space } from '~/style/theme';
import { mergeData, useSewerStationSelectPropsSimplified } from './logic';
import { RichContentSelect } from '~/components/rich-content-select';
import styled from 'styled-components';
import { Text } from '~/components/typography';
import { TimelineEventConfig } from '~/components/time-series-chart/components/timeline';
import { TimeSeriesChart } from '~/components/time-series-chart';
import { AccessibilityDefinition } from '~/utils/use-accessibility-annotations';
import { WarningTile } from '~/components/warning-tile';
import { mergeData, useSewerStationSelectPropsSimplified } from './logic';
import { useIntl } from '~/intl';
import { mediaQueries, space } from '~/style/theme';
import { useRouter } from 'next/router';
import { useEffect, useMemo, useState } from 'react';
import { useScopedWarning } from '~/utils/use-scoped-warning';
import { TimelineEventConfig } from '~/components/time-series-chart/components/timeline';
import { ChartTimeControls } from '~/components/chart-time-controls';
import styled from 'styled-components';
import { useIntl } from '~/intl';
import { Warning } from '@corona-dashboard/icons';
import { WarningTile } from '~/components/warning-tile';

interface SewerChartProps {
/**
@@ -181,19 +181,20 @@ export const SewerChart = ({ accessibility, dataAverages, dataPerInstallation, t
values={mergeData(dataAverages, dataPerInstallation, selectedInstallation)}
timeframe={sewerTimeframe}
seriesConfig={[
{
type: 'line',
metricProperty: 'selected_installation_rna_normalized',
label: text.rwziLabel ? `${text.rwziLabel} ${selectedInstallation}` : selectedInstallation,
color: colors.orange1,
},
{
type: 'line',
metricProperty: 'average',
label: text.averagesLegendLabel,
shortLabel: text.averagesTooltipLabel,
color: colors.scale.blue[3],
},
{
type: 'line',
metricProperty: 'selected_installation_rna_normalized',
label: text.rwziLabel ? `${text.rwziLabel} ${selectedInstallation}` : selectedInstallation,
color: colors.orange4,
strokeWidth: 1,
},
]}
dataOptions={dataOptions}
forceLegend
1 change: 1 addition & 0 deletions packages/common/src/theme/colors.ts
Original file line number Diff line number Diff line change
@@ -52,6 +52,7 @@ const colorDefinitions = {
orange1: '#E37321',
orange2: '#A14E00',
orange3: '#F65234',
orange4: 'rgba(227,115,33,0.7)',
//Yellow scales
yellow1: '#FFF4C1',
yellow2: '#fee670',