decidim-forms 0.29.1 → 0.30.0.rc1

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:
@@ -80,14 +79,10 @@ ro:
             title: Editare chestionar
           form:
             add_question: Adaugă întrebare
-            add_separator: Adaugă separator
-            add_title_and_description: Adaugați titlu și descriere
-            already_answered_warning: Au fost înregistrare deja câteva răspunsuri de la utilizatori pentru acest chestionar. De aceea, nu mai puteți modifica întrebările.
             collapse: Restrânge toate întrebările
             expand: Extinde toate întrebările
             preview: Previzualizează
             title: Actualizați chestionarul pentru %{questionnaire_for}
-            unpublished_warning: Chestionarul nu este publicat. Poți modifica întrebările, dar această acțiune va duce la stergerea automată a răspunsurilor curente.
           matrix_row:
             matrix_row: Rând
             remove: Elimină
@@ -165,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
@@ -179,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 vei putea să îți editezi răspunsurile. Sigur dorești asta?
+          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/sk.yml

@@ -32,7 +32,6 @@ sk:
             save: Uložiť
           form:
             add_question: Pridať otázku
-            already_answered_warning: Na formulár už niekto odpovedal, takže nemôžete meniť jeho otázky.
           matrix_row:
             remove: Odstrániť
             statement: Prehlásenie
@@ -74,7 +73,6 @@ sk:
           tos_agreement: Účasťou súhlasíte s našimi Podmienkami použitia
       step_navigation:
         show:
-          are_you_sure: Táto akcia sa nedá vrátiť späť, a nebudete môcť upraviť svoje odpovede. Ste si istí?
           submit: Poslať
       user_answers_serializer:
         created_at: Odpovedané na 

data/config/locales/sv.yml

@@ -81,14 +81,10 @@ sv:
             title: Redigera enkät
           form:
             add_question: Lägg till fråga
-            add_separator: Lägg till avgränsare
-            add_title_and_description: Lägg till titel och beskrivning
-            already_answered_warning: Frågeformuläret har redan besvarats av användare och du kan inte längre ändra frågorna.
             collapse: Dölj alla frågor
             expand: Visa alla frågor
             preview: Förhandsgranska
             title: Redigera formulär för %{questionnaire_for}
-            unpublished_warning: Formuläret har inte publicerats. Du kan ändra frågorna, men det kommer att göra att befintliga svar raderas.
           matrix_row:
             matrix_row: Rad
             remove: Ta bort
@@ -181,7 +177,6 @@ sv:
           tos_agreement: Genom att delta godkänner du användarvillkoren
       step_navigation:
         show:
-          are_you_sure: Den här åtgärden kan inte ångras och du kommer inte att kunna redigera dina svar. Är du säker?
           back: Tillbaka
           continue: Fortsätt
           submit: Skicka in

data/config/locales/tr-TR.yml

@@ -71,13 +71,10 @@ tr:
             title: Anketi düzenleyin
           form:
             add_question: Soru ekle
-            add_separator: Ayırıcı ekle
-            already_answered_warning: Form, bazı kullanıcılar tarafından zaten yanıtlandı, bu nedenle sorularını değiştiremezsiniz.
             collapse: Tüm soruları daraltın
             expand: Tüm soruları genişletin
             preview: Önizleme
             title: '%{questionnaire_for} için formu düzenleyin'
-            unpublished_warning: Form yayınlanmadı. Sorularını değiştirebilirsiniz, ancak bunu yapmak mevcut cevapları silecektir.
           matrix_row:
             matrix_row: Satır
             remove: Kaldır
@@ -144,7 +141,6 @@ tr:
           tos_agreement: Katılarak Hizmet Şartlarını kabul etmiş olursunuz.
       step_navigation:
         show:
-          are_you_sure: Bu işlem geri alınamaz ve cevaplarınızı düzenleyemezsiniz. Emin misiniz?
           back: Geri
           continue: Devam et
           submit: Gönder

data/config/locales/val-ES.yml

@@ -4,8 +4,6 @@ val:
     forms:
       admin:
         questionnaires:
-          form:
-            add_title_and_description: Afig títol i descripció
           title_and_description:
             collapse: Redueix
             description: Descripció

data/config/locales/zh-CN.yml

@@ -71,12 +71,9 @@ zh-CN:
             title: 编辑问题单
           form:
             add_question: 添加问题
-            add_separator: 添加分隔符
-            already_answered_warning: 某些用户已经回答了表单，因此您不能修改其问题。
             collapse: 收起所有问题
             expand: 展开所有问题
             preview: 预览
-            unpublished_warning: 表单未发布。您可以修改它的问题，但这样做将删除当前答案。
           matrix_row:
             matrix_row: 行
             remove: 删除
@@ -142,7 +139,6 @@ zh-CN:
           tos_agreement: 通过参与您接受其服务条款
       step_navigation:
         show:
-          are_you_sure: 此操作不能撤消，您将无法编辑您的答案。您确定吗？
           back: 后退
           continue: 继续
           submit: 提交

data/config/locales/zh-TW.yml

@@ -22,8 +22,6 @@ zh-TW:
               too_long: 太長
             choices:
               missing: 尚未完成
-        questionnaire:
-          request_invalid: 處理請求時發生錯誤。請再試一次。
   decidim:
     forms:
       admin:
@@ -80,14 +78,10 @@ zh-TW:
             title: 編輯問卷內容
           form:
             add_question: 新增問題
-            add_separator: 新增分隔線
-            add_title_and_description: 新增標題與描述
-            already_answered_warning: 已有使用者回答此表單，因此您無法修改問題。
             collapse: 收起所有問題
             expand: 展開所有問題
             preview: 預覽
             title: 編輯問卷表單%{questionnaire_for}
-            unpublished_warning: 此表單尚未發佈。您可以修改其問題，但這樣做將刪除目前的回答。
           matrix_row:
             matrix_row: 列
             remove: 移除
@@ -178,7 +172,6 @@ zh-TW:
           tos_agreement: 透過參與，您同意其服務條款
       step_navigation:
         show:
-          are_you_sure: 此操作無法撤消，您將無法編輯您的答案。您確定嗎？
           back: 返回
           continue: 繼續
           submit: 提交

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

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.version = Decidim::Forms.version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva", "Rubén González Valero"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com", "rbngzlv@gmail.com"]
-  s.license = "AGPL-3.0"
+  s.license = "AGPL-3.0-or-later"
   s.homepage = "https://decidim.org"
   s.metadata = {
     "bug_tracker_uri" => "https://github.com/decidim/decidim/issues",
@@ -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,11 +33,6 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency "decidim-core", Decidim::Forms.version
-  s.add_dependency "wicked_pdf", "~> 2.1"
-  # Latest version of wkhtmltopdf-binary downloads more versions of the binary
-  # This brings problems with deployment in certain environments, as Heroku
-  # Hopefully they will fix this situation soon
-  s.add_dependency "wkhtmltopdf-binary", "= 0.12.6.6"
 
   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