decidim-surveys 0.32.1 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cb034fa7c80259bde217462967bb54391c350972e30a5c634b0deaed153addb
-  data.tar.gz: d74440cf33a3aa26401c8f0a7bd3b2aed9b2a1450a4b07a4d2edbece3d0b7f50
+  metadata.gz: f9eb38a7b8f527f505518ba2b1245f80575d8c2e13fa31aee247653a7dfc83af
+  data.tar.gz: 335680a9f21232b7343e8cbdc88c90cf2cd5351c47d88d6c64d341b5da77224f
 SHA512:
-  metadata.gz: fb21e76052674fac4b3c9e6e5280370ac0849149a4ac9a5cb6b157e349785bf7ef7af19dab2480c1fbc7475aa1e092d3368a27615725baceec8e16d638dabc67
-  data.tar.gz: dbce60aecea833f3934396e3d0a9f4310af8ad0a686bf10ffc9f01065f4a05b3044322f4818dc506085b306468beb8f1cc5eff390160b77a8a52816bb86c5dbc
+  metadata.gz: f85359170121d0971a9f311b147c0f17be6c67b75e16cfbc2d800b8f21521f7993b316e0bc27c34eeee9c9b16c81362acbf9a2585a90a132f827a12df0ecc957
+  data.tar.gz: 6ac443a988d9ca71e2f440e971429eced07a9a24db56024795d758b2b6efd64cc00b6c54e1aa517dfd570b803982233fa5cbe73f64a2e8307850bb368befd699

data/app/controllers/decidim/surveys/admin/publish_responses_controller.rb

@@ -43,8 +43,10 @@ module Decidim
           end
         end
 
+        protected
+
         def questionnaire
-          @questionnaire ||= Decidim::Forms::Questionnaire.find_by(questionnaire_for:)
+          @questionnaire ||= Decidim::Forms::Questionnaire.find_by(questionnaire_for:) # rubocop:disable Decidim/OrganizationScopedFinder -- questionnaire_for returns survey which is scoped to current_component
         end
 
         def questionnaire_for

data/app/controllers/decidim/surveys/admin/questions/surveys_controller.rb

@@ -11,6 +11,8 @@ module Decidim
 
           helper_method :surveys
 
+          protected
+
           def edit_questions_template
             "decidim/surveys/admin/questions/surveys/edit"
           end
@@ -19,6 +21,10 @@ module Decidim
             survey
           end
 
+          def response_options_url(params)
+            url_for(params.merge(controller: "questions/surveys", action: "response_options", format: :json, survey_id: survey.id))
+          end
+
           def after_update_url
             edit_questions_questions_survey_path(survey)
           end
@@ -39,7 +45,15 @@ module Decidim
           private
 
           def survey
-            @survey ||= Decidim::Surveys::Survey.where(component: current_component).find(params[:id])
+            @survey ||= Decidim::Surveys::Survey.where(component: current_component).find(survey_id)
+          end
+
+          def survey_id
+            if action_name == "response_options"
+              params.expect(:survey_id)
+            else
+              params.expect(:id)
+            end
           end
         end
       end

data/app/controllers/decidim/surveys/admin/responses_controller.rb

@@ -26,6 +26,8 @@ module Decidim
           render template: "decidim/surveys/admin/responses/show"
         end
 
+        protected
+
         def questionnaire_for
           @questionnaire_for ||= Decidim::Surveys::Survey.where(component: current_component).find_by(id: params[:survey_id])
         end
@@ -54,7 +56,7 @@ module Decidim
         end
 
         def questionnaire
-          @questionnaire ||= Decidim::Forms::Questionnaire.find_by(questionnaire_for:)
+          @questionnaire ||= Decidim::Forms::Questionnaire.find_by(questionnaire_for:) # rubocop:disable Decidim/OrganizationScopedFinder -- questionnaire_for returns a survey scoped to current_component
         end
 
         def participants_query

data/app/controllers/decidim/surveys/admin/surveys_controller.rb

@@ -9,7 +9,9 @@ module Decidim
 
         helper_method :surveys
 
-        def index; end
+        def index
+          enforce_permission_to :read, :questionnaire
+        end
 
         def new
           enforce_permission_to(:create, :questionnaire)

