decidim-consultations 0.19.1 → 0.23.0

data/config/locales/zh-TW.yml

@@ -0,0 +1 @@
+zh-TW:

data/db/migrate/20190708114204_create_decidim_consultations_response_groups.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class CreateDecidimConsultationsResponseGroups < ActiveRecord::Migration[5.2]
+  def change
+    create_table :decidim_consultations_response_groups do |t|
+      t.jsonb :title
+      t.references :decidim_consultations_questions,
+                   foreign_key: true,
+                   index: { name: "index_consultations_response_groups_on_consultation_questions" }
+      t.integer :responses_count,
+                null: false,
+                default: 0
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20190708120345_add_response_groups_count_to_decidim_consultations_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddResponseGroupsCountToDecidimConsultationsQuestions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_consultations_questions, :response_groups_count, :integer, null: false, default: 0
+  end
+end

data/db/migrate/20190708121643_add_response_groups_to_decidim_consultations_responses.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddResponseGroupsToDecidimConsultationsResponses < ActiveRecord::Migration[5.2]
+  def change
+    add_reference :decidim_consultations_responses,
+                  :decidim_consultations_response_group,
+                  foreign_key: true,
+                  index: { name: "index_consultations_response_groups_on_consultation_responses" }
+  end
+end

data/db/migrate/20200320105916_index_foreign_keys_in_decidim_consultations_votes.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class IndexForeignKeysInDecidimConsultationsVotes < ActiveRecord::Migration[5.2]
+  def change
+    add_index :decidim_consultations_votes, :decidim_user_group_id
+  end
+end

data/db/migrate/20200827154143_add_commentable_counter_cache_to_consultations.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddCommentableCounterCacheToConsultations < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_consultations_questions, :comments_count, :integer, null: false, default: 0, index: true
+    Decidim::Consultations::Question.reset_column_information
+    Decidim::Consultations::Question.find_each(&:update_comments_count)
+  end
+end

data/lib/decidim/consultations/admin_engine.rb

@@ -32,12 +32,14 @@ module Decidim
             member do
               put :publish
               put :unpublish
+              get :share
             end
             resources :exports, only: :create
           end
 
           resources :question_attachments
           resources :responses, except: :show
+          resources :response_groups, except: :show
         end
 
         scope "/questions/:question_slug/components/:component_id/manage" do

data/lib/decidim/consultations/participatory_space.rb

@@ -10,6 +10,8 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     Decidim::Consultation.where(organization: organization)
   end
 
+  participatory_space.query_type = "Decidim::Consultations::ConsultationType"
+
   participatory_space.context(:public) do |context|
     context.engine = Decidim::Consultations::Engine
     context.layout = "layouts/decidim/question"
@@ -24,6 +26,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
   participatory_space.register_resource(:consultation) do |resource|
     resource.model_class_name = "Decidim::Consultation"
     resource.card = "decidim/consultations/consultation"
+    resource.searchable = true
   end
 
   participatory_space.register_resource(:question) do |resource|
@@ -46,10 +49,10 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       published_at: Time.now.utc,
       start_voting_date: Time.zone.today,
       end_voting_date: Time.zone.today + 1.month,
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      organization: organization,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
-      organization: organization
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id
     }
 
     active_consultation = Decidim.traceability.perform_action!(
@@ -60,6 +63,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     ) do
       Decidim::Consultation.create!(active_consultation_params)
     end
+    active_consultation.add_to_index_as_search_resource
 
     finished_consultation_params = {
       slug: Faker::Internet.unique.slug(nil, "-"),
@@ -72,10 +76,10 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       results_published_at: Time.zone.today - 1.month,
       start_voting_date: Time.zone.today - 2.months,
       end_voting_date: Time.zone.today - 1.month,
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      organization: organization,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
-      organization: organization
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id
     }
 
     finished_consultation = Decidim.traceability.perform_action!(
@@ -86,6 +90,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     ) do
       Decidim::Consultation.create!(finished_consultation_params)
     end
+    finished_consultation.add_to_index_as_search_resource
 
     upcoming_consultation_params = {
       slug: Faker::Internet.unique.slug(nil, "-"),
@@ -97,10 +102,10 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
       published_at: Time.zone.today + 1.month,
       start_voting_date: Time.zone.today + 1.month + 1.day,
       end_voting_date: Time.zone.today + 2.months,
-      banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+      organization: organization,
+      banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
       introductory_video_url: "https://www.youtube.com/embed/zhMMW0TENNA",
-      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id,
-      organization: organization
+      decidim_highlighted_scope_id: Decidim::Scope.reorder(Arel.sql("RANDOM()")).first.id
     }
 
     upcoming_consultation = Decidim.traceability.perform_action!(
@@ -111,6 +116,7 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
     ) do
       Decidim::Consultation.create!(upcoming_consultation_params)
     end
+    upcoming_consultation.add_to_index_as_search_resource
 
     [finished_consultation, active_consultation, upcoming_consultation].each do |consultation|
       4.times do
@@ -126,12 +132,12 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
           question_context: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
             Decidim::Faker::Localized.paragraph(3)
           end,
-          hero_image: File.new(File.join(seeds_root, "city.jpeg")),
-          banner_image: File.new(File.join(seeds_root, "city2.jpeg")),
+          organization: organization,
+          hero_image: File.new(File.join(seeds_root, "city.jpeg")), # Keep after organization
+          banner_image: File.new(File.join(seeds_root, "city2.jpeg")), # Keep after organization
           promoter_group: Decidim::Faker::Localized.sentence(3),
           participatory_scope: Decidim::Faker::Localized.sentence(3),
-          published_at: Time.now.utc,
-          organization: organization
+          published_at: Time.now.utc
         }
 
         question = Decidim.traceability.perform_action!(
@@ -155,15 +161,15 @@ Decidim.register_participatory_space(:consultations) do |participatory_space|
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "city.jpeg")),
-          attached_to: question
+          attached_to: question,
+          file: File.new(File.join(seeds_root, "city.jpeg")) # Keep after attached_to
         )
 
         Decidim::Attachment.create!(
           title: Decidim::Faker::Localized.sentence(2),
           description: Decidim::Faker::Localized.sentence(5),
-          file: File.new(File.join(seeds_root, "Exampledocument.pdf")),
-          attached_to: question
+          attached_to: question,
+          file: File.new(File.join(seeds_root, "Exampledocument.pdf")) # Keep after attached_to
         )
       end
     end

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

@@ -22,6 +22,7 @@ FactoryBot.define do
     published_at { Time.current }
     start_voting_date { Time.zone.today }
     end_voting_date { Time.zone.today + 1.month }
+    introductory_image { Decidim::Dev.test_file("city.jpeg", "image/jpeg") }
     introductory_video_url { "https://www.youtube.com/embed/zhMMW0TENNA" }
     decidim_highlighted_scope_id { create(:scope, organization: organization).id }
     results_published_at { nil }
@@ -101,6 +102,11 @@ FactoryBot.define do
     title { generate_localized_title }
   end
 
+  factory :response_group, class: "Decidim::Consultations::ResponseGroup" do
+    question { create(:question, :multiple) }
+    title { generate_localized_title }
+  end
+
   factory :vote, class: "Decidim::Consultations::Vote" do
     question
     response

data/lib/decidim/consultations/version.rb

@@ -3,7 +3,7 @@
 module Decidim
   module Consultations
     def self.version
-      "0.19.1"
+      "0.23.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.23.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: 0.23.0
 description: Extends Decidim adding a first level public consultation component
 email:
 - jsperezg@gmail.com
@@ -84,6 +84,7 @@ files:
 - app/assets/javascripts/decidim/consultations/utils_multiple.js
 - app/assets/javascripts/decidim/consultations/vote_dialog.js
 - app/assets/stylesheets/decidim/consultations/_question.scss
+- app/assets/stylesheets/decidim/consultations/_question_multiple_votes.scss
 - app/assets/stylesheets/decidim/consultations/_stats.scss
 - app/assets/stylesheets/decidim/consultations/_video_wrapper.scss
 - app/assets/stylesheets/decidim/consultations/banners/_block-banner.scss
@@ -111,6 +112,8 @@ files:
 - app/commands/decidim/consultations/admin/create_consultation.rb
 - app/commands/decidim/consultations/admin/create_question.rb
 - app/commands/decidim/consultations/admin/create_response.rb
+- app/commands/decidim/consultations/admin/create_response_group.rb
+- app/commands/decidim/consultations/admin/destroy_response_group.rb
 - app/commands/decidim/consultations/admin/publish_consultation.rb
 - app/commands/decidim/consultations/admin/publish_consultation_results.rb
 - app/commands/decidim/consultations/admin/publish_question.rb
@@ -121,12 +124,14 @@ files:
 - app/commands/decidim/consultations/admin/update_question.rb
 - app/commands/decidim/consultations/admin/update_question_configuration.rb
 - app/commands/decidim/consultations/admin/update_response.rb
+- app/commands/decidim/consultations/admin/update_response_group.rb
 - app/commands/decidim/consultations/multiple_vote_question.rb
 - app/commands/decidim/consultations/unvote_question.rb
 - app/commands/decidim/consultations/vote_question.rb
 - app/constraints/decidim/consultations/current_component.rb
 - app/constraints/decidim/consultations/current_question.rb
 - app/controllers/concerns/decidim/consultations/admin/consultation_admin.rb
