From 230fb13744fe16962661ae7844dc004610ad92b8 Mon Sep 17 00:00:00 2001 From: Fred Marecesche Date: Thu, 19 May 2022 15:47:10 +0100 Subject: [PATCH 1/5] Post release changelog update - 2.8.2 --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f46057158..efbb084510 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,16 @@ ### Bugs fixed -- GLS-228 - invert market guides experiment to hide stats by default - ### Enhancements +## [2.8.2](https://github.com/uktrade/great-cms/releases/tag/2.8.2) + +[Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.1...2.8.2) + +### Bugs fixed + +- GLS-228 - invert market guides experiment to hide stats by default + ## [2.8.1](https://github.com/uktrade/great-cms/releases/tag/2.8.1) [Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.0...2.8.1) From 56613b0280a19d00edd44b5882f68b7c1dc75253 Mon Sep 17 00:00:00 2001 From: Fred Marecesche Date: Mon, 23 May 2022 10:02:05 +0100 Subject: [PATCH 2/5] Change highlights stats descriptions to specify exports --- CHANGELOG.md | 2 ++ domestic/templates/domestic/country_guide.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f46057158..8e5e14c011 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ ### Enhancements +- GLS-231 - Specify 'exports' for highlight stats + ## [2.8.1](https://github.com/uktrade/great-cms/releases/tag/2.8.1) [Full Changelog](https://github.com/uktrade/great-cms/compare/2.8.0...2.8.1) diff --git a/domestic/templates/domestic/country_guide.html b/domestic/templates/domestic/country_guide.html index dc617d7e1d..4f8c4ed4ed 100644 --- a/domestic/templates/domestic/country_guide.html +++ b/domestic/templates/domestic/country_guide.html @@ -73,7 +73,7 @@

The UK's

- largest trading partner + largest export market {% endif %} @@ -87,7 +87,7 @@

Accounting for

- of total UK trade + of total UK exports {% endif %} From 30db8662d1daf3d687a80e9c41019e4e3dfdc218 Mon Sep 17 00:00:00 2001 From: Fred Marecesche Date: Mon, 23 May 2022 11:06:54 +0100 Subject: [PATCH 3/5] Add note about total trade to market trends metadata --- CHANGELOG.md | 1 + core/templates/core/includes/data_source.html | 3 ++- domestic/fixtures/market_guide_stats.json | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e5e14c011..eb0f581767 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ ### Enhancements - GLS-231 - Specify 'exports' for highlight stats +- GLS-238 - Clarify 'total trade' for line chart ## [2.8.1](https://github.com/uktrade/great-cms/releases/tag/2.8.1) diff --git a/core/templates/core/includes/data_source.html b/core/templates/core/includes/data_source.html index 9ca103f982..1932f86d54 100644 --- a/core/templates/core/includes/data_source.html +++ b/core/templates/core/includes/data_source.html @@ -10,8 +10,9 @@
Next release: {{ source.next_release }} {% endif %} {% if source.notes %} +
{% for note in source.notes %} -
{{ note }} + {{ note }} {% endfor %} {% endif %} {% endspaceless %} diff --git a/domestic/fixtures/market_guide_stats.json b/domestic/fixtures/market_guide_stats.json index dd981866e7..b9dcaea2bc 100644 --- a/domestic/fixtures/market_guide_stats.json +++ b/domestic/fixtures/market_guide_stats.json @@ -33,6 +33,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -197,6 +198,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -361,6 +363,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -525,6 +528,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -689,6 +693,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -853,6 +858,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } @@ -1017,6 +1023,7 @@ "url": "https://www.ons.gov.uk/economy/nationalaccounts/balanceofpayments/datasets/uktotaltradeallcountriesseasonallyadjusted ", "next_release": "To be announced", "notes": [ + "Total trade is the sum of all exports and imports over the same time period.", "Data includes goods and services combined." ] } From 71621fd250ff9f964c89d0276c48e860342e871d Mon Sep 17 00:00:00 2001 From: Fred Marecesche Date: Mon, 23 May 2022 11:15:53 +0100 Subject: [PATCH 4/5] Use join to combine notes --- core/templates/core/includes/data_source.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/templates/core/includes/data_source.html b/core/templates/core/includes/data_source.html index 1932f86d54..3341ac241e 100644 --- a/core/templates/core/includes/data_source.html +++ b/core/templates/core/includes/data_source.html @@ -10,10 +10,7 @@
Next release: {{ source.next_release }} {% endif %} {% if source.notes %} -
- {% for note in source.notes %} - {{ note }} - {% endfor %} +
{{ source.notes|join:" " }} {% endif %} {% endspaceless %}

From 27d8ea89f676f0cccc9f0493c51b441d8cba168d Mon Sep 17 00:00:00 2001 From: Fred Marecesche Date: Mon, 23 May 2022 11:28:35 +0100 Subject: [PATCH 5/5] Use 'total trade' for column heading --- domestic/templates/domestic/country_guide.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domestic/templates/domestic/country_guide.html b/domestic/templates/domestic/country_guide.html index 4f8c4ed4ed..1b9659edb2 100644 --- a/domestic/templates/domestic/country_guide.html +++ b/domestic/templates/domestic/country_guide.html @@ -192,7 +192,7 @@

Total import and export values between {{ page.headin Year Imports (£{% if unit %}{{ unit }}{% endif %}) Exports (£{% if unit %}{{ unit }}{% endif %}) - Total (£{% if unit %}{{ unit }}{% endif %}) + Total trade (£{% if unit %}{{ unit }}{% endif %})