Merge pull request #742 from citizensadvice/new-supplier-data-layout

chore/Add new CSR data

Author: KPobeeNorris

app/assets/stylesheets/components/_index.scss

@@ -9,4 +9,4 @@
 @import "./supplier-table-row";
 @import "./unranked-supplier";
 @import "./score-summary";
-@import "./other-scores";
+@import "./section-scores";

…tylesheets/components/_other-scores.scss …lesheets/components/_section-scores.scssapp/assets/stylesheets/components/_other-scores.scss renamed to app/assets/stylesheets/components/_section-scores.scss app/assets/stylesheets/components/_other-scores.scss renamed to app/assets/stylesheets/components/_section-scores.scss

@@ -1,4 +1,4 @@
-.other-scores {
+.section-scores, .other-scores {
   margin-bottom: $cads-spacing-7;
 
   h2 {

app/components/csr_table/billing_and_metering_scores_component.html.haml

@@ -0,0 +1,9 @@
+.cads-grid-row
+  .cads-grid-col-md-9
+    .section-scores
+      %h2 Billing and metering
+      .cads-prose
+        %p
+          We measure billing accuracy by looking at how many bills are based on a meter reading, rather than an estimate.
+      = render CsrTable::DescriptionListComponent.new do |c|
+        - c.with_descriptions(descriptions)

app/components/csr_table/billing_and_metering_scores_component.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module CsrTable
+  class BillingAndMeteringScoresComponent < ViewComponent::Base
+    attr_reader :supplier, :renderer
+
+    def initialize(supplier)
+      super()
+      @supplier = supplier
+      @renderer = Renderers::RichTextRenderer.new
+    end
+
+    def render?
+      supplier.present?
+    end
+
+    def descriptions
+      [
+        bills_accuracy_smart,
+        bills_accuracy_traditional,
+        smart_operating
+      ]
+    end
+
+    def bills_accuracy_smart
+      {
+        term: content_tag(:p, "Bills accuracy (smart meters) "),
+        description: content_tag(:p, "#{supplier.bills_accuracy_smart}%")
+      }
+    end
+
+    def bills_accuracy_traditional
+      {
+        term: content_tag(:p, "Bills accuracy (traditional meters)"),
+        description: content_tag(:p, "#{supplier.bills_accuracy_traditional}%")
+      }
+    end
+
+    def smart_operating
+      {
+        term: content_tag(:p, "Smart meters working correctly"),
+        description: content_tag(:p, "#{supplier.smart_operating}%")
+      }
+    end
+  end
+end

app/components/csr_table/complaints_scores_component.html.haml

@@ -0,0 +1,9 @@
+.cads-grid-row
+  .cads-grid-col-md-9
+    .section-scores
+      %h2 Complaints received
+      .cads-prose
+        %p
+          If a supplier gets a low number of complaints, we give them a higher star rating.
+      = render CsrTable::DescriptionListComponent.new do |c|
+        - c.with_descriptions(descriptions)

app/components/csr_table/complaints_scores_component.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module CsrTable
+  class ComplaintsScoresComponent < ViewComponent::Base
+    attr_reader :supplier, :renderer
+
+    def initialize(supplier)
+      super()
+      @supplier = supplier
+      @renderer = Renderers::RichTextRenderer.new
+    end
+
+    def render?
+      supplier.present?
+    end
+
+    def descriptions
+      [
+        {
+          term: content_tag(:p, "Complaints to Citizens Advice, Advice Direct Scotland and the Energy Ombudsman"),
+          description: content_tag(:p, "#{supplier.complaints_number} per 10,000 customers")
+        }
+      ]
+    end
+  end
+end

app/controllers/queries/supplier_detail.rb

@@ -32,6 +32,9 @@ module Queries
         overallRating,
         dataAvailable,
         billAccuracyAndMeteringRating,
+        billsAccuracySmart,
+        billsAccuracyTraditional,
+        smartOperating,
         guaranteeList {
           json
         },

app/models/supplier.rb

@@ -10,7 +10,9 @@ class Supplier
            :contact_social_media, :contact_time, :contact_info,
            :other_contact_info, :billing_info, :guarantee_rating,
            :guarantee_list, :overall_rating, :data_available, :fuel_mix,
-           :opening_hours, :bill_accuracy_and_metering_rating, to: :data
+           :opening_hours, :bill_accuracy_and_metering_rating,
+           :bills_accuracy_smart, :bills_accuracy_traditional,
+           :smart_operating, to: :data
 
   def self.fetch_all
     response = Contentful::Graphql::Client.query(Queries::Suppliers)

app/views/csr_table/suppliers/show.html.haml

@@ -24,11 +24,23 @@
     %p
       = link_to("Check the full table to compare more energy suppliers' customer service", suppliers_path(country: current_country))
 
-  = render CsrTable::OtherScoresComponent.new(supplier)
-
-  .cads-prose
-    %p
-      = link_to("Find out how the scores are worked out", country_url("/consumer/energy/energy-supply/get-a-better-energy-deal/compare-domestic-energy-suppliers-customer-service1/how-the-scores-are-worked-out/"))
+  - if Feature.enabled?("FF_NEW_CSR_DATA")
+    .cads-prose
+      %h2
+        More information
+      %p
+        We give energy suppliers a score out of 5 for each category, based on various data. You can look at this data in more detail below.
+      %p
+        = link_to("Find out how the scores are worked out", country_url("/consumer/energy/energy-supply/get-a-better-energy-deal/compare-domestic-energy-suppliers-customer-service1/how-the-scores-are-worked-out/"))
+    = render CsrTable::ComplaintsScoresComponent.new(supplier)
+    = render CsrTable::BillingAndMeteringScoresComponent.new(supplier)
+
+  - else
+    = render CsrTable::OtherScoresComponent.new(supplier)
+
+    .cads-prose
+      %p
+        = link_to("Find out how the scores are worked out", country_url("/consumer/energy/energy-supply/get-a-better-energy-deal/compare-domestic-energy-suppliers-customer-service1/how-the-scores-are-worked-out/"))
 
   = render CsrTable::FuelMixComponent.new(supplier)