decidim-forms 0.23.3 → 0.24.0.rc1

data/config/locales/fr-CA.yml

@@ -10,10 +10,15 @@ fr-CA:
         question_type: Type
       questionnaire_question:
         mandatory: Obligatoire
+        max_characters: Limite de caractères (laisser à 0 si aucune limite)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Doit être téléchargé de nouveau
+            body:
+              too_long: est trop long
             choices:
               missing: ne sont pas complets
               too_many: sont trop nombreux
@@ -78,7 +83,7 @@ fr-CA:
             collapse: Réduire toutes les questions
             expand: Développer toutes les questions
             preview: Aperçu
-            title: Modifier le formulaire
+            title: Modifier le questionnaire pour %{questionnaire_for}
             unpublished_warning: Le formulaire n'est pas publié. Vous pouvez modifier ses questions, mais cela supprimera les réponses actuelles.
           matrix_row:
             matrix_row: Ligne
@@ -110,7 +115,7 @@ fr-CA:
         answer:
           body: Le corps ne peut pas être vide
       files:
-        extension_whitelist: 'Formats acceptés :'
+        extension_allowlist: 'Formats acceptés :'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Cette image sera :'
@@ -118,6 +123,7 @@ fr-CA:
           resize_and_pad: Redimensionné et ajustée à
           resize_to_fit: Redimensionnée pour s'adapter
       question_types:
+        files: Fichiers
         long_answer: Longue réponse
         matrix_multiple: Matrice (choix multiples)
         matrix_single: Matrice (choix unique)

data/config/locales/fr.yml

@@ -10,10 +10,15 @@ fr:
         question_type: Type
       questionnaire_question:
         mandatory: Obligatoire
+        max_characters: Limite de caractères (laisser à 0 si aucune limite)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Doit être téléchargé de nouveau
+            body:
+              too_long: est trop long
             choices:
               missing: ne sont pas complets
               too_many: sont trop nombreux
@@ -78,7 +83,7 @@ fr:
             collapse: Réduire toutes les questions
             expand: Développer toutes les questions
             preview: Aperçu
-            title: Modifier le formulaire
+            title: Modifier le questionnaire pour %{questionnaire_for}
             unpublished_warning: Le formulaire n'est pas publié. Vous pouvez modifier ses questions, mais cela supprimera les réponses actuelles.
           matrix_row:
             matrix_row: Ligne
@@ -110,7 +115,7 @@ fr:
         answer:
           body: Le corps ne peut pas être vide
       files:
-        extension_whitelist: 'Formats acceptés :'
+        extension_allowlist: 'Formats acceptés :'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Cette image sera :'
@@ -118,6 +123,7 @@ fr:
           resize_and_pad: Redimensionné et ajustée à
           resize_to_fit: Redimensionnée pour s'adapter
       question_types:
+        files: Fichiers
         long_answer: Longue réponse
         matrix_multiple: Matrice (choix multiples)
         matrix_single: Matrice (choix unique)

data/config/locales/gl.yml

@@ -33,7 +33,6 @@ gl:
           form:
             add_question: Engadir pregunta
             already_answered_warning: Algúns usuarios xa responderon o cuestionario para que non poida modificar as súas preguntas.
-            title: Editar formulario
           matrix_row:
             remove: Quitar
             statement: Declaración

data/config/locales/it.yml

@@ -78,7 +78,6 @@ it:
             collapse: Comprimi tutte le domande
             expand: Espandi tutte le domande
             preview: Anteprima
-            title: Modificare il modulo
             unpublished_warning: Il modulo non è pubblicato. Puoi modificare le sue domande, ma in questo modo cancellerai le risposte correnti.
           matrix_row:
             matrix_row: Riga
@@ -110,7 +109,7 @@ it:
         answer:
           body: Il corpo non può essere vuoto
       files:
-        extension_whitelist: 'Formati accettati:'
+        extension_allowlist: 'Formati accettati:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Questa immagine sarà:'

data/config/locales/ja.yml

@@ -76,7 +76,7 @@ ja:
             collapse: すべての質問を閉じる
             expand: すべての質問を展開
             preview: プレビュー
