decidim-consultations 0.19.0 → 0.22.0

data/config/locales/sl.yml

@@ -0,0 +1,5 @@
+sl:
+  activemodel:
+    attributes:
+      consultation:
+        description: Opis

data/config/locales/sr-CS.yml

@@ -0,0 +1 @@
+sr:

data/config/locales/sv.yml

@@ -2,8 +2,8 @@ sv:
   activemodel:
     attributes:
       consultation:
-        banner_image: Banner image
-        decidim_highlighted_scope_id: Markerat omfattning
+        banner_image: Bannerbild
+        decidim_highlighted_scope_id: Markerat omfång
         description: Beskrivning
         end_voting_date: Omröstningen avslutas
         introductory_image: Introduktionsbild
@@ -14,29 +14,44 @@ sv:
         subtitle: Underrubrik
         title: Titel
       question:
-        banner_image: Banner image
+        banner_image: Bannerbild
         decidim_scope_id: Kommundelsområde
         hashtag: Hashtag
         hero_image: Hembild
         i_frame_url: URL till externt röstningssystem
+        instructions: Ytterligare anvisningar för röstning
+        max_votes: Max antal röster
+        min_votes: Minsta antal röster
         origin_scope: Omfång
         origin_title: Ursprung
         origin_url: Ursprungs-URL
         participatory_scope: Deltagaromfång
-        promoter_group: Promotorgrupp
+        promoter_group: Kampanjgrupp
         question_context: Kontext
         reference: Referens
-        scope: Kommunala området
+        scope: Kommundelsområde
         slug: URL-slug
         subtitle: Underrubrik
-        title: Titel
         vote: Externt omröstningssystem
         what_is_decided: Vad som bestäms
+      response:
+        decidim_consultations_response_group_id: Grupp
     errors:
+      models:
+        question:
+          attributes:
+            max_votes:
+              lower_than_min: Maximalt antal röster bör vara högre eller lika med minimum.
       vote:
         decidim_consultations_response_id:
           not_found: Hittade inte svar.
   activerecord:
+    errors:
+      models:
+        decidim/consultations/vote:
+          attributes:
+            question:
+              invalid_num_votes: Ogiltigt antal röster
     models:
       decidim/consultation:
         one: Samråd
@@ -53,10 +68,13 @@ sv:
   decidim:
     admin:
       actions:
+        back_to_responses: Tillbaka till svar
         new_consultation: Nytt samråd
         new_question: Ny fråga
         new_response: Nytt svar
+        new_response_group: Ny grupp
         publish_results: Publicera resultat
+        response_groups: Hantera svarsgrupper
         unpublish_results: Avpublicera resultat
       consultation_publications:
         create:
@@ -89,6 +107,7 @@ sv:
           title: Nytt samråd
         results:
           not_visible: Resultaten kommer att vara tillgängliga när samrådet har avslutats
+          participants: "%{count} deltagare"
           total_votes: 'Totalt: %{count} röster'
         update:
           error: Det gick inte att uppdatera samrådet.
@@ -101,6 +120,7 @@ sv:
           results: Resultat
         questions_submenu:
           components: Komponenter
+          configuration: Konfiguration
           consultation: Samråd
           info: Information
           responses: Svar
@@ -124,10 +144,16 @@ sv:
         response:
           fields:
             created_at: Skapad
+            response_group: Grupp
             title: Titel
           name:
             one: Svar
             other: Svar
+      question_configuration:
+        disable_external_voting: Avaktivera extern röstning för avancerade konfigurationer
+        form:
+          help: Skapa flervalsfrågor genom att öka det maximala antalet svar en deltagare kan ge. Det förvalda maxvärdet är 1, vilket innebär att det endast går att rösta på ett alternativ.
+          title: Avancerad konfiguration
       question_publications:
         create:
           error: Det gick inte att publicera den här frågan.
@@ -154,6 +180,24 @@ sv:
         update:
           error: Det gick inte att uppdatera frågan.
           success: Frågan har uppdaterats.
+      response_groups:
+        create:
+          error: Det gick inte att skapa en ny svarsgrupp.
+          success: Svarsgruppen har skapats.
+        destroy:
+          error: Det gick inte att ta bort svarsgruppen. Kontrollera att inga svar beror på den.
+          success: Svarsgruppen har raderats.
+        edit:
+          update: Uppdatera
+        form:
+          title: Allmän information
+        help: Ordna paket med flervalsfrågor med hjälp av grupper.
+        new:
+          create: Skapa
+          title: Ny svarsgrupp
+        update:
+          error: Det gick inte att uppdatera svaret.
+          success: Svaret har uppdaterats.
       responses:
         create:
           error: Det gick inte att skapa ett nytt svar.
