From 553348eaad869f6cffbb242e08d0f6767fff53b7 Mon Sep 17 00:00:00 2001
From: Bertocq <bertocq@gmail.com>
Date: Tue, 5 Sep 2017 16:18:36 +0200
Subject: [PATCH] Convert phase to symbol before comparision for active dates

---
 app/views/legislation/annotations/index.html.erb      | 2 +-
 app/views/legislation/annotations/show.html.erb       | 2 +-
 app/views/legislation/draft_versions/changes.html.erb | 2 +-
 app/views/legislation/draft_versions/show.html.erb    | 2 +-
 app/views/legislation/processes/_key_dates.html.erb   | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/legislation/annotations/index.html.erb b/app/views/legislation/annotations/index.html.erb
index cc67f9f2d..2b8e4d469 100644
--- a/app/views/legislation/annotations/index.html.erb
+++ b/app/views/legislation/annotations/index.html.erb
@@ -2,7 +2,7 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :small %>
 
-<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %>
+<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
 
 <div class="column row">
   <div class="draft-panels small-12 column row">
diff --git a/app/views/legislation/annotations/show.html.erb b/app/views/legislation/annotations/show.html.erb
index e85e7ea76..808474269 100644
--- a/app/views/legislation/annotations/show.html.erb
+++ b/app/views/legislation/annotations/show.html.erb
@@ -2,7 +2,7 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :small %>
 
-<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %>
+<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
 
 <div class="column row">
   <div class="draft-panels small-12 column row">
diff --git a/app/views/legislation/draft_versions/changes.html.erb b/app/views/legislation/draft_versions/changes.html.erb
index bb3a05d7e..dc6e0aa06 100644
--- a/app/views/legislation/draft_versions/changes.html.erb
+++ b/app/views/legislation/draft_versions/changes.html.erb
@@ -2,7 +2,7 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :small %>
 
-<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %>
+<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
 
 <div class="column row">
   <div class="draft-panels small-12 column row">
diff --git a/app/views/legislation/draft_versions/show.html.erb b/app/views/legislation/draft_versions/show.html.erb
index 754d02494..b3067049b 100644
--- a/app/views/legislation/draft_versions/show.html.erb
+++ b/app/views/legislation/draft_versions/show.html.erb
@@ -2,7 +2,7 @@
 
 <%= render 'legislation/processes/header', process: @process, header: :small %>
 
-<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations %>
+<%= render 'legislation/processes/key_dates', process: @process, phase: :allegations_phase %>
 
 <div class="column row">
   <div class="draft-panels small-12 column row">
diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb
index 9d8239039..f1198c2e3 100644
--- a/app/views/legislation/processes/_key_dates.html.erb
+++ b/app/views/legislation/processes/_key_dates.html.erb
@@ -6,7 +6,7 @@
 
         <ul>
           <% if process.debate_phase.enabled? %>
-            <li <%= 'class="active"' if phase == :debate_phase %>>
+            <li <%= 'class="active"' if phase.to_sym == :debate_phase %>>
               <%= link_to debate_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.debate_dates') %></h4>
                 <p><%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %></p>
@@ -15,7 +15,7 @@
           <% end %>
 
           <% if process.draft_publication.enabled? %>
-            <li <%= 'class="active"' if phase == :draft_publication %>>
+            <li <%= 'class="active"' if phase.to_sym == :draft_publication %>>
               <%= link_to draft_publication_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.draft_publication_date') %></h4>
                 <p><%= format_date(process.draft_publication_date) %></p>
@@ -24,7 +24,7 @@
           <% end %>
 
           <% if process.allegations_phase.enabled? %>
-            <li <%= 'class="active"' if phase == :allegations_phase %>>
+            <li <%= 'class="active"' if phase.to_sym == :allegations_phase %>>
               <%= link_to allegations_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.allegations_dates') %></h4>
                 <p><%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %></p>
@@ -33,7 +33,7 @@
           <% end %>
 
           <% if process.result_publication.enabled? %>
-            <li <%= 'class="active"' if phase == :result_publication %>>
+            <li <%= 'class="active"' if phase.to_sym == :result_publication %>>
               <%= link_to result_publication_legislation_process_path(process) do %>
                 <h4><%= t('legislation.processes.shared.result_publication_date') %></h4>
                 <p><%= format_date(process.result_publication_date) %></p>