Adds draft phase functionality in legislation processes #3048
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hi @jaflutz, Thanks for the PR! 🙏 😌 I leave you some comments on the code 😉 |
decabeza
reviewed
Nov 19, 2018
| </div> | ||
|
|
||
| <div class="small-12 medium-3 column"> | ||
| <%= f.label :draft_start_date, t("admin.legislation.processes.form.start") %> |
There was a problem hiding this comment.
Could you delete this <%= f.label... and use: 🙏
<%= f.text_field :draft_start_date,
label: t("admin.legislation.processes.form.start"),
value: format_date_for_calendar_form(@process.draft_start_date),
class: "js-calendar-full",
id: "draft_start_date" %>
decabeza
reviewed
Nov 19, 2018
| </div> | ||
|
|
||
| <div class="small-12 medium-3 column"> | ||
| <%= f.label :draft_end_date, t("admin.legislation.processes.form.end") %> |
There was a problem hiding this comment.
Could you delete this <%= f.label... and use: 🙏
<%= f.text_field :draft_end_date,
label: t("admin.legislation.processes.form.end"),
value: format_date_for_calendar_form(@process.draft_end_date),
class: "js-calendar-full",
id: "draft_end_date" %>
decabeza
reviewed
Nov 19, 2018
| @@ -46,6 +76,7 @@ | |||
| <hr> | |||
| </div> | |||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Please, remove unnecessary blank line 😉
decabeza
reviewed
Nov 19, 2018
spec/factories/legislations.rb
Outdated
| draft_publication_date { Date.current - 1.day } | ||
| allegations_start_date { Date.current } | ||
| allegations_end_date { Date.current + 3.days } | ||
| proposals_phase_start_date { Date.current } | ||
| proposals_phase_end_date { Date.current + 2.days } | ||
| result_publication_date { Date.current + 5.days } | ||
| #draft_phase_enabled true |
There was a problem hiding this comment.
Please, remove the three commented lines on this file 😉
decabeza
reviewed
Nov 19, 2018
|
|
||
| fill_in 'legislation_process_title_en', with: 'An example legislation process in draft phase' | ||
| fill_in 'legislation_process_summary_en', with: 'Summary of the process' | ||
| fill_in 'legislation_process_description_en', with: 'Describing the process' |
There was a problem hiding this comment.
This spec it failing right now, could you change these lines to:
fill_in 'Process Title', with: 'An example legislation process in draft phase'
fill_in 'Summary', with: 'Summary of the process'
fill_in 'Description', with: 'Describing the process'
This change avoid spec fails 😉
decabeza
reviewed
Nov 19, 2018
| @@ -340,6 +342,8 @@ en: | |||
| invalid_date_range: must be on or after the start date | |||
| debate_end_date: | |||
| invalid_date_range: must be on or after the debate start date | |||
| draft_end_date: | |||
| invalid_date_range: must be on or after the draft start date | |||
There was a problem hiding this comment.
Could you include locales/es/activerecord.yml file with this: 🙏
draft_start_date: Fecha de inicio del borrador
draft_end_date: Fecha de fin del borrador
draft_end_date:
invalid_date_range: tiene que ser igual o posterior a la fecha de inicio del borrador
decabeza
reviewed
Nov 19, 2018
| @@ -373,6 +373,8 @@ en: | |||
| enabled: Enabled | |||
| process: Process | |||
| debate_phase: Debate phase | |||
| draft_phase: Draft phase | |||
| draft_phase_description: If this phase is active, the process won't be listed on processes index. Allow to preview the process and create content before the start. | |||
There was a problem hiding this comment.
Could you include locales/es/admin.yml file with this: 🙏
draft_phase: Fase de borrador
draft_phase_description: Si esta fase está activa, el proceso no aparecerá en la página de procesos. Permite previsualizar el proceso y crear contenido antes del inicio.
decabeza
reviewed
Nov 19, 2018
| @@ -75,6 +77,48 @@ | |||
| expect(page).to have_content 'Summary of the process' | |||
| expect(page).not_to have_content 'Describing the process' | |||
| end | |||
|
|
|||
There was a problem hiding this comment.
Please, remove unnecessary blank line 😉
jaflutz
force-pushed
the
2930-draft-phase-processes
branch
from
5a6696f
to
34b58a5
Compare
voodoorai2000
approved these changes
Nov 20, 2018
|
@decabeza and @voodoorai2000, thanks for reviewing the PR! |
decabeza
approved these changes
Nov 22, 2018
decabeza
approved these changes
Nov 24, 2018
|
Thank you so much @jaflutz! Nice work 👌 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
References
#2930 - Legislation process draft phase
Objectives
Adds a draft phase to the legislation process, and hides processes in this phase when enabled
Visual Changes