decidim-forms 0.29.2 → 0.30.0.rc1

data/config/locales/fr.yml

@@ -24,17 +24,31 @@ fr:
               missing: ne sont pas complets
               too_many: Vous pouvez choisir un maximum de %{count}.
         questionnaire:
-          request_invalid: Une erreur s'est produite. Veuillez réessayer.
+          request_invalid: Une erreur s'est produite lors du traitement de la requête. Veuillez essayer à nouveau.
   decidim:
+    download_your_data:
+      show:
+        answers: Export des réponses
+        survey_user_answers: Réponses à l'enquête
     forms:
       admin:
         models:
           components:
+            allow_answers: Autoriser les réponses
+            allow_editing_answers: Autoriser les utilisateurs enregistrés à modifier leurs propres réponses à l'enquête
+            allow_unregistered: Autoriser les utilisateurs non enregistrés à répondre à l'enquête
+            announcement: Annonce
+            clean_after_publish: Supprimer les réponses lors de la publication de l’enquête
             description: La description
+            ends_at: Réponses acceptées jusqu'au
+            ends_at_help: Laisser vide si aucune date spécifique
+            starts_at: Réponses acceptées à partir du
+            starts_at_help: Laisser vide si aucune date spécifique
             tos: Conditions d'utilisation
         questionnaires:
           actions:
             back: Retour aux questions
+            publish_answers: Publier les réponses
             show: Afficher les réponses
           answer_option:
             answer_option: Option de réponse
@@ -79,16 +93,18 @@ fr:
           edit:
             save: sauvegarder
             title: Modifier le questionnaire
-          form:
+          edit_questions:
             add_question: Ajouter une question
             add_separator: Ajouter un séparateur
             add_title_and_description: Ajouter un titre et une description
-            already_answered_warning: Certains utilisateurs ont déjà répondu au formulaire, vous ne pouvez donc pas modifier ses questions.
+            save: Enregistrer
+            title: Questions
+          form:
+            add_question: Ajouter une question
             collapse: Réduire toutes les questions
             expand: Développer toutes les questions
             preview: Aperçu
             title: Modifier le questionnaire pour %{questionnaire_for}
-            unpublished_warning: Le formulaire n'est pas publié. Vous pouvez modifier ses questions, mais cela supprimera les réponses actuelles.
           matrix_row:
             matrix_row: Ligne
             remove: Retirer
@@ -107,6 +123,13 @@ fr:
             remove: Retirer
             statement: Déclaration
             up: Monter
+          questions_form:
+            already_answered_warning: Certains utilisateurs ont déjà répondu au formulaire, vous ne pouvez donc pas modifier ses questions.
+            collapse: Replier toutes les questions
+            expand: Déplier toutes les questions
+            unpublished_warning: Le formulaire n'est pas publié. Vous pouvez modifier ses questions, mais cela supprimera les réponses actuelles.
+            update:
+              success: Les questions de l'enquête ont été sauvegardées avec succès.
           separator:
             down: Bas
             remove: Retirer
@@ -125,6 +148,9 @@ fr:
             invalid: Il y a eu des erreurs lors de la sauvegarde du questionnaire.
             success: Le questionnaire a bien été sauvegardé.
       admin_log:
+        question:
+          publish_answers: "%{user_name} a publié les réponses aux questions de %{resource_name} sur l'espace %{space_name}"
+          unpublish_answers: "%{user_name} a dépublié les réponses aux questions de %{resource_name} sur l'espace %{space_name}"
         questionnaire:
           update: "%{user_name} a modifié le questionnaire %{resource_name}"
       errors:
@@ -167,6 +193,9 @@ fr:
           questionnaire_answered:
             body: Vous avez déjà répondu à ce questionnaire.
             title: Déjà répondu
+          questionnaire_answered_edit:
+            body: Vous avez déjà répondu à ce formulaire. %{link}
+            edit: Modifier vos réponses
           questionnaire_closed:
             body: Le questionnaire est fermé et vous ne pouvez pas y répondre.
             title: Questionnaire fermé
@@ -181,9 +210,12 @@ fr:
           tos_agreement: En participant, vous acceptez ces conditions d'utilisation
       step_navigation:
         show:
-          are_you_sure: Cette action ne peut pas être annulée et vous ne pourrez pas modifier vos réponses. Êtes-vous sûr(e) ?
+          are_you_sure_edit: Vous serez en mesure de modifier vos réponses. Êtes-vous sûr(e)?
+          are_you_sure_edit_guest: Si vous voulez pouvoir modifier vos réponses par la suite, vous devez vous connecter ou créer un compte.
+          are_you_sure_no_edit: Cette action ne peut pas être annulée et vous ne pourrez pas modifier vos réponses. Êtes-vous sûr(e) ?
           back: Revenir en arrière
           continue: Continuer
+          disallowed: Vous n'êtes pas autorisé(e) à modifier vos réponses.
           submit: Soumettre
       user_answers_serializer:
         body: Répondre

data/config/locales/ja.yml

@@ -24,7 +24,7 @@ ja:
               missing: は完全ではありません
               too_many: 最大 %{count} 個まで選択できます。
         questionnaire:
-          request_invalid: リクエストの処理中にエラーが発生しました。もう一度やり直してください。
+          request_invalid: リクエストの処理中に問題が発生しました。もう一度やり直してください。
   decidim:
     forms:
       admin:

data/config/locales/lt.yml

@@ -22,8 +22,6 @@ lt:
               too_long: per ilgas
             choices:
               missing: nepilnas - trūksta elementų
-        questionnaire:
-          request_invalid: Tvarkant prašymą įvyko klaida. Bandykite dar kartą.
   decidim:
     forms:
       admin:

data/config/locales/pl.yml

@@ -23,8 +23,6 @@ pl:
             choices:
               missing: nie są kompletne
               too_many: Możesz wybrać maksymalnie %{count}.
-        questionnaire:
-          request_invalid: Wystąpił błąd podczas obsługi żądania. Spróbuj ponownie.
   decidim:
     forms:
       admin:

data/config/locales/ro-RO.yml

@@ -22,13 +22,12 @@ ro:
               too_long: este prea lung
             choices:
               missing: nu sunt completate
-        questionnaire:
-          request_invalid: A apărut o eroare la procesarea cererii. Te rugăm să încerci din nou.
   decidim:
     forms:
       admin:
         models:
           components:
+            allow_editing_answers: Permiteți utilizatorilor înregistrați să modifice propriile răspunsuri la sondaj
             description: Descriere
             tos: Condiţii de utilizare
         questionnaires:
@@ -161,6 +160,9 @@ ro:
           questionnaire_answered:
             body: Ai completat deja la acest chestionar.
             title: Un răspuns a fost deja trimis
+          questionnaire_answered_edit:
+            body: Ați răspuns deja la acest sondaj. %{link}
+            edit: Modificați răspunsurile
           questionnaire_closed:
             body: Chestionarul este închis și nu mai poate fi completat.
             title: Formular închis
@@ -175,9 +177,12 @@ ro:
           tos_agreement: Prin participare accepți Termenii și condițiile sale de utilizare
       step_navigation:
         show:
-          are_you_sure: Această acțiune nu poate fi anulată și nu veți putea să vă modificați răspunsurile. Sunteți sigur?
+          are_you_sure_edit: Veți putea să modificați răspunsurile. Sunteți sigur?
+          are_you_sure_edit_guest: Dacă doriți să modificați răspunsurile după ce veți răspunde, atunci trebuie să vă autentificați sau să creați un cont.
+          are_you_sure_no_edit: Această acțiune nu poate fi anulată și nu veți putea să vă modificați răspunsurile. Sunteți sigur?
           back: Înapoi
           continue: Continuă
+          disallowed: Nu aveți permisiunea să vă modificați răspunsurile.
           submit: Trimite
       user_answers_serializer:
         body: Răspuns

data/config/locales/zh-TW.yml

@@ -22,8 +22,6 @@ zh-TW:
               too_long: 太長
             choices:
               missing: 尚未完成
-        questionnaire:
-          request_invalid: 處理請求時發生錯誤。請再試一次。
   decidim:
     forms:
       admin:

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