From e4cbb7b8d428f4ad7e40d9ad2fed088d631ab2b7 Mon Sep 17 00:00:00 2001 From: Johnnadel Salita Uy Date: Tue, 30 Jul 2024 08:59:46 +0200 Subject: [PATCH] [MIM-1932] Mim 1932 sr arrow keyfigure (#2838) * Add screen reader change screen reader only text for keyFigures MIM-1932 * Minor code refactoring; types and duplicate imports --- src/main/resources/lib/ssb/parts/keyFigure.ts | 15 +++++++++++++-- .../resources/lib/types/partTypes/keyFigure.ts | 1 + src/main/resources/site/i18n/phrases.properties | 2 ++ .../resources/site/i18n/phrases_en.properties | 2 ++ .../resources/site/i18n/phrases_nn.properties | 2 ++ src/main/resources/site/pages/default/default.ts | 1 - 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/resources/lib/ssb/parts/keyFigure.ts b/src/main/resources/lib/ssb/parts/keyFigure.ts index 5544d75de..c7f7646da 100644 --- a/src/main/resources/lib/ssb/parts/keyFigure.ts +++ b/src/main/resources/lib/ssb/parts/keyFigure.ts @@ -165,12 +165,22 @@ function getDataTbProcessor( changeText += ` ${denomination}` } } + const changePeriod = row2.th.toString() // set arrow direction based on change let changeDirection: KeyFigureChanges['changeDirection'] = 'same' + let srChangeText if (+change > 0) { changeDirection = 'up' + const changeDirectionText = localize({ + key: 'keyFigure.increase', + }) + srChangeText = `${changeDirectionText} ${changeText} ${changePeriod}` } else if (+change < 0) { changeDirection = 'down' + const changeDirectionText = localize({ + key: 'keyFigure.decrease', + }) + srChangeText = `${changeDirectionText} ${changeText} ${changePeriod}` } else { changeText = localize({ key: 'keyFigure.noChange', @@ -180,7 +190,8 @@ function getDataTbProcessor( keyFigureViewData.changes = { changeDirection, changeText, - changePeriod: row2.th.toString(), + changePeriod, + srChangeText, } } @@ -221,7 +232,7 @@ function getDataWithFilterStatbankApi( if (municipalData && municipalData.value !== null) { // add data to key figure view keyFigureViewData.number = parseValueZeroSafe(municipalData.value) - keyFigureViewData.time = localizeTimePeriod(municipalData.label) + keyFigureViewData.time = localizeTimePeriod(municipalData.label as string) } } } diff --git a/src/main/resources/lib/types/partTypes/keyFigure.ts b/src/main/resources/lib/types/partTypes/keyFigure.ts index 63d9b039f..4c6ce5003 100644 --- a/src/main/resources/lib/types/partTypes/keyFigure.ts +++ b/src/main/resources/lib/types/partTypes/keyFigure.ts @@ -56,4 +56,5 @@ export interface KeyFigureChanges { changeDirection: 'up' | 'down' | 'same' changeText?: string changePeriod: string + srChangeText?: string } diff --git a/src/main/resources/site/i18n/phrases.properties b/src/main/resources/site/i18n/phrases.properties index afd488b4d..76a53c948 100644 --- a/src/main/resources/site/i18n/phrases.properties +++ b/src/main/resources/site/i18n/phrases.properties @@ -94,6 +94,8 @@ period.week = Tall for uke {0} {1} value.notFound = Tall ikke tilgjengelig keyFigure.noChange = Ingen endring +keyFigure.increase = Oppgang +keyFigure.decrease = Nedgang factsAbout = Fakta om source = Kilde diff --git a/src/main/resources/site/i18n/phrases_en.properties b/src/main/resources/site/i18n/phrases_en.properties index 6f24b4d24..f70bd5f01 100644 --- a/src/main/resources/site/i18n/phrases_en.properties +++ b/src/main/resources/site/i18n/phrases_en.properties @@ -94,6 +94,8 @@ period.week = Figures for week {0} {1} value.notFound = Numbers not available keyFigure.noChange = No change +keyFigure.increase = Increase +keyFigure.decrease = Decrease factsAbout = Facts about source = Source diff --git a/src/main/resources/site/i18n/phrases_nn.properties b/src/main/resources/site/i18n/phrases_nn.properties index 94dc9e22e..fc2b1c29e 100644 --- a/src/main/resources/site/i18n/phrases_nn.properties +++ b/src/main/resources/site/i18n/phrases_nn.properties @@ -88,6 +88,8 @@ interval.U = Veke value.notFound = Tal ikkje tilgjengelege keyFigure.noChange = Inga endring +keyFigure.increase = Oppgang +keyFigure.decrease = Nedgang factsAbout = Fakta om source = Kjelde diff --git a/src/main/resources/site/pages/default/default.ts b/src/main/resources/site/pages/default/default.ts index a44e0166b..3c23a7529 100644 --- a/src/main/resources/site/pages/default/default.ts +++ b/src/main/resources/site/pages/default/default.ts @@ -37,7 +37,6 @@ import { isEnabled } from '/lib/featureToggle' import { ensureArray } from '/lib/ssb/utils/arrayUtils' import { type SubjectItem } from '/lib/types/subject' import { type MunicipalityWithCounty, type RequestWithCode } from '/lib/types/municipalities' -import { isEnabled } from '/lib/featureToggle' import { type Default as DefaultPageConfig } from '/site/pages/default' import { type Page, type Statistics } from '/site/content-types'