+- app/controllers/concerns/decidim/consultations/admin/filterable.rb
 - app/controllers/concerns/decidim/consultations/admin/question_admin.rb
 - app/controllers/concerns/decidim/consultations/needs_consultation.rb
 - app/controllers/concerns/decidim/consultations/needs_question.rb
@@ -143,6 +148,7 @@ files:
 - app/controllers/decidim/consultations/admin/question_permissions_controller.rb
 - app/controllers/decidim/consultations/admin/question_publications_controller.rb
 - app/controllers/decidim/consultations/admin/questions_controller.rb
+- app/controllers/decidim/consultations/admin/response_groups_controller.rb
 - app/controllers/decidim/consultations/admin/responses_controller.rb
 - app/controllers/decidim/consultations/application_controller.rb
 - app/controllers/decidim/consultations/authorization_vote_modals_controller.rb
@@ -156,6 +162,7 @@ files:
 - app/forms/decidim/consultations/admin/question_configuration_form.rb
 - app/forms/decidim/consultations/admin/question_form.rb
 - app/forms/decidim/consultations/admin/response_form.rb
+- app/forms/decidim/consultations/admin/response_group_form.rb
 - app/forms/decidim/consultations/multi_vote_form.rb
 - app/forms/decidim/consultations/vote_form.rb
 - app/helpers/decidim/consultations/admin/consultations_helper.rb
@@ -168,6 +175,7 @@ files:
 - app/models/decidim/consultations/application_record.rb
 - app/models/decidim/consultations/question.rb
 - app/models/decidim/consultations/response.rb
+- app/models/decidim/consultations/response_group.rb
 - app/models/decidim/consultations/vote.rb
 - app/permissions/decidim/consultations/admin/permissions.rb
 - app/permissions/decidim/consultations/permissions.rb
@@ -177,6 +185,8 @@ files:
 - app/queries/decidim/consultations/organization_consultations.rb
 - app/queries/decidim/consultations/organization_questions.rb
 - app/services/decidim/consultations/consultation_search.rb
+- app/types/decidim/consultations/consultation_question_type.rb
+- app/types/decidim/consultations/consultation_type.rb
 - app/views/decidim/consultations/_consultation.html.erb
 - app/views/decidim/consultations/admin/consultations/_form.html.erb
 - app/views/decidim/consultations/admin/consultations/edit.html.erb
@@ -189,6 +199,10 @@ files:
 - app/views/decidim/consultations/admin/questions/edit.html.erb
 - app/views/decidim/consultations/admin/questions/index.html.erb
 - app/views/decidim/consultations/admin/questions/new.html.erb
+- app/views/decidim/consultations/admin/response_groups/_form.html.erb
+- app/views/decidim/consultations/admin/response_groups/edit.html.erb
+- app/views/decidim/consultations/admin/response_groups/index.html.erb
+- app/views/decidim/consultations/admin/response_groups/new.html.erb
 - app/views/decidim/consultations/admin/responses/_form.html.erb
 - app/views/decidim/consultations/admin/responses/edit.html.erb
 - app/views/decidim/consultations/admin/responses/index.html.erb
@@ -232,35 +246,72 @@ files:
 - app/views/layouts/decidim/consultation_choose.html.erb
 - app/views/layouts/decidim/question.html.erb
 - app/views/layouts/decidim/question_multivote.html.erb
+- 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/20180109092205_create_decidim_consultations.rb
 - db/migrate/20180112053247_create_decidim_consultations_questions.rb
 - db/migrate/20180115132000_add_end_voting_date_to_decidim_consultations.rb
@@ -290,7 +341,12 @@ files:
 - db/migrate/20180712111146_remove_unused_search_indexs.rb
 - db/migrate/20181003082318_fix_user_groups_ids_on_consultations.rb
 - db/migrate/20190702162755_add_options_to_decidim_consultations_questions.rb
+- db/migrate/20190708114204_create_decidim_consultations_response_groups.rb
+- db/migrate/20190708120345_add_response_groups_count_to_decidim_consultations_questions.rb
+- db/migrate/20190708121643_add_response_groups_to_decidim_consultations_responses.rb
 - db/migrate/20190710121122_add_free_instructions_field_to_consultations_questions.rb
+- db/migrate/20200320105916_index_foreign_keys_in_decidim_consultations_votes.rb
+- db/migrate/20200827154143_add_commentable_counter_cache_to_consultations.rb
 - db/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -314,7 +370,7 @@ 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:
   - - ">="