effective_polls 0.5.6 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2de40c717cb2296f4a0a7aed128811bd1991899d579c26e538f68c9ad70fee4a
-  data.tar.gz: a2815292003805d8174c9e7ff7996b311162157b92b07fa164b7087dee9082d2
+  metadata.gz: 6f0bb62aded7cf4461b6ac474f751db47c9709b0079e39ebfced3aac50327beb
+  data.tar.gz: 43c9c7448edee9b0ec1d913187bd28f28c7ca9222494a13f34790ce66f36d40d
 SHA512:
-  metadata.gz: 3601f0b8098f681b375e6982f594893c12d49ff7cec643ab6d7f286bcbf15a3dda38b808d76ac977a53a66207b83f07dce74a3b4d4f075d8f63389d424677794
-  data.tar.gz: e69034e422902663ef2607bca59378aef46233b9df1486feb0566e50f6c80a9a810e98559d1b4044231fd53cfb78029a2c21afcede2867ad0c7224ba2ed0e080
+  metadata.gz: 911327063e49263e213ff7a35243a655e955eacbb9c37d432c9677ab2fc96e2b49066bef2514bd13351c8902691f086e4c00c2f33fed9890223fb3499889fc27
+  data.tar.gz: 8bb1b75e904a57867e0f0392be9e8f897c81a9b528f41cc7814f3f99feca0be06503ab0f5b8fd0ca8e2266a974c9722520e2c39b6c5a53cec14661e4750cff5c

data/app/datatables/admin/effective_polls_datatable.rb

@@ -21,6 +21,9 @@ class Admin::EffectivePollsDatatable < Effective::Datatable
     col :poll_notifications
     col :poll_questions, visible: false
 
+    col :hide_results, visible: false
+    col :skip_logging, visible: false
+
     actions_col
   end
 

data/app/mailers/effective/polls_mailer.rb

@@ -11,7 +11,8 @@ module Effective
         to: user.email,
         from: poll_notification.from,
         body: poll_notification.body,
-        subject: poll_notification.subject
+        subject: poll_notification.subject,
+        message_stream: 'broadcast-stream'
       )
     end
 
@@ -22,7 +23,8 @@ module Effective
         to: user.email,
         from: poll_notification.from,
         body: poll_notification.body,
-        subject: poll_notification.subject
+        subject: poll_notification.subject,
+        message_stream: 'broadcast-stream'
       )
     end
 
@@ -33,7 +35,8 @@ module Effective
         to: user.email,
         from: poll_notification.from,
         body: poll_notification.body,
-        subject: poll_notification.subject
+        subject: poll_notification.subject,
+        message_stream: 'broadcast-stream'
       )
     end
 
@@ -44,7 +47,8 @@ module Effective
         to: user.email,
         from: poll_notification.from,
         body: poll_notification.body,
-        subject: poll_notification.subject
+        subject: poll_notification.subject,
+        message_stream: 'broadcast-stream'
       )
     end
 
@@ -55,7 +59,8 @@ module Effective
         to: user.email,
         from: poll_notification.from,
         body: poll_notification.body,
-        subject: poll_notification.subject
+        subject: poll_notification.subject,
+        message_stream: 'broadcast-stream'
       )
     end
 

data/app/models/effective/ballot.rb

@@ -60,6 +60,12 @@ module Effective
       model_name.human
     end
 
+    # Disable effective_logging log_changes for this resource
+    def log_changes?
+      return false if poll&.skip_logging?
+      true
+    end
+
     # Find or build
     def ballot_response(poll_question)
       ballot_response = ballot_responses.find { |br| br.poll_question_id == poll_question.id }

data/app/models/effective/poll.rb

@@ -37,6 +37,9 @@ module Effective
       start_at      :datetime
       end_at        :datetime
 
+      hide_results          :boolean, default: false
+      skip_logging          :boolean, default: false
+
       audience              :string
       audience_class_name   :string
       audience_scope        :text       # An Array of user_ids or named scopes on the User model

