decidim-surveys 0.27.5 → 0.28.0.rc4

data/config/locales/lv.yml

@@ -52,10 +52,7 @@ lv:
           update:
             invalid: Saglabājot aptauju, radās problēma.
             success: Aptauja ir veiksmīgi saglabāta
-      last_activity:
-        new_survey_at_html: "<span>Jauna aptauja %{link}</span>"
       surveys:
         answer:
           invalid: Atbildot uz aptauju, radās problēma.
-          spam_detected: Atbildot uz aptaujas jautājumiem, radās problēma. Varbūt jūs esat rīkojies pārāk ātri, vai varat mēģināt vēlreiz?
           success: Uz aptaujas jautājumiem ir veiksmīgi atbildēts.

data/config/locales/nl.yml

@@ -59,10 +59,7 @@ nl:
           update:
             invalid: Er is een probleem opgetreden bij het opslaan van de enquête.
             success: Enquête succesvol opgeslagen.
-      last_activity:
-        new_survey_at_html: "<span>Nieuwe enquête op %{link}</span>"
       surveys:
         answer:
           invalid: Er is een fout opgetreden bij het opslaan van de pagina.
-          spam_detected: Er was een probleem bij het beantwoorden van het formulier. Misschien bent u te snel geweest, kunt u het opnieuw proberen?
           success: Enquête met succes beantwoord.

data/config/locales/no.yml

@@ -59,10 +59,7 @@
           update:
             invalid: Det oppstod et problem med å lagre undersøkelsen.
             success: Undersøkelsen ble lagret.
-      last_activity:
-        new_survey_at_html: "<span>Ny undersøkelse på %{link}</span>"
       surveys:
         answer:
           invalid: Det oppstod et problem med å svare på undersøkelsen.
-          spam_detected: Det oppstod et problem med å svare på skjemaet. Kanskje du har vært for rask, kan du prøve igjen?
           success: Undersøkelsen ble besvart.

data/config/locales/pl.yml

@@ -63,10 +63,7 @@ pl:
           update:
             invalid: Podczas zapisywania ankiety wystąpił błąd.
             success: Ankieta została zapisana pomyślnie.
-      last_activity:
-        new_survey_at_html: "<span>Nowa ankieta %{link}</span>"
       surveys:
         answer:
           invalid: Podczas wypełniania ankiety wystąpił 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-BR.yml

@@ -31,7 +31,6 @@ pt-BR:
           step:
             allow_answers: Permitir respostas
             allow_unregistered: Permitir que usuários não registrados respondam à pesquisa
-            allow_unregistered_help: Se ativo, nenhum login será necessário para responder a pesquisa. Isso pode levar a dados ruins ou não confiáveis e será mais vulnerável a ataques automatizados. Usar com cuidado! Lembre-se de que um usuário pode responder à mesma pesquisa várias vezes, usando navegadores diferentes ou a função "navegação privada" de seu navegador.
             announcement: Anúncio
     events:
       surveys:
@@ -60,10 +59,7 @@ pt-BR:
           update:
             invalid: Houve erros ao salvar a pesquisa.
             success: Pesquisa salva com sucesso.
-      last_activity:
-        new_survey_at_html: "<span>Nova pesquisa em %{link}</span>"
       surveys:
         answer:
           invalid: Houve erros ao responder a pesquisa.
-          spam_detected: Houve algum problema ao responder ao formulário. Talvez você tenha sido rápido demais, pode tentar novamente?
           success: Pesquisa respondida com sucesso.

data/config/locales/pt.yml

@@ -59,10 +59,7 @@ pt:
           update:
             invalid: Ocorreu um problema ao guardar o inquérito.
             success: Inquérito guardado corretamente.
-      last_activity:
-        new_survey_at_html: "<span>Novo inquérito em %{link}</span>"
       surveys:
         answer:
           invalid: Ocorreu um problema ao responder ao inquérito.
-          spam_detected: Ocorreu um problema ao responder ao formulário. Talvez tenha sido demasiado rápido, pode tentar novamente?
           success: Inquérito respondido corretamente.

data/config/locales/ro-RO.yml

@@ -63,9 +63,9 @@ ro:
             invalid: A apărut o eroare la salvarea sondajului.
             success: Sondajul a fost salvat cu succes.
       last_activity:
-        new_survey_at_html: "<span>Sondaj nou la %{link}</span>"
+        new_survey: 'Sondaj nou:'
       surveys:
         answer:
           invalid: A apărut o problemă în timpul răspunsului pentru sondaj.
