decidim-forms 0.30.2 → 0.31.0.rc1

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

@@ -1,7 +1,7 @@
 <% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit.title")) %>
 
 <% if templates_defined? && choose_template? %>
-  <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
+  <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title"), show_buttons: true } %>
 <% else %>
 
 <div class="questionnaire-questions">
@@ -11,20 +11,20 @@
 
       <% unless template? questionnaire.questionnaire_for %>
         <% if questionnaire.questions_editable? %>
-          <button class="button button__sm button__secondary add-question"><%= t(".add_question") %></button>
-          <button class="button button__sm button__secondary add-separator"><%= t(".add_separator") %></button>
-          <button class="button button__sm button__secondary add-title-and-description"><%= t(".add_title_and_description") %></button>
+          <button class="button button__sm button__transparent-secondary add-question"><%= t(".add_question") %></button>
+          <button class="button button__sm button__transparent-secondary add-separator"><%= t(".add_separator") %></button>
+          <button class="button button__sm button__transparent-secondary add-title-and-description"><%= t(".add_title_and_description") %></button>
         <% end %>
         <% if allowed_to? :preview, :questionnaire %>
           <%= link_to t("preview", scope: "decidim.forms.admin.questionnaires.form"), public_url, class: "button button__sm button__transparent-secondary", target: :_blank, data: { "external-link": false } %>
         <% end %>
-        <% if questionnaire.answers.any? %>
-          <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_answers, :questionnaire %>
-          <% if allowed_to? :show, :questionnaire_answers %>
+        <% if questionnaire.responses.any? %>
+          <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_responses, :questionnaire %>
+          <% if allowed_to? :show, :questionnaire_responses %>
             <%= link_to t("actions.show", scope: "decidim.forms.admin.questionnaires"), questionnaire_participants_url, class: "button button__sm button__secondary new whitespace-nowrap" %>
           <% end %>
         <% else %>
-          <button class="button button__sm button__secondary whitespace-nowrap" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
+          <button class="button button__sm button__secondary whitespace-nowrap" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.responses") %></button>
         <% end %>
       <% end %>
     </h1>

data/app/views/decidim/forms/admin/questionnaires/responses/index.html.erb

@@ -0,0 +1,80 @@
+<div class="card" id="responses">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t ".title", total: @total %>
+      <%= link_to t("actions.back", scope: "decidim.forms.admin.questionnaires"), questionnaire_url, class: "button button__sm button__secondary new" %>
+    </h1>
+  </div>
+  <div class="table-stacked">
+    <table class="table-list">
+      <thead>
+        <tr>
+          <th>#</th>
+          <th><%= first_table_th(@participants.first) %></th>
+          <th><%= t("user_status", scope: "decidim.forms.user_responses_serializer") %></th>
+          <th><%= t("ip_hash", scope: "decidim.forms.user_responses_serializer") %></th>
+          <th><%= t("completion", scope: "decidim.forms.user_responses_serializer") %></th>
+          <th><%= t("created_at", scope: "decidim.forms.user_responses_serializer") %></th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% @participants.each_with_index do |participant, idx| %>
+          <tr>
+            <td data-label="#"><%= idx + 1 + page_offset %></td>
+            <td data-label="<%= first_table_th(@participants.first) %>">
+              <% if allowed_to? :show, :questionnaire_responses %>
+                <%= link_to first_table_td(participant), questionnaire_participant_responses_url(participant.session_token) %>
+              <% else %>
+                <%= first_table_td(participant) %>
+              <% end %>
+            </td>
+            <td data-label="<%= t("user_status", scope: "decidim.forms.user_responses_serializer") %>">
+              <%= participant.status %>
+            </td>
+            <td data-label="<%= t("ip_hash", scope: "decidim.forms.user_responses_serializer") %>">
+              <%= participant.ip_hash %>
+            </td>
+            <td data-label="<%= t("completion", scope: "decidim.forms.user_responses_serializer") %>">
+              <%= display_percentage(participant.completion) %>
+            </td>
+            <td data-label="<%= t("created_at", scope: "decidim.forms.user_responses_serializer") %>">
+              <%= l participant.responded_at, format: :short %>
+            </td>
+            <td data-label="<%= t("actions.actions", scope: "decidim.admin") %>" class="table-list__actions">
+              <button type="button" data-controller="dropdown" data-target="actions-participant-<%= participant.id %>"
+                aria-label="<%= t("decidim.admin.actions.actions_label", resource: participant.session_token) %>">
+                <%= icon "more-fill", class: "text-secondary" %>
+              </button>
+
+              <div class="inline-block relative">
+                <ul id="actions-participant-<%= participant.id %>" class="dropdown dropdown__action" aria-hidden="true">
+                  <% if allowed_to? :show, :questionnaire_responses %>
+                    <li class="dropdown__item">
+                      <%= link_to questionnaire_participant_responses_url(participant.session_token), target: "_blank", data: { "external-link": false }, class: "dropdown__button" do %>
+                        <%= icon "eye-line" %>
+                        <%= t("actions.show", scope: "decidim.forms.admin.questionnaires.responses") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+
+                  <% if allowed_to? :export_response, :questionnaire_responses %>
+                    <hr>
+
+                    <li class="dropdown__item">
+                      <%= link_to questionnaire_export_response_url(participant.session_token), class: "dropdown__button" do %>
+                        <%= icon "download-line" %>
+                        <%= t("actions.export", scope: "decidim.forms.admin.questionnaires.responses") %>
+                      <% end %>
+                    </li>
+                  <% end %>
+                </ul>
+              </div>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
+</div>
+<%= decidim_paginate @query %>

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

