Add description to legislation questions

This commit is contained in:
decabeza
2022-09-27 11:26:45 +02:00
committed by Javi Martín
parent cd99f2a5eb
commit 800027728a
7 changed files with 26 additions and 4 deletions

View File

@@ -4,6 +4,7 @@ class Legislation::Question < ApplicationRecord
include Notifiable
translates :title, touch: true
translates :description, touch: true
include Globalizable
belongs_to :author, -> { with_hidden }, class_name: "User", inverse_of: :legislation_questions

View File

@@ -9,6 +9,10 @@
<div class="small-12 medium-9 column end">
<%= translations_form.text_field :title %>
</div>
<div class="small-12 medium-9 column end">
<%= translations_form.text_area :description, class: "html-area admin" %>
</div>
<% end %>
</div>

View File

@@ -29,6 +29,7 @@
<div class="row">
<div class="small-12 medium-9 column">
<h3 class="quiz-question"><%= @question.title %></h3>
<%= AdminWYSIWYGSanitizer.new.sanitize(@question.description) %>
<div class="debate-questions" id="legislation-answer-form">
<%= render "answer_form", process: @process, question: @question, answer: @answer %>
</div>

View File

@@ -0,0 +1,5 @@
class AddDescriptionToLegislationQuestionTranslations < ActiveRecord::Migration[6.0]
def change
add_column :legislation_question_translations, :description, :text
end
end

View File

@@ -861,6 +861,7 @@ ActiveRecord::Schema.define(version: 2023_02_06_141152) do
t.datetime "updated_at", null: false
t.text "title"
t.datetime "hidden_at"
t.text "description"
t.index ["hidden_at"], name: "index_legislation_question_translations_on_hidden_at"
t.index ["legislation_question_id"], name: "index_d34cc1e1fe6d5162210c41ce56533c5afabcdbd3"
t.index ["locale"], name: "index_legislation_question_translations_on_locale"

View File

@@ -32,6 +32,7 @@ describe "Admin legislation questions", :admin do
click_link "Create question"
fill_in "Question", with: "Question 3"
fill_in_ckeditor "Description", with: "A little description about question 3"
click_button "Create question"
expect(page).to have_content "Question 3"
@@ -40,7 +41,7 @@ describe "Admin legislation questions", :admin do
context "Update" do
scenario "Valid legislation question" do
create(:legislation_question, title: "Question 2", process: process)
create(:legislation_question, title: "Question 2", description: "Description 2", process: process)
visit admin_root_path
@@ -57,9 +58,11 @@ describe "Admin legislation questions", :admin do
click_link "Question 2"
fill_in "Question", with: "Question 2b"
fill_in_ckeditor "Description", with: "Description 2b"
click_button "Save changes"
expect(page).to have_content "Question 2b"
expect(page).to have_ckeditor "Description", with: "Description 2b"
end
end

View File

@@ -9,9 +9,9 @@ describe "Legislation" do
end
before do
create(:legislation_question, process: process, title: "Question 1")
create(:legislation_question, process: process, title: "Question 2")
create(:legislation_question, process: process, title: "Question 3")
create(:legislation_question, process: process, title: "Question 1", description: "Description 1")
create(:legislation_question, process: process, title: "Question 2", description: "Description 2")
create(:legislation_question, process: process, title: "Question 3", description: "Description 3")
end
scenario "shows question list" do
@@ -24,16 +24,19 @@ describe "Legislation" do
click_link "Question 1"
expect(page).to have_content("Question 1")
expect(page).to have_content("Description 1")
expect(page).to have_content("NEXT QUESTION")
click_link "Next question"
expect(page).to have_content("Question 2")
expect(page).to have_content("Description 2")
expect(page).to have_content("NEXT QUESTION")
click_link "Next question"
expect(page).to have_content("Question 3")
expect(page).to have_content("Description 3")
expect(page).not_to have_content("NEXT QUESTION")
end
@@ -41,6 +44,7 @@ describe "Legislation" do
visit legislation_process_question_path(process, process.questions.first)
expect(page).to have_content("Question 1")
expect(page).to have_content("Description 1")
expect(page).to have_content("Open answers (0)")
end
@@ -48,16 +52,19 @@ describe "Legislation" do
visit legislation_process_question_path(process, process.questions.first)
expect(page).to have_content("Question 1")
expect(page).to have_content("Description 1")
expect(page).to have_content("NEXT QUESTION")
click_link "Next question"
expect(page).to have_content("Question 2")
expect(page).to have_content("Description 2")
expect(page).to have_content("NEXT QUESTION")
click_link "Next question"
expect(page).to have_content("Question 3")
expect(page).to have_content("Description 3")
expect(page).not_to have_content("NEXT QUESTION")
end