-          spam_detected: A apărut o problemă în timpul răspunsului pentru sondaj. Poate ai fost prea rapid, poţi încerca din nou?
+          spam_detected: A apărut o problemă la completarea formularului. Poate că ați fost prea rapid(ă), puteți încerca din nou?
           success: Răspunsul pentru sondaj a fost înregistrat cu succes.

data/config/locales/sk.yml

@@ -54,10 +54,7 @@ sk:
           update:
             invalid: Vyskytol sa problém s ukladaním prieskumu.
             success: Prieskum úspešne uložený.
-      last_activity:
-        new_survey_at_html: "<span>Nový prieskum na %{link}</span>"
       surveys:
         answer:
           invalid: Vyskytol sa problém s odpovedaním na prieskum.
-          spam_detected: Vyskytol sa problém s odpovedaním na formulár. Možno ste boli príliš rýchli, skúste prosíme znovu.
           success: Odpoveď úspešne zaznamenaná.

data/config/locales/sv.yml

@@ -60,10 +60,7 @@ sv:
           update:
             invalid: Det gick inte att spara enkäten.
             success: Enkäten har sparats.
-      last_activity:
-        new_survey_at_html: "<span>Ny enkät på %{link}</span>"
       surveys:
         answer:
           invalid: Det gick inte att besvara enkäten.
-          spam_detected: Det gick inte att svara på formuläret. Du hade kanske för bråttom, kan du försöka igen?
           success: Enkäten har besvarats.

data/config/locales/tr-TR.yml

@@ -57,10 +57,7 @@ tr:
           update:
             invalid: Anketi kaydederken bir sorun oluştu.
             success: Anket başarıyla kaydedildi.
-      last_activity:
-        new_survey_at_html: "<span> %{link}</span> linkinde yeni anket"
       surveys:
         answer:
           invalid: Anketi cevaplarken bir sorun oluştu.
-          spam_detected: Formu yanıtlarken bir sorun oluştu. Belki çok hızlı davrandın, tekrar deneyebilir misin?
           success: Anket başarıyla cevaplandı.

data/config/locales/zh-CN.yml

@@ -51,10 +51,7 @@ zh-CN:
           update:
             invalid: 保存调查时出现问题。
             success: 调查保存成功。
-      last_activity:
-        new_survey_at_html: "<span>在 %{link}上的新调查</span>"
       surveys:
         answer:
           invalid: 回答调查时出现问题。
-          spam_detected: 回答表单时出现问题。可能你太快了，你可以再试一次吗？
           success: 调查回答成功。

data/config/locales/zh-TW.yml

@@ -59,9 +59,9 @@ zh-TW:
             invalid: 儲存問卷時出現問題。
             success: 問卷成功儲存
       last_activity:
-        new_survey_at_html: "<span>在 %{link} 上有新的調查</span>"
+        new_survey: '新問卷調查'
       surveys:
         answer:
           invalid: 回答問卷時出現問題。
-          spam_detected: 填寫表單時發生問題。也許您填寫得太快了，可以再試一次嗎?
+          spam_detected: 回答表單時出現問題。也許您回答太快了，可以再試一次嗎?
           success: 問卷回答成功。

data/db/migrate/20200609090533_check_legacy_tables.rb

@@ -28,7 +28,7 @@ class CheckLegacyTables < ActiveRecord::Migration[5.2]
         puts "Migrate or backup your data and then remove the following raise statement to continue with the migrations (that will remove surveys legacy tables)"
         puts "For migrating your data you can do that with the command:"
         puts "bundle exec rake decidim_surveys:migrate_data_to_decidim_forms"
-        raise "ERROR:  there's the risk to loose legacy information from old surveys!"
+        raise "ERROR:  there is the risk to loose legacy information from old surveys!"
       end
     end
   end
@@ -61,7 +61,7 @@ class CheckLegacyTables < ActiveRecord::Migration[5.2]
           puts "Migrating question #{survey_question.id}..."
 
           question = ::Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
+            questionnaire:,
             position: survey_question.position,
             question_type: survey_question.question_type,
             mandatory: survey_question.mandatory,
@@ -77,7 +77,7 @@ class CheckLegacyTables < ActiveRecord::Migration[5.2]
 
           AnswerOption.where(decidim_survey_question_id: survey_question.id).find_each do |survey_answer_option|
             answer_option_mapping[survey_answer_option.id] = ::Decidim::Forms::AnswerOption.create!(
-              question: question,
+              question:,
               body: survey_answer_option.body,
               free_text: survey_answer_option.free_text
             )
