From 929a71c80ffb0a75be16188e53d43362e630caf4 Mon Sep 17 00:00:00 2001 From: Saranya Date: Thu, 9 Jan 2025 13:09:37 +0000 Subject: [PATCH] adding code change for ACQ-48 and updating jest config to check the code coverage --- jest.config.js | 16 +++++++++++++--- src/server/data/en/monitoring-sites.js | 16 ++++++++-------- src/server/locations/location.njk | 19 ++++++++++--------- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/jest.config.js b/jest.config.js index 16090544..846d422a 100644 --- a/jest.config.js +++ b/jest.config.js @@ -16,11 +16,21 @@ module.exports = { '/src/__fixtures__', '/test-helpers', '/mock-api', - '/src/server/common/components' + '/src/server/common/components', + '/src/server/common/helpers', + '/src/client/assets/javascripts', + '/src/common/helpers/redis-client.js', + '/src/config', + '/src/helpers', + '/src/server/router.js', + '/src/server/index.js', + '/test-helpers/component-helpers.js', + '/src/index.js', + '/src/indextest.js' ], coverageDirectory: '/coverage', - collectCoverage: false - // coverageReporters: ['text', 'lcov', 'text-summary'], + collectCoverage: false, + coverageReporters: ['clover', 'json', 'text', 'lcov', 'text-summary'] // coverageThreshold: { // global: { // branches: 90, diff --git a/src/server/data/en/monitoring-sites.js b/src/server/data/en/monitoring-sites.js index 4e929589..1ddc9976 100644 --- a/src/server/data/en/monitoring-sites.js +++ b/src/server/data/en/monitoring-sites.js @@ -2,10 +2,10 @@ // Pollutant reference data export const pollutantTypes = { - NO2: { - title: 'Nitrogen dioxide', - href: '/pollutants/nitrogen-dioxide', - low_range: '0 to 200' + PM25: { + title: 'PM2.5', + href: '/pollutants/particulate-matter-25', + low_range: '0 to 35' }, MP10: { title: 'PM10', @@ -17,10 +17,10 @@ export const pollutantTypes = { href: '/pollutants/particulate-matter-10', low_range: '0 to 50' }, - PM25: { - title: 'PM2.5', - href: '/pollutants/particulate-matter-25', - low_range: '0 to 35' + NO2: { + title: 'Nitrogen dioxide', + href: '/pollutants/nitrogen-dioxide', + low_range: '0 to 200' }, O3: { title: 'Ozone', diff --git a/src/server/locations/location.njk b/src/server/locations/location.njk index 87d3f526..780794c6 100644 --- a/src/server/locations/location.njk +++ b/src/server/locations/location.njk @@ -110,14 +110,14 @@

{{siteTypeDescriptions[site.areaType]}}

{% set rows = [] %} - {% for key, pollutant in site.pollutants %} - - {% set pollutantTime = pollutant.time.hour %} - {% set pollutantDay = pollutant.time.day %} - {% set pollutantMonth = pollutant.time.month %} - {% set pollutantYear = pollutant.time.year %} - {% set pollutantDetail = pollutantTypes[key] %} - {% set row = [ + {% for key, pollutantDetail in pollutantTypes %} + {% set pollutant = site.pollutants[key] %} + {% if pollutant %} + {% set pollutantTime = pollutant.time.hour %} + {% set pollutantDay = pollutant.time.day %} + {% set pollutantMonth = pollutant.time.month %} + {% set pollutantYear = pollutant.time.year %} + {% set row = [ { html: "" + pollutantDetail.title + "" + daqi.pollutantTable.e + ' ' + pollutantDetail.low_range + "", classes: "defra-aq-levels-table__cell--pollutant" @@ -130,8 +130,9 @@ html: "" + pollutant.band + "", classes: "defra-aq-levels-table__cell--level" } - ] %} + ] %} {% set _ = rows.push(row) %} + {% endif %} {% endfor %} {{ aqLevelsTable({ id:loop.index,