data/app/controllers/decidim/surveys/surveys_controller.rb

@@ -19,7 +19,9 @@ module Decidim
       before_action :check_permissions, except: [:index]
       before_action :check_editable, only: [:edit]
 
-      def index; end
+      def index
+        enforce_permission_to :read, :survey
+      end
 
       def edit
         @form = form(Decidim::Forms::QuestionnaireForm).from_model(questionnaire)

data/app/helpers/decidim/surveys/publish_responses_helper.rb

@@ -80,7 +80,7 @@ module Decidim
       end
 
       def options_column_chart_wrapper(question)
-        tally = question.responses.map { |response| response.choices.map { |choice| translated_attribute(choice.response_option.body) } }.tally
+        tally = question.responses.flat_map { |response| response.choices.map { |choice| translated_attribute(choice.response_option.body) } }.tally
 
         column_chart(tally, download: true)
       end

data/app/permissions/decidim/surveys/admin/permissions.rb

@@ -14,7 +14,7 @@ module Decidim
           case permission_action.subject
           when :questionnaire
             case permission_action.action
-            when :export_responses, :update, :create, :destroy, :preview
+            when :read, :export_responses, :update, :create, :destroy, :preview
               permission_action.allow!
             end
           when :questionnaire_responses

data/app/permissions/decidim/surveys/permissions.rb

@@ -7,6 +7,11 @@ module Decidim
         return Decidim::Surveys::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
+        if permission_action.subject == :survey && permission_action.action == :read
+          permission_action.allow!
+          return permission_action
+        end
+
         return permission_action if permission_action.subject != :questionnaire
 
         permission_action.allow! if permission_action.action == :respond

data/config/locales/cs.yml

@@ -1,6 +1,9 @@
 ---
 cs:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Přidat přílohy
     models:
       decidim/surveys/closed_survey_event: Průzkum skončil
       decidim/surveys/opened_survey_event: Průzkum začal
@@ -170,6 +173,7 @@ cs:
         response:
           invalid: Při odpovědi na dotazník došlo k chybě.
           spam_detected: Vyskytl se problém s odpovědí na formulář. Možná jste byl příliš rychlý, můžete to zkusit znovu?
+          success: Průzkum úspěšně zodpovězen.
         show:
           closed: Uzavřeno
           open: Otevřeno

data/config/locales/de.yml

@@ -1,6 +1,9 @@
 ---
 de:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Anhänge hinzufügen
     models:
       decidim/surveys/closed_survey_event: Umfrage beendet
       decidim/surveys/opened_survey_event: Umfrage gestartet
@@ -72,6 +75,7 @@ de:
         manage_questions: Fragen
         new_survey: Neue Umfrage
         preview: Vorschau
+        responses: Antworten
         responses_alert: Das Löschen der Antworten bei der Veröffentlichung dieser Umfrage aktiv. Derzeit gibt es %{responses_count} Antworten, die gelöscht werden, wenn Sie fortfahren.
         title: Aktionen
       admin:
@@ -148,6 +152,7 @@ de:
             title: Titel
           published:
             published: Veröffentlicht
+            unpublished: Unveröffentlicht
           status:
             closed: Geschlossen
             open: Offen

data/config/locales/eu.yml

@@ -3,7 +3,7 @@ eu:
   activemodel:
     attributes:
       response:
-        add_attachments: Gehitu eranskinak
+        add_attachments: Eranskinak gehitu
     models:
       decidim/surveys/closed_survey_event: Inkesta amaitu da
       decidim/surveys/opened_survey_event: Inkesta hasi da
@@ -18,7 +18,7 @@ eu:
   decidim:
     admin:
       actions:
-        confirm_unpublish_survey: Ziur zaude inkesta hau despublikatu nahi duzula?
+        confirm_unpublish_survey: Ziur zaude inkesta hau desargitaratu nahi duzula?
         see_survey: Inkesta ikusi
       admin_log:
         changeset:
@@ -59,7 +59,7 @@ eu:
           created_at: Erantzun hau noiz sortu zen
           id: Identifikatzaile bakarra inkestaren erantzunerako
           ip_hash: Elkarrizketatuaren IP helbidea pribatutasunagatik
-          question: Erantzun zen galdera
+          question: Erantzun den galdera
           registered: Parte-hartzaile erregistratua
           unregistered: Erregistratu gabeko parte-hartzailea
           user_status: Erantzuna aurkeztu duen parte-hartzailearen egoera
@@ -74,7 +74,7 @@ eu:
         edit: Editatu
         manage_questions: Galderak
         new_survey: Beste inkesta bat
-        preview: Aurreikusi
+        preview: Aurrebistaratu
         responses: Erantzunak
         responses_alert: Erantzunak ezabatzea argitalpenean aktibatuta dago inkesta honetarako. Une honetan, erantzunen %{responses_count} suntsitu egingo dira, jarraitzen baduzu.
         title: Ekintzak
@@ -124,8 +124,8 @@ eu:
             invalid: Arazo bat egon da inkesta hau argitaratzean.
             success: Inkesta zuzen argitaratua.
           unpublish:
-            invalid: Arazo bat egon da inkesta hau despublikatzean.
-            success: Inkesta zuzen despublikatua.
+            invalid: Arazo bat egon da inkesta hau desargitaratzean.
+            success: Inkesta behar bezala desargitaratu da.
           update:
             invalid: Arazo bat egon da inkesta gordetzean.
             success: Inkesta ondo gorde da.
@@ -152,7 +152,7 @@ eu:
             title: Izenburua
           published:
             published: Argitaratua
-            unpublished: Desargitaratua
+            unpublished: Argitaratu gabea
           status:
             closed: Itxita
             open: Zabaldu

data/config/locales/fr-CA.yml

@@ -79,8 +79,14 @@ fr-CA:
         responses_alert: La suppression des réponses lors de la publication est active pour cette enquête. Il y a actuellement %{responses_count} réponses qui seront supprimées si vous continuez.
         title: Actions
       admin:
+        exports:
+          survey_user_responses: Réponses des participants à l'enquête
         publish_responses:
           index:
+            description: |-
+              En publiant les réponses aux questions, vous les rendrez accessibles au public.
+              Vous pouvez sélectionner les réponses que vous souhaitez publier en cochant la case située à côté de chaque question.
+              Vous ne pouvez publier que les types de questions suivants : « Choix unique », « Choix multiples », « Matrice (choix unique) », « Matrice (choix multiples) » et « Tri ».
             responses:
               one: "%{count} réponse"
               other: "%{count} réponses"
@@ -151,14 +157,25 @@ fr-CA:
             closed: Fermée
             open: Ouverte
       survey_confirmation_mailer:
+        confirmation:
+          body: Vous avez répondu avec succès à l'enquête %{questionnaire_title} au sein de %{participatory_space}
+          subject: Confirmation de réponse à l'enquête %{questionnaire_title}
         export_name: Réponses à l'enquête
       surveys:
+        count:
+          surveys_count:
+            one: "%{count} enquête"
+            other: "%{count} enquêtes"
         filters:
           all: Toutes
           state_values:
             closed: Fermée
             open: Ouverte
         no_surveys_warning: Aucune enquête ne correspond à vos critères de recherche ou aucune enquête n'est actuellement ouverte.
+        response:
+          invalid: Un problème est survenu pendant l'enquête.
+          spam_detected: Un problème est survenu lors du remplissage du formulaire. Vous avez peut-être répondu trop vite. Pouvez-vous réessayer ?
+          success: Les réponses à l'enquête ont été enregistrées avec succès.
         show:
           closed: Fermée
           open: Ouverte

data/config/locales/fr.yml

@@ -79,8 +79,14 @@ fr:
         responses_alert: La suppression des réponses lors de la publication est active pour cette enquête. Il y a actuellement %{responses_count} réponses qui seront supprimées si vous continuez.
         title: Actions
       admin:
+        exports:
+          survey_user_responses: Réponses des participants à l'enquête
         publish_responses:
           index:
+            description: |-
+              En publiant les réponses aux questions, vous les rendrez accessibles au public.
+              Vous pouvez sélectionner les réponses que vous souhaitez publier en cochant la case située à côté de chaque question.
+              Vous ne pouvez publier que les types de questions suivants : « Choix unique », « Choix multiples », « Matrice (choix unique) », « Matrice (choix multiples) » et « Tri ».
             responses:
               one: "%{count} réponse"
               other: "%{count} réponses"
@@ -151,14 +157,25 @@ fr:
             closed: Fermée
             open: Ouverte
       survey_confirmation_mailer:
+        confirmation:
+          body: Vous avez répondu avec succès à l'enquête %{questionnaire_title} au sein de %{participatory_space}
+          subject: Confirmation de réponse à l'enquête %{questionnaire_title}
         export_name: Réponses à l'enquête
       surveys:
+        count:
+          surveys_count:
+            one: "%{count} enquête"
+            other: "%{count} enquêtes"
         filters:
           all: Toutes
           state_values:
             closed: Fermée
             open: Ouverte
         no_surveys_warning: Aucune enquête ne correspond à vos critères de recherche ou aucune enquête n'est actuellement ouverte.
+        response:
+          invalid: Un problème est survenu pendant l'enquête.
+          spam_detected: Un problème est survenu lors du remplissage du formulaire. Vous avez peut-être répondu trop vite. Pouvez-vous réessayer ?
+          success: Les réponses à l'enquête ont été enregistrées avec succès.
         show:
           closed: Fermée
           open: Ouverte

data/config/locales/gl.yml

@@ -1,6 +1,9 @@
 ---
 gl:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Engadir anexos
     models:
       decidim/surveys/closed_survey_event: A investigación finalizou
       decidim/surveys/opened_survey_event: Iniciouse a enquisa
@@ -9,10 +12,30 @@ gl:
       decidim/surveys/survey:
         one: Enquisa
         other: Enquisas
+      decidim/surveys/survey_response:
+        one: Resposta
+        other: Respostas
   decidim:
+    admin:
+      actions:
+        confirm_unpublish_survey: Seguro que queres retirar a publicación desta enquisa?
+        see_survey: Ver enquisa
+      admin_log:
+        changeset:
+          surveys: enquisas
+      menu:
+        surveys_menu:
+          main: Principal
+          questions: Preguntas
+          responses: Respostas
+          settings: Configuración
     components:
       surveys:
+        actions:
+          respond: Responder
+        name: Enquisas
         settings:
+          announcement: Aviso
           global:
             announcement: Anuncio
           step:
@@ -29,9 +52,128 @@ gl:
           email_outro: Recibiches esta notificación porque estás seguindo %{participatory_space_title}. Podes deixar de recibir notificacións seguindo a ligazón anterior.
           email_subject: Unha nova enquisa en %{participatory_space_title}
           notification_title: A enquisa <a href="%{resource_path}">%{resource_title}</a> en <a href="%{participatory_space_url}">%{participatory_space_title}</a> está agora aberta.
+    open_data:
+      help:
+        published_survey_user_responses:
+          body: O contido da resposta
+          created_at: A marca de tempo na que se creou a resposta
+          id: O identificador único da resposta á enquisa
+          ip_hash: O enderezo IP da persoa que respondeu, codificado mediante hash por privacidade
+          question: A pregunta que se respondeu
+          registered: Participante con conta rexistrada
+          unregistered: Participante sen conta rexistrada
+          user_status: Estado da conta da persoa participante que enviou a resposta
+    statistics:
+      responses: 'Respostas:'
+      responses_count: Respostas
+      surveys_count_tooltip: O número de enquisas dispoñibles e de respostas recollidas.
     surveys:
+      actions:
+        confirm_destroy: Seguro que queres eliminar isto?
+        destroy: Eliminar
+        edit: Editar
+        manage_questions: Preguntas
+        new_survey: Nova enquisa
+        preview: Vista previa
+        responses: Respostas
+        title: Accións
       admin:
+        exports:
+          survey_user_responses: Respostas das persoas participantes á enquisa
+        publish_responses:
+          index:
+            description: |-
+              Ao publicar as respostas ás preguntas, faralas visibles para o público.
+              Podes seleccionar as respostas que queres publicar marcando a caixa situada xunto a cada pregunta.
+              Só podes publicar os seguintes tipos de pregunta: «Opción única», «Opción múltiple», «Matriz (opción única)», «Matriz (opción múltiple)» e «Ordenación».
+            responses:
+              one: "%{count} resposta"
+              other: "%{count} respostas"
+            status:
+              not_published: Non publicada
+              published: Publicada
+            title: Publicar respostas
+        questions:
+          surveys:
+            edit:
+              title: Preguntas
+        responses:
+          index:
+            no_responses: Aínda non hai respostas
+            title: "%{total} respostas en total"
+          show:
+            title: 'Resposta n.º %{number}'
+        settings:
+          surveys:
+            edit:
+              title: Configuración
         surveys:
+          create:
+            invalid: Produciuse un problema ao crear a enquisa.
+            success: A enquisa creouse correctamente.
+          destroy:
+            success: A enquisa eliminouse correctamente.
+          index:
+            title: Enquisas
+          new:
+            title: Nova enquisa
+          publish:
+            invalid: Produciuse un problema ao publicar esta enquisa.
+            success: A enquisa publicouse correctamente.
+          unpublish:
+            invalid: Produciuse un problema ao retirar a publicación desta enquisa.
+            success: Retirouse correctamente a publicación da enquisa.
           update:
             invalid: Houbo erros ao gardar a enquisa.
             success: A enquisa gardouse correctamente.
+      admin_log:
+        survey:
+          create: "%{user_name} creou a enquisa %{resource_name} no espazo %{space_name}"
+          delete: "%{user_name} eliminou a enquisa %{resource_name} do espazo %{space_name}"
+          publish: "%{user_name} publicou a enquisa %{resource_name} no espazo %{space_name}"
+          unpublish: "%{user_name} retirou a publicación da enquisa %{resource_name} no espazo %{space_name}"
+          update: "%{user_name} actualizou a enquisa %{resource_name} no espazo %{space_name}"
+      directory:
+        surveys:
+          index:
+            surveys: Enquisas
+      last_activity:
+        new_survey: 'Nova enquisa:'
+      models:
+        survey:
+          fields:
+            published: Publicada
+            questions: Preguntas
+            responses: Respostas
+            status: Estado
+            title: Título
+          published:
+            published: Publicada
+            unpublished: Non publicada
+          status:
+            closed: Pechada
+            open: Aberta
+      survey_confirmation_mailer:
+        confirmation:
+          body: Respondiches correctamente á enquisa %{questionnaire_title} en %{participatory_space}
+          subject: Confirmación da resposta ao cuestionario %{questionnaire_title}
+        export_name: Respostas á enquisa
+      surveys:
+        count:
+          surveys_count:
+            one: "%{count} enquisa"
+            other: "%{count} enquisas"
+        filters:
+          all: Todas
+          state_values:
+            closed: Pechada
+            open: Aberta
+        no_surveys_warning: Non hai ningunha enquisa aberta ou ningunha coincide cos teus criterios de busca.
+        response:
+          invalid: Produciuse un problema ao responder á enquisa.
+          spam_detected: Produciuse un problema ao responder ao formulario. Quizais o fixeches demasiado rápido; podes tentalo de novo?
+          success: A enquisa respondeuse correctamente.
+        show:
+          closed: Pechada
+          open: Aberta
+          questions: preguntas

data/config/locales/sv.yml

@@ -1,6 +1,9 @@
 ---
 sv:
   activemodel:
+    attributes:
+      response:
+        add_attachments: Lägg till bilagor
     models:
       decidim/surveys/closed_survey_event: Enkäten avslutades
       decidim/surveys/opened_survey_event: Enkäten startade

data/decidim-surveys.gemspec

@@ -3,7 +3,7 @@
 $LOAD_PATH.push File.expand_path("lib", __dir__)
 
 Gem::Specification.new do |s|
-  version = "0.32.1"
+  version = "0.32.2"
   s.version = version
   s.authors = ["Josep Jaume Rey Peroy", "Marc Riera Casals", "Oriol Gual Oliva"]
   s.email = ["josepjaume@gmail.com", "mrc2407@gmail.com", "oriolgual@gmail.com"]

data/lib/decidim/surveys/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-surveys version.
   module Surveys
     def self.version
-      "0.32.1"
+      "0.32.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.32.2
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -17,84 +17,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
 - !ruby/object:Gem::Dependency
   name: decidim-templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.32.1
+        version: 0.32.2
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com