consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1632 from consul/feature/1587#remove_target_participate_fields

Browse Source 
Remove 'target' and 'how_to_participate' from Legislative Processes
This commit is contained in:
Raimond Garcia
2017-06-12 09:17:04 +02:00
committed by GitHub
parent 79dfdb88b4 41ec36f470
commit 89aa4237ad
16 changed files with 15 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/legislation/processes_controller.rb
View File

@@ -37,8 +37,6 @@ class Admin::Legislation::ProcessesController < Admin::Legislation::BaseControll
:title,
:summary,
:description,
:target,
:how_to_participate,
:additional_info,
:start_date,
:end_date,

26
app/views/admin/legislation/processes/_form.html.erb
View File

@@ -190,32 +190,6 @@
</div>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<%= f.label :target %>
<small><%= t('admin.legislation.processes.form.use_markdown') %></small>
</div>
<div class="small-12 medium-8 column">
<%= f.text_area :target,
label: false,
rows: 5,
placeholder: t('admin.legislation.processes.form.target_placeholder') %>
</div>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<%= f.label :how_to_participate %>
<small><%= t('admin.legislation.processes.form.use_markdown') %></small>
</div>
<div class="small-12 medium-8 column">
<%= f.text_area :how_to_participate,
label: false,
rows: 5,
placeholder: t('admin.legislation.processes.form.how_to_participate_placeholder') %>
</div>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<%= f.label :additional_info %>

16
app/views/legislation/processes/_header.html.erb
View File

@@ -7,24 +7,12 @@
</div>
<div id="debate-show" class="row description">
<div class="small-12 medium-4 column">
<div class="small-12 column">
<% if process.description.present? %>
<h4><%= t('legislation.processes.header_full.description') %></h4>
<%= markdown process.description %>
<% end %>
</div>
<div class="small-12 medium-4 column">
<% if process.target.present? %>
<h4><%= t('legislation.processes.header_full.target') %></h4>
<%= markdown process.target %>
<% end %>
</div>
<div class="small-12 medium-4 column">
<% if process.how_to_participate.present? %>
<h4><%= t('legislation.processes.header_full.how_to_participate') %></h4>
<%= markdown process.how_to_participate %>
<% end %>
</div>
<% if process.additional_info.present? %>
<div class="small-12 column debate-add-info">
<div class="debate-info-wrapper">
@@ -34,7 +22,7 @@
<% end %>
</div>
<% if process.description.present? || process.target.present? || process.how_to_participate.present? || process.additional_info.present? %>
<% if process.description.present? || process.additional_info.present? %>
<div class="text-center half-gradient">
<a class="button big text-center button-circle" title="<%= t('.view_process_information') %>" id="js-toggle-small-debate">
<span class="icon-angle-down" aria-hidden="true"></span>

14
app/views/legislation/processes/_header_full.html.erb
View File

@@ -9,24 +9,12 @@
</div>
<div class="row description">
<div class="small-12 medium-4 column">
<div class="small-12 column">
<% if process.description.present? %>
<h4><%= t('.description') %></h4>
<%= markdown process.description %>
<% end %>
</div>
<div class="small-12 medium-4 column">
<% if process.target.present? %>
<h4><%= t('.target') %></h4>
<%= markdown process.target %>
<% end %>
</div>
<div class="small-12 medium-4 column">
<% if process.how_to_participate.present? %>
<h4><%= t('.how_to_participate') %></h4>
<%= markdown process.how_to_participate %>
<% end %>
</div>
<% if process.additional_info.present? %>
<div id="debate-show" class="small-12 column debate-add-info">
<div class="debate-info-wrapper">

33
app/views/sandbox/admin_legislation_info.html.erb
View File

@@ -36,8 +36,8 @@
<div class="small-12 medium-2 column">
<input class="js-calendar-full" id="debate_end_date" type="text" value="2016-12-21" name="legislation_process[debate_end_date]" />
</div>
<div class="small-12 medium-4 column">
<label for="legislation_process_debate_start_date">Fase previa</label>
</div>
@@ -53,7 +53,7 @@
<div class="small-12 medium-2 column">
<input class="js-calendar-full" id="debate_end_date" type="text" value="2016-12-21" name="legislation_process[debate_end_date]" />
</div>
<div class="small-12 medium-4 column">
<label for="legislation_process_debate_start_date">Fase alegaciones</label>
</div>
@@ -69,7 +69,7 @@
<div class="small-12 medium-2 column">
<input class="js-calendar-full" id="debate_end_date" type="text" value="2016-12-21" name="legislation_process[debate_end_date]" />
</div>
<div class="small-12 medium-4 column">
<label for="legislation_process_final_publication_date">Publicación de resultados</label>
</div>
@@ -97,29 +97,6 @@
</div>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<label for="legislation_process_target">A quién va dirigido</label>
</div>
<div class="small-12 medium-8 column">
<textarea rows="5" name="legislation_process[target]" id="legislation_process_target">- Ciudadanos con vivienda en propiedad
- Profesionales de la construcción y reformas
- Empresarios con locales comerciales
</textarea>
</div>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<label for="legislation_process_how_to_participate">Cómo puedes participar</label>
</div>
<div class="small-12 medium-8 column">
<textarea rows="5" name="legislation_process[how_to_participate]" id="legislation_process_how_to_participate">- **Participa en el debate previo** para identificar los problemas a solucionar, la necesidad de esta normativa, sus objetivos y posibles soluciones alternativas.
- Después del debate el Ayuntamiento presentará un borrador del texto al cual podrás realizar **comentarios y alegaciones**.
</textarea>
</div>
</div>
<div class="row">
<div class="small-12 medium-4 column">
<label for="legislation_process_additional_info">Información adicional</label>
@@ -151,7 +128,7 @@
<input type="submit" name="commit" value="Guardar cambios" class="button expanded" />
</div>
</div>
</form>
</div>
</div>