@@ -0,0 +1,43 @@
+<div class="card" id="responses">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t ".title", number: current_idx %>
+
+      <%= link_to t("actions.next", scope: "decidim.forms.admin.questionnaires.responses").html_safe, next_url, rel: "next", class: "button button__sm button__secondary next" unless last? %>
+      <%= link_to t("actions.previous", scope: "decidim.forms.admin.questionnaires.responses").html_safe, prev_url, rel: "prev", class: "button button__sm button__secondary prev" unless first? %>
+      <%= link_to t("actions.export", scope: "decidim.forms.admin.questionnaires.responses"), questionnaire_export_response_url(@participant.session_token), class: "button button__sm button__secondary export" %>
+      <%= link_to t("actions.back", scope: "decidim.forms.admin.questionnaires.responses"), questionnaire_participants_url, class: "button button__sm button__secondary back" %>
+    </h1>
+  </div>
+  <div class="card-section">
+     <div class="table">
+      <table class="table-list">
+        <thead>
+          <tr>
+            <th><%= t("session_token", scope: "decidim.forms.user_responses_serializer") %></th>
+            <th><%= t("user_status", scope: "decidim.forms.user_responses_serializer") %></th>
+            <th><%= t("ip_hash", scope: "decidim.forms.user_responses_serializer") %></th>
+            <th><%= t("completion", scope: "decidim.forms.user_responses_serializer") %></th>
+            <th><%= t("created_at", scope: "decidim.forms.user_responses_serializer") %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr>
+            <td><%= @participant.session_token %></td>
+            <td><%= @participant.status %></td>
+            <td><%= @participant.ip_hash %></td>
+            <td><%= display_percentage(@participant.completion) %></td>
+            <td><%= l @participant.responded_at, format: :short %></td>
+          </tr>
+        </tbody>
+      </table>
+    </div>
+    <dl class="p-4 [&_ul]:list-disc [&_ul]:pl-4">
+      <% @participant.responses.each do |response| %>
+        <dt class="font-semibold"><%= response.question %></dt>
+        <dd><%= response.body %></dd>
+      <% end %>
+    </dl>
+  </div>
+</div>

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

@@ -10,60 +10,56 @@
   <%= cell("decidim/announcement", translated_attribute(questionnaire_for.announcement), callout_class: "warning") %>
 <% end %>
 
-<%= decidim_form_for(@form, url: update_url, method: :post, html: { multipart: true, class: "form answer-questionnaire" }, data: { "safe-path" => form_path }) do |form| %>
+<%= decidim_form_for(@form, url: update_url, method: :post, html: { multipart: true, class: "form response-questionnaire" }, data: { "safe-path" => form_path }) do |form| %>
   <%= form_required_explanation %>
 
