decidim-forms 0.19.0 → 0.22.0

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

@@ -0,0 +1 @@
+<%= answer_form.text_area :body, label: false, id: field_id, rows: 10, disabled: disabled %>

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

@@ -0,0 +1,43 @@
+<table class="questionnaire-question-matrix table">
+  <thead>
+    <tr>
+      <td></td>
+      <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+        <td><%= translated_attribute(answer_option.body) %></td>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% answer.question.matrix_rows.each_with_index do |row, row_idx| %>
+      <tr class="check-box-collection">
+        <td><%= translated_attribute row.body %></td>
+        <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+          <% choice = answer.selected_choices.find { |choice| choice.answer_option_id == answer_option.id && choice.matrix_row_id == row.id } %>
+          <% choice_id = "#{field_id}_matrix_row_#{row_idx}_choice_#{idx}" %>
+          <td>
+            <div class="collection-input">
+              <%= check_box_tag "questionnaire[responses][#{answer_idx}][choices][][body]",
+                                    translated_attribute(answer_option.body),
+                                    choice.present?,
+                                    id: "#{choice_id}_body", disabled: disabled %>
+              <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][][answer_option_id]",
+                                    answer_option.id,
+                                    id: "#{choice_id}_answer_option",
+                                    disabled: true %>
+              <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][][matrix_row_id]",
+                                    row.id,
+                                    id: "#{choice_id}_matrix_row",
+                                    disabled: true %>
+              <% if answer_option.free_text %>
+                <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][][custom_body]",
+                choice.try(:custom_body),
+                id: "#{choice_id}_custom_body",
+                disabled: true %>
+              <% end %>
+            </div>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,43 @@
+<table class="questionnaire-question-matrix table">
+  <thead>
+    <tr>
+      <td></td>
+      <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+        <td><%= translated_attribute(answer_option.body) %></td>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% answer.question.matrix_rows.each_with_index do |row, row_idx| %>
+      <tr class="radio-button-collection">
+        <td><%= translated_attribute row.body %></td>
+        <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+          <% choice = answer.choices.find { |choice| choice.answer_option_id == answer_option.id && choice.matrix_row_id == row.id } %>
+          <% choice_id = "#{field_id}_matrix_row_#{row_idx}_choice_#{idx}" %>
+          <td>
+            <div class="collection-input">
+              <%= radio_button_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][body]",
+                                    translated_attribute(answer_option.body),
+                                    answer_option.id == choice.try(:answer_option_id),
+                                    id: "#{choice_id}_body", disabled: disabled %>
+              <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][answer_option_id]",
+                                    answer_option.id,
+                                    id: "#{choice_id}_answer_option",
+                                    disabled: true %>
+              <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][matrix_row_id]",
+                                    row.id,
+                                    id: "#{choice_id}_matrix_row",
+                                    disabled: true %>
+              <% if answer_option.free_text %>
+                <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][custom_body]",
+                choice.try(:custom_body),
+                id: "#{choice_id}_custom_body",
+                disabled: true %>
+              <% end %>
+            </div>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

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

@@ -0,0 +1,23 @@
+<div class="check-box-collection">
+  <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+    <% choice = answer.selected_choices.find { |choice| choice.answer_option_id == answer_option.id } %>
+
+    <div class="collection-input">
+      <%= label_tag do %>
+        <%= check_box_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][body]",
+                          translated_attribute(answer_option.body),
+                          choice.present?, disabled: disabled %>
+
+        <%= translated_attribute(answer_option.body) %>
+
+        <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][answer_option_id]", answer_option.id %>
+      <% end %>
+
+      <% if answer_option.free_text %>
+        <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][custom_body]",
+        choice.try(:custom_body),
+        disabled: true %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

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

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

@@ -0,0 +1 @@
+<%= answer_form.text_field :body, label: false, id: field_id, disabled: disabled %>

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