2
config/locales/activerecord.en.yml
View File

@@ -167,8 +167,6 @@ en:
legislation/process:
title: Process Title
description: Description
target: Target
how_to_participate: How to participate
additional_info: Additional info
start_date: Start date
end_date: End date

2
config/locales/activerecord.es.yml
View File

@@ -162,8 +162,6 @@ es:
legislation/process:
title: Título del proceso
description: En qué consiste
target: A quién afecta
how_to_participate: Cómo participar
additional_info: Información adicional
start_date: Fecha de inicio del proceso
end_date: Fecha de fin del proceso

2
config/locales/admin.en.yml
View File

@@ -221,8 +221,6 @@ en:
title_placeholder: The title of the process
summary_placeholder: Short summary of the description
description_placeholder: Add a description of the process
target_placeholder: Describe who is the target of the process
how_to_participate_placeholder: Describe how to participate
additional_info_placeholder: Add an additional information you consider useful
index:
create: New process

2
config/locales/admin.es.yml
View File

@@ -221,8 +221,6 @@ es:
title_placeholder: Escribe el título del proceso
summary_placeholder: Resumen corto de la descripción
description_placeholder: Añade una descripción del proceso
target_placeholder: Describe a quién va dirigido
how_to_participate_placeholder: Describe cómo participar
additional_info_placeholder: Añade cualquier información adicional que pueda ser de interés
index:
create: Nuevo proceso

2
config/locales/legislation.en.yml
View File

@@ -55,8 +55,6 @@ en:
header_full:
title: Participate
description: Description
target: Target
how_to_participate: How to participate
more_info: More information and context
index:
filters:

2
config/locales/legislation.es.yml
View File

@@ -55,8 +55,6 @@ es:
header_full:
title: Colabora en la elaboración de la normativa sobre
description: En qué consiste
target: A quién va dirigido
how_to_participate: Cómo puedes participar
more_info: Más información y contexto
index:
filters:

2
db/dev_seeds.rb
View File

@@ -635,8 +635,6 @@ print "Creating legislation processes"
process = ::Legislation::Process.create!(title: Faker::Lorem.sentence(3).truncate(60),
description: Faker::Lorem.paragraphs.join("\n\n"),
summary: Faker::Lorem.paragraph,
target: Faker::Lorem.paragraphs.join("\n\n"),
how_to_participate: Faker::Lorem.paragraphs.join("\n\n"),
additional_info: Faker::Lorem.paragraphs.join("\n\n"),
start_date: Date.current - 3.days,
end_date: Date.current + 3.days,

6
db/migrate/20170610211027_remove_ht_participate_and_target_from_leg_process.rb Normal file
View File

@@ -0,0 +1,6 @@
class RemoveHtParticipateAndTargetFromLegProcess < ActiveRecord::Migration
def change
remove_column :legislation_processes, :how_to_participate, :text
remove_column :legislation_processes, :target, :text
end
end

4
db/schema.rb
View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170602162155) do
ActiveRecord::Schema.define(version: 20170610211027) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -404,8 +404,6 @@ ActiveRecord::Schema.define(version: 20170602162155) do
create_table "legislation_processes", force: :cascade do |t|
t.string "title"
t.text "description"
t.text "target"
t.text "how_to_participate"
t.text "additional_info"
t.date "start_date"
t.date "end_date"

2
spec/factories.rb
View File

@@ -604,8 +604,6 @@ FactoryGirl.define do
title "A collaborative legislation process"
description "Description of the process"
summary "Summary of the process"
target "Who will affected by this law?"
how_to_participate "You can participate by answering some questions"
start_date Date.current - 5.days
end_date Date.current + 5.days
debate_start_date Date.current - 5.days

4
spec/features/admin/legislation/processes_spec.rb
View File

@@ -41,8 +41,6 @@ feature 'Admin legislation processes' do
fill_in 'legislation_process_title', with: 'An example legislation process'
fill_in 'legislation_process_summary', with: 'Summary of the process'
fill_in 'legislation_process_description', with: 'Describing the process'
fill_in 'legislation_process_target', with: 'This thing affects people'
fill_in 'legislation_process_how_to_participate', with: 'You can partipate in this thing by doing...'
base_date = Date.current
fill_in 'legislation_process[start_date]', with: base_date.strftime("%d/%m/%Y")
@@ -65,14 +63,12 @@ feature 'Admin legislation processes' do
expect(page).to have_content 'An example legislation process'
expect(page).not_to have_content 'Summary of the process'
expect(page).to have_content 'Describing the process'
expect(page).to have_content 'This thing affects people'
visit legislation_processes_path
expect(page).to have_content 'An example legislation process'
expect(page).to have_content 'Summary of the process'
expect(page).not_to have_content 'Describing the process'
expect(page).not_to have_content 'This thing affects people'
end
end