decidim 0.5.1 → 0.6.0

data/decidim-results/spec/factories.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/core/test/factories"
+require "decidim/participatory_processes/test/factories"
 require "decidim/comments/test/factories"
 require "decidim/proposals/test/factories"
 require "decidim/meetings/test/factories"

data/decidim-results/spec/features/comments_spec.rb

@@ -4,13 +4,13 @@ require "spec_helper"
 
 describe "Comments", type: :feature, perform_enqueued: true do
   let!(:feature) { create(:result_feature, organization: organization) }
-  let!(:participatory_process) { feature.participatory_process }
+  let!(:participatory_space) { feature.participatory_space }
   let!(:participatory_process_admin) do
     user = create(:user, :confirmed, organization: organization)
     Decidim::ParticipatoryProcessUserRole.create!(
       role: :admin,
       user: user,
-      participatory_process: participatory_process
+      participatory_process: participatory_space
     )
     user
   end

data/decidim-results/spec/features/explore_results_spec.rb

@@ -117,7 +117,7 @@ describe "Explore results", type: :feature do
     context "with a category" do
       let(:result) do
         result = results.first
-        result.category = create :category, participatory_process: participatory_process
+        result.category = create :category, participatory_space: participatory_process
         result.save
         result
       end
@@ -184,7 +184,7 @@ describe "Explore results", type: :feature do
 
     context "with linked proposals" do
       let(:proposal_feature) do
-        create(:feature, manifest_name: :proposals, participatory_process: result.feature.participatory_process)
+        create(:feature, manifest_name: :proposals, participatory_space: result.feature.participatory_space)
       end
       let(:proposals) { create_list(:proposal, 3, feature: proposal_feature) }
 
@@ -205,7 +205,7 @@ describe "Explore results", type: :feature do
 
     context "with linked proposals" do
       let(:meeting_feature) do
-        create(:feature, manifest_name: :meetings, participatory_process: result.feature.participatory_process)
+        create(:feature, manifest_name: :meetings, participatory_space: result.feature.participatory_space)
       end
       let(:meetings) { create_list(:meeting, 3, feature: meeting_feature) }
 

data/decidim-results/spec/features/follow_result_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+describe "Follow results", type: :feature do
+  let(:manifest_name) { "results" }
+
+  let!(:followable) do
+    create(:result, feature: feature)
+  end
+
+  include_examples "follows"
+end

data/decidim-results/spec/forms/result_form_spec.rb

@@ -13,7 +13,7 @@ describe Decidim::Results::Admin::ResultForm do
     }
   end
   let(:participatory_process) { create :participatory_process, organization: organization }
-  let(:current_feature) { create :feature, participatory_process: participatory_process, manifest_name: "results" }
+  let(:current_feature) { create :feature, participatory_space: participatory_process, manifest_name: "results" }
   let(:title) do
     Decidim::Faker::Localized.sentence(3)
   end
@@ -22,7 +22,7 @@ describe Decidim::Results::Admin::ResultForm do
   end
   let(:scope) { create :scope, organization: organization }
   let(:scope_id) { scope.id }
-  let(:category) { create :category, participatory_process: participatory_process }
+  let(:category) { create :category, participatory_space: participatory_process }
   let(:category_id) { category.id }
   let(:attributes) do
     {
@@ -68,7 +68,7 @@ describe Decidim::Results::Admin::ResultForm do
   end
 
   context "with proposals" do
-    let(:proposals_feature) { create :feature, manifest_name: :proposals, participatory_process: participatory_process }
+    let(:proposals_feature) { create :feature, manifest_name: :proposals, participatory_space: participatory_process }
     let!(:proposal) { create :proposal, feature: proposals_feature }
 
     describe "#proposals" do

data/decidim-results/spec/models/result_spec.rb

@@ -14,6 +14,26 @@ module Decidim
       include_examples "has scope"
       include_examples "has category"
       include_examples "has reference"
+
+      describe "#users_to_notify_on_comment_created" do
+        let!(:follows) { create_list(:follow, 3, followable: subject) }
+        let(:followers) { follows.map(&:user) }
+        let(:participatory_space) { subject.feature.participatory_space }
+        let(:organization) { participatory_space.organization }
+        let!(:participatory_process_admin) do
+          user = create(:user, :confirmed, organization: organization)
+          Decidim::ParticipatoryProcessUserRole.create!(
+            role: :admin,
+            user: user,
+            participatory_process: participatory_space
+          )
+          user
+        end
+
+        it "returns the followers and the feature's participatory space admins" do
+          expect(subject.users_to_notify_on_comment_created).to match_array(followers.concat([participatory_process_admin]))
+        end
+      end
     end
   end
 end

data/decidim-results/spec/queries/decidim/results/filtered_results_spec.rb

@@ -5,8 +5,8 @@ require "spec_helper"
 describe Decidim::Results::FilteredResults do
   let(:organization) { create(:organization) }
   let(:participatory_process) { create(:participatory_process, organization: organization) }
-  let(:feature) { create(:result_feature, participatory_process: participatory_process) }
-  let(:another_feature) { create(:result_feature, participatory_process: participatory_process) }
+  let(:feature) { create(:result_feature, participatory_space: participatory_process) }
+  let(:another_feature) { create(:result_feature, participatory_space: participatory_process) }
 
   let(:results) { create_list(:result, 3, feature: feature) }
   let(:old_results) { create_list(:result, 3, feature: feature, created_at: 10.days.ago) }

data/decidim-results/spec/services/result_search_spec.rb

@@ -6,7 +6,7 @@ describe Decidim::Results::ResultSearch do
   let(:current_feature) { create :feature, manifest_name: "results" }
   let(:scope1) { create :scope, organization: current_feature.organization }
   let(:scope2) { create :scope, organization: current_feature.organization }
-  let(:parent_category) { create :category, participatory_process: current_feature.participatory_process }
+  let(:parent_category) { create :category, participatory_space: current_feature.participatory_space }
   let(:subcategory) { create :subcategory, parent: parent_category }
   let!(:result1) do
     create(

data/decidim-results/spec/services/result_stats_calculator_spec.rb

@@ -4,9 +4,9 @@ require "spec_helper"
 
 describe Decidim::Results::ResultStatsCalculator do
   let(:participatory_process) { create(:participatory_process, :with_steps) }
-  let(:current_feature) { create :feature, manifest_name: :results, participatory_process: participatory_process }
+  let(:current_feature) { create :feature, manifest_name: :results, participatory_space: participatory_process }
   let(:scope) { create :scope, organization: current_feature.organization }
-  let(:parent_category) { create :category, participatory_process: current_feature.participatory_process }
+  let(:parent_category) { create :category, participatory_space: current_feature.participatory_space }
   let!(:result) do
     create(
       :result,
@@ -16,7 +16,7 @@ describe Decidim::Results::ResultStatsCalculator do
     )
   end
   let(:meetings_feature) do
-    create(:feature, manifest_name: :meetings, participatory_process: participatory_process)
+    create(:feature, manifest_name: :meetings, participatory_space: participatory_process)
   end
   let(:meetings) do
     create_list(
@@ -28,7 +28,7 @@ describe Decidim::Results::ResultStatsCalculator do
     )
   end
   let(:proposals_feature) do
-    create(:feature, manifest_name: :proposals, participatory_process: participatory_process)
+    create(:feature, manifest_name: :proposals, participatory_space: participatory_process)
   end
   let(:proposals) do
     create_list(

data/decidim-surveys/app/assets/images/decidim/surveys/icon.svg

@@ -1 +1,8 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02"><path d="M373,545.54a18,18,0,1,1,18-18A18,18,0,0,1,373,545.54Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,373,511.53Z" transform="translate(-354.99 -509.53)"/><path d="M377.73,536.41h-9.46a1,1,0,1,1,0-2h9.46A1,1,0,0,1,377.73,536.41Z" transform="translate(-354.99 -509.53)"/><path d="M375,525.54h-6.73a1,1,0,1,1,0-2H375A1,1,0,1,1,375,525.54Z" transform="translate(-354.99 -509.53)"/><path d="M375,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,375,535.41Z" transform="translate(-354.99 -509.53)"/><path d="M373,523a3,3,0,1,1,3-3A3,3,0,0,1,373,523Zm0-4a1,1,0,1,0,1,1A1,1,0,0,0,373,519Z" transform="translate(-354.99 -509.53)"/><path d="M371,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,371,535.41Z" transform="translate(-354.99 -509.53)"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36.02 36.02">
+  <path d="M373,545.54a18,18,0,1,1,18-18A18,18,0,0,1,373,545.54Zm0-34a16,16,0,1,0,16,16A16,16,0,0,0,373,511.53Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M377.73,536.41h-9.46a1,1,0,1,1,0-2h9.46A1,1,0,0,1,377.73,536.41Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M375,525.54h-6.73a1,1,0,1,1,0-2H375A1,1,0,1,1,375,525.54Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M375,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,375,535.41Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M373,523a3,3,0,1,1,3-3A3,3,0,0,1,373,523Zm0-4a1,1,0,1,0,1,1A1,1,0,0,0,373,519Z" transform="translate(-354.99 -509.53)"/>
+  <path d="M371,535.41a1,1,0,0,1-1-1v-9.87a1,1,0,1,1,2,0v9.87A1,1,0,0,1,371,535.41Z" transform="translate(-354.99 -509.53)"/>
+</svg>

data/decidim-surveys/app/helpers/decidim/surveys/admin/application_helper.rb

@@ -16,10 +16,6 @@ module Decidim
           "${tabsId}"
         end
 
-        def label_for_question(survey, _question)
-          survey.questions_editable? ? "#{icon("move")} #{t(".question")}".html_safe : t(".question")
-        end
-
         def mandatory_id_for_question(question)
           return "survey_questions_#{question.id}_mandatory" if question.persisted?
           "${tabsId}_mandatory"

data/decidim-surveys/app/models/decidim/surveys/abilities/participatory_process_admin_ability.rb

@@ -10,7 +10,7 @@ module Decidim
           super
 
           can :manage, Survey do |survey|
-            can_manage_process?(survey.feature.participatory_process)
+            can_manage_process?(survey.feature.participatory_space)
           end
         end
       end

data/decidim-surveys/app/views/decidim/surveys/admin/surveys/_question.html.erb

@@ -1,7 +1,14 @@
 <div class="card survey-question" id="survey-question-<%= question.id %>-field">
   <div class="card-divider question-divider">
     <h2 class="card-title">
-    <span><%= label_for_question(survey, question) %></span>
+    <span>
+      <% if survey.questions_editable? %>
+        <%== "#{icon("move")} #{t(".question")}" %>
+      <% else %>
+        <%= t(".question") %>
+      <% end %>
+    </span>
+
     <% if survey.questions_editable? %>
       <button class="button small alert hollow remove-question button--title"><%= t('.remove_question') %></button>
     <% end %>

data/decidim-surveys/config/locales/ca.yml

@@ -1,3 +1,4 @@
+---
 ca:
   activemodel:
     attributes:
@@ -13,13 +14,13 @@ ca:
           answer: Resposta
         name: Enquesta
         settings:
+          global:
+            announcement: Avís
           step:
             allow_answers: Permetre respostes
+            announcement: Avís
     surveys:
       admin:
-        application_helper:
-          label_for_question:
-            question: Pregunta
         exports:
           survey_user_answers: Respostes dels usuaris
         models:

data/decidim-surveys/config/locales/en.yml

@@ -21,9 +21,6 @@ en:
             announcement: Announcement
     surveys:
       admin:
-        application_helper:
-          label_for_question:
-            question: Question
         exports:
           survey_user_answers: Survey user answers
         models:
@@ -40,8 +37,7 @@ en:
             title: Title
           form:
             add_question: Add question
-            already_answered_warning: The survey is already answered by some users
-              so you cannot modify its questions.
+            already_answered_warning: The survey is already answered by some users so you cannot modify its questions.
           question:
             add_answer_option: Add answer option
             question: Question
@@ -61,11 +57,9 @@ en:
           success: Survey answered successfully.
         show:
           answer_survey:
-            anonymous_user_message: <a href="%{sign_in_link}">Sign in with your account</a>
-              or <a href="%{sign_up_link}">sign up</a> to answer the survey.
+            anonymous_user_message: <a href="%{sign_in_link}">Sign in with your account</a> or <a href="%{sign_up_link}">sign up</a> to answer the survey.
             title: Answer the survey
-          are_you_sure: This action cannot be undone and you will not be able to edit
-            your answers. Are you sure?
+          are_you_sure: This action cannot be undone and you will not be able to edit your answers. Are you sure?
           submit: Submit
           survey_answered:
             body: You have already answered this survey.

data/decidim-surveys/config/locales/es.yml

@@ -1,3 +1,4 @@
+---
 es:
   activemodel:
     attributes:
@@ -13,13 +14,13 @@ es:
           answer: Respuesta
         name: Encuesta
         settings:
+          global:
+            announcement: Aviso
           step:
             allow_answers: Permitir respuestas
+            announcement: Aviso
     surveys:
       admin:
-        application_helper:
-          label_for_question:
-            question: Pregunta
         exports:
           survey_user_answers: Respuestas de los usuarios de la encuesta
         models:

data/decidim-surveys/config/locales/eu.yml

@@ -17,11 +17,9 @@ eu:
             announcement: Oharra
           step:
             allow_answers: Baimendu erantzunak
+            announcement: Oharra
     surveys:
       admin:
-        application_helper:
-          label_for_question:
-            question: Galdera
         exports:
           survey_user_answers: Inkesta erabiltzaile erantzunak
         models:

data/decidim-surveys/config/locales/fi.yml

@@ -1,5 +1,69 @@
 fi:
+  activemodel:
+    attributes:
+      survey_answer:
+        body: Vastaa
+      survey_question:
+        mandatory: Pakollinen
+        question_type: Tyyppi
   decidim:
     features:
       surveys:
+        actions:
+          answer: Vastaa
         name: Tutkimus
+        settings:
+          global:
+            announcement: Ilmoitus
+          step:
+            allow_answers: Salli vastaukset
+            announcement: Ilmoitus
+    surveys:
+      admin:
+        exports:
+          survey_user_answers: Kyselyn vastaukset
+        models:
+          components:
+            description: Kuvaus
+            tos: Käyttöehdot
+        surveys:
+          answer_option:
+            answer_option: Vastausvaihtoehto
+            remove_answer_option: Poista vastausvaihtoehto
+            statement: Kysymysasettelu
+          edit:
+            save: Tallenna
+            title: Otsikko
+          form:
+            add_question: Lisää kysymys
+            already_answered_warning: Jotkut käyttäjät ovat jo vastanneet tähän kyselyyn, minkä takia et voi muokata sen kysymyksiä.
+          question:
+            add_answer_option: Lisää vastausvaihtoehto
+            question: Kysymys
+            remove_question: Poista kysymys
+            statement: Kysymysasettelu
+          update:
+            invalid: Kyselyn tallennus epäonnistui.
+            success: Kysely tallennettu onnistuneesti.
+      question_types:
+        long_answer: Pitkä vastaus
+        multiple_option: Useita vaihtoehtoja
+        short_answer: Lyhyt vastaus
+        single_option: Yksi vaihtoehto
+      surveys:
+        answer:
+          invalid: Kyselyyn vastaaminen epäonnistui.
+          success: Kyselyyn vastattu onnistuneesti.
+        show:
+          answer_survey:
+            anonymous_user_message: <a href="%{sign_in_link}">Kirjaudu sisään tililläsi</a> tai <a href="%{sign_up_link}">rekisteröidy</a> vastataksesi kyselyyn.
+            title: Vastaa kyselyyn
+          are_you_sure: Tätä toimintoa ei voi peruuttaa eikä vastauksia voi muokata tämän jälkeen. Oletko varma?
+          submit: Lähetä
+          survey_answered:
+            body: Olet jo vastannut tähän kyselyyn.
+            title: Kyselyyn vastattu
+          survey_closed:
+            body: Kysely on suljettu ja siihen ei voi vastata.
+            title: Kysely suljettu
+          tos_agreement: Osallistumalla tähän kyselyyn hyväksyt sen käyttöehdot

data/decidim-surveys/config/locales/fr.yml

@@ -5,7 +5,7 @@ fr:
         body: Répondre
       survey_question:
         mandatory: Requis
-        question_type: Type de question
+        question_type: Type de contenus
   decidim:
     features:
       surveys:
@@ -13,13 +13,13 @@ fr:
           answer: Répondre
         name: Enquête
         settings:
+          global:
+            announcement: Annonce
           step:
             allow_answers: Autoriser les réponses
+            announcement: Annonce
     surveys:
       admin:
-        application_helper:
-          label_for_question:
-            question: Question
         exports:
           survey_user_answers: Réponses des participants à l'enquête
         models:
@@ -30,6 +30,7 @@ fr:
           answer_option:
             answer_option: Option de réponse
             remove_answer_option: Supprimer l'option de réponse
+            statement: Déclaration
           edit:
             save: Sauvegarder
             title: Titre

data/decidim-surveys/config/locales/it.yml

@@ -3,3 +3,67 @@ it:
     attributes:
       survey_answer:
         body: Risposta
+      survey_question:
+        mandatory: Obbligatorio
+        question_type: Tipo
+  decidim:
+    features:
+      surveys:
+        actions:
+          answer: Risposta
+        name: Questionario
+        settings:
+          global:
+            announcement: Annuncio
+          step:
+            allow_answers: Consentire risposte
+            announcement: Annuncio
+    surveys:
+      admin:
+        exports:
+          survey_user_answers: Risposte degli utente al questionario
+        models:
+          components:
+            description: Descrizione
+            tos: Termini del servizio
+        surveys:
+          answer_option:
+            answer_option: Opzione di risposta
+            remove_answer_option: Rimuovere l'opzione di risposta
+            statement: Dichiarazione
+          edit:
+            save: Salva
+            title: Titolo
+          form:
+            add_question: Aggiungi domanda
+            already_answered_warning: Dato che alcuni utenti hanno già risposto al questionario, non è più possibile modificare le domande.
+          question:
+            add_answer_option: Aggiungre opzione di risposta
+            question: Domanda
+            remove_question: Rimuovere la domanda
+            statement: Dichiarazione
+          update:
+            invalid: Ci sono stati degli errori durante il salvataggio dell'indagine.
+            success: Il questionario è stato salvato correttamente.
+      question_types:
+        long_answer: Risposta lunga
+        multiple_option: Opzione multipla
+        short_answer: Risposta breve
+        single_option: Opzione unica
+      surveys:
+        answer:
+          invalid: Ci sono stati degli errori durante il salvataggio dell'indagine.
+          success: Il questionario è stato salvato correttamente.
+        show:
+          answer_survey:
+            anonymous_user_message: <a href="%{sign_in_link}">Entra con il tuo account</a> or <a href="%{sign_up_link}">Registrati</a> per poter commentare.
+            title: Rispondere al questionario
+          are_you_sure: Questa azione non potrà essere cancellata e non sarà più possibile modificare le risposte. Sei sicuro?
+          submit: Invia
+          survey_answered:
+            body: Hai già risposto a questo sondaggio, grazie.
+            title: Questionario risposto
+          survey_closed:
+            body: L'indagine è chiusa e non è più possibile rispondere.
+            title: Questionario chiuso
+          tos_agreement: Partecipando a questo sondaggio, accetti le sue condizioni di servizio