@@ -0,0 +1,30 @@
+<div class="radio-button-collection">
+  <% choice = answer.choices.first %>
+
+  <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+    <% choice_id = "#{field_id}_choices_#{idx}" %>
+
+    <div class="collection-input">
+      <%= label_tag "#{choice_id}_body" do %>
+        <%= radio_button_tag "questionnaire[responses][#{answer_idx}][choices][][body]",
+                            translated_attribute(answer_option.body),
+                            answer_option.id == choice.try(:answer_option_id),
+                            id: "#{choice_id}_body", disabled: disabled %>
+
+        <%= translated_attribute(answer_option.body) %>
+
+        <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][][answer_option_id]",
+                            answer_option.id,
+                            id: "#{choice_id}_answer_option",
+                            disabled: true %>
+      <% end %>
+
+      <% if answer_option.free_text %>
+        <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][][custom_body]",
+        choice.try(:custom_body),
+        id: "#{choice_id}_custom_body",
+        disabled: true %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,23 @@
+<div class="sortable-check-box-collection">
+  <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
+    <% choice = answer.selected_choices.find { |choice| choice.answer_option_id == answer_option.id } %>
+
+    <div class="collection-input">
+      <%= label_tag do %>
+        <%= check_box_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][body]",
+                          translated_attribute(answer_option.body),
+                          choice.present?, disabled: disabled %>
+
+        <span class="position"><%= choice.try(:position) %></span>
+
+        <%= translated_attribute(answer_option.body) %>
+
+        <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][position]",
+                            choice.try(:position),
+                            disabled: true %>
+
+        <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][answer_option_id]", answer_option.id %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

@@ -3,24 +3,26 @@
   description: translated_attribute(questionnaire.description),
 }) %>
 
+<% columns = allow_answers? && visitor_can_answer? && @form.responses.map(&:question).any?(&:matrix?) ? 9 : 6 %>
+
 <%= render partial: "decidim/shared/component_announcement" %>
 
 <div class="row columns">
-  <h2 class="section-heading"><%= translated_attribute questionnaire.title %></h2>
+  <h3 class="section-heading"><%= translated_attribute questionnaire.title %></h3>
   <div class="row">
-    <div class="columns large-6 medium-centered lead">
+    <div class="columns large-<%= columns %> medium-centered lead">
       <%= decidim_sanitize translated_attribute questionnaire.description %>
     </div>
   </div>
 </div>
 
 <div class="row">
-  <div class="columns large-6 medium-centered">
+  <div class="columns large-<%= columns %> medium-centered">
     <div class="card">
       <div class="card__content">
         <% if allow_answers? %>
-          <% if current_user %>
-            <% if questionnaire.answered_by?(current_user) %>
+          <% if visitor_can_answer? %>
+            <% if visitor_already_answered? %>
               <div class="section">
                 <div class="callout success">
                   <h5><%= t(".questionnaire_answered.title") %></h5>
@@ -38,31 +40,62 @@
                   </div>
                 <% end %>
 
-                <%= decidim_form_for(@form, url: update_url, method: :post, html: { class: "form answer-questionnaire" }) do |form| %>
-                  <% @form.answers.each_with_index do |answer, answer_idx| %>
-                    <div class="row column">
-                      <%= fields_for "questionnaire[answers][#{answer_idx}]", answer do |answer_form| %>
-                        <%= render "decidim/forms/questionnaires/answer", answer_form: answer_form, answer: answer, answer_idx: answer_idx, disabled: !current_participatory_space.can_participate?(current_user) %>
+                <%= decidim_form_for(@form, url: update_url, method: :post, html: { class: "form answer-questionnaire" }, data: { "safe-path" => form_path }) do |form| %>
+                  <%= form_required_explanation %>
+                  <%= invisible_captcha %>
+                  <% answer_idx = 0 %>
+                  <% cleaned_answer_idx = 0 %>
+                  <% @form.responses_by_step.each_with_index do |step_answers, step_index| %>
+                    <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>
+                        </h4>
                       <% end %>
-                    </div>
-                  <% end %>
 
