decidim-forms 0.29.3 → 0.30.0.rc1

data/config/locales/sk.yml

@@ -9,6 +9,12 @@ sk:
         question_type: Typ
       questionnaire_question:
         mandatory: Povinné
+    errors:
+      models:
+        answer:
+          attributes:
+            choices:
+              missing: nie je kompletné
   decidim:
     forms:
       admin:
@@ -19,6 +25,7 @@ sk:
         questionnaires:
           answer_option:
             answer_option: Možnosť odpovede
+            free_text: Voľný text
             remove: Odstrániť
             statement: Prehlásenie
           edit:
@@ -70,4 +77,6 @@ sk:
       user_answers_serializer:
         created_at: Odpovedané na 
         id: ID odpovede
-        question: Otázka
+        registered: Registrovaný
+        unregistered: Neregistrovaný
+        user_status: Status Užívateľa

data/config/locales/sl.yml

@@ -4,3 +4,10 @@ sl:
     attributes:
       answer:
         body: Odgovor
+  decidim:
+    forms:
+      admin:
+        questionnaires:
+          answers:
+            actions:
+              export: Izvozi

data/config/locales/sv.yml

@@ -4,6 +4,8 @@ sv:
     attributes:
       answer:
         body: Svar
+        choices: Alternativ
+        selected_choices: Valda alternativ
       question:
         max_choices: Högst antal alternativ
         question_type: Typ
@@ -12,6 +14,15 @@ sv:
         max_characters: Teckengräns (skriv 0 för obegränsad)
     errors:
       models:
+        answer:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: Måste bifogas igen
+            body:
+              too_long: är för långt
+            choices:
+              missing: är inte fullständiga
+              too_many: Du kan välja maximalt %{count}.
         questionnaire:
           request_invalid: Det gick inte att hantera begäran. Försök igen.
   decidim:
@@ -27,14 +38,24 @@ sv:
             show: Visa svar
           answer_option:
             answer_option: Svarsalternativ
+            free_text: Fritext
             remove: Ta bort
             statement: Påstående
           answers:
             actions:
+              back: Tillbaka till svar
+              export: Exportera
+              next: Nästa ›
+              previous: "‹ Föregående"
               show: Visa svar
             empty: Inga svar ännu
+            export:
+              answer:
+                title: 'Svar #%{number}'
             export_response:
               title: survey_user_answers_%{token}
+            index:
+              title: "%{total} svar totalt"
             show:
               title: 'Svar #%{number}'
           display_condition:
@@ -102,6 +123,9 @@ sv:
       admin_log:
         questionnaire:
           update: "%{user_name} uppdaterade enkäten %{resource_name}"
+      errors:
+        answer:
+          body: Innehåll kan inte vara tomt
       images:
         dimensions: "%{width} x %{height} px"
         processors:
@@ -117,14 +141,21 @@ sv:
         single_option: Ett alternativ
         sorting: Sortering
         title_and_description: Titel och beskrivning
+      questionnaire_answer_presenter:
+        download_attachment: Ladda ner bilaga
       questionnaires:
         answer:
           invalid: Det gick inte att besvara formuläret.
+          max_choices_alert: För många alternativ har valts
           success: Formuläret har besvarats.
         question:
           max_choices: 'Högst antal val: %{n}'
         show:
           answer_questionnaire:
+            already_have_an_account?: Har du redan ett konto?
+            are_you_new?: Ny användare?
+            sign_in_description: Logga in för att göra enkäten
+            sign_up_description: Skapa ett konto för att göra enkäten
             title: Besvara formuläret
           current_step: Steg %{step}
           empty: Formuläret har inga frågor än.
@@ -151,6 +182,12 @@ sv:
           submit: Skicka in
       user_answers_serializer:
         body: Svar
+        completion: Slutfört
         created_at: Besvarad
         id: Svars-ID
+        ip_hash: IP Hash
         question: Fråga
+        registered: Registrerad
+        session_token: Identifierare för användare
+        unregistered: Ej registrerad
+        user_status: Användarstatus

data/config/locales/tr-TR.yml

@@ -4,11 +4,19 @@ tr:
     attributes:
       answer:
         body: Cevap
+        choices: Seçenekler
+        selected_choices: Seçilmiş seçenekler
       question:
         max_choices: Maksimum seçenek sayısı
         question_type: tip
       questionnaire_question:
         mandatory: Zorunlu
