decidim-forms 0.24.0 → 0.25.0.rc1

data/config/locales/ja.yml

@@ -3,15 +3,22 @@ ja:
     attributes:
       answer:
         body: 回答
+        choices: 選択項目
+        selected_choices: 選択した項目
       question:
         max_choices: 選択肢の最大数
         question_type: タイプ
       questionnaire_question:
         mandatory: Mandatory
+        max_characters: 文字数制限 (制限がない場合は0にしてください)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: 再添付が必要
+            body:
+              too_long: 長すぎます
             choices:
               missing: は完全ではありません
               too_many: 多すぎます
@@ -116,6 +123,7 @@ ja:
           resize_and_pad: リサイズおよびパッド先
           resize_to_fit: フィットするようにリサイズしました
       question_types:
+        files: ファイル
         long_answer: 長い回答
         matrix_multiple: マトリクス (複数オプション)
         matrix_single: マトリクス（シングルオプション）

data/config/locales/lb-LU.yml

@@ -0,0 +1 @@
+lb:

data/config/locales/pl.yml

@@ -30,7 +30,7 @@ pl:
         models:
           components:
             description: Opis
-            tos: Warunki korzystania
+            tos: Warunki uczestnictwa
         questionnaires:
           actions:
             back: Powrót do pytań
@@ -158,7 +158,7 @@ pl:
             title: JavaScript jest wyłączony
           questionnaire_not_published:
             body: Ten formularz nie został jeszcze opublikowany.
-          tos_agreement: Biorąc udział akceptujesz Warunki korzystania z serwisu
+          tos_agreement: Biorąc udział akceptujesz Warunki korzystania z Platformy
       step_navigation:
         show:
           are_you_sure: Tego działania nie można cofnąć i nie będzie można edytować odpowiedzi. Jesteś pewny?

data/config/locales/pt-BR.yml

@@ -3,18 +3,27 @@ pt:
     attributes:
       answer:
         body: Responda
+        choices: Escolhas
+        selected_choices: Escolhas selecionadas
       question:
         max_choices: Número máximo de escolhas
         question_type: Tipo
       questionnaire_question:
         mandatory: Obrigatório
+        max_characters: Limite de caracteres (deixe para 0 se não houver limite)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Precisa ser reanexado
+            body:
+              too_long: é longo demais
             choices:
               missing: não estão completos
               too_many: são muitos
+        questionnaire:
+          request_invalid: Houve um erro ao lidar com a solicitação. Por favor, tente novamente
   decidim:
     forms:
       admin:
@@ -23,35 +32,101 @@ pt:
             description: Descrição
             tos: Termos de serviço
         questionnaires:
+          actions:
+            back: Voltar às perguntas
+            show: Mostrar respostas
           answer_option:
             answer_option: Opção de resposta
             free_text: Texto livre
             remove: Remover
             statement: Declaração
+          answers:
+            actions:
+              back: Voltar para respostas
+              export: Exportar
+              show: Mostrar respostas
+            empty: Ainda não há respostas
+            export:
+              answer:
+                title: 'Resposta #%{number}'
+            export_response:
+              title: pesquisa_respostas_do_usuário_%{token}
+            index:
+              title: "%{total} respostas totais"
+            show:
+              title: 'Resposta #%{number}'
+          display_condition:
+            answer_option: Opção de resposta
+            condition_question: Questão
+            condition_type: Condição
+            condition_types:
+              answered: Respondido
+              equal: Igual
+              match: Incluir texto
+              not_answered: Não respondido
+              not_equal: Diferente
+            condition_value: Incluir texto
+            display_condition: Exibir condição
+            mandatory: Esta condição precisa ser sempre satisfeita independentemente do status de outras condições
+            remove: Remover
+            save_warning: Lembre-se de salvar o formulário antes de configurar condições de exibição
+            select_answer_option: Selecionar opção de resposta
+            select_condition_question: Selecione uma pergunta
+            select_condition_type: Selecione um tipo de condição
           edit:
             save: Salvar
+            title: Editar questionário
           form:
             add_question: Adicionar pergunta
