CP changes: change date picker

Author: mountolive

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

@@ -251,47 +251,24 @@
 
   <% if @company_presenter.cp_assessments.any? %>
     <section id="carbon-performance" class="carbon-performance container">
+      <% subsector_assessments = @company.company_subsectors.any? ? @company_presenter.cp_assessments.group_by(&:subsector_name) : {} %>
+      <% active_subsector = @company.company_subsectors.any? ? (params[:subsector_type] || @cp_assessment&.subsector_name || @company.company_subsectors.first.subsector) : nil %>
+
       <div class="management-quality__header">
         <h4>
           Carbon Performance <%= @company.name %>
         </h4>
         <p class="is-hidden-desktop"><%= "Carbon Performance alignment of companies in the #{@company.name} sector with the Paris agreement benchmarks." %></p>
 
-        <% if @company.company_subsectors.any? %>
-          <% subsector_assessments = @company_presenter.cp_assessments.group_by(&:subsector_name) %>
-          <% active_subsector = params[:subsector_type] || @cp_assessment&.subsector_name || @company.company_subsectors.first.subsector %>
-          <div class="buttons has-addons" style="margin-bottom: 0.5rem;">
-            <% @company.company_subsectors.each do |cs| %>
-              <% has_data = subsector_assessments[cs.subsector].present? %>
-              <% if has_data %>
-                <% first_assessment_id = subsector_assessments[cs.subsector].first.id %>
-                <%= link_to cs.subsector, cp_assessment_tpi_company_path(@company, cp_assessment_id: first_assessment_id),
-                  remote: true,
-                  class: "button #{active_subsector == cs.subsector ? 'is-primary' : 'is-secondary'}" %>
-              <% else %>
-                <span class="button is-secondary" style="opacity: 0.5; cursor: not-allowed;" title="No data available">
-                  <%= cs.subsector %>
-                </span>
-              <% end %>
-            <% end %>
-          </div>
-          <% if @cp_assessment&.subsector_name.present? %>
-            <p style="font-size: 0.9rem; margin-bottom: 1rem;">
-              The graph shows the company's pathway and the relevant benchmarks for <%= @cp_assessment.subsector_name.downcase %>.
-            </p>
-          <% end %>
-        <% end %>
-
         <div>
           <div class="show-by-dropdown assessment-date__container">
             <div class="caption">
               Assessment Date:
             </div>
 
-            <% active_subsector_type = active_subsector if @company.company_subsectors.any? %>
             <% cp_dropdown_assessments = @company_presenter.cp_assessments.select do |v|
-              if active_subsector_type.present?
-                v.subsector_name == active_subsector_type
+              if active_subsector.present?
+                v.subsector_name == active_subsector
               else
                 true
               end
@@ -316,6 +293,29 @@
         </div>
       </div>
 
+      <% if @company.company_subsectors.any? %>
+        <div class="buttons has-addons" style="margin-top: 1rem; margin-bottom: 0.5rem;">
+          <% @company.company_subsectors.each do |cs| %>
+            <% has_data = subsector_assessments[cs.subsector].present? %>
+            <% if has_data %>
+              <% first_assessment_id = subsector_assessments[cs.subsector].first.id %>
+              <%= link_to cs.subsector, cp_assessment_tpi_company_path(@company, cp_assessment_id: first_assessment_id),
+                remote: true,
+                class: "button #{active_subsector == cs.subsector ? 'is-primary' : 'is-secondary'}" %>
+            <% else %>
+              <span class="button is-secondary" style="opacity: 0.5; cursor: not-allowed;" title="No data available">
+                <%= cs.subsector %>
+              </span>
+            <% end %>
+          <% end %>
+        </div>
+        <% if @cp_assessment&.subsector_name.present? %>
+          <p style="font-size: 0.9rem; margin-bottom: 1rem;">
+            The graph shows the company's pathway and the relevant benchmarks for <%= @cp_assessment.subsector_name.downcase %>.
+          </p>
+        <% end %>
+      <% end %>
+
       <div id="cp-assessment">
         <%= render partial: 'cp_assessment', locals: { assessment: @cp_assessment } %>
       </div>