+    errors:
+      models:
+        answer:
+          attributes:
+            choices:
+              missing: tamamlanmadı
   decidim:
     forms:
       admin:
@@ -22,14 +30,22 @@ tr:
             show: Yanıtları göster
           answer_option:
             answer_option: Cevap seçeneği
+            free_text: Ücretsiz Metin
             remove: Kaldır
             statement: Beyan
           answers:
             actions:
+              back: Yanıtlara dön
+              export: Dışa aktar
               show: Cevapları göster
             empty: Henüz cevap bulunmuyor
+            export:
+              answer:
+                title: '#%{number} yanıt'
             export_response:
               title: survey_user_answers _%{token}
+            index:
+              title: "%{total} toplam yanıt"
             show:
               title: '%{number} cevap'
           display_condition:
@@ -98,6 +114,7 @@ tr:
       questionnaires:
         answer:
           invalid: Formu yanıtlarken bir sorun oluştu.
+          max_choices_alert: Çok fazla seçenek seçilmiş
           success: Form başarıyla cevaplandı.
         question:
           max_choices: 'Maksimum seçenek: %{n}'
@@ -129,6 +146,12 @@ tr:
           submit: Gönder
       user_answers_serializer:
         body: Cevap
+        completion: Tamamlanma
         created_at: Yanıtlandı
         id: Cevap kimliği
+        ip_hash: IP Hash
         question: Soru
+        registered: Kayıtlı
+        session_token: Kullanıcı tanımlayıcı
+        unregistered: Kayıtlı değil
+        user_status: Kullanıcı durumu

data/config/locales/zh-CN.yml

@@ -4,11 +4,19 @@ zh-CN:
     attributes:
       answer:
         body: 答案
+        choices: 选择
+        selected_choices: 选定的选择
       question:
         max_choices: 选择的最大数量
         question_type: 类型
       questionnaire_question:
         mandatory: Mandatory
+    errors:
+      models:
+        answer:
+          attributes:
+            choices:
+              missing: 不完成
   decidim:
     forms:
       admin:
@@ -22,14 +30,22 @@ zh-CN:
             show: 显示回复
           answer_option:
             answer_option: 答案选项
+            free_text: 免费文本
             remove: 删除
             statement: 声明
           answers:
             actions:
+              back: 回到回应
+              export: 导出
               show: 显示答案
             empty: 尚无答案
+            export:
+              answer:
+                title: '回复 #%{number}'
             export_response:
               title: survey_user_answers_%{token}
+            index:
+              title: "%{total} 个回复总数"
             show:
               title: '答案 #%{number}'
           display_condition:
@@ -97,6 +113,7 @@ zh-CN:
       questionnaires:
         answer:
           invalid: 回答表单时出现问题。
+          max_choices_alert: 选择了太多选项
           success: 表单回答成功。
         question:
           max_choices: '最大选择数: %{n}'
@@ -127,6 +144,12 @@ zh-CN:
           submit: 提交
       user_answers_serializer:
         body: 答案
+        completion: 完成
         created_at: 回答于
         id: 答案 ID
+        ip_hash: IP哈希
         question: 问
+        registered: 已注册
+        session_token: 用户标识符
+        unregistered: 未注册
+        user_status: 用户状态

data/config/locales/zh-TW.yml

@@ -4,6 +4,8 @@ zh-TW:
     attributes:
       answer:
         body: 回答
+        choices: 選項
+        selected_choices: 已選擇的選項
       question:
         max_choices: 選擇的最大數量
         question_type: 類別
@@ -12,8 +14,14 @@ zh-TW:
         max_characters: 字元限制（如果不需要限制，請設為0）
     errors:
       models:
-        questionnaire:
-          request_invalid: 處理請求時發生錯誤。請再試一次。
+        answer:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: 需要重新附加
+            body:
+              too_long: 太長
+            choices:
+              missing: 尚未完成
   decidim:
     forms:
       admin:
@@ -27,14 +35,24 @@ zh-TW:
             show: 顯示回應
           answer_option:
             answer_option: 答案選項：
+            free_text: 免費文字
             remove: 移除
             statement: 聲明
           answers:
             actions:
+              back: 返回回覆
+              export: 匯出
+              next: 下一個 ›
+              previous: "‹ 上一篇"
               show: 顯示答案
             empty: 目前尚未回答
+            export:
+              answer:
+                title: '回應 #%{number}'
             export_response:
               title: 調查問卷使用者回答_%{token}
+            index:
+              title: "%{total} 個回應總數"
             show:
               title: '回答#%{number}'
           display_condition:
@@ -102,6 +120,9 @@ zh-TW:
       admin_log:
         questionnaire:
           update: "%{user_name} 更新了 %{resource_name} 問卷模板"
+      errors:
+        answer:
+          body: 內容不能為空
       images:
         dimensions: "%{width} x %{height} 像素"
         processors:
@@ -117,14 +138,20 @@ zh-TW:
         single_option: 單選
         sorting: 排序中
         title_and_description: 標題和描述
+      questionnaire_answer_presenter:
+        download_attachment: 下載附件
       questionnaires:
         answer:
           invalid: 回答表單時出現問題
+          max_choices_alert: 選擇的項目太多了
           success: 表單已成功回答
         question:
           max_choices: '最多選擇數量： %{n}'
         show:
           answer_questionnaire:
+            already_have_an_account?: 已經有帳號了嗎？
+            are_you_new?: 新用戶?
+            sign_up_description: 建立參與者帳號以填寫問卷
             title: 回答表單 
           current_step: 步驟%{step}
           of_total_steps: 的%{total_steps}
@@ -150,6 +177,12 @@ zh-TW:
           submit: 提交
       user_answers_serializer:
         body: 回答
+        completion: 完成
         created_at: 回答時間
         id: 回答 ID
+        ip_hash: IP Hash
         question: 問題
+        registered: 已註冊
+        session_token: 使用者識別碼
+        unregistered: 未註冊
+        user_status: 用戶狀態

data/db/migrate/20190315203056_add_session_token_to_decidim_forms_answers.rb

@@ -10,7 +10,7 @@ class AddSessionTokenToDecidimFormsAnswers < ActiveRecord::Migration[5.2]
     add_index :decidim_forms_answers, :session_token
 
     Answer.find_each do |answer|
-      answer.session_token = Digest::MD5.hexdigest("#{answer.decidim_user_id}-#{Rails.application.secrets.secret_key_base}")
+      answer.session_token = Digest::MD5.hexdigest("#{answer.decidim_user_id}-#{Rails.application.secret_key_base}")
       answer.save!
     end
   end

data/db/migrate/20241122142230_add_survey_answers_published_at_to_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddSurveyAnswersPublishedAtToQuestions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_forms_questions, :survey_answers_published_at, :datetime, index: true
+  end
+end

data/decidim-forms.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-forms"
   s.summary = "Decidim forms"
@@ -33,7 +33,6 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "decidim-core", Decidim::Forms.version
-  s.add_dependency "wicked_pdf", "~> 2.1"
 
   s.add_development_dependency "decidim-admin", Decidim::Forms.version
   s.add_development_dependency "decidim-dev", Decidim::Forms.version

data/lib/decidim/api/answer_option_type.rb

@@ -5,9 +5,9 @@ module Decidim
     class AnswerOptionType < Decidim::Api::Types::BaseObject
       description "An answer option for a multi-choice question in a questionnaire"
 
-      field :id, GraphQL::Types::ID, "ID of this answer option", null: false
       field :body, Decidim::Core::TranslatedFieldType, "The text answer response option.", null: false
       field :free_text, GraphQL::Types::Boolean, "Whether if this answer accepts any free text from the user.", null: false
+      field :id, GraphQL::Types::ID, "ID of this answer option", null: false
     end
   end
 end

data/lib/decidim/api/question_type.rb

@@ -7,15 +7,15 @@ module Decidim
 
       implements Decidim::Core::TimestampsInterface
 
-      field :id, GraphQL::Types::ID, "ID of this question", null: false
+      field :answer_options, [AnswerOptionType, { null: true }], "List of answer options in multi-choice questions.", null: false
       field :body, Decidim::Core::TranslatedFieldType, "What is being asked in this question.", null: false
       field :description, Decidim::Core::TranslatedFieldType, "The description of this question.", null: true
+      field :id, GraphQL::Types::ID, "ID of this question", null: false
       field :mandatory, GraphQL::Types::Boolean, "Whether if this question is mandatory.", null: false
-      field :position, GraphQL::Types::Int, "Order position of the question in the questionnaire", null: true
-      field :max_choices, GraphQL::Types::Int, "On questions with answer options, maximum number of choices the user has", null: true
       field :max_characters, GraphQL::Types::Int, "On questions with free text answers, maximum number of characters the answer can have (0 if no limit)", null: false
+      field :max_choices, GraphQL::Types::Int, "On questions with answer options, maximum number of choices the user has", null: true
+      field :position, GraphQL::Types::Int, "Order position of the question in the questionnaire", null: true
       field :question_type, GraphQL::Types::String, "Type of question.", null: true
-      field :answer_options, [AnswerOptionType, { null: true }], "List of answer options in multi-choice questions.", null: false
     end
   end
 end

data/lib/decidim/api/questionnaire_type.rb

@@ -7,13 +7,13 @@ module Decidim
 
       implements Decidim::Core::TimestampsInterface
 
-      field :id, GraphQL::Types::ID, "ID of this questionnaire", null: false
-      field :title, Decidim::Core::TranslatedFieldType, "The title of this questionnaire.", null: false
       field :description, Decidim::Core::TranslatedFieldType, "The description of this questionnaire.", null: true
-      field :tos, Decidim::Core::TranslatedFieldType, "The Terms of Service for this questionnaire.", null: true
-      field :for_type, GraphQL::Types::String, "Type of entity using this questionnaire.", method: :questionnaire_for_type, null: true
       field :for_entity, QuestionnaireEntityInterface, "Entity using this questionnaire.", method: :questionnaire_for, null: true
+      field :for_type, GraphQL::Types::String, "Type of entity using this questionnaire.", method: :questionnaire_for_type, null: true
+      field :id, GraphQL::Types::ID, "ID of this questionnaire", null: false
       field :questions, [Decidim::Forms::QuestionType, { null: true }], "Questions in this questionnaire.", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this questionnaire.", null: false
+      field :tos, Decidim::Core::TranslatedFieldType, "The Terms of Service for this questionnaire.", null: true
     end
   end
 end

data/lib/decidim/exporters/form_pdf.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "wicked_pdf"
-
 module Decidim
   module Exporters
     # Inherits from abstract PDF exporter. This class is used to set
@@ -9,25 +7,130 @@ module Decidim
     #
     class FormPDF < PDF
       # i18n-tasks-use t('decidim.admin.exports.formats.FormPDF')
+      include ActionView::Helpers::NumberHelper
+      include Decidim::Forms::Admin::QuestionnaireAnswersHelper
+
+      class QuestionnaireAnswerPresenter < Decidim::Forms::Admin::QuestionnaireAnswerPresenter
+        def choice(choice_hash)
+          render_body_for choice_hash
+        end
+
+        delegate :attachments, to: :answer
+
+        def body
+          return { string: answer.body } if answer.body.present?
+          return { attachments: answer.attachments } if answer.attachments.any?
+          return { string: "-" } if answer.choices.empty?
+
+          choices = answer.choices.map do |choice|
+            {
+              answer_option_body: choice.try(:answer_option).try(:translated_body),
+              choice_body: body_or_custom_body(choice)
+            }
+          end
+
+          return { single_option: choice(choices.first) } if answer.question.question_type == "single_option"
 
-      def controller
-        @controller ||= FormPDFControllerHelper.new
+          { multiple_option: choices.map { |c| choice(c) } }
+        end
       end
 
-      def template
-        "decidim/forms/admin/questionnaires/answers/export/pdf"
+      class ParticipantPresenter < Decidim::Forms::Admin::QuestionnaireParticipantPresenter
+        def answers
+          siblings.map { |answer| QuestionnaireAnswerPresenter.new(answer:) }
+        end
       end
 
-      def layout
-        "decidim/forms/admin/questionnaires/questionnaire_answers"
+      protected
+
+      def add_data!
+        composer.text(decidim_sanitize(translated_attribute(questionnaire.title), strip_tags: true), style: :h1)
+        composer.text(decidim_sanitize(translated_attribute(questionnaire.description), strip_tags: true), style: :description)
+        composer.text(I18n.t("title", scope: "decidim.forms.admin.questionnaires.answers.index", total: collection.count), style: :section_title)
+
+        local_collection = collection.map { |answer| ParticipantPresenter.new(participant: answer.first) }
+
+        local_collection.each_with_index do |record, index|
+          add_response_box(record, index)
+        end
       end
 
-      def locals
+      def questionnaire = collection.first.first.questionnaire
+
+      def styles
         {
-          questionnaire: collection.first.first.questionnaire,
-          collection: collection.map { |answer| Decidim::Forms::Admin::QuestionnaireParticipantPresenter.new(participant: answer.first) }
+          h1: { font: bold_font, font_size: 18, margin: [0, 0, 10, 0] },
+          th: { font: bold_font, font_size: 10, margin: [0, 0, 10, 0] },
+          td: { font:, font_size: 10, margin: [0, 0, 10, 0] },
+          description: { font:, margin: [0, 0, 10, 0], font_size: 10 },
+          section_title: { font: bold_font, margin: [15, 0, 15, 0], font_size: 16 },
+          question_title: { font: bold_font, margin: [10, 0, 10, 0], font_size: 12 },
+          question_answer: { font:, margin: [10, 0, 10, 0], font_size: 10 },
+          file_info: { font:, margin: [10, 0, 10, 0], font_size: 8 },
+          link: { font:, margin: [10, 0, 10, 0], font_size: 10, underline: true }
         }
       end
+
+      def header
+        [
+          layout.text(I18n.t("session_token", scope: "decidim.forms.user_answers_serializer"), style: :th),
+          layout.text(I18n.t("user_status", scope: "decidim.forms.user_answers_serializer"), style: :th),
+          layout.text(I18n.t("ip_hash", scope: "decidim.forms.user_answers_serializer"), style: :th),
+          layout.text(I18n.t("completion", scope: "decidim.forms.user_answers_serializer"), style: :th),
+          layout.text(I18n.t("created_at", scope: "decidim.forms.user_answers_serializer"), style: :th)
+        ]
+      end
+
+      def add_user_data(record)
+        cells = [
+          layout.text(record.session_token, style: :td),
+          layout.text(record.status, style: :td),
+          layout.text(record.ip_hash, style: :td),
+          layout.text(display_percentage(record.completion), style: :td),
+          layout.text(I18n.l(record.answered_at, format: :short), style: :td)
+        ]
+        composer.table([cells], header: ->(_table) { [header] }, cell_style: { border: { width: 0 } })
+      end
+
+      def add_response_box(record, index)
+        composer.text(I18n.t("title", number: index + 1, scope: "decidim.forms.admin.questionnaires.answers.export.answer"), style: :section_title)
+        add_user_data(record)
+
+        record.answers.each do |answer|
+          composer.text(answer.question, style: :question_title)
+          add_answer_body(answer)
+        end
+      end
+
+      def add_answer_body(answer)
+        return composer.text(answer.body[:string], style: :question_answer) if answer.body.has_key?(:string)
+
+        if answer.attachments.any?
+          composer.list(marker_type: :disc) do |sub_list|
+            answer.attachments.each do |attachment|
+              sub_list.formatted_text(
+                [{ link: attachment.url,
+                   text: translated_attribute(attachment.title).presence ||
+                    I18n.t("download_attachment", scope: "decidim.forms.questionnaire_answer_presenter"),
+                   style: :link },
+                 " (#{attachment.file_type} #{number_to_human_size(attachment.file_size)})"],
+                style: :file_info
+              )
+            end
+          end
+          return
+        end
+
+        if answer.body.has_key?(:single_option)
+          composer.list(marker_type: :disc) do |sub_list|
+            sub_list.text(answer.body[:single_option], style: :question_answer)
+          end
+        else
+          composer.list(marker_type: :disc) do |sub_list|
+            answer.body[:multiple_option].map { |choice| sub_list.text(choice, style: :question_answer) }
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/forms/download_your_data_user_answers_serializer.rb

@@ -8,10 +8,6 @@ module Decidim
       def serialize
         {
           id: resource.id,
-          user: {
-            name: resource.user.name,
-            email: resource.user.email
-          },
           questionnaire: {
             id: resource.question.questionnaire.id,
             title: translated_attribute(resource.question.questionnaire.title),

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

@@ -149,8 +149,8 @@ FactoryBot.define do
 
     trait :with_attachments do
       after(:create) do |answer, evaluator|
-        create :attachment, :with_image, attached_to: answer, skip_injection: evaluator.skip_injection
-        create :attachment, :with_pdf, attached_to: answer, skip_injection: evaluator.skip_injection
+        create(:attachment, :with_image, attached_to: answer, skip_injection: evaluator.skip_injection)
+        create(:attachment, :with_pdf, attached_to: answer, skip_injection: evaluator.skip_injection)
       end
     end
   end