<%= t('advice_pages.solar_pv.has_solar_pv.analysis.there_may_be_extra_returns') %>.
-| @@ -94,8 +94,8 @@ | |||
|---|---|---|---|
| <%= t('advice_pages.solar_pv.has_solar_pv.analysis.before_april_2019_content_html') %> | -<%= t('advice_pages.solar_pv.has_solar_pv.analysis.after_april_2019_content_html') %> | +<%= t('advice_pages.solar_pv.has_solar_pv.analysis.before_april_2019_content_html', solar_generation: format_unit(@existing_benefits.annual_solar_pv_kwh, :kwh)) %> | +<%= t('advice_pages.solar_pv.has_solar_pv.analysis.after_april_2019_content_html', export_price: BenchmarkMetrics.pricing.solar_export_price * 100, export_value: format_unit(@existing_benefits.export_£, :£)) %> |
Gallai'r ysgol hefyd elwa o gymhorthdal y llywodraeth o'r enw 'tariff cyflenwi trydan'.
-Bydd swm y tariff cyflenwi trydan yn dibynnu ar bryd y gosodwyd y paneli ac fel arfer mae o fewn yr ystod 5p/kWh i 40 p/kWh x cyfanswm y 'Cynhyrchiad Ffotofoltäig' o 5,693 kWh, bob blwyddyn
+Bydd swm y tariff cyflenwi trydan yn dibynnu ar bryd y gosodwyd y paneli ac fel arfer mae o fewn yr ystod 5p/kWh i 40 p/kWh x cyfanswm y 'Cynhyrchiad Ffotofoltäig' o %{solar_generation} kWh, bob blwyddyn
benefits_of_having_installed_solar_panels: Manteision gosod paneli solar if_the_panels_are_owned_by_a_third_party: Os yw'r paneli yn eiddo i drydydd parti if_the_panels_are_owned_by_the_school: Os yw'r paneli yn eiddo i'r ysgol diff --git a/config/locales/views/advice_pages/solar_pv.yml b/config/locales/views/advice_pages/solar_pv.yml index 6db9a0cb07..dd04220b6d 100644 --- a/config/locales/views/advice_pages/solar_pv.yml +++ b/config/locales/views/advice_pages/solar_pv.yml @@ -5,11 +5,13 @@ en: has_solar_pv: analysis: after_april_2019: After April 2019 - after_april_2019_content_html: There will be an extra saving of about £79 from exported electricity under the SEG (Smart Export Guarantee) + after_april_2019_content_html: |- +The school might also gain between 1p and 15p per kWh of exported electricity under the SEG (Smart Export Guarantee). This rate will be agreed with your energy provider.
+Using Energy Spark’s average SEG rate of %{export_price}p per kWh, we estimate that your school will have received %{export_value} under the SEG in the last year.
before_april_2019: Before April 2019 before_april_2019_content_html: |-The school might also gain from the government subsidy called 'feed-in-tariff'.
-The amount of the feed in tariff will depend on when the panels were installed and is typically in the range 5p/kWh to 40 p/kWh x the total 'Photovoltaic production' of 5,694 kWh, each year
+The amount of the feed in tariff will depend on when the panels were installed and is typically in the range 5p/kWh to 40 p/kWh x the total 'Photovoltaic production' of %{solar_generation} kWh, each year
benefits_of_having_installed_solar_panels: Benefits of having installed solar panels if_the_panels_are_owned_by_a_third_party: If the panels are owned by a third-party if_the_panels_are_owned_by_the_school: If the panels are owned by the school diff --git a/spec/system/schools/advice_pages/solar_pv_spec.rb b/spec/system/schools/advice_pages/solar_pv_spec.rb index 6f54e7267a..f6032985b9 100644 --- a/spec/system/schools/advice_pages/solar_pv_spec.rb +++ b/spec/system/schools/advice_pages/solar_pv_spec.rb @@ -126,8 +126,13 @@ def expected_page_title expect(page).to have_content('Long term trends') expect(page).to have_content('Recent electricity consumption and solar production') expect(page).to have_content('Benefits of having installed solar panels') - expect(page).to have_content('Before April 2019') - expect(page).to have_content('After April 2019') + within('#investment-returns') do + expect(page).to have_content('Before April 2019') + expect(page).to have_content('14,000 kWh') + expect(page).to have_content('After April 2019') + expect(page).to have_content("#{BenchmarkMetrics.pricing.solar_export_price * 100}p per kWh") + expect(page).to have_content('£65') + end expect(page).to have_css('#chart_wrapper_solar_pv_group_by_month') expect(page).to have_css('#chart_wrapper_solar_pv_last_7_days_by_submeter') end