decidim-surveys 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d14a8aaa5a0ede9d984f77eeac91dbacd3c4e400cd3942555506f3c81c740a3
-  data.tar.gz: b6d3a986147764edb8a20ad4e8bf1219860949dac654dc93a4a0367b5d9b1c4a
+  metadata.gz: 438c473b61d9bc07cad2c8e3ce3c6c56f900ae0a4aaade52db7dffbcb1e4a433
+  data.tar.gz: 182793a9e4e0fee42249e40ec2862f4a756344656f5010c055167c0477240559
 SHA512:
-  metadata.gz: 40cc1192e187b3a192516fb90150e76e5a2233d2acf7155f8937728781602e102459dee3ab1a9775b012af9d2d616ed6f379059ee8f11d9b9975dc409b65cf88
-  data.tar.gz: cf7ba0b830eb911b88fdfda3d3aec5bcab6cfc187300d73e2563904eeb37f2c707c551cf59ab16eb965591e6fb2ff72eb534957df3490ea0e333efb5f172b290
+  metadata.gz: fd718b0903ddd737e42ea62e71039e4fdc34bf7c5cc13444f8b1f4353a5d197dd0b95cbd20434d1c52cbefe6c74d82ed64fb590732fddbe6f1f1a17ea5df685d
+  data.tar.gz: 92a9f208813e602e656b27f7549da9aafbfb88da073f2d2280d5eddde519fd0756a95223f5860cdbb4f3c207406a0420e4e0dbac8a19f6b5ae32129485dab7c0

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

@@ -6,11 +6,22 @@ module Decidim
       # This controller allows the user to update a Page.
       class SurveysController < Admin::ApplicationController
         include Decidim::Forms::Admin::Concerns::HasQuestionnaire
+        include Decidim::Forms::Admin::Concerns::HasQuestionnaireAnswers
 
         def questionnaire_for
           survey
         end
 
+        # Specify the public url from which the survey can be viewed and answered
+        def public_url
+          Decidim::EngineRouter.main_proxy(current_component).survey_path(survey)
+        end
+
+        # Specify where to redirect after exporting a user response
+        def questionnaire_participant_answers_url(session_token)
+          Decidim::EngineRouter.admin_proxy(survey.component).show_survey_path(session_token: session_token)
+        end
+
         private
 
         def i18n_flashes_scope

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

@@ -8,7 +8,7 @@ module Decidim
       include Decidim::ComponentPathHelper
       helper Decidim::Surveys::SurveyHelper
 
-      delegate :allow_answers?, :allow_unregistered?, to: :current_settings
+      delegate :allow_unregistered?, to: :current_settings
 
       before_action :check_permissions
 
@@ -20,6 +20,12 @@ module Decidim
         survey
       end
 
+      protected
+
+      def allow_answers?
+        !current_component.published? || current_settings.allow_answers?
+      end
+
       def form_path
         main_component_path(current_component)
       end

data/app/jobs/decidim/surveys/clean_survey_answers_job.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    class CleanSurveyAnswersJob < ApplicationJob
+      def perform(_event_name, data)
+        @component = data[:resource]
+        return unless component&.manifest_name == "surveys"
+
+        @survey = Survey.find_by(component: component)
+        return unless survey&.questionnaire
+
+        case data[:event_class]
+        when "Decidim::ComponentPublishedEvent"
+          clean_answers
+        end
+      end
+
+      private
+
+      attr_reader :survey, :component
+
+      def clean_answers
+        return unless survey.clean_after_publish?
+
+        survey.questionnaire.answers.destroy_all
+        component.settings[:clean_after_publish] = false
+        component.save
+      end
+    end
+  end
+end

data/app/jobs/decidim/surveys/settings_change_job.rb

@@ -42,6 +42,10 @@ module Decidim
         !!current_settings[:allow_answers] == false &&
           previous_settings[:allow_answers] == true
       end
+
+      def clean_after_publish_changed?(previous_settings, current_settings)
+        current_settings[:clean_after_publish] != previous_settings[:clean_after_publish]
+      end
       # rubocop:enable Style/DoubleNegation
     end
   end

data/app/models/decidim/surveys/survey.rb

