decidim-forms 0.30.9 → 0.31.0.rc1

data/app/views/decidim/forms/questionnaires/{answers → responses}/_matrix_multiple.html.erb

@@ -1,40 +1,41 @@
-<div class="answer-questionnaire__multiple-matrix">
+<div class="response-questionnaire__multiple-matrix">
   <table>
     <thead>
       <tr>
         <td></td>
-        <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
-          <th><%= translated_attribute(answer_option.body) %></th>
+        <% response.question.response_options.each_with_index do |response_option, idx| %>
+          <th><%= translated_attribute(response_option.body) %></th>
         <% end %>
       </tr>
     </thead>
     <tbody>
-      <% answer.question.matrix_rows.by_position.each_with_index do |row, row_idx| %>
+      <% response.question.matrix_rows.by_position.each_with_index do |row, row_idx| %>
         <tr class="js-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 } %>
+          <% response.question.response_options.each_with_index do |response_option, idx| %>
+            <% choice = response.selected_choices.find { |choice| choice.response_option_id == response_option.id && choice.matrix_row_id == row.id } %>
             <% choice_id = "#{field_id}_matrix_row_#{row_idx}_choice_#{idx}" %>
             <td>
               <div class="js-collection-input">
-                <%= check_box_tag "questionnaire[responses][#{answer_idx}][choices][][body]",
-                                  translated_attribute(answer_option.body),
+                <%= check_box_tag "questionnaire[responses][#{response_idx}][choices][][body]",
+                                  translated_attribute(response_option.body),
                                   choice.present?,
-                                  "aria-label": translated_attribute(answer_option.body),
+                                  "aria-label": translated_attribute(response_option.body),
                                   id: "#{choice_id}_body", disabled: %>
-                <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][][answer_option_id]",
-                                     answer_option.id,
-                                     id: "#{choice_id}_answer_option",
+                <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][][response_option_id]",
+                                     response_option.id,
+                                     id: "#{choice_id}_response_option",
                                      disabled: true %>
-                <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][][matrix_row_id]",
+                <%= hidden_field_tag "questionnaire[responses][#{response_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]",
+                <% if response_option.free_text %>
+                  <%= text_field_tag "questionnaire[responses][#{response_idx}][choices][][custom_body]",
                                      choice.try(:custom_body),
                                      id: "#{choice_id}_custom_body",
                                      disabled: true,
+                                     data: { controller: "character-counter" },
                                      maxlength: %>
                 <% end %>
               </div>

data/app/views/decidim/forms/questionnaires/{answers → responses}/_matrix_single.html.erb

@@ -1,40 +1,41 @@
-<div class="answer-questionnaire__single-matrix">
+<div class="response-questionnaire__single-matrix">
   <table>
     <thead>
       <tr>
         <td></td>
-        <% answer.question.answer_options.each_with_index do |answer_option, idx| %>
-          <th><%= translated_attribute(answer_option.body) %></th>
+        <% response.question.response_options.each_with_index do |response_option, idx| %>
+          <th><%= translated_attribute(response_option.body) %></th>
         <% end %>
       </tr>
     </thead>
     <tbody>
-      <% answer.question.matrix_rows.by_position.each_with_index do |row, row_idx| %>
+      <% response.question.matrix_rows.by_position.each_with_index do |row, row_idx| %>
         <tr class="js-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 } %>
+          <% response.question.response_options.each_with_index do |response_option, idx| %>
+            <% choice = response.choices.find { |choice| choice.response_option_id == response_option.id && choice.matrix_row_id == row.id } %>
             <% choice_id = "#{field_id}_matrix_row_#{row_idx}_choice_#{idx}" %>
             <td>
               <div class="js-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),
-                                     "aria-label": translated_attribute(answer_option.body),
+                <%= radio_button_tag "questionnaire[responses][#{response_idx}][choices][#{row_idx}][body]",
+                                     translated_attribute(response_option.body),
+                                     response_option.id == choice.try(:response_option_id),
+                                     "aria-label": translated_attribute(response_option.body),
                                      id: "#{choice_id}_body", disabled: %>
-                <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][answer_option_id]",
-                                     answer_option.id,
-                                     id: "#{choice_id}_answer_option",
+                <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][#{row_idx}][response_option_id]",
+                                     response_option.id,
+                                     id: "#{choice_id}_response_option",
                                      disabled: true %>
-                <%= hidden_field_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][matrix_row_id]",
+                <%= hidden_field_tag "questionnaire[responses][#{response_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]",
+                <% if response_option.free_text %>
+                  <%= text_field_tag "questionnaire[responses][#{response_idx}][choices][#{row_idx}][custom_body]",
                                      choice.try(:custom_body),
                                      id: "#{choice_id}_custom_body",
                                      disabled: true,
