From 952326bbf14c7ec483dbe9e45d2d2d76cba7d9c3 Mon Sep 17 00:00:00 2001
From: Jaroslaw Michalski <jaroslaw.m.michalski@phe.gov.uk>
Date: Thu, 12 Oct 2023 17:00:26 +0100
Subject: [PATCH] fix some mistakes in testing layout

---
 Layouts/testing.yaml | 78 +++++---------------------------------------
 1 file changed, 8 insertions(+), 70 deletions(-)

diff --git a/Layouts/testing.yaml b/Layouts/testing.yaml
index a7d38ca..2ad1270 100644
--- a/Layouts/testing.yaml
+++ b/Layouts/testing.yaml
@@ -17,7 +17,7 @@ headlineNumbers:
         areaName:
           - England
 
-  # Virus tests reported - Northern Ireland
+  # Virus tests reported - Northern Ireland, Scotland and Wales
   - caption: Virus tests reported
     valueItems:
 
@@ -33,39 +33,7 @@ headlineNumbers:
       included:
         areaName:
           - Northern Ireland
-
-  # Virus tests reported - Scotland
-  - caption: Virus tests reported
-    valueItems:
-
-      - label: Total
-        value: cumVirusTestsByPublishDate
-        tooltip: Total number of virus tests reported up to {date}
-
-      - label: Last 7 days
-        value: newVirusTestsByPublishDateRollingSum
-        tooltip: Number of new virus tests reported in the 7 days up to {date}
-
-    locationAware:
-      included:
-        areaName:
           - Scotland
-
-  # Virus tests reported - Wales
-  - caption: Virus tests reported
-    valueItems:
-
-      - label: Total
-        value: cumVirusTestsByPublishDate
-        tooltip: Total number of virus tests reported up to {date}
-
-      - label: Last 7 days
-        value: newVirusTestsByPublishDateRollingSum
-        tooltip: Number of new virus tests reported in the 7 days up to {date}
-
-    locationAware:
-      included:
-        areaName:
           - Wales
 
   # Virus tests reported - for other than 'nation' area types
@@ -102,24 +70,7 @@ headlineNumbers:
         areaname:
           - England
 
-  # Change from previous 7 days  - for Northern Ireland
-  - caption: Change from previous 7 days
-    valueItems:
-
-      - label: Number
-        value: newVirusTestsByPublishDateChange
-        tooltip: Change in number of virus tests reported in the 7 days up to {date} compared with the previous 7 day period.
-
-      - label: Percentage
-        value: newVirusTestsByPublishDateChangePercentage
-        tooltip: Percentage change in number of virus tests reported in the 7 days up to {date} compared with the previous 7 day period.
-
-    locationAware:
-      included:
-        areaname:
-          - England
-
-  # Change from previous 7 days  - for Scotland
+  # Change from previous 7 days  - for Northern Ireland, Scotland and Wales
   - caption: Change from previous 7 days
     valueItems:
 
@@ -134,23 +85,8 @@ headlineNumbers:
     locationAware:
       included:
         areaname:
+          - Northern Ireland
           - Scotland
-
-  # Change from previous 7 days  - for Wales
-  - caption: Change from previous 7 days
-    valueItems:
-
-      - label: Number
-        value: newVirusTestsByPublishDateChange
-        tooltip: Change in number of virus tests reported in the 7 days up to {date} compared with the previous 7 day period.
-
-      - label: Percentage
-        value: newVirusTestsByPublishDateChangePercentage
-        tooltip: Percentage change in number of virus tests reported in the 7 days up to {date} compared with the previous 7 day period.
-
-    locationAware:
-      included:
-        areaname:
           - Wales
 
   # Change from previous 7 days  - for other than 'nation' area types
@@ -182,9 +118,11 @@ cards:
   - heading: Virus tests reported
     cardType: chart
     locationAware:
-      excluded:
-        areaType:
-          - overview
+      included:
+        areaName:
+          - Northern Ireland
+          - Scotland
+          - Wales
 
     fullWidth: true
     abstract: >