diff --git a/app/controllers/legislation/processes_controller.rb b/app/controllers/legislation/processes_controller.rb
index af1ab147a..05b7fbeae 100644
--- a/app/controllers/legislation/processes_controller.rb
+++ b/app/controllers/legislation/processes_controller.rb
@@ -9,4 +9,24 @@ class Legislation::ProcessesController < Legislation::BaseController
def show
end
+
+ def draft_publication
+ phase :draft_publication
+ end
+
+ def allegations
+ phase :allegations
+ end
+
+ def final_version_publication
+ phase :final_version_publication
+ end
+
+ private
+
+ def phase(phase)
+ @process = ::Legislation::Process.find(params[:process_id])
+ @phase = phase
+ render :phase
+ end
end
diff --git a/app/controllers/legislation/questions_controller.rb b/app/controllers/legislation/questions_controller.rb
new file mode 100644
index 000000000..01653fca3
--- /dev/null
+++ b/app/controllers/legislation/questions_controller.rb
@@ -0,0 +1,7 @@
+class Legislation::QuestionsController < Legislation::BaseController
+ load_and_authorize_resource :process
+ load_and_authorize_resource :question, through: :process
+
+ def show
+ end
+end
diff --git a/app/helpers/legislation_helper.rb b/app/helpers/legislation_helper.rb
index 790e21a5b..6b5fcbe87 100644
--- a/app/helpers/legislation_helper.rb
+++ b/app/helpers/legislation_helper.rb
@@ -1,5 +1,5 @@
module LegislationHelper
def format_date(date)
- l(date, format: "%d %b %Y")
+ l(date, format: "%d %b %Y") if date
end
end
diff --git a/app/models/abilities/everyone.rb b/app/models/abilities/everyone.rb
index 88eccd00a..9569ebf53 100644
--- a/app/models/abilities/everyone.rb
+++ b/app/models/abilities/everyone.rb
@@ -11,7 +11,7 @@ module Abilities
can :read, User
can [:search, :read], Annotation
can :new, DirectMessage
- can [:read], Legislation::Process
+ can [:read, :draft_version_publication, :allegations, :final_version_publication], Legislation::Process
can [:read], Legislation::DraftVersion
end
end
diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb
index ac303b37d..dbc31c7b3 100644
--- a/app/models/legislation/process.rb
+++ b/app/models/legislation/process.rb
@@ -3,6 +3,7 @@ class Legislation::Process < ActiveRecord::Base
include ActsAsParanoidAliases
has_many :draft_versions, class_name: 'Legislation::DraftVersion', foreign_key: 'legislation_process_id'
+ has_one :final_draft_version, -> { where final_version: true }, class_name: 'Legislation::DraftVersion', foreign_key: 'legislation_process_id'
has_many :questions, class_name: 'Legislation::Question', foreign_key: 'legislation_process_id'
validates :title, presence: true
@@ -18,7 +19,38 @@ class Legislation::Process < ActiveRecord::Base
validates :allegations_end_date, presence: true
validates :final_publication_date, presence: true
- scope :open, -> {where("start_date <= ? and end_date >= ?", Time.current, Time.current) }
- scope :next, -> {where("start_date > ?", Time.current) }
- scope :past, -> {where("end_date < ?", Time.current) }
+ scope :open, -> {where("start_date <= ? and end_date >= ?", Date.current, Date.current) }
+ scope :next, -> {where("start_date > ?", Date.current) }
+ scope :past, -> {where("end_date < ?", Date.current) }
+
+ def open_phase?(phase)
+ today = Date.current
+
+ case phase
+ when :debate
+ today >= debate_start_date && today <= debate_end_date
+ when :draft_publication
+ today >= draft_publication_date
+ when :allegations
+ today >= allegations_start_date && today <= allegations_end_date
+ when :final_version_publication
+ today >= final_publication_date
+ end
+ end
+
+ def show_phase?(phase)
+ # show past phases even if they're finished
+ today = Date.current
+
+ case phase
+ when :debate
+ today >= debate_start_date
+ when :draft_publication
+ today >= draft_publication_date
+ when :allegations
+ today >= allegations_start_date
+ when :final_version_publication
+ today >= final_publication_date
+ end
+ end
end
diff --git a/app/views/legislation/processes/_debate.html.erb b/app/views/legislation/processes/_debate.html.erb
new file mode 100644
index 000000000..6bdfc26a0
--- /dev/null
+++ b/app/views/legislation/processes/_debate.html.erb
@@ -0,0 +1,14 @@
+
+
+ <% if process.questions.empty? %>
+
<%= t('.empty_questions') %>
+ <% else %>
+ <%= render process.questions %>
+ <% end %>
+
+
+
<%= t('.participate') %>
+
+
+
+
<%= t('.title') %>
+
+ <%= process.title %>
+
+
+
+
+
+
+
+
<%= t('.description') %>
+ <%= markdown process.description %>
+
+
+
<%= t('.target') %>
+ <%= markdown process.target %>
+
+
+
<%= t('.how_to_participate') %>
+ <%= markdown process.how_to_participate %>
+
+
+
+
+
+ <% process.draft_versions.each do |draft_version| %>
+ - <%= link_to draft_version.title, legislation_process_draft_version_path(process, draft_version) %>
+ <% end %>
+
+<% else %>
+ <%= t('.empty') %>
+<% end %>
diff --git a/app/views/legislation/processes/_phase_draft_publication.html.erb b/app/views/legislation/processes/_phase_draft_publication.html.erb
new file mode 100644
index 000000000..be31ddf43
--- /dev/null
+++ b/app/views/legislation/processes/_phase_draft_publication.html.erb
@@ -0,0 +1,9 @@
+<% if process.draft_versions.any? %>
+
+ <% process.draft_versions.each do |draft_version| %>
+ - <%= link_to draft_version.title, legislation_process_draft_version_path(process, draft_version) %>
+ <% end %>
+
+<% else %>
+ <%= t('.empty') %>
+<% end %>
diff --git a/app/views/legislation/processes/_phase_final_version_publication.html.erb b/app/views/legislation/processes/_phase_final_version_publication.html.erb
new file mode 100644
index 000000000..52fba50d5
--- /dev/null
+++ b/app/views/legislation/processes/_phase_final_version_publication.html.erb
@@ -0,0 +1,5 @@
+<% if process.final_draft_version %>
+ <%= legislation_process_draft_version_path(process.final_draft_version) %>
+<% else %>
+ <%= t('.empty') %>
+<% end %>
diff --git a/app/views/legislation/processes/_phase_not_open.html.erb b/app/views/legislation/processes/_phase_not_open.html.erb
new file mode 100644
index 000000000..354ff5440
--- /dev/null
+++ b/app/views/legislation/processes/_phase_not_open.html.erb
@@ -0,0 +1,13 @@
+
+
+
<%= t('.not_open') %>
+
Suscríbete al proceso para recibir un aviso en el momento en que se abra.
+
+
+
+
+
+
-
<%= t('legislation.processes.common.key_dates') %>
+
<%= t('legislation.processes.shared.key_dates') %>
-
<%= t('legislation.processes.common.debate_dates') %>
+
<%= t('legislation.processes.shared.debate_dates') %>
<%= format_date(process.debate_start_date) %> - <%= format_date(process.debate_end_date) %>
-
<%= t('legislation.processes.common.draft_publication_date') %>
+
<%= t('legislation.processes.shared.draft_publication_date') %>
<%= format_date(process.draft_publication_date) %>
-
<%= t('legislation.processes.common.allegations_dates') %>
+
<%= t('legislation.processes.shared.allegations_dates') %>
<%= format_date(process.allegations_start_date) %> - <%= format_date(process.allegations_end_date) %>
-
<%= t('legislation.processes.common.final_publication_date') %>
+
<%= t('legislation.processes.shared.final_publication_date') %>
<%= format_date(process.final_publication_date) %>
diff --git a/app/views/legislation/processes/phase.html.erb b/app/views/legislation/processes/phase.html.erb
new file mode 100644
index 000000000..5ac6ceb85
--- /dev/null
+++ b/app/views/legislation/processes/phase.html.erb
@@ -0,0 +1,15 @@
+<%= render 'legislation/processes/header_full', process: @process %>
+
+
+ <%= render 'legislation/processes/key_dates', process: @process, phase: @phase %>
+
+
+
+ <% if @process.show_phase?(@phase) %>
+ <%= render "phase_#{@phase}", process: @process %>
+ <% else %>
+ <%= render 'legislation/processes/phase_not_open' %>
+ <% end %>
+
+
+
+ <%= render 'key_dates', process: @process, phase: :debate %>
-
<%= @process.title %>
-
-<% @process.draft_versions.each do |draft_version| %>
- <%= link_to draft_version.title, legislation_process_draft_version_path(@process, draft_version) %>
-<% end %>
-
+
+
+ <% if @process.show_phase?(:debate) %>
+ <%= render 'debate', process: @process %>
+ <% else %>
+ <%= render 'phase_not_open' %>
+ <% end %>
+
+
+
+ <%= t('.debate') %>
+
+
+
<%= link_to question.title, legislation_process_question_path(question.process, question) %>
+
+
+ · <%= format_date question.created_at %>
+
+
+
<%= @question.title %>
+