-  <%= form.hidden_field :allow_editing_answers %>
+  <%= form.hidden_field :allow_editing_responses %>
 
   <%= invisible_captcha %>
-  <% answer_idx = 0 %>
-  <% cleaned_answer_idx = 1 %>
-  <% @form.responses_by_step.each_with_index do |step_answers, step_index| %>
-    <div id="step-<%= step_index %>" class="answer-questionnaire__step" <%= "hidden" if !step_index.zero? %>>
+  <% response_idx = 0 %>
+  <% cleaned_response_idx = 1 %>
+  <% @form.responses_by_step.each_with_index do |step_responses, step_index| %>
+    <div id="step-<%= step_index %>" class="response-questionnaire__step" <%= "hidden" if !step_index.zero? %>>
 
       <% if @form.total_steps > 1 %>
-        <p class="answer-questionnaire__step-counter">
+        <p class="response-questionnaire__step-counter">
           <%= t("decidim.forms.questionnaires.show.current_step", step: step_index + 1) %>&nbsp;<%= t("decidim.forms.questionnaires.show.of_total_steps", total_steps: @form.total_steps) %></span>
         </p>
       <% end %>
 
-      <% step_answers.each do |answer| %>
-        <div class="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| %>
+      <% step_responses.each do |response| %>
+        <div class="response question" data-max-choices="<%= response.question.max_choices %>" data-conditioned="<%= response.question.display_conditions.any? %>" data-question-id="<%= response.question.id %>">
+          <% response.question.display_conditions.each do |display_condition| %>
             <%= content_tag :div, nil, class: "display-condition", data: display_condition.to_html_data %>
           <% end %>
 
-          <%= fields_for "questionnaire[responses][#{answer_idx}]", answer do |answer_form| %>
+          <%= fields_for "questionnaire[responses][#{response_idx}]", response do |response_form| %>
             <%= render(
-              "decidim/forms/questionnaires/answer",
-              answer_form:,
-              answer:,
-              answer_idx:,
-              cleaned_answer_idx:,
+              "decidim/forms/questionnaires/response",
+              response_form:,
+              response:,
+              response_idx:,
+              cleaned_response_idx:,
               disabled: !current_participatory_space.can_participate?(current_user)
             ) %>
           <% end %>
         </div>
 
-        <% if !(answer.question.separator? || answer.question.title_and_description?) %>
-          <% cleaned_answer_idx += 1 %>
+        <% if !(response.question.separator? || response.question.title_and_description?) %>
+          <% cleaned_response_idx += 1 %>
         <% end %>
 
-        <% answer_idx += 1 %>
+        <% response_idx += 1 %>
 
       <% end %>
 
-      <div class="answer-questionnaire__footer">
+      <div class="response-questionnaire__footer">
         <% if step_index + 1 == @form.total_steps %>
-          <% if show_represent_user_group? %>
-            <%= cell("decidim/represent_user_group", form) %>
-          <% end %>
-
           <% if show_public_participation? %>
             <%= cell("decidim/public_participation", form) %>
           <% end %>
 
-          <div class="answer-questionnaire__tos">
+          <div class="response-questionnaire__tos">
             <%= form.check_box :tos_agreement, label: t("decidim.forms.questionnaires.show.tos_agreement"), id: "questionnaire_tos_agreement", disabled: !current_participatory_space.can_participate?(current_user) %>
             <div>
               <%= decidim_sanitize_editor translated_attribute questionnaire.tos %>
@@ -77,7 +73,7 @@
           total_steps: @form.total_steps,
           button_disabled: !current_participatory_space.can_participate?(current_user),
           form:,
-          allow_editing_answers: questionnaire_for.try(:allow_editing_answers?)
+          allow_editing_responses: questionnaire_for.try(:allow_editing_responses?)
         ) %>
       </div>
     </div>

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

@@ -1,7 +1,12 @@
-<%= render partial: "decidim/devise/shared/login_boxes", locals: { scope: "decidim.forms.questionnaires.show.answer_questionnaire" } %>
+<%# i18n-tasks-use t("decidim.forms.questionnaires.show.response_questionnaire.already_have_an_account?") %>
+<%# i18n-tasks-use t("decidim.forms.questionnaires.show.response_questionnaire.are_you_new?") %>
+<%# i18n-tasks-use t("decidim.forms.questionnaires.show.response_questionnaire.sign_in_description") %>
+<%# i18n-tasks-use t("decidim.forms.questionnaires.show.response_questionnaire.sign_up_description") %>
+<%# i18n-tasks-use t("decidim.forms.questionnaires.show.response_questionnaire.title") %>
+<%= render partial: "decidim/devise/shared/login_boxes", locals: { scope: "decidim.forms.questionnaires.show.response_questionnaire" } %>
 
-<div class="answer-questionnaire mt-12">
-  <ol class="answer-questionnaire__step">
+<div class="response-questionnaire mt-12">
+  <ol class="response-questionnaire__step">
     <%= cell(
       "decidim/forms/question_readonly",
       collection: @questionnaire.questions.not_conditioned.not_separator,

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

@@ -0,0 +1,61 @@
+<% field_id = "questionnaire_responses_#{response_idx}" %>
+
+<% if response.question.separator? %>
+
+  <%= render partial: "decidim/forms/questionnaires/responses/#{response.question.question_type}", locals: { response:, response_form:, response_idx:, field_id:, disabled: } %>
+  <%= response_form.hidden_field :question_id %>
+
+<% elsif response.question.title_and_description? %>
+
+  <div class="response-questionnaire__step-heading">
+    <h3 class="h3"><%= translated_attribute(response.question.body) %></h3>
+    <% if translated_attribute(response.question.description).present? %>
+      <div>
+        <%= decidim_sanitize_editor_admin translated_attribute(response.question.description) %>
+      </div>
+    <% end %>
+  </div>
+
+  <%= render partial: "decidim/forms/questionnaires/responses/#{response.question.question_type}", locals: { response:, response_form:, response_idx:, field_id:, disabled: } %>
+  <%= response_form.hidden_field :question_id %>
+
+<% else %>
+
+  <div class="response-questionnaire__question">
+    <%
+    label_options = {
+      class: "response-questionnaire__question-label questionnaire-question",
+      data: { "response-idx": cleaned_response_idx }
+    }
+    label_options[:for] = nil if %w(matrix_single matrix_multiple single_option multiple_option).include?(response.question.question_type)
+    %>
+
+    <%= label_tag field_id, **label_options do %>
+      <%= translated_attribute(response.question.body) %>
+      <% if response.question.mandatory? %>
+        <%= response_form.send(:required_indicator) %>
+      <% end %>
+      <% if response.question.max_choices %>
+        <%= " (#{response.send(:max_choices_label)})" %>
+      <% end %>
+    <% end %>
+
+    <% if translated_attribute(response.question.description).present? %>
+      <div class="response-questionnaire__question-description">
+        <%= decidim_sanitize_editor_admin translated_attribute(response.question.description) %>
+      </div>
+    <% end %>
+
+    <% if response.question.max_choices %>
+      <small class="form-error max-choices-alert"><%= t(".max_choices_alert") %></small>
+    <% end %>
+
+    <% %w(short_answer long_answer).exclude?(response&.question&.question_type) && response.errors.full_messages.each do |msg| %>
+      <small class="form-error is-visible"><%= msg %></small>
+    <% end %>
+
+    <%= render partial: "decidim/forms/questionnaires/responses/#{response.question.question_type}", locals: { response:, response_form:, response_idx:, field_id:, disabled:, maxlength: (response.question.max_characters if response.question.max_characters.positive?) } %>
+    <%= response_form.hidden_field :question_id %>
+  </div>
+
+<% end %>

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

@@ -29,8 +29,8 @@
   <% end %>
 
   <section>
-    <% if allow_answers? %>
-      <% if visitor_can_answer? %>
+    <% if allow_responses? %>
+      <% if visitor_can_respond? %>
         <% if @form.responses_by_step.flatten.empty? %>
           <%= cell("decidim/announcement", t("decidim.forms.questionnaires.show.empty")) %>
         <% else %>

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

@@ -0,0 +1 @@
+<%= response_form.upload :add_documents, attachments: response.documents, label: false, multiple: true, id: field_id, disabled:, button_class: "button button__lg button__transparent-secondary w-full" %>

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

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

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"
 )