diff --git a/app/views/admin/legislation/processes/index.html.erb b/app/views/admin/legislation/processes/index.html.erb index c01aeb645..b5207fc46 100644 --- a/app/views/admin/legislation/processes/index.html.erb +++ b/app/views/admin/legislation/processes/index.html.erb @@ -17,7 +17,8 @@ <%= t("admin.legislation.processes.process.title") %> <%= t("admin.legislation.processes.process.status") %> - <%= t("admin.legislation.processes.process.creation_date") %> + <%= t("admin.legislation.processes.process.start_date") %> + <%= t("admin.legislation.processes.process.end_date") %> <%= t("admin.legislation.processes.process.comments") %> <%= t("admin.actions.actions") %> @@ -26,11 +27,12 @@ <% @processes.each do |process| %> - + <%= link_to process.title, edit_admin_legislation_process_path(process) %> <%= t("admin.legislation.processes.process.status_#{process.status}") %> - <%= I18n.l process.created_at.to_date %> + <%= I18n.l process.start_date %> + <%= I18n.l process.end_date %> <%= process.total_comments %> <%= link_to t("admin.legislation.processes.index.delete"), admin_legislation_process_path(process), diff --git a/config/locales/en/admin.yml b/config/locales/en/admin.yml index 56f614850..cc2293069 100644 --- a/config/locales/en/admin.yml +++ b/config/locales/en/admin.yml @@ -456,7 +456,8 @@ en: title: Process comments: Comments status: Status - creation_date: Creation date + start_date: Start date + end_date: End date status_open: Open status_closed: Closed status_planned: Planned diff --git a/config/locales/es/admin.yml b/config/locales/es/admin.yml index 29a7b1827..4186560a4 100644 --- a/config/locales/es/admin.yml +++ b/config/locales/es/admin.yml @@ -456,7 +456,8 @@ es: title: Proceso comments: Comentarios status: Estado - creation_date: Fecha de creación + start_date: Fecha de apertura + end_date: Fecha de cierre status_open: Abierto status_closed: Cerrado status_planned: Próximamente diff --git a/spec/features/admin/legislation/processes_spec.rb b/spec/features/admin/legislation/processes_spec.rb index 038a365bd..8b3c94140 100644 --- a/spec/features/admin/legislation/processes_spec.rb +++ b/spec/features/admin/legislation/processes_spec.rb @@ -50,14 +50,22 @@ feature "Admin legislation processes" do end scenario "Processes are sorted by descending start date" do - create(:legislation_process, title: "Process 1", start_date: Date.yesterday) - create(:legislation_process, title: "Process 2", start_date: Date.today) - create(:legislation_process, title: "Process 3", start_date: Date.tomorrow) + process_1 = create(:legislation_process, title: "Process 1", start_date: Date.yesterday) + process_2 = create(:legislation_process, title: "Process 2", start_date: Date.today) + process_3 = create(:legislation_process, title: "Process 3", start_date: Date.tomorrow) visit admin_legislation_processes_path(filter: "all") - expect("Process 3").to appear_before("Process 2") - expect("Process 2").to appear_before("Process 1") + expect(page).to have_content (process_1.start_date) + expect(page).to have_content (process_2.start_date) + expect(page).to have_content (process_3.start_date) + + expect(page).to have_content (process_1.end_date) + expect(page).to have_content (process_2.end_date) + expect(page).to have_content (process_3.end_date) + + expect(process_3.title).to appear_before(process_2.title) + expect(process_2.title).to appear_before(process_1.title) end end @@ -179,6 +187,14 @@ feature "Admin legislation processes" do expect(page).not_to have_content "Summary of the process" expect(page).to have_css("img[alt='#{Legislation::Process.last.title}']") end + + scenario "Default colors are present" do + visit new_admin_legislation_process_path + + expect(find("#legislation_process_background_color").value).to eq "#e7f2fc" + expect(find("#legislation_process_font_color").value).to eq "#222222" + end + end context "Update" do