decidim-surveys 0.14.4 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 489cb19ce6c304379f2352864349c0cc7a053fcdfbe90a8990e5c1535096fd25
-  data.tar.gz: 898e2ba19ffff3a96a71820e0695d984230536a04be175816564be395d4e9f28
+  metadata.gz: ab880c5579f03c8c0f088a43b0afe39904e410e720ef4180ec9400fd3af64178
+  data.tar.gz: bdbbe058f4fe8aaec83590ab7c4b72742f6d6474ff86ad64c35eba30b57ddf61
 SHA512:
-  metadata.gz: cf28d2c6f5e3aae3f5af02b0ef4e2e41a6ee8a1403835ad331e799cc48a662c6fad68aa0464a3402c7b05ebd088b65b48bb8612a94e48b87829922bdea0c2019
-  data.tar.gz: a662eb26894ee4d4a3a2586ef1fd0e3197c3fcbbc6a119de7229f3ef3efd0d1d1ba57a99206f2d9c52f4c663603517dd2622363bc97d531853d0e727c2fe97ff
+  metadata.gz: a64b7e5de0a22af66fbb5309a01835923409f16d1e15a96dc5036a1c3524539af60cca312975f3b0571462cbbc626f2d5c7cf44dc6da4685a89c65d79081808f
+  data.tar.gz: 32f930fe24eebd905533bfdee3ff8db902f27afa8e27baf6666c637b433085d1361a1b15d7a02658de79295c6b5324104c45f40644686d5a69642cccd1e18a64

data/app/cells/decidim/surveys/survey_activity_cell.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    # A cell to display when a Survey has been published.
+    class SurveyActivityCell < ActivityCell
+      include Decidim::ComponentPathHelper
+
+      def title
+        I18n.t(
+          "decidim.surveys.last_activity.new_survey_at_html",
+          link: participatory_space_link
+        )
+      end
+
+      def activity_link_path
+        main_component_path(component)
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Decidim
       end
 
       def self.export_serializer
-        Decidim::Surveys::SurveyUserAnswersSerializer
+        Decidim::Surveys::DataPortabilitySurveyUserAnswersSerializer
       end
 
       private

data/config/locales/ca.yml

@@ -85,6 +85,8 @@ ca:
           update:
             invalid: Hi ha hagut errors en desar l'enquesta.
             success: Enquesta desada correctament.
+      last_activity:
+        new_survey_at_html: "<span>Nova enquesta a %{link}</span>"
       question_types:
         long_answer: Resposta llarga
         multiple_option: Opció múltiple

data/config/locales/de.yml

@@ -85,6 +85,8 @@ de:
           update:
             invalid: Beim Speichern der Umfrage sind Fehler aufgetreten.
             success: Umfrage wurde erfolgreich gespeichert.
+      last_activity:
+        new_survey_at_html: "<span>Neue Umfrage bei %{link}</span>"
       question_types:
         long_answer: Lange Antwort
         multiple_option: Mehrere Optionen

data/config/locales/en.yml

@@ -86,6 +86,8 @@ en:
           update:
             invalid: There's been errors when saving the survey.
             success: Survey saved successfully.
+      last_activity:
+        new_survey_at_html: "<span>New survey at %{link}</span>"
       question_types:
         long_answer: Long answer
         multiple_option: Multiple option

data/config/locales/es-PY.yml

@@ -2,7 +2,7 @@ es-PY:
   activemodel:
     attributes:
       survey_answer:
-        body: Respuesta
+        body: Responder
       survey_question:
         mandatory: Obligatorio
         max_choices: Número máximo de opciones
@@ -85,6 +85,8 @@ es-PY:
           update:
             invalid: Se han producido errores al guardar la encuesta.
             success: Encuesta guardada correctamente.
+      last_activity:
+        new_survey_at_html: "<span>Nueva encuesta en %{link}</span>"
       question_types:
         long_answer: Respuesta larga
         multiple_option: Opción múltiple

data/config/locales/es.yml

@@ -2,7 +2,7 @@ es:
   activemodel:
     attributes:
       survey_answer:
-        body: Respuesta
+        body: Responder
       survey_question:
         mandatory: Obligatorio
         max_choices: Número máximo de opciones
@@ -85,6 +85,8 @@ es:
           update:
             invalid: Se han producido errores al guardar la encuesta.
             success: Encuesta guardada correctamente.
+      last_activity:
+        new_survey_at_html: "<span>Nueva encuesta en %{link}</span>"
       question_types:
         long_answer: Respuesta larga
         multiple_option: Opción múltiple

data/config/locales/eu.yml

@@ -85,6 +85,8 @@ eu:
           update:
             invalid: Inkesta gordetzean erroreak gertatu dira.
             success: Inkesta ondo gorde da.
+      last_activity:
+        new_survey_at_html: "<span>Inkesta berrian %{link}</span>"
       question_types:
         long_answer: Erantzun luzea
         multiple_option: Aukera anitz

data/config/locales/fi.yml

@@ -2,7 +2,7 @@ fi:
   activemodel:
     attributes:
       survey_answer:
