From 54c46e68579484480be4f21f6db64662e1f2bae3 Mon Sep 17 00:00:00 2001 From: martintomas Date: Tue, 7 Nov 2023 13:54:41 +0100 Subject: [PATCH] feat: Adding research notes to ASCOR assessment model --- app/admin/ascor/assessments.rb | 7 +++---- app/assets/stylesheets/tpi/pages/ascor.scss | 6 +++++- app/services/csv_import/ascor_assessments.rb | 2 +- app/views/tpi/ascor/show.html.erb | 11 +++++++++++ db/seeds/tpi/ascor_assessments.csv | 6 +++--- spec/commands/csv_data_upload_spec.rb | 2 +- spec/support/fixtures/files/ascor_assessments.csv | 6 +++--- 7 files changed, 27 insertions(+), 13 deletions(-) diff --git a/app/admin/ascor/assessments.rb b/app/admin/ascor/assessments.rb index 89e210b63..00ca3a8d7 100644 --- a/app/admin/ascor/assessments.rb +++ b/app/admin/ascor/assessments.rb @@ -18,7 +18,6 @@ column :country, sortable: 'ascor_countries.name' column :assessment_date column :publication_date - column :notes actions end @@ -29,7 +28,7 @@ row :country row :assessment_date row :publication_date - row :notes + row 'Research Notes', &:notes row :created_at row :updated_at end @@ -53,7 +52,7 @@ f.input :country, as: :select, collection: ASCOR::Country.all.order(:name) f.input :assessment_date, as: :datepicker f.input :publication_date, as: :datepicker - f.input :notes + f.input :notes, label: 'Research Notes' end f.has_many :results, allow_destroy: true, heading: false do |ff| @@ -91,7 +90,7 @@ controller.assessment_results[[resource.id, indicator.id]]&.first&.year end end - column :notes + column 'Research Notes', &:notes end controller do diff --git a/app/assets/stylesheets/tpi/pages/ascor.scss b/app/assets/stylesheets/tpi/pages/ascor.scss index b42742940..a0debceaf 100644 --- a/app/assets/stylesheets/tpi/pages/ascor.scss +++ b/app/assets/stylesheets/tpi/pages/ascor.scss @@ -253,7 +253,7 @@ $see-more-width-tablet: 130px; .country-assessment { margin-top: 60px; - margin-bottom: 60px; + margin-bottom: 30px; &__pillar { outline: solid 1px $grey-lighter-medium; @@ -510,6 +510,10 @@ $see-more-width-tablet: 130px; } } + .notes { + margin-bottom: 30px; + } + .contacts { width: 100%; height: 380px; diff --git a/app/services/csv_import/ascor_assessments.rb b/app/services/csv_import/ascor_assessments.rb index c9c6e4740..2c01646e1 100644 --- a/app/services/csv_import/ascor_assessments.rb +++ b/app/services/csv_import/ascor_assessments.rb @@ -9,7 +9,7 @@ def import assessment.country = countries[row[:country]].first if row.header?(:country) assessment.assessment_date = assessment_date(row) if row.header?(:assessment_date) assessment.publication_date = publication_date(row) if row.header?(:publication_date) - assessment.notes = row[:notes] if row.header?(:notes) + assessment.notes = row[:research_notes] if row.header?(:research_notes) was_new_record = assessment.new_record? diff --git a/app/views/tpi/ascor/show.html.erb b/app/views/tpi/ascor/show.html.erb index c38d0940f..0ffb49734 100644 --- a/app/views/tpi/ascor/show.html.erb +++ b/app/views/tpi/ascor/show.html.erb @@ -39,5 +39,16 @@ <% end %> +
+ <% if @assessment.notes.present? %> +
Research notes:
+

+ <%= @assessment.notes %> +

+ <% else %> + + <% end %> +
+ <%= render 'contact' %> \ No newline at end of file diff --git a/db/seeds/tpi/ascor_assessments.csv b/db/seeds/tpi/ascor_assessments.csv index a9f294d78..904cb4d41 100644 --- a/db/seeds/tpi/ascor_assessments.csv +++ b/db/seeds/tpi/ascor_assessments.csv @@ -1,8 +1,8 @@ -Id,Assessment Date,Publication Date,Country Id,Country,area EP.1,indicator EP.1.a,indicator EP.1.b,indicator EP.1.c,area EP.2,indicator EP.2.a,metric EP.2.a.i,indicator EP.2.b,metric EP.2.b.i,indicator EP.2.c,metric EP.2.c.i,indicator EP.2.d,metric EP.2.d.i,area EP.3,indicator EP.3.a,metric EP.3.a.i,indicator EP.3.b,indicator EP.3.c,area CP.1,indicator CP.1.a,indicator CP.1.b,area CP.2,indicator CP.2.a,indicator CP.2.b,metric CP.2.b.i,indicator CP.2.c,metric CP.2.c.i,area CP.3,indicator CP.3.a,metric CP.3.a.i,indicator CP.3.b,metric CP.3.b.i,metric CP.3.b.ii,indicator CP.3.c,metric CP.3.c.i,indicator CP.3.d,metric CP.3.d.i,metric CP.3.d.ii,area CP.4,indicator CP.4.a,indicator CP.4.b,metric CP.4.b.i,indicator CP.4.c,indicator CP.4.d,metric CP.4.d.i,indicator CP.4.e,metric CP.4.e.i,area CP.5,indicator CP.5.a,indicator CP.5.b,indicator CP.5.c,indicator CP.5.d,indicator CP.5.e,area CP.6,indicator CP.6.a,metric CP.6.a.i,indicator CP.6.b,indicator CP.6.c,indicator CP.6.d,area CF.1,indicator CF.1.a,metric CF.1.a.i,indicator CF.1.b,metric CF.1.b.i,area CF.2,indicator CF.2.a,indicator CF.2.b,area CF.3,indicator CF.3.a,indicator CF.3.b,area CF.4,metric CF.4.i,metric CF.4.ii,metric CF.4.iii,metric CF.4.iv,source indicator EP.1.a,source indicator EP.1.b,source indicator EP.1.c,source indicator EP.2.a,source metric EP.2.a.i,source indicator EP.2.b,source metric EP.2.b.i,source indicator EP.2.c,source metric EP.2.c.i,source indicator EP.2.d,source metric EP.2.d.i,source indicator EP.3.a,source metric EP.3.a.i,source indicator EP.3.b,source indicator EP.3.c,source indicator CP.1.a,source indicator CP.1.b,source indicator CP.2.a,source indicator CP.2.b,source metric CP.2.b.i,source indicator CP.2.c,source metric CP.2.c.i,source indicator CP.3.a,source metric CP.3.a.i,source indicator CP.3.b,source metric CP.3.b.i,source metric CP.3.b.ii,source indicator CP.3.c,source metric CP.3.c.i,source indicator CP.3.d,source metric CP.3.d.i,source metric CP.3.d.ii,source indicator CP.4.a,source indicator CP.4.b,source metric CP.4.b.i,source indicator CP.4.c,source indicator CP.4.d,source metric CP.4.d.i,source indicator CP.4.e,source metric CP.4.e.i,source indicator CP.5.a,source indicator CP.5.b,source indicator CP.5.c,source indicator CP.5.d,source indicator CP.5.e,source indicator CP.6.a,source metric CP.6.a.i,source indicator CP.6.b,source indicator CP.6.c,source indicator CP.6.d,source indicator CF.1.a,source metric CF.1.a.i,source indicator CF.1.b,source metric CF.1.b.i,source indicator CF.2.a,source indicator CF.2.b,source indicator CF.3.a,source indicator CF.3.b,source metric CF.4.i,source metric CF.4.ii,source metric CF.4.iii,source metric CF.4.iv,year metric EP.1.a.i,year metric EP.1.a.ii,year metric EP.2.a.i,year metric EP.2.b.i,year metric EP.2.c.i,year metric EP.2.d.i,year metric EP.3.a.i,year metric CP.2.b.i,year metric CP.2.c.i,year metric CP.3.a.i,year metric CP.3.b.i,year metric CP.3.b.ii,year metric CP.3.c.i,year metric CP.3.d.i,year metric CP.3.d.ii,year metric CP.4.b.i,year metric CP.4.d.i,year metric CP.4.e.i,year metric CP.6.a.i,year metric CF.1.a.i,year metric CF.1.b.i,year metric CF.4.i,year metric CF.4.ii,year metric CF.4.iii,year metric CF.4.iv, -,2023-10-31,2023-12,,United States,No,No,No,No,Partial,Yes,-38%,Yes,0%,No,43%,No,860%,Partial,Yes,2050,Yes,No,No,No,No,Partial,Yes,No,7%,No,$28.08,Partial,Yes,2022,No,0.097%,-3%,No,0.17%,No,0.61%,0.36%,Partial,No,No,4.21,No,Yes,39%,No,13%,Yes,Yes,Yes,Yes,Yes,Exempt,Partial,No,0.75,Yes,Yes,Yes,Partial,No,0.008%,Yes,0.040%,Exempt,Exempt,Exempt,Partial,Yes,No,Not applicable,4.54,3.49,0.05,0.55,,,,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf, ,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf,https://1p5ndc-pathways.climateanalytics.org/,https://1p5ndc-pathways.climateanalytics.org/, ,,https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf, ,,,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/,,https://carbonpricingdashboard.worldbank.org/map_data , ,https://carbonpricingdashboard.worldbank.org/map_data, ,https://icapcarbonaction.com/en/ets,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/ ,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/ , ,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://globalenergymonitor.org/projects/global-coal-mine-tracker/tracker-map/,https://data.worldbank.org/indicator/NY.GDP.COAL.RT.ZS , ,https://data.worldbank.org/indicator/NY.GDP.PETR.RT.ZS,https://data.worldbank.org/indicator/NY.GDP.NGAS.RT.ZS ,https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf,https://www.govinfo.gov/content/pkg/COMPS-845/pdf/COMPS-845.pdf ,https://data.worldbank.org/indicator/EG.EGY.PRIM.PP.KD,https://www.sec.gov/files/rules/proposed/2022/33-11042.pdf ,https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf,https://www.iea.org/data-and-statistics/data-tools/energy-statistics-data-browser?country=WORLD&fuel=Energy%20supply&indicator=ElecGenByFuel,https://data.worldbank.org/indicator/ER.LND.PTLD.ZS?locations=US,https://www.ibat-alliance.org/country_profiles/,https://www.epa.gov/climate-adaptation/climate-adaptation-plans,https://www.epa.gov/cira/past-reports,https://www.state.gov/wp-content/uploads/2022/10/state-2022-cap-1-1.pdf,https://www.undrr.org/media/84088/download?startDownload=true, ,,https://data.worldbank.org/indicator/VA.PER.RNK , ,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/12/08/executive-order-on-catalyzing-clean-energy-industries-and-jobs-through-federal-sustainability/ ,https://ww2.arb.ca.gov/sites/default/files/auction-proceeds/cci_annual_report_2023.pdf ,https://unfccc.int/BR5 ,https://unfccc.int/BR5,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf ,https://www.epa.gov/system/files/documents/2021-09/epa-climate-adaptation-plan-pdf-version.pdf,https://www.whitehouse.gov/wp-content/uploads/2022/03/budget_fy2023.pdf , ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,2021,,,,2023,2022,2021,2021,2021,2021,2021,2021,2021,2021,2022,2021,2020,2021,2023,2023,2023,2023, +Id,Assessment Date,Publication Date,Country Id,Country,area EP.1,indicator EP.1.a,indicator EP.1.b,indicator EP.1.c,area EP.2,indicator EP.2.a,metric EP.2.a.i,indicator EP.2.b,metric EP.2.b.i,indicator EP.2.c,metric EP.2.c.i,indicator EP.2.d,metric EP.2.d.i,area EP.3,indicator EP.3.a,metric EP.3.a.i,indicator EP.3.b,indicator EP.3.c,area CP.1,indicator CP.1.a,indicator CP.1.b,area CP.2,indicator CP.2.a,indicator CP.2.b,metric CP.2.b.i,indicator CP.2.c,metric CP.2.c.i,area CP.3,indicator CP.3.a,metric CP.3.a.i,indicator CP.3.b,metric CP.3.b.i,metric CP.3.b.ii,indicator CP.3.c,metric CP.3.c.i,indicator CP.3.d,metric CP.3.d.i,metric CP.3.d.ii,area CP.4,indicator CP.4.a,indicator CP.4.b,metric CP.4.b.i,indicator CP.4.c,indicator CP.4.d,metric CP.4.d.i,indicator CP.4.e,metric CP.4.e.i,area CP.5,indicator CP.5.a,indicator CP.5.b,indicator CP.5.c,indicator CP.5.d,indicator CP.5.e,area CP.6,indicator CP.6.a,metric CP.6.a.i,indicator CP.6.b,indicator CP.6.c,indicator CP.6.d,area CF.1,indicator CF.1.a,metric CF.1.a.i,indicator CF.1.b,metric CF.1.b.i,area CF.2,indicator CF.2.a,indicator CF.2.b,area CF.3,indicator CF.3.a,indicator CF.3.b,area CF.4,metric CF.4.i,metric CF.4.ii,metric CF.4.iii,metric CF.4.iv,source indicator EP.1.a,source indicator EP.1.b,source indicator EP.1.c,source indicator EP.2.a,source metric EP.2.a.i,source indicator EP.2.b,source metric EP.2.b.i,source indicator EP.2.c,source metric EP.2.c.i,source indicator EP.2.d,source metric EP.2.d.i,source indicator EP.3.a,source metric EP.3.a.i,source indicator EP.3.b,source indicator EP.3.c,source indicator CP.1.a,source indicator CP.1.b,source indicator CP.2.a,source indicator CP.2.b,source metric CP.2.b.i,source indicator CP.2.c,source metric CP.2.c.i,source indicator CP.3.a,source metric CP.3.a.i,source indicator CP.3.b,source metric CP.3.b.i,source metric CP.3.b.ii,source indicator CP.3.c,source metric CP.3.c.i,source indicator CP.3.d,source metric CP.3.d.i,source metric CP.3.d.ii,source indicator CP.4.a,source indicator CP.4.b,source metric CP.4.b.i,source indicator CP.4.c,source indicator CP.4.d,source metric CP.4.d.i,source indicator CP.4.e,source metric CP.4.e.i,source indicator CP.5.a,source indicator CP.5.b,source indicator CP.5.c,source indicator CP.5.d,source indicator CP.5.e,source indicator CP.6.a,source metric CP.6.a.i,source indicator CP.6.b,source indicator CP.6.c,source indicator CP.6.d,source indicator CF.1.a,source metric CF.1.a.i,source indicator CF.1.b,source metric CF.1.b.i,source indicator CF.2.a,source indicator CF.2.b,source indicator CF.3.a,source indicator CF.3.b,source metric CF.4.i,source metric CF.4.ii,source metric CF.4.iii,source metric CF.4.iv,year metric EP.1.a.i,year metric EP.1.a.ii,year metric EP.2.a.i,year metric EP.2.b.i,year metric EP.2.c.i,year metric EP.2.d.i,year metric EP.3.a.i,year metric CP.2.b.i,year metric CP.2.c.i,year metric CP.3.a.i,year metric CP.3.b.i,year metric CP.3.b.ii,year metric CP.3.c.i,year metric CP.3.d.i,year metric CP.3.d.ii,year metric CP.4.b.i,year metric CP.4.d.i,year metric CP.4.e.i,year metric CP.6.a.i,year metric CF.1.a.i,year metric CF.1.b.i,year metric CF.4.i,year metric CF.4.ii,year metric CF.4.iii,year metric CF.4.iv,Research notes +,2023-10-31,2023-12,,United States,No,No,No,No,Partial,Yes,-38%,Yes,0%,No,43%,No,860%,Partial,Yes,2050,Yes,No,No,No,No,Partial,Yes,No,7%,No,$28.08,Partial,Yes,2022,No,0.097%,-3%,No,0.17%,No,0.61%,0.36%,Partial,No,No,4.21,No,Yes,39%,No,13%,Yes,Yes,Yes,Yes,Yes,Exempt,Partial,No,0.75,Yes,Yes,Yes,Partial,No,0.008%,Yes,0.040%,Exempt,Exempt,Exempt,Partial,Yes,No,Not applicable,4.54,3.49,0.05,0.55,,,,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf, ,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf,https://1p5ndc-pathways.climateanalytics.org/,https://1p5ndc-pathways.climateanalytics.org/, ,,https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf, ,,,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/,,https://carbonpricingdashboard.worldbank.org/map_data , ,https://carbonpricingdashboard.worldbank.org/map_data, ,https://icapcarbonaction.com/en/ets,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/ ,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/01/27/executive-order-on-tackling-the-climate-crisis-at-home-and-abroad/ , ,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://globalenergymonitor.org/projects/global-coal-mine-tracker/tracker-map/,https://data.worldbank.org/indicator/NY.GDP.COAL.RT.ZS , ,https://data.worldbank.org/indicator/NY.GDP.PETR.RT.ZS,https://data.worldbank.org/indicator/NY.GDP.NGAS.RT.ZS ,https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf,https://www.govinfo.gov/content/pkg/COMPS-845/pdf/COMPS-845.pdf ,https://data.worldbank.org/indicator/EG.EGY.PRIM.PP.KD,https://www.sec.gov/files/rules/proposed/2022/33-11042.pdf ,https://www.whitehouse.gov/wp-content/uploads/2021/10/US-Long-Term-Strategy.pdf,https://www.iea.org/data-and-statistics/data-tools/energy-statistics-data-browser?country=WORLD&fuel=Energy%20supply&indicator=ElecGenByFuel,https://data.worldbank.org/indicator/ER.LND.PTLD.ZS?locations=US,https://www.ibat-alliance.org/country_profiles/,https://www.epa.gov/climate-adaptation/climate-adaptation-plans,https://www.epa.gov/cira/past-reports,https://www.state.gov/wp-content/uploads/2022/10/state-2022-cap-1-1.pdf,https://www.undrr.org/media/84088/download?startDownload=true, ,,https://data.worldbank.org/indicator/VA.PER.RNK , ,https://www.whitehouse.gov/briefing-room/presidential-actions/2021/12/08/executive-order-on-catalyzing-clean-energy-industries-and-jobs-through-federal-sustainability/ ,https://ww2.arb.ca.gov/sites/default/files/auction-proceeds/cci_annual_report_2023.pdf ,https://unfccc.int/BR5 ,https://unfccc.int/BR5,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/United%20States%20NDC%20April%2021%202021%20Final.pdf ,https://www.epa.gov/system/files/documents/2021-09/epa-climate-adaptation-plan-pdf-version.pdf,https://www.whitehouse.gov/wp-content/uploads/2022/03/budget_fy2023.pdf , ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,2021,,,,2023,2022,2021,2021,2021,2021,2021,2021,2021,2021,2022,2021,2020,2021,2023,2023,2023,2023,This are some random research notes ,2023-10-31,2023-12,,Japan,Partial,Yes,No,No,Partial,Yes,-33%,Yes,15%,No,71%,No,408%,Partial,Yes,2050,Yes,No,Yes,Yes,Yes,Partial,Yes,Yes,73%,No,$2.00,No,No,No or unsuitable disclosure ,No,0.126%,293%,No,0.00%,No,0.00%,0.01%,Partial,Yes,Yes,3.29,No,No,32%,Yes,30%,Yes,Yes,Yes,Yes,Yes,Exempt,No,No,0.84,No,No,No,Partial,Yes,0.209%,No,No or unsuitable disclosure ,Exempt,Exempt,Exempt,Partial,Yes,No,Not applicable,0.63,12.41,0,0.14,,,,https://unfccc.int/sites/default/files/NDC/2022-06/JAPAN_FIRST%20NDC%20%28UPDATED%20SUBMISSION%29.pdf, ,https://unfccc.int/sites/default/files/NDC/2022-06/JAPAN_FIRST%20NDC%20%28UPDATED%20SUBMISSION%29.pdf, ,,,,,https://unfccc.int/sites/default/files/NDC/2022-06/JAPAN_FIRST%20NDC%20%28UPDATED%20SUBMISSION%29.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/JAPAN_FIRST%20NDC%20%28UPDATED%20SUBMISSION%29.pdf, ,,https://www.japaneselawtranslation.go.jp/en/laws/view/4387,https://www.japaneselawtranslation.go.jp/en/laws/view/4387 ,https://climate-laws.org/geographies/japan/laws/act-partially-amending-the-law-on-special-tax-measures-tax-reform-act-2012-law-no-16-of-2012 , ,https://stats.oecd.org/Index.aspx?DataSetCode=ECR, ,https://carbonpricingdashboard.worldbank.org/map_data,https://www.meti.go.jp/information/g7hirosima/energy/pdf/G7MinistersCommunique2023.pdf , , ,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://globalenergymonitor.org/projects/global-coal-mine-tracker/tracker-map/,https://data.worldbank.org/indicator/NY.GDP.COAL.RT.ZS , ,https://data.worldbank.org/indicator/NY.GDP.PETR.RT.ZS,https://data.worldbank.org/indicator/NY.GDP.NGAS.RT.ZS ,https://unfccc.int/sites/default/files/NDC/2022-06/JAPAN_FIRST%20NDC%20%28UPDATED%20SUBMISSION%29.pdf,https://elaws.e-gov.go.jp/document?lawid=354AC0000000049 ,https://data.worldbank.org/indicator/EG.EGY.PRIM.PP.KD,https://www.fsa.go.jp/inter/etc/20211104/01.pdf ,https://www.meti.go.jp/information/g7hirosima/energy/pdf/G7MinistersCommunique2023.pdf ,https://www.iea.org/data-and-statistics/data-tools/energy-statistics-data-browser?country=WORLD&fuel=Energy%20supply&indicator=ElecGenByFuel,https://data.worldbank.org/indicator/ER.LND.PTLD.ZS?locations,https://www.ibat-alliance.org/country_profiles/,https://www.env.go.jp/content/900440195.pdf,https://www.env.go.jp/content/000047546.pdf,https://unfccc.int/sites/default/files/resource/2_Japan_July%202018_MOEJ%20Adaptation%20Overview%20REV.pdf,https://www.undrr.org/media/84088/download?startDownload=true, ,,https://data.worldbank.org/indicator/VA.PER.RNK ,https://www.enecho.meti.go.jp/category/others/basic_plan/pdf/20211022_01.pdf ,https://unfccc.int/sites/default/files/resource/Japan_LTS2021.pdf ,https://www.env.go.jp/content/900453366.pdf ,https://unfccc.int/BR5,https://unfccc.int/BR5,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/JAPAN_FIRST%20NDC%20%28UPDATED%20SUBMISSION%29.pdf,https://www.env.go.jp/content/900440195.pdf,https://www.env.go.jp/content/000143145.pdf , ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,,,,2021,2021,2023,,2021,2021,2021,2021,2021,2021,2021,2022,2021,2020,2021,2023,2023,2023,2023, ,2023-10-31,2023-12,,France,Partial,Yes,No,No,Partial,Yes,-23%,Yes,0%,No,65%,No,239%,Partial,Yes,2050,Yes,No,Yes,Yes,Yes,Partial,Yes,Yes,63%,No,$48.50,Partial,No,No or unsuitable disclosure,Yes,0.129%,10%,Yes,0.00%,Yes,0.01%,0.00%,Partial,No,Yes,3.23,Yes,No,91%,Yes,28%,Yes,Yes,Yes,Yes,Yes,Exempt,Partial,No,0.88,Yes,No,Yes,Partial,Yes,0.233%,No,0.201%,Exempt,Exempt,Exempt,Yes,Yes,Yes,Not applicable,0.68,6.65,No data,0,,,,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020.pdf, ,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020.pdf, ,,,,,https://www.strategie.gouv.fr/sites/strategie.gouv.fr/files/atoms/files/fs-the-value-for-climate-action-final-web.pdf, ,,,https://www.legifrance.gouv.fr/loda/id/JORFTEXT000039355955/,https://www.legifrance.gouv.fr/loda/id/JORFTEXT000039355955/,https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=celex%3A32003L0087, ,https://stats.oecd.org/Index.aspx?DataSetCode=ECR, ,https://carbonpricingdashboard.worldbank.org/map_data,https://energy.ec.europa.eu/system/files/2022-08/fr_final_necp_main_en.pdf , ,https://energy.ec.europa.eu/system/files/2022-08/fr_final_necp_main_en.pdf ,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.legifrance.gouv.fr/codes/id/LEGIARTI000045589503/2022-04-15/ ,https://data.worldbank.org/indicator/NY.GDP.COAL.RT.ZS ,https://www.legifrance.gouv.fr/codes/id/LEGIARTI000045589503/2022-04-15/ ,https://data.worldbank.org/indicator/NY.GDP.PETR.RT.ZS,https://data.worldbank.org/indicator/NY.GDP.NGAS.RT.ZS ,https://unfccc.int/sites/default/files/resource/en_SNBC-2_complete.pdf ,https://www.legifrance.gouv.fr/codes/section_lc/LEGITEXT000023983208/LEGISCTA000023985174/?anchor=LEGIARTI000047302125#LEGIARTI000047302125 ,https://data.worldbank.org/indicator/EG.EGY.PRIM.PP.KD,https://www.legifrance.gouv.fr/loda/id/JORFTEXT000031044385 ,https://unfccc.int/sites/default/files/resource/en_SNBC-2_complete.pdf ,https://www.iea.org/data-and-statistics/data-tools/energy-statistics-data-browser?country=WORLD&fuel=Energy%20supply&indicator=ElecGenByFuel,https://data.worldbank.org/indicator/ER.LND.PTLD.ZS ,https://www.ibat-alliance.org/country_profiles/,https://www.ecologie.gouv.fr/sites/default/files/2018.12.20_PNACC2.pdf,https://www.ecologie.gouv.fr/sites/default/files/ONERC_rapport_Climate%20change_Costs%20of%20impacts%20and%20lines%20of%20adaptation_ENG.pdf,https://www.ecologie.gouv.fr/sites/default/files/Evaluation%20%C3%A0%20mi-parcours%20du%20PNACC-2.pdf,https://www.undrr.org/media/84088/download?startDownload=true, ,,https://data.worldbank.org/indicator/VA.PER.RNK ,https://unfccc.int/sites/default/files/resource/en_SNBC-2_complete.pdf ,https://travail-emploi.gouv.fr/IMG/pdf/bilan-pic-mi-parcours.pdf ,https://data.consilium.europa.eu/doc/document/PE-11-2023-INIT/en/pdf ,https://unfccc.int/BR5,https://unfccc.int/BR5,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020_0.pdf ,https://www.ecologie.gouv.fr/sites/default/files/2018.12.20_PNACC2.pdf,https://www.budget.gouv.fr/documentation/file-download/19125 ,https://www.budget.gouv.fr/documentation/file-download/19125 ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,,,,,2021,2023,,2021,2021,2021,2021,2021,2021,2021,2022,2021,2020,2021,2023,2023,2023,2023, -,2023-10-31,2023-12,,Italy,Partial,Yes,No,No,Partial,Yes,-10%,Yes,0%,No,138%,No,314%,Partial,Yes,2050,Yes,No,No,No,No,Partial,Yes,No,36%,Yes,$83.10,Partial,Yes,2025,Yes,0.257%,2%,Not applicable,0.00%,No,0.08%,0.03%,Partial,No,Yes,2.48,No,No,42%,Yes,22%,Partial,Yes,No,No,Yes,Exempt,Partial,Yes,0.85,No,No,Yes,Partial,No,0.028%,Yes,0.061%,Exempt,Exempt,Exempt,No,No,No,Not applicable,1.75,20.78,0,0,,,,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020.pdf, ,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020.pdf, ,,,,,"https://ec.europa.eu/clima/sites/lts/lts_it_it.pdf +,2023-10-31,2023-12,,Italy,Partial,Yes,No,No,Partial,Yes,-10%,Yes,0%,No,138%,No,314%,Partial,Yes,2050,Yes,No,No,No,No,Partial,Yes,No,36%,Yes,$83.10,Partial,Yes,2025,Yes,0.257%,2%,Not applicable,0.00%,No,0.08%,0.03%,Partial,No,Yes,2.48,No,No,42%,Yes,22%,Partial,Yes,No,No,Yes,Exempt,Partial,Yes,0.85,No,No,Yes,Partial,No,0.028%,Yes,0.061%,Exempt,Exempt,Exempt,No,No,No,Not applicable,1.75,20.78,0,0,,,,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020.pdf, ,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020.pdf, ,,,,,"https://ec.europa.eu/clima/sites/lts/lts_it_it.pdf ", ,,,,,https://eur-lex.europa.eu/legal-content/EN/TXT/?uri=celex%3A32003L0087, ,https://stats.oecd.org/Index.aspx?DataSetCode=ECR, ,https://icapcarbonaction.com/en/ets,https://energy.ec.europa.eu/system/files/2020-02/it_final_necp_main_en_0.pdf,https://energy.ec.europa.eu/system/files/2020-02/it_final_necp_main_en_0.pdf,https://energy.ec.europa.eu/system/files/2020-02/it_final_necp_main_en_0.pdf,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://globalenergymonitor.org/projects/global-coal-mine-tracker/tracker-map/,https://data.worldbank.org/indicator/NY.GDP.COAL.RT.ZS , ,https://data.worldbank.org/indicator/NY.GDP.PETR.RT.ZS,https://data.worldbank.org/indicator/NY.GDP.NGAS.RT.ZS ,https://www.mase.gov.it/sites/default/files/archivio/allegati/PTE/PTE-definitivo.pdf ,https://www.normattiva.it/uri-res/N2Ls?urn:nir:stato:legge:2004-08-23;239 ,https://data.worldbank.org/indicator/EG.EGY.PRIM.PP.KD,https://www.gazzettaufficiale.it/eli/id/2017/01/10/17G00002/sg ,https://www.meti.go.jp/information/g7hirosima/energy/pdf/G7MinistersCommunique2023.pdf ,https://www.iea.org/data-and-statistics/data-tools/energy-statistics-data-browser?country=WORLD&fuel=Energy%20supply&indicator=ElecGenByFuel,https://data.worldbank.org/indicator/ER.LND.PTLD.ZS ,https://www.ibat-alliance.org/country_profiles/,https://www.mase.gov.it/sites/default/files/archivio/allegati/clima/PNACC_versione_dicembre2022.pdf,http://www.derris.eu/wp-content/uploads/2016/03/03-rapporto-sullo-stato-delle-conoscenze-scientifiche-su-impatti-vulnerabilita-ed-adattamento-ai-cambiamenti-climatici-in-italia.pdf,https://www.mase.gov.it/sites/default/files/archivio/allegati/sviluppo_sostenibile/report_ministero_MasterFile_FinalDraft_novembre2017.pdf,https://www.undrr.org/media/84088/download?startDownload=true, ,,https://data.worldbank.org/indicator/VA.PER.RNK ,https://www.mase.gov.it/sites/default/files/archivio/allegati/PTE/PTE-definitivo.pdf ,https://www.mase.gov.it/sites/default/files/archivio/allegati/PTE/PTE-definitivo.pdf ,https://data.consilium.europa.eu/doc/document/PE-11-2023-INIT/en/pdf ,https://unfccc.int/BR5,https://unfccc.int/BR5,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://webarchive.nationalarchives.gov.uk/ukgwa/20230401054904/https:/ukcop26.org/wp-content/uploads/2021/11/Table-of-climate-finance-commitments-November-2021.pdf,https://unfccc.int/sites/default/files/NDC/2022-06/EU_NDC_Submission_December%202020_0.pdf ,"https://unfccc.int/sites/default/files/resource/UNFCCC_Italy_2021.pdf, https://www.fao.org/faolex/results/details/en/c/LEX-FAOC149292/",https://www.rgs.mef.gov.it/_Documenti/VERSIONE-I/Attivit--i/Bilancio_di_previsione/Ecobilancio/2023/Ecobilancio-dello-Stato-2023.pdf ,https://www.oecd-ilibrary.org/sites/acf5d047-en/1/3/2/index.html?itemId=/content/publication/acf5d047-en&_csp_=3bdc5c1c30cb759d429453c611be28ba&itemIGO=oecd&itemContentType=book#section-d1e313 ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,,,,,2021,2022,2019,2021,2021,2021,2021,2021,2021,2021,2022,2021,2020,2021,2023,2023,2023,2023, ,2023-10-31,2023-12,,Egypt,No,No,No,No,No,No,46%,No,No or unsuitable disclosure ,No,113%,No,137%,No,No,No or unsuitable disclosure,Exempt,Exempt,No,No,No,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Partial,No,No,No,Yes,No,Partial,Yes,0.08,No,No,Exempt,Exempt,Exempt,Exempt,Exempt,Exempt,Yes,Yes,Yes,No,No,No,Not applicable,35.86,41.29,No data,5.03,,,,https://unfccc.int/sites/default/files/NDC/2023-06/Egypts%20Updated%20First%20Nationally%20Determined%20Contribution%202030%20%28Second%20Update%29.pdf, ,https://unfccc.int/sites/default/files/NDC/2023-06/Egypts%20Updated%20First%20Nationally%20Determined%20Contribution%202030%20%28Second%20Update%29.pdf, ,,,,,https://unfccc.int/sites/default/files/NDC/2023-06/Egypts%20Updated%20First%20Nationally%20Determined%20Contribution%202030%20%28Second%20Update%29.pdf, ,,,,,, , , ,,,,,,,,,,,,,,,,,,,,http://www.climasouth.eu/docs/Adaptation011%20StrategyEgypt.pdf, , ,https://www.undrr.org/media/84088/download?startDownload=true, ,,https://data.worldbank.org/indicator/VA.PER.RNK , ,https://www.eeaa.gov.eg/Uploads/Topics/Files/20221206130720583.pdf , ,,,,,https://unfccc.int/sites/default/files/NDC/2022-07/Egypt%20Updated%20NDC.pdf.pdf,https://cdn.climatepolicyradar.org/navigator/EGY/2022/egypt-national-climate-change-strategy-nccs-2050_5194e1cfe3cbca99042988f80ac7050d.pdf,https://mof.gov.eg/ar/posts/stateGeneralBudget/632850eabd2d6d000aad0585/%D9%85%D9%88%D8%A7%D8%B2%D9%86%D8%A9%20%D8%A7%D9%84%D9%85%D9%88%D8%A7%D8%B7%D9%86%20%22%D8%AD%D9%82%D9%83%20%D8%AA%D8%B9%D8%B1%D9%81%20%D9%85%D9%88%D8%A7%D8%B2%D9%86%D8%A9%20%D8%A8%D9%84%D8%AF%D9%83%22%20%D9%84%D8%B9%D8%A7%D9%85%202022%2023 ,https://assets.mof.gov.eg/files/2023-05/5b784cc0-ef31-11ed-8d15-9df60469d9ff.pdf ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,,,,,,,,,,,,,,,,2021,,,2023,2023,2023,2023, ,2023-10-31,2023-12,,Uruguay,Yes,Yes,No data,Yes,Partial,Yes,10%,No,No or unsuitable disclosure ,No data,No data,No,25%,Partial,Yes,2050,Yes,No,Partial,Yes,No,Partial,Yes,No,19%,Yes,$156.00,Partial,Yes,2015,Not applicable,0.000%,Not applicable,Not applicable,0.00%,No,0.01%,0.00%,Partial,No,Yes,2.91,No,No,94%,Yes,4%,Partial,Yes,No,No,Yes,Exempt,No,No,0.92,No,No,No,Exempt,Exempt,Exempt,Exempt,Exempt,No,No,No,No,No,No,Not applicable,2.11,0,No data,0,,,,https://unfccc.int/sites/default/files/NDC/2022-12/Uruguay%20Segunda%20CDN.pdf, , , ,,,,,https://unfccc.int/sites/default/files/resource/URY_LTS_Dec2021.pdf, ,,,https://www.impo.com.uy/bases/leyes/17283-2000, ,https://carbonpricingdashboard.worldbank.org/map_data, ,https://carbonpricingdashboard.worldbank.org/map_data, ,https://carbonpricingdashboard.worldbank.org/map_data,https://www.imf.org/en/Topics/climate-change/energy-subsidies,https://www.imf.org/en/Topics/climate-change/energy-subsidies, ,https://www.imf.org/en/Topics/climate-change/energy-subsidies, ,,https://data.worldbank.org/indicator/NY.GDP.COAL.RT.ZS , ,https://data.worldbank.org/indicator/NY.GDP.PETR.RT.ZS,https://data.worldbank.org/indicator/NY.GDP.NGAS.RT.ZS ,https://unfccc.int/sites/default/files/resource/URY_LTS_Dec2021.pdf ,https://www.impo.com.uy/bases/leyes/18597-2009 ,https://data.worldbank.org/indicator/EG.EGY.PRIM.PP.KD, ,https://unfccc.int/sites/default/files/resource/URY_LTS_Dec2021.pdf,https://www.iea.org/data-and-statistics/data-tools/energy-statistics-data-browser?country=WORLD&fuel=Energy%20supply&indicator=ElecGenByFuel, ,https://www.ibat-alliance.org/country_profiles?locale=en,https://cdn.climatepolicyradar.org/navigator/URY/2019/national-adaptation-plan-to-climate-variability-and-change-for-the-agriculture-sector_1ad0898ef13c1ca22c514b55b12e3ca9.pdf, ,https://visualizador.gobiernoabierto.gub.uy/visualizador/api/repos/%3Apublic%3Aorganismos%3Aambiente%3Avisualizador_cdn.wcdf/generatedContent, , ,,https://data.worldbank.org/indicator/VA.PER.RNK ,https://unfccc.int/sites/default/files/resource/URY_LTS_Dec2021.pdf ,https://unfccc.int/sites/default/files/resource/URY_LTS_Dec2021.pdf , ,,,,,https://unfccc.int/sites/default/files/NDC/2022-12/Uruguay%20Segunda%20CDN.pdf,https://unfccc.int/sites/default/files/NDC/2022-12/Uruguay%20Segunda%20CDN.pdf,https://transparenciapresupuestaria.opp.gub.uy/inicio/presupuesto-nacional,https://transparenciapresupuestaria.opp.gub.uy/inicio/objetivos-de-desarrollo-sostenible/v%C3%ADnculos-entre-ods-y-%C3%A1reas-program%C3%A1ticas-2020-2024 ,https://globalenergymonitor.org/projects/global-solar-power-tracker/ ,https://globalenergymonitor.org/projects/global-wind-power-tracker/ ,https://globalenergymonitor.org/projects/global-geothermal-power-tracker/ ,https://globalenergymonitor.org/projects/global-hydropower-tracker/ ,,, ,,,,,2023,2023,2021,2021,,2021,2021,2021,2020,2020,2022,2021,,,2023,2023,2023,2023, diff --git a/spec/commands/csv_data_upload_spec.rb b/spec/commands/csv_data_upload_spec.rb index 9967343b6..b8a1279f7 100644 --- a/spec/commands/csv_data_upload_spec.rb +++ b/spec/commands/csv_data_upload_spec.rb @@ -1622,7 +1622,7 @@ indicator_1 = assessment.results.joins(:indicator).find_by ascor_assessment_indicators: {code: 'EP.1.a'} indicator_2 = assessment.results.joins(:indicator).find_by ascor_assessment_indicators: {code: 'EP.1.a.i'} - expect(assessment.notes).to be_nil + expect(assessment.notes).to eq('Research notes') expect(assessment.publication_date).to eq(Date.new(2023, 12)) expect(assessment.assessment_date).to eq(Date.new(2023, 10, 30)) expect(indicator_1.answer).to eq('Yes') diff --git a/spec/support/fixtures/files/ascor_assessments.csv b/spec/support/fixtures/files/ascor_assessments.csv index 7824ee3ce..83707a02a 100644 --- a/spec/support/fixtures/files/ascor_assessments.csv +++ b/spec/support/fixtures/files/ascor_assessments.csv @@ -1,3 +1,3 @@ -Id,Assessment Date,Publication Date,Country Id,Country,area EP.1,indicator EP.1.a,indicator EP.1.b,indicator EP.1.c,source indicator EP.1.a,source metric EP.1.a.i,source metric EP.1.a.ii,source indicator EP.1.b,source indicator EP.1.c,year metric EP.1.a.i,year metric EP.1.a.ii -,10/30/23,2023-12,,United States,No,No,No,No,https://zenodo.org/record/7727475,,,https://1p5ndc-pathways.climateanalytics.org/,,, -,10/30/23,2023-12,,Japan,Partial,Yes,No,No,https://zenodo.org/record/7727476,,,https://1p5ndc-pathways.climateanalytics.org/,,2010, \ No newline at end of file +Id,Assessment Date,Publication Date,Country Id,Country,area EP.1,indicator EP.1.a,indicator EP.1.b,indicator EP.1.c,source indicator EP.1.a,source metric EP.1.a.i,source metric EP.1.a.ii,source indicator EP.1.b,source indicator EP.1.c,year metric EP.1.a.i,year metric EP.1.a.ii,Research notes +,10/30/23,2023-12,,United States,No,No,No,No,https://zenodo.org/record/7727475,,,https://1p5ndc-pathways.climateanalytics.org/,,,, +,10/30/23,2023-12,,Japan,Partial,Yes,No,No,https://zenodo.org/record/7727476,,,https://1p5ndc-pathways.climateanalytics.org/,,2010,,Research notes \ No newline at end of file