+                                     data: { controller: "character-counter" },
                                      maxlength: %>
                 <% end %>
               </div>

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

@@ -0,0 +1,26 @@
+<div class="response-questionnaire__single-option js-check-box-collection">
+  <% response.question.response_options.each_with_index do |response_option, idx| %>
+    <% choice = response.selected_choices.find { |choice| choice.response_option_id == response_option.id } %>
+
+    <div class="js-collection-input">
+      <%= label_tag do %>
+        <%= check_box_tag "questionnaire[responses][#{response_idx}][choices][#{idx}][body]",
+                          translated_attribute(response_option.body),
+                          choice.present?, disabled: %>
+
+        <%= translated_attribute(response_option.body) %>
+
+        <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][#{idx}][response_option_id]", response_option.id %>
+      <% end %>
+
+      <% if response_option.free_text %>
+        <%= text_field_tag "questionnaire[responses][#{response_idx}][choices][#{idx}][custom_body]",
+                           choice.try(:custom_body),
+                           disabled: true,
+                           data: { controller: "character-counter" },
+                           maxlength:,
+                           class: "w-full" %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

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

data/app/views/decidim/forms/questionnaires/responses/_short_response.html.erb

@@ -0,0 +1,3 @@
+<div>
+  <%= response_form.text_field :body, label: false, id: field_id, disabled:, maxlength:, class: "w-full", required: false, data: { controller: "character-counter" } %>
+</div>

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

@@ -0,0 +1,33 @@
+<div class="response-questionnaire__single-option js-radio-button-collection">
+  <% choice = response.choices.first %>
+
+  <% response.question.response_options.each_with_index do |response_option, idx| %>
+    <% choice_id = "#{field_id}_choices_#{idx}" %>
+
+    <div class="js-collection-input">
+      <%= label_tag "#{choice_id}_body" do %>
+        <%= radio_button_tag "questionnaire[responses][#{response_idx}][choices][][body]",
+                             translated_attribute(response_option.body),
+                             response_option.id == choice.try(:response_option_id),
+                             id: "#{choice_id}_body", disabled: %>
+
+        <%= translated_attribute(response_option.body) %>
+
+        <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][][response_option_id]",
+                             response_option.id,
+                             id: "#{choice_id}_response_option",
+                             disabled: true %>
+      <% end %>
+
+      <% if response_option.free_text %>
+        <%= text_field_tag "questionnaire[responses][#{response_idx}][choices][][custom_body]",
+                           choice.try(:custom_body),
+                           id: "#{choice_id}_custom_body",
+                           disabled: true,
+                           maxlength:,
+                           data: { controller: "character-counter" },
+                           class: "w-full" %>
+      <% end %>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,26 @@
+<div class="response-questionnaire__sorting-container js-sortable-check-box-collection">
+  <%
+    # This is a block that aims to identify the order to the response questions, and if there is an user response, use that
+    # to order the date that needs to be displayed. It is done like this to help with edit user response form
+  %>
+  <% ordering = response.question.response_options.pluck(:id) %>
+  <% if response.selected_choices.present? %>
+    <% ordering = response.selected_choices.map(&:response_option_id) %>
+  <% end %>
+
+  <% ids_for_order = ordering.map.with_index { |id, index| "#{id}=#{index + 1}" }.join(", ") %>
+
+  <% response.question.reload.response_options.reorder(Arel.sql("POSITION(id::text in '#{ids_for_order}')")).each_with_index do |response_option, idx| %>
+    <% choice = response.selected_choices.find { |choice| choice.response_option_id == response_option.id } %>
+
+    <div class="response-questionnaire__sorting js-collection-input" role="button">
+      <%= translated_attribute(response_option.body) %>
+
+      <%= icon "drag-move-2-line" %>
+
+      <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][#{idx}][position]", choice.try(:position) %>
+      <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][#{idx}][body]", translated_attribute(response_option.body) %>
+      <%= hidden_field_tag "questionnaire[responses][#{response_idx}][choices][#{idx}][response_option_id]", response_option.id %>
+    </div>
+  <% end %>
+</div>

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

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

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

@@ -29,17 +29,17 @@
   <% end %>
 
   <section>
-    <% if allow_answers? %>
-      <% if visitor_can_answer? %>
-        <% if visitor_already_answered? %>
-          <% if visitor_can_edit_answers? && current_component.manifest_name == "surveys" %>
-            <% body = t("decidim.forms.questionnaires.show.questionnaire_answered_edit.body",
-                        link: link_to(t("decidim.forms.questionnaires.show.questionnaire_answered_edit.edit"), edit_survey_path(questionnaire_for))
+    <% if allow_responses? %>
+      <% if visitor_can_respond? %>
+        <% if visitor_already_responded? %>
+          <% if visitor_can_edit_responses? && current_component.manifest_name == "surveys" %>
+            <% body = t("decidim.forms.questionnaires.show.questionnaire_responded_edit.body",
+                        link: link_to(t("decidim.forms.questionnaires.show.questionnaire_responded_edit.edit"), edit_survey_path(questionnaire_for))
             ) %>
           <% else %>
-            <% body = t("decidim.forms.questionnaires.show.questionnaire_answered.body") %>
+            <% body = t("decidim.forms.questionnaires.show.questionnaire_responded.body") %>
           <% end %>
-          <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_answered.title"), body: body }) %>
+          <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_responded.title"), body: body }) %>
         <% else %>
           <% if @form.responses_by_step.flatten.empty? %>
             <%= cell("decidim/announcement", t("decidim.forms.questionnaires.show.empty")) %>
@@ -51,8 +51,8 @@
         <%= render partial: "decidim/forms/questionnaires/questionnaire_readonly" %>
       <% end %>
     <% else %>
-      <% if questionnaire_for.class.name == "Decidim::Surveys::Survey" && show_published_questions_answers? %>
-        <%= render partial: "decidim/surveys/surveys/published_questions_answers" %>
+      <% if questionnaire_for.class.name == "Decidim::Surveys::Survey" && show_published_questions_responses? %>
+        <%= render partial: "decidim/surveys/surveys/published_questions_responses" %>
       <% else %>
         <%= cell("decidim/announcement", { title: t("decidim.forms.questionnaires.show.questionnaire_closed.title"), body: t("decidim.forms.questionnaires.show.questionnaire_closed.body") }, callout_class: "warning") %>
       <% end %>

data/config/assets.rb

@@ -2,8 +2,8 @@
 
 base_path = File.expand_path("..", __dir__)
 
-Decidim::Webpacker.register_path("#{base_path}/app/packs")
-Decidim::Webpacker.register_entrypoints(
+Decidim::Shakapacker.register_path("#{base_path}/app/packs")
+Decidim::Shakapacker.register_entrypoints(
   decidim_forms: "#{base_path}/app/packs/entrypoints/decidim_forms.js",
   decidim_forms_admin: "#{base_path}/app/packs/entrypoints/decidim_forms_admin.js"
 )

data/config/locales/ar.yml

@@ -2,8 +2,6 @@
 ar:
   activemodel:
     attributes:
-      answer:
-        body: إجابة
       question:
         max_choices: أقصى عدد من الخيارات
         question_type: نوع
@@ -17,10 +15,6 @@ ar:
             description: وصف
             tos: شروط الخدمة
         questionnaires:
-          answer_option:
-            answer_option: خيار الإجابة
-            remove: إزالة
-            statement: بيان
           display_condition:
             condition_question: سؤال
             remove: حذف
@@ -32,36 +26,26 @@ ar:
             remove: إزالة
             statement: بيان
           question:
-            add_answer_option: إضافة خيار الإجابة
             any: أي
             description: وصف
+            down: أسفل
             question: سؤال
             remove: إزالة
             statement: بيان
+            up: فوق
           title_and_description:
             description: الوصف
           update:
             invalid: كانت هناك مشكلة في حفظ النموذج.
       question_types:
-        long_answer: اجابة طويلة
         multiple_option: خيار متعدد
-        short_answer: اجابة قصيرة
         single_option: خيار واحد
         sorting: فرز
       questionnaires:
-        answer:
-          invalid: كانت هناك مشكلة في الإجابة على النموذج.
-          success: نموذج أجاب بنجاح.
         question:
           max_choices: 'خيارات ماكس: %{n}'
         show:
-          answer_questionnaire:
-            title: أجب عن النموذج
-          questionnaire_answered:
-            body: لقد أجبت بالفعل على هذا النموذج.
-            title: تمت الاجابة مسبقا
           questionnaire_closed:
-            body: النموذج مغلق ولا يمكن الرد عليه.
             title: شكل مغلق
           questionnaire_for_private_users:
             body: النموذج متاح فقط للمستخدمين من القطاع الخاص
@@ -70,7 +54,3 @@ ar:
       step_navigation:
         show:
           submit: خضع
-      user_answers_serializer:
-        created_at: أجاب على
-        id: معرف الإجابة
-        question: سؤال

data/config/locales/bg.yml

@@ -2,8 +2,6 @@
 bg:
   activemodel:
     attributes:
-      answer:
-        body: Отговор
       question:
         max_choices: Максимален брой възможности
         question_type: Тип
@@ -19,35 +17,19 @@ bg:
             tos: Условия за ползване
         questionnaires:
           actions:
-            show: Показване на отговорите
-          answer_option:
-            answer_option: Възможност за отговор
-            remove: Премахни
-            statement: Изявление
-          answers:
-            actions:
-              show: Показване на отговорите
-            empty: Все още няма отговори
-            export_response:
-              title: survey_user_answers_%{token}
-            show:
-              title: 'Отговор № %{number}'
+            back: Назад към въпросите
           display_condition:
-            answer_option: Възможност за отговор
             condition_question: Въпрос
             condition_type: Условие
             condition_types:
-              answered: Отговорено
               equal: Равно
               match: Включва текст
-              not_answered: Неотговорено
               not_equal: Не е равно
             condition_value: Включен текст
             display_condition: Условие за показване
             mandatory: Това условие винаги трябва да бъде удовлетворено, независимо от състоянието на другите условия
             remove: Премахни
             save_warning: Не забравяйте да запазите формуляра, преди да конфигурирате условията за показване
-            select_answer_option: Изберете вариант за отговор
             select_condition_question: Изберете въпрос
             select_condition_type: Изберете тип условие
           edit:
@@ -64,27 +46,35 @@ bg:
             remove: Премахни
             statement: Изявление
           question:
-            add_answer_option: Добавяне на възможност за отговор
             add_display_condition: Добавяне на условие за показване
             add_display_condition_info: Запазете формуляра, за да конфигурирате условията за показване
             add_matrix_row: Добавяне на ред
             any: Някой
             collapse: Свий
             description: Описание
+            down: Надолу
             expand: Разтваряне
             question: Въпрос
             remove: Премахни
             statement: Изявление
+            up: Горе
+          responses:
+            actions:
+              show: Показване на отговорите
           separator:
+            down: Долу
             remove: Премахни
             separator: Разделител
+            up: Горе
           title_and_description:
             collapse: Свий
             description: Описание
+            down: Долу
             expand: Разтваряне
             remove: Премахни
             title: Заглавие
             title_and_description: Заглавие и описание
+            up: Горе
           update:
             invalid: Възникна проблем при запазването на формуляра.
             success: Формулярите бяха запазени успешно.
@@ -98,31 +88,20 @@ bg:
           resize_to_fit: Това изображение ще бъде преоразмерено и уплътнено до %{dimensions}.
       question_types:
         files: Файлове
-        long_answer: Дълъг отговор
         matrix_multiple: Матрица (множество опции)
         matrix_single: Матрица (единична опция)
         multiple_option: Множество опции
-        short_answer: Кратък отговор
         single_option: Единична опция
         sorting: Сортиране
         title_and_description: Заглавие и описание
       questionnaires:
-        answer:
-          invalid: Възникна проблем при попълването на отговорите във формуляра.
-          success: Отговорите са попълнени успешно във формуляра.
         question:
           max_choices: 'Максимален брой избрани варианти: %{n}'
         show:
-          answer_questionnaire:
-            title: Попълване на отговори във формуляра
           current_step: Стъпка %{step}
           empty: Все още няма конфигурирани въпроси за този формуляр.
           of_total_steps: от %{total_steps}
-          questionnaire_answered:
-            body: Вече сте попълнили отговорите в този формуляр.
-            title: Вече сте отговорили
           questionnaire_closed:
-            body: Формулярът е затворен и не можете да попълните отговорите си.
             title: Формулярът е затворен
           questionnaire_for_private_users:
             body: Формулярът е налице само за частни потребители
@@ -138,8 +117,3 @@ bg:
           back: Назад
           continue: Продължи
           submit: Изпрати
-      user_answers_serializer:
-        body: Отговор
-        created_at: Отговорено на
-        id: ID на отговора
-        question: Въпрос