@@ -85,8 +85,8 @@ class CheckLegacyTables < ActiveRecord::Migration[5.2]
 
           Answer.where(decidim_survey_id: survey.id, decidim_survey_question_id: survey_question.id).find_each do |survey_answer|
             answer = ::Decidim::Forms::Answer.new(
-              questionnaire: questionnaire,
-              question: question,
+              questionnaire:,
+              question:,
               decidim_user_id: survey_answer.decidim_user_id,
               body: survey_answer.body,
               created_at: survey_answer.created_at,

data/lib/decidim/surveys/admin_engine.rb

@@ -18,7 +18,7 @@ module Decidim
         root to: "surveys#edit"
       end
 
-      initializer "decidim.notifications.components" do
+      initializer "decidim_surveys_admin.notifications.components" do
         config.to_prepare do
           Decidim::EventsManager.subscribe(/^decidim\.events\.components/) do |event_name, data|
             CleanSurveyAnswersJob.perform_later(event_name, data)

data/lib/decidim/surveys/component.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
-require "decidim/components/namer"
-
 Decidim.register_component(:surveys) do |component|
   component.engine = Decidim::Surveys::Engine
   component.admin_engine = Decidim::Surveys::AdminEngine
   component.icon = "media/images/decidim_surveys.svg"
+  component.icon_key = "survey-line"
   component.stylesheet = "decidim/surveys/surveys"
   component.permissions_class_name = "Decidim::Surveys::Permissions"
   component.serializes_specific_data = true
@@ -15,13 +14,13 @@ Decidim.register_component(:surveys) do |component|
 
   component.on(:copy) do |context|
     Decidim::Surveys::CreateSurvey.call(context[:new_component]) do
-      on(:invalid) { raise "Can't create survey" }
+      on(:invalid) { raise "Cannot create survey" }
     end
   end
 
   component.on(:create) do |instance|
     Decidim::Surveys::CreateSurvey.call(instance) do
-      on(:invalid) { raise "Can't create survey" }
+      on(:invalid) { raise "Cannot create survey" }
     end
   end
 
@@ -33,7 +32,7 @@ Decidim.register_component(:surveys) do |component|
     survey = Decidim::Surveys::Survey.find_by(decidim_component_id: instance.id)
     survey_answers_for_component = Decidim::Forms::Answer.where(questionnaire: survey.questionnaire)
 
-    raise "Can't destroy this component when there are survey answers" if survey_answers_for_component.any?
+    raise "Cannot destroy this component when there are survey answers" if survey_answers_for_component.any?
   end
 
   component.register_resource(:survey) do |resource|
@@ -85,90 +84,8 @@ Decidim.register_component(:surveys) do |component|
   end
 
   component.seeds do |participatory_space|
-    admin_user = Decidim::User.find_by(
-      organization: participatory_space.organization,
-      email: "admin@example.org"
-    )
-
-    params = {
-      name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :surveys).i18n_name,
-      manifest_name: :surveys,
-      published_at: Time.current,
-      participatory_space: participatory_space
-    }
-
-    component = Decidim.traceability.perform_action!(
-      "publish",
-      Decidim::Component,
-      admin_user,
-      visibility: "all"
-    ) do
-      Decidim::Component.create!(params)
-    end
-
-    questionnaire = Decidim::Forms::Questionnaire.new(
-      title: Decidim::Faker::Localized.paragraph,
-      description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 3)
-      end,
-      tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(sentence_count: 2)
-      end
-    )
-
-    params = {
-      component: component,
-      questionnaire: questionnaire
-    }
-
-    Decidim.traceability.create!(
-      Decidim::Surveys::Survey,
-      admin_user,
-      params,
-      visibility: "all"
-    )
-
-    %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,
-        position: index
-      )
-    end
+    require "decidim/surveys/seeds"
 
-    %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,
-        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_with_index do |matrix_question_type, index|
-      question = Decidim::Forms::Question.create!(
-        questionnaire: questionnaire,
-        body: Decidim::Faker::Localized.paragraph,
-        question_type: matrix_question_type,
-        position: index
-      )
-
-      3.times do |position|
-        question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
-        question.matrix_rows.create!(body: Decidim::Faker::Localized.sentence, position: position)
-      end
-    end
+    Decidim::Surveys::Seeds.new(participatory_space:).call
   end
 end

data/lib/decidim/surveys/engine.rb

@@ -18,7 +18,7 @@ module Decidim
         root to: "surveys#show"
       end
 
