From 0bcc622944a84ed4224513624785b0ccde78c95e Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 27 Dec 2018 13:01:49 +0100 Subject: [PATCH 1/5] Removes legislation processes custom documents --- .../legislation/processes/proposals.html.erb | 2 -- .../processes/_custom_documents.html.erb | 19 ----------- .../processes/_documents_process_25.html.erb | 15 --------- .../processes/_documents_process_26.html.erb | 33 ------------------- .../processes/_documents_process_28.html.erb | 29 ---------------- .../processes/_documents_process_29.html.erb | 29 ---------------- .../processes/_documents_process_30.html.erb | 29 ---------------- .../legislation/processes/debate.html.erb | 2 -- .../processes/phase_empty.html.erb | 2 -- .../processes/phase_not_open.html.erb | 2 -- 10 files changed, 162 deletions(-) delete mode 100644 app/views/legislation/processes/_custom_documents.html.erb delete mode 100644 app/views/legislation/processes/_documents_process_25.html.erb delete mode 100644 app/views/legislation/processes/_documents_process_26.html.erb delete mode 100644 app/views/legislation/processes/_documents_process_28.html.erb delete mode 100644 app/views/legislation/processes/_documents_process_29.html.erb delete mode 100644 app/views/legislation/processes/_documents_process_30.html.erb diff --git a/app/views/custom/legislation/processes/proposals.html.erb b/app/views/custom/legislation/processes/proposals.html.erb index de8e9e46b52..7156e3bb5a8 100644 --- a/app/views/custom/legislation/processes/proposals.html.erb +++ b/app/views/custom/legislation/processes/proposals.html.erb @@ -2,8 +2,6 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> -<%= render 'custom_documents' %> - <%= render 'custom_results' %> <%= render 'key_dates', process: @process, phase: :proposals %> diff --git a/app/views/legislation/processes/_custom_documents.html.erb b/app/views/legislation/processes/_custom_documents.html.erb deleted file mode 100644 index 83fe3eed4ee..00000000000 --- a/app/views/legislation/processes/_custom_documents.html.erb +++ /dev/null @@ -1,19 +0,0 @@ -<% if @process.id == 25 %> - <%= render 'documents_process_25' %> -<% end %> - -<% if @process.id == 26 %> - <%= render 'documents_process_26' %> -<% end %> - -<% if @process.id == 28 %> - <%= render 'documents_process_28' %> -<% end %> - -<% if @process.id == 29 %> - <%= render 'documents_process_29' %> -<% end %> - -<% if @process.id == 30 %> - <%= render 'documents_process_30' %> -<% end %> diff --git a/app/views/legislation/processes/_documents_process_25.html.erb b/app/views/legislation/processes/_documents_process_25.html.erb deleted file mode 100644 index b402be8f8a2..00000000000 --- a/app/views/legislation/processes/_documents_process_25.html.erb +++ /dev/null @@ -1,15 +0,0 @@ -
-
-
-
-

-   - <%= t('proposals.show.title_external_url') %> -

- <%= link_to "Resumen Plan Estratégico de zonas verde, arbolado y biodiversidad de la ciudad de Madrid (PDF | 468Kb)".html_safe, - "/system/legislations/processes/25/resumen_plan_estrategico_zonas_verdes.pdf", - target: "_blank", title: t("shared.target_blank_html") %> -
-
-
-
diff --git a/app/views/legislation/processes/_documents_process_26.html.erb b/app/views/legislation/processes/_documents_process_26.html.erb deleted file mode 100644 index 202c51713d1..00000000000 --- a/app/views/legislation/processes/_documents_process_26.html.erb +++ /dev/null @@ -1,33 +0,0 @@ -
-
-
-
-

-   - <%= t('proposals.show.title_external_url') %> -

-
    -
  • <%= link_to "Medidas estructurales Estrategia ESS (PDF | 34Kb)".html_safe, - "/system/legislations/processes/26/medidas_estructurales_estrategia_ess.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Medidas Estrategia ESS (PDF | 39Kb)".html_safe, - "/system/legislations/processes/26/medidas_estrategia_ess.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Estrategia Municipal ESS del Ayuntamiento de Madrid 2018-2025 (PDF | 2Mb)".html_safe, - "/system/legislations/processes/26/presentacion_estrategia.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Resumen del diagnóstico sobre la ESS en la ciudad de Madrid (PDF | 1,1Mb)".html_safe, - "/system/legislations/processes/26/resumen_diagnostico_ess_en_madrid.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Borrador Estrategia Municipal ESS (PDF | 3,5Mb)".html_safe, - "/system/legislations/processes/26/estrategia_municipal_de_ess_borrador.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • -
-
-
-
-
diff --git a/app/views/legislation/processes/_documents_process_28.html.erb b/app/views/legislation/processes/_documents_process_28.html.erb deleted file mode 100644 index 5b81b69c37c..00000000000 --- a/app/views/legislation/processes/_documents_process_28.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
-
-

-   - <%= t('proposals.show.title_external_url') %> -

-
    -
  • <%= link_to "Memoria propuesta para la consulta pública (PDF | 28Kb)".html_safe, - "/system/legislations/processes/28/memoria_propuesta_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Trámite de consulta pública (PDF | 29Kb)".html_safe, - "/system/legislations/processes/28/tramite_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "BOAM núm. 8.026 (PDF | 67Kb)".html_safe, - "/system/legislations/processes/28/boam8026_2379.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Comunicación consulta pública (PDF | 114Kb)".html_safe, - "/system/legislations/processes/28/comunicacion_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • -
-
-
-
-
diff --git a/app/views/legislation/processes/_documents_process_29.html.erb b/app/views/legislation/processes/_documents_process_29.html.erb deleted file mode 100644 index c53a740433d..00000000000 --- a/app/views/legislation/processes/_documents_process_29.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
-
-

-   - <%= t('proposals.show.title_external_url') %> -

-
    -
  • <%= link_to "Memoria propuesta para la consulta pública (PDF | 32Kb)".html_safe, - "/system/legislations/processes/29/memoria_propuesta_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Trámite de consulta pública (PDF | 30Kb)".html_safe, - "/system/legislations/processes/29/tramite_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "BOAM núm. 8.026 (PDF | 71Kb)".html_safe, - "/system/legislations/processes/29/boam8026_2378.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Comunicación consulta pública (PDF | 115Kb)".html_safe, - "/system/legislations/processes/29/comunicacion_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • -
-
-
-
-
diff --git a/app/views/legislation/processes/_documents_process_30.html.erb b/app/views/legislation/processes/_documents_process_30.html.erb deleted file mode 100644 index f12be165f39..00000000000 --- a/app/views/legislation/processes/_documents_process_30.html.erb +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
-
-

-   - <%= t('proposals.show.title_external_url') %> -

-
    -
  • <%= link_to "Memoria propuesta para la consulta pública (PDF | 29Kb)".html_safe, - "/system/legislations/processes/30/memoria_propuesta_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Trámite de consulta pública (PDF | 28Kb)".html_safe, - "/system/legislations/processes/30/tramite_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "BOAM núm. 8.026 (PDF | 66Kb)".html_safe, - "/system/legislations/processes/30/boam8026_2377.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • - -
  • <%= link_to "Comunicación consulta pública (PDF | 115Kb)".html_safe, - "/system/legislations/processes/30/comunicacion_consulta_publica.pdf", - target: "_blank", title: t("shared.target_blank_html") %>
    • -
