consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moves draft and final result publication dates from tabs to sidebar

Browse Source
This commit is contained in:
decabeza
2019-01-10 14:25:33 +01:00
parent 73637de0d0
commit 9dfbeed140
3 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/views/legislation/processes/_header.html.erb
View File

@@ -34,6 +34,30 @@
url: legislation_process_url(@process), url: legislation_process_url(@process),
description: @process.title description: @process.title
} %> } %>
<% if process.draft_publication.enabled? %>
<div class="sidebar-divider"></div>
<p class="sidebar-title">
<%= t("legislation.processes.shared.draft_publication_date") %>
</p>
<p>
<%= link_to draft_publication_legislation_process_path(@process) do %>
<strong><%= format_date(process.draft_publication_date) %></strong>
<% end %>
</p>
<% end %>
<% if process.result_publication.enabled? %>
<div class="sidebar-divider"></div>
<p class="sidebar-title">
<%= t("legislation.processes.shared.result_publication_date") %>
</p>
<p>
<%= link_to result_publication_legislation_process_path(@process) do %>
<strong><%= format_date(process.result_publication_date) %></strong>
<% end %>
</p>
<% end %>
</aside> </aside>
</div> </div>
</div> </div>

18
app/views/legislation/processes/_key_dates.html.erb
View File

@@ -33,15 +33,6 @@
</li> </li>
<% end %> <% end %>
<% if process.draft_publication.enabled? %>
<li <%= 'class=is-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>
<span><%= format_date(process.draft_publication_date) %></span>
<% end %>
</li>
<% end %>
<% if process.allegations_phase.enabled? %> <% if process.allegations_phase.enabled? %>
<li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>> <li <%= 'class=is-active' if phase.to_sym == :allegations_phase %>>
<%= link_to allegations_legislation_process_path(process) do %> <%= link_to allegations_legislation_process_path(process) do %>
@@ -51,15 +42,6 @@
</li> </li>
<% end %> <% end %>
<% if process.result_publication.enabled? %>
<li <%= 'class=is-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>
<span><%= format_date(process.result_publication_date) %></span>
<% end %>
</li>
<% end %>
<% if process.milestones.any? %> <% if process.milestones.any? %>
<li class="milestones <%= "is-active" if phase == :milestones %>"> <li class="milestones <%= "is-active" if phase == :milestones %>">
<%= link_to milestones_legislation_process_path(process) do %> <%= link_to milestones_legislation_process_path(process) do %>

28
spec/features/legislation/processes_spec.rb
View File

@@ -152,8 +152,7 @@ feature 'Legislation' do
scenario 'show view has document present on all phases' do scenario 'show view has document present on all phases' do
process = create(:legislation_process) process = create(:legislation_process)
document = create(:document, documentable: process) document = create(:document, documentable: process)
phases = ["Debate", "Proposals", "Draft publication", phases = ["Debate", "Proposals", "Comments"]
"Comments", "Final result publication"]
visit legislation_process_path(process) visit legislation_process_path(process)
@@ -166,6 +165,31 @@ feature 'Legislation' do
end end
end end
scenario 'show draft publication and final result publication dates' do
process = create(:legislation_process, draft_publication_date: Date.new(2019, 01, 10),
result_publication_date: Date.new(2019, 01, 20))
visit legislation_process_path(process)
within("aside") do
expect(page).to have_content("Draft publication")
expect(page).to have_content("10 Jan 2019")
expect(page).to have_content("Final result publication")
expect(page).to have_content("20 Jan 2019")
end
end
scenario 'do not show draft publication and final result publication dates if are empty' do
process = create(:legislation_process, :empty)
visit legislation_process_path(process)
within("aside") do
expect(page).not_to have_content("Draft publication")
expect(page).not_to have_content("Final result publication")
end
end
scenario 'show additional info button' do scenario 'show additional info button' do
process = create(:legislation_process, additional_info: "Text for additional info of the process") process = create(:legislation_process, additional_info: "Text for additional info of the process")