decidim-forms 0.23.0 → 0.24.0.rc1

data/app/models/decidim/forms/question.rb

@@ -6,7 +6,7 @@ module Decidim
     class Question < Forms::ApplicationRecord
       include Decidim::TranslatableResource
 
-      QUESTION_TYPES = %w(short_answer long_answer single_option multiple_option sorting matrix_single matrix_multiple).freeze
+      QUESTION_TYPES = %w(short_answer long_answer single_option multiple_option sorting files matrix_single matrix_multiple).freeze
       SEPARATOR_TYPE = "separator"
       TYPES = (QUESTION_TYPES + [SEPARATOR_TYPE]).freeze
 
@@ -48,6 +48,8 @@ module Decidim
 
       validates :question_type, inclusion: { in: TYPES }
 
+      scope :not_separator, -> { where.not(question_type: SEPARATOR_TYPE) }
+
       scope :with_body, -> { where(question_type: %w(short_answer long_answer)) }
       scope :with_choices, -> { where.not(question_type: %w(short_answer long_answer)) }
 
@@ -63,11 +65,11 @@ module Decidim
       end
 
       def mandatory_body?
-        mandatory? && !multiple_choice?
+        mandatory? && !multiple_choice? && !has_attachments?
       end
 
       def mandatory_choices?
-        mandatory? && multiple_choice?
+        mandatory? && multiple_choice? && !has_attachments?
       end
 
       def number_of_options
@@ -81,6 +83,10 @@ module Decidim
       def separator?
         question_type.to_s == SEPARATOR_TYPE
       end
+
+      def has_attachments?
+        question_type.to_s == "files"
+      end
     end
   end
 end

data/app/models/decidim/forms/questionnaire.rb

@@ -14,6 +14,8 @@ module Decidim
       has_many :questions, -> { order(:position) }, class_name: "Question", foreign_key: "decidim_questionnaire_id", dependent: :destroy
       has_many :answers, class_name: "Answer", foreign_key: "decidim_questionnaire_id", dependent: :destroy
 
+      after_initialize :set_default_salt
+
       # Public: returns whether the questionnaire questions can be modified or not.
       def questions_editable?
         has_component = questionnaire_for.respond_to? :component
@@ -29,6 +31,15 @@ module Decidim
       def pristine?
         created_at.to_i == updated_at.to_i && questions.empty?
       end
+
+      private
+
+      # salt is used to generate secure hash in anonymous answers
+      def set_default_salt
+        return unless defined?(salt)
+
+        self.salt ||= Tokenizer.random_salt
+      end
     end
   end
 end

data/app/presenters/decidim/forms/admin/questionnaire_answer_presenter.rb

@@ -17,6 +17,7 @@ module Decidim
 
         def body
           return answer.body if answer.body.present?
+          return attachments if answer.attachments.any?
           return "-" if answer.choices.empty?
 
           choices = answer.choices.map do |choice|
@@ -30,8 +31,27 @@ module Decidim
           end
         end
 
+        def attachments
+          content_tag(:ul) do
+            safe_join(answer.attachments.map { |a| pretty_attachment(a) })
+          end
+        end
+
         private
 
+        def pretty_attachment(attachment)
+          # rubocop:disable Style/StringConcatenation
+          # Interpolating strings that are `html_safe` is problematic with Rails.
+          content_tag :li do
+            link_to(translated_attribute(attachment.title), attachment.url) +
+              " " +
+              content_tag(:small) do
+                "#{attachment.file_type} #{number_to_human_size(attachment.file_size)}"
+              end
+          end
+          # rubocop:enable Style/StringConcatenation
+        end
+
         def choice(choice_body)
           content_tag :li do
             choice_body

data/app/presenters/decidim/forms/admin/questionnaire_participant_presenter.rb

@@ -36,23 +36,23 @@ module Decidim
         end
 
         def first_short_answer
-          short = sibilings.where("decidim_forms_questions.question_type in (?)", %w(short_answer))
+          short = sibilings.where(decidim_forms_questions: { question_type: %w(short_answer) })
           short.first
         end
 
         def completion
-          with_body = sibilings.where("decidim_forms_questions.question_type in (?)", %w(short_answer long_answer))
+          with_body = sibilings.where(decidim_forms_questions: { question_type: %w(short_answer long_answer) })
                                .where.not(body: "").count
           with_choices = sibilings.where.not("decidim_forms_questions.question_type in (?)", %w(short_answer long_answer))
                                   .where("decidim_forms_answers.id IN (SELECT decidim_answer_id FROM decidim_forms_answer_choices)").count
 
