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

Commit

Permalink
Merge branch 'develop' into release/2.80.1
Browse files Browse the repository at this point in the history
  • Loading branch information
VWSCoronaDashboard30 committed Sep 12, 2023
2 parents d0fec7f + 0739602 commit 5231e48
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 250 deletions.
2 changes: 1 addition & 1 deletion docs/release-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ By making a commit to develop first, you prevent getting merge conflicts in
later releases and the flow of the commit history is one-directional and
easy to follow.

1. Create a topic branch based on `develop`.
1. Create a hotfix branch based on `develop`.
2. Commit changes and create a PR on `develop` just like a normal feature
branch.
3. Merged the branch to `develop` using **squash and merge**.
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src/pages/landelijk/ziekenhuizen-in-beeld.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ const HospitalsAndCarePage = (props: StaticProps<typeof getStaticProps>) => {
const hospitalLastValue = getLastFilledValue(data.hospital_lcps);
const icuLastValue = getLastFilledValue(data.intensive_care_lcps);

const valuesWithoutDateRange = data.hospital_lcps.values.map((value) => ({ ...value, date_end_unix: undefined, date_start_unix: undefined }));

const lastInsertionDateOfPage = getLastInsertionDateOfPage(data, pageMetrics);

return (
Expand Down Expand Up @@ -171,7 +173,7 @@ const HospitalsAndCarePage = (props: StaticProps<typeof getStaticProps>) => {
accessibility={{
key: 'hospital_beds_occupied_over_time_chart',
}}
values={data.hospital_lcps.values}
values={valuesWithoutDateRange}
timeframe={hospitalBedsOccupiedOverTimeTimeframe}
forceLegend
seriesConfig={[
Expand Down Expand Up @@ -294,7 +296,7 @@ const HospitalsAndCarePage = (props: StaticProps<typeof getStaticProps>) => {
accessibility={{
key: 'hospital_patient_influx_over_time_chart',
}}
values={trimLeadingNullValues(data.hospital_lcps.values, 'influx_covid_patients')}
values={trimLeadingNullValues(valuesWithoutDateRange, 'influx_covid_patients')}
timeframe={hospitalPatientInfluxOverTimeTimeframe}
seriesConfig={[
{
Expand Down
Loading

0 comments on commit 5231e48

Please sign in to comment.