effective_polls 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6a8bdf3c390cdfb86549465e0b02dca81c9036e6dc62535c0b520be3bf56c91
-  data.tar.gz: 19eef49b77145f3efca025591e2a790efcf0c88a1e98d0599edd4a874caebaf0
+  metadata.gz: 1893c50235d32c084e4edda3e02512dc4d3dda12fe78c0950912bd445b290d95
+  data.tar.gz: 68a4ec6af9aba679d144bceb777fbecc4669216369ad5f1bb25d1f4d9e6284af
 SHA512:
-  metadata.gz: 7a20600e039346a802e89b17bf24457793d2efdc8d2848dfaec78a59be8be5366261027f4dc6c3c78fc178652acaf06644f7521c1398e07750e4d17bbe2ac66b
-  data.tar.gz: 17d0bc1e39ca2ff8221f1eecc02ee5c897d2fd930d539cbc728a4112d699f8c959877edf118a0920b5472fcff8744bc23cb62ce0a232bcc2df2a2f4e1f1ab608
+  metadata.gz: 542819abd880bf6f6be5644a6d87339e2aef874883017bb354d19a23bcc7b12b89c24c9af9fc60fd0d8d66a2bd1ef4843cbb6e84adce314d4cd72f0fc610324f
+  data.tar.gz: aecfe705c0a2000edfa42932a9fc8a415086e6c9d95c6ebbf12080958808cf501fc40deb2db477251ee44c4c5d0da0935b1dc003ef231bac586fe20d96830c3d

data/app/controllers/effective/ballots_controller.rb

@@ -56,7 +56,7 @@ module Effective
       when :vote
         params.require(:effective_ballot).permit(:current_step, ballot_responses_attributes: [
           :id, :poll_id, :poll_question_id,
-          :date, :email, :number, :long_answer, :short_answer, :upload_file,
+          :date, :email, :number, :long_answer, :short_answer, :upload_file, :_destroy,
           :poll_question_option_ids, poll_question_option_ids: []
         ])
       when :submit

data/app/datatables/admin/effective_poll_questions_datatable.rb

@@ -6,23 +6,40 @@ class Admin::EffectivePollQuestionsDatatable < Effective::Datatable
     col :created_at, visible: false
     col :id, visible: false
 
-    col :poll
+    if attributes[:follow_up]
+      col :show_if_value_to_s, label: 'When answered with'
+    else
+      col :poll
+    end
 
-    col :position do |poll_question|
+    col :position, visible: false do |poll_question|
       poll_question.position.to_i + 1
     end
 
     col :title
-    col :body, as: :text
+    col :body, as: :text, visible: !attributes[:follow_up]
     col :required
 
     col :category, label: 'Type'
     col :poll_question_options, label: 'Options'
 
+    unless attributes[:follow_up]
+      col :follow_up_poll_questions, action: false, label: 'Follow up questions'
+    end
+
     actions_col
   end
 
   collection do
-    Effective::PollQuestion.all.deep
+    scope = Effective::PollQuestion.all.deep
+
+    if attributes[:follow_up]
+      scope = scope.where(follow_up: true, poll_question_id: attributes[:poll_question_id])
+    else
+      scope = scope.where(poll_question_id: nil)
+    end
+
+    scope
   end
+
 end

data/app/datatables/admin/effective_poll_results_datatable.rb

@@ -5,7 +5,7 @@ class Admin::EffectivePollResultsDatatable < Effective::Datatable
     col :position, visible: false
     col :category, search: Effective::PollQuestion::CATEGORIES, visible: false
 
-    col :question, search: poll.poll_questions.pluck(:title)
+    col :question, search: poll.poll_questions.pluck(:title).sort
     col :responses
   end
 

data/app/models/concerns/effective_polls_user.rb

@@ -55,6 +55,16 @@ module EffectivePollsUser
       end
     end
 
+    if self.class.try(:effective_mentorships_user?)
+      Effective::MentorshipCycle.sorted.each do |cycle|
+        scopes += [
+          ["All grouped participants in #{cycle}", "mentorships_with_groups_id_#{cycle.id}"],
+          ["All grouped mentors in #{cycle}", "mentorships_mentors_with_groups_id_#{cycle.id}"],
+          ["All grouped mentees in #{cycle}", "mentorships_mentees_with_groups_id_#{cycle.id}"],
+        ]
+      end
+    end
+
     scopes
   end
 
@@ -72,6 +82,12 @@ module EffectivePollsUser
       return collection.with_committee(Effective::Committee.find_by_id(id))
     when :with_role
       return collection.with_role(id)
+    when :mentorships_with_groups
+      return collection.mentorships_with_groups(Effective::MentorshipCycle.find_by_id(id))
+    when :mentorships_mentors_with_groups
+      return collection.mentorships_mentors_with_groups(Effective::MentorshipCycle.find_by_id(id))
+    when :mentorships_mentees_with_groups
+      return collection.mentorships_mentees_with_groups(Effective::MentorshipCycle.find_by_id(id))
     end
 
     # Otherwise we don't know what this scope is

data/app/models/effective/ballot.rb

@@ -10,7 +10,7 @@ module Effective
     belongs_to :poll
 
     has_many :ballot_responses, dependent: :destroy
-    accepts_nested_attributes_for :ballot_responses
+    accepts_nested_attributes_for :ballot_responses, allow_destroy: true
 
     acts_as_tokened
 

data/app/models/effective/poll_question.rb

@@ -2,9 +2,14 @@ module Effective
   class PollQuestion < ActiveRecord::Base
     belongs_to :poll
 
+    belongs_to :poll_question, optional: true # Present when I'm a follow up question
+    belongs_to :poll_question_option, optional: true # Might be present when I'm a follow up question
+
     has_many :poll_question_options, -> { order(:position) }, inverse_of: :poll_question, dependent: :delete_all
     accepts_nested_attributes_for :poll_question_options, reject_if: :all_blank, allow_destroy: true
 
+    has_many :follow_up_poll_questions, -> { order(:position) }, class_name: 'Effective::PollQuestion', foreign_key: :poll_question_id, dependent: :destroy
+
     has_rich_text :body
     log_changes(to: :poll) if respond_to?(:log_changes)
 
@@ -34,6 +39,8 @@ module Effective
       'Select up to 5'
     ]
 
+    UNSUPPORTED_FOLLOW_UP_QUESTION_CATEGORIES = ['Upload File']
+
     effective_resource do
       title         :string
       category      :string
@@ -41,21 +48,37 @@ module Effective
 
       position      :integer
 
+      follow_up        :boolean
+      follow_up_value  :string
+
       timestamps
     end
 
-    before_validation(if: -> { poll.present? }) do
-      self.position ||= (poll.poll_questions.map { |obj| obj.position }.compact.max || -1) + 1
+    before_validation(if: -> { poll_question.present? }) do
+      assign_attributes(poll: poll_question.poll)
+    end
+
+    # Set position
+    before_validation do
+      source = poll_question_option.try(:follow_up_poll_questions) || poll.try(:poll_questions) || []
+      self.position = (source.map { |obj| obj.position }.compact.max || -1) + 1
     end
 
     scope :deep, -> { with_rich_text_body_and_embeds.includes(:poll_question_options) }
     scope :sorted, -> { order(:position) }
 
+    scope :top_level, -> { where(follow_up: false) }
+    scope :follow_up, -> { where(follow_up: true) }
+
     validates :title, presence: true
     validates :category, presence: true, inclusion: { in: CATEGORIES }
     validates :position, presence: true
     validates :poll_question_options, presence: true, if: -> { poll_question_option? }
 
+    validates :poll_question, presence: true, if: -> { follow_up? }
+    validates :poll_question_option, presence: true, if: -> { follow_up? && poll_question.try(:poll_question_option?) }
+    validates :follow_up_value, presence: true, if: -> { follow_up? && !poll_question.try(:poll_question_option?) }
+
     # Create choose_one? and select_all_that_apply? methods for each category
     CATEGORIES.each do |category|
       define_method(category.parameterize.underscore + '?') { self.category == category }
@@ -65,6 +88,28 @@ module Effective
       title.presence || model_name.human
     end
 
+    def show_if_attribute
+      return :poll_question_option_ids if poll_question_option?
+
+      case category
+      when 'Date' then :date
+      when 'Email' then :email
+      when 'Number' then :number
+      when 'Long Answer' then :long_answer
+      when 'Short Answer' then :short_answer
+      when 'Upload File' then :upload_file
+      else :unknown
+      end
+    end
+
+    def show_if_value
+      poll_question.try(:poll_question_option?) ? poll_question_option_id : follow_up_value
+    end
+
+    def show_if_value_to_s
+      (poll_question.try(:poll_question_option?) ? poll_question_option : follow_up_value).to_s
+    end
+
     def poll_question_option?
       WITH_OPTIONS_CATEGORIES.include?(category)
     end

data/app/views/admin/poll_questions/_form.html.haml

@@ -4,6 +4,21 @@
   - else
     = f.select :poll_id, Effective::Poll.all
 
+  -# Follow up
+  - if inline_datatable? && (original = f.object.poll_question).present?
+    = f.hidden_field :follow_up, value: true
+    = f.hidden_field :poll_question_id
+
+    .mb-3.card
+      .card-body
+        %h5 Follow up Question
+        %p.text-muted This question will only appear when they answer the above question with the following value:
+
+        - if original.poll_question_option?
+          = f.select :poll_question_option_id, original.poll_question_options, label: 'Answer required to display this question'
+        - else
+          = f.text_field :follow_up_value, label: 'Answer required to display this question', required: true, hint: 'Enter the exact answer value that should trigger this question to appear'
+
   = f.text_field :title, label: 'Question Title'
 
   - if defined?(EffectiveArticleEditor)