data/app/models/effective/poll_notification.rb

@@ -129,7 +129,9 @@ module Effective
       end
     end
 
-    def notify!(force: false)
+    def notify!(force: false, except: [])
+      raise('expected an Array of user IDs') if except.present? && !except.kind_of?(Array)
+
       return false unless (notify_now? || force)
 
       # We send to all users, except for the 'Reminder' that exclude completed users
@@ -138,7 +140,17 @@ module Effective
       update_column(:started_at, Time.zone.now)
 
       users.find_each do |user|
-        Effective::PollsMailer.public_send(email_template, self, user).deliver_now
+        print '.'
+
+        next if except.include?(user.id)
+
+        begin
+          Effective::PollsMailer.public_send(email_template, self, user).deliver_now
+        rescue => e
+          EffectiveLogger.error(e.message, associated: self) if defined?(EffectiveLogger)
+          ExceptionNotifier.notify_exception(e, data: { user_id: user.id }) if defined?(ExceptionNotifier)
+        end
+
       end
 
       update_column(:completed_at, Time.zone.now)

data/app/views/admin/polls/_form_poll.html.haml

@@ -9,6 +9,14 @@
     .alert.alert-info
       Please be aware of the existing #{ets(f.object.poll_notifications)} when changing the start or end availability date.
 
+  = f.check_box :hide_results, 
+    label: 'Hide results until the poll has ended',
+    hint: 'If checked, admin users will be unable to view the poll results until the poll has ended.'
+
+  = f.check_box :skip_logging,
+    label: 'Skip logging of ballots',
+    hint: 'If checked, no logs of who has submitted or completed ballots will be kept.'
+
   -# Audience
   - f.object.audience_class_name ||= current_user.class.name
 

data/app/views/admin/polls/_poll.html.haml

@@ -1,5 +1,8 @@
 = render 'effective/poll_results/results', poll: @poll
 
 = card('Raw Data') do
-  - datatable = Admin::EffectivePollResultsDatatable.new(poll: @poll)
-  = render_datatable(datatable)
+  - if poll.hide_results? && !poll.ended?
+    %p The raw data for this poll will be displayed once it has ended.
+  - else
+    - datatable = Admin::EffectivePollResultsDatatable.new(poll: @poll)
+    = render_datatable(datatable)

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

@@ -20,23 +20,26 @@
   .card-body
     %h5.card-title Question Results
 
-    .effective-ballot
-      %table.table.table-hover
-        %thead
-          %tr
-            %th Question
-            %th Results
+    - if poll.hide_results? && !poll.ended?
+      %p The results of this poll will be displayed once it has ended.
+    - else
+      .effective-ballot
+        %table.table.table-hover
+          %thead
+            %tr
+              %th Question
+              %th Results
 
-        %tbody
-          - ballots = poll.ballots
+          %tbody
+            - ballots = poll.ballots
 
-          - poll.poll_questions.each_with_index do |poll_question, index|
-            - ballot_responses = poll.poll_results(poll_question: poll_question)
+            - poll.poll_questions.each_with_index do |poll_question, index|
+              - ballot_responses = poll.poll_results(poll_question: poll_question)
 
-            %tr
-              %td
-                #{poll_question.position + 1}. #{poll_question}
-                %br
-                %small.text-muted= poll_question.category
+              %tr
+                %td
+                  #{poll_question.position + 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)
+                %td= render('effective/poll_results/poll_result', poll_question: poll_question, ballot_responses: ballot_responses)

data/db/migrate/101_create_effective_polls.rb

@@ -12,6 +12,9 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.string :audience_class_name
       t.text :audience_scope
 
+      t.boolean :hide_results, default: false
+      t.boolean :skip_logging, default: false
+
       t.datetime :updated_at
       t.datetime :created_at
     end

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.5.6'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails