CP Changes 2: addendum 2

Author: mountolive

app/assets/stylesheets/tpi/pages/company.scss

@@ -524,6 +524,14 @@
       }
     }
 
+    &__metric-label {
+      font-size: 14px;
+      color: #666666;
+      margin-bottom: 0.75rem;
+      font-weight: 500;
+      text-align: center;
+    }
+
     &__assumptions {
       padding: 15px 30px;
 

app/services/api/charts/cp_assessment.rb

@@ -66,9 +66,9 @@ def emissions_data
       # ]
       def emissions_data_from_assessment
         data = if assessment&.emissions&.size == 1
-                 data_with_marker_settings
+                 format_emissions_data_with_marker_settings(assessment&.emissions)
                else
-                 assessment&.emissions&.transform_keys(&:to_i)
+                 format_emissions_data(assessment&.emissions || {})
                end
         {
           name: company_series_name,
@@ -82,18 +82,6 @@ def emissions_data_from_assessment
         }
       end
 
-      def data_with_marker_settings
-        [{
-          y: assessment&.emissions&.first&.second,
-          x: assessment&.emissions&.first&.first&.to_i,
-          marker: {
-            symbol: 'circle',
-            enabled: true,
-            radius: 3
-          }
-        }]
-      end
-
       def years_with_targets
         return unless assessment&.years_with_targets&.any?
         return unless assessment&.emissions&.any?
@@ -151,11 +139,31 @@ def emissions_data_from_sector_benchmarks
               name: benchmark.scenario,
               sector: sector.name,
               subsector: benchmark.subsector,
-              data: benchmark.emissions.transform_keys(&:to_i)
+              data: format_emissions_data(benchmark.emissions)
             }
           end.reverse
       end
 
+      def format_emissions_data(emissions_hash)
+        emissions_hash.transform_keys(&:to_i).transform_values do |value|
+          value.present? ? value.round(2) : nil
+        end
+      end
+
+      def format_emissions_data_with_marker_settings(emissions_hash)
+        value = emissions_hash.first&.second
+
+        [{
+          y: value.present? ? value.round(2) : nil,
+          x: emissions_hash.first&.first&.to_i,
+          marker: {
+            symbol: 'circle',
+            enabled: true,
+            radius: 3
+          }
+        }]
+      end
+
       def sector_benchmarks_for_chart
         selected_region = regional_view? ? assessment.region : nil
         match_key = assessment.subsector_name

app/views/tpi/companies/_cp_assessment.html.erb

@@ -7,11 +7,18 @@
 <% end %>
 
 <% if assessment.emissions.any?  %>
+  <% if assessment.company.sector.name == 'Chemicals' %>
+    <div class="carbon-performance__metric-label">
+      Emissions intensity (tCO2e/US$1,000 (2019))
+    </div>
+  <% end %>
+
   <%= react_component('charts/cp-performance', {
     dataUrl: emissions_chart_data_tpi_company_path(assessment.company, cp_assessment_id: assessment.id, view: params[:view]),
     unit: assessment.unit,
     companySelector: false,
-    sectorUrl: tpi_sector_path(assessment.company.sector.slug)
+    sectorUrl: tpi_sector_path(assessment.company.sector.slug),
+    sectorName: assessment.company.sector.name
     }) %>
 <% else %>
   <div class="notification" style="text-align: center; padding: 2rem; color: #6b7280; font-style: italic;">

spec/services/api/charts/cp_assessment_spec.rb

@@ -329,4 +329,40 @@
       end
     end
   end
+
+  describe 'decimal formatting' do
+    let(:sector) { create(:tpi_sector, name: 'Test Sector', categories: %w[Company]) }
+    let(:company) { create(:company, :published, sector: sector) }
+    let!(:benchmark) do
+      create(:cp_benchmark,
+             sector: sector,
+             category: 'Company',
+             scenario: '1.5 Degrees',
+             release_date: 6.months.ago,
+             emissions: {'2020' => 123.456789, '2021' => 456.789012})
+    end
+    let(:assessment) do
+      create(:cp_assessment,
+             sector: sector,
+             cp_assessmentable: company,
+             publication_date: 3.months.ago,
+             assessment_date: 3.months.ago,
+             last_reported_year: 2021,
+             emissions: {'2020' => 100.123456, '2021' => 200.987654})
+    end
+
+    subject { described_class.new(assessment, 'global') }
+
+    it 'formats benchmark emissions to 2 decimal places' do
+      benchmark_data = subject.emissions_data.find { |s| s[:type] == 'area' }[:data]
+      expect(benchmark_data[2020]).to eq(123.46)
+      expect(benchmark_data[2021]).to eq(456.79)
+    end
+
+    it 'formats company emissions to 2 decimal places' do
+      company_data = subject.emissions_data.find { |s| s[:name] == company.name }[:data]
+      expect(company_data[2020]).to eq(100.12)
+      expect(company_data[2021]).to eq(200.99)
+    end
+  end
 end