-
-
-
-
diff --git a/app/views/legislation/processes/debate.html.erb b/app/views/legislation/processes/debate.html.erb index 1b40c52fb7b..0cc28b626c9 100644 --- a/app/views/legislation/processes/debate.html.erb +++ b/app/views/legislation/processes/debate.html.erb @@ -2,8 +2,6 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> -<%= render 'custom_documents' %> - <%= render 'custom_results' %> <%= render 'documents/additional_documents', documents: @process.documents %> diff --git a/app/views/legislation/processes/phase_empty.html.erb b/app/views/legislation/processes/phase_empty.html.erb index 74662d5d1c8..82822903ead 100644 --- a/app/views/legislation/processes/phase_empty.html.erb +++ b/app/views/legislation/processes/phase_empty.html.erb @@ -2,8 +2,6 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> -<%= render 'custom_documents' %> - <%= render 'custom_results' %> <%= render 'documents/additional_documents', documents: @process.documents %> diff --git a/app/views/legislation/processes/phase_not_open.html.erb b/app/views/legislation/processes/phase_not_open.html.erb index 08929ff83c3..34c47d8ffa4 100644 --- a/app/views/legislation/processes/phase_not_open.html.erb +++ b/app/views/legislation/processes/phase_not_open.html.erb @@ -2,8 +2,6 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> -<%= render 'custom_documents' %> - <%= render 'custom_results' %> <%= render 'documents/additional_documents', documents: @process.documents %> From 2a7ba33fb7c65f37d1fe1a8b56cb8582310c03ee Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 27 Dec 2018 13:02:33 +0100 Subject: [PATCH 2/5] Adds documents list on custom legislation process proposals phase --- app/views/custom/legislation/processes/proposals.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/custom/legislation/processes/proposals.html.erb b/app/views/custom/legislation/processes/proposals.html.erb index 7156e3bb5a8..6c7677b716c 100644 --- a/app/views/custom/legislation/processes/proposals.html.erb +++ b/app/views/custom/legislation/processes/proposals.html.erb @@ -4,6 +4,8 @@ <%= render 'custom_results' %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'key_dates', process: @process, phase: :proposals %> <%= render 'proposals_content', process: @process, proposals: @proposals %> From b47147d77cb18a8efc709b97d18c5a7a4b1d62e6 Mon Sep 17 00:00:00 2001 From: decabeza Date: Thu, 27 Dec 2018 13:02:44 +0100 Subject: [PATCH 3/5] Adds documents list on legislation process proposals phase --- app/views/legislation/processes/proposals.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/legislation/processes/proposals.html.erb b/app/views/legislation/processes/proposals.html.erb index eb8caa153ba..53e11485c4f 100644 --- a/app/views/legislation/processes/proposals.html.erb +++ b/app/views/legislation/processes/proposals.html.erb @@ -2,6 +2,8 @@ <%= render 'legislation/processes/header', process: @process, header: :full %> +<%= render 'documents/additional_documents', documents: @process.documents %> + <%= render 'key_dates', process: @process, phase: :proposals %> <%= render 'proposals_content', process: @process, proposals: @proposals %> From a3f15c3858547bbeb6503af2320ff9a7358de408 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 28 Dec 2018 12:18:16 +0100 Subject: [PATCH 4/5] Increases max_documents_allowed for legislation process Until this will be a setting, I change it to upload all old custom documents (process 26 had 5 documents). --- app/models/legislation/process.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/legislation/process.rb b/app/models/legislation/process.rb index ed59fdd0ad5..e73a28e8c3d 100644 --- a/app/models/legislation/process.rb +++ b/app/models/legislation/process.rb @@ -3,7 +3,7 @@ class Legislation::Process < ActiveRecord::Base include Taggable include Milestoneable include Documentable - documentable max_documents_allowed: 4, + documentable max_documents_allowed: 5, max_file_size: 3.megabytes, accepted_content_types: [ "application/pdf" ] From a242c8f3c330a331c108ab86e038fc521d2c5218 Mon Sep 17 00:00:00 2001 From: decabeza Date: Fri, 28 Dec 2018 13:01:34 +0100 Subject: [PATCH 5/5] Adds specs for show view has document present on all phases --- spec/features/legislation/processes_spec.rb | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb index a8d9ce42213..6dc3c025605 100644 --- a/spec/features/legislation/processes_spec.rb +++ b/spec/features/legislation/processes_spec.rb @@ -131,12 +131,21 @@ context "show" do include_examples "not published permissions", :legislation_process_path - scenario '#show view has document present' do + scenario 'show view has document present on all phases' do process = create(:legislation_process) document = create(:document, documentable: process) + phases = ["Debate", "Proposals", "Draft publication", + "Comments", "Final result publication"] + visit legislation_process_path(process) - expect(page).to have_content(document.title) + phases.each do |phase| + within(".legislation-process-list") do + find('li', :text => "#{phase}").click_link + end + + expect(page).to have_content(document.title) + end end scenario 'show additional info button' do