-                  <% if show_represent_user_group? %>
-                    <div class="row column represent-user-group">
-                      <%= cell("decidim/represent_user_group", form) %>
-                    </div>
-                  <% end %>
+                      <% step_answers.each do |answer| %>
+                        <div class="row column answer" data-max-choices="<%= answer.question.max_choices %>">
+                          <%= fields_for "questionnaire[responses][#{answer_idx}]", answer do |answer_form| %>
+                            <%= render(
+                              "decidim/forms/questionnaires/answer",
+                              answer_form: answer_form,
+                              answer: answer,
+                              answer_idx: answer_idx,
+                              cleaned_answer_idx: cleaned_answer_idx,
+                              disabled: !current_participatory_space.can_participate?(current_user)
+                            ) %>
+                          <% end %>
+                        </div>
+                        <% if !answer.question.separator? %>
+                          <% cleaned_answer_idx += 1 %>
+                        <% end %>
+                        <% answer_idx += 1 %>
+                      <% end %>
 
-                  <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 %>
-                    </div>
-                  </div>
+                      <% if step_index + 1 == @form.total_steps %>
+                        <% if show_represent_user_group? %>
+                          <div class="row column represent-user-group">
+                            <%= cell("decidim/represent_user_group", form) %>
+                          </div>
+                        <% end %>
 
-                  <div class="button--double form-general-submit">
-                    <%= form.submit t(".submit"), class: "button", disabled: !current_participatory_space.can_participate?(current_user), data: { confirm: t(".are_you_sure"), disable: true } %>
-                  </div>
+                        <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 %>
+                          </div>
+                        </div>
+                      <% end %>
+
+                      <%= cell(
+                        "decidim/forms/step_navigation",
+                        step_index,
+                        total_steps: @form.total_steps,
+                        button_disabled: !current_participatory_space.can_participate?(current_user),
+                        form: form
+                      ) %>
+                    </div>
+                  <% end %>
                 <% end %>
               </div>
             <% end %>
@@ -81,7 +114,7 @@
         <% else %>
           <div class="section">
             <div class="callout warning">
-              <h5><%= t(".questionnaire_closed.title") %></h5>
+              <h4><%= t(".questionnaire_closed.title") %></h4>
               <p><%= t(".questionnaire_closed.body") %></p>
             </div>
           </div>

data/config/locales/ar.yml

@@ -15,6 +15,8 @@ ar:
             choices:
               missing: ليست كاملة
               too_many: كثير جدا
+        questionnaire:
+          request_invalid: حدث خطأ أثناء معالجة الطلب. الرجاء إعادة المحاولة ثانية
   decidim:
     forms:
       admin:
@@ -30,10 +32,12 @@ ar:
             statement: بيان
           edit:
             save: حفظ
-            title: عنوان
           form:
             add_question: أضف سؤال
             already_answered_warning: تمت الإجابة على النموذج من قبل بعض المستخدمين حتى لا تتمكن من تعديل أسئلته.
+          matrix_row:
+            remove: إزالة
+            statement: بيان
           question:
             add_answer_option: إضافة خيار الإجابة
             any: أي
@@ -65,7 +69,6 @@ ar:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">قم بتسجيل الدخول بحسابك</a> أو <a href="%{sign_up_link}">اشترك</a> للإجابة على النموذج
             title: أجب عن النموذج
-          are_you_sure: لا يمكن التراجع عن هذا الإجراء ولن تتمكن من تعديل إجاباتك. هل أنت واثق؟
           questionnaire_answered:
             body: لقد أجبت بالفعل على هذا النموذج.
             title: تمت الاجابة مسبقا
@@ -75,8 +78,14 @@ ar:
           questionnaire_for_private_users:
             body: النموذج متاح فقط للمستخدمين من القطاع الخاص
             title: شكل مغلق
-          submit: خضع
           tos_agreement: من خلال المشاركة ، فإنك تقبل شروط الخدمة
+      step_navigation:
+        show:
+          are_you_sure: لا يمكن التراجع عن هذا الإجراء ولن تتمكن من تعديل إجاباتك. هل أنت واثق؟
+          submit: خضع
       user_answers_serializer:
         created_at: أجاب على
         id: معرف الإجابة
+        registered: مُسجَّل
+        unregistered: غير مُسجَّل
+        user_status: حالة المستخدم

data/config/locales/bg-BG.yml

@@ -0,0 +1,16 @@
+bg:
+  activemodel:
+    attributes:
+      answer:
+        body: Отговор
+      question:
+        max_choices: Максимален брой възможности
+        question_type: Тип
+  decidim:
+    forms:
+      step_navigation:
+        show:
+          are_you_sure: Това действие не може да се отмени и Вие не можете да редактирате отговорите си. Сигурни ли сте?
+          submit: Изпрати
+      user_answers_serializer:
+        ip_hash: Ip Хеш

