decidim-forms 0.25.2 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 823bcb025aec6da675b888233df115cc2ea8ab33186de78ad258f78bc87dd9ab
-  data.tar.gz: 9b90705fdc0dd68fe35cec38e3b61f2c500db39a0f8860332f02536ebdab0e5e
+  metadata.gz: 58253eb8322a05bac48b60ee5a1b469183bb23df8768dfa36e4ff9e89d4962be
+  data.tar.gz: c8ffbd6fd1537adcdd76487b0d18e832a8effbbe4722bcda72a5d8b6e5eb0d83
 SHA512:
-  metadata.gz: 144f5b67eba8110755ec0e09ddc5085ee7fd663c81ef0a7c25759b49d827eebca165fc1d4887ca3d99b1f70b3e369567649cf7a580f638072943b6b466fa2dda
-  data.tar.gz: a175cb3dea44efc07d5cfb4fa60762faf8421592d8fe217ff0b2d9c691a748a803ffc3cca7c98868dc93ed3f1263543e8b43a20686dedf53340232eb5527d021
+  metadata.gz: 2d078591bab65974d315d8eff0fff980d2c7973a1ef67d829f952620d39d251b6b2e381655be036a740ba5d61bd4c8351984c629e74f202878c234173a2dda68
+  data.tar.gz: 38b3873ee99d11c14c8dcf1efadeac81e57f3a67d80e6ca23bf7c9d208d1527599d756d092b739d92b6f6bc009c36f97fe5969c90c391520fc88c14b5cd31d3f

data/app/commands/decidim/forms/answer_questionnaire.rb

@@ -20,7 +20,7 @@ module Decidim
       #
       # Broadcasts :ok if successful, :invalid otherwise.
       def call
-        return broadcast(:invalid) if @form.invalid?
+        return broadcast(:invalid) if @form.invalid? || user_already_answered?
 
         answer_questionnaire
 
@@ -32,7 +32,7 @@ module Decidim
         end
       end
 
-      attr_reader :form
+      attr_reader :form, :questionnaire, :current_user
 
       private
 
@@ -96,6 +96,10 @@ module Decidim
           raise ActiveRecord::Rollback if @errors
         end
       end
+
+      def user_already_answered?
+        questionnaire.answered_by?(current_user || form.context.session_token)
+      end
     end
   end
 end

data/app/forms/decidim/forms/admin/question_form.rb

@@ -42,6 +42,10 @@ module Decidim
           question_type == Decidim::Forms::Question::SEPARATOR_TYPE
         end
 
+        def title_and_description?
+          question_type == Decidim::Forms::Question::TITLE_AND_DESCRIPTION_TYPE
+        end
+
         def matrix_rows_by_position
           matrix_rows.sort do |a, b|
             if a.position && b.position

data/app/models/decidim/forms/answer.rb

@@ -22,6 +22,7 @@ module Decidim
       validate :question_belongs_to_questionnaire
 
       scope :not_separator, -> { joins(:question).where.not(decidim_forms_questions: { question_type: Decidim::Forms::Question::SEPARATOR_TYPE }) }
+      scope :not_title_and_description, -> { joins(:question).where.not(decidim_forms_questions: { question_type: Decidim::Forms::Question::TITLE_AND_DESCRIPTION_TYPE }) }
 
       def self.user_collection(user)
         where(decidim_user_id: user.id)

data/app/models/decidim/forms/question.rb

@@ -8,7 +8,8 @@ module Decidim
 
       QUESTION_TYPES = %w(short_answer long_answer single_option multiple_option sorting files matrix_single matrix_multiple).freeze
       SEPARATOR_TYPE = "separator"
-      TYPES = (QUESTION_TYPES + [SEPARATOR_TYPE]).freeze
+      TITLE_AND_DESCRIPTION_TYPE = "title_and_description"
+      TYPES = (QUESTION_TYPES + [SEPARATOR_TYPE, TITLE_AND_DESCRIPTION_TYPE]).freeze
 
       translatable_fields :body, :description
 
@@ -49,6 +50,7 @@ module Decidim
       validates :question_type, inclusion: { in: TYPES }
 
       scope :not_separator, -> { where.not(question_type: SEPARATOR_TYPE) }
+      scope :not_title_and_description, -> { where.not(question_type: TITLE_AND_DESCRIPTION_TYPE) }
 
       scope :with_body, -> { where(question_type: %w(short_answer long_answer)) }
       scope :with_choices, -> { where.not(question_type: %w(short_answer long_answer)) }
@@ -84,6 +86,10 @@ module Decidim
         question_type.to_s == SEPARATOR_TYPE
       end
 
+      def title_and_description?
+        question_type.to_s == TITLE_AND_DESCRIPTION_TYPE
+      end
+
       def has_attachments?
         question_type.to_s == "files"
       end

data/app/packs/src/decidim/forms/admin/forms.js

@@ -375,8 +375,10 @@ export default function createEditableForm() {
     fieldSelector: fieldSelector,
     addFieldButtonSelector: ".add-question",
     addSeparatorButtonSelector: ".add-separator",
+    addTitleAndDescriptionButtonSelector: ".add-title-and-description",
     fieldTemplateSelector: ".decidim-question-template",
     separatorTemplateSelector: ".decidim-separator-template",
+    TitleAndDescriptionTemplateSelector: ".decidim-title-and-description-template",
     removeFieldButtonSelector: ".remove-question",
     moveUpFieldButtonSelector: ".move-up-question",
     moveDownFieldButtonSelector: ".move-down-question",

data/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb

@@ -21,10 +21,13 @@ module Decidim
           return "-" if answer.choices.empty?
 
           choices = answer.choices.map do |choice|
-            choice.try(:custom_body) || choice.try(:body)
+            {
+              answer_option_body: choice.try(:answer_option).try(:translated_body),
+              choice_body: body_or_custom_body(choice)
+            }
           end
 
-          return choices.first if answer.question.question_type == "single_option"
+          return choice(choices.first) if answer.question.question_type == "single_option"
 
           content_tag(:ul) do
             safe_join(choices.map { |c| choice(c) })
@@ -52,11 +55,23 @@ module Decidim
           # rubocop:enable Style/StringConcatenation
         end
 
-        def choice(choice_body)
+        def choice(choice_hash)
           content_tag :li do
-            choice_body
+            render_body_for choice_hash
           end
         end
+
+        def render_body_for(choice_hash)
+          return choice_hash[:answer_option_body] if choice_hash[:choice_body].blank?
+
+          "#{choice_hash[:answer_option_body]} (#{choice_hash[:choice_body]})"
+        end
+
+        def body_or_custom_body(choice)
+          return choice.custom_body if choice.try(:custom_body).present?
+
+          ""
+        end
       end
     end
   end

data/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb

@@ -46,13 +46,16 @@ module Decidim
           with_choices = sibilings.where.not("decidim_forms_questions.question_type in (?)", %w(short_answer long_answer))
                                   .where("decidim_forms_answers.id IN (SELECT decidim_answer_id FROM decidim_forms_answer_choices)").count
 
-          (with_body + with_choices).to_f / questionnaire.questions.not_separator.count * 100
+          (with_body + with_choices).to_f / questionnaire.questions.not_separator.not_title_and_description.count * 100
         end
 
         private
 
         def sibilings
-          Answer.not_separator.where(questionnaire: questionnaire, session_token: participant.session_token).joins(:question).order("decidim_forms_questions.position ASC")
+          Answer.not_separator
+                .not_title_and_description
+                .where(questionnaire: questionnaire, session_token: participant.session_token)
+                .joins(:question).order("decidim_forms_questions.position ASC")
         end
       end
     end

data/app/queries/decidim/forms/questionnaire_user_answers.rb

@@ -20,7 +20,10 @@ module Decidim
 
       # Finds and group answers by user for each questionnaire's question.
       def query
-        answers = Answer.not_separator.joins(:question).where(questionnaire: @questionnaire)
+        answers = Answer.not_separator
+                        .not_title_and_description
+                        .joins(:question)
+                        .where(questionnaire: @questionnaire)
 
         answers.sort_by { |answer| answer.question.position }.group_by { |a| a.user || a.session_token }.values
       end

data/app/views/decidim/forms/admin/questionnaires/_form.html.erb

@@ -65,6 +65,12 @@
               id: tabs_id_for_question(blank_question),
               editable: questionnaire.questions_editable? %>
       </script>
+      <script type="text/template" class="decidim-title-and-description-template decidim-template" id="title-and-description-template">
+        <%= render "decidim/forms/admin/questionnaires/title_and_description",
+              form: question_form,
+              id: tabs_id_for_question(blank_question),
+              editable: questionnaire.questions_editable? %>
+      </script>
       <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
       <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-dummy" %>
       <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-dummy" %>
@@ -83,6 +89,11 @@
                 form: question_form,
                 id: tabs_id_for_question(question),
                 editable: questionnaire.questions_editable? %>
+        <% elsif question.title_and_description? %>
+          <%= render "decidim/forms/admin/questionnaires/title_and_description",
+                form: question_form,
+                id: tabs_id_for_question(question),
+                editable: questionnaire.questions_editable? %>
         <% else %>
           <%= render "decidim/forms/admin/questionnaires/question",
                 form: question_form,
@@ -102,6 +113,7 @@
   <% if questionnaire.questions_editable? %>
     <button class="button add-question"><%= t(".add_question") %></button>
     <button class="button add-separator"><%= t(".add_separator") %></button>
+    <button class="button add-title-and-description"><%= t(".add_title_and_description") %></button>
   <% end %>
 </div>
 

data/app/views/decidim/forms/admin/questionnaires/_title_and_description.html.erb

@@ -0,0 +1,80 @@
+<% question = form.object %>
+<% is_expanded = question.errors.any? %>
+
+<div class="card questionnaire-question" id="<%= id %>-field">
+  <div class="card-divider question-divider">
+    <h2 class="card-title">
+    <span>
+      <% if editable %>
+        <%== icon("move") %>
+      <% end %>
+      <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t(".title_and_description")) %>
+    </span>
+
+      <button type="button" class="button small secondary button--title question--collapse" data-toggle="<%= id %>-question-card button--collapse-question-<%= id %> button--expand-question-<%= id %>">
+        <span id="button--collapse-question-<%= id %>" data-toggler=".hide" class="icon-collapse <%= "hide" unless is_expanded %>">
+          <%== icon("caret-top", aria_label: t(".collapse"), role: "img") %>
+        </span>
+
+        <span id="button--expand-question-<%= id %>" data-toggler=".hide" class="icon-expand <%= "hide" if is_expanded %>">
+          <%== icon("caret-bottom", aria_label: t(".expand"), role: "img") %>
+        </span>
+      </button>
+
+      <% if editable %>
+        <button class="button small alert hollow move-up-question button--title">
+          <%== "#{icon("arrow-top")} #{t(".up")}" %>
+        </button>
+
+        <button class="button small alert hollow move-down-question button--title">
+          <%== "#{icon("arrow-bottom")} #{t(".down")}" %>
+        </button>
+
+        <button class="button small alert hollow remove-question button--title">
+          <%= t(".remove") %>
+        </button>
+      <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section collapsible <%= "hide" unless is_expanded %>" data-toggler=".hide" id="<%= id %>-question-card">
+    <div class="row column">
+      <%=
+        form.translated(
+          :text_field,
+          :body,
+          tabs_id: id,
+          label: t(".title"),
+          disabled: !editable
+        )
+      %>
+    </div>
+
+    <div class="row column">
+      <%=
+        form.translated(
+          :editor,
+          :description,
+          toolbar: :full,
+          tabs_id: id,
+          label: t(".description"),
+          disabled: !editable
+        )
+      %>
+    </div>
+
+    <%=
+      form.hidden_field(
+        :question_type,
+        value: :title_and_description
+      )
+    %>
+
+    <% if question.persisted? %>
+      <%= form.hidden_field :id, disabled: !editable %>
+    <% end %>
+
+    <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
+    <%= form.hidden_field :deleted, disabled: !editable %>
+  </div>
+</div>

data/app/views/decidim/forms/questionnaires/_answer.html.erb

@@ -3,6 +3,15 @@
 <% if answer.question.separator? %>
   <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
   <%= answer_form.hidden_field :question_id %>
+<% elsif answer.question.title_and_description? %>
+  <%= label_tag field_id, translated_attribute(answer.question.body), class: "questionnaire-title_and_description" %>
+  <% if translated_attribute(answer.question.description).present? %>
+    <div class="help-title_and_description ">
+      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
+    </div>
+  <% end %>
+  <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
+  <%= answer_form.hidden_field :question_id %>
 <% else %>
   <% case answer.question.question_type %>
   <% when "single_option", "multiple_option", "sorting" %>
@@ -13,7 +22,7 @@
 
   <% if translated_attribute(answer.question.description).present? %>
     <div class="help-text">
-      <%= decidim_sanitize translated_attribute(answer.question.description) %>
+      <%= decidim_sanitize_editor translated_attribute(answer.question.description) %>
     </div>
   <% end %>
 

data/app/views/decidim/forms/questionnaires/answers/_title_and_description.html.erb

@@ -0,0 +1 @@
+<%= answer_form.hidden_field :body, value: "title-and-description", id: field_id, disabled: disabled %>

data/app/views/decidim/forms/questionnaires/show.html.erb

@@ -11,7 +11,7 @@
   <h3 class="section-heading"><%= translated_attribute questionnaire.title %></h3>
   <div class="row">
     <div class="columns large-<%= columns %> medium-centered lead">
-      <%= decidim_sanitize translated_attribute questionnaire.description %>
+      <%= decidim_sanitize_editor translated_attribute questionnaire.description %>
     </div>
   </div>
 </div>
@@ -20,8 +20,8 @@
   <div class="columns large-<%= columns %> medium-centered">
     <div class="card">
       <div class="card__content">
-       <% unless questionnaire_for.try(:component)&.try(:published?) %>
-           <div class="section">
+        <% unless questionnaire_for.try(:component)&.try(:published?) %>
+          <div class="section">
             <div class="callout warning">
               <p><%= t(".questionnaire_not_published.body") %></p>
             </div>
@@ -65,14 +65,15 @@
                     <div id="step-<%= step_index %>" class="<%= step_index.zero? ? "questionnaire-step" : "questionnaire-step hide" %>" data-toggler=".hide">
                       <% if @form.total_steps > 1 %>
                         <h4 class="section-heading">
-                          <%= t(".current_step", step: step_index + 1) %> <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @form.total_steps) %></span>
+                          <%= t(".current_step", step: step_index + 1) %>
+                          <span class="answer-questionnaire__steps"><%= t(".of_total_steps", total_steps: @form.total_steps) %></span>
                         </h4>
                       <% end %>
 
                       <% step_answers.each do |answer| %>
                         <div class="row column answer question" data-max-choices="<%= answer.question.max_choices %>" data-conditioned="<%= answer.question.display_conditions.any? %>" data-question-id="<%= answer.question.id %>">
                           <% answer.question.display_conditions.each do |display_condition| %>
-                            <%= content_tag :div, nil,  class: "display-condition", data: display_condition.to_html_data %>
+                            <%= content_tag :div, nil, class: "display-condition", data: display_condition.to_html_data %>
                           <% end %>
 
                           <%= fields_for "questionnaire[responses][#{answer_idx}]", answer do |answer_form| %>
@@ -86,7 +87,7 @@
                             ) %>
                           <% end %>
                         </div>
-                        <% if !answer.question.separator? %>
+                        <% if !(answer.question.separator? || answer.question.title_and_description?) %>
                           <% cleaned_answer_idx += 1 %>
                         <% end %>
                         <% answer_idx += 1 %>
@@ -108,7 +109,7 @@
                         <div class="row column tos-agreement">
                           <%= form.check_box :tos_agreement, label: t(".tos_agreement"), id: "questionnaire_tos_agreement", disabled: !current_participatory_space.can_participate?(current_user) %>
                           <div class="help-text">
-                            <%= decidim_sanitize translated_attribute questionnaire.tos %>
+                            <%= decidim_sanitize_editor translated_attribute questionnaire.tos %>
                           </div>
                         </div>
                       <% end %>

data/config/locales/cs.yml

@@ -79,6 +79,7 @@ cs:
           form:
             add_question: Přidat otázku
             add_separator: Přidat oddělovač
+            add_title_and_description: Přidat název a popis
             already_answered_warning: Formulář je již zodpovězen některými uživateli, takže jeho otázky nemůžete upravovat.
             collapse: Sbalit všechny otázky
             expand: Rozbalit všechny otázky
@@ -108,6 +109,15 @@ cs:
             remove: Odebrat
             separator: Oddělovač
             up: Nahoru
+          title_and_description:
+            collapse: Sbalit
+            description: Popis
+            down: Dolů
+            expand: Rozbalit
+            remove: Odebrat
+            title: Název
+            title_and_description: Název a popis
+            up: Nahoru
           update:
             invalid: Při ukládání dotazníku došlo k chybám.
             success: Formulář byl úspěšně uložen.
@@ -131,6 +141,7 @@ cs:
         short_answer: Stručná odpověď
         single_option: Jedna možnost
         sorting: Třídění
+        title_and_description: Název a popis
       questionnaires:
         answer:
           invalid: Při odpovědi na dotazník došlo k chybám.

data/config/locales/en.yml

@@ -80,6 +80,7 @@ en:
           form:
             add_question: Add question
             add_separator: Add separator
+            add_title_and_description: Add title and description
             already_answered_warning: The form is already answered by some users so you cannot modify its questions.
             collapse: Collapse all questions
             expand: Expand all questions
@@ -109,6 +110,15 @@ en:
             remove: Remove
             separator: Separator
             up: Up
+          title_and_description:
+            collapse: Collapse
+            description: Description
+            down: Down
+            expand: Expand
+            remove: Remove
+            title: Title
+            title_and_description: Title and description
+            up: Up
           update:
             invalid: There was a problem saving the form.
             success: Form successfully saved.
@@ -132,6 +142,7 @@ en:
         short_answer: Short answer
         single_option: Single option
         sorting: Sorting
+        title_and_description: Title and description
       questionnaires:
         answer:
           invalid: There was a problem answering the form.

data/config/locales/es.yml

@@ -79,6 +79,7 @@ es:
           form:
             add_question: Añadir pregunta
             add_separator: Añadir separador
+            add_title_and_description: Añadir título y descripción
             already_answered_warning: Algunas participantes ya han respondido el formulario, por lo que no puedes modificar las preguntas.
             collapse: Contraer todas las preguntas
             expand: Expandir todos las preguntas
@@ -108,6 +109,15 @@ es:
             remove: Eliminar
             separator: Separador
             up: Subir
+          title_and_description:
+            collapse: Contraer
+            description: Descripción
+            down: Bajar
+            expand: Expandir
+            remove: Eliminar
+            title: Título
+            title_and_description: Título y descripción
+            up: Subir
           update:
             invalid: Se ha producido un error al guardar el formulario.
             success: Formulario guardado correctamente.
@@ -131,6 +141,7 @@ es:
         short_answer: Respuesta corta
         single_option: Opción única
         sorting: Ordenación
+        title_and_description: Titulo y descripción
       questionnaires:
         answer:
           invalid: Se ha producido un error al responder el formulario.

data/config/locales/fi.yml

@@ -79,6 +79,7 @@ fi:
           form:
             add_question: Lisää kysymys
             add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
             already_answered_warning: Jotkut käyttäjät ovat jo vastanneet tähän kyselylomakkeeseen, joten et voi enää muokata kysymyksiä.
             collapse: Sulje kaikki kysymykset
             expand: Avaa kaikki kysymykset
@@ -108,6 +109,15 @@ fi:
             remove: Poista
             separator: Erotin
             up: Ylös
+          title_and_description:
+            collapse: Pienennä
+            description: Kuvaus
+            down: Alas
+            expand: Laajenna
+            remove: Poista
+            title: Otsikko
+            title_and_description: Otsikko ja kuvaus
+            up: Ylös
           update:
             invalid: Kyselylomakkeen tallentaminen epäonnistui.
             success: Lomake tallennettu onnistuneesti.
@@ -131,6 +141,7 @@ fi:
         short_answer: Lyhyt vastaus
         single_option: Yksi vaihtoehto
         sorting: Järjestäminen
+        title_and_description: Otsikko ja kuvaus
       questionnaires:
         answer:
           invalid: Kyselylomakkeeseen vastaaminen epäonnistui.

data/config/locales/fr-CA.yml

@@ -79,6 +79,7 @@ fr-CA:
           form:
             add_question: Ajouter une question
             add_separator: Ajouter un séparateur
+            add_title_and_description: Ajouter un titre et une description
             already_answered_warning: Certains utilisateurs ont déjà répondu au questionnaire, vous ne pouvez donc pas modifier ses questions.
             collapse: Réduire toutes les questions
             expand: Développer toutes les questions
@@ -108,6 +109,15 @@ fr-CA:
             remove: Retirer
             separator: Séparateur
             up: Haut
+          title_and_description:
+            collapse: Réduire
+            description: Description
+            down: Descendre
+            expand: Déveloper
+            remove: Supprimer
+            title: Titre
+            title_and_description: Titre et description
+            up: Vers le haut
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le formulaire a bien été sauvegardé.
@@ -131,6 +141,7 @@ fr-CA:
         short_answer: Réponse courte
         single_option: Option unique
         sorting: Tri
+        title_and_description: Titre et description
       questionnaires:
         answer:
           invalid: Il y a eu des erreurs en répondant au questionnaire.

data/config/locales/fr.yml

@@ -79,6 +79,7 @@ fr:
           form:
             add_question: Ajouter une question
             add_separator: Ajouter un séparateur
+            add_title_and_description: Ajouter un titre et une description
             already_answered_warning: Certains utilisateurs ont déjà répondu au questionnaire, vous ne pouvez donc pas modifier ses questions.
             collapse: Réduire toutes les questions
             expand: Développer toutes les questions
@@ -108,6 +109,15 @@ fr:
             remove: Retirer
             separator: Séparateur
             up: Haut
+          title_and_description:
+            collapse: Réduire
+            description: Description
+            down: Descendre
+            expand: Déveloper
+            remove: Supprimer
+            title: Titre
+            title_and_description: Titre et description
+            up: Vers le haut
           update:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le questionnaire a bien été sauvegardé.
@@ -131,6 +141,7 @@ fr:
         short_answer: Réponse courte
         single_option: Option unique
         sorting: Tri
+        title_and_description: Titre et description
       questionnaires:
         answer:
           invalid: Il y a eu des erreurs en répondant au questionnaire.

data/config/locales/ja.yml

@@ -9,7 +9,7 @@ ja:
         max_choices: 選択肢の最大数
         question_type: タイプ
       questionnaire_question:
-        mandatory: Mandatory
+        mandatory: 必須
         max_characters: 文字数制限 (制限がない場合は0にしてください)
     errors:
       models:
@@ -79,6 +79,7 @@ ja:
           form:
             add_question: 質問を追加
             add_separator: 区切り文字を追加
+            add_title_and_description: タイトルと説明を追加
             already_answered_warning: このフォームはすでに一部のユーザーによって回答されているため、質問を修正することはできません。
             collapse: すべての質問を閉じる
             expand: すべての質問を展開
@@ -108,6 +109,15 @@ ja:
             remove: 削除
             separator: 区切り記号
             up: 上へ
+          title_and_description:
+            collapse: 折りたたむ
+            description: 説明
+            down: 下へ
+            expand: 展開する
+            remove: 削除
+            title: タイトル
+            title_and_description: タイトルと説明
+            up: 上へ
           update:
             invalid: フォームの保存に失敗しました。
             success: フォームを保存しました。
@@ -131,6 +141,7 @@ ja:
         short_answer: 短い回答
         single_option: 単一オプション
         sorting: 並び替え
+        title_and_description: タイトルと説明
       questionnaires:
         answer:
           invalid: フォームの回答に問題がありました。

data/config/locales/lb-LU.yml

@@ -1 +1,104 @@
 lb:
+  activemodel:
+    attributes:
+      questionnaire_question:
+        mandatory: Verpflichtend
+        max_characters: Maximale Anzahl Zeichen (0 bedeutet kein Limit)
+    errors:
+      models:
+        answer:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: Muss erneut angehängt werden
+            body:
+              too_long: ist zu lang
+            choices:
+              missing: sind nicht vollständig
+              too_many: sind zu viele
+        questionnaire:
+          request_invalid: Bei der Bearbeitung der Anfrage ist ein Fehler aufgetreten. Bitte versuchen Sie es nochmal
+  decidim:
+    forms:
+      admin:
+        models:
+          components:
+            description: Beschreibung
+            tos: Nutzungsbedingungen
+        questionnaires:
+          actions:
+            back: Zurück zu Fragen
+            show: Antworten anzeigen
+          answer_option:
+            answer_option: Antwortoption
+            free_text: Freier Text
+            remove: Löschen
+            statement: Aussage
+          answers:
+            actions:
+              back: Zurück zu Antworten
+              export: Exportieren
+              show: Antworten anzeigen
+            empty: Noch keine Antworten
+            export:
+              answer:
+                title: 'Antwort #%{number}'
+            export_response:
+              title: Umfrage_Benutzer_Antworten_%{token}
+            index:
+              title: "%{total} Antworten insgesamt"
+            show:
+              title: 'Antwort #%{number}'
+          display_condition:
+            answer_option: Antwortoption
+            condition_question: Frage
+            condition_type: Bedingung
+            condition_types:
+              answered: Beantwortet
+              equal: Gleich
+              match: Beinhaltet Text
+              not_answered: Unbeantwortet
+              not_equal: Nicht gleich
+            condition_value: Enthaltener Text
+            display_condition: Bedingung anzeigen
+            mandatory: Diese Bedingung muss immer erfüllt werden, unabhängig vom Status anderer Bedingungen
+            remove: Löschen
+            save_warning: Vergessen Sie nicht, das Formular zu speichern, bevor Sie die Anzeigebedingungen konfigurieren
+            select_answer_option: Antwortoption auswählen
+            select_condition_question: Eine Frage
+            select_condition_type: Wählen Sie einen Bedingungstyp
+          edit:
+            save: Speichern
+            title: Fragebogen bearbeiten
+          form:
+            add_question: Frage hinzufügen
+            add_separator: Trennzeichen hinzufügen
+            already_answered_warning: Der Fragebogen wird bereits von einigen Benutzern beantwortet, sodass Sie die Fragen nicht ändern können.
+            collapse: Alle Fragen einklappen
+            expand: Alle Fragen ausklappen
+            preview: Vorschau
+            title: Formular für %{questionnaire_for} bearbeiten
+            unpublished_warning: Das Formular ist nicht öffentlich. Sie können die Fragen ändern, dabei werden allerdings die aktuellen Antworten gelöscht.
+          matrix_row:
+            matrix_row: Zeile
+      questionnaires:
+        show:
+          questionnaire_not_published:
+            body: Dieses Formular ist noch nicht veröffentlicht.
+          tos_agreement: Mit der Teilnahme stimmen Sie den Nutzungsbedingungen zu
+      step_navigation:
+        show:
+          are_you_sure: Diese Aktion kann nicht rückgängig gemacht werden und Sie können Ihre Antworten nicht bearbeiten. Bist du sicher?
+          back: Zurück
+          continue: Weiter
+          submit: einreichen
+      user_answers_serializer:
+        body: Antwort
+        completion: Abschluss
+        created_at: Beantwortet am
+        id: ID beantworten
+        ip_hash: IP-Hash
+        question: Frage
+        registered: Registriert
+        session_token: Benutzerkennung
+        unregistered: Nicht registriert
+        user_status: Benutzerstatus

data/config/locales/nl.yml

@@ -74,6 +74,7 @@ nl:
           form:
             add_question: Vraag toevoegen
             add_separator: Scheidingsteken toevoegen
+            add_title_and_description: Titel en beschrijving toevoegen
             already_answered_warning: De vragenlijst is al door enkele gebruikers beantwoord, dus u kunt de vragen niet wijzigen.
             collapse: Alle vragen samenvouwen
             expand: Vouw alle vragen uit
@@ -102,6 +103,15 @@ nl:
             remove: Verwijderen
             separator: Scheidingsteken
             up: Omhoog
+          title_and_description:
+            collapse: Inklappen
+            description: Beschrijving
+            down: Naar beneden
+            expand: Uitklappen
+            remove: Verwijderen
+            title: Titel
+            title_and_description: Titel en beschrijving
+            up: Naar boven
           update:
             invalid: Er zijn fouten opgetreden bij het opslaan van de vragenlijst.
             success: Formulier succesvol opgeslagen.
@@ -124,6 +134,7 @@ nl:
         short_answer: Kort antwoord
         single_option: Enkele optie
         sorting: sorteer-
+        title_and_description: Titel en beschrijving
       questionnaires:
         answer:
           invalid: Er zijn fouten opgetreden bij het beantwoorden van de vragenlijst.

