decidim-surveys 0.23.6 → 0.24.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28b93ce6de694fd5c8a9b7a36f76f5e32d7d979addbb8bb3ac18cbf374d3ecff
-  data.tar.gz: 84d7573c2fcbd6521d37aac90dab6e4cef4801d66a555cc7f41564cb557ef6b0
+  metadata.gz: af4b91c9293ed9ea20b5c26d30fb39d737c3ac75c895a3a9f9cfd1de4faee968
+  data.tar.gz: dac349c2ca9f62d61bd6bd1032ce0f16d932390611a67468fc8f9fe7e6d123dc
 SHA512:
-  metadata.gz: 78136977ea8aa58b7cc947611543686032868a0ff8b7cec5efa96f4cc8aa18fb908c393be6b9954b41eee029b303ace024bfb62f4a38f4c91d1e32be4b03c1f4
-  data.tar.gz: d517a524054c164a8892c29da4aa306817a2da6495fb470ec730fd9ca20f87a91728370e2440f75bfdb4bcc6e3f696910d5634ad5a3a00379342a8c88c3a6044
+  metadata.gz: 8d2ad1ff942b509f64df52d4062e2a03b54625be459e3c2d0106b61f0be3519ff87b161f9efe9c5ab9926b888605bb4f42cc136606957fdb0bb114bf6b36610c
+  data.tar.gz: 3b9346b7bcb2de0c6f16d03a66683a1621827e6419c2baeb24e4e1bd987f7bf8abc6bf4ef8291d7b86dc3cff708c44170e7f51a9844929f97e565c9c86d08623

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

@@ -22,6 +22,10 @@ module Decidim
           Decidim::EngineRouter.admin_proxy(survey.component).show_survey_path(session_token: session_token)
         end
 
+        def edit_questionnaire_title
+          t(:title, scope: "decidim.forms.admin.questionnaires.form", questionnaire_for: translated_attribute(current_component.name))
+        end
+
         private
 
         def i18n_flashes_scope

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

@@ -23,7 +23,7 @@ module Decidim
       protected
 
       def allow_answers?
-        !current_component.published? || current_settings.allow_answers?
+        !current_component.published? || (current_settings.allow_answers? && survey.open?)
       end
 
       def form_path

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

@@ -15,6 +15,24 @@ module Decidim
       def clean_after_publish?
         component.settings.clean_after_publish?
       end
+
+      def starts_at
+        component.settings.starts_at
+      end
+
+      def ends_at
+        component.settings.ends_at
+      end
+
+      def open?
+        return true if starts_at.blank? && ends_at.blank?
+        return true if ends_at.blank? && starts_at.past?
+        return true if starts_at.blank? && ends_at.future?
+
+        return Time.zone.now.between?(starts_at, ends_at) if starts_at.present? && ends_at.present?
+
+        false
+      end
     end
   end
 end

data/config/locales/cs.yml

@@ -25,8 +25,12 @@ cs:
           global:
             announcement: Oznámení
             clean_after_publish: Odstranit odpovědi při publikování ankety
+            ends_at: Odpověď přijata do
+            ends_at_help: Ponechte prázdné pro žádné konkrétní datum
             scope_id: Oblast působnosti
             scopes_enabled: Oblasti působnosti povoleny
+            starts_at: Odpovědi přijaté od
+            starts_at_help: Ponechte prázdné pro žádné konkrétní datum
           step:
             allow_answers: Povolte odpovědi
             allow_unregistered: Umožnit neregistrovaným uživatelům odpovědět na průzkum

data/config/locales/de.yml

@@ -21,8 +21,12 @@ de:
           global:
             announcement: Ankündigung
             clean_after_publish: Antworten bei Veröffentlichung des Fragebogens löschen
+            ends_at: Antworten akzeptiert bis
+            ends_at_help: Leer lassen für kein bestimmtes Datum
             scope_id: Bereich
             scopes_enabled: Bereiche aktiviert
+            starts_at: Antworten akzeptiert von
+            starts_at_help: Leer lassen für kein bestimmtes Datum
           step:
             allow_answers: Erlaube Antworten
             allow_unregistered: Nicht registrierten Benutzern die Beantwortung des Fragebogens erlauben

data/config/locales/en.yml

@@ -22,8 +22,12 @@ en:
           global:
             announcement: Announcement
             clean_after_publish: Delete answers when publishing the survey
+            ends_at: Answers accepted until
+            ends_at_help: Leave blank for no specific date
             scope_id: Scope
             scopes_enabled: Scopes enabled
+            starts_at: Answers accepted from
+            starts_at_help: Leave blank for no specific date
           step:
             allow_answers: Allow answers
             allow_unregistered: Allow unregistered users to answer the survey

data/config/locales/fi-plain.yml

@@ -21,8 +21,12 @@ fi-pl:
           global:
             announcement: Ilmoitus
             clean_after_publish: Poista vastaukset julkaistaessa kysely
+            ends_at: Vastausajan loppumisajankohta
+            ends_at_help: Jätä tyhjäksi, jos vastausaikaa ei ole rajattu
             scope_id: Teema
             scopes_enabled: Teemat käytössä
+            starts_at: Vastausajan alkamisajankohta
+            starts_at_help: Jätä tyhjäksi, jos vastausaikaa ei ole rajattu
           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

@@ -21,8 +21,12 @@ fi:
           global:
             announcement: Ilmoitus
             clean_after_publish: Poista vastaukset julkaistaessa kysely
+            ends_at: Vastausajan loppumisajankohta
+            ends_at_help: Jätä tyhjäksi, jos vastausaikaa ei ole rajattu
             scope_id: Teema
             scopes_enabled: Teemat käytössä
+            starts_at: Vastausajan alkamisajankohta
+            starts_at_help: Jätä tyhjäksi, jos vastausaikaa ei ole rajattu
           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

@@ -21,8 +21,12 @@ fr-CA:
           global:
             announcement: Annonce
             clean_after_publish: Supprimer les réponses lors de la publication du sondage
+            ends_at: Réponses acceptées jusqu'au
+            ends_at_help: Laisser vide si aucune date spécifique
             scope_id: Secteur
             scopes_enabled: Secteurs activés
+            starts_at: Réponses acceptées du
+            starts_at_help: Laisser vide si aucune date spécifique
           step:
             allow_answers: Autoriser les réponses
             allow_unregistered: Autoriser les utilisateurs non inscrits à répondre à l'enquête

data/config/locales/fr.yml

@@ -21,8 +21,12 @@ fr:
           global:
             announcement: Annonce
             clean_after_publish: 'Supprimer les réponses lors de la publication de l''enquête - ATTENTION : décocher après avoir fini vos tests et avoir publié l''enquête'
+            ends_at: Réponses acceptées jusqu'au
+            ends_at_help: Laisser vide si aucune date spécifique
             scope_id: Secteur
             scopes_enabled: Secteurs activés
+            starts_at: Réponses acceptées du
+            starts_at_help: Laisser vide si aucune date spécifique
           step:
             allow_answers: Autoriser les réponses
             allow_unregistered: Autoriser les utilisateurs non inscrits à répondre à l'enquête

data/config/locales/gl.yml

@@ -21,12 +21,14 @@ gl:
           global:
             announcement: Anuncio
             clean_after_publish: Eliminar as respostas ao publicar a enquisa
+            ends_at: Respostas aceptadas até
+            ends_at_help: Deixar baleiro de non especificar unha data
             scope_id: Ámbito
             scopes_enabled: Ámbitos habilitados
+            starts_at_help: Deixar baleiro de non especificar unha data
           step:
             allow_answers: Permitir respostas
             allow_unregistered: Permitir aos usuarios non rexistrados responder a enquisa
-            allow_unregistered_help: Se está activo, non será preciso iniciar sesión para contestar a enquisa. Isto pode comportar que os datos sexan pouco fiábeis e aumentará a vulnerabilidade a ataques automatizados. Empregar con precaución!
             announcement: Anuncio
     events:
       surveys:
@@ -58,5 +60,4 @@ gl:
       surveys:
         answer:
           invalid: Houbo erros ao responder a enquisa.
-          spam_detected: Produciuse un problema ao contestar o formulario. É posíbel que o fixeras rápido de máis, podes tentalo de novo?
           success: A enquisa respondeu con éxito.

data/config/locales/it.yml

@@ -21,6 +21,10 @@ it:
           global:
             announcement: Annuncio
             clean_after_publish: Eliminare le risposte quando si pubblica il sondaggio
+            ends_at: Risposte accettate fino al
+            ends_at_help: Lascia vuoto se nessuna data è specificata
+            starts_at: Risposte accettate da
+            starts_at_help: Lascia vuoto se nessuna data è specificata
           step:
             allow_answers: Consenti risposte
             allow_unregistered: Consenti agli utenti non registrati di rispondere al sondaggio

data/config/locales/nl.yml

@@ -21,8 +21,12 @@ nl:
           global:
             announcement: Aankondiging
             clean_after_publish: Verwijder antwoorden bij publicatie van de enquête
+            ends_at: Antwoorden geaccepteerd tot
+            ends_at_help: Laat leeg voor geen specifieke datum
             scope_id: Scope
             scopes_enabled: Scopes ingeschakeld
+            starts_at: Antwoorden geaccepteerd vanaf
+            starts_at_help: Laat leeg voor geen specifieke datum
           step:
             allow_answers: Antwoorden toestaan
             allow_unregistered: Sta niet-geregistreerde gebruikers toe om de enquête te beantwoorden

data/config/locales/pl.yml

@@ -25,8 +25,12 @@ pl:
           global:
             announcement: Ogłoszenie
             clean_after_publish: Usuń odpowiedzi podczas publikowania ankiety
+            ends_at: Odpowiedzi akceptowane do
+            ends_at_help: Pozostaw puste jeśli nie określono daty
             scope_id: Zakres
             scopes_enabled: Zakresy włączone
+            starts_at: Odpowiedzi akceptowane od
+            starts_at_help: Pozostaw puste jeśli nie określono daty
           step:
             allow_answers: Pozwól na wypełnianie
             allow_unregistered: Pozwól niezarejestrowanym użytkownikom wypełnić ankietę

data/config/locales/ro-RO.yml

@@ -23,8 +23,6 @@ ro:
           global:
             announcement: Anunţ
             clean_after_publish: Ștergeți răspunsurile la publicarea sondajului
-            scope_id: Domeniu de interes
-            scopes_enabled: Domenii de interes activate
           step:
             allow_answers: Permite răspunsuri
             allow_unregistered: Permite utilizatorilor neînregistrați să răspundă la chestionar

data/config/locales/sv.yml

@@ -21,8 +21,6 @@ sv:
           global:
             announcement: Meddelande
             clean_after_publish: Ta bort svar vid publicering av enkäten
-            scope_id: Omfång
-            scopes_enabled: Omfång aktiverade
           step:
             allow_answers: Tillåt svar
             allow_unregistered: Tillåt ej registrerade användare att besvara enkäten

data/config/locales/tr-TR.yml

@@ -21,8 +21,12 @@ tr:
           global:
             announcement: Duyuru
             clean_after_publish: Anketi yayınlarken cevapları sil
+            ends_at: Şu tarihe kadar kabul edilen cevaplar
+            ends_at_help: Belirli bir tarih için boş bırakın
             scope_id: Kapsam
             scopes_enabled: Kapsamlar etkinleştirildi
+            starts_at: Cevaplar kabul edildi
+            starts_at_help: Belirli bir tarih için boş bırakın
           step:
             allow_answers: Cevaplara izin ver
             allow_unregistered: Kayıtlı olmayan kullanıcıların anketi yanıtlamasına izin verin

data/lib/decidim/api/survey_type.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    class SurveyType < Decidim::Api::Types::BaseObject
+      description "A survey"
+
+      field :id, GraphQL::Types::ID, "The internal ID for this survey", null: false
+      field :created_at, Decidim::Core::DateTimeType, "The time this survey was created", null: true
+      field :updated_at, Decidim::Core::DateTimeType, "The time this survey was updated", null: true
+      field :questionnaire, Decidim::Forms::QuestionnaireType, "The questionnaire for this survey", null: true
+    end
+  end
+end

data/lib/decidim/api/surveys_type.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    class SurveysType < Decidim::Api::Types::BaseObject
+      implements Decidim::Core::ComponentInterface
+
+      graphql_name "Surveys"
+      description "A surveys component of a participatory space."
+
+      field :surveys, Decidim::Surveys::SurveyType.connection_type, null: true, connection: true
+
+      def surveys
+        Survey.where(component: object).includes(:component)
+      end
+
+      field :survey, Decidim::Surveys::SurveyType, null: true do
+        argument :id, GraphQL::Types::ID, required: true
+      end
+
+      def survey(**args)
+        Survey.where(component: object).find_by(id: args[:id])
+      end
+    end
+  end
+end

data/lib/decidim/surveys/api.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Surveys
+    autoload :SurveyType, "decidim/api/survey_type"
+    autoload :SurveysType, "decidim/api/surveys_type"
+  end
+end

data/lib/decidim/surveys/component.rb

@@ -57,6 +57,8 @@ Decidim.register_component(:surveys) do |component|
   component.settings(:global) do |settings|
     settings.attribute :scopes_enabled, type: :boolean, default: false
     settings.attribute :scope_id, type: :scope
+    settings.attribute :starts_at, type: :time
+    settings.attribute :ends_at, type: :time
     settings.attribute :announcement, type: :text, translated: true, editor: true
     settings.attribute :clean_after_publish, type: :boolean, default: true
   end
@@ -103,10 +105,10 @@ Decidim.register_component(:surveys) do |component|
     questionnaire = Decidim::Forms::Questionnaire.new(
       title: Decidim::Faker::Localized.paragraph,
       description: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(3)
+        Decidim::Faker::Localized.paragraph(sentence_count: 3)
       end,
       tos: Decidim::Faker::Localized.wrapped("<p>", "</p>") do
-        Decidim::Faker::Localized.paragraph(2)
+        Decidim::Faker::Localized.paragraph(sentence_count: 2)
       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.23.6"
+      "0.24.0.rc1"
     end
   end
 end

data/lib/decidim/surveys.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "decidim/surveys/admin"
+require "decidim/surveys/api"
 require "decidim/surveys/engine"
 require "decidim/surveys/admin_engine"
 require "decidim/surveys/component"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-surveys
 version: !ruby/object:Gem::Version
-  version: 0.23.6
+  version: 0.24.0.rc1
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,84 +18,84 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-admin
+  name: decidim-templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
-  type: :development
+        version: 0.24.0.rc1
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-dev
+  name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-participatory_processes
+  name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 - !ruby/object:Gem::Dependency
-  name: decidim-templates
+  name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.23.6
+        version: 0.24.0.rc1
 description: A surveys component for decidim's participatory spaces.
 email:
 - josepjaume@gmail.com
@@ -127,8 +127,6 @@ files:
 - app/queries/decidim/surveys/metrics/survey_participants_metric_measure.rb
 - app/serializers/decidim/surveys/data_importer.rb
 - app/serializers/decidim/surveys/data_serializer.rb
-- 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
@@ -220,9 +218,12 @@ files:
 - db/migrate/20200610090725_remove_survey_answers.rb
 - db/migrate/20200610090845_remove_survey_questions.rb
 - db/migrate/20200610105927_remove_survey_columns.rb
+- lib/decidim/api/survey_type.rb
+- lib/decidim/api/surveys_type.rb
 - lib/decidim/surveys.rb
 - lib/decidim/surveys/admin.rb
 - lib/decidim/surveys/admin_engine.rb
+- lib/decidim/surveys/api.rb
 - lib/decidim/surveys/component.rb
 - lib/decidim/surveys/engine.rb
 - lib/decidim/surveys/test/factories.rb
@@ -240,14 +241,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key:
 specification_version: 4
 summary: Decidim surveys module

data/app/types/decidim/surveys/survey_type.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    SurveyType = GraphQL::ObjectType.define do
-      name "Survey"
-      description "A survey"
-
-      field :id, !types.ID, "The internal ID for this survey"
-      field :createdAt, Decidim::Core::DateTimeType, "The time this survey was created", property: :created_at
-      field :updatedAt, Decidim::Core::DateTimeType, "The time this survey was updated", property: :updated_at
-      field :questionnaire, Decidim::Forms::QuestionnaireType, "The questionnaire for this survey"
-    end
-  end
-end

data/app/types/decidim/surveys/surveys_type.rb

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Surveys
-    SurveysType = GraphQL::ObjectType.define do
-      interfaces [-> { Decidim::Core::ComponentInterface }]
-
-      name "Surveys"
-      description "A surveys component of a participatory space."
-
-      connection :surveys, SurveyType.connection_type do
-        resolve ->(component, _args, _ctx) {
-                  SurveysTypeHelper.base_scope(component).includes(:component)
-                }
-      end
-
-      field(:survey, SurveyType) do
-        argument :id, !types.ID
-
-        resolve ->(component, args, _ctx) {
-          SurveysTypeHelper.base_scope(component).find_by(id: args[:id])
-        }
-      end
-    end
-
-    module SurveysTypeHelper
-      def self.base_scope(component)
-        Survey.where(component: component)
-      end
-    end
-  end
-end