decidim-forms 0.26.5 → 0.27.0.rc1

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 +1,2 @@
+---
 zh-TW:

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.5"
+      "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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.26.5
+  version: 0.27.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-13 00:00:00.000000000 Z
+date: 2022-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.26.5
+        version: 0.27.0.rc1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -151,6 +151,7 @@ files:
 - app/packs/stylesheets/decidim/forms/questionnaire-answers-pdf.scss
 - app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb
 - app/presenters/decidim/forms/admin/questionnaire_participant_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/queries/decidim/forms/questionnaire_participant.rb
@@ -216,7 +217,6 @@ files:
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
-- config/locales/gn-PY.yml
 - config/locales/hr-HR.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
@@ -225,12 +225,10 @@ files:
 - config/locales/is.yml
 - config/locales/it.yml
 - config/locales/ja.yml
-- config/locales/ka-GE.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
 - config/locales/lb-LU.yml
 - config/locales/lb.yml
-- config/locales/lo-LA.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -238,7 +236,6 @@ files:
 - config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
-- config/locales/oc-FR.yml
 - config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
@@ -284,7 +281,7 @@ files:
 - lib/decidim/forms/admin.rb
 - lib/decidim/forms/admin_engine.rb
 - lib/decidim/forms/api.rb
-- lib/decidim/forms/data_portability_user_answers_serializer.rb
+- lib/decidim/forms/download_your_data_user_answers_serializer.rb
 - lib/decidim/forms/engine.rb
 - lib/decidim/forms/test.rb
 - lib/decidim/forms/test/factories.rb
@@ -309,14 +306,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Decidim forms

data/config/locales/gn-PY.yml

@@ -1 +0,0 @@
-gn:

data/config/locales/ka-GE.yml

@@ -1 +0,0 @@
-ka:

data/config/locales/lo-LA.yml

@@ -1 +0,0 @@
-lo:

data/config/locales/oc-FR.yml

@@ -1 +0,0 @@
-oc: