Skip to content

Commit

Permalink
Try to resolve <br/> tags in bar charts
Browse files Browse the repository at this point in the history
  • Loading branch information
gilesdring committed Oct 23, 2023
1 parent 161ce1f commit a34cd92
Show file tree
Hide file tree
Showing 16 changed files with 49 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ config:
category: sector
columns:
- name: monthly
template: '{{sector}} <br/> monthly change: {{ monthly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> monthly change: {{ monthly_pct_change | toFixed(1)}}%'
- name: quarterly
template: '{{sector}} <br/> quarterly change: {{ quarterly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> quarterly change: {{ quarterly_pct_change | toFixed(1)}}%'
- name: yearly
template: '{{sector}} <br/> yearly change: {{ yearly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> yearly change: {{ yearly_pct_change | toFixed(1)}}%'
file: /data/cpi/cpi_all_category_bar_chart.csv
legend:
position: top right
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ config:
category: sector
columns:
- name: monthly
template: '{{sector}} <br/> monthly change: {{ monthly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> monthly change: {{ monthly_pct_change | toFixed(1)}}%'
- name: quarterly
template: '{{sector}} <br/> quarterly change: {{ quarterly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> quarterly change: {{ quarterly_pct_change | toFixed(1)}}%'
- name: yearly
template: '{{sector}} <br/> yearly change: {{ yearly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> yearly change: {{ yearly_pct_change | toFixed(1)}}%'
file: /data/cpi/cpi_summary_barchart.csv
id: cpi_summary
legend:
Expand Down
12 changes: 6 additions & 6 deletions src/dashboard/cpi/_data/visualisation/time_series.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ config:
- name: x_tick_labels
template: "{{ date_axis_label }}"
- name: all_categories
template: "{{ named_date }}<br/>All Categories: {{cpi_index_00_all_items_2015_100}}"
template: "{{ named_date }}<br>All Categories: {{cpi_index_00_all_items_2015_100}}"
- name: youth_average
template: "{{ named_date }}<br/>All Categories: {{Youth-focused average}}"
template: "{{ named_date }}<br>All Categories: {{Youth-focused average}}"
- name: food_and_non_alcoholic_beverages
template: "{{ named_date }}<br/>Food & non-alcoholic beverages: {{cpi_index_01_food_and_non_alcoholic_beverages_2015_100}}"
template: "{{ named_date }}<br>Food & non-alcoholic beverages: {{cpi_index_01_food_and_non_alcoholic_beverages_2015_100}}"
- name: transport
template: "{{ named_date }}<br/>Clothing & footwear: {{cpi_index_07_transport_2015_100}}"
template: "{{ named_date }}<br>Clothing & footwear: {{cpi_index_07_transport_2015_100}}"
- name: housing_energy
template:
"{{ named_date }}<br/>Housing, water, electricity, gas & other fuels:
"{{ named_date }}<br>Housing, water, electricity, gas & other fuels:
{{cpi_index_04_housing_water_and_fuels_2015_100}}"
- name: recreation_and_culture
template: "{{ named_date }}<br/>Recreation & culture: {{cpi_index_09_recreation_&_culture_2015_100}}"
template: "{{ named_date }}<br>Recreation & culture: {{cpi_index_09_recreation_&_culture_2015_100}}"
file: /data/cpi/cpi_linechart.csv
legend:
position: top right
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ config:
category: sector
columns:
- name: monthly
template: '{{sector}} <br/> monthly change: {{ monthly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> monthly change: {{ monthly_pct_change | toFixed(1)}}%'
- name: quarterly
template: '{{sector}} <br/> quarterly change: {{ quarterly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> quarterly change: {{ quarterly_pct_change | toFixed(1)}}%'
- name: yearly
template: '{{sector}} <br/> yearly change: {{ yearly_pct_change | toFixed(1)}}%'
template: '{{sector}} <br> yearly change: {{ yearly_pct_change | toFixed(1)}}%'
file: /data/cpi/cpi_barchart.csv
id: cpi-young-people
legend:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ config:
- name: x_tick_labels
template: '{{ quarter_axis_label }}'
- name: label_6_to_12_months
template: '{{quarter_label}} <br/> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
- name: label_12_months
template: '{{quarter_label}} <br/> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
series:
- title: 6 to 12 months
x: quarter_index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ config:
label: ''
columns:
- name: label_6_to_12_months
template: '{{quarter_label}} <br/> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
- name: label_12_months
template: '{{quarter_label}} <br/> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
series:
- title: 6 to 12 months
x: quarter_index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ config:
- name: x_tick_labels
template: '{{ quarter_axis_label }}'
- name: label_6_to_12_months
template: '{{quarter_label}} <br/> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
- name: label_12_months
template: '{{quarter_label}} <br/> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
series:
- title: '6 to 12 months'
x: 'quarter_index' # Column heading to use for x-value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@ config:
label: ''
columns:
- name: label_6_to_12_months
template: '{{quarter_label}} <br/> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion between 6 and 12 months: {{age_16_to_24_unemployed_6_to_12_months_rate_sa | toFixed(1) }}%'
- name: label_12_months
template: '{{quarter_label}} <br/> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
template: '{{quarter_label}} <br> Proportion over 12 months: {{age_16_to_24_unemployed_over_12_months_rate_sa | toFixed(1) }}%'
series:
- title: '6 to 12 months'
x: 'quarter_index' # Column heading to use for x-value
Expand Down
18 changes: 9 additions & 9 deletions src/dashboard/neet/_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ visualisations:
- name: x_tick_labels
template: "{{ quarter_label }}"
- name: "Total"
template: "{{quarter_label}} <br/> NEET rate: {{people_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> NEET rate: {{people_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
- name: unemployed_tooltip
template: "{{quarter_label}} <br/> Unemployed rate: {{people_age_16_to_24_neet_unemployed_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> Unemployed rate: {{people_age_16_to_24_neet_unemployed_rate_sa | toFixed(1)}}%"
- name: economically_inactive_tooltip
template: "{{quarter_label}} <br/> Economically inactive rate: {{people_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> Economically inactive rate: {{people_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1)}}%"
series:
- title: "Total NEET rate"
x: "quarter_index" # Column heading to use for x-value
Expand Down Expand Up @@ -92,11 +92,11 @@ visualisations:
- name: x_tick_labels
template: "{{ quarter_label }}"
- name: "Total"
template: "{{quarter_label}} <br/> NEET rate: {{women_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> NEET rate: {{women_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
- name: unemployed_tooltip
template: "{{quarter_label}} <br/> Unemployed rate: {{ women_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Unemployed rate: {{ women_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
- name: economically_inactive_tooltip
template: "{{quarter_label}} <br/> Economically inactive rate: {{ women_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Economically inactive rate: {{ women_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
series:
- title: "Total NEET rate"
x: "quarter_index" # Column heading to use for x-value
Expand Down Expand Up @@ -139,11 +139,11 @@ visualisations:
- name: x_tick_labels
template: "{{ quarter_label }}"
- name: "Total"
template: "{{quarter_label}} <br/> NEET rate: {{men_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> NEET rate: {{men_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
- name: unemployed_tooltip
template: "{{quarter_label}} <br/> Unemployed rate: {{ men_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Unemployed rate: {{ men_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
- name: economically_inactive_tooltip
template: "{{quarter_label}} <br/> Economically inactive rate: {{ men_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Economically inactive rate: {{ men_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
series:
- title: "Total NEET rate"
x: "quarter_index" # Column heading to use for x-value
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard/neet/_data/visualisation/all_young_men.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ config:
- name: x_tick_labels
template: '{{ quarter_axis_label }}'
- name: "Total"
template: "{{quarter_label}} <br/> NEET rate: {{men_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> NEET rate: {{men_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
- name: unemployed_tooltip
template: "{{quarter_label}} <br/> Unemployed rate: {{ men_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Unemployed rate: {{ men_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
- name: economically_inactive_tooltip
template: "{{quarter_label}} <br/> Economically inactive rate: {{ men_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Economically inactive rate: {{ men_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
series:
- title: "Total NEET rate"
x: "quarter_index" # Column heading to use for x-value
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard/neet/_data/visualisation/all_young_people.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ config:
- name: x_tick_labels
template: '{{ quarter_axis_label }}'
- name: "Total"
template: "{{quarter_label}} <br/> NEET rate: {{people_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> NEET rate: {{people_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
- name: unemployed_tooltip
template: "{{quarter_label}} <br/> Unemployed rate: {{people_age_16_to_24_neet_unemployed_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> Unemployed rate: {{people_age_16_to_24_neet_unemployed_rate_sa | toFixed(1)}}%"
- name: economically_inactive_tooltip
template: "{{quarter_label}} <br/> Economically inactive rate: {{people_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> Economically inactive rate: {{people_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1)}}%"
series:
- title: "Total NEET rate"
x: "quarter_index" # Column heading to use for x-value
Expand Down
6 changes: 3 additions & 3 deletions src/dashboard/neet/_data/visualisation/all_young_women.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ config:
- name: x_tick_labels
template: '{{ quarter_axis_label }}'
- name: "Total"
template: "{{quarter_label}} <br/> NEET rate: {{women_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
template: "{{quarter_label}} <br> NEET rate: {{women_age_16_to_24_neet_total_rate_sa | toFixed(1)}}%"
- name: unemployed_tooltip
template: "{{quarter_label}} <br/> Unemployed rate: {{ women_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Unemployed rate: {{ women_age_16_to_24_neet_unemployed_rate_sa | toFixed(1) }}%"
- name: economically_inactive_tooltip
template: "{{quarter_label}} <br/> Economically inactive rate: {{ women_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
template: "{{quarter_label}} <br> Economically inactive rate: {{ women_age_16_to_24_neet_economically_inactive_rate_sa | toFixed(1) }}%"
series:
- title: "Total NEET rate"
x: "quarter_index" # Column heading to use for x-value
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ config:
category: "Sector" # Category names come from
columns:
- name: growth_last_quarter
template: "{{Sector}} <br/> quarterly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
template: "{{Sector}} <br> quarterly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
- name: growth_compared_with_2020
template: "{{Sector}} <br/> growth since pre-coronavirus: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
template: "{{Sector}} <br> growth since pre-coronavirus: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
series:
- title: "Growth since previous quarter (%)"
value: "Growth since previous quarter (%)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ config:
category: "Sector" # Category names come from
columns:
- name: growth_last_quarter
template: "{{Sector}} <br/> monthly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
template: "{{Sector}} <br> monthly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
- name: growth_compared_with_2020
template: "{{Sector}} <br/> quarterly change: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
template: "{{Sector}} <br> quarterly change: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
series:
- title: "Growth since previous quarter (%)"
value: "Growth since previous quarter (%)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ config:
category: "Sector" # Category names come from
columns:
- name: growth_last_quarter
template: "{{Sector}} <br/> monthly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
template: "{{Sector}} <br> monthly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
- name: growth_compared_with_2020
template: "{{Sector}} <br/> quarterly change: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
template: "{{Sector}} <br> quarterly change: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
series:
- title: "Growth since previous quarter (%)"
value: "Growth since previous quarter (%)"
Expand Down
4 changes: 2 additions & 2 deletions src/dashboard/vacancies/_data/visualisations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,9 @@
category: "Sector" # Category names come from
columns:
- name: growth_last_quarter
template: "{{Sector}} <br/> monthly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
template: "{{Sector}} <br> monthly change: {{ Growth since previous quarter (%) | toFixed(1)}}%"
- name: growth_compared_with_2020
template: "{{Sector}} <br/> quarterly change: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
template: "{{Sector}} <br> quarterly change: {{ Growth since pre-coronavirus January to March 2020 (%) | toFixed(1)}}%"
series:
- title: "Growth since previous quarter (%)"
value: "Growth since previous quarter (%)"
Expand Down

0 comments on commit a34cd92

Please sign in to comment.