+            add_separator: Adicionar separador
             already_answered_warning: O questionário já foi respondido por alguns usuários então você não pode modificar suas perguntas.
+            collapse: Recolher todas as questões
+            expand: Expandir todas as questões
+            preview: Pré-visualização
+            title: Editar formulário para %{questionnaire_for}
+            unpublished_warning: O formulário não foi publicado. Você pode modificar suas perguntas, mas apagará as respostas atuais.
           matrix_row:
+            matrix_row: Linha
             remove: Remover
             statement: Declaração
           question:
             add_answer_option: Adicionar opção de resposta
+            add_display_condition: Adicionar condição de exibição
+            add_display_condition_info: Salve o formulário para configurar condições de exibição
+            add_matrix_row: Adicionar linha
             any: Qualquer
+            collapse: Recolher
             description: Descrição
             down: Baixa
+            expand: Expandir
             question: Questão
             remove: Remover
             statement: Declaração
             up: Acima
+          separator:
+            down: Para Baixo
+            remove: Remover
+            separator: Separador
+            up: Para Cima
           update:
             invalid: Houve erros ao salvar o questionário.
+            success: Formulário salvo com sucesso.
       errors:
         answer:
           body: O corpo não pode ficar em branco
+      files:
+        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
+        matrix_multiple: Matriz (Múltipla opção)
+        matrix_single: Matriz (opção única)
         multiple_option: Opção múltipla
         short_answer: Resposta curta
         single_option: Opção única
@@ -59,6 +134,7 @@ pt:
       questionnaires:
         answer:
           invalid: Houve erros ao responder a pesquisa.
+          max_choices_alert: Há muitas opções selecionadas
           success: Questionário respondido com sucesso.
         question:
           max_choices: 'Escolhas máximas: %{n}'
@@ -66,6 +142,8 @@ pt:
           answer_questionnaire:
             anonymous_user_message: <a href="%{sign_in_link}">Entre com sua conta</a> ou <a href="%{sign_up_link}">inscreva-se</a> para responder ao questionário.
             title: Responda o questionário
+          current_step: Passo %{step}
+          of_total_steps: de %{total_steps}
           questionnaire_answered:
             body: Você já respondeu esta pesquisa.
             title: Já respondido
@@ -75,11 +153,26 @@ pt:
           questionnaire_for_private_users:
             body: O questionário está disponível apenas para usuários particulares
             title: Questionário fechado
+          questionnaire_js_disabled:
+            body: Algumas das funcionalidades deste formulário serão desativadas. Para melhorar sua experiência, por favor ative o JavaScript no seu navegador.
+            title: JavaScript está desativado
+          questionnaire_not_published:
+            body: Este formulário ainda não foi publicado.
           tos_agreement: Ao participar você aceita seus Termos de Serviço
       step_navigation:
         show:
           are_you_sure: Esta ação não pode ser desfeita e você não poderá editar suas respostas. Você tem certeza?
+          back: Voltar
+          continue: Continuar
           submit: Enviar
       user_answers_serializer:
+        body: Resposta
+        completion: Conclusão
         created_at: Respondido em
         id: ID da resposta
+        ip_hash: Hash IP
+        question: Questão
+        registered: Registrado
+        session_token: Identificador de Usuário
+        unregistered: Não registrado
+        user_status: Status do usuário

data/config/locales/sv.yml

@@ -3,15 +3,22 @@ sv:
     attributes:
       answer:
         body: Svar
+        choices: Val
+        selected_choices: Utvalda val
       question:
         max_choices: Högst antal val
         question_type: Typ
       questionnaire_question:
         mandatory: Obligatorisk
+        max_characters: Teckengräns (lämna till 0 om ingen gräns)
     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: är för många
@@ -76,6 +83,7 @@ sv:
             collapse: Komprimera alla frågor
             expand: Expandera alla frågor
             preview: Förhandsgranska
+            title: Redigera formulär för %{questionnaire_for}
             unpublished_warning: Formuläret är inte publicerat. Du kan ändra dess frågor, men det kommer att ta bort aktuella svar.
           matrix_row:
             matrix_row: Rad
@@ -114,6 +122,7 @@ sv:
           resize_and_pad: Anpassad och vadderad till
           resize_to_fit: Anpassad för att passa
       question_types:
+        files: Filer
         long_answer: Långt svar
         matrix_multiple: Matris (flera alternativ)
         matrix_single: Matris (Single alternativ)

data/db/migrate/20170515144119_create_decidim_forms_answers.rb

@@ -3,11 +3,10 @@
 class CreateDecidimFormsAnswers < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_forms_answers do |t|
-      t.jsonb :body, default: []
+      t.text :body
       t.references :decidim_user, index: true
       t.references :decidim_questionnaire, index: true
       t.references :decidim_question, index: { name: "index_decidim_forms_answers_question_id" }
-      t.text :body
 
       t.timestamps
     end

data/db/migrate/20210616153042_set_position_to_question_matrix_rows.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class SetPositionToQuestionMatrixRows < ActiveRecord::Migration[5.2]
+  def up
+    execute "UPDATE decidim_forms_question_matrix_rows SET position = id"
+  end
+
+  def down
+    execute "UPDATE decidim_forms_question_matrix_rows SET position = NULL"
+  end
+end

data/lib/decidim/forms/admin_engine.rb

@@ -9,10 +9,6 @@ module Decidim
       paths["db/migrate"] = nil
       paths["lib/tasks"] = nil
 
-      initializer "decidim_forms.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_forms_manifest.js admin/decidim_forms_manifest.css)
-      end
-
       def load_seed
         nil
       end

data/lib/decidim/forms/engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/core"
+
 module Decidim
   module Forms
     # This is the engine that runs on the public interface of `decidim-forms`.
@@ -9,10 +11,6 @@ module Decidim
       initializer "decidim_forms.add_cells_view_paths" do
         Cell::ViewModel.view_paths << File.expand_path("#{Decidim::Forms::Engine.root}/app/cells")
       end
-
-      initializer "decidim_forms.assets" do |app|
-        app.config.assets.precompile += %w(decidim_forms_manifest.js decidim_forms_manifest.css)
-      end
     end
   end
 end

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

@@ -28,6 +28,42 @@ FactoryBot.define do
       end
     end
 
+    trait :with_all_questions do
+      questions do
+        position = 0
+        qs = %w(short_answer long_answer).collect do |text_question_type|
+          q = build(:questionnaire_question, question_type: text_question_type, position: position)
+          position += 1
+          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.display_conditions.build(
+            condition_question: qs[q.position - 2],
+            question: q,
+            condition_type: :answered,
+            mandatory: true
+          )
+        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.display_conditions.build(
+            condition_question: qs[q.position - 2],
+            question: q,
+            condition_type: :answered,
+            mandatory: true
+          )
+        end
+        qs
+      end
+    end
+
     trait :empty do
       title { {} }
       description { {} }
@@ -63,9 +99,10 @@ FactoryBot.define do
       end
 
       if question.matrix_rows.empty?
-        evaluator.rows.each do |row|
+        evaluator.rows.each_with_index do |row, idx|
           question.matrix_rows.build(
-            body: row["body"]
+            body: row["body"],
+            position: idx
           )
         end
       end

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

@@ -921,6 +921,7 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is long answer" do
             let!(:condition_question_type) { "long_answer" }