data/config/locales/pt-BR.yml

@@ -1,4 +1,4 @@
-pt:
+pt-BR:
   activemodel:
     attributes:
       answer:

data/config/locales/val-ES.yml

@@ -0,0 +1,18 @@
+val:
+  decidim:
+    forms:
+      admin:
+        questionnaires:
+          form:
+            add_title_and_description: Afig títol i descripció
+          title_and_description:
+            collapse: Redueix
+            description: Descripció
+            down: Baixar
+            expand: Expandeix
+            remove: Elimina
+            title: Títol
+            title_and_description: Títol i descripció
+            up: Pujar
+      question_types:
+        title_and_description: Títol i descripció

data/lib/decidim/forms/test/factories.rb

@@ -123,6 +123,10 @@ FactoryBot.define do
     trait :separator do
       question_type { :separator }
     end
+
+    trait :title_and_description do
+      question_type { :title_and_description }
+    end
   end
 
   factory :answer, class: "Decidim::Forms::Answer" do
@@ -144,6 +148,14 @@ FactoryBot.define do
     question { create(:questionnaire_question) }
     body { generate_localized_title }
     free_text { false }
+
+    trait :free_text_enabled do
+      free_text { true }
+    end
+
+    trait :free_text_disabled do
+      free_text { false }
+    end
   end
 
   factory :answer_choice, class: "Decidim::Forms::AnswerChoice" do

data/lib/decidim/forms/test/shared_examples/manage_questionnaire_answers.rb

@@ -69,6 +69,24 @@ shared_examples_for "manage questionnaire answers" do
           expect(page).to have_content("User identifier")
         end
       end
+
+      context "when multiple answer choice" do
+        let(:first_type) { "multiple_option" }
+        let!(:answer1) { create :answer, questionnaire: questionnaire, question: first, body: nil }
+        let!(:answer_option) { create :answer_option, question: first }
+        let!(:answer_choice) { create :answer_choice, answer: answer1, answer_option: answer_option, body: translated(answer_option.body, locale: I18n.locale) }
+
+        before do
+          find_all("a.action-icon.action-icon--eye").first.click
+        end
+
+        it "shows the answers page with custom body" do
+          within "#answers" do
+            expect(page).to have_css("dt", text: translated(first.body))
+            expect(page).to have_css("li", text: translated(answer_option.body))
+          end
+        end
+      end
     end
 
     context "and managing individual answer page" do

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb

@@ -4,20 +4,21 @@ require "spec_helper"
 
 shared_examples_for "add questions" do
   it "adds a few questions and separators to the questionnaire" do
-    questions_body = ["This is the first question", "This is the second question"]
+    fields_body = ["This is the first question", "This is the second question", "This is the first title and description"]
 
     within "form.edit_questionnaire" do
       click_button "Add question"
       click_button "Add separator"
+      click_button "Add title and description"
       click_button "Add question"
 
-      expect(page).to have_selector(".questionnaire-question", count: 3)
+      expect(page).to have_selector(".questionnaire-question", count: 4)
 
       expand_all_questions
 
-      page.all(".questionnaire-question .collapsible").each_with_index do |question, idx|
-        within question do
-          fill_in find_nested_form_field_locator("body_en"), with: questions_body[idx]
+      page.all(".questionnaire-question .collapsible").each_with_index do |field, idx|
+        within field do
+          fill_in find_nested_form_field_locator("body_en"), with: fields_body[idx]
         end
       end
 
@@ -30,6 +31,7 @@ shared_examples_for "add questions" do
 
     expect(page).to have_selector("input[value='This is the first question']")
     expect(page).to have_selector("input[value='This is the second question']")
+    expect(page).to have_selector("input[value='This is the first title and description']")
     expect(page).to have_content("Separator #2")
   end
 
@@ -62,6 +64,35 @@ shared_examples_for "add questions" do
     expect(page).to have_selector("strong", text: "Superkalifragilistic description")
   end
 
