decidim-forms 0.26.7 → 0.27.0.rc1

data/config/locales/pl.yml

@@ -1,3 +1,4 @@
+---
 pl:
   activemodel:
     attributes:
@@ -7,10 +8,10 @@ pl:
         selected_choices: Wybrane opcje
       question:
         max_choices: Maksymalna liczba opcji do wyboru
-        question_type: Typ odpowiedzi
+        question_type: Typ
       questionnaire_question:
-        mandatory: Odpowiedź wymagana
-        max_characters: Limit znaków (zostaw 0, jeśli nie chcesz ustawiać limitu)
+        mandatory: Obowiązkowy
+        max_characters: Limit znaków (zostaw 0 jeśli nie chcesz ustawiać limitu)
     errors:
       models:
         answer:
@@ -37,7 +38,7 @@ pl:
             show: Pokaż odpowiedzi
           answer_option:
             answer_option: Opcja odpowiedzi
-            free_text: Możliwość wpisania dowolnego tekstu
+            free_text: Dowolny tekst
             remove: Usuń
             statement: Komunikat
           answers:
@@ -118,10 +119,6 @@ pl:
         extension_allowlist: 'Dozwolone formaty:'
       images:
         dimensions: "%{width} × %{height} px"
-        dimensions_info: 'Rozmiar obrazu będzie wynosił:'
-        processors:
-          resize_and_pad: Zmieniony i dopełniony do
-          resize_to_fit: Dopasowany
       question_types:
         files: Pliki
         long_answer: Długa odpowiedź
@@ -131,7 +128,6 @@ pl:
         short_answer: Krótka odpowiedź
         single_option: Jedna opcja
         sorting: Sortowanie
-        title_and_description: Tytuł i opis
       questionnaires:
         answer:
           invalid: Podczas wypełniania formularza wystąpiły błędy.

data/config/locales/pt-BR.yml

@@ -1,4 +1,5 @@
-pt-BR:
+---
+pt:
   activemodel:
     attributes:
       answer:
@@ -118,10 +119,6 @@ pt-BR:
         extension_allowlist: 'Formatos aceitos:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagem será:'
-        processors:
-          resize_and_pad: Redimensionado e acolchoado para
-          resize_to_fit: Redimensionado para caber
       question_types:
         files: Arquivos
         long_answer: Resposta longa

data/config/locales/pt.yml

@@ -1,3 +1,4 @@
+---
 pt:
   activemodel:
     attributes:
@@ -118,10 +119,6 @@ pt:
         extension_allowlist: 'Formatos aceites:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Esta imagem será:'
-        processors:
-          resize_and_pad: Redimensionada e ajustada para
-          resize_to_fit: Redimensionada para caber
       question_types:
         files: Ficheiros
         long_answer: Resposta longa

data/config/locales/ro-RO.yml

@@ -1,3 +1,4 @@
+---
 ro:
   activemodel:
     attributes:
@@ -128,10 +129,6 @@ ro:
         extension_allowlist: 'Formate acceptate:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Această imagine va fi:'
-        processors:
-          resize_and_pad: Redimensionat și padded la
-          resize_to_fit: Redimensionată pentru a se potrivi
       question_types:
         files: Fișiere
         long_answer: Răspuns lung
@@ -142,8 +139,6 @@ ro:
         single_option: Opțiune unică
         sorting: Sortare
         title_and_description: Titlu și descriere
-      questionnaire_answer_presenter:
-        download_attachment: Descărcare atașament
       questionnaires:
         answer:
           invalid: A apărut o problemă la completarea chestionarului.

data/config/locales/ru.yml

@@ -1,3 +1,4 @@
+---
 ru:
   decidim:
     forms:

data/config/locales/si-LK.yml

@@ -1 +1,2 @@
+---
 si:

data/config/locales/sk.yml

@@ -1,3 +1,4 @@
+---
 sk:
   activemodel:
     attributes:

data/config/locales/sl.yml

@@ -1,3 +1,4 @@
+---
 sl:
   activemodel:
     attributes:

data/config/locales/so-SO.yml

@@ -1 +1,2 @@
+---
 so:

data/config/locales/sr-CS.yml

@@ -1 +1,2 @@
+---
 sr:

data/config/locales/sv.yml

@@ -1,3 +1,4 @@
+---
 sv:
   activemodel:
     attributes:
@@ -128,10 +129,6 @@ sv:
         extension_allowlist: 'Godkända format:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Denna bild kommer att vara:'
-        processors:
-          resize_and_pad: Anpassad och vadderad till
-          resize_to_fit: Anpassad för att passa
       question_types:
         files: Filer
         long_answer: Långt svar

data/config/locales/sw-KE.yml

@@ -1 +1,2 @@
+---
 sw:

data/config/locales/ti-ER.yml

@@ -1 +1,2 @@
+---
 ti:

data/config/locales/tr-TR.yml

@@ -1,3 +1,4 @@
+---
 tr:
   activemodel:
     attributes:
@@ -113,10 +114,6 @@ tr:
         extension_allowlist: 'Kabul edilen biçimler:'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: 'Bu resim:'
-        processors:
-          resize_and_pad: Yeniden boyutlandırıldı ve dolduruldu
-          resize_to_fit: Sığacak şekilde yeniden boyutlandırıldı
       question_types:
         long_answer: Uzun cevap
         matrix_multiple: Matris (Çoklu seçenek)

data/config/locales/uk.yml

@@ -1 +1,2 @@
+---
 uk:

data/config/locales/val-ES.yml

@@ -1,3 +1,4 @@
+---
 val:
   decidim:
     forms:

data/config/locales/vi.yml

@@ -1 +1,2 @@
+---
 vi:

data/config/locales/zh-CN.yml

@@ -1,3 +1,4 @@
+---
 zh-CN:
   activemodel:
     attributes:
@@ -112,10 +113,6 @@ zh-CN:
         extension_allowlist: '接受的格式：'
       images:
         dimensions: "%{width} x %{height} px"
-        dimensions_info: '这张图片将是：'
-        processors:
-          resize_and_pad: 缩放并填充到
-          resize_to_fit: 调整到适合的
       question_types:
         long_answer: 长答案
         matrix_multiple: 矩阵(多选项)

data/config/locales/zh-TW.yml

@@ -1,191 +1,2 @@
+---
 zh-TW:
-  activemodel:
-    attributes:
-      answer:
-        body: 回答
-        choices: 選項
-        selected_choices: 已選擇的選項
-      question:
-        max_choices: 選擇的最大數量
-        question_type: 類別
-      questionnaire_question:
-        mandatory: 必填的
-        max_characters: 字元限制（如果不需要限制，請設為0）
-    errors:
-      models:
-        answer:
-          attributes:
-            add_documents:
-              needs_to_be_reattached: 需要重新附加
-            body:
-              too_long: 太長
-            choices:
-              missing: 尚未完成
-              too_many: 太多了
-        questionnaire:
-          request_invalid: 處理請求時發生錯誤，請再試一次
-  decidim:
-    forms:
-      admin:
-        models:
-          components:
-            description: 說明
-            tos: 服務條款
-        questionnaires:
-          actions:
-            back: 返回問題
-            show: 顯示回應
-          answer_option:
-            answer_option: 答案選項：
-            free_text: 免費文字
-            remove: 移除
-            statement: 聲明
-          answers:
-            actions:
-              back: 返回回覆
-              export: 匯出
-              show: 顯示答案
-            empty: 目前尚未回答
-            export:
-              answer:
-                title: '回應 #%{number}'
-            export_response:
-              title: 調查問卷使用者回答_%{token}
-            index:
-              title: "%{total} 個回應總數"
-            show:
-              title: '回答#%{number}'
-          display_condition:
-            answer_option: 答案選項
-            condition_question: 問題
-            condition_type: 條件
-            condition_types:
-              answered: 已回答
-              equal: 等於
-              match: 包含文字
-              not_answered: 未回答
-              not_equal: 不等於
-            condition_value: 包含文字
-            display_condition: 顯示條件
-            mandatory: 這個條件必須始終滿足，無論其他條件的狀態如何。
-            remove: 移除
-            save_warning: 在配置顯示條件之前，請記得保存表單。
-            select_answer_option: 選擇答案選項
-            select_condition_question: 選取一個問題
-            select_condition_type: 選擇一個條件類型
-          edit:
-            save: 儲存
-            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: 移除
-            statement: 聲明
-          question:
-            add_answer_option: 新增答案選項
-            add_display_condition: 新增顯示條件
-            add_display_condition_info: 請先儲存表單再設定顯示條件
-            add_matrix_row: 新增列
-            any: 任何
-            collapse: 收回
-            description: 說明
-            down: 向下
-            expand: 展開
-            question: 問題
-            remove: 移除
-            statement: 聲明
-            up: 往上
-          separator:
-            down: 向下
-            remove: 移除
-            separator: 分隔線
-            up: 往上
-          title_and_description:
-            collapse: 收回
-            description: 說明
-            down: 向下
-            expand: 展開
-            remove: 移除
-            title: 標題
-            title_and_description: 標題和描述
-            up: 往上
-          update:
-            invalid: 儲存表單時發生問題。
-            success: 表單已成功儲存。
-      errors:
-        answer:
-          body: 內容不能為空
-      files:
-        extension_allowlist: '可用格式'
-      images:
-        dimensions: "%{width} x %{height} 像素"
-        dimensions_info: '這張圖片會是:'
-        processors:
-          resize_and_pad: 調整大小並填充為
-          resize_to_fit: 重新調整大小以符合
-      question_types:
-        files: 檔案
-        long_answer: 長回答
-        matrix_multiple: 矩陣（多重選項）
-        matrix_single: 矩陣（單一選項）
-        multiple_option: 多選
-        short_answer: 簡答
-        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:
-            anonymous_user_message: <a href="%{sign_in_link}">使用現有帳號登入</a> 或 <a href="%{sign_up_link}">註冊新帳戶</a> 以回答此表單。
-            title: 回答表單 
-          current_step: 步驟%{step}
-          of_total_steps: 的%{total_steps}
-          questionnaire_answered:
-            body: 您已經回答過此表格。
-            title: 已經回答
-          questionnaire_closed:
-            body: 該表格已關閉，無法回答。
-            title: 表單已關閉
-          questionnaire_for_private_users:
-            body: 此表單僅適用於私人使用者
-            title: 表單已關閉
-          questionnaire_js_disabled:
-            body: 此表單的某些功能將被禁用。為了改善您的體驗，請在您的瀏覽器中啟用JavaScript。
-            title: JavaScript已停用
-          questionnaire_not_published:
-            body: 此表單尚未發佈。
-          tos_agreement: 透過參與，您同意其服務條款
-      step_navigation:
-        show:
-          are_you_sure: 此操作無法撤消，您將無法編輯您的答案。您確定嗎？
-          back: 返回
-          continue: 繼續
-          submit: 提交
-      user_answers_serializer:
-        body: 回答
-        completion: 完成
-        created_at: 回答時間
-        id: 回答 ID
-        ip_hash: IP Hash
-        question: 問題
-        registered: 已註冊
-        session_token: 使用者識別碼
-        unregistered: 未註冊
-        user_status: 用戶狀態

data/lib/decidim/exporters/form_pdf.rb

@@ -15,11 +15,11 @@ module Decidim
       end
 
       def template
-        "decidim/forms/admin/questionnaires/answers/export/pdf.html.erb"
+        "decidim/forms/admin/questionnaires/answers/export/pdf"
       end
 
       def layout
-        "decidim/forms/admin/questionnaires/questionnaire_answers.html.erb"
+        "decidim/forms/admin/questionnaires/questionnaire_answers"
       end
 
       def locals

data/lib/decidim/forms/{data_portability_user_answers_serializer.rb → download_your_data_user_answers_serializer.rb}

@@ -2,9 +2,9 @@
 
 module Decidim
   module Forms
-    class DataPortabilityUserAnswersSerializer < Decidim::Exporters::Serializer
+    class DownloadYourDataUserAnswersSerializer < Decidim::Exporters::Serializer
       include Decidim::TranslationsHelper
-      # Serializes an user answer for data portability
+      # Serializes an user answer for download your data
       def serialize
         {
           id: resource.id,

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

@@ -29,38 +29,47 @@ FactoryBot.define do
     end
 
     trait :with_all_questions do
-      questions do
+      after(:build) do |questionaire, _evaluator|
         position = 0
-        qs = %w(short_answer long_answer).collect do |text_question_type|
-          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+        %w(short_answer long_answer).collect do |text_question_type|
+          q = create(:questionnaire_question,
+                     question_type: text_question_type,
+                     position: position,
+                     questionnaire: questionaire)
           position += 1
-          q
+          questionaire.questions << q
         end
 
         %w(single_option multiple_option).each do |option_question_type|
-          q = build(:questionnaire_question, :with_answer_options, question_type: option_question_type, position: position)
-          position += 1
-          qs << q
+          q = create(:questionnaire_question, :with_answer_options,
+                     question_type: option_question_type,
+                     position: position,
+                     questionnaire: questionaire)
           q.display_conditions.build(
-            condition_question: qs[q.position - 2],
+            condition_question: questionaire.questions[q.position - 1],
             question: q,
             condition_type: :answered,
             mandatory: true
           )
+          questionaire.questions << q
+          position += 1
         end
 
         %w(matrix_single matrix_multiple).collect do |matrix_question_type|
-          q = build(:questionnaire_question, :with_answer_options, question_type: matrix_question_type, position: position, body: generate_localized_title)
-          position += 1
-          qs << q
+          q = build(:questionnaire_question, :with_answer_options,
+                    question_type: matrix_question_type,
+                    position: position,
+                    body: generate_localized_title,
+                    questionnaire: questionaire)
           q.display_conditions.build(
-            condition_question: qs[q.position - 2],
+            condition_question: questionaire.questions[q.position - 1],
             question: q,
             condition_type: :answered,
             mandatory: true
           )
+          questionaire.questions << q
+          position += 1
         end
-        qs
       end
     end
 

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

@@ -10,11 +10,8 @@ shared_examples_for "manage questionnaire answers" do
   let!(:second) do
     create :questionnaire_question, questionnaire: questionnaire, position: 2, question_type: "single_option"
   end
-  let!(:third) do
-    create :questionnaire_question, questionnaire: questionnaire, position: 3, question_type: "files"
-  end
   let(:questions) do
-    [first, second, third]
+    [first, second]
   end
 
   context "when there are no answers" do
@@ -28,7 +25,6 @@ shared_examples_for "manage questionnaire answers" do
     let!(:answer1) { create :answer, questionnaire: questionnaire, question: first }
     let!(:answer2) { create :answer, body: "second answer", questionnaire: questionnaire, question: first }
     let!(:answer3) { create :answer, questionnaire: questionnaire, question: second }
-    let!(:file_answer) { create :answer, :with_attachments, questionnaire: questionnaire, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
 
     it "shows the answer admin link" do
       visit questionnaire_edit_path
@@ -49,7 +45,7 @@ shared_examples_for "manage questionnaire answers" do
       end
 
       it "shows the percentage" do
-        expect(page).to have_content("33%")
+        expect(page).to have_content("50%")
       end
 
       it "has a detail link" do
@@ -125,25 +121,6 @@ shared_examples_for "manage questionnaire answers" do
         expect(page).not_to have_link("Next ›")
         expect(page).to have_link("‹ Prev")
       end
-
-      it "third answer has download link for the attachments" do
-        click_link answer3.session_token, match: :first
-        expect(page).to have_content(translated(file_answer.attachments.first.title))
-        expect(page).to have_content(translated(file_answer.attachments.second.title))
-      end
-
-      context "when the file answer does not have a title for the attachment" do
-        let!(:file_answer) { create :answer, questionnaire: questionnaire, question: third, body: nil, user: answer3.user, session_token: answer3.session_token }
-
-        before do
-          create :attachment, :with_image, attached_to: file_answer, title: {}, description: {}
-        end
-
-        it "third answer has download link for the attachments" do
-          click_link answer3.session_token, match: :first
-          expect(page).to have_content("Download attachment")
-        end
-      end
     end
   end
 end

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

@@ -344,11 +344,11 @@ shared_examples_for "update questions" do
   end
 
   context "when a questionnaire has multiple existing questions" do
-    let!(:question_1) do
+    let!(:question1) do
       create(:questionnaire_question, questionnaire: questionnaire, body: first_body, position: 0)
     end
 
-    let!(:question_2) do
+    let!(:question2) do
       create(:questionnaire_question, questionnaire: questionnaire, body: second_body, position: 1)
     end
 

data/lib/decidim/forms/user_answers_serializer.rb

@@ -79,7 +79,7 @@ module Decidim
       end
 
       def normalize_matrix_choices(answer, choices)
-        answer.question.matrix_rows.map do |matrix_row|
+        answer.question.matrix_rows.to_h do |matrix_row|
           row_body = translated_attribute(matrix_row.body)
 
           row_choices = answer.question.answer_options.map do |answer_option|
@@ -88,7 +88,7 @@ module Decidim
           end
 
           [row_body, row_choices]
-        end.to_h
+        end
       end
 
       def answer_translated_attribute_name(attribute)

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.26.7"
+      "0.27.0.rc1"
     end
   end
 end

data/lib/decidim/forms.rb

@@ -9,7 +9,7 @@ module Decidim
   # This namespace holds the logic of the `Forms`.
   module Forms
     autoload :UserAnswersSerializer, "decidim/forms/user_answers_serializer"
-    autoload :DataPortabilityUserAnswersSerializer, "decidim/forms/data_portability_user_answers_serializer"
+    autoload :DownloadYourDataUserAnswersSerializer, "decidim/forms/download_your_data_user_answers_serializer"
   end
 
   module Exporters