decidim-forms 0.20.1 → 0.23.1

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

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    # A class used to collect user answers for a questionnaire
+    class QuestionnaireParticipants < Rectify::Query
+      # Syntactic sugar to initialize the class and return the queried objects.
+      #
+      # questionnaire - a Questionnaire object
+      def self.for(questionnaire)
+        new(questionnaire).query
+      end
+
+      # Initializes the class.
+      #
+      # questionnaire = a Questionnaire object
+      def initialize(questionnaire)
+        @questionnaire = questionnaire
+      end
+
+      # Finds all Answers for the questionnaire (unique session_tokens).
+      # Because exporters only have access to the Answers this
+      # is used as an indirect way to access the participants
+      # (see #participants and #participant)
+      def query
+        Answer.where(questionnaire: @questionnaire)
+      end
+
+      def participant(session_token)
+        query.find_by(session_token: session_token)
+      end
+
+      def participants
+        subquery = query.select("DISTINCT ON (decidim_forms_answers.session_token) decidim_forms_answers.*")
+        Answer.select("*").from(subquery).order(:created_at)
+      end
+
+      def count_participants
+        query.select(:session_token).distinct.count
+      end
+    end
+  end
+end

data/app/types/decidim/forms/answer_option_type.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    AnswerOptionType = GraphQL::ObjectType.define do
+      name "AnswerOption"
+      description "An answer option for a multi-choice question in a questionnaire"
+
+      field :id, !types.ID, "ID of this answer option"
+      field :body, !Decidim::Core::TranslatedFieldType, "The text answer response option."
+      field :freeText, !types.Boolean, "Whether if this answer accepts any free text from the user.", property: :free_text
+    end
+  end
+end

data/app/types/decidim/forms/question_type.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    QuestionType = GraphQL::ObjectType.define do
+      name "Question"
+      description "A question in a questionnaire"
+
+      interfaces [
+        -> { Decidim::Core::TimestampsInterface }
+      ]
+
+      field :id, !types.ID, "ID of this question"
+      field :body, !Decidim::Core::TranslatedFieldType, "What is being asked in this question."
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this question."
+      field :mandatory, !types.Boolean, "Whether if this question is mandatory."
+      field :position, types.Int, "Order position of the question in the questionnaire"
+      field :maxChoices, types.Int, "On questions with answer options, maximum number of choices the user has", property: :max_choices
+      field :questionType, types.String, "Type of question.", property: :question_type
+      field :answerOptions, !types[AnswerOptionType], "List of answer options in multi-choice questions.", property: :answer_options
+    end
+  end
+end

data/app/types/decidim/forms/questionnaire_type.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Forms
+    QuestionnaireType = GraphQL::ObjectType.define do
+      name "Questionnaire"
+      description "A questionnaire"
+
+      interfaces [
+        -> { Decidim::Core::TimestampsInterface }
+      ]
+
+      field :id, !types.ID, "ID of this questionnaire"
+      field :title, !Decidim::Core::TranslatedFieldType, "The title of this questionnaire."
+      field :description, Decidim::Core::TranslatedFieldType, "The description of this questionnaire."
+      field :tos, Decidim::Core::TranslatedFieldType, "The Terms of Service for this questionnaire."
+      field :forType, types.String, "Type of entity using this questionnaire.", property: :questionnaire_for_type
+      field :forEntity, QuestionnaireEntityInterface, "Entity using this questionnaire.", property: :questionnaire_for
+      field :questions, !types[QuestionType], "Questions in this questionnaire."
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 <% question = form.object %>
 
-<script type="text/template" class="decidim-template" id="<%= template_id %>">
+<script type="text/template" class="decidim-answer-option-template decidim-template" id="<%= template_id %>">
   <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", blank_answer_option do |answer_option_form| %>
     <%= render "decidim/forms/admin/questionnaires/answer_option", form: answer_option_form, question: question, editable: editable %>
   <% end %>

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

@@ -0,0 +1,88 @@
+<% display_condition = form.object %>
+
+<div class="card questionnaire-question-display-condition">
+  <div class="card-divider">
+    <h2 class="card-title">
+    <span><%= t(".display_condition") %></span>
+    <% if editable %>
+      <button class="button small alert hollow remove-display-condition button--title">
+        <%= t(".remove") %>
+      </button>
+    <% end %>
+    </h2>
+  </div>
+  <div class="card-section">
+    <div class="row column">
+      <small class="text-muted">
+        <%= t(".save_warning") %>
+      </small>
+    </div>
+  </div>
+  <div class="card-section">
+    <div class="row column questionnaire-question-display-condition-condition-question">
+      <%=
+        form.select(
+          :decidim_condition_question_id,
+          options_for_select(display_condition.questions_for_select(questionnaire, question.id), selected: display_condition.decidim_condition_question_id),
+          { prompt: t(".select_condition_question"), label: t(".condition_question") },
+          disabled: !editable,
+          data: { url: answer_options_url(id: question.id) }
+        )
+      %>
+    </div>
+    <div class="row column">
+      <%=
+        form.select(
+          :condition_type,
+          options_from_collection_for_select(display_condition_types, :first, :last, display_condition.condition_type),
+          { prompt: t(".select_condition_type"), label: t(".condition_type") },
+          disabled: !editable,
+        )
+      %>
+    </div>
+    <div class="row column questionnaire-question-display-condition-answer-option">
+      <%=
+        form.select(
+          :decidim_answer_option_id,
+          options_from_collection_for_select(display_condition.answer_options, :id, :translated_body, display_condition.answer_option),
+          { prompt: t(".select_answer_option"), label: t(".answer_option") },
+          disabled: !editable,
+          data: { selected: display_condition.answer_option&.id }
+        )
+      %>
+    </div>
+    <div class="row column questionnaire-question-display-condition-value">
+      <%=
+        form.translated(
+          :text_field,
+          :condition_value,
+          tabs_id: tabs_id_for_question_display_condition(question, display_condition),
+          label: t(".condition_value"),
+          disabled: !editable
+        )
+      %>
+    </div>
+    <div class="row column">
+      <%=
+        form.check_box(
+          :mandatory,
+          label: t(".mandatory"),
+          disabled: !questionnaire.questions_editable?
+        )
+      %>
+    </div>
+    <div class="row column">
+      <% display_condition.errors.full_messages.each do |msg| %>
+        <small class="form-error is-visible"><%= msg %></small>
+      <% end %>
+    </div>
+  </div>
+
+  <%= form.hidden_field :decidim_question_id, value: question.id, disabled: !editable %>
+
+  <% if display_condition.persisted? %>
+    <%= form.hidden_field :id, disabled: !editable %>
+  <% end %>
+
+  <%= form.hidden_field :deleted, disabled: !editable %>
+</div>

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

@@ -0,0 +1,7 @@
+<% question = form.object %>
+
+<script type="text/template" class="decidim-template" id="<%= template_id %>">
+  <%= fields_for "questionnaire[questions][#{question.to_param}][display_conditions][]", blank_display_condition do |display_condition_form| %>
+    <%= render "decidim/forms/admin/questionnaires/display_condition", form: display_condition_form, question: question, editable: editable %>
+  <% end %>
+</script>

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

@@ -1,10 +1,26 @@
 <div class="card">
   <div class="card-divider">
     <h2 class="card-title">
-      <%= title %>
-      <div class="button--title">
-        <%= export_dropdown if allowed_to? :export_answers, :questionnaire %>
-      </div>
+      <%= t(".title") %>
+      <% unless template? questionnaire.questionnaire_for %>
+        <% if allowed_to? :preview, :questionnaire %>
+          <div class="button--title">
+            <%= link_to t(".preview"), public_url, class: "button tiny button--simple", target: :_blank %>
+          </div>
+        <% end %>
+        <% if questionnaire.answers.any? %>
+          <div class="button--title">
+            <%= export_dropdown if allowed_to? :export_answers, :questionnaire %>
+          </div>
+          <div class="button--title">
+            <% if allowed_to? :show, :questionnaire_answers %>
+              <%= link_to t("actions.show", scope: "decidim.forms.admin.questionnaires"), questionnaire_participants_url, class: "button tiny button--title new" %>
+            <% end %>
+          </div>
+        <% else %>
+          <button class="button tiny button--title" disabled><%= t("empty", scope: "decidim.forms.admin.questionnaires.answers") %></a>
+        <% end %>
+      <% end %>
     </h2>
   </div>
   <div class="card-section">
@@ -21,12 +37,37 @@
 </div>
 
 <div class="questionnaire-questions">
+  <div class="row column text-center">
+    <button type="button" class="button collapse-all"><%= t(".collapse") %></button>
+    <button type="button" class="button expand-all"><%= t(".expand") %></button>
+  </div>
+
   <% if questionnaire.questions_editable? %>
