effective_polls 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564dabc8a5490be5d5ebf050a0b4e718b69781dcc9b7d585e8644546f54288cd
-  data.tar.gz: 1503bc14d59cc2e1b1d7a9938065b5ac687eb8b81defcc594fc95b74b7284009
+  metadata.gz: 75f0f5786c67293ac7c6e5d8758334fe217c3d2b6361185ec36a8792fe751eaf
+  data.tar.gz: '08c11bd2988f3cf8c8ab81b3ffaa2fda3d445b7460004cd25d329ba984a81db5'
 SHA512:
-  metadata.gz: 811446095aa021a4eed57a83047f79debbdab3c931184ff748c6c36181202691d7a5c845b4b5c364a984b5785d9f661d8ca56268eec807c5c6cf95905d250e2d
-  data.tar.gz: 8e5e682feb705f6a4891b734610fac4c6e5a90ae897119f04c63c28bf32ea2479fb041ca8653bf32876974bb52dd8c72cdebf7e8d29fe47ba1230572ebef9cbd
+  metadata.gz: acfb2e71deb5da69bb9f37ccc6889cb93aee01624854e37537cadae80c19f49569fbc1d63080ca32c343595158e99a75833a9393efd1d9c311408151e2b4392d
+  data.tar.gz: 1adb90d91b12bed10d2eb7260080487eac8e5e2c689f171b0032a8dce139e4ddd7fe1e3f1a779826032cef0234b8b0fd1f7247c125e0c0a0c97364ac56c87056

data/app/controllers/effective/ballots_controller.rb

@@ -19,7 +19,7 @@ module Effective
         flash[:danger] = 'You have already completed a ballot for this poll.'
         redirect_to(root_path)
       elsif existing.present?
-        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(existing.next_step)} step."
+        flash[:success] = "You have been redirected to the #{resource_wizard_step_title(existing, existing.next_step)} step."
         redirect_to effective_polls.poll_ballot_build_path(existing.poll, existing, existing.next_step)
       end
     end

data/app/datatables/admin/effective_poll_notifications_datatable.rb

@@ -23,6 +23,8 @@ class Admin::EffectivePollNotificationsDatatable < Effective::Datatable
         Effective::PollNotification::UPCOMING_REMINDERS.invert[poll_notification.reminder]
       when 'Reminder'
         Effective::PollNotification::REMINDERS.invert[poll_notification.reminder]
+      when 'Before poll ends'
+        Effective::PollNotification::UPCOMING_REMINDERS.invert[poll_notification.reminder]
       else
         raise('unexpected category')
       end

data/app/datatables/admin/effective_poll_results_datatable.rb

@@ -10,7 +10,7 @@ class Admin::EffectivePollResultsDatatable < Effective::Datatable
   end
 
   collection do
-    ballot_responses = Effective::BallotResponse.completed.deep.where(poll: poll)
+    ballot_responses = Effective::BallotResponse.completed.deep.where(poll: poll, poll_question: poll.poll_questions)
 
     ballot_responses.flat_map do |br|
       rows = if br.poll_question.poll_question_option?

data/app/mailers/effective/polls_mailer.rb

@@ -35,6 +35,17 @@ module Effective
       )
     end
 
+    def poll_before_poll_ends(poll_notification, user)
+      @assigns = effective_email_templates_assigns(poll_notification, user)
+
+      mail(
+        to: user.email,
+        from: poll_notification.from,
+        body: poll_notification.body,
+        subject: poll_notification.subject
+      )
+    end
+
     def poll_when_poll_ends(poll_notification, user)
       @assigns = effective_email_templates_assigns(poll_notification, user)
 