-        body: Vastaa
+        body: Vastaus
       survey_question:
         mandatory: Pakollinen
         max_choices: Valintojen enimmäismäärä
@@ -85,6 +85,8 @@ fi:
           update:
             invalid: Kyselyn tallennus epäonnistui.
             success: Kysely tallennettu onnistuneesti.
+      last_activity:
+        new_survey_at_html: "<span>Uusi kysely osoitteessa %{link}</span>"
       question_types:
         long_answer: Pitkä vastaus
         multiple_option: Useita vaihtoehtoja

data/config/locales/fr.yml

@@ -85,6 +85,8 @@ fr:
           update:
             invalid: Erreurs lors de la sauvegarde de l'enquête.
             success: Enquête enregistrée avec succès.
+      last_activity:
+        new_survey_at_html: "<span>Nouvelle enquête à %{link}</span>"
       question_types:
         long_answer: Réponse longue
         multiple_option: Options multiples

data/config/locales/gl.yml

@@ -85,6 +85,8 @@ gl:
           update:
             invalid: Houbo erros ao gardar a enquisa.
             success: A enquisa gardouse correctamente.
+      last_activity:
+        new_survey_at_html: "<span>Nova enquisa en %{link}</span>"
       question_types:
         long_answer: Resposta longa
         multiple_option: Múltipla opción

data/config/locales/hu.yml

@@ -15,7 +15,7 @@ hu:
               missing: nincs befejezve
               too_many: túl sok
     models:
-      decidim/surveys/closed_survey_event: Felmérés vége
+      decidim/surveys/closed_survey_event: A felmérés véget ért
       decidim/surveys/opened_survey_event: Felmérés elindult
   activerecord:
     models:
@@ -85,6 +85,8 @@ hu:
           update:
             invalid: Hiba történt a felmérés mentése során.
             success: Felmérés mentése sikeres.
+      last_activity:
+        new_survey_at_html: "<span>Új felmérés %{link}</span>kor"
       question_types:
         long_answer: Hosszú válasz
         multiple_option: Több lehetőség

data/config/locales/it.yml

@@ -85,6 +85,8 @@ it:
           update:
             invalid: Ci sono stati degli errori durante il salvataggio dell'indagine.
             success: Il questionario è stato salvato correttamente.
+      last_activity:
+        new_survey_at_html: "<span>Nuovo sondaggio al %{link}</span>"
       question_types:
         long_answer: Risposta lunga
         multiple_option: Opzione multipla

data/config/locales/nl.yml

@@ -2,7 +2,7 @@ nl:
   activemodel:
     attributes:
       survey_answer:
-        body: Antwoord
+        body: Antwoorden
       survey_question:
         mandatory: Verplicht
         max_choices: Maximum aantal keuzes
@@ -85,6 +85,8 @@ nl:
           update:
             invalid: Er zijn fouten geweest 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>"
       question_types:
         long_answer: Lang antwoord
         multiple_option: Meerdere opties

data/config/locales/pl.yml

@@ -89,6 +89,8 @@ pl:
           update:
             invalid: Podczas zapisywania ankiety wystąpiły błędy.
             success: Ankieta została zapisana pomyślnie.
+      last_activity:
+        new_survey_at_html: "<span>Nowa ankieta na %{link}</span>"
       question_types:
         long_answer: Długa odpowiedź
         multiple_option: Wiele opcji

data/config/locales/pt-BR.yml

@@ -2,7 +2,7 @@ pt-BR:
   activemodel:
     attributes:
       survey_answer:
-        body: Resposta
+        body: Responda
       survey_question:
         mandatory: Obrigatório
         max_choices: Número máximo de escolhas
@@ -85,6 +85,8 @@ 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>"
       question_types:
         long_answer: Resposta longa
         multiple_option: Opção múltipla

data/config/locales/pt.yml

@@ -2,7 +2,7 @@ pt:
   activemodel:
     attributes:
       survey_answer:
-        body: Resposta
+        body: Responda
       survey_question:
         mandatory: Obrigatório
         max_choices: Número máximo de escolhas
@@ -85,6 +85,8 @@ pt:
           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>"
       question_types:
         long_answer: Resposta longa
         multiple_option: Opção múltipla

data/config/locales/ru.yml

@@ -2,7 +2,7 @@ ru:
   activemodel:
     attributes:
       survey_answer:
-        body: Ответить
+        body: Ответ
       survey_question:
         mandatory: Обязательно
         max_choices: Максимальное количество вариантов

data/config/locales/sv.yml

@@ -2,7 +2,7 @@ sv:
   activemodel:
     attributes:
       survey_answer:
-        body: Svar
+        body: Svara
       survey_question:
         mandatory: Obligatorisk
         max_choices: Max antal val
@@ -85,6 +85,8 @@ sv:
           update:
             invalid: Det har blivit fel när du sparat enkäten.
             success: Enkäten sparades.
+      last_activity:
+        new_survey_at_html: "<span>Ny undersökning vid %{link}</span>"
       question_types:
         long_answer: Långt svar
         multiple_option: Flera alternativ

data/config/locales/uk.yml

@@ -2,7 +2,7 @@ uk:
   activemodel:
     attributes:
       survey_answer:
-        body: Відповісти
+        body: Відповідь
       survey_question:
         mandatory: Обов’язкове поле
         max_choices: Гранична кількість варіантів

data/lib/decidim/surveys.rb

@@ -10,5 +10,6 @@ module Decidim
   # allows users to create surveys in a participatory process.
   module Surveys
     autoload :SurveyUserAnswersSerializer, "decidim/surveys/survey_user_answers_serializer"
+    autoload :DataPortabilitySurveyUserAnswersSerializer, "decidim/surveys/data_portability_survey_user_answers_serializer"
   end
 end

data/lib/decidim/surveys/component.rb

@@ -9,6 +9,12 @@ Decidim.register_component(:surveys) do |component|
   component.stylesheet = "decidim/surveys/surveys"
   component.permissions_class_name = "Decidim::Surveys::Permissions"
 
+  component.on(:copy) do |context|
+    Decidim::Surveys::CreateSurvey.call(context[:new_component]) do
+      on(:invalid) { raise "Can't create survey" }
+    end
+  end
+
   component.on(:create) do |instance|
     Decidim::Surveys::CreateSurvey.call(instance) do
       on(:invalid) { raise "Can't create survey" }
@@ -62,14 +68,28 @@ Decidim.register_component(:surveys) do |component|
   end
 
   component.seeds do |participatory_space|
-    component = Decidim::Component.create!(
+    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
 
-    survey = Decidim::Surveys::Survey.create!(
+    params = {
       component: component,
       title: Decidim::Faker::Localized.paragraph,
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
@@ -78,6 +98,13 @@ Decidim.register_component(:surveys) do |component|
       tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
         Decidim::Faker::Localized.paragraph(2)
       end
+    }
+
+    survey = Decidim.traceability.create!(
+      Decidim::Surveys::Survey,
+      admin_user,
+      params,
+      visibility: "all"
     )
 
     %w(short_answer long_answer).each do |text_question_type|

data/lib/decidim/surveys/data_portability_survey_user_answers_serializer.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    class DataPortabilitySurveyUserAnswersSerializer < Decidim::Exporters::Serializer
+      include Decidim::TranslationsHelper
+      # Serializes a Survey User Answer for data portability
+      def serialize
+        {
+          id: resource.id,
+          user: {
+            name: resource.user.name,
+            email: resource.user.email
+          },
+          survey: {
+            id: resource.question.survey.id,
+            title: translated_attribute(resource.question.survey.title),
+            description: translated_attribute(resource.question.survey.description),
+            tos: translated_attribute(resource.question.survey.tos)
+          },
+          question: {
+            id: resource.question.id,
+            body: translated_attribute(resource.question.body),
+            description: translated_attribute(resource.question.description)
+          },
+          answer: normalize_body(resource)
+        }
+      end
+
+      private
+
+      def normalize_body(resource)
+        resource.body || resource.choices.pluck(:body)
+      end
+    end
+  end
+end

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

@@ -11,13 +11,13 @@ FactoryBot.define do
   end
 
   factory :survey, class: Decidim::Surveys::Survey do
-    title { Decidim::Faker::Localized.sentence }
+    title { generate_localized_title }
     description do
       Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.sentence(4)
+        generate_localized_title
       end
     end
-    tos { Decidim::Faker::Localized.sentence(4) }
+    tos { generate_localized_title }
     component { build(:surveys_component) }
   end
 
@@ -26,7 +26,7 @@ FactoryBot.define do
       answer_options { [] }
     end
 
-    body { Decidim::Faker::Localized.sentence }
+    body { generate_localized_title }
     mandatory { false }
     position { 0 }
     question_type { Decidim::Surveys::SurveyQuestion::TYPES.first }
@@ -50,7 +50,7 @@ FactoryBot.define do
   end
 
   factory :survey_answer_option, class: Decidim::Surveys::SurveyAnswerOption do
-    body { Decidim::Faker::Localized.sentence }
+    body { generate_localized_title }
   end
 
   factory :survey_answer_choice, class: Decidim::Surveys::SurveyAnswerChoice do

data/lib/decidim/surveys/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.4
+        version: 0.15.0
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -89,6 +89,7 @@ files:
 - app/assets/javascripts/decidim/surveys/option_attached_inputs.component.js.es6
 - app/assets/javascripts/decidim/surveys/surveys.js.es6
 - app/assets/stylesheets/decidim/surveys/surveys.scss
+- app/cells/decidim/surveys/survey_activity_cell.rb
 - app/commands/decidim/surveys/admin/update_survey.rb
 - app/commands/decidim/surveys/answer_survey.rb
 - app/commands/decidim/surveys/create_survey.rb
@@ -159,6 +160,7 @@ files:
 - lib/decidim/surveys/admin.rb
 - lib/decidim/surveys/admin_engine.rb
 - lib/decidim/surveys/component.rb
+- lib/decidim/surveys/data_portability_survey_user_answers_serializer.rb
 - lib/decidim/surveys/engine.rb
 - lib/decidim/surveys/survey_user_answers_serializer.rb
 - lib/decidim/surveys/test/factories.rb
@@ -183,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Decidim surveys module