+    <% if questionnaire.answers.any? && !questionnaire.published? %>
+      <div class="callout warning">
+        <%= t(".unpublished_warning") %>
+      </div>
+    <% end %>
+
     <%= fields_for "questionnaire[questions][#{blank_question.to_param}]", blank_question do |question_form| %>
-      <script type="text/template" class="decidim-template">
-        <%= render "decidim/forms/admin/questionnaires/question", form: question_form, id: tabs_id_for_question(blank_question), editable: questionnaire.questions_editable?, child_template_selector: "#answer-option-template-dummy" %>
+      <script type="text/template" class="decidim-question-template decidim-template" id="question-template">
+        <%= render "decidim/forms/admin/questionnaires/question",
+              form: question_form,
+              id: tabs_id_for_question(blank_question),
+              editable: questionnaire.questions_editable?,
+              answer_option_template_selector: "#answer-option-template-dummy",
+              display_condition_template_selector: "#display-condition-template-dummy",
+              matrix_row_template_selector: "#matrix-row-template-dummy" %>
+      </script>
+      <script type="text/template" class="decidim-separator-template decidim-template" id="separator-template">
+        <%= render "decidim/forms/admin/questionnaires/separator",
+              form: question_form,
+              id: tabs_id_for_question(blank_question),
+              editable: questionnaire.questions_editable? %>
       </script>
       <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-dummy" %>
+      <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-dummy" %>
+      <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-dummy" %>
     <% end %>
   <% else %>
     <div class="callout warning">
@@ -37,17 +78,35 @@
   <div class="questionnaire-questions-list">
     <% @form.questions.each_with_index do |question, index| %>
       <%= fields_for "questionnaire[questions][]", question do |question_form| %>
-        <%= render "decidim/forms/admin/questionnaires/question", form: question_form, id: tabs_id_for_question(question), editable: questionnaire.questions_editable?, child_template_selector: "#answer-option-template-#{index}" %>
-        <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-#{index}" %>
+        <% if question.separator? %>
+          <%= render "decidim/forms/admin/questionnaires/separator",
+                form: question_form,
+                id: tabs_id_for_question(question),
+                editable: questionnaire.questions_editable? %>
+        <% else %>
+          <%= render "decidim/forms/admin/questionnaires/question",
+                form: question_form,
+                id: tabs_id_for_question(question),
+                editable: questionnaire.questions_editable?,
+                display_condition_template_selector: "#display-condition-template-#{index}",
+                answer_option_template_selector: "#answer-option-template-#{index}",
+                matrix_row_template_selector: "#matrix-row-template-#{index}" %>
+          <%= render "decidim/forms/admin/questionnaires/display_condition_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "display-condition-template-#{index}" %>
+          <%= render "decidim/forms/admin/questionnaires/answer_option_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "answer-option-template-#{index}" %>
+          <%= render "decidim/forms/admin/questionnaires/matrix_row_template", form: question_form, editable: questionnaire.questions_editable?, template_id: "matrix-row-template-#{index}" %>
+        <% end %>
       <% end %>
     <% end %>
   </div>
 
   <% if questionnaire.questions_editable? %>
     <button class="button add-question"><%= t(".add_question") %></button>
+    <button class="button add-separator"><%= t(".add_separator") %></button>
   <% end %>
 </div>
 
 <% if questionnaire.questions_editable? %>
   <%= javascript_include_tag "decidim/forms/admin/forms" %>
 <% end %>
+
+<%= javascript_include_tag "decidim/forms/admin/collapsible_questions" %>

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

@@ -0,0 +1,34 @@
+<% matrix_row = form.object %>
+
+<div class="card questionnaire-question-matrix-row">
+  <div class="card-divider">
+    <h2 class="card-title">
+    <span><%= t(".matrix_row") %></span>
+    <% if editable %>
+      <button class="button small alert hollow remove-matrix-row button--title">
+        <%= t(".remove") %>
+      </button>
+    <% end %>
+    </h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
+      <%=
+        form.translated(
+          :text_field,
+          :body,
+          tabs_id: tabs_id_for_question_matrix_row(question, matrix_row),
+          label: t(".statement"),
+          disabled: !editable
+        )
+      %>
+    </div>
+  </div>
+
+  <% if matrix_row.persisted? %>
+    <%= form.hidden_field :id, disabled: !editable %>
+  <% end %>
+
+  <%= form.hidden_field :deleted, disabled: !editable %>
+</div>

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

