decidim-forms 0.20.0 → 0.23.1.rc1

data/lib/decidim/forms/user_answers_serializer.rb

@@ -28,15 +28,32 @@ module Decidim
       private
 
       def normalize_body(answer)
-        answer.body || normalize_choices(answer.choices)
+        answer.body || normalize_choices(answer, answer.choices)
       end
 
-      def normalize_choices(choices)
-        choices.map do |choice|
-          choice.try(:custom_body) || choice.try(:body)
+      def normalize_choices(answer, choices)
+        if answer.question.matrix?
+          normalize_matrix_choices(answer, choices)
+        else
+          choices.map do |choice|
+            choice.try(:custom_body) || choice.try(:body)
+          end
         end
       end
 
+      def normalize_matrix_choices(answer, choices)
+        answer.question.matrix_rows.map do |matrix_row|
+          row_body = translated_attribute(matrix_row.body)
+
+          row_choices = answer.question.answer_options.map do |answer_option|
+            choice = choices.find_by(matrix_row: matrix_row, answer_option: answer_option)
+            choice.try(:custom_body) || choice.try(:body)
+          end
+
+          [row_body, row_choices]
+        end.to_h
+      end
+
       def answer_translated_attribute_name(attribute)
         I18n.t(attribute.to_sym, scope: "decidim.forms.user_answers_serializer")
       end

data/lib/decidim/forms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.23.1.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,42 +19,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
+- !ruby/object:Gem::Dependency
+  name: wicked_pdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: wkhtmltopdf-binary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.23.1.rc1
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -67,77 +95,162 @@ 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
+- app/cells/decidim/forms/matrix_readonly_cell.rb
 - app/cells/decidim/forms/question_readonly/show.erb
 - app/cells/decidim/forms/question_readonly_cell.rb
+- app/cells/decidim/forms/step_navigation/show.erb
+- app/cells/decidim/forms/step_navigation_cell.rb
 - app/commands/decidim/forms/admin/update_questionnaire.rb
 - app/commands/decidim/forms/answer_questionnaire.rb
 - app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb
+- app/controllers/decidim/forms/admin/concerns/has_questionnaire_answers.rb
 - app/controllers/decidim/forms/concerns/has_questionnaire.rb
 - app/forms/decidim/forms/admin/answer_option_form.rb
+- app/forms/decidim/forms/admin/display_condition_form.rb
 - app/forms/decidim/forms/admin/question_form.rb
+- app/forms/decidim/forms/admin/question_matrix_row_form.rb
 - app/forms/decidim/forms/admin/questionnaire_form.rb
 - app/forms/decidim/forms/answer_choice_form.rb
 - app/forms/decidim/forms/answer_form.rb
 - app/forms/decidim/forms/questionnaire_form.rb
 - app/helpers/decidim/forms/admin/application_helper.rb
+- app/helpers/decidim/forms/admin/concerns/has_questionnaire_answers_pagination_helper.rb
+- app/helpers/decidim/forms/admin/concerns/has_questionnaire_answers_url_helper.rb
+- app/helpers/decidim/forms/admin/questionnaire_answers_helper.rb
 - app/helpers/decidim/forms/application_helper.rb
+- app/jobs/decidim/forms/export_questionnaire_answers_job.rb
 - app/models/concerns/decidim/forms/has_questionnaire.rb
 - app/models/decidim/forms/answer.rb
 - app/models/decidim/forms/answer_choice.rb
 - app/models/decidim/forms/answer_option.rb
 - app/models/decidim/forms/application_record.rb
+- app/models/decidim/forms/display_condition.rb
 - app/models/decidim/forms/question.rb
+- app/models/decidim/forms/question_matrix_row.rb
 - app/models/decidim/forms/questionnaire.rb
+- 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
+- app/presenters/decidim/forms/question_presenter.rb
+- app/queries/decidim/forms/questionnaire_participant.rb
+- app/queries/decidim/forms/questionnaire_participants.rb
 - app/queries/decidim/forms/questionnaire_user_answers.rb
+- app/types/decidim/forms/answer_option_type.rb
+- app/types/decidim/forms/question_type.rb
+- app/types/decidim/forms/questionnaire_type.rb
 - app/views/decidim/forms/admin/questionnaires/_answer_option.html.erb
 - app/views/decidim/forms/admin/questionnaires/_answer_option_template.html.erb
+- app/views/decidim/forms/admin/questionnaires/_display_condition.html.erb
+- app/views/decidim/forms/admin/questionnaires/_display_condition_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_form.html.erb
+- app/views/decidim/forms/admin/questionnaires/_matrix_row.html.erb
+- app/views/decidim/forms/admin/questionnaires/_matrix_row_template.html.erb
 - app/views/decidim/forms/admin/questionnaires/_question.html.erb
+- app/views/decidim/forms/admin/questionnaires/_separator.html.erb
+- app/views/decidim/forms/admin/questionnaires/answers/export/_answer.html.erb
+- app/views/decidim/forms/admin/questionnaires/answers/export/pdf.html.erb
+- app/views/decidim/forms/admin/questionnaires/answers/index.html.erb
+- app/views/decidim/forms/admin/questionnaires/answers/show.html.erb
 - app/views/decidim/forms/admin/questionnaires/edit.html.erb
 - app/views/decidim/forms/questionnaires/_answer.html.erb
+- app/views/decidim/forms/questionnaires/answers/_long_answer.html.erb
+- app/views/decidim/forms/questionnaires/answers/_matrix_multiple.html.erb
+- app/views/decidim/forms/questionnaires/answers/_matrix_single.html.erb
+- app/views/decidim/forms/questionnaires/answers/_multiple_option.html.erb
+- app/views/decidim/forms/questionnaires/answers/_separator.html.erb
+- app/views/decidim/forms/questionnaires/answers/_short_answer.html.erb
+- app/views/decidim/forms/questionnaires/answers/_single_option.html.erb
+- 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/initializers/wicked_pdf.rb
+- config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
+- config/locales/bg.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
+- config/locales/da.yml
 - config/locales/de.yml
+- config/locales/el-GR.yml
+- config/locales/el.yml
 - config/locales/en.yml
 - config/locales/eo-UY.yml
+- config/locales/eo.yml
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.yml
+- config/locales/et.yml
 - config/locales/eu.yml
 - config/locales/fi-pl.yml
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
+- config/locales/fr-CA.yml
 - config/locales/fr.yml
+- config/locales/ga-IE.yml
 - config/locales/gl.yml
+- config/locales/hr-HR.yml
+- config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
+- 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/lt-LT.yml
+- config/locales/lt.yml
+- config/locales/lv.yml
+- config/locales/mt-MT.yml
+- config/locales/mt.yml
 - config/locales/nl.yml
 - config/locales/no.yml
+- config/locales/om-ET.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/pt.yml
+- config/locales/ro-RO.yml
 - config/locales/ru.yml
+- config/locales/sk-SK.yml
+- config/locales/sk.yml
+- config/locales/sl.yml
+- config/locales/so-SO.yml
+- config/locales/sr-CS.yml
 - config/locales/sv.yml
+- config/locales/ti-ER.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
+- config/locales/vi-VN.yml
+- config/locales/vi.yml
+- config/locales/zh-CN.yml
+- config/locales/zh-TW.yml
 - db/migrate/20170511092231_create_decidim_forms_questionnaires.rb
 - db/migrate/20170515090916_create_decidim_forms_questions.rb
 - db/migrate/20170515144119_create_decidim_forms_answers.rb
@@ -145,15 +258,27 @@ files:
 - db/migrate/20180405015147_create_decidim_forms_answer_choices.rb
 - db/migrate/20190315203056_add_session_token_to_decidim_forms_answers.rb
 - db/migrate/20190930094710_add_ip_hash_to_decidim_form_answers.rb
+- db/migrate/20200130194123_create_decidim_forms_display_conditions.rb
+- db/migrate/20200225123810_create_decidim_forms_question_matrix_rows.rb
+- db/migrate/20200304152939_add_matrix_row_id_to_decidim_forms_answer_choices.rb
+- lib/decidim/api/questionnaire_entity_interface.rb
+- lib/decidim/exporters/form_pdf.rb
+- lib/decidim/exporters/form_pdf_controller_helper.rb
 - lib/decidim/forms.rb
 - 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/engine.rb
 - lib/decidim/forms/test.rb
 - lib/decidim/forms/test/factories.rb
 - lib/decidim/forms/test/shared_examples/has_questionnaire.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaire_answers.rb
 - lib/decidim/forms/test/shared_examples/manage_questionnaires.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaires/add_display_conditions.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaires/update_display_conditions.rb
+- lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb
 - lib/decidim/forms/user_answers_serializer.rb
 - lib/decidim/forms/version.rb
 homepage: https://github.com/decidim/decidim
@@ -168,12 +293,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: