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

feature/COR-1953_non-archived-graphs-adjustments #5005

Merged
merged 1 commit into from
Mar 13, 2024
Merged

feature/COR-1953_non-archived-graphs-adjustments #5005

merged 1 commit into from
Mar 13, 2024

Conversation

VWSCoronaDashboard30
Copy link
Contributor

Summary

  • Added the metadata corrections for Rioolwater NL and Infectieradar pages

VWSCoronaDashboard30
VWSCoronaDashboard30 commented Mar 12, 2024
View reviewed changes
packages/app/src/components/time-series-chart/time-series-chart.tsx
onHandleTimeIntervalChange({ start: values[0] ? values[0].date_unix : 0, end: values[values.length - 1] ? values[values.length - 1].date_unix : 0 });
}
}
}, [values, timeframe, onHandleTimeIntervalChange]);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

onHandleTimeIntervalChange was added right before the PR. If something is not working correctly, try removing this from dependencies

ben-van-eekelen
ben-van-eekelen suggested changes Mar 12, 2024
View reviewed changes
packages/app/src/components/metadata.tsx Outdated
@@ -29,15 +32,33 @@ export interface MetadataProps extends MarginBottomProps {
datumsText?: string;
intervalCount?: string;
disclaimer?: string;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove rendundant comment

packages/app/src/components/metadata.tsx Outdated
})}`}
{intervalString && `. ${intervalString}`}
{dateString && source ? ' · ' : null}

{/* This can go */}
Copy link
Contributor

@ben-van-eekelen ben-van-eekelen Mar 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason it has not been removed yet? Now it causes the source label to be displayed doubly:
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's there since it should go as part of the merge of those two metadata components we currently have.

ben-van-eekelen
ben-van-eekelen approved these changes Mar 13, 2024
View reviewed changes
packages/app/src/components/time-series-chart/time-series-chart.tsx
* @param value: DateRange | number
* @returns
*/
onHandleTimeIntervalChange?: (value: DateRange) => void;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Very solid work on figuring this out!

@ben-van-eekelen ben-van-eekelen changed the base branch from develop to feature/COR-1952_COR-1953_graph-adjustments March 13, 2024 09:57
@ben-van-eekelen ben-van-eekelen changed the base branch from feature/COR-1952_COR-1953_graph-adjustments to topic/COR-1952_COR-1953_graph-adjustments March 13, 2024 10:00
@ben-van-eekelen ben-van-eekelen merged commit 2de4457 into topic/COR-1952_COR-1953_graph-adjustments Mar 13, 2024
8 checks passed
@ben-van-eekelen ben-van-eekelen deleted the feature/COR-1953_non-archived-graphs-adjustments branch March 13, 2024 10:00
@VWSCoronaDashboard30 VWSCoronaDashboard30 restored the feature/COR-1953_non-archived-graphs-adjustments branch March 19, 2024 08:28
VWSCoronaDashboard30 added a commit that referenced this pull request Mar 20, 2024
@VWSCoronaDashboard30
feat(COR-1953): Added corrections for rioolwater NL and infectieradar…
22170d0 
… pages (#5005)

Signed-off-by: M <[email protected]>
VWSCoronaDashboard30 added a commit that referenced this pull request Mar 22, 2024
@VWSCoronaDashboard30 @ben-van-eekelen
topic/COR-1952_COR-1953_graph-adjustments (#5013)
00c7dd7 
* feat(COR-1953/COR-1952): Added new metadata fields

* feat(COR-1952/COR-1953): Added lokalize keys

* feat(COR-1953): Added corrections for rioolwater NL and infectieradar pages (#5005)

* feature/COR-1954-consolidate-metadata (#5007)

* feat(COR-1954): Initial copy-paste merging

* feat(COR-1954): Add JSDoc comments

* feat(COR-1954): Fix empty source showing up

* feat(COR-1954): Replace source with metadataItem

* feat(COR-1954): Turn datelastinserted date into MetadataItem

* feat(COR-1954): Consolidated metadataprops type into seperate type file

* feat(COR-1954) Split up and combine into module

* feat(COR-1954): Substitute clock on pageinfoblock with metadataitem

* feature/COR-1953_non-archived-graphs-adjustments (#5008)

* feat(COR-1953): Added corrections for rioolwater NL and infectieradar pages

* feature(COR-1953): Adjustments for metadata and time-series-chart components

* feature(COR-1953): Adjustments for rioolwater page

* feature(COR-1953): Adjustments for NL variants page

* feature(COR-1953): Adjustments for NL infectieradar page

* feature(COR-1953): Adjustments for GM stertfe page

* feature(COR-1953): Adjustments for GM positive tests page

* feature(COR-1953): Adjustments for GM patienten-in-beeld page

* feature(COR-1953): Adjustments for NL de-coronaprik page

* feature(COR-1953): Adjustments for NL de-coronaprik component indentation

* feature(COR-1953): Adjustments for NL infectieradar page components

* feature(COR-1953): Adjustments for NL positive tests page

* feature(COR-1953): Adjustments for NL besmettelijke-mensen page

* feature(COR-1953): Adjustments for NL coronamelder page

* feature(COR-1953): Adjustments for NL gedrag page

* feature(COR-1953): Adjustments for NL gehandicaptenzorg page

* feature(COR-1953): Adjustments for NL klachten-bij-huisartsen page

* feature(COR-1953): Adjustments for NL kwetsbare-groepen-70-plussers page

* feature(COR-1953): Adjustments for NL patienten-in-beeld page

* feature(COR-1953): Adjustments for NL sterfte page

* feature(COR-1953): Adjustments for NL thuiswonende-70-plussers page

* feature(COR-1953): Adjustments for NL ziekenhuizen-in-beeld page

* feature(COR-1953): Adjustments for NL ziekenhuizen-in-beeld page import order

* feature(COR-1953): Fixed sewer branch last insertion date not displaying

* feature(COR-1953): Attempt to sign commit

* feature(COR-1953): Reverting change for commit signing test

* feature(COR-1953): Fixed rioolwater pageinformationblock not displaying last update

* feat(COR-1953): Rename timeInterval to timeframePeriod

* Revert "feat(COR-1953): Rename timeInterval to timeframePeriod"

This reverts commit 4c3b077.

* feature(COR-1953): Renamed timeInterval/TimeInterval to timeframePeriod/TimeframePeriod

---------

Co-authored-by: VWSCoronaDashboard29 <[email protected]>

* feature/COR-1951_dropdown-options-selection-changes (#5010)

* feature/COR-1938-update-format-intial-tick-date (#5003)

* refactor(COR-1938): Make comments JSDoc compliant

* refactor: reorder

* refactor: reorder

* feat(COR-1938): Set dateformat of first tick to include date

* feature(COR-1951): Corrected time frame option values

---------

Co-authored-by: Ben van Eekelen (work) <[email protected]>

* feature/COR-1956_make-metadata-consistent (#5011)

* feat(COR-1953): Added corrections for rioolwater NL and infectieradar pages

* feature(COR-1953): Adjustments for metadata and time-series-chart components

* feature(COR-1953): Adjustments for rioolwater page

* feature(COR-1953): Adjustments for NL variants page

* feature(COR-1953): Adjustments for NL infectieradar page

* feature(COR-1953): Adjustments for GM stertfe page

* feature(COR-1953): Adjustments for GM positive tests page

* feature(COR-1953): Adjustments for GM patienten-in-beeld page

* feature(COR-1953): Adjustments for NL de-coronaprik page

* feature(COR-1953): Adjustments for NL de-coronaprik component indentation

* feature(COR-1953): Adjustments for NL infectieradar page components

* feature(COR-1953): Adjustments for NL positive tests page

* feature(COR-1953): Adjustments for NL besmettelijke-mensen page

* feature(COR-1953): Adjustments for NL coronamelder page

* feature(COR-1953): Adjustments for NL gedrag page

* feature(COR-1953): Adjustments for NL gehandicaptenzorg page

* feature(COR-1953): Adjustments for NL klachten-bij-huisartsen page

* feature(COR-1953): Adjustments for NL kwetsbare-groepen-70-plussers page

* feature(COR-1953): Adjustments for NL patienten-in-beeld page

* feature(COR-1953): Adjustments for NL sterfte page

* feature(COR-1953): Adjustments for NL thuiswonende-70-plussers page

* feature(COR-1953): Adjustments for NL ziekenhuizen-in-beeld page

* feature(COR-1953): Adjustments for NL ziekenhuizen-in-beeld page import order

* feature(COR-1953): Fixed sewer branch last insertion date not displaying

* feature(COR-1953): Attempt to sign commit

* feature(COR-1953): Reverting change for commit signing test

* feature(COR-1953): Fixed rioolwater pageinformationblock not displaying last update

* feat(COR-1953): Rename timeInterval to timeframePeriod

* Revert "feat(COR-1953): Rename timeInterval to timeframePeriod"

This reverts commit 4c3b077.

* feature(COR-1953): Renamed timeInterval/TimeInterval to timeframePeriod/TimeframePeriod

* feature(COR-1956): Adjusted KPI's and Choropleths to new metadata

---------

Co-authored-by: VWSCoronaDashboard29 <[email protected]>

* feature/COR-1952_archived-graphs-adjustments (#5009)

* feature(COR-1952): Corrected archived graphs for NL variants page

* feature(COR-1952): Corrected archived graphs for NL sterfte page

* feature(COR-1952): Corrected archived graphs for NL kwetsbare-groepen-70-plussers page

* feature(COR-1952): Corrected archived graphs for NL reproductiegetal page

* feature(COR-1952): Corrected archived graphs for NL positieve-testen page

* feature(COR-1952): Corrected archived graphs for NL gehandicaptenzorg page

* feature(COR-1952): Corrected archived graphs for NL thuiswonende-70-plussers page

* feature(COR-1952): Corrected archived graphs for NL coronamelder page

* feature(COR-1952): Corrected archived graphs for GM positieve-testen page

* feature(COR-1952): Corrected archived graphs for GM sterfte page

* feature(COR-1952): Corrected archived graphs for GM patienten-in-beeld page

* feature(COR-1952): Added missing metadata for patienten-in-beeld

---------

Co-authored-by: Ben van Eekelen (work) <[email protected]>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@ben-van-eekelen ben-van-eekelen ben-van-eekelen approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@VWSCoronaDashboard30 @ben-van-eekelen