decidim-forms 0.30.2 → 0.31.0.rc1

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

@@ -16,7 +16,7 @@ shared_examples_for "update questions" do
         fill_in "questions_questions_#{question.id}_body_en", with: "Modified question"
         fill_in "questions_questions_#{question.id}_max_characters", with: 30
         check "Mandatory"
-        select "Long answer", from: "Type"
+        select "Long response", from: "Type"
       end
 
       click_on "Save"
@@ -29,7 +29,7 @@ shared_examples_for "update questions" do
       expect(page).to have_no_css("input[value='This is the first question']")
       expect(page).to have_css("input#questions_questions_#{question.id}_mandatory[checked]")
       expect(page).to have_css("input#questions_questions_#{question.id}_max_characters[value='30']")
-      expect(page).to have_css("select#questions_questions_#{question.id}_question_type option[value='long_answer'][selected]")
+      expect(page).to have_css("select#questions_questions_#{question.id}_question_type option[value='long_response'][selected]")
     end
 
     it "re-renders the form when the information is invalid and displays errors" do
@@ -85,7 +85,7 @@ shared_examples_for "update questions" do
 
       expect(page).to have_admin_callout("successfully")
 
-      click_on "Manage questions"
+      click_on "Questions"
 
       expect(page).to have_css(".questionnaire-question", count: 0)
     end
@@ -169,7 +169,7 @@ shared_examples_for "update questions" do
 
       expect(page).to have_admin_callout("successfully")
 
-      click_on "Manage questions"
+      click_on "Questions"
 
       expect(page).to have_css(".questionnaire-question", count: 0)
     end
@@ -187,7 +187,7 @@ shared_examples_for "update questions" do
     end
   end
 
-  context "when a questionnaire has an existing question with answer options" do
+  context "when a questionnaire has an existing question with response options" do
     let!(:question) do
       create(
         :questionnaire_question,
@@ -205,13 +205,13 @@ shared_examples_for "update questions" do
 
     before do
       click_on "Save"
-      click_on "Manage questions"
+      click_on "Questions"
     end
 
-    it "allows deleting answer options" do
+    it "allows deleting response options" do
       expand_all_questions
 
-      within ".questionnaire-question-answer-option:last-of-type" do
+      within ".questionnaire-question-response-option:last-of-type" do
         click_on "Remove"
       end
 
@@ -219,7 +219,7 @@ shared_examples_for "update questions" do
 
       visit_manage_questions_and_expand_all
 
-      expect(page).to have_css(".questionnaire-question-answer-option", count: 2)
+      expect(page).to have_css(".questionnaire-question-response-option", count: 2)
     end
 
     it "still removes the question even if previous editions rendered the options invalid" do
@@ -227,7 +227,7 @@ shared_examples_for "update questions" do
 
       expand_all_questions
 
-      within ".questionnaire-question-answer-option:first-of-type" do
+      within ".questionnaire-question-response-option:first-of-type" do
         fill_in find_nested_form_field_locator("body_en"), with: ""
       end
 
@@ -283,7 +283,7 @@ shared_examples_for "update questions" do
 
       within ".questionnaire-question:last-of-type" do
         expect(page).to have_css(".questionnaire-question-matrix-row", count: 2)
-        expect(page).to have_css(".questionnaire-question-answer-option", count: 3)
+        expect(page).to have_css(".questionnaire-question-response-option", count: 3)
       end
     end
 
@@ -478,26 +478,26 @@ shared_examples_for "update questions" do
       end.to change { page.all(".editor-toolbar").size }.by(1)
     end
 
-    it "properly decides which button to show after adding/removing answer options" do
+    it "properly decides which button to show after adding/removing response options" do
       click_on "Add question"
       expand_all_questions
 
       within ".questionnaire-question:last-of-type" do
         select "Single option", from: "Type"
 
-        within ".questionnaire-question-answer-options-list" do
+        within ".questionnaire-question-response-options-list" do
           expect(page).to have_no_button("Remove")
         end
 
-        click_on "Add answer option"
+        click_on "Add response option"
 
-        expect(page.all(".questionnaire-question-answer-option")).to all(have_button("Remove"))
+        expect(page.all(".questionnaire-question-response-option")).to all(have_button("Remove"))
 
-        within ".questionnaire-question-answer-option:first-of-type" do
+        within ".questionnaire-question-response-option:first-of-type" do
           click_on "Remove"
         end
 
-        within ".questionnaire-question-answer-options-list" do
+        within ".questionnaire-question-response-options-list" do
           expect(page).to have_no_button("Remove")
         end
       end
@@ -506,7 +506,7 @@ shared_examples_for "update questions" do
       expand_all_questions
 
       within ".questionnaire-question:last-of-type" do
-        within ".questionnaire-question-answer-options-list" do
+        within ".questionnaire-question-response-options-list" do
           expect(page).to have_no_button("Remove")
         end
       end

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

@@ -24,7 +24,7 @@ shared_examples_for "manage questionnaires" do
     }
   end
 