@@ -174,6 +218,7 @@ sv:
       titles:
         consultations: Samråd
         questions: Frågor
+        response_groups: Svarsgrupper
         responses: Svar
         results: Resultat
     consultations:
@@ -191,9 +236,11 @@ sv:
           label: 'Sortera samråd efter:'
           random: Slumpmässig
           recent: Senaste
+        show:
+          dates: Datum
       content_blocks:
         highlighted_consultations:
-          name: Annonserade samråd
+          name: Viktiga samråd just nu
       count:
         title:
           one: "%{count} samråd"
@@ -220,7 +267,7 @@ sv:
       pages:
         home:
           highlighted_consultations:
-            active_consultations: Aktiva samråd
+            active_consultations: Pågående samråd
             see_all_consultations: Se alla samråd
             voting_ends_in:
               one: Omröstningen avslutas <strong>imorgon</strong>
@@ -232,9 +279,28 @@ sv:
         votes_out_of:
           one: röst av
           other: röster av
+      question_multiple_votes:
+        results_rules:
+          minimum_votes_per_user:
+            description: Deltagarna kunde fördela minst %{votes} röster mellan olika alternativ.
+          title: Flera val är möjliga som svar på denna fråga
+          total_participants: Sammanlagt deltog %{count} personer i omröstningen.
+          vote_limit:
+            description: Deltagarna kunde rösta på upp till %{limit} alternativ.
+        voting_rules:
+          minimum_votes_per_user:
+            description: Du måste distribuera minst %{votes} röster mellan olika alternativ.
+          title: 'Röster måste följa följande regler:'
+          vote_limit:
+            description: Du kan rösta på upp till %{limit} alternativ.
+            left: Återstående
+            votes: Röster
       question_votes:
         create:
           error: Det gick inte att rösta i frågan
+          success: Du kan ändra den upp till slutet av samrådet. Endast den sista rösten räknas.
+          title_error: Röstningsfel!
+          title_success: Rösten har tagits emot
       regular_questions:
         title: Frågor för detta samråd
       show:
@@ -279,12 +345,15 @@ sv:
         already_voted: Redan röstat
         already_voted_hover: Återkalla röst
         starting_from: Börjar %{date}
+        verification_required: Bekräfta ditt konto för att rösta
         vote: Rösta
       vote_modal:
+        close_modal: Stäng modal
         contextual_help: Välj ett alternativ.
         title: 'Samråd: rösta på en fråga'
       vote_modal_confirm:
         change: Ändra
+        close_modal: Stäng modal
         confirm: Bekräfta
         contextual_help: Bekräfta det valda alternativet.
         title: 'Samråd: bekräfta röst'
@@ -305,3 +374,4 @@ sv:
         unfold: Veckla ut
       question_header:
         back_to_consultation: Visa alla samråd
+        back_to_question: Tillbaka till frågan

data/config/locales/tr-TR.yml

@@ -29,7 +29,6 @@ tr:
         scope: Belediye alanı
         slug: URL sümüklü böcek
         subtitle: Alt yazı
-        title: Başlık
         vote: Dış oylama sistemi
         what_is_decided: Karar nedir
     errors:

data/config/locales/uk.yml

@@ -29,7 +29,6 @@ uk:
         scope: Дільниця міста
         slug: Скорочена веб-адреса
         subtitle: Підзаголовок
-        title: Заголовок
         vote: Зовнішня система голосування
         what_is_decided: Що вирішується
     errors:

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/lib/decidim/consultations/admin_engine.rb

@@ -38,6 +38,7 @@ module Decidim
 
           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|
@@ -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, "-"),
@@ -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, "-"),
@@ -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

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

@@ -101,6 +101,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.0"
+      "0.22.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-consultations
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Juan Salvador Perez Garcia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2020-09-01 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.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.22.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
@@ -234,30 +248,48 @@ files:
 - app/views/layouts/decidim/question_multivote.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
 - config/locales/en.yml
 - config/locales/eo-UY.yml
 - 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
@@ -290,7 +322,11 @@ 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/seeds/Exampledocument.pdf
 - db/seeds/city.jpeg
 - db/seeds/city2.jpeg
@@ -321,7 +357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Decidim consultations module