@@ -17,11 +32,8 @@
   = f.show_if :category, 'Choose one' do
     .mt-3.card
       .card-body
-        %h5 Options
-        %p Display the following options:
-
-        = f.has_many :poll_question_options, build: true do |fa|
-          = fa.text_field :title, label: false
+        %h5 Choose one
+        %p Display radio buttons to select one option
 
   = f.show_if :category, 'Select all that apply' do
     .card
@@ -105,3 +117,16 @@
           = fa.text_field :title, label: false
 
   = effective_submit(f)
+
+- unless poll_question.follow_up?
+  %h2 Follow up questions
+
+  - if Effective::PollQuestion::UNSUPPORTED_FOLLOW_UP_QUESTION_CATEGORIES.include?(poll_question.category)
+    %p.text-muted 
+      %em Follow up questions are not supported for the #{poll_question.category} question category
+  - elsif poll_question.new_record?
+    %p.text-muted 
+      %em Please save this question to add follow up questions
+  - else
+    %p Display follow up question(s) based on the answer to this question:
+    = render_inline_datatable Admin::EffectivePollQuestionsDatatable.new(follow_up: true, poll_question: poll_question)

data/app/views/effective/ballot_responses/fields/_upload_file.html.haml

@@ -1 +1,2 @@
-= f.file_field :upload_file, label: false, required: poll_question.required?
+- # Always required false here because we'll handle the logic in the ballot_response model
+= f.file_field :upload_file, label: false, required: false

data/app/views/effective/ballots/_ballot.html.haml

@@ -6,9 +6,17 @@
         %th Response
 
     %tbody
-      - ballot.poll.poll_questions.each_with_index do |poll_question, index|
+      - ballot.poll.poll_questions.top_level.deep.each do |poll_question|
         - ballot_response = ballot.ballot_response(poll_question)
 
         %tr
           %td= poll_question
           %td= render(ballot_response)
+
+        - poll_question.follow_up_poll_questions.deep.each do |follow_up_poll_question|
+          - ballot_response = ballot.ballot_response(follow_up_poll_question)
+
+          - if ballot_response.persisted?
+            %tr
+              %td= follow_up_poll_question
+              %td= render(ballot_response)

data/app/views/effective/ballots/vote.html.haml

@@ -5,10 +5,21 @@
     = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
       = f.hidden_field :current_step
 
-      - resource.poll.poll_questions.deep.all.each_with_index do |poll_question, index|
+      - resource.poll.poll_questions.top_level.deep.each do |poll_question|
         - ballot_response = resource.ballot_response(poll_question)
 
         = f.fields_for :ballot_responses, ballot_response do |fbr|
           = render('/effective/ballot_responses/fields', f: fbr, poll_question: poll_question)
 
+          - poll_question.follow_up_poll_questions.each do |follow_up|
+            - ballot_response = resource.ballot_response(follow_up)
+
+            = fbr.show_if(poll_question.show_if_attribute, follow_up.show_if_value) do
+              = f.fields_for :ballot_responses, ballot_response do |fbr|
+                = render('/effective/ballot_responses/fields', f: fbr, poll_question: follow_up)
+
+            = fbr.hide_if(poll_question.show_if_attribute, follow_up.show_if_value) do
+              = f.fields_for :ballot_responses, ballot_response do |fbr|
+                = fbr.hidden_field :_destroy, value: true
+
       = f.submit 'Save and Continue', center: true

data/app/views/effective/poll_results/_results.html.haml

@@ -33,13 +33,25 @@
           %tbody
             - ballots = poll.ballots
 
-            - poll.poll_questions.each_with_index do |poll_question, index|
+            - poll.poll_questions.top_level.each_with_index do |poll_question, index|
               - ballot_responses = poll.poll_results(poll_question: poll_question)
 
               %tr
                 %td
-                  #{poll_question.position + 1}. #{poll_question}
+                  #{index + 1}. #{poll_question}
                   %br
                   %small.text-muted= poll_question.category
 
                 %td= render('effective/poll_results/poll_result', poll_question: poll_question, ballot_responses: ballot_responses)
+
+              - poll_question.follow_up_poll_questions.each_with_index do |follow_up_poll_question, index|
+                - ballot_responses = poll.poll_results(poll_question: follow_up_poll_question)
+
+                %tr
+                  %td
+                    .ml-4
+                      #{('a'.ord + index).chr}. #{follow_up_poll_question}
+                      %br
+                      %small.text-muted= follow_up_poll_question.category
+
+                  %td= render('effective/poll_results/poll_result', poll_question: follow_up_poll_question, ballot_responses: ballot_responses)

data/db/migrate/101_create_effective_polls.rb

@@ -49,6 +49,12 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
 
       t.integer :position
 
+      t.boolean :follow_up, default: false
+      t.string :follow_up_value
+
+      t.integer :poll_question_id
+      t.integer :poll_question_option_id
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.7.2'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails