Show creation date and status in admin list
This commit is contained in:
@@ -59,6 +59,18 @@ class Legislation::Process < ActiveRecord::Base
|
|||||||
questions.map(&:comments_count).sum
|
questions.map(&:comments_count).sum
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def status
|
||||||
|
today = Date.current
|
||||||
|
|
||||||
|
if today < start_date
|
||||||
|
:planned
|
||||||
|
elsif end_date < today
|
||||||
|
:closed
|
||||||
|
else
|
||||||
|
:open
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def valid_date_ranges
|
def valid_date_ranges
|
||||||
|
|||||||
@@ -20,6 +20,8 @@
|
|||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th><%= t("admin.legislation.processes.process.title") %></th>
|
<th><%= t("admin.legislation.processes.process.title") %></th>
|
||||||
|
<th><%= t("admin.legislation.processes.process.status") %></th>
|
||||||
|
<th><%= t("admin.legislation.processes.process.creation_date") %></th>
|
||||||
<th><%= t("admin.legislation.processes.process.comments") %></th>
|
<th><%= t("admin.legislation.processes.process.comments") %></th>
|
||||||
<th></th>
|
<th></th>
|
||||||
</tr>
|
</tr>
|
||||||
@@ -30,6 +32,8 @@
|
|||||||
<td class="small-12 medium-8">
|
<td class="small-12 medium-8">
|
||||||
<%= link_to process.title, edit_admin_legislation_process_path(process) %>
|
<%= link_to process.title, edit_admin_legislation_process_path(process) %>
|
||||||
</td>
|
</td>
|
||||||
|
<td><%= t("admin.legislation.processes.process.status_#{process.status}") %></td>
|
||||||
|
<td><%= I18n.l process.created_at.to_date %></td>
|
||||||
<td><%= process.total_comments %></td>
|
<td><%= process.total_comments %></td>
|
||||||
<td>
|
<td>
|
||||||
<%= link_to t("admin.legislation.processes.index.delete"), admin_legislation_process_path(process),
|
<%= link_to t("admin.legislation.processes.index.delete"), admin_legislation_process_path(process),
|
||||||
|
|||||||
@@ -113,6 +113,11 @@ en:
|
|||||||
process:
|
process:
|
||||||
title: Process
|
title: Process
|
||||||
comments: Comments
|
comments: Comments
|
||||||
|
status: Status
|
||||||
|
creation_date: Creation date
|
||||||
|
status_open: Open
|
||||||
|
status_closed: Closed
|
||||||
|
status_planned: Planned
|
||||||
subnav:
|
subnav:
|
||||||
info: Information
|
info: Information
|
||||||
draft_texts: Text
|
draft_texts: Text
|
||||||
|
|||||||
@@ -111,6 +111,11 @@ es:
|
|||||||
process:
|
process:
|
||||||
title: Proceso
|
title: Proceso
|
||||||
comments: Comentarios
|
comments: Comentarios
|
||||||
|
status: Estado
|
||||||
|
creation_date: Fecha creación
|
||||||
|
status_open: Abierto
|
||||||
|
status_closed: Cerrado
|
||||||
|
status_planned: Próximamente
|
||||||
subnav:
|
subnav:
|
||||||
info: Información
|
info: Información
|
||||||
draft_texts: Texto
|
draft_texts: Texto
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
require 'rails_helper'
|
require 'rails_helper'
|
||||||
|
|
||||||
RSpec.describe Legislation::Process, type: :model do
|
RSpec.describe Legislation::Process, type: :model do
|
||||||
let(:legislation_process) { build(:legislation_process) }
|
let(:process) { create(:legislation_process) }
|
||||||
|
|
||||||
it "should be valid" do
|
it "should be valid" do
|
||||||
expect(legislation_process).to be_valid
|
expect(process).to be_valid
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "date ranges validations" do
|
describe "date ranges validations" do
|
||||||
@@ -76,8 +76,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
|
|
||||||
describe "#open_phase?" do
|
describe "#open_phase?" do
|
||||||
it "checks debate phase" do
|
it "checks debate phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(debate_start_date: Date.current + 2.days, debate_end_date: Date.current + 3.days)
|
process.update_attributes(debate_start_date: Date.current + 2.days, debate_end_date: Date.current + 3.days)
|
||||||
expect(process.open_phase?(:debate)).to be false
|
expect(process.open_phase?(:debate)).to be false
|
||||||
@@ -96,7 +94,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "checks allegations phase" do
|
it "checks allegations phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(allegations_start_date: Date.current + 2.days, allegations_end_date: Date.current + 3.days)
|
process.update_attributes(allegations_start_date: Date.current + 2.days, allegations_end_date: Date.current + 3.days)
|
||||||
@@ -116,8 +113,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "checks draft publication phase" do
|
it "checks draft publication phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(draft_publication_date: Date.current + 2.days)
|
process.update_attributes(draft_publication_date: Date.current + 2.days)
|
||||||
expect(process.open_phase?(:draft_publication)).to be false
|
expect(process.open_phase?(:draft_publication)).to be false
|
||||||
@@ -132,8 +127,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "checks final version publication phase" do
|
it "checks final version publication phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(final_publication_date: Date.current + 2.days)
|
process.update_attributes(final_publication_date: Date.current + 2.days)
|
||||||
expect(process.open_phase?(:final_version_publication)).to be false
|
expect(process.open_phase?(:final_version_publication)).to be false
|
||||||
@@ -150,8 +143,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
|
|
||||||
describe "#show_phase?" do
|
describe "#show_phase?" do
|
||||||
it "checks debate phase" do
|
it "checks debate phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(debate_start_date: Date.current + 2.days, debate_end_date: Date.current + 3.days)
|
process.update_attributes(debate_start_date: Date.current + 2.days, debate_end_date: Date.current + 3.days)
|
||||||
expect(process.show_phase?(:debate)).to be false
|
expect(process.show_phase?(:debate)).to be false
|
||||||
@@ -170,8 +161,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "checks allegations phase" do
|
it "checks allegations phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(allegations_start_date: Date.current + 2.days, allegations_end_date: Date.current + 3.days)
|
process.update_attributes(allegations_start_date: Date.current + 2.days, allegations_end_date: Date.current + 3.days)
|
||||||
expect(process.show_phase?(:allegations)).to be false
|
expect(process.show_phase?(:allegations)).to be false
|
||||||
@@ -190,8 +179,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "checks draft publication phase" do
|
it "checks draft publication phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(draft_publication_date: Date.current + 2.days)
|
process.update_attributes(draft_publication_date: Date.current + 2.days)
|
||||||
expect(process.show_phase?(:draft_publication)).to be false
|
expect(process.show_phase?(:draft_publication)).to be false
|
||||||
@@ -206,8 +193,6 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
end
|
end
|
||||||
|
|
||||||
it "checks final version publication phase" do
|
it "checks final version publication phase" do
|
||||||
process = create(:legislation_process)
|
|
||||||
|
|
||||||
# future
|
# future
|
||||||
process.update_attributes(final_publication_date: Date.current + 2.days)
|
process.update_attributes(final_publication_date: Date.current + 2.days)
|
||||||
expect(process.show_phase?(:final_version_publication)).to be false
|
expect(process.show_phase?(:final_version_publication)).to be false
|
||||||
@@ -221,4 +206,20 @@ RSpec.describe Legislation::Process, type: :model do
|
|||||||
expect(process.show_phase?(:final_version_publication)).to be true
|
expect(process.show_phase?(:final_version_publication)).to be true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "#status" do
|
||||||
|
it "should detect planned phase" do
|
||||||
|
process.update_attributes(start_date: Date.current + 2.days)
|
||||||
|
expect(process.status).to eq(:planned)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should detect closed phase" do
|
||||||
|
process.update_attributes(end_date: Date.current - 2.days)
|
||||||
|
expect(process.status).to eq(:closed)
|
||||||
|
end
|
||||||
|
|
||||||
|
it "should detect open phase" do
|
||||||
|
expect(process.status).to eq(:open)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user