-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #491 from DEFRA/feature/FSR-886
FSR-886 - HCM updates
- Loading branch information
Showing
21 changed files
with
3,974 additions
and
274 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
server/src/js/components/bar-chart/pagination-controls.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
|
|
||
| export function createPaginationControls () { | ||
| const pagination = document.createElement('div') | ||
| pagination.classList.add('defra-chart-controls__group', 'defra-chart-controls__group--pagination') | ||
| pagination.style.display = 'none' | ||
|
|
||
| const pageBack = document.createElement('button') | ||
| pageBack.className = 'defra-chart-controls__button' | ||
| pageBack.setAttribute('data-direction', 'back') | ||
| pageBack.setAttribute('aria-controls', 'bar-chart') | ||
| pageBack.setAttribute('aria-describedby', 'page-back-description') | ||
|
|
||
| const pageBackText = document.createElement('span') | ||
| pageBackText.className = 'defra-chart-controls__button-text' | ||
|
|
||
| const pageBackDescription = document.createElement('span') | ||
| pageBackDescription.id = 'page-back-description' | ||
| pageBackDescription.className = 'govuk-visually-hidden' | ||
| pageBackDescription.setAttribute('aria-live', 'polite') | ||
|
|
||
| pageBack.appendChild(pageBackText) | ||
| pageBack.appendChild(pageBackDescription) | ||
|
|
||
| const pageForward = document.createElement('button') | ||
| pageForward.className = 'defra-chart-controls__button' | ||
| pageForward.setAttribute('data-direction', 'forward') | ||
| pageForward.setAttribute('aria-controls', 'bar-chart') | ||
| pageForward.setAttribute('aria-describedby', 'page-forward-description') | ||
|
|
||
| const pageForwardText = document.createElement('span') | ||
| pageForwardText.className = 'defra-chart-controls__text' | ||
|
|
||
| const pageForwardDescription = document.createElement('span') | ||
| pageForwardDescription.id = 'page-forward-description' | ||
| pageForwardDescription.className = 'govuk-visually-hidden' | ||
| pageForwardDescription.setAttribute('aria-live', 'polite') | ||
|
|
||
| pageForward.appendChild(pageForwardText) | ||
| pageForward.appendChild(pageForwardDescription) | ||
|
|
||
| pagination.appendChild(pageBack) | ||
| pagination.appendChild(pageForward) | ||
|
|
||
| return { | ||
| pagination, | ||
| pageForward, | ||
| pageForwardText, | ||
| pageForwardDescription, | ||
| pageBack, | ||
| pageBackText, | ||
| pageBackDescription | ||
| } | ||
| } | ||
| export function updatePagination ({ | ||
| start, end, duration, dataStart, paginationControlGroup, | ||
| pageForward, pageForwardText, pageForwardDescription, | ||
| pageBack, pageBackText, pageBackDescription | ||
| }) { | ||
| // Set paging values and ensure they are within data range | ||
| const now = new Date() | ||
| let nextStart = new Date(start.getTime() + duration) | ||
| let nextEnd = new Date(end.getTime() + duration) | ||
| let previousStart = new Date(start.getTime() - duration) | ||
| let previousEnd = new Date(end.getTime() - duration) | ||
| nextEnd = nextEnd.getTime() <= now.getTime() ? nextEnd.toISOString().replace(/.\d+Z$/g, 'Z') : null | ||
| nextStart = nextEnd ? nextStart.toISOString().replace(/.\d+Z$/g, 'Z') : null | ||
| previousStart = previousStart.getTime() >= dataStart.getTime() ? previousStart.toISOString().replace(/.\d+Z$/g, 'Z') : null | ||
| previousEnd = previousStart ? previousEnd.toISOString().replace(/.\d+Z$/g, 'Z') : null | ||
| // Set properties | ||
| paginationControlGroup.style.display = (nextStart || previousEnd) ? 'inline-block' : 'none' | ||
| pageForward.setAttribute('data-start', nextStart) | ||
| pageForward.setAttribute('data-end', nextEnd) | ||
| pageBack.setAttribute('data-start', previousStart) | ||
| pageBack.setAttribute('data-end', previousEnd) | ||
| pageForward.setAttribute('aria-disabled', !(nextStart && nextEnd)) | ||
| pageBack.setAttribute('data-journey-click', 'Rainfall:Chart Interaction:Rainfall - Previous 24hrs') | ||
| pageForward.setAttribute('data-journey-click', 'Rainfall:Chart Interaction:Rainfall - Next 24hrs') | ||
| pageBack.setAttribute('aria-disabled', !(previousStart && previousEnd)) | ||
| pageForwardText.innerText = 'Forward' | ||
| pageBackText.innerText = 'Back' | ||
| pageForwardDescription.innerText = '' | ||
| pageBackDescription.innerText = '' | ||
| } |
48 changes: 48 additions & 0 deletions
48
server/src/js/components/bar-chart/resolution-controls.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
|
|
||
| const { forEach } = window.flood.utils | ||
|
|
||
| export function createResolutionControls ({ bands }) { | ||
| const resolutionControlGroup = document.createElement('div') | ||
| resolutionControlGroup.classList.add('defra-chart-controls__group', 'defra-chart-controls__group--resolution') | ||
| for (let i = bands.length - 1; i >= 0; i--) { | ||
| const band = bands[i] | ||
| const control = document.createElement('button') | ||
|
|
||
| const start = new Date() | ||
| const end = new Date() | ||
| start.setHours(start.getHours() - (bands.find(({ period }) => period === band.period).days * 24)) | ||
|
|
||
| control.className = 'defra-chart-controls__button' | ||
| control.style.display = 'none' | ||
| control.setAttribute('data-period', band.period) | ||
| control.setAttribute('data-start', start.toISOString().replace(/.\d+Z$/g, 'Z')) | ||
| control.setAttribute('data-end', end.toISOString().replace(/.\d+Z$/g, 'Z')) | ||
| control.setAttribute('aria-controls', 'bar-chart') | ||
|
|
||
| const text = document.createElement('span') | ||
| text.className = 'defra-chart-controls__text' | ||
| text.innerText = band.label | ||
|
|
||
| control.appendChild(text) | ||
| resolutionControlGroup.appendChild(control) | ||
| } | ||
| return resolutionControlGroup | ||
| } | ||
|
|
||
| export function updateResolutionControls ({ bands, dataCache, dataStart, period, resolutionControlGroup }) { | ||
| const now = new Date() | ||
| const dataDurationDays = (new Date(now.getTime() - dataStart.getTime())) / (1000 * 60 * 60 * 24) | ||
| // Check there are at least 2 telemetry arrays | ||
| let numBands = 0 | ||
| for (let i = 0; i < bands.length; i++) { | ||
| numBands += Object.getOwnPropertyDescriptor(dataCache, bands[i].period) ? 1 : 0 | ||
| } | ||
| // Determine which controls to display | ||
| forEach(resolutionControlGroup.querySelectorAll('.defra-chart-controls__button'), button => { | ||
| const isBand = period === button.getAttribute('data-period') | ||
| const band = bands.find(x => x.period === button.getAttribute('data-period')) | ||
| button.checked = isBand | ||
| button.style.display = (band.days <= dataDurationDays) && numBands > 1 ? 'inline-block' : 'none' | ||
| button.classList.toggle('defra-chart-controls__button--selected', isBand) | ||
| }) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.