data/config/locales/ca.yml

@@ -2,7 +2,7 @@ ca:
   activemodel:
     attributes:
       answer:
-        body: Respondre
+        body: Resposta
       question:
         max_choices: Nombre màxim d'opcions
         question_type: Tipus
@@ -15,42 +15,69 @@ ca:
             choices:
               missing: no estan complets
               too_many: en són masses
+        questionnaire:
+          request_invalid: Hi ha hagut un problema gestionant la petició. Si us plau torna-ho a provar
   decidim:
     forms:
       admin:
         models:
           components:
             description: Descripció
-            tos: Termes i condicions d'ús
+            tos: Termes del servei
         questionnaires:
           answer_option:
             answer_option: Opció de resposta
             free_text: Text lliure
-            remove: Eliminar
+            remove: Elimina
             statement: Declaració
           edit:
-            save: Desar
-            title: Títol
+            save: Desa
+            title: Editar el qüestionari
           form:
             add_question: Afegeix una pregunta
+            add_separator: Afegir separador
             already_answered_warning: No pots modificar les preguntes d'aquest formulari perquè ja ha estat contestat per algunes participants.
+            collapse: Redueix totes les preguntes
+            expand: Expandeix totes les preguntes
+          matrix_row:
+            matrix_row: Fila
+            remove: Elimina
+            statement: Declaració
           question:
             add_answer_option: Afegeix una opció de resposta
+            add_matrix_row: Afegir fila
             any: Cap
+            collapse: Redueix
             description: Descripció
             down: Avall
+            expand: Expandeix
             question: Pregunta
             remove: Eliminar
             statement: Declaració
             up: Amunt
+          separator:
+            down: Baixar
+            remove: Eliminar
+            separator: Separador
+            up: Pujar
           update:
             invalid: S'ha produït un error en desar el formulari.
             success: Els formularis s'han desat correctament.
       errors:
         answer:
           body: El camp no pot estar en blanc
+      files:
+        extension_whitelist: 'Formats d''arxiu acceptats:'
+      images:
+        dimensions: "%{width} x %{height} px"
+        dimensions_info: 'Esta imagen medirà:'
+        processors:
+          resize_and_pad: Redimensionat i ajustat a
+          resize_to_fit: Redimensionada per ajustar-la
       question_types:
         long_answer: Resposta llarga
+        matrix_multiple: Matriu (opció multiple)
+        matrix_single: Matriu (opció única)
         multiple_option: Opció múltiple
         short_answer: Resposta curta
         single_option: Opció única
@@ -58,6 +85,7 @@ ca:
       questionnaires:
         answer:
           invalid: S'han produït un error en respondre el formulari.
+          max_choices_alert: Hi ha masses opcions seleccionades
           success: Has contestat el formulari correctament.
         question:
           max_choices: 'Opcions màximes: %{n}'
@@ -65,7 +93,8 @@ ca:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">Inicia sessió amb el teu compte</a> o <a href="%{sign_up_link}">registra't</a> per respondre el formulari.
             title: Respon el formulari
-          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Estàs segura?
+          current_step: Pas %{step}
+          of_total_steps: de %{total_steps}
           questionnaire_answered:
             body: Ja has respost a aquest formulari.
             title: Ja has respost
@@ -75,8 +104,17 @@ ca:
           questionnaire_for_private_users:
             body: El formulari només està disponible per a participants privades
             title: S'ha tancat el formulari
-          submit: Enviar respostes
           tos_agreement: En participar acceptes els Termes i condicions d'ús
+      step_navigation:
+        show:
+          are_you_sure: Aquesta acció no es pot desfer i no podràs editar les teves respostes. Estàs segura?
+          back: Enrere
+          continue: Continuar
+          submit: Enviar respostes
       user_answers_serializer:
         created_at: Respost el
         id: Identificador de resposta
+        ip_hash: Ip Hash
+        registered: Registrada
+        unregistered: No registrada
+        user_status: Estat de l'usuària