-      initializer "decidim_changes" do
+      initializer "decidim_surveys.settings_changes" do
         config.to_prepare do
           Decidim::SettingsChange.subscribe "surveys" do |changes|
             Decidim::Surveys::SettingsChangeJob.perform_later(
@@ -50,6 +50,24 @@ module Decidim
       initializer "decidim_surveys.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end
+
+      initializer "decidim_surveys.answers_email" do
+        config.to_prepare do
+          ActiveSupport::Notifications.subscribe("decidim.forms.answer_questionnaire:after") do |_event_name, data|
+            extra_data = data[:extra]
+            if data[:resource].questionnaire_for.instance_of?(::Decidim::Surveys::Survey)
+              component = data[:resource].questionnaire_for.component
+
+              answers = Decidim::Forms::QuestionnaireUserAnswers.for(data[:resource])
+              user_answers = answers.select { |a| a.first.session_token == extra_data[:session_token] }
+
+              if component.manifest_name == "surveys" && user_answers.present?
+                Decidim::Surveys::SurveyConfirmationMailer.confirmation(extra_data[:event_author], extra_data[:questionnaire], user_answers).deliver_later
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/decidim/surveys/seeds.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+require "decidim/components/namer"
+
+module Decidim
+  module Surveys
+    class Seeds
+      attr_reader :participatory_space
+
+      def initialize(participatory_space:)
+        @participatory_space = participatory_space
+      end
+
+      def call
+        admin_user = Decidim::User.find_by(
+          organization: participatory_space.organization,
+          email: "admin@example.org"
+        )
+
+        params = {
+          name: Decidim::Components::Namer.new(participatory_space.organization.available_locales, :surveys).i18n_name,
+          manifest_name: :surveys,
+          published_at: Time.current,
+          participatory_space:
+        }
+
+        component = Decidim.traceability.perform_action!(
+          "publish",
+          Decidim::Component,
+          admin_user,
+          visibility: "all"
+        ) do
+          Decidim::Component.create!(params)
+        end
+
+        questionnaire = Decidim::Forms::Questionnaire.new(
+          title: Decidim::Faker::Localized.paragraph,
+          description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 3)
+          end,
+          tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
+            Decidim::Faker::Localized.paragraph(sentence_count: 2)
+          end
+        )
+
+        params = {
+          component:,
+          questionnaire:
+        }
+
+        Decidim.traceability.create!(
+          Decidim::Surveys::Survey,
+          admin_user,
+          params,
+          visibility: "all"
+        )
+
+        %w(short_answer long_answer).each_with_index do |text_question_type, index|
+          Decidim::Forms::Question.create!(
+            questionnaire:,
+            body: Decidim::Faker::Localized.paragraph,
+            question_type: text_question_type,
+            position: index
+          )
+        end
+
+        %w(single_option multiple_option).each_with_index do |multiple_choice_question_type, index|
+          question = Decidim::Forms::Question.create!(
+            questionnaire:,
+            body: Decidim::Faker::Localized.paragraph,
+            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:,
+            condition_type: :answered,
+            mandatory: true
+          )
+        end
+
+        %w(matrix_single matrix_multiple).each_with_index do |matrix_question_type, index|
+          question = Decidim::Forms::Question.create!(
+            questionnaire:,
+            body: Decidim::Faker::Localized.paragraph,
+            question_type: matrix_question_type,
+            position: index
+          )
+
+          3.times do |position|
+            question.answer_options.create!(body: Decidim::Faker::Localized.sentence)
+            question.matrix_rows.create!(body: Decidim::Faker::Localized.sentence, position:)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/components/namer"
 require "decidim/core/test/factories"
 require "decidim/forms/test/factories"
 require "decidim/participatory_processes/test/factories"

data/lib/decidim/surveys/version.rb

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

data/lib/tasks/decidim_surveys_tasks.rake

@@ -42,7 +42,7 @@ namespace :decidim_surveys do
           puts "Migrating question #{survey_question.id}..."
 
           question = Decidim::Forms::Question.create!(
-            questionnaire: questionnaire,
+            questionnaire:,
             position: survey_question.position,
             question_type: survey_question.question_type,
             mandatory: survey_question.mandatory,
@@ -58,7 +58,7 @@ namespace :decidim_surveys do
 
           AnswerOption.where(decidim_survey_question_id: survey_question.id).find_each do |survey_answer_option|
             answer_option_mapping[survey_answer_option.id] = Decidim::Forms::AnswerOption.create!(
-              question: question,
+              question:,
               body: survey_answer_option.body,
               free_text: survey_answer_option.free_text
             )
@@ -66,8 +66,8 @@ namespace :decidim_surveys do
 
           Answer.where(decidim_survey_id: survey.id, decidim_survey_question_id: survey_question.id).find_each do |survey_answer|
             answer = Decidim::Forms::Answer.new(
-              questionnaire: questionnaire,
-              question: question,
+              questionnaire:,
+              question:,
               decidim_user_id: survey_answer.decidim_user_id,
               body: survey_answer.body,
               created_at: survey_answer.created_at,