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

Rename legislation process final_version_publication phase name to more descriptive result_publication

Browse Source
This commit is contained in:
Bertocq
2017-06-13 19:59:49 +02:00
parent edee908fc1
commit e55328caf4
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/legislation/processes_controller.rb
View File

@@ -55,8 +55,8 @@ class Legislation::ProcessesController < Legislation::BaseController
end
end
def final_version_publication
phase :final_version_publication
def result_publication
phase :result_publication
if @process.show_phase?(@phase)
if final_version = @process.final_draft_version

2
app/models/abilities/everyone.rb
View File

@@ -19,7 +19,7 @@ module Abilities
can [:read, :print], Budget::Investment
can :read_results, Budget, phase: "finished"
can :new, DirectMessage
can [:read, :debate, :draft_publication, :allegations, :final_version_publication], Legislation::Process
can [:read, :debate, :draft_publication, :allegations, :result_publication], Legislation::Process
can [:read, :changes, :go_to_version], Legislation::DraftVersion
can [:read], Legislation::Question
can [:create], Legislation::Answer

10
app/models/legislation/process.rb
View File

@@ -29,8 +29,8 @@ class Legislation::Process < ActiveRecord::Base
active_phase?(:draft_publication) && today >= draft_publication_date
when :allegations
active_phase?(:allegations) && today >= allegations_start_date && today <= allegations_end_date
when :final_version_publication
active_phase?(:final_version_publication) && today >= final_publication_date
when :result_publication
active_phase?(:result_publication) && today >= final_publication_date
end
end
@@ -45,8 +45,8 @@ class Legislation::Process < ActiveRecord::Base
active_phase?(:draft_publication) && today >= draft_publication_date
when :allegations
active_phase?(:allegations) && today >= allegations_start_date
when :final_version_publication
active_phase?(:final_version_publication) && today >= final_publication_date
when :result_publication
active_phase?(:result_publication) && today >= final_publication_date
end
end
@@ -58,7 +58,7 @@ class Legislation::Process < ActiveRecord::Base
draft_publication_date.present?
when :allegations
allegations_start_date.present? && allegations_end_date.present?
when :final_version_publication
when :result_publication
final_publication_date.present?
end
end

4
app/views/admin/legislation/processes/_form.html.erb
View File

@@ -145,8 +145,8 @@
id: "result_publication_date" %>
</div>
<div class="small-12 medium-2 column">
<%= check_box_tag :final_version_publication_phase_active, @process.active_phase?(:final_version_publication), @process.new_record? || @process.active_phase?(:final_version_publication), data: {disable_date: "final_publication"} %>
<%= label_tag :final_version_publication_phase_active, t('admin.legislation.processes.form.active') %>
<%= check_box_tag :result_publication_phase_active, @process.active_phase?(:result_publication), @process.new_record? || @process.active_phase?(:result_publication), data: {disable_date: "final_publication"} %>
<%= label_tag :result_publication_phase_active, t('admin.legislation.processes.form.active') %>
</div>
<div class="small-12 column">
<hr>

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

@@ -34,9 +34,9 @@
</li>
<% end %>
<% if process.active_phase?(:final_version_publication) %>
<li <%= "class=active" if phase == :final_version_publication %>>
<%= link_to legislation_process_final_version_publication_path(process) do %>
<% if process.active_phase?(:result_publication) %>
<li <%= "class=active" if phase == :result_publication %>>
<%= link_to legislation_process_result_publication_path(process) do %>
<h4><%= t('legislation.processes.shared.result_publication_date') %></h4>
<p><%= format_date(process.result_publication_date) %></p>
<% end %>

2
config/routes.rb
View File

@@ -112,7 +112,7 @@ Rails.application.routes.draw do
get :debate
get :draft_publication
get :allegations
get :final_version_publication
get :result_publication
resources :questions, only: [:show] do
resources :answers, only: [:create]
end

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

@@ -106,7 +106,7 @@ feature 'Legislation' do
scenario 'not open' do
process = create(:legislation_process, result_publication_date: Date.current + 1.day)
visit legislation_process_final_version_publication_path(process)
visit legislation_process_result_publication_path(process)
expect(page).to have_content("This phase is not open yet")
end
@@ -114,7 +114,7 @@ feature 'Legislation' do
scenario 'open' do
process = create(:legislation_process, result_publication_date: Date.current)
visit legislation_process_final_version_publication_path(process)
visit legislation_process_result_publication_path(process)
expect(page).to have_content("Nothing published yet")
end

12
spec/models/legislation/process_spec.rb
View File

@@ -155,15 +155,15 @@ RSpec.describe Legislation::Process, type: :model do
it "checks final version publication phase" do
# future
process.update_attributes(result_publication_date: Date.current + 2.days)
expect(process.open_phase?(:final_version_publication)).to be false
expect(process.open_phase?(:result_publication)).to be false
# past
process.update_attributes(result_publication_date: Date.current - 2.days)
expect(process.open_phase?(:final_version_publication)).to be true
expect(process.open_phase?(:result_publication)).to be true
# starts today
process.update_attributes(result_publication_date: Date.current)
expect(process.open_phase?(:final_version_publication)).to be true
expect(process.open_phase?(:result_publication)).to be true
end
end
@@ -221,15 +221,15 @@ RSpec.describe Legislation::Process, type: :model do
it "checks final version publication phase" do
# future
process.update_attributes(result_publication_date: Date.current + 2.days)
expect(process.show_phase?(:final_version_publication)).to be false
expect(process.show_phase?(:result_publication)).to be false
# past
process.update_attributes(result_publication_date: Date.current - 2.days)
expect(process.show_phase?(:final_version_publication)).to be true
expect(process.show_phase?(:result_publication)).to be true
# starts today
process.update_attributes(result_publication_date: Date.current)
expect(process.show_phase?(:final_version_publication)).to be true
expect(process.show_phase?(:result_publication)).to be true
end
end