@@ -0,0 +1,7 @@
+<% question = form.object %>
+
+<script type="text/template" class="decidim-matrix-row-template decidim-template" id="<%= template_id %>">
+  <%= fields_for "questionnaire[questions][#{question.to_param}][matrix_rows][]", blank_matrix_row do |matrix_row_form| %>
+    <%= render "decidim/forms/admin/questionnaires/matrix_row", form: matrix_row_form, question: question, editable: editable %>
+  <% end %>
+</script>

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

@@ -1,16 +1,26 @@
 <% question = form.object %>
+<% is_expanded = question.errors.any? %>
 
 <div class="card questionnaire-question" id="<%= id %>-field">
   <div class="card-divider question-divider">
     <h2 class="card-title">
     <span>
       <% if editable %>
-        <%== "#{icon("move")} #{t(".question")}" %>
-      <% else %>
-        <%= t(".question") %>
+        <%== icon("move") %>
       <% end %>
+      <%= dynamic_title(translated_attribute(question.body), class: "question-title-statement", max_length: 50, omission: "...", placeholder: t(".question")) %>
     </span>
 
+    <button type="button" class="button small secondary button--title question--collapse" data-toggle="<%= id %>-question-card button--collapse-question-<%= id %> button--expand-question-<%= id %>">
+      <span id="button--collapse-question-<%= id %>" data-toggler=".hide" class="icon-collapse <%= "hide" unless is_expanded %>">
+        <%== icon("caret-top", aria_label: t(".collapse"), role: "img") %>
+      </span>
+
+      <span id="button--expand-question-<%= id %>" data-toggler=".hide" class="icon-expand <%= "hide" if is_expanded %>">
+        <%== icon("caret-bottom", aria_label: t(".expand"), role: "img") %>
+      </span>
+    </button>
+
     <% if editable %>
       <button class="button small alert hollow move-up-question button--title">
         <%== "#{icon("arrow-top")} #{t(".up")}" %>
@@ -27,7 +37,7 @@
     </h2>
   </div>
 
-  <div class="card-section">
+  <div class="card-section collapsible <%= "hide" unless is_expanded %>" data-toggler=".hide" id="<%= id %>-question-card">
     <div class="row column">
       <%=
         form.translated(
@@ -81,7 +91,21 @@
     <%= form.hidden_field :position, value: question.position || 0, disabled: !editable %>
     <%= form.hidden_field :deleted, disabled: !editable %>
 
-    <div class="questionnaire-question-answer-options" data-template="<%= child_template_selector %>">
+    <div class="questionnaire-question-matrix-rows" data-template="<%= matrix_row_template_selector %>">
+      <div class="questionnaire-question-matrix-rows-list">
+        <% question.matrix_rows.each do |matrix_row| %>
+          <%= fields_for "questionnaire[questions][#{question.to_param}][matrix_rows][]", matrix_row do |matrix_row_form| %>
+            <%= render "decidim/forms/admin/questionnaires/matrix_row", form: matrix_row_form, question: question, editable: editable %>
+          <% end %>
+        <% end %>
+      </div>
+
+      <% if editable %>
+        <button class="button add-matrix-row"><%= t(".add_matrix_row") %></button>
+      <% end %>
+    </div>
+
+    <div class="questionnaire-question-answer-options" data-template="<%= answer_option_template_selector %>">
       <div class="questionnaire-question-answer-options-list">
         <% question.answer_options.each do |answer_option| %>
           <%= fields_for "questionnaire[questions][#{question.to_param}][answer_options][]", answer_option do |answer_option_form| %>
@@ -100,10 +124,25 @@
         form.select(
           :max_choices,
           (2..question.number_of_options),
-          { prompt: t(".any") },
+          { include_blank: t(".any") },
           disabled: !editable
         )
       %>
     </div>
+
+    <div class="questionnaire-question-display-conditions" data-template="<%= display_condition_template_selector %>">
+      <div class="questionnaire-question-display-conditions-list">
+        <% question.display_conditions.each do |display_condition| %>
+          <%= fields_for "questionnaire[questions][#{question.to_param}][display_conditions][]", display_condition do |display_condition_form| %>
+            <%= render "decidim/forms/admin/questionnaires/display_condition", form: display_condition_form, question: question, editable: editable %>
+          <% end %>
+        <% end %>
+      </div>
+
+      <% if editable %>
+        <% disabled = !question.persisted? %>
+        <button <%= "disabled" if disabled %> title="<%= disabled ? t(".add_display_condition_info") : t(".add_display_condition_info") %>" class="button add-display-condition"><%= t(".add_display_condition") %></button>
+      <% end %>
+    </div>
   </div>
 </div>