@@ -59,7 +70,7 @@ module Effective
       {
         available_date: poll.available_date,
         title: poll.title,
-        url: effective_polls.new_poll_ballot_url(poll),
+        url: effective_polls.poll_url(poll),
         user: {
           name: user.to_s,
           email: user.email

data/app/models/effective/ballot_response.rb

@@ -48,19 +48,19 @@ module Effective
     validates :poll_question_option_ids, if: -> { poll_question&.choose_one? },
       length: { maximum: 1, message: 'please choose 1 option only' }
 
-    validates :poll_question_option_ids, if: -> { poll_question&.select_upto_1? },
+    validates :poll_question_option_ids, if: -> { poll_question&.select_up_to_1? },
       length: { maximum: 1, message: 'please select 1 option or fewer' }
 
-    validates :poll_question_option_ids, if: -> { poll_question&.select_upto_2? },
+    validates :poll_question_option_ids, if: -> { poll_question&.select_up_to_2? },
       length: { maximum: 2, message: 'please select 2 options or fewer' }
 
-    validates :poll_question_option_ids, if: -> { poll_question&.select_upto_3? },
+    validates :poll_question_option_ids, if: -> { poll_question&.select_up_to_3? },
       length: { maximum: 3, message: 'please select 3 options or fewer' }
 
-    validates :poll_question_option_ids, if: -> { poll_question&.select_upto_4? },
+    validates :poll_question_option_ids, if: -> { poll_question&.select_up_to_4? },
       length: { maximum: 4, message: 'please select 4 options or fewer' }
 
-    validates :poll_question_option_ids, if: -> { poll_question&.select_upto_5? },
+    validates :poll_question_option_ids, if: -> { poll_question&.select_up_to_5? },
       length: { maximum: 5, message: 'please select 5 options or fewer' }
 
     def to_s
@@ -78,7 +78,7 @@ module Effective
       return upload_file if poll_question.upload_file?
 
       return poll_question_options.first if poll_question.choose_one?
-      return poll_question_options.first if poll_question.select_upto_1?
+      return poll_question_options.first if poll_question.select_up_to_1?
       return poll_question_options if poll_question.poll_question_option?
 
       raise('unknown response for unexpected poll question category')

data/app/models/effective/poll_notification.rb

@@ -3,7 +3,7 @@ module Effective
     belongs_to :poll
     log_changes(to: :poll) if respond_to?(:log_changes)
 
-    CATEGORIES = ['Upcoming reminder', 'When poll starts', 'Reminder', 'When poll ends']
+    CATEGORIES = ['Upcoming reminder', 'When poll starts', 'Reminder', 'Before poll ends', 'When poll ends']
     EMAIL_TEMPLATE_VARIABLES = ['available_date', 'title', 'url', 'user.name', 'user.email']
 
     UPCOMING_REMINDERS = {
@@ -77,7 +77,7 @@ module Effective
       validates :subject, liquid: true
     end
 
-    validates :reminder, if: -> { reminder? || upcoming_reminder? },
+    validates :reminder, if: -> { reminder? || upcoming_reminder? || before_poll_ends? },
       presence: true, uniqueness: { scope: [:poll_id, :category], message: 'already exists' }
 
     def to_s
@@ -100,6 +100,10 @@ module Effective
       category == 'Reminder'
     end
 
+    def before_poll_ends?
+      category == 'Before poll ends'
+    end
+
     def poll_end?
       category == 'When poll ends'
     end
@@ -120,16 +124,18 @@ module Effective
         !poll.started? && poll.start_at < (Time.zone.now + reminder)
       when 'Reminder'
         !poll.ended? && poll.start_at < (Time.zone.now - reminder)
+      when 'Before poll ends'
+        !poll.ended? && poll.end_at.present? && poll.end_at < (Time.zone.now + reminder)
       else
         raise('unexpected category')
       end
     end
 
-    def notify!
-      return false unless notify_now?
+    def notify!(force: false)
+      return false unless (notify_now? || force)
 
       # We send to all users, except for the 'Reminder' that exclude completed users
-      users = poll.users(except_completed: (category == 'Reminder'))
+      users = poll.users(except_completed: (category == 'Reminder' || category == 'Before poll ends'))
 
       update_column(:started_at, Time.zone.now)
 

data/app/views/admin/poll_notifications/_form_poll_before_poll_ends.html.haml

@@ -0,0 +1,8 @@
+= f.select :reminder, Effective::PollNotification::UPCOMING_REMINDERS, label: false,
+  hint: "before the poll ends on #{f.object.poll&.end_at&.strftime('%F') || 'never'}."
+
+.alert.alert-warning
+  %strong Before Poll Ends
+  reminders are sent to users in the audience who have not yet completed their ballot.
+  %br
+  Use before poll ends notifications to remind people to vote.

data/app/views/effective/polls_mailer/poll_before_poll_ends.liquid

@@ -0,0 +1,13 @@
+---
+subject: 'Please submit your ballot for {{ title }}'
+from: 'admin@example.com'
+---
+Hello {{ user.name }},
+
+The {{ title }} poll is almost complete.
+
+Please remember to submit your ballot.
+
+{{ url }}
+
+Thank you

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.1.1'
+  VERSION = '0.1.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,7 +104,6 @@ files:
 - app/datatables/effective_polls_datatable.rb
 - app/helpers/effective_polls_helper.rb
 - app/mailers/effective/polls_mailer.rb
-- app/models/effective/access_denied.rb
 - app/models/effective/ballot.rb
 - app/models/effective/ballot_response.rb
 - app/models/effective/ballot_response_option.rb
@@ -113,6 +112,7 @@ files:
 - app/models/effective/poll_question.rb
 - app/models/effective/poll_question_option.rb
 - app/views/admin/poll_notifications/_form.html.haml
+- app/views/admin/poll_notifications/_form_poll_before_poll_ends.html.haml
 - app/views/admin/poll_notifications/_form_poll_reminder.html.haml
 - app/views/admin/poll_notifications/_form_poll_upcoming_reminder.html.haml
 - app/views/admin/poll_notifications/_form_poll_when_poll_ends.html.haml
@@ -130,11 +130,11 @@ files:
 - app/views/effective/ballot_responses/fields/_long_answer.html.haml
 - app/views/effective/ballot_responses/fields/_number.html.haml
 - app/views/effective/ballot_responses/fields/_select_all_that_apply.html.haml
-- app/views/effective/ballot_responses/fields/_select_upto_1.html.haml
-- app/views/effective/ballot_responses/fields/_select_upto_2.html.haml
-- app/views/effective/ballot_responses/fields/_select_upto_3.html.haml
-- app/views/effective/ballot_responses/fields/_select_upto_4.html.haml
-- app/views/effective/ballot_responses/fields/_select_upto_5.html.haml
+- app/views/effective/ballot_responses/fields/_select_up_to_1.html.haml
+- app/views/effective/ballot_responses/fields/_select_up_to_2.html.haml
+- app/views/effective/ballot_responses/fields/_select_up_to_3.html.haml
+- app/views/effective/ballot_responses/fields/_select_up_to_4.html.haml
+- app/views/effective/ballot_responses/fields/_select_up_to_5.html.haml
 - app/views/effective/ballot_responses/fields/_short_answer.html.haml
 - app/views/effective/ballot_responses/fields/_upload_file.html.haml
 - app/views/effective/ballot_responses/responses/_choose_one.html.haml
@@ -143,11 +143,11 @@ files:
 - app/views/effective/ballot_responses/responses/_long_answer.html.haml
 - app/views/effective/ballot_responses/responses/_number.html.haml
 - app/views/effective/ballot_responses/responses/_select_all_that_apply.html.haml
-- app/views/effective/ballot_responses/responses/_select_upto_1.html.haml
-- app/views/effective/ballot_responses/responses/_select_upto_2.html.haml
-- app/views/effective/ballot_responses/responses/_select_upto_3.html.haml
-- app/views/effective/ballot_responses/responses/_select_upto_4.html.haml
-- app/views/effective/ballot_responses/responses/_select_upto_5.html.haml
+- app/views/effective/ballot_responses/responses/_select_up_to_1.html.haml
+- app/views/effective/ballot_responses/responses/_select_up_to_2.html.haml
+- app/views/effective/ballot_responses/responses/_select_up_to_3.html.haml
+- app/views/effective/ballot_responses/responses/_select_up_to_4.html.haml
+- app/views/effective/ballot_responses/responses/_select_up_to_5.html.haml
 - app/views/effective/ballot_responses/responses/_short_answer.html.haml
 - app/views/effective/ballot_responses/responses/_upload_file.html.haml
 - app/views/effective/ballots/_ballot.html.haml
@@ -164,13 +164,14 @@ files:
 - app/views/effective/poll_results/results/_number.html.haml
 - app/views/effective/poll_results/results/_poll_question_option.html.haml
 - app/views/effective/poll_results/results/_select_all_that_apply.html.haml
-- app/views/effective/poll_results/results/_select_upto_1.html.haml
-- app/views/effective/poll_results/results/_select_upto_2.html.haml
-- app/views/effective/poll_results/results/_select_upto_3.html.haml
-- app/views/effective/poll_results/results/_select_upto_4.html.haml
-- app/views/effective/poll_results/results/_select_upto_5.html.haml
+- app/views/effective/poll_results/results/_select_up_to_1.html.haml
+- app/views/effective/poll_results/results/_select_up_to_2.html.haml
+- app/views/effective/poll_results/results/_select_up_to_3.html.haml
+- app/views/effective/poll_results/results/_select_up_to_4.html.haml
+- app/views/effective/poll_results/results/_select_up_to_5.html.haml
 - app/views/effective/poll_results/results/_short_answer.html.haml
 - app/views/effective/poll_results/results/_upload_file.html.haml
+- app/views/effective/polls_mailer/poll_before_poll_ends.liquid
 - app/views/effective/polls_mailer/poll_reminder.liquid
 - app/views/effective/polls_mailer/poll_upcoming_reminder.liquid
 - app/views/effective/polls_mailer/poll_when_poll_ends.liquid

data/app/models/effective/access_denied.rb

@@ -1,17 +0,0 @@
-unless defined?(Effective::AccessDenied)
-  module Effective
-    class AccessDenied < StandardError
-      attr_reader :action, :subject
-
-      def initialize(message = nil, action = nil, subject = nil)
-        @message = message
-        @action = action
-        @subject = subject
-      end
-
-      def to_s
-        @message || I18n.t(:'unauthorized.default', :default => 'Access Denied')
-      end
-    end
-  end
-end