decidim-forms 0.21.0 → 0.22.0

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.21.0"
+      "0.22.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -73,21 +73,29 @@ files:
 - 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/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/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/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/concerns/has_questionnaire.rb
 - app/forms/decidim/forms/admin/answer_option_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
@@ -100,6 +108,7 @@ files:
 - app/models/decidim/forms/answer_option.rb
 - app/models/decidim/forms/application_record.rb
 - app/models/decidim/forms/question.rb
+- app/models/decidim/forms/question_matrix_row.rb
 - app/models/decidim/forms/questionnaire.rb
 - app/queries/decidim/forms/questionnaire_user_answers.rb
 - app/types/decidim/forms/answer_option_type.rb
@@ -108,15 +117,28 @@ files:
 - 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/_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/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
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
+- config/locales/bg-BG.yml
 - config/locales/ca.yml
 - config/locales/cs-CZ.yml
 - config/locales/cs.yml
+- config/locales/da-DK.yml
 - config/locales/de.yml
 - config/locales/el-GR.yml
 - config/locales/el.yml
@@ -125,22 +147,35 @@ files:
 - config/locales/es-MX.yml
 - config/locales/es-PY.yml
 - config/locales/es.yml
+- config/locales/et-EE.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/hu.yml
 - config/locales/id-ID.yml
 - config/locales/is-IS.yml
 - config/locales/it.yml
+- config/locales/ja-JP.yml
+- config/locales/lt-LT.yml
+- config/locales/lv-LV.yml
+- config/locales/mt-MT.yml
 - config/locales/nl.yml
 - config/locales/no.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/sr-CS.yml
 - config/locales/sv.yml
 - config/locales/tr-TR.yml
 - config/locales/uk.yml
@@ -151,6 +186,8 @@ 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/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/forms.rb
 - lib/decidim/forms/admin.rb