Merge branch 'main' into feature/update-chart-series-to-accept-only-6-series

precious-onyenaucheya-ons · web-flow · commit a21229d6b21e · 2025-11-04T09:14:18.000Z
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-line-chart-with-markers_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-line-chart-with-markers_0_document_0_desktop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b9f66c2aac7b06e3210a8a3242f618a13f09e12cc84d4030c2a73b8b67f5a072
-size 131261
+oid sha256:fe2318a1989a3a13ebcf73751035d9ec1eba82d63e4883a8af05fd195eef55cc
+size 108231
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-line-chart-with-markers_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-line-chart-with-markers_0_document_1_tablet.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:31fb33343ab3c88ed1f9ebe4c5c3a455c3cd2445049b1345e74ea1836eca3455
-size 113721
+oid sha256:28087ed74028e38ec358db32f1f0a7b2f0ea796c805b84a900d7e0bcdc90c188
+size 96311
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-line-chart-with-markers_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-line-chart-with-markers_0_document_2_mobile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9a4d723e0a18be3d9f9ff93927f74ed107d90045b5f69085ce2678f7d26711f6
-size 102220
+oid sha256:4c4fadadd66b66b721872b76b866d2cb41160a2741070466e3392fec5819e214
+size 90595
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-stacked-column-chart_0_document_0_desktop.png b/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-stacked-column-chart_0_document_0_desktop.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:76b97b4c84aa6c98436c49605db870fb751cf4c1f52aa530ce14dbc2529c5f5f
-size 88623
+oid sha256:c378b3486fe7f3a30308e22ac1405636fe3e75a39a85d12af7141b1a2a468d0e
+size 83780
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-stacked-column-chart_0_document_1_tablet.png b/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-stacked-column-chart_0_document_1_tablet.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fad8a3de75b261c8a87816c9d5861561bd80a2e06dfcc9eea6d980ec26907250
-size 83600
+oid sha256:4f0912abe858202ba63aee79c87ceb886b1609713fe2417490f261ed001f4668
+size 81677
diff --git a/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-stacked-column-chart_0_document_2_mobile.png b/backstop_data/bitmaps_reference/ds-vr-test__components_chart_example-stacked-column-chart_0_document_2_mobile.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:628d2843ad5fcbe8b4b227c0644c8c9b4c7a706561c977b832e546fa8e1f1764
-size 81818
+oid sha256:efdf57078fdb49896e806f3f3f74d69ec2242454f073726e4dd6108ed4ed6c12
+size 81062
diff --git a/src/components/chart/example-line-chart-with-markers.njk b/src/components/chart/example-line-chart-with-markers.njk
@@ -38,11 +38,7 @@
                 'Dec 2014',
                 'Jan 2015',
                 'Feb 2015',
-                'Mar 2015',
-                'Apr 2015',
-                'May 2015',
-                'Jun 2015',
-                'Jul 2015'
+                'Mar 2015'
             ]
         },
         "yAxis": {
@@ -98,38 +94,6 @@
                 ],
                 "marker": true,
                 "connectNulls": true
-            },
-            {
-                "name": 'Extra test series 3',
-                "data": [
-                    5.5, 5.3, 5.4, 5.5, 5.4, 5.2, 5.1, 5.2, 5.0, 5.3
-                ],
-                "marker": true,
-                "connectNulls": true
-            },
-            {
-                "name": 'Extra test series 4',
-                "data": [
-                    -3.5, -3.3, -3.4, -3.5, -3.4, -3.2, -3.1, -3.2, -3.0, -3.3
-                ],
-                "marker": true,
-                "connectNulls": true
-            },
-            {
-                "name": 'Extra test series 5',
-                "data": [
-                    -4.5, -4.3, -4.4, -4.5, -4.4, -4.2, -4.1, -4.2, -4.0, -4.3
-                ],
-                "marker": true,
-                "connectNulls": true
-            },
-            {
-                "name": 'Extra test series 6',
-                "data": [
-                    -5.5, -5.3, -5.4, -5.5, -5.4, -5.2, -5.1, -5.2, -5.0, -5.3
-                ],
-                "marker": true,
-                "connectNulls": true
             }
         ],
         "percentageHeightDesktop": 35,
diff --git a/src/components/chart/example-stacked-column-chart.njk b/src/components/chart/example-stacked-column-chart.njk
@@ -2,66 +2,55 @@
 {{
     onsChart({
         "chartType": "column",
-        "description": "Volume sales, seasonally adjusted, Great Britain, January 2022 to January 2025",
+        "description": "Monthly percentage change in retail sales volume by store type, Great Britain, January to June 2025",
         "theme": "primary",
         "title": "Food stores showed a strong rise on the month, while non-food stores fell",
-        "subtitle": "Figure 6: Upward contribution from housing and household services (including energy) saw the annual CPIH inflation rate rise",
+        "subtitle": "Figure 6: Upward contribution to monthly percentage change in total retail sales",
         "id": "uuid",
         "useStackedLayout": true,
         "caption": "Source: Monthly Business Survey, Retail Sales Inquiry from the Office for National Statistics",
         "download": {
-            'title': 'Download Figure 1 data',
-            'itemsList': [
-                {
-                    "text": "Excel spreadsheet (XLSX format, 18KB)",
-                    "url": "#"
-                },
-                {
-                    "text": "Simple text file (CSV format, 25KB)",
-                    "url": "#"
-                },
-                {
-                    "text": "Image (PNG format, 25KB)",
-                    "url": "#"
-                }
+            "title": "Download Figure 6 data",
+            "itemsList": [
+                { "text": "Excel spreadsheet (XLSX format, 22KB)", "url": "#" },
+                { "text": "Simple text file (CSV format, 28KB)", "url": "#" },
+                { "text": "Image (PNG format, 32KB)", "url": "#" }
             ]
         },
         "legend": true,
         "series": [
             {
-                "data": [5, 3, 4, 6, 2, 2, 3, 7],
-                "dataLabels": false,
-                "name": "2022"
+                "name": "Food stores",
+                "data": [1.5, 0.8, 1.2, 0.9, 1.1, 1.4]
             },
             {
-                "data": [2, 2, 3, 7, 3, 4, 4, 1],
-                "dataLabels": false,
-                "name": "2023"
+                "name": "Non-food stores",
+                "data": [0.5, -0.2, 0.6, 0.8, 0.3, 0.4]
             },
             {
-                "data": [3, 4, 4, 1, 5, 3, 4, 6],
-                "dataLabels": false,
-                "name": "2024"
+                "name": "Non-store retailing",
+                "data": [0.2, 0.1, 0.3, 0.2, 0.4, 0.3]
+            },
+            {
+                "name": "Automotive fuel",
+                "data": [0.3, 0.2, -0.1, 0.4, 0.2, 0.5]
             }
         ],
         "xAxis": {
             "categories": [
-                "Food stores",
-                "Non-food stores",
-                "Non-store retailing ",
-                "Automotive fuel",
-                "Household goods stores",
-                "Clothing stores",
-                "Other stores",
-                "All retailing"
+                "Jan 2025",
+                "Feb 2025",
+                "Mar 2025",
+                "Apr 2025",
+                "May 2025",
+                "Jun 2025"
             ],
-            "title": "Items",
-            "type": "linear"
+            "title": "Month"
         },
         "yAxis": {
-            "title": "Percentage of GDP (%)"
+            "title": "Monthly percentage change (%)"
         },
-        "percentageHeightDesktop": 35,
+        "percentageHeightDesktop": 40,
         "percentageHeightMobile": 90
     })
 }}