@@ -11,6 +11,10 @@ module Decidim
       component_manifest_name "surveys"
 
       validates :questionnaire, presence: true
+
+      def clean_after_publish?
+        component.settings.clean_after_publish?
+      end
     end
   end
 end

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

@@ -7,13 +7,19 @@ module Decidim
         def permissions
           return permission_action unless user
 
-          return permission_action if permission_action.scope != :admin
+          return permission_action unless permission_action.scope == :admin
 
-          return permission_action if permission_action.subject != :questionnaire
-
-          case permission_action.action
-          when :export_answers, :update
-            permission_action.allow!
+          case permission_action.subject
+          when :questionnaire
+            case permission_action.action
+            when :export_answers, :update
+              permission_action.allow!
+            end
+          when :questionnaire_answers
+            case permission_action.action
+            when :index, :show, :export_response
+              permission_action.allow!
+            end
           end
 
           permission_action

data/config/locales/am-ET.yml

@@ -0,0 +1 @@
+am:

data/config/locales/bg.yml

@@ -0,0 +1,10 @@
+bg:
+  activemodel:
+    models:
+      decidim/surveys/closed_survey_event: Анкетата завърши
+      decidim/surveys/opened_survey_event: Анкетата започна
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        one: Анкета
+        other: Анкети

data/config/locales/ca.yml

@@ -20,6 +20,9 @@ ca:
         settings:
           global:
             announcement: Avís
+            clean_after_publish: Esborrar les respostes en publicar l'enquesta
+            scope_id: Àmbit
+            scopes_enabled: Àmbits habilitats
           step:
             allow_answers: Permetre respostes
             allow_unregistered: Permet a usuàries no registrades contestar l'enquesta

data/config/locales/cs.yml

@@ -24,6 +24,9 @@ cs:
         settings:
           global:
             announcement: Oznámení
+            clean_after_publish: Odstranit odpovědi při publikování ankety
+            scope_id: Oblast působnosti
+            scopes_enabled: Oblasti působnosti povoleny
           step:
             allow_answers: Povolte odpovědi
             allow_unregistered: Umožnit neregistrovaným uživatelům odpovědět na průzkum

data/config/locales/da.yml

@@ -0,0 +1 @@
+da:

data/config/locales/de.yml

@@ -20,6 +20,9 @@ de:
         settings:
           global:
             announcement: Ankündigung
+            clean_after_publish: Antworten bei Veröffentlichung des Fragebogens löschen
+            scope_id: Bereich
+            scopes_enabled: Bereiche aktiviert
           step:
             allow_answers: Erlaube Antworten
             allow_unregistered: Nicht registrierten Benutzern die Beantwortung des Fragebogens erlauben

data/config/locales/en.yml

@@ -21,6 +21,9 @@ en:
         settings:
           global:
             announcement: Announcement
+            clean_after_publish: Delete answers when publishing the survey
+            scope_id: Scope
+            scopes_enabled: Scopes enabled
           step:
             allow_answers: Allow answers
             allow_unregistered: Allow unregistered users to answer the survey

data/config/locales/eo.yml

@@ -0,0 +1 @@
+eo:

data/config/locales/es-MX.yml

@@ -20,6 +20,9 @@ es-MX:
         settings:
           global:
             announcement: Anuncio
+            clean_after_publish: Borrar respuestas al publicar la encuesta
+            scope_id: Ámbito
+            scopes_enabled: Ámbitos habilitados
           step:
             allow_answers: Permitir respuestas
             allow_unregistered: Permitir a las usuarias no registradas responder a la encuesta

data/config/locales/es-PY.yml

@@ -20,6 +20,9 @@ es-PY:
         settings:
           global:
             announcement: Anuncio
+            clean_after_publish: Borrar respuestas al publicar la encuesta
+            scope_id: Ámbito
+            scopes_enabled: Ámbitos habilitados
           step:
             allow_answers: Permitir respuestas
             allow_unregistered: Permitir a las usuarias no registradas responder a la encuesta

data/config/locales/es.yml

@@ -20,6 +20,9 @@ es:
         settings:
           global:
             announcement: Aviso
+            clean_after_publish: Borrar respuestas al publicar la encuesta
+            scope_id: Ámbito
+            scopes_enabled: Ámbitos habilitados
           step:
             allow_answers: Permitir respuestas
             allow_unregistered: Permitir a las usuarias no registradas responder a la encuesta

data/config/locales/et.yml

@@ -0,0 +1 @@
+et:

data/config/locales/fi-plain.yml

@@ -20,6 +20,9 @@ fi-pl:
         settings:
           global:
             announcement: Ilmoitus
+            clean_after_publish: Poista vastaukset julkaistaessa kysely
+            scope_id: Teema
+            scopes_enabled: Teemat käytössä
           step:
             allow_answers: Salli vastaukset
             allow_unregistered: Salli rekisteröitymättömien käyttäjien vastata tähän kyselyyn

data/config/locales/fi.yml

@@ -20,6 +20,9 @@ fi:
         settings:
           global:
             announcement: Ilmoitus
+            clean_after_publish: Poista vastaukset julkaistaessa kysely
+            scope_id: Teema
+            scopes_enabled: Teemat käytössä
           step:
             allow_answers: Salli vastaukset
             allow_unregistered: Salli rekisteröitymättömien käyttäjien vastata tähän kyselyyn

data/config/locales/fr-CA.yml

@@ -20,6 +20,9 @@ fr-CA:
         settings:
           global:
             announcement: Annonce
+            clean_after_publish: Supprimer les réponses lors de la publication du sondage
+            scope_id: Secteur
+            scopes_enabled: Secteurs activés
           step:
             allow_answers: Autoriser les réponses
             allow_unregistered: Autoriser les utilisateurs non inscrits à répondre à l'enquête

data/config/locales/fr.yml

@@ -20,6 +20,9 @@ fr:
         settings:
           global:
             announcement: Annonce
+            clean_after_publish: Supprimer les réponses lors de la publication de l'enquête
+            scope_id: Secteur
+            scopes_enabled: Secteurs activés
           step:
             allow_answers: Autoriser les réponses
             allow_unregistered: Autoriser les utilisateurs non inscrits à répondre à l'enquête

data/config/locales/hr.yml

@@ -0,0 +1 @@
+hr:

data/config/locales/is.yml

@@ -0,0 +1,25 @@
+is:
+  decidim:
+    components:
+      surveys:
+        actions:
+          answer: Svara
+        name: Könnun
+        settings:
+          global:
+            announcement: Tilkynning
+          step:
+            allow_answers: Leyfa svörum
+            announcement: Tilkynning
+    events:
+      surveys:
+        survey_closed:
+          email_intro: Könnunin %{resource_title} í %{participatory_space_title} hefur verið lokuð.
+          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{participatory_space_title}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
+          email_subject: Könnun er lokið í %{participatory_space_title}
+          notification_title: Könnunin <a href="%{resource_path}">%{resource_title}</a> í <a href="%{participatory_space_url}">%{participatory_space_title}</a> er lokið.
+        survey_opened:
+          email_intro: 'Könnunin %{resource_title} í %{participatory_space_title} er nú opin. Þú getur tekið þátt í henni frá þessari síðu:'
+          email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með %{participatory_space_title}. Þú getur hætt við að fá tilkynningar eftir fyrri tengilinn.
+          email_subject: Ný könnun á %{participatory_space_title}
+          notification_title: Könnunin <a href="%{resource_path}">%{resource_title}</a> í <a href="%{participatory_space_url}">%{participatory_space_title}</a> er nú opin.

data/config/locales/it.yml

@@ -20,6 +20,7 @@ it:
         settings:
           global:
             announcement: Annuncio
+            clean_after_publish: Eliminare le risposte quando si pubblica il sondaggio
           step:
             allow_answers: Consenti risposte
             allow_unregistered: Consenti agli utenti non registrati di rispondere al sondaggio

data/config/locales/ja-JP.yml

@@ -18,6 +18,7 @@ ja:
         settings:
           global:
             announcement: お知らせ
+            clean_after_publish: アンケートを公開するときに回答を削除する
           step:
             allow_answers: 回答を許可
             allow_unregistered: 未登録ユーザーがアンケートに回答できるようにする

data/config/locales/ja.yml

@@ -0,0 +1,60 @@
+ja:
+  activemodel:
+    models:
+      decidim/surveys/closed_survey_event: アンケートが終了しました
+      decidim/surveys/opened_survey_event: アンケートを開始
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        other: 調査
+      decidim/surveys/survey_answer:
+        other: 回答
+  decidim:
+    components:
+      surveys:
+        actions:
+          answer: 回答
+        name: 調査
+        settings:
+          global:
+            announcement: お知らせ
+            clean_after_publish: アンケートを公開するときに回答を削除する
+            scope_id: スコープ
+            scopes_enabled: スコープが有効
+          step:
+            allow_answers: 回答を許可
+            allow_unregistered: 未登録ユーザーがアンケートに回答できるようにする
+            allow_unregistered_help: 有効な場合、アンケートに回答するためにログインは必要ありません。 これにより、データが貧弱または信頼できない可能性があり、自動攻撃に対してより脆弱になります。注意して使用してください！
+            announcement: お知らせ
+    events:
+      surveys:
+        survey_closed:
+          email_intro: '%{resource_title} の調査 %{participatory_space_title} はクローズされました。'
+          email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+          email_subject: '%{participatory_space_title} でアンケートが完了しました'
+          notification_title: <a href="%{resource_path}">%{resource_title}の</a> <a href="%{participatory_space_url}">%{participatory_space_title}</a> の調査は終了しました。
+        survey_opened:
+          email_intro: '%{resource_title} のアンケート %{participatory_space_title} が公開されました。このページから参加できます：'
+          email_outro: '%{participatory_space_title}をフォローしているため、この通知を受け取りました。前のリンクに続く通知の受信を停止することができます。'
+          email_subject: '%{participatory_space_title} での新しい調査'
+          notification_title: <a href="%{resource_path}">%{resource_title}の</a> <a href="%{participatory_space_url}">%{participatory_space_title}の調査</a> が公開されました。
+    metrics:
+      survey_answers:
+        description: 回答したアンケート数
+        object: アンケートに対する答えは
+        title: アンケートへの回答
+    surveys:
+      admin:
+        exports:
+          survey_user_answers: アンケート参加者の回答
+        surveys:
+          update:
+            invalid: 調査の保存中に問題が発生しました。
+            success: アンケートを保存しました。
+      last_activity:
+        new_survey_at_html: "<span>新しい調査 %{link}</span>"
+      surveys:
+        answer:
+          invalid: アンケートの回答に問題がありました。
+          spam_detected: フォームに応答する際に問題が発生しました。もう一度試してみてください。
+          success: アンケートは正常に回答しました。

data/config/locales/ko-KR.yml

@@ -0,0 +1 @@
+ko:

data/config/locales/ko.yml

@@ -0,0 +1 @@
+ko:

data/config/locales/lt.yml

@@ -0,0 +1 @@
+lt:

data/config/locales/mt.yml

@@ -0,0 +1 @@
+mt:

data/config/locales/nl.yml

@@ -20,6 +20,9 @@ nl:
         settings:
           global:
             announcement: Aankondiging
+            clean_after_publish: Verwijder antwoorden bij publicatie van de enquête
+            scope_id: Scope
+            scopes_enabled: Scopes ingeschakeld
           step:
             allow_answers: Antwoorden toestaan
             allow_unregistered: Sta niet-geregistreerde gebruikers toe om de enquête te beantwoorden

data/config/locales/om-ET.yml

@@ -0,0 +1 @@
+om:

data/config/locales/pl.yml

@@ -1,7 +1,7 @@
 pl:
   activemodel:
     models:
-      decidim/surveys/closed_survey_event: Ankieta zakończyła się
+      decidim/surveys/closed_survey_event: Ankieta zamknięta
       decidim/surveys/opened_survey_event: Rozpoczęto ankietę
   activerecord:
     models:
@@ -24,40 +24,43 @@ pl:
         settings:
           global:
             announcement: Ogłoszenie
+            clean_after_publish: Usuń odpowiedzi podczas publikowania ankiety
+            scope_id: Zakres
+            scopes_enabled: Zakresy włączone
           step:
-            allow_answers: Pozwól odpowiedzi
+            allow_answers: Pozwól na wypełnianie
             allow_unregistered: Pozwól niezarejestrowanym użytkownikom wypełnić ankietę
-            allow_unregistered_help: Jeśli jest aktywny, do wypełnienia ankiety nie będzie wymagane logowanie. Może to dać słabej jakości lub niewiarygodne dane i ankieta będzie bardziej podatna na automatyczne ataki. Zalecamy ostrożność!
+            allow_unregistered_help: Jeśli jest aktywna, do wypełnienia ankiety nie będzie wymagane logowanie. Może to doprowadzić do słabej jakości lub niewiarygodnych danych i ankieta będzie bardziej podatna na automatyczne ataki. Zalecamy ostrożność!
             announcement: Ogłoszenie
     events:
       surveys:
         survey_closed:
           email_intro: Ankieta %{resource_title} w %{participatory_space_title} została zamknięta.
-          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po poprzednim linku.
-          email_subject: Ankieta zakończyła się w %{participatory_space_title}
+          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
+          email_subject: Ankieta w %{participatory_space_title} została zakończona
           notification_title: Ankieta <a href="%{resource_path}">%{resource_title}</a> w <a href="%{participatory_space_url}">%{participatory_space_title}</a> została zakończona.
         survey_opened:
-          email_intro: 'Ankieta %{resource_title} w %{participatory_space_title} jest teraz otwarta. Możesz wziąć w nim udział z tej strony:'
-          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po poprzednim linku.
+          email_intro: 'Ankieta %{resource_title} w %{participatory_space_title} jest teraz otwarta. Możesz ją wypełnić na tej stronie:'
+          email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz %{participatory_space_title}. Możesz przestać otrzymywać powiadomienia po kliknięciu w poprzedni link.
           email_subject: Nowa ankieta w %{participatory_space_title}
           notification_title: Ankieta <a href="%{resource_path}">%{resource_title}</a> w <a href="%{participatory_space_url}">%{participatory_space_title}</a> jest teraz otwarta.
     metrics:
       survey_answers:
-        description: Liczba ankiet odebranych przez użytkowników
+        description: Liczba ankiet wypełnionych przez użytkowników
         object: odpowiedzi na ankiety
         title: Odpowiedzi na ankiety
     surveys:
       admin:
         exports:
-          survey_user_answers: Odpowiedzi na pytania użytkowników
+          survey_user_answers: Odpowiedzi użytkowników na pytania z ankiety
         surveys:
           update:
-            invalid: Podczas zapisywania ankiety wystąpiły błędy.
+            invalid: Podczas zapisywania ankiety wystąpił błąd.
             success: Ankieta została zapisana pomyślnie.
       last_activity:
-        new_survey_at_html: "<span>Nowa ankieta na %{link}</span>"
+        new_survey_at_html: "<span>Nowa ankieta %{link}</span>"
       surveys:
         answer:
-          invalid: Podczas odpowiadania na ankiet pojawiły się błędy.
-          spam_detected: Wystąpił błąd podczas udzielania odpowiedzi w formularzu. Spróbuj ponownie.
-          success: Twoja ankieta została przesłana.
+          invalid: Podczas wypełniania ankiety pojawił się błąd.
+          spam_detected: Wystąpił błąd podczas wypełniania formularza. Być może zostało to zrobione zbyt szybko, czy możesz spróbować ponownie?
+          success: Twoja ankieta została wypełniona.

data/config/locales/pt.yml

@@ -20,6 +20,7 @@ pt:
         settings:
           global:
             announcement: Anúncio
+            clean_after_publish: Eliminar respostas ao publicar o inquérito
           step:
             allow_answers: Permitir respostas
             allow_unregistered: Permitir que utilizadores não registados respondam ao inquérito

data/config/locales/ro-RO.yml

@@ -22,6 +22,7 @@ ro:
         settings:
           global:
             announcement: Anunţ
+            clean_after_publish: Ștergeți răspunsurile la publicarea sondajului
           step:
             allow_answers: Permite răspunsuri
             allow_unregistered: Permite utilizatorilor neînregistrați să răspundă la chestionar

data/config/locales/so-SO.yml

@@ -0,0 +1 @@
+so:

data/config/locales/sv.yml

@@ -20,6 +20,7 @@ sv:
         settings:
           global:
             announcement: Meddelande
+            clean_after_publish: Ta bort svar vid publicering av enkäten
           step:
             allow_answers: Tillåt svar
             allow_unregistered: Tillåt ej registrerade användare att besvara enkäten

data/config/locales/ti-ER.yml

@@ -0,0 +1 @@
+ti:

data/config/locales/vi-VN.yml

@@ -0,0 +1 @@
+vi:

data/config/locales/vi.yml

@@ -0,0 +1 @@
+vi:

data/config/locales/zh-CN.yml

@@ -0,0 +1,60 @@
+zh-CN:
+  activemodel:
+    models:
+      decidim/surveys/closed_survey_event: 调查结束
+      decidim/surveys/opened_survey_event: 调查已开始
+  activerecord:
+    models:
+      decidim/surveys/survey:
+        other: 调查
+      decidim/surveys/survey_answer:
+        other: 答案
+  decidim:
+    components:
+      surveys:
+        actions:
+          answer: 答案
+        name: 调查
+        settings:
+          global:
+            announcement: 通 知
+            clean_after_publish: 在发布调查时删除答案
+            scope_id: 范围
+            scopes_enabled: 范围已启用
+          step:
+            allow_answers: 允许答案
+            allow_unregistered: 允许未注册用户回答调查
+            allow_unregistered_help: 如果激活，将不需要登录才能回答调查。 这可能导致数据不准确或不可靠，更容易受到自动攻击。请谨慎使用！
+            announcement: 通 知
+    events:
+      surveys:
+        survey_closed:
+          email_intro: '%{resource_title} 在 %{participatory_space_title} 中的调查已被关闭。'
+          email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
+          email_subject: 调查已在 %{participatory_space_title} 完成
+          notification_title: 调查 <a href="%{resource_path}">%{resource_title}</a> 在 <a href="%{participatory_space_url}">%{participatory_space_title}</a> 已完成。
+        survey_opened:
+          email_intro: '调查 %{resource_title} %{participatory_space_title} 现已打开。您可以从这个页面参与：'
+          email_outro: 您收到此通知是因为您正在关注 %{participatory_space_title}。您可以停止收到跟随上一个链接的通知。
+          email_subject: '%{participatory_space_title} 的新调查'
+          notification_title: <a href="%{resource_path}">%{resource_title}</a> 在 <a href="%{participatory_space_url}">%{participatory_space_title}</a> 中的调查现已打开。
+    metrics:
+      survey_answers:
+        description: 参与者回答的调查次数
+        object: 调查答案
+        title: 对调查的答复
+    surveys:
+      admin:
+        exports:
+          survey_user_answers: 调查参与者答案
+        surveys:
+          update:
+            invalid: 保存调查时出现问题。
+            success: 调查保存成功。
+      last_activity:
+        new_survey_at_html: "<span>在 %{link}上的新调查</span>"
+      surveys:
+        answer:
+          invalid: 回答调查时出现问题。
+          spam_detected: 回答表单时出现问题。可能你太快了，你可以再试一次吗？
+          success: 调查回答成功。

data/config/locales/zh-TW.yml

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

data/db/migrate/20200609090533_check_legacy_tables.rb

@@ -109,5 +109,6 @@ class CheckLegacyTables < ActiveRecord::Migration[5.2]
     end
   end
 end
+
 # rubocop:enable Style/GuardClause
 # rubocop:enable Rails/Output

data/lib/decidim/surveys/admin_engine.rb

@@ -10,10 +10,20 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        get "/answer/:session_token", to: "surveys#show", as: :show_survey
+        get "/answer/:session_token/export", to: "surveys#export_response", as: :export_response_survey
+        get "/answers", to: "surveys#index", as: :index_survey
+        get "/answer_options", to: "surveys#answer_options", as: :answer_options_survey
         put "/", to: "surveys#update", as: :survey
         root to: "surveys#edit"
       end
 
+      initializer "decidim.notifications.components" do
+        Decidim::EventsManager.subscribe(/^decidim\.events\.components/) do |event_name, data|
+          CleanSurveyAnswersJob.perform_later(event_name, data)
+        end
+      end
+
       def load_seed
         nil
       end

data/lib/decidim/surveys/component.rb

@@ -43,7 +43,7 @@ Decidim.register_component(:surveys) do |component|
     surveys.count
   end
 
-  component.register_stat :answers_count, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
+  component.register_stat :answers_count, primary: true, priority: Decidim::StatsRegistry::MEDIUM_PRIORITY do |components, start_at, end_at|
     surveys = Decidim::Surveys::Survey.includes(:questionnaire).where(component: components)
     answers = Decidim::Forms::Answer.where(questionnaire: surveys.map(&:questionnaire))
     answers = answers.where("created_at >= ?", start_at) if start_at.present?
@@ -55,7 +55,10 @@ Decidim.register_component(:surveys) do |component|
   component.actions = %w(answer)
 
   component.settings(:global) do |settings|
+    settings.attribute :scopes_enabled, type: :boolean, default: false
+    settings.attribute :scope_id, type: :scope
     settings.attribute :announcement, type: :text, translated: true, editor: true
+    settings.attribute :clean_after_publish, type: :boolean, default: true
   end
 
   component.settings(:step) do |settings|
@@ -70,6 +73,8 @@ Decidim.register_component(:surveys) do |component|
       Decidim::Forms::QuestionnaireUserAnswers.for(survey.questionnaire)
     end
 
+    exports.formats %w(CSV JSON Excel FormPDF)
+
     exports.serializer Decidim::Forms::UserAnswersSerializer
   end
 
@@ -117,24 +122,33 @@ Decidim.register_component(:surveys) do |component|
       visibility: "all"
     )
 
-    %w(short_answer long_answer).each do |text_question_type|
+    %w(short_answer long_answer).each_with_index do |text_question_type, index|
       Decidim::Forms::Question.create!(
         questionnaire: questionnaire,
         body: Decidim::Faker::Localized.paragraph,
-        question_type: text_question_type
+        question_type: text_question_type,
+        position: index
       )
     end
 
-    %w(single_option multiple_option).each do |multiple_choice_question_type|
+    %w(single_option multiple_option).each_with_index do |multiple_choice_question_type, index|
       question = Decidim::Forms::Question.create!(
         questionnaire: questionnaire,
         body: Decidim::Faker::Localized.paragraph,
-        question_type: multiple_choice_question_type
+        question_type: multiple_choice_question_type,
+        position: index + 2
       )
 
       3.times do
         question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
       end
+
+      question.display_conditions.create!(
+        condition_question: questionnaire.questions.find_by(position: question.position - 2),
+        question: question,
+        condition_type: :answered,
+        mandatory: true
+      )
     end
 
     %w(matrix_single matrix_multiple).each do |matrix_question_type|

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

@@ -12,7 +12,7 @@ FactoryBot.define do
   end
 
   factory :survey, class: "Decidim::Surveys::Survey" do
-    questionnaire { build(:questionnaire) }
+    questionnaire { build(:questionnaire, :with_questions) }
     component { build(:surveys_component) }
   end
 end

data/lib/decidim/surveys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.22.0
+  version: 0.23.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,70 +18,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
+- !ruby/object:Gem::Dependency
+  name: decidim-templates
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 0.23.0
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -103,6 +117,7 @@ files:
 - app/events/decidim/surveys/closed_survey_event.rb
 - app/events/decidim/surveys/opened_survey_event.rb
 - app/helpers/decidim/surveys/survey_helper.rb
+- app/jobs/decidim/surveys/clean_survey_answers_job.rb
 - app/jobs/decidim/surveys/settings_change_job.rb
 - app/models/decidim/surveys/application_record.rb
 - app/models/decidim/surveys/survey.rb
@@ -115,22 +130,27 @@ files:
 - app/types/decidim/surveys/survey_type.rb
 - app/types/decidim/surveys/surveys_type.rb
 - app/views/decidim/surveys/surveys/no_permission.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
@@ -140,16 +160,24 @@ files:
 - 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/lv-LV.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
@@ -158,10 +186,16 @@ files:
 - 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_surveys.rb
 - db/migrate/20170515090916_create_decidim_survey_questions.rb
 - db/migrate/20170515144119_create_decidim_survey_answers.rb
@@ -204,14 +238,14 @@ 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'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Decidim surveys module