-          (with_body + with_choices).to_f / questionnaire.questions.count * 100
+          (with_body + with_choices).to_f / questionnaire.questions.not_separator.count * 100
         end
 
         private
 
         def sibilings
-          Answer.where(session_token: participant.session_token).joins(:question).order("decidim_forms_questions.position ASC")
+          Answer.not_separator.where(questionnaire: questionnaire, session_token: participant.session_token).joins(:question).order("decidim_forms_questions.position ASC")
         end
       end
     end

data/app/queries/decidim/forms/questionnaire_user_answers.rb

@@ -20,7 +20,8 @@ module Decidim
 
       # Finds and group answers by user for each questionnaire's question.
       def query
-        answers = Answer.where(questionnaire: @questionnaire)
+        answers = Answer.not_separator.joins(:question).where(questionnaire: @questionnaire)
+
         answers.sort_by { |answer| answer.question.position }.group_by { |a| a.user || a.session_token }.values
       end
     end

data/app/views/decidim/forms/admin/questionnaires/_form.html.erb

@@ -1,7 +1,7 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= t(".title") %>
+      <%= edit_questionnaire_title %>
       <% unless template? questionnaire.questionnaire_for %>
         <% if allowed_to? :preview, :questionnaire %>
           <div class="button--title">
@@ -10,7 +10,7 @@
         <% end %>
         <% if questionnaire.answers.any? %>
           <div class="button--title">
-            <%= export_dropdown if allowed_to? :export_answers, :questionnaire %>
+            <%= export_dropdown(current_component, questionnaire.id) if allowed_to? :export_answers, :questionnaire %>
           </div>
           <div class="button--title">
             <% if allowed_to? :show, :questionnaire_answers %>
@@ -18,7 +18,7 @@
             <% end %>
           </div>
         <% else %>
-          <button class="button tiny button--title" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></a>
+          <button class="button tiny button--title" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></button>
         <% end %>
       <% end %>
     </h2>

data/app/views/decidim/forms/admin/questionnaires/_question.html.erb

@@ -73,6 +73,17 @@
       %>
     </div>
 
+    <div class="row column">
+      <%=
+        form.number_field(
+          :max_characters,
+          disabled: !editable,
+          min: 0,
+          label: t("activemodel.attributes.questionnaire_question.max_characters")
+        )
+      %>
+    </div>
+
     <div class="row column">
       <%=
         form.select(

data/app/views/decidim/forms/admin/questionnaires/edit.html.erb

@@ -2,7 +2,7 @@
   <%= render partial: "decidim/templates/admin/questionnaire_templates/choose", locals: { target: questionnaire, form_title: t("decidim.forms.admin.questionnaires.edit.title") } %>
 <% else %>
   <%= decidim_form_for(@form, url: update_url, method: :put, html: { class: "form edit_questionnaire" }) do |form| %>
-    <%= render partial: "decidim/forms/admin/questionnaires/form", object: form, locals: { title: title_for_questionnaire } %>
+    <%= render partial: "decidim/forms/admin/questionnaires/form", object: form %>
 
     <div class="button--double form-general-submit">
       <%= form.submit t(".save"), class: "button" %>

data/app/views/decidim/forms/questionnaires/_answer.html.erb

@@ -17,7 +17,7 @@
     </div>
   <% end %>
 
-  <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled } %>
+  <%= render partial: "decidim/forms/questionnaires/answers/#{answer.question.question_type}", locals: { answer: answer, answer_form: answer_form, answer_idx: answer_idx, field_id: field_id, disabled: disabled, maxlength: (answer.question.max_characters if answer.question.max_characters.positive?) } %>
 
   <%= answer_form.hidden_field :question_id %>
 

data/app/views/decidim/forms/questionnaires/answers/_files.html.erb

@@ -0,0 +1 @@
+<%= answer_form.file_field :add_documents, label: false, multiple: true, id: field_id, disabled: disabled %>

data/app/views/decidim/forms/questionnaires/answers/_long_answer.html.erb

@@ -1 +1 @@
-<%= answer_form.text_area :body, label: false, id: field_id, rows: 10, disabled: disabled %>
+<%= answer_form.text_area :body, label: false, id: field_id, rows: 10, disabled: disabled, maxlength: maxlength %>

data/app/views/decidim/forms/questionnaires/answers/_matrix_multiple.html.erb

@@ -32,7 +32,8 @@
                 <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][][custom_body]",
                 choice.try(:custom_body),
                 id: "#{choice_id}_custom_body",
-                disabled: true %>
+                disabled: true,
+                maxlength: maxlength %>
               <% end %>
             </div>
           </td>

data/app/views/decidim/forms/questionnaires/answers/_matrix_single.html.erb

@@ -32,7 +32,8 @@
                 <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][#{row_idx}][custom_body]",
                 choice.try(:custom_body),
                 id: "#{choice_id}_custom_body",
-                disabled: true %>
+                disabled: true,
+                maxlength: maxlength %>
               <% end %>
             </div>
           </td>

data/app/views/decidim/forms/questionnaires/answers/_multiple_option.html.erb

@@ -16,7 +16,8 @@
       <% if answer_option.free_text %>
         <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][#{idx}][custom_body]",
         choice.try(:custom_body),
-        disabled: true %>
+        disabled: true,
+        maxlength: maxlength %>
       <% end %>
     </div>
   <% end %>

data/app/views/decidim/forms/questionnaires/answers/_short_answer.html.erb

@@ -1 +1 @@
-<%= answer_form.text_field :body, label: false, id: field_id, disabled: disabled %>
+<%= answer_form.text_field :body, label: false, id: field_id, disabled: disabled, maxlength: maxlength %>

data/app/views/decidim/forms/questionnaires/answers/_single_option.html.erb

@@ -23,7 +23,8 @@
         <%= text_field_tag "questionnaire[responses][#{answer_idx}][choices][][custom_body]",
         choice.try(:custom_body),
         id: "#{choice_id}_custom_body",
-        disabled: true %>
+        disabled: true,
+        maxlength: maxlength %>
       <% end %>
     </div>
   <% end %>

data/app/views/decidim/forms/questionnaires/show.html.erb

@@ -56,7 +56,7 @@
                   </div>
                 <% end %>
 
-                <%= decidim_form_for(@form, url: update_url, method: :post, html: { class: "form answer-questionnaire" }, data: { "safe-path" => form_path }) do |form| %>
+                <%= decidim_form_for(@form, url: update_url, method: :post, html: { multipart: true, class: "form answer-questionnaire" }, data: { "safe-path" => form_path }) do |form| %>
                   <%= form_required_explanation %>
                   <%= invisible_captcha %>
                   <% answer_idx = 0 %>

data/config/initializers/wicked_pdf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "wicked_pdf"
 
 # frozen_string_literal: true

data/config/locales/ca.yml

@@ -14,6 +14,8 @@ ca:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Ha de ser adjuntat de nou
             choices:
               missing: no estan complets
               too_many: en són masses
@@ -78,7 +80,6 @@ ca:
             collapse: Redueix totes les preguntes
             expand: Expandeix totes les preguntes
             preview: Previsualitzar
-            title: Editar el formulari
             unpublished_warning: El formulari no està publicat. Pots modificar les preguntes, però al fer-ho s'esborraran les respostes actuals.
           matrix_row:
             matrix_row: Fila
@@ -110,7 +111,7 @@ ca:
         answer:
           body: El camp no pot estar en blanc
       files:
-        extension_whitelist: 'Formats d''arxiu acceptats:'
+        extension_allowlist: 'Formats d''arxiu acceptats:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Aquesta imatge medirà:'
@@ -118,6 +119,7 @@ ca:
           resize_and_pad: Redimensionat i ajustat a
           resize_to_fit: Redimensionada per ajustar-la
       question_types:
+        files: Fitxers
         long_answer: Resposta llarga
         matrix_multiple: Matriu (opció multiple)
         matrix_single: Matriu (opció única)

data/config/locales/cs.yml

@@ -10,10 +10,15 @@ cs:
         question_type: Typ
       questionnaire_question:
         mandatory: Povinné
+        max_characters: Limit znaků (ponechte na 0, pokud není limit)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Potřebuje být znovu připojen
+            body:
+              too_long: je příliš dlouhý
             choices:
               missing: nejsou úplné
               too_many: jsou příliš mnoho
@@ -74,11 +79,11 @@ cs:
           form:
             add_question: Přidat otázku
             add_separator: Přidat oddělovač
-            already_answered_warning: Dotazník již odpověděli někteří uživatelé, takže nemusíte upravovat své dotazy.
-            collapse: Sbalit všechny úlohy
+            already_answered_warning: Formulář je již zodpovězen některými uživateli, takže jeho otázky nemůžete upravovat.
+            collapse: Sbalit všechny otázky
             expand: Rozbalit všechny otázky
             preview: Náhled
-            title: Upravit formulář
+            title: Upravit formulář pro %{questionnaire_for}
             unpublished_warning: Formulář není zveřejněn. Můžete změnit jeho otázky, ale tím odstraníte aktuální odpovědi.
           matrix_row:
             matrix_row: Řádek
@@ -110,7 +115,7 @@ cs:
         answer:
           body: Tělo nemůže být prázdné
       files:
-        extension_whitelist: 'Akceptované formáty:'
+        extension_allowlist: 'Akceptované formáty:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Tento obrázek bude:'
@@ -118,6 +123,7 @@ cs:
           resize_and_pad: Zmenšeno a odsazeno k
           resize_to_fit: Upravena velikost na vyplnění
       question_types:
+        files: Soubory
         long_answer: Dlouhá odpověď
         matrix_multiple: Matice (Více možností)
         matrix_single: Matice (Jedna možnost)

data/config/locales/de.yml

@@ -3,15 +3,22 @@ de:
     attributes:
       answer:
         body: Antworten
+        choices: Auswahl
+        selected_choices: Ausgewählte Auswahl
       question:
         max_choices: Maximale Anzahl von Auswahlmöglichkeiten
         question_type: Art
       questionnaire_question:
         mandatory: Verpflichtend
+        max_characters: Maximale Anzahl Zeichen (0 bedeutet kein Limit)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Muss erneut angehängt werden
+            body:
+              too_long: ist zu lang
             choices:
               missing: sind nicht vollständig
               too_many: sind zu viele
@@ -76,7 +83,7 @@ de:
             collapse: Alle Fragen einklappen
             expand: Alle Fragen ausklappen
             preview: Vorschau
-            title: Formular bearbeiten
+            title: Formular für %{questionnaire_for} bearbeiten
             unpublished_warning: Das Formular ist nicht öffentlich. Sie können die Fragen ändern, dabei werden allerdings die aktuellen Antworten gelöscht.
           matrix_row:
             matrix_row: Zeile
@@ -108,7 +115,7 @@ de:
         answer:
           body: Körper kann nicht leer sein
       files:
-        extension_whitelist: 'Gültige Formate:'
+        extension_allowlist: 'Gültige Formate:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'Das Bild wird:'
@@ -116,6 +123,7 @@ de:
           resize_and_pad: in der Größe angepasst und gepolstert zu
           resize_to_fit: in der Größe verändert, damit es passt
       question_types:
+        files: Dateien
         long_answer: Lange Antwort
         matrix_multiple: Matrix (Mehrfachoption)
         matrix_single: Matrix (Einzelne Option)

data/config/locales/el.yml

@@ -66,7 +66,7 @@ el:
         answer:
           body: Το σώμα δεν μπορεί να είναι κενό
       files:
-        extension_whitelist: 'Αποδεκτές μορφές:'
+        extension_allowlist: 'Αποδεκτές μορφές:'
       images:
         dimensions: "Π %{width} x Υ %{height} px"
         dimensions_info: 'Για αυτήν την εικόνα θα:'

data/config/locales/en.yml

@@ -11,10 +11,15 @@ en:
         question_type: Type
       questionnaire_question:
         mandatory: Mandatory
+        max_characters: Character limit (leave to 0 if no limit)
     errors:
       models:
         answer:
           attributes:
+            add_documents:
+              needs_to_be_reattached: Needs to be reattached
+            body:
+              too_long: is too long
             choices:
               missing: are not complete
               too_many: are too many
@@ -79,7 +84,7 @@ en:
             collapse: Collapse all questions
             expand: Expand all questions
             preview: Preview
-            title: Edit form
+            title: Edit form for %{questionnaire_for}
             unpublished_warning: The form is not published. You may modify its questions, but doing so will delete current answers.
           matrix_row:
             matrix_row: Row
@@ -111,7 +116,7 @@ en:
         answer:
           body: Body can't be blank
       files:
-        extension_whitelist: 'Accepted formats:'
+        extension_allowlist: 'Accepted formats:'
       images:
         dimensions: "%{width} x %{height} px"
         dimensions_info: 'This image will be:'
@@ -119,6 +124,7 @@ en:
           resize_and_pad: Resized and padded to
           resize_to_fit: Resized to fit
       question_types:
+        files: Files
         long_answer: Long answer
         matrix_multiple: Matrix (Multiple option)
         matrix_single: Matrix (Single option)