+  it "adds a title-and-description" do
+    within "form.edit_questionnaire" do
+      click_button "Add title and description"
+      expand_all_questions
+
+      within ".questionnaire-question" do
+        fill_in find_nested_form_field_locator("body_en"), with: "Body"
+
+        fill_in_editor find_nested_form_field_locator("description_en", visible: false), with: "<strong>Superkalifragilistic description</strong>"
+      end
+
+      click_button "Save"
+    end
+
+    expect(page).to have_admin_callout("successfully")
+
+    component.update!(
+      step_settings: {
+        component.participatory_space.active_step.id => {
+          allow_answers: true
+        }
+      }
+    )
+
+    visit questionnaire_public_path
+
+    expect(page).to have_selector("strong", text: "Superkalifragilistic description")
+  end
+
   it "adds a question with answer options" do
     question_body = ["This is the first question", "This is the second question"]
     answer_options_body = [

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb

@@ -118,6 +118,104 @@ shared_examples_for "update questions" do
     end
   end
 
+  context "when a questionnaire has a title and description" do
+    let!(:question) { create(:questionnaire_question, :title_and_description, questionnaire: questionnaire, body: title_and_description_body) }
+
+    before do
+      visit questionnaire_edit_path
+      expand_all_questions
+    end
+
+    it "modifies the question when the information is valid" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          fill_in "questionnaire_questions_#{question.id}_body_en", with: "Modified title and description"
+        end
+
+        click_button "Save"
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      visit_questionnaire_edit_path_and_expand_all
+
+      expect(page).to have_selector("input[value='Modified title and description']")
+      expect(page).to have_no_selector("input[value='This is the first title and description']")
+    end
+
+    it "re-renders the form when the information is invalid and displays errors" do
+      expand_all_questions
+
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          fill_in "questionnaire_questions_#{question.id}_body_en", with: ""
+        end
+
+        click_button "Save"
+      end
+
+      expand_all_questions
+
+      expect(page).to have_admin_callout("There was a problem saving")
+      expect(page).to have_content("can't be blank", count: 1)
+      expect(page).to have_selector("input[value='']")
+      expect(page).to have_no_selector("input[value='This is the first title and description']")
+    end
+
+    it "preserves deleted status across submission failures" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          click_button "Remove"
+        end
+      end
+
+      click_button "Add question"
+
+      click_button "Save"
+
+      expect(page).to have_selector(".questionnaire-question", count: 1)
+
+      within ".questionnaire-question" do
+        expect(page).to have_selector(".card-title", text: "#1")
+        expect(page).to have_no_button("Up")
+      end
+    end
+
+    it "removes the question" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          click_button "Remove"
+        end
+
+        click_button "Save"
+      end
+
+      expect(page).to have_admin_callout("successfully")
+
+      visit questionnaire_edit_path
+
+      within "form.edit_questionnaire" do
+        expect(page).to have_selector(".questionnaire-question", count: 0)
+      end
+    end
+
+    it "cannot be moved up" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          expect(page).to have_no_button("Up")
+        end
+      end
+    end
+
+    it "cannot be moved down" do
+      within "form.edit_questionnaire" do
+        within ".questionnaire-question" do
+          expect(page).to have_no_button("Down")
+        end
+      end
+    end
+  end
+
   context "when a questionnaire has an existing question with answer options" do
     let!(:question) do
       create(

data/lib/decidim/forms/test/shared_examples/manage_questionnaires.rb

@@ -16,6 +16,14 @@ shared_examples_for "manage questionnaires" do
     }
   end
 
+  let(:title_and_description_body) do
+    {
+      en: "Este es el primer separador de texto",
+      ca: "Aquest és el primer separador de text",
+      es: "Esta es la primera pregunta"
+    }
+  end
+
   it "updates the questionnaire" do
     visit questionnaire_edit_path
 

data/lib/decidim/forms/user_answers_serializer.rb

@@ -73,7 +73,7 @@ module Decidim
           normalize_matrix_choices(answer, choices)
         else
           choices.map do |choice|
-            choice.try(:custom_body) || choice.try(:body)
+            format_free_text_for choice
           end
         end
       end
@@ -94,6 +94,12 @@ module Decidim
       def answer_translated_attribute_name(attribute)
         I18n.t(attribute.to_sym, scope: "decidim.forms.user_answers_serializer")
       end
+
+      def format_free_text_for(choice)
+        return choice.try(:body) if choice.try(:custom_body).blank?
+
+        "#{choice.try(:body)} (#{choice.try(:custom_body)})"
+      end
     end
   end
 end

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.25.2"
+      "0.26.0.rc1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.25.2
+  version: 0.26.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-25 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.25.2
+        version: 0.26.0.rc1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -165,6 +165,7 @@ files:
 - app/views/decidim/forms/admin/questionnaires/_matrix_row_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_question.html.erb
 - app/views/decidim/forms/admin/questionnaires/_separator.html.erb
+- app/views/decidim/forms/admin/questionnaires/_title_and_description.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/export/_answer.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/export/pdf.html.erb
 - app/views/decidim/forms/admin/questionnaires/answers/index.html.erb
@@ -180,6 +181,7 @@ files:
 - app/views/decidim/forms/questionnaires/answers/_short_answer.html.erb
 - app/views/decidim/forms/questionnaires/answers/_single_option.html.erb
 - app/views/decidim/forms/questionnaires/answers/_sorting.html.erb
+- app/views/decidim/forms/questionnaires/answers/_title_and_description.html.erb
 - app/views/decidim/forms/questionnaires/show.html.erb
 - app/views/layouts/decidim/forms/admin/questionnaires/questionnaire_answers.html.erb
 - config/assets.rb
@@ -250,6 +252,7 @@ files:
 - config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/val-ES.yml
 - config/locales/vi-VN.yml
 - config/locales/vi.yml
 - config/locales/zh-CN.yml
@@ -305,11 +308,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Decidim forms