-            title: フォームの編集
+            title: '%{questionnaire_for} のフォームを編集'
             unpublished_warning: フォームは公開されていません。質問を修正することはできますが、そうすると現在の回答が削除されます。
           matrix_row:
             matrix_row: 行
@@ -108,7 +108,7 @@ ja:
         answer:
           body: 本文は空白にできません
       files:
-        extension_whitelist: '承認されたフォーマット:'
+        extension_allowlist: '承認されたフォーマット:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'この画像は次のようになります:'

data/config/locales/lv.yml

@@ -66,7 +66,7 @@ lv:
         answer:
           body: Pamatteksts nevar būt tukšs
       files:
-        extension_whitelist: 'Pieņemtie formāti:'
+        extension_allowlist: 'Pieņemtie formāti:'
       images:
         dimensions: "%{width} x %{height} pikseļi"
         dimensions_info: 'Attēlam būs:'

data/config/locales/nl.yml

@@ -24,8 +24,8 @@ nl:
       admin:
         models:
           components:
-            description: Beschrijving
-            tos: Gebruiksvoorwaarden
+            description: Omschrijving
+            tos: Servicevoorwaarden
         questionnaires:
           actions:
             back: Terug naar vragen
@@ -74,11 +74,10 @@ nl:
           form:
             add_question: Vraag toevoegen
             add_separator: Scheidingsteken toevoegen
-            already_answered_warning: Het formulier is al door sommige gebruikers beantwoord, dus u kunt de vragen niet wijzigen.
+            already_answered_warning: De vragenlijst is al door enkele gebruikers beantwoord, dus u kunt de vragen niet wijzigen.
             collapse: Alle vragen samenvouwen
             expand: Vouw alle vragen uit
             preview: Voorvertoning
-            title: Formulier bewerken
             unpublished_warning: Het formulier is niet gepubliceerd. Je kunt de vragen wijzigen, maar als je dit doet worden de huidige antwoorden verwijderd.
           matrix_row:
             matrix_row: Rij
@@ -110,7 +109,7 @@ nl:
         answer:
           body: Lichaam mag niet leeg zijn
       files:
-        extension_whitelist: 'Geaccepteerde formaten:'
+        extension_allowlist: 'Geaccepteerde formaten:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Deze afbeelding zal zijn:'

data/config/locales/no.yml

@@ -53,7 +53,6 @@
           form:
             add_question: Legg til spørsmål
             already_answered_warning: Skjemaet er allerede besvart av noen brukere derfor kan du ikke endre spørsmålene.
-            title: Rediger skjema
           matrix_row:
             remove: Fjern
             statement: Uttalelse
@@ -81,7 +80,7 @@
         answer:
           body: Teksten kan ikke være blank
       files:
-        extension_whitelist: 'Aksepterte formater:'
+        extension_allowlist: 'Aksepterte formater:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Dette bildet vil være:'

data/config/locales/pl.yml

@@ -3,15 +3,22 @@ pl:
     attributes:
       answer:
         body: Odpowiedź
+        choices: Opcje
+        selected_choices: Wybrane opcje
       question:
         max_choices: Maksymalna liczba opcji do wyboru
         question_type: Typ
       questionnaire_question:
         mandatory: Obowiązkowy
+        max_characters: Limit znaków (zostaw 0 jeśli nie chcesz ustawiać limitu)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Załącz ponownie
+            body:
+              too_long: jest zbyt długie
             choices:
               missing: nie są kompletne
               too_many: jest zbyt wiele
@@ -76,7 +83,7 @@ pl:
             collapse: Zwiń wszystkie pytania
             expand: Rozwiń wszystkie pytania
             preview: Podgląd
-            title: Edytuj formularz
+            title: Edytuj formularz dla %{questionnaire_for}
             unpublished_warning: Formularz nie został jeszcze opublikowany. Możesz zmienić jego pytania, ale to spowoduje usunięcie bieżących odpowiedzi.
           matrix_row:
             matrix_row: Wiersz
@@ -103,11 +110,12 @@ pl:
             up: W górę
           update:
             invalid: Podczas zapisywania formularza wystąpił błąd.
+            success: Formularz został zapisany.
       errors:
         answer:
           body: Treść nie może być pusta
       files:
-        extension_whitelist: 'Dozwolone formaty:'
+        extension_allowlist: 'Dozwolone formaty:'
       images:
         dimensions: "%{width} × %{height} px"
         dimensions_info: 'Rozmiar obrazu będzie wynosił:'
@@ -115,6 +123,7 @@ pl:
           resize_and_pad: Zmieniony i dopełniony do
           resize_to_fit: Dopasowany
       question_types:
+        files: Pliki
         long_answer: Długa odpowiedź
         matrix_multiple: Macierz (wiele opcji)
         matrix_single: Macierz (jedna opcja)

data/config/locales/pt.yml

@@ -76,7 +76,6 @@ pt:
             collapse: Colapsar todas as questões
             expand: Expandir todas as questões
             preview: Pré-visualizar
-            title: Editar formulário
             unpublished_warning: O formulário não está publicado. Pode modificar as suas questões, mas essa ação eliminará as respostas atuais.
           matrix_row:
             matrix_row: Linha
@@ -107,7 +106,7 @@ pt:
         answer:
           body: O corpo não pode ficar em branco
       files:
-        extension_whitelist: 'Formatos aceites:'
+        extension_allowlist: 'Formatos aceites:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Esta imagem será:'

data/config/locales/ro-RO.yml

@@ -76,7 +76,6 @@ ro:
             collapse: Restrânge toate întrebările
             expand: Extinde toate întrebările
             preview: Previzualizare
-            title: Editare formular
             unpublished_warning: Formularul nu este publicat. Puteți modifica întrebările, dar acest lucru va șterge răspunsurile curente.
           matrix_row:
             matrix_row: Rând
@@ -107,7 +106,7 @@ ro:
         answer:
           body: Corpul nu poate fi gol
       files:
-        extension_whitelist: 'Formate acceptate:'
+        extension_allowlist: 'Formate acceptate:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Această imagine va fi:'

data/config/locales/sv.yml

@@ -76,7 +76,6 @@ sv:
             collapse: Komprimera alla frågor
             expand: Expandera alla frågor
             preview: Förhandsgranska
-            title: Redigera formulär
             unpublished_warning: Formuläret är inte publicerat. Du kan ändra dess frågor, men det kommer att ta bort aktuella svar.
           matrix_row:
             matrix_row: Rad
@@ -107,7 +106,7 @@ sv:
         answer:
           body: Kroppen kan inte vara to
       files:
-        extension_whitelist: 'Godkända format:'
+        extension_allowlist: 'Godkända format:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Denna bild kommer att vara:'

data/config/locales/tr-TR.yml

@@ -78,7 +78,7 @@ tr:
             collapse: Tüm soruları daraltın
             expand: Tüm soruları genişletin
             preview: Önizleme
-            title: Formu düzenle
+            title: '%{questionnaire_for} için formu düzenleyin'
             unpublished_warning: Form yayınlanmadı. Sorularını değiştirebilirsiniz, ancak bunu yapmak mevcut cevapları silecektir.
           matrix_row:
             matrix_row: Satır
@@ -110,7 +110,7 @@ tr:
         answer:
           body: Vücut boş olamaz
       files:
-        extension_whitelist: 'Kabul edilen biçimler:'
+        extension_allowlist: 'Kabul edilen biçimler:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Bu resim:'

data/config/locales/zh-CN.yml

@@ -78,7 +78,6 @@ zh-CN:
             collapse: 收起所有问题
             expand: 展开所有问题
             preview: 预览
-            title: 编辑表单
             unpublished_warning: 表单未发布。您可以修改它的问题，但这样做将删除当前答案。
           matrix_row:
             matrix_row: 行
@@ -110,7 +109,7 @@ zh-CN:
         answer:
           body: 主体不能为空
       files:
-        extension_whitelist: '接受的格式：'
+        extension_allowlist: '接受的格式：'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: '这张图片将是：'

data/db/migrate/20210208094442_add_max_characters_to_decidim_forms_questions.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddMaxCharactersToDecidimFormsQuestions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :decidim_forms_questions, :max_characters, :integer, default: 0
+  end
+end

data/lib/decidim/api/answer_option_type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    class AnswerOptionType < Decidim::Api::Types::BaseObject
+      description "An answer option for a multi-choice question in a questionnaire"
+
+      field :id, GraphQL::Types::ID, "ID of this answer option", null: false
+      field :body, Decidim::Core::TranslatedFieldType, "The text answer response option.", null: false
+      field :free_text, GraphQL::Types::Boolean, "Whether if this answer accepts any free text from the user.", null: false
+    end
+  end
+end

data/lib/decidim/api/question_type.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    class QuestionType < Decidim::Api::Types::BaseObject
+      description "A question in a questionnaire"
+
+      implements Decidim::Core::TimestampsInterface
+
+      field :id, GraphQL::Types::ID, "ID of this question", null: false
+      field :body, Decidim::Core::TranslatedFieldType, "What is being asked in this question.", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this question.", null: true
+      field :mandatory, GraphQL::Types::Boolean, "Whether if this question is mandatory.", null: false
+      field :position, GraphQL::Types::Int, "Order position of the question in the questionnaire", null: true
+      field :max_choices, GraphQL::Types::Int, "On questions with answer options, maximum number of choices the user has", null: true
+      field :max_characters, GraphQL::Types::Int, "On questions with free text answers, maximum number of characters the answer can have (0 if no limit)", null: false
+      field :question_type, GraphQL::Types::String, "Type of question.", null: true
+      field :answer_options, [AnswerOptionType, { null: true }], "List of answer options in multi-choice questions.", null: false
+    end
+  end
+end

data/lib/decidim/api/questionnaire_entity_interface.rb

@@ -4,15 +4,15 @@ module Decidim
   module Forms
     # This interface should be implemented by any Type that can be linked to a questionnaire
     # The only requirement is to have an ID and the Type name be the class.name + Type
-    QuestionnaireEntityInterface = GraphQL::InterfaceType.define do
-      name "QuestionnaireEntityInterface"
+    module QuestionnaireEntityInterface
+      include Decidim::Api::Types::BaseInterface
       description "An interface that can be used in objects with questionnaires"
 
-      field :id, !types.ID, "ID of this entity"
+      field :id, GraphQL::Types::ID, "ID of this entity", null: false
 
-      resolve_type ->(obj, _ctx) {
+      def self.resolve_type(obj, _ctx)
         "#{obj.class.name}Type".constantize
-      }
+      end
     end
   end
 end

data/lib/decidim/api/questionnaire_type.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    class QuestionnaireType < Decidim::Api::Types::BaseObject
+      description "A questionnaire"
+
+      implements Decidim::Core::TimestampsInterface
+
+      field :id, GraphQL::Types::ID, "ID of this questionnaire", null: false
+      field :title, Decidim::Core::TranslatedFieldType, "The title of this questionnaire.", null: false
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this questionnaire.", null: true
+      field :tos, Decidim::Core::TranslatedFieldType, "The Terms of Service for this questionnaire.", null: true
+      field :for_type, GraphQL::Types::String, "Type of entity using this questionnaire.", method: :questionnaire_for_type, null: true
+      field :for_entity, QuestionnaireEntityInterface, "Entity using this questionnaire.", method: :questionnaire_for, null: true
+      field :questions, [Decidim::Forms::QuestionType, { null: true }], "Questions in this questionnaire.", null: false
+    end
+  end
+end

data/lib/decidim/exporters/form_pdf_controller_helper.rb

@@ -2,8 +2,10 @@
 
 module Decidim
   module Exporters
+    # rubocop: disable Rails/ApplicationController
     # A dummy controller to render views while exporting questionnaires
     class FormPDFControllerHelper < ActionController::Base
+      # rubocop: enable Rails/ApplicationController
       helper Decidim::TranslationsHelper
       helper Decidim::Forms::Admin::QuestionnaireAnswersHelper
     end

data/lib/decidim/forms.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
 require "decidim/forms/admin"
+require "decidim/forms/api"
 require "decidim/forms/engine"
 require "decidim/forms/admin_engine"
-require "decidim/forms/api"
 
 module Decidim
   # This namespace holds the logic of the `Forms`.