From 7625073339c86488d705ba4c76b55124d5afc976 Mon Sep 17 00:00:00 2001
From: Giles Dring <giles@dringtech.com>
Date: Tue, 21 Nov 2023 15:41:29 +0000
Subject: [PATCH 1/3] Varioous fixes to maps

---
 src/_includes/partials/dashboard/maps.njk |   7 +-
 src/maps/neet-factors/index.njk           | 467 +++++-----------------
 2 files changed, 111 insertions(+), 363 deletions(-)

diff --git a/src/_includes/partials/dashboard/maps.njk b/src/_includes/partials/dashboard/maps.njk
index f3020502..785a6081 100644
--- a/src/_includes/partials/dashboard/maps.njk
+++ b/src/_includes/partials/dashboard/maps.njk
@@ -1,4 +1,5 @@
-{% set background = "#005776" %}
+{# {% set background = "#005776" %} #}
+{% set background = "#337991" %}
 
 {% comp 'grid.block', {
 	link: '~/maps/neet-factors/index.njk' | url + '?map-selector=total-score',
@@ -9,7 +10,7 @@
 	<h3>NEET factors</h3>
 
   <p>
-    Likelihood of NEET outcome modelled on multiple factors by Local Authority.
+    Likelihood of NEET outcome for each English Local Authority, modelled on multiple factors.
   </p>
 
   <div class="dashboard-viz">
@@ -34,7 +35,7 @@
 	<h3>Employment</h3>
 
   <p>
-    Propoprtion of young people unemployed, economically inactive and not in full-time education by parliamentary consituency.
+    Proportion of young people unemployed, economically inactive and not in full-time education, mapped by English parliamentary consituency.
   </p>
 
   <div class="dashboard-viz">
diff --git a/src/maps/neet-factors/index.njk b/src/maps/neet-factors/index.njk
index e04cd90c..d6d8275c 100644
--- a/src/maps/neet-factors/index.njk
+++ b/src/maps/neet-factors/index.njk
@@ -41,10 +41,12 @@ css: |
     padding-top: 1.5rem;
   }
 
-
   ul.spaced {
     margin-left: 3em;
   }
+  article .pane {
+    margin-top: 1.5em;
+  }
 
 featured: "#children-in-poverty figure"
 chart_description: |
@@ -75,7 +77,6 @@ barchart_description: |
     <article id='total-score' class='selector-block' data-selector-group="Aggregate scores">
     <h2>Total Score</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -84,7 +85,10 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: {
+            position: 'top left'
+          }
         } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
@@ -92,33 +96,20 @@ barchart_description: |
     <section>
     <h3>Ranked Local Authorities for this Dataset</h3>
     {{ barchart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
           data: view.total_score_barchart.rows,
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Total score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Total score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 35,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 5 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -128,7 +119,6 @@ barchart_description: |
     <article id='weighted-scores-double' class='selector-block' data-selector-group="Aggregate scores">
     <h2>Weighted Scores (double)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -137,41 +127,29 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
           data: view.weighted_scores_double_barchart.rows,
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Weighted score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Weighted score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -181,7 +159,6 @@ barchart_description: |
     <article id='children-in-poverty' class='selector-block' data-selector-group="Standardised layers">
     <h2>Children in Poverty</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -190,15 +167,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -206,26 +183,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -235,7 +200,6 @@ barchart_description: |
     <article id='children-looked-after' class='selector-block' data-selector-group="Standardised layers (incomplete)">
     <h2>Children Looked After</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -244,15 +208,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -260,26 +224,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -290,7 +242,6 @@ barchart_description: |
     <article id='disability-all' class='selector-block' data-selector-group="Standardised layers">
     <h2>Disability (all ages)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -299,15 +250,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -315,26 +266,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -344,7 +283,6 @@ barchart_description: |
     <article id='disability-under-25' class='selector-block' data-selector-group="Standardised layers">
     <h2>Disability (under 25)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -353,15 +291,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -369,26 +307,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -398,7 +324,6 @@ barchart_description: |
     <article id='economic-inactivity-neet' class='selector-block' data-selector-group="Standardised layers">
     <h2>Economic Inactivity (NEET)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -407,15 +332,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -423,26 +348,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -452,7 +365,6 @@ barchart_description: |
     <article id='fertility-rates-20-24' class='selector-block' data-selector-group="Standardised layers">
     <h2>Fertility Rates (aged 20-24)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -461,8 +373,9 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
@@ -477,26 +390,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -506,7 +407,6 @@ barchart_description: |
     <article id='fertility-rates-under-20' class='selector-block' data-selector-group="Standardised layers">
     <h2>Fertility Rates (under 20)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -515,41 +415,29 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
           data: view.fertility_rates_under_20_barchart.rows,
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -559,7 +447,6 @@ barchart_description: |
     <article id='imd-crime' class='selector-block' data-selector-group="Standardised layers">
     <h2>IMD Crime</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -568,15 +455,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -584,26 +471,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -613,7 +488,6 @@ barchart_description: |
     <article id='imd-health' class='selector-block' data-selector-group="Standardised layers">
     <h2>IMD Health</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -622,15 +496,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -638,26 +512,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -667,7 +529,6 @@ barchart_description: |
     <article id='lone-parent-households' class='selector-block' data-selector-group="Standardised layers">
     <h2>Lone Parent Households</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -676,15 +537,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -692,26 +553,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -721,7 +570,6 @@ barchart_description: |
     <article id='pupils-with-sen-support' class='selector-block' data-selector-group="Standardised layers (incomplete)">
     <h2>Pupils with SEN Support</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -730,15 +578,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -746,26 +594,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -775,7 +611,6 @@ barchart_description: |
     <article id='qualification-below-level-2-aged-16-24' class='selector-block' data-selector-group="Standardised layers">
     <h2>Qualification Below Level 2 (aged 16-24)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -784,15 +619,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -800,26 +635,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -829,7 +652,6 @@ barchart_description: |
     <article id='qualification-below-level-2-all' class='selector-block' data-selector-group="Standardised layers">
     <h2>Qualification Below Level 2 (all)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -838,15 +660,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -854,26 +676,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -883,7 +693,6 @@ barchart_description: |
     <article id='school-absences' class='selector-block' data-selector-group="Standardised layers (incomplete)">
     <h2>School Absences</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -892,15 +701,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -908,26 +717,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -937,7 +734,6 @@ barchart_description: |
     <article id='school-exclusions' class='selector-block' data-selector-group="Standardised layers">
     <h2>School Exclusions</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -946,15 +742,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -962,26 +758,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -991,7 +775,6 @@ barchart_description: |
     <article id='school-suspensions' class='selector-block' data-selector-group="Standardised layers">
     <h2>School Suspensions</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -1000,15 +783,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -1016,26 +799,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -1045,7 +816,6 @@ barchart_description: |
     <article id='socially-renting-households' class='selector-block' data-selector-group="Standardised layers">
     <h2>Socially Renting Households</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -1054,15 +824,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section>
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -1070,26 +840,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -1099,7 +857,6 @@ barchart_description: |
     <article id='unpaid-carer-aged-16-24' class='selector-block' data-selector-group="Standardised layers">
     <h2>Unpaid Carer (aged 16-24)</h2>
     {{ chart_description | md | safe }}
-    </br>
     {% comp 'display.figure' %}
       {{ comp.oi.map.hex_cartogram({
         config: {
@@ -1108,15 +865,15 @@ barchart_description: |
           matchKey: 'local_authority_code',
           value: 'value',
           scale: 'YFF',
-          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>'
-        } | autoLegend
+          tooltip: '{{ n }}: <strong>{{ value | toFixed(2) }}</strong>',
+          legend: { position: 'top left' }
+        } | autoLegend({ formatter: legendKey })
       }) | safe }}
     {% endcomp %}
 
     <section style = "padding-top:3rem;">
     <h3>Ranked Local Authorities</h3>
     {{ barchart_description | md | safe }}
-    </br>
 
     {% comp 'display.figure' %}
       {{ comp.oi.chart.bar({ config: {
@@ -1124,26 +881,14 @@ barchart_description: |
           category: 'local_authority_name',
           width: 800,
           series: [
-            { title: 'Weighted Score', value: 'value' }
+            { title: 'Standardised score', value: 'value', tooltip: '{{ local_authority_name }}<br/>Standardised score {{ value | toFixed(1) }}' }
           ],
           legend: {
             show: true,
             position: "top"
           },
           axis: {
-            x: {
-                min: 0,
-                max: 5,
-              title: {
-                label: ""
-              },
-              tickSpacing: 10
-            },
-            y: {
-              title: {
-                label: ""
-              }
-            }
+            x: { tick: { spacing: 1 } }
           }
         } }) | safe }}
     {% endcomp %}
@@ -1160,7 +905,9 @@ barchart_description: |
         config: {
           columns: [
             {'name':'Local Authority'},
-            {'name':'Weighted Score', 'scale': 'YFF', 'template': '{{ Weighted Score | toFixed(2) }}', 'align': 'center' }
+            {'name':'Weighted Score', 'scale': 'YFF', 'template': '{{ Weighted Score | toFixed(2) }}', 'align': 'center',
+              min: view.weighted_scores_double.range.value.min, max: view.weighted_scores_double.range.value.max
+            }
           ],
           data: view.weighted_scores_table.rows 
         } }

From 9b1fe8c74f512a30a56da136d56d207e0e370481 Mon Sep 17 00:00:00 2001
From: Taz-Chiles <97239140+Taz-Chiles@users.noreply.github.com>
Date: Wed, 22 Nov 2023 15:59:21 +0000
Subject: [PATCH 2/3] Amend unemployment wording

---
 src/_includes/partials/dashboard/headlines.njk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/_includes/partials/dashboard/headlines.njk b/src/_includes/partials/dashboard/headlines.njk
index 2eef8489..193e3501 100644
--- a/src/_includes/partials/dashboard/headlines.njk
+++ b/src/_includes/partials/dashboard/headlines.njk
@@ -25,7 +25,7 @@
 {{ dashboard_block({
   link: '~/dashboard/labour-market/index.njk' | url,
   title: 'Unemployment',
-  description: 'Percentage of young people (aged 16 to 24) unemployed for period ' +
+  description: 'Percentage of economically active young people (aged 16 to 24) unemployed for period ' +
     search.data('dashboard/labour-market/').latest.most_recent_lms_period
     + '.',
   number: search.data('dashboard/labour-market/').latest.unemployment_rate_young_people + '%'
@@ -43,7 +43,7 @@
 {{ dashboard_block({
   link: '~/dashboard/labour-market/index.njk' | url,
   title: 'Long-term unemployment',
-  description: 'Percentage of young people (aged 16 to 24) unemployed for between 6 and 12 months for period ' +
+  description: 'Percentage of economically active young people (aged 16 to 24) unemployed for between 6 and 12 months for period ' +
     search.data('dashboard/labour-market/').latest.most_recent_lms_period
     + '.',
   number: search.data('dashboard/labour-market/').latest.long_term_unemployment_rate_6_to_12_months + '%'

From 92c5b696fa7f8847111258b7f1242ef5778070c1 Mon Sep 17 00:00:00 2001
From: Taz-Chiles <97239140+Taz-Chiles@users.noreply.github.com>
Date: Mon, 27 Nov 2023 17:34:57 +0000
Subject: [PATCH 3/3] Update labour market description

---
 src/dashboard/labour-market/index.njk | 28 ++++++++++-----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/dashboard/labour-market/index.njk b/src/dashboard/labour-market/index.njk
index 1a0a3cf0..6a81531d 100644
--- a/src/dashboard/labour-market/index.njk
+++ b/src/dashboard/labour-market/index.njk
@@ -24,13 +24,19 @@ raw_data:
 <h2> About the data on this page </h2>
 <p>
 These visualisations are driven by data from the ONS Labour Force Survey, published by the Office for National Statistics. 
-Specific links to the data sets used are provided below.
-The charts include the most recent 3-monthly rolling data from the LFS published on {{ latest.last_update | date('HUMAN_DATE') }}.
-The next data publication is due on {{ latest.next_update | date('HUMAN_DATE') }}.
 </p>
 
 <p>
-The page is automatically updated when ONS publishes new data.
+  This data is derived from the 
+  <a href="https://www.ons.gov.uk/employmentandlabourmarket/peopleinwork/employmentandemployeetypes/datasets/labourmarketstatistics">Labour Market Statistics time series</a> dataset.
+</p>
+
+<p>
+	The Office for National Statistics has paused the regular publication of this data, therefore the most recent release of this publication covers up until the 1st June 2023. The data on this page
+	will update once the ONS resumes publication of the Labour Force Survey. 
+
+{# The charts include the most recent 3-monthly rolling data from the LFS published on {{ latest.last_update | date('HUMAN_DATE') }}.
+The next data publication is due on {{ latest.next_update | date('HUMAN_DATE') }}. #}
 </p>
 
 <h2 id='long-term-unemployment'>Long-term unemployment for young people (seasonally adjusted)</h2>
@@ -40,12 +46,6 @@ The page is automatically updated when ONS publishes new data.
   unemployed for more than 12 months.
 </p>
 
-<p>
-  This data is derived from the 
-  <a href="https://www.ons.gov.uk/employmentandlabourmarket/peoplenotinwork/unemployment/datasets/unemploymentbyageanddurationseasonallyadjustedunem01sa">UNEM01 SA: Unemployment by age 
-  and duration (seasonally adjusted)</a> dataset.
-</p>
-
 {% comp 'tabbed', { tab_count: 2 } %}
 
   {% comp 'display.figure', { id: 'long_term_unemployment_3_years', source_file: '/data/labour-market/long_term_unemployed_last_3_years.csv' } %}
@@ -169,14 +169,6 @@ The page is automatically updated when ONS publishes new data.
   These visualisations show the labour market status of young people aged 16-24.
 </p>
 
-<p>
-  This data is derived from the 
-  <a href="https://www.ons.gov.uk/employmentandlabourmarket/peopleinwork/employmentandemployeetypes/datasets/educationalstatusandlabourmarketstatusforpeopleagedfrom16to24seasonallyadjusteda06sa">A06 
-  SA: Educational status and labour market status for people aged from 16 to 24 (seasonally adjusted)</a> dataset.
-</p>
-
-
-
 
 {% comp 'tabbed', { tab_count: 3 } %}