-  context "when the questionnaire is not already answered" do
+  context "when the questionnaire is not already responded" do
     before do
       visit manage_questions_path
     end
@@ -35,9 +35,9 @@ shared_examples_for "manage questionnaires" do
     it_behaves_like "update display conditions"
   end
 
-  context "when the questionnaire is already answered" do
+  context "when the questionnaire is already responded" do
     let!(:question) { create(:questionnaire_question, questionnaire:, body:, question_type: "multiple_option") }
-    let!(:answer) { create(:answer, questionnaire:, question:) }
+    let!(:response) { create(:response, questionnaire:, question:) }
 
     it "cannot modify questionnaire questions" do
       visit manage_questions_path
@@ -92,7 +92,7 @@ shared_examples_for "manage questionnaires" do
   end
 
   def visit_manage_questions_and_expand_all
-    click_on "Manage questions"
+    click_on "Questions"
     expand_all_questions
   end
 end

data/lib/decidim/forms/test.rb

@@ -2,7 +2,7 @@
 
 require "decidim/forms/test/shared_examples/has_questionnaire"
 require "decidim/forms/test/shared_examples/manage_questionnaires"
-require "decidim/forms/test/shared_examples/manage_questionnaire_answers"
+require "decidim/forms/test/shared_examples/manage_questionnaire_responses"
 
 if defined? Decidim::Templates
   require "decidim/templates/test/shared_examples/uses_questionnaire_templates"

data/lib/decidim/forms/user_responses_serializer.rb

@@ -0,0 +1,110 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    # This class serializes the responses given by a User for questionnaire so can be
+    # exported to CSV, JSON or other formats.
+    class UserResponsesSerializer < Decidim::Exporters::Serializer
+      include Decidim::TranslationsHelper
+
+      # Public: Initializes the serializer with a collection of Responses.
+      def initialize(responses)
+        @responses = responses
+      end
+
+      # i18n-tasks-use t('decidim.forms.user_responses_serializer.body')
+      # i18n-tasks-use t('decidim.forms.user_responses_serializer.id')
+      # i18n-tasks-use t('decidim.forms.user_responses_serializer.question')
+      # i18n-tasks-use t('decidim.forms.user_responses_serializer.registered')
+      # i18n-tasks-use t('decidim.forms.user_responses_serializer.unregistered')
+      # Public: Exports a hash with the serialized data for the user responses.
+      def serialize
+        responses_hash = hash_for(@responses.first)
+        responses_hash.merge!(questions_hash)
+
+        @responses.each do |response|
+          responses_hash[translated_question_key(response.question.position, response.question.body)] = normalize_body(response)
+        end
+
+        responses_hash
+      end
+
+      private
+
+      attr_reader :responses
+      alias resource responses
+
+      def hash_for(response)
+        {
+          response_translated_attribute_name(:id) => response&.session_token,
+          response_translated_attribute_name(:created_at) => response&.created_at,
+          response_translated_attribute_name(:ip_hash) => response&.ip_hash,
+          response_translated_attribute_name(:user_status) => response_translated_attribute_name(response&.decidim_user_id.present? ? "registered" : "unregistered")
+        }
+      end
+
+      def questions_hash
+        questionnaire_id = @responses.first&.decidim_questionnaire_id
+        return {} unless questionnaire_id
+
+        questions = Decidim::Forms::Question.where(decidim_questionnaire_id: questionnaire_id).order(:position)
+        return {} if questions.none?
+
+        questions.each.inject({}) do |serialized, question|
+          serialized.update(
+            translated_question_key(question.position, question.body) => ""
+          )
+        end
+      end
+
+      def translated_question_key(idx, body)
+        "#{idx + 1}. #{translated_attribute(body)}"
+      end
+
+      def normalize_body(response)
+        response.body ||
+          normalize_attachments(response) ||
+          normalize_choices(response, response.choices)
+      end
+
+      def normalize_attachments(response)
+        return if response.attachments.blank?
+
+        response.attachments.map(&:url)
+      end
+
+      def normalize_choices(response, choices)
+        if response.question.matrix?
+          normalize_matrix_choices(response, choices)
+        else
+          choices.map do |choice|
+            format_free_text_for choice
+          end
+        end
+      end
+
+      def normalize_matrix_choices(response, choices)
+        response.question.matrix_rows.to_h do |matrix_row|
+          row_body = translated_attribute(matrix_row.body)
+
+          row_choices = response.question.response_options.map do |response_option|
+            choice = choices.find_by(matrix_row:, response_option:)
+            choice.try(:custom_body) || choice.try(:body)
+          end
+
+          [row_body, row_choices]
+        end
+      end
+
+      def response_translated_attribute_name(attribute)
+        I18n.t(attribute.to_sym, scope: "decidim.forms.user_responses_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.30.2"
+      "0.31.0.rc1"
     end
   end
 end

data/lib/decidim/forms.rb

@@ -8,8 +8,8 @@ require "decidim/forms/admin_engine"
 module Decidim
   # This namespace holds the logic of the `Forms`.
   module Forms
-    autoload :UserAnswersSerializer, "decidim/forms/user_answers_serializer"
-    autoload :DownloadYourDataUserAnswersSerializer, "decidim/forms/download_your_data_user_answers_serializer"
+    autoload :UserResponsesSerializer, "decidim/forms/user_responses_serializer"
+    autoload :DownloadYourDataUserResponsesSerializer, "decidim/forms/download_your_data_user_responses_serializer"
   end
 
   module Exporters

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.30.2
+  version: 0.31.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2025-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.30.2
+        version: 0.31.0.rc1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -67,45 +67,45 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/cells/decidim/forms/answer_readonly/show.erb
-- app/cells/decidim/forms/answer_readonly_cell.rb
 - app/cells/decidim/forms/matrix_readonly/show.erb
 - app/cells/decidim/forms/matrix_readonly_cell.rb
 - app/cells/decidim/forms/question_readonly/show.erb
 - app/cells/decidim/forms/question_readonly/title_and_description.erb
 - app/cells/decidim/forms/question_readonly_cell.rb
+- app/cells/decidim/forms/response_readonly/show.erb
+- app/cells/decidim/forms/response_readonly_cell.rb
 - app/cells/decidim/forms/step_navigation/show.erb
 - app/cells/decidim/forms/step_navigation_cell.rb
 - app/commands/decidim/forms/admin/update_questionnaire.rb
 - app/commands/decidim/forms/admin/update_questions.rb
-- app/commands/decidim/forms/answer_questionnaire.rb
+- app/commands/decidim/forms/response_questionnaire.rb
 - app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
-- app/controllers/decidim/forms/admin/concerns/has_questionnaire_answers.rb
+- app/controllers/decidim/forms/admin/concerns/has_questionnaire_responses.rb
 - app/controllers/decidim/forms/concerns/has_questionnaire.rb
-- app/forms/decidim/forms/admin/answer_option_form.rb
 - app/forms/decidim/forms/admin/display_condition_form.rb
 - app/forms/decidim/forms/admin/question_form.rb
 - app/forms/decidim/forms/admin/question_matrix_row_form.rb
 - app/forms/decidim/forms/admin/questionnaire_form.rb
 - app/forms/decidim/forms/admin/questions_form.rb
-- app/forms/decidim/forms/answer_choice_form.rb
-- app/forms/decidim/forms/answer_form.rb
+- app/forms/decidim/forms/admin/response_option_form.rb
 - app/forms/decidim/forms/questionnaire_form.rb
+- app/forms/decidim/forms/response_choice_form.rb
+- app/forms/decidim/forms/response_form.rb
 - app/helpers/decidim/forms/admin/application_helper.rb
-- app/helpers/decidim/forms/admin/concerns/has_questionnaire_answers_pagination_helper.rb
-- app/helpers/decidim/forms/admin/concerns/has_questionnaire_answers_url_helper.rb
-- app/helpers/decidim/forms/admin/questionnaire_answers_helper.rb
+- app/helpers/decidim/forms/admin/concerns/has_questionnaire_responses_pagination_helper.rb
+- app/helpers/decidim/forms/admin/concerns/has_questionnaire_responses_url_helper.rb
+- app/helpers/decidim/forms/admin/questionnaire_responses_helper.rb
 - app/helpers/decidim/forms/application_helper.rb
-- app/jobs/decidim/forms/export_questionnaire_answers_job.rb
+- app/jobs/decidim/forms/export_questionnaire_responses_job.rb
 - app/models/concerns/decidim/forms/has_questionnaire.rb
-- app/models/decidim/forms/answer.rb
-- app/models/decidim/forms/answer_choice.rb
-- app/models/decidim/forms/answer_option.rb
 - app/models/decidim/forms/application_record.rb
 - app/models/decidim/forms/display_condition.rb
 - app/models/decidim/forms/question.rb
 - app/models/decidim/forms/question_matrix_row.rb
 - app/models/decidim/forms/questionnaire.rb
+- app/models/decidim/forms/response.rb
+- app/models/decidim/forms/response_choice.rb
+- app/models/decidim/forms/response_option.rb
 - app/packs/entrypoints/decidim_forms.js
 - app/packs/entrypoints/decidim_forms_admin.js
 - app/packs/images/decidim/surveys/decidim_surveys.svg
@@ -115,23 +115,21 @@ files:
 - app/packs/src/decidim/forms/admin/collapsible_questions.js
 - app/packs/src/decidim/forms/admin/forms.js
 - app/packs/src/decidim/forms/admin/live_text_update.component.js
-- app/packs/src/decidim/forms/admin/publish_answers_buttons.js
+- app/packs/src/decidim/forms/admin/publish_responses_buttons.js
 - app/packs/src/decidim/forms/display_conditions.component.js
 - app/packs/src/decidim/forms/forms.js
 - app/packs/src/decidim/forms/max_choices_alert.component.js
 - app/packs/src/decidim/forms/option_attached_inputs.component.js
 - app/packs/stylesheets/decidim/forms/forms.scss
-- app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb
 - app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb
+- app/presenters/decidim/forms/admin/questionnaire_response_presenter.rb
 - app/presenters/decidim/forms/admin_log/question_presenter.rb
 - app/presenters/decidim/forms/admin_log/questionnaire_presenter.rb
-- app/presenters/decidim/forms/answer_option_presenter.rb
 - app/presenters/decidim/forms/question_presenter.rb
+- app/presenters/decidim/forms/response_option_presenter.rb
 - app/queries/decidim/forms/questionnaire_participant.rb
 - app/queries/decidim/forms/questionnaire_participants.rb
-- app/queries/decidim/forms/questionnaire_user_answers.rb
-- app/views/decidim/forms/admin/questionnaires/_answer_option.html.erb
-- app/views/decidim/forms/admin/questionnaires/_answer_option_template.html.erb
+- app/queries/decidim/forms/questionnaire_user_responses.rb
 - app/views/decidim/forms/admin/questionnaires/_display_condition.html.erb
 - app/views/decidim/forms/admin/questionnaires/_display_condition_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_form.html.erb
@@ -139,26 +137,28 @@ 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/_questions_form.html.erb
+- app/views/decidim/forms/admin/questionnaires/_response_option.html.erb
+- app/views/decidim/forms/admin/questionnaires/_response_option_template.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/index.html.erb
-- app/views/decidim/forms/admin/questionnaires/answers/show.html.erb
 - app/views/decidim/forms/admin/questionnaires/edit.html.erb
 - app/views/decidim/forms/admin/questionnaires/edit_questions.html.erb
-- app/views/decidim/forms/questionnaires/_answer.html.erb
+- app/views/decidim/forms/admin/questionnaires/responses/index.html.erb
+- app/views/decidim/forms/admin/questionnaires/responses/show.html.erb
 - app/views/decidim/forms/questionnaires/_questionnaire.html.erb
 - app/views/decidim/forms/questionnaires/_questionnaire_readonly.html.erb
-- app/views/decidim/forms/questionnaires/answers/_files.html.erb
-- app/views/decidim/forms/questionnaires/answers/_long_answer.html.erb
-- app/views/decidim/forms/questionnaires/answers/_matrix_multiple.html.erb
-- app/views/decidim/forms/questionnaires/answers/_matrix_single.html.erb
-- app/views/decidim/forms/questionnaires/answers/_multiple_option.html.erb
-- app/views/decidim/forms/questionnaires/answers/_separator.html.erb
-- 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/_response.html.erb
 - app/views/decidim/forms/questionnaires/edit.html.erb
+- app/views/decidim/forms/questionnaires/responses/_files.html.erb
+- app/views/decidim/forms/questionnaires/responses/_long_response.html.erb
+- app/views/decidim/forms/questionnaires/responses/_matrix_multiple.html.erb
+- app/views/decidim/forms/questionnaires/responses/_matrix_single.html.erb
+- app/views/decidim/forms/questionnaires/responses/_multiple_option.html.erb
+- app/views/decidim/forms/questionnaires/responses/_separator.html.erb
+- app/views/decidim/forms/questionnaires/responses/_short_response.html.erb
+- app/views/decidim/forms/questionnaires/responses/_single_option.html.erb
+- app/views/decidim/forms/questionnaires/responses/_sorting.html.erb
+- app/views/decidim/forms/questionnaires/responses/_title_and_description.html.erb
 - app/views/decidim/forms/questionnaires/show.html.erb
 - config/assets.rb
 - config/locales/am-ET.yml
@@ -262,28 +262,31 @@ files:
 - db/migrate/20240416111953_add_display_conditions_counter_cache_to_questions.rb
 - db/migrate/20240416113926_add_display_conditions_for_other_questions_counter_cache_to_questions.rb
 - db/migrate/20241122142230_add_survey_answers_published_at_to_questions.rb
+- db/migrate/20250314150250_rename_answer_to_response_in_decidim_forms.rb
+- db/migrate/20250319130003_change_question_types_in_questions.rb
 - decidim-forms.gemspec
-- lib/decidim/api/answer_option_type.rb
+- lib/decidim/api/question_matrix_row_type.rb
 - lib/decidim/api/question_type.rb
 - lib/decidim/api/questionnaire_entity_interface.rb
 - lib/decidim/api/questionnaire_type.rb
+- lib/decidim/api/response_option_type.rb
 - lib/decidim/exporters/form_pdf.rb
 - lib/decidim/forms.rb
 - lib/decidim/forms/admin.rb
 - lib/decidim/forms/admin_engine.rb
 - lib/decidim/forms/api.rb
-- lib/decidim/forms/download_your_data_user_answers_serializer.rb
+- lib/decidim/forms/download_your_data_user_responses_serializer.rb
 - lib/decidim/forms/engine.rb
 - lib/decidim/forms/test.rb
 - lib/decidim/forms/test/factories.rb
 - lib/decidim/forms/test/shared_examples/has_questionnaire.rb
-- lib/decidim/forms/test/shared_examples/manage_questionnaire_answers.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaire_responses.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
-- lib/decidim/forms/user_answers_serializer.rb
+- lib/decidim/forms/user_responses_serializer.rb
 - lib/decidim/forms/version.rb
 homepage: https://decidim.org
 licenses:

data/app/cells/decidim/forms/answer_readonly_cell.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    # This cell renders a possible answer of a question (readonly)
-    class AnswerReadonlyCell < Decidim::ViewModel
-    end
-  end
-end

data/app/helpers/decidim/forms/admin/questionnaire_answers_helper.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    module Admin
-      # Custom helpers for questionnaire answers
-      #
-      module QuestionnaireAnswersHelper
-        def first_table_th(answer)
-          if answer.first_short_answer
-            @first_short_answer = answer.first_short_answer
-            return translated_attribute @first_short_answer.question.body
-          end
-
-          t("session_token", scope: "decidim.forms.user_answers_serializer")
-        end
-
-        def first_table_td(answer)
-          return answer.first_short_answer&.body if @first_short_answer
-
-          answer.session_token
-        end
-
-        def display_percentage(number)
-          number_to_percentage(number, precision: 0, strip_insignificant_zeros: true, locale: I18n.locale)
-        end
-      end
-    end
-  end
-end

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

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    class AnswerChoice < Forms::ApplicationRecord
-      belongs_to :answer,
-                 class_name: "Answer",
-                 foreign_key: "decidim_answer_id"
-
-      belongs_to :answer_option,
-                 class_name: "AnswerOption",
-                 foreign_key: "decidim_answer_option_id"
-
-      belongs_to :matrix_row,
-                 class_name: "QuestionMatrixRow",
-                 foreign_key: "decidim_question_matrix_row_id",
-                 optional: true
-
-      validates :matrix_row, presence: true, if: -> { answer.question.matrix? }
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Forms
-    # A class used to collect user answers for a questionnaire
-    class QuestionnaireUserAnswers < Decidim::Query
-      # Syntactic sugar to initialize the class and return the queried objects.
-      #
-      # questionnaire - a Questionnaire object
-      def self.for(questionnaire)
-        new(questionnaire).query
-      end
-
-      # Initializes the class.
-      #
-      # questionnaire = a Questionnaire object
-      def initialize(questionnaire)
-        @questionnaire = questionnaire
-      end
-
-      # Finds and group answers by user for each questionnaire's question.
-      def query
-        answers = Answer.not_separator
-                        .not_title_and_description
-                        .joins(:question)
-                        .where(questionnaire: @questionnaire)
-
-        answers.sort_by { |answer| answer.question.position.to_i }.group_by { |a| a.user || a.session_token }.values
-      end
-    end
-  end
-end

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

@@ -1,7 +0,0 @@
-<% question = form.object %>
-
-<script type="text/template" class="decidim-answer-option-template decidim-template" id="<%= template_id %>">
-  <%= fields_for "questions[questions][#{question.to_param}][answer_options][]", blank_answer_option do |answer_option_form| %>
-    <%= render "decidim/forms/admin/questionnaires/answer_option", form: answer_option_form, question:, editable: %>
-  <% end %>
-</script>