+            let!(:conditioned_question_id) { "#questionnaire_responses_0" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(false)
@@ -1012,6 +1013,7 @@ shared_examples_for "has questionnaire" do
 
           context "when the condition_question type is long answer" do
             let!(:condition_question_type) { "long_answer" }
+            let!(:conditioned_question_id) { "#questionnaire_responses_0" }
 
             it "shows the question only if the condition is fulfilled" do
               expect_question_to_be_visible(true)

data/lib/decidim/forms/user_answers_serializer.rb

@@ -27,6 +27,9 @@ module Decidim
 
       private
 
+      attr_reader :answers
+      alias resource answers
+
       def normalize_body(answer)
         answer.body ||
           normalize_attachments(answer) ||

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,28 +19,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: wicked_pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: wkhtmltopdf-binary
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.25.0.rc1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -95,24 +95,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_forms_manifest.css
-- app/assets/config/admin/decidim_forms_manifest.js
-- app/assets/config/decidim_forms_manifest.css
-- app/assets/config/decidim_forms_manifest.js
-- app/assets/images/decidim/surveys/icon.svg
-- app/assets/javascripts/decidim/forms/admin/auto_buttons_by_min_items.component.js.es6
-- app/assets/javascripts/decidim/forms/admin/auto_select_options_by_total_items.component.js.es6
-- app/assets/javascripts/decidim/forms/admin/auto_select_options_from_url.component.js.es6
-- app/assets/javascripts/decidim/forms/admin/collapsible_questions.js.es6
-- app/assets/javascripts/decidim/forms/admin/forms.js.es6
-- app/assets/javascripts/decidim/forms/admin/live_text_update.component.js.es6
-- app/assets/javascripts/decidim/forms/autosortable_checkboxes.component.js.es6
-- app/assets/javascripts/decidim/forms/display_conditions.component.js.es6
-- app/assets/javascripts/decidim/forms/forms.js.es6
-- app/assets/javascripts/decidim/forms/max_choices_alert.component.js.es6
-- app/assets/javascripts/decidim/forms/option_attached_inputs.component.js.es6
-- app/assets/stylesheets/decidim/forms/forms.scss
-- app/assets/stylesheets/decidim/forms/questionnaire-answers-pdf.scss
 - app/cells/decidim/forms/answer_readonly/show.erb
 - app/cells/decidim/forms/answer_readonly_cell.rb
 - app/cells/decidim/forms/matrix_readonly/show.erb
@@ -149,6 +131,24 @@ files:
 - app/models/decidim/forms/question.rb
 - app/models/decidim/forms/question_matrix_row.rb
 - app/models/decidim/forms/questionnaire.rb
+- app/packs/entrypoints/decidim_forms.js
+- app/packs/entrypoints/decidim_forms_admin.js
+- app/packs/entrypoints/decidim_questionnaire_answers_pdf.js
+- app/packs/entrypoints/decidim_questionnaire_answers_pdf.scss
+- app/packs/images/decidim/surveys/decidim_surveys.svg
+- app/packs/src/decidim/forms/admin/auto_buttons_by_min_items.component.js
+- app/packs/src/decidim/forms/admin/auto_select_options_by_total_items.component.js
+- app/packs/src/decidim/forms/admin/auto_select_options_from_url.component.js
+- app/packs/src/decidim/forms/admin/collapsible_questions.js
+- app/packs/src/decidim/forms/admin/forms.js
+- app/packs/src/decidim/forms/admin/live_text_update.component.js
+- app/packs/src/decidim/forms/autosortable_checkboxes.component.js
+- app/packs/src/decidim/forms/display_conditions.component.js
+- app/packs/src/decidim/forms/forms.js
+- app/packs/src/decidim/forms/max_choices_alert.component.js
+- app/packs/src/decidim/forms/option_attached_inputs.component.js
+- app/packs/stylesheets/decidim/forms/forms.scss
+- 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/answer_option_presenter.rb
@@ -182,6 +182,7 @@ files:
 - app/views/decidim/forms/questionnaires/answers/_sorting.html.erb
 - app/views/decidim/forms/questionnaires/show.html.erb
 - app/views/layouts/decidim/forms/admin/questionnaires/questionnaire_answers.html.erb
+- config/assets.rb
 - config/initializers/wicked_pdf.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
@@ -209,6 +210,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -219,10 +221,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -263,6 +265,7 @@ files:
 - db/migrate/20200304152939_add_matrix_row_id_to_decidim_forms_answer_choices.rb
 - db/migrate/20201110152921_add_salt_to_decidim_forms_questionnaires.rb
 - db/migrate/20210208094442_add_max_characters_to_decidim_forms_questions.rb
+- db/migrate/20210616153042_set_position_to_question_matrix_rows.rb
 - lib/decidim/api/answer_option_type.rb
 - lib/decidim/api/question_type.rb
 - lib/decidim/api/questionnaire_entity_interface.rb
@@ -301,11 +304,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Decidim forms