effective_polls 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092395996d087f516aca9b5aa9f42e170c56702b0dd9c7c7479332cb18a0c2c7'
-  data.tar.gz: 316a9df7d201ed389316f1cc11c5a77310038957520bdaf711666bfcf867ed7a
+  metadata.gz: 637320f25a72489ada773806629e70590bb5c8435e871a6de40497e2eb6300ed
+  data.tar.gz: e797d1afdad6be66099b291ec7a809cbb65ef32d7963ca04f03d3ac3d91fe2a9
 SHA512:
-  metadata.gz: d4f8a181881338bd4f274194770d82fb632f0456910d1df843ec404025d4eaceb219fca21215e70d44c278a6f1791dff199fbab9b3cd2f6e88fadc6498fbfa7a
-  data.tar.gz: 7dae7c572c9236edcae987f7d3a4e1afce6cd65557890a82c81797b7a7d12816157020d0966379c3f70322d08ffdc7a0bde593c755ffe824153e3a97a4be3a4f
+  metadata.gz: 7317013d4063bdd11eaf4a72b6d5ca964c7acb2c35ac29653e9c7043c4e4c40de4e1b4b55079ed023b758f08982a51ca17926e37c5abafbca2462cf0b4a9e657
+  data.tar.gz: d3fe9a3b04a9ca98c5a27fa956fb82d536db6b9662b6d61a0e8fd954f603673384f6d70c3ec33e51fabde548063b126892508e858be72e616d2c9ff30318e732

data/app/controllers/admin/polls_controller.rb

@@ -5,13 +5,7 @@ module Admin
 
     include Effective::CrudController
 
-    def results
-      @poll = Effective::Poll.find(params[:id])
-      EffectiveResources.authorize!(self, :results, @poll)
-
-      @datatable = Admin::EffectivePollResultsDatatable.new(poll_token: @poll.token)
-      @page_title = "#{@poll} Results"
-    end
+    on :save, only: :create, redirect: :edit
 
     def permitted_params
       params.require(:effective_poll).permit!

data/app/controllers/effective/ballots_controller.rb

@@ -1,6 +1,9 @@
 module Effective
   class BallotsController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise)
+
+    if defined?(Devise)
+      before_action :authenticate_user!, unless: -> { action_name == 'new' || (action_name == 'show' && params[:id] == 'start') }
+    end
 
     include Effective::WizardController
 

data/app/datatables/admin/effective_poll_notifications_datatable.rb

@@ -31,7 +31,10 @@ class Admin::EffectivePollNotificationsDatatable < Effective::Datatable
     end
 
     col :subject
-    col :body
+
+    col :body do |notification|
+      simple_format(notification.body.to_s)
+    end
 
     col :started_at, visible: false
     col :completed_at

data/app/datatables/admin/effective_poll_results_datatable.rb

@@ -41,10 +41,7 @@ class Admin::EffectivePollResultsDatatable < Effective::Datatable
   end
 
   def poll
-    @poll ||= begin
-      raise('expected datatable poll_token attribute') unless attributes[:poll_token]
-      Effective::Poll.deep_results.find(attributes[:poll_token])
-    end
+    @poll ||= Effective::Poll.deep_results.where(id: attributes[:poll_id]).first!
   end
 
 end

data/app/datatables/admin/effective_polls_datatable.rb

@@ -18,6 +18,7 @@ class Admin::EffectivePollsDatatable < Effective::Datatable
     col :end_at
     col :audience
 
+    col :poll_notifications
     col :poll_questions, visible: false
 
     actions_col

data/app/datatables/{effective_polls_datatable.rb → effective_polls_available_polls_datatable.rb}

@@ -1,13 +1,14 @@
+# Dashboard available polls
 # Displays available polls that the current_user may complete
 
-class EffectivePollsDatatable < Effective::Datatable
+class EffectivePollsAvailablePollsDatatable < Effective::Datatable
   datatable do
     order :start_at
 
     col :start_at, visible: false
 
     col :title
-    col :available_date, label: 'Date'
+    col :available_date
 
     actions_col(actions: []) do |poll|
       ballot = poll.ballots.where(user: current_user).first
@@ -15,16 +16,17 @@ class EffectivePollsDatatable < Effective::Datatable
       if ballot.blank?
         dropdown_link_to('Start', effective_polls.poll_ballot_build_path(poll, :new, :start))
       elsif ballot.completed?
+        #dropdown_link_to('Show', effective_polls.poll_ballot_path(poll, ballot))
         'Complete'
       else
         dropdown_link_to('Continue', effective_polls.poll_ballot_build_path(poll, ballot, ballot.next_step))
+        dropdown_link_to('Delete', effective_polls.poll_ballot_path(poll, ballot), 'data-confirm': "Really delete #{ballot}?", 'data-method': :delete)
       end
     end
   end
 
   collection do
-    raise('expected a current_user') unless current_user.present?
-    Effective::Poll.available.select { |poll| poll.available_for?(current_user) }
+    Effective::Poll.where(id: current_user.available_polls)
   end
 
 end

data/app/helpers/effective_polls_helper.rb

@@ -1,22 +1,26 @@
 module EffectivePollsHelper
 
+  # Used on dashboard
+  def polls_name_label
+    et('effective_polls.name')
+  end
+
   # Used by admin/polls form
-  def effective_polls_audience_scope_collection
-    # Normalize the collection into [[label, value], [label, value]]
-    scopes = Array(EffectivePolls.audience_user_scopes).map do |key, value|
-      (key.present? && value.present?) ? [key, value] : [key.to_s.titleize, key]
-    end
+  def effective_polls_audience_scope_collection(poll)
+    klass = poll.try(:audience_class)
+    raise('expected a poll with an audience_class') unless klass.try(:effective_polls_user?)
 
-    # Makes sure the User model responds to all values
-    scopes.each do |_, scope|
-      unless defined?(User) && User.respond_to?(scope)
-        raise("invalid effective_polls config.audience_user_scopes value. The user model must respond to the scope User.#{scope}")
-      end
-    end
+    resource = klass.new
+
+    scopes = resource.poll_audience_scopes
+    raise('expected poll audience scopes') unless scopes.kind_of?(Array)
 
     # Append the number of users in this scope
-    scopes.map! do |label, scope|
-      ["#{label} (#{pluralize(User.send(scope).count, 'user')})", scope]
+    scopes.map do |label, scope|
+      relation = resource.poll_audience_scope(scope)
+      raise("invalid poll_audience_scope for #{scope}") unless relation.kind_of?(ActiveRecord::Relation)
+
+      ["#{label} (#{pluralize(relation.count, 'user')})", scope]
     end
   end
 

data/app/mailers/effective/polls_mailer.rb

@@ -75,7 +75,9 @@ module Effective
         title: poll.title,
         url: effective_polls.poll_url(poll),
         user: {
-          name: user.to_s,
+          name: (user.try(:email_to_s) || user.to_s),
+          first_name: user.try(:first_name).to_s,
+          last_name: user.try(:last_name).to_s,
           email: user.email
         }
       }

data/app/models/concerns/effective_polls_user.rb

@@ -0,0 +1,67 @@
+# EffectivePollsUser
+#
+# Mark your user model with effective_polls_user to get all the includes
+
+module EffectivePollsUser
+  extend ActiveSupport::Concern
+
+  module Base
+    def effective_polls_user
+      include ::EffectivePollsUser
+    end
+  end
+
+  module ClassMethods
+    def effective_polls_user?; true; end
+  end
+
+  included do
+    has_many :ballots, -> { Effective::Ballot.sorted }, inverse_of: :user, as: :user, class_name: 'Effective::Ballot'
+  end
+
+  # The list of all available audience scopes for the Poll Selected Users
+  def poll_audience_scopes
+    scopes = [
+      ['All Users', :all]
+    ]
+
+    if self.class.try(:effective_memberships_user?)
+      scopes += [
+        ['All members', :members],
+        ['All removed members', :membership_removed],
+        ['All members in good standing', :membership_in_good_standing],
+        ['All members not in good standing', :membership_not_in_good_standing],
+        ['All members renewed this period', :membership_renewed_this_period],
+      ] 
+
+      scopes += EffectiveMemberships.Category.sorted.map do |category|
+        ["All #{category} members", "members_with_category_id_#{category.id}"]
+      end
+    end
+
+    scopes
+  end
+
+  # Turns the given audience_scope value into the actual ActiveRecord::Relation scope
+  def poll_audience_scope(value)
+    collection = self.class.respond_to?(:unarchived) ? self.class.unarchived : self.class
+
+    # If we respond to the fill value, call it
+    return collection.send(value) if collection.respond_to?(value)
+
+    # Parse the value
+    name, id = value.to_s.split('_id_')
+
+    case name.try(:to_sym)
+    when :members_with_category
+      collection.members_with_category(EffectiveMemberships.Category.find(id))
+    else
+      raise("unknown poll_audience_scope for #{value}")
+    end
+  end
+
+  def available_polls
+    Effective::Poll.available.select { |poll| poll.available_for?(self) }
+  end
+
+end

data/app/models/effective/ballot.rb

@@ -3,14 +3,19 @@ module Effective
     attr_accessor :current_user
     attr_accessor :current_step
 
+    # Application namespace
+    belongs_to :user, polymorphic: true
+
+    # Effective namespace
     belongs_to :poll
-    belongs_to :user
 
     has_many :ballot_responses, dependent: :destroy
     accepts_nested_attributes_for :ballot_responses
 
     acts_as_tokened
 
+    log_changes(to: :poll) if respond_to?(:log_changes)
+
     acts_as_wizard(
       start: 'Start',
       vote: 'Ballot',
@@ -34,6 +39,10 @@ module Effective
 
     scope :deep, -> { includes(:poll, :user, ballot_responses: [:poll, :poll_question, :poll_question_options]) }
     scope :sorted, -> { order(:id) }
+
+    scope :in_progress, -> { where(completed_at: nil) }
+    scope :done, -> { where.not(completed_at: nil) }
+
     scope :completed, -> { where.not(completed_at: nil) }
 
     before_validation(if: -> { new_record? }) do
@@ -48,7 +57,7 @@ module Effective
     validates :ballot_responses, associated: true
 
     def to_s
-      'ballot'
+      model_name.human
     end
 
     # Find or build

data/app/models/effective/ballot_response.rb

@@ -64,7 +64,7 @@ module Effective
       length: { maximum: 5, message: 'please select 5 options or fewer' }
 
     def to_s
-      'ballot reponse'
+      model_name.human
     end
 
     def response

data/app/models/effective/poll.rb

@@ -1,10 +1,6 @@
 module Effective
   class Poll < ActiveRecord::Base
-    has_rich_text :all_steps_content
-    has_rich_text :start_content
-    has_rich_text :vote_content
-    has_rich_text :submit_content
-    has_rich_text :complete_content
+    acts_as_tokened
 
     has_many :poll_notifications, -> { order(:id) }, inverse_of: :poll, dependent: :destroy
     accepts_nested_attributes_for :poll_notifications, allow_destroy: true
@@ -19,7 +15,12 @@ module Effective
     has_many :completed_ballots, -> { Effective::Ballot.completed }, class_name: 'Effective::Ballot'
     has_many :completed_ballot_responses, -> { where(ballot: Effective::Ballot.completed) }, class_name: 'Effective::BallotResponse'
 
-    acts_as_tokened
+    has_many_rich_texts
+    # rich_text_all_steps_content
+    # rich_text_start_content
+    # rich_text_vote_content
+    # rich_text_submit_content
+    # rich_text_complete_content
 
     if respond_to?(:log_changes)
       log_changes(except: [:ballots, :ballot_responses, :completed_ballots, :completed_ballot_responses])
@@ -29,29 +30,23 @@ module Effective
 
     effective_resource do
       # Acts as tokened
-      token                  :string, permitted: false
+      token         :string, permitted: false
 
       title         :string
 
       start_at      :datetime
       end_at        :datetime
 
-      audience            :string
-      audience_scope      :text       # An Array of user_ids or named scopes on the User model
+      audience              :string
+      audience_class_name   :string
+      audience_scope        :text       # An Array of user_ids or named scopes on the User model
 
       timestamps
     end
 
     serialize :audience_scope, Array
 
-    scope :deep, -> {
-      includes(poll_questions: :poll_question_options)
-      .with_rich_text_all_steps_content
-      .with_rich_text_start_content
-      .with_rich_text_vote_content
-      .with_rich_text_submit_content
-      .with_rich_text_complete_content
-    }
+    scope :deep, -> { includes(poll_questions: :poll_question_options) }
 
     scope :deep_results, -> {
       includes(poll_questions: :poll_question_options)
@@ -68,6 +63,8 @@ module Effective
     validates :start_at, presence: true
 
     validates :audience, inclusion: { in: AUDIENCES }
+    validates :audience_class_name, presence: true
+
     validates :audience_scope, presence: true, unless: -> { audience == 'All Users' }
 
     validate(if: -> { start_at.present? && end_at.present? }) do
@@ -75,33 +72,49 @@ module Effective
     end
 
     def to_s
-      title.presence || 'New Poll'
+      title.presence || model_name.human
     end
 
     def available_for?(user)
-      raise('expected a user') unless user.kind_of?(User)
+      raise('expected an effective_polls_user') unless user.class.try(:effective_polls_user?)
       available? && users.include?(user)
     end
 
+    def audience_class
+      klass = audience_class_name.safe_constantize
+      raise('expected an effective_polls_user klass') unless klass.try(:effective_polls_user?)
+      klass
+    end
+
     def users(except_completed: false)
+      klass = audience_class()
+      resource = klass.new
+
       users = case audience
       when 'All Users'
-        User.all
+        klass.try(:unarchived) || klass.all
       when 'Individual Users'
-        User.where(id: audience_scope)
+        (klass.try(:unarchived) || klass.all).where(id: audience_scope)
       when 'Selected Users'
-        collection = User.none
-        audience_scope.each { |scope| collection = collection.or(User.send(scope)) }
+        collection = klass.none
+
+        audience_scope.each do |scope| 
+          relation = resource.poll_audience_scope(scope)
+          raise("invalid poll_audience_scope for #{scope}") unless relation.kind_of?(ActiveRecord::Relation)
+
+          collection = collection.or(relation)
+        end
+
         collection
       else
         raise('unexpected audience')
       end
 
       if except_completed
-        users.where.not(id: completed_ballots.select('user_id as id'))
-      else
-        users
+        users = users.where.not(id: completed_ballots.select('user_id as id'))
       end
+
+      users
     end
 
     def available?

data/app/models/effective/poll_notification.rb

@@ -72,7 +72,7 @@ module Effective
     validates :subject, presence: true
     validates :body, presence: true
 
-    if EffectivePolls.use_effective_email_templates
+    with_options(if: -> { EffectivePolls.use_effective_email_templates }) do
       validates :body, liquid: true
       validates :subject, liquid: true
     end
@@ -81,7 +81,7 @@ module Effective
       presence: true, uniqueness: { scope: [:poll_id, :category], message: 'already exists' }
 
     def to_s
-      'poll notification'
+      [category.presence, subject.presence].compact.join(' - ') || model_name.human
     end
 
     def email_template

data/app/models/effective/poll_question.rb

@@ -62,7 +62,7 @@ module Effective
     end
 
     def to_s
-      title.presence || 'New Poll Question'
+      title.presence || model_name.human
     end
 
     def poll_question_option?

data/app/models/effective/poll_question_option.rb

@@ -19,7 +19,7 @@ module Effective
     validates :position, presence: true
 
     def to_s
-      title.presence || 'New Poll Question Option'
+      title.presence || model_name.human
     end
 
   end

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

@@ -12,22 +12,20 @@
     - template = 'poll_' + category.parameterize.underscore
 
     = f.show_if :category, category do
-      = render "/admin/poll_notifications/form_#{template}", f: f
+      .my-3= render "/admin/poll_notifications/form_#{template}", f: f
+      
+      = f.select :from, EffectivePolls.mailer_froms
 
       - if f.object.category == category
-        = f.email_field :from
         = f.text_field :subject
         = f.text_area :body, rows: 10
 
       - elsif EffectivePolls.use_effective_email_templates == false
-        = f.email_field :from, value: EffectivePolls.mailer[:default_from]
         = f.text_field :subject, value: ''
         = f.text_area :body, rows: 10, value: ''
 
       - else
         - email_template = Effective::EmailTemplate.where(template_name: template).first!
-
-        = f.email_field :from, value: email_template.from
         = f.text_field :subject, value: email_template.subject
         = f.text_area :body, rows: 10, value: email_template.body
 

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

@@ -2,19 +2,26 @@
   - if inline_datatable?
     = f.hidden_field :poll_id
   - else
-    = f.select :poll_id, Effective::Poll.sorted.editable.all
+    = f.select :poll_id, Effective::Poll.all
 
   = f.text_field :title, label: 'Question Title'
-  = f.rich_text_area :body, label: 'Body (optional)'
+
+  - if defined?(EffectiveArticleEditor)
+    = f.article_editor :body, label: 'Body (optional)'
+  - else
+    = f.rich_text_area :body, label: 'Body (optional)'
 
   = f.check_box :required, hint: 'A response to this question will be required'
   = f.select :category, Effective::PollQuestion::CATEGORIES
 
   = f.show_if :category, 'Choose one' do
-    .card
+    .mt-3.card
       .card-body
-        %h5 Choose one
-        %p Display radio buttons to choose one option
+        %h5 Options
+        %p Display the following options:
+
+        = f.has_many :poll_question_options, build: true do |fa|
+          = fa.text_field :title, label: false
 
   = f.show_if :category, 'Select all that apply' do
     .card

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

@@ -7,18 +7,23 @@
       = render 'admin/polls/form_content', poll: poll
 
     = tab 'Questions' do
-      - datatable = Admin::EffectivePollQuestionsDatatable.new(poll_id: poll.id)
+      - datatable = Admin::EffectivePollQuestionsDatatable.new(poll: poll)
       = render_datatable(datatable, inline: true, simple: true)
 
     = tab 'Notifications' do
       %p
         The following email notifications will be sent to
-        = pluralize(poll.users.count, 'users')
+        = pluralize(poll.users.count, 'user')
         in the audience.
 
-      - datatable = Admin::EffectivePollNotificationsDatatable.new(poll_id: poll.id)
+      %p 
+        The url for this #{et(poll)} is:
+        - url = effective_polls.poll_url(poll)
+        = link_to(url, url, target: '_blank')
+
+      - datatable = Admin::EffectivePollNotificationsDatatable.new(poll: poll)
       = render_datatable(datatable, inline: true, simple: true)
 
-    - if poll.respond_to?(:log_changes_datatable)
+    - if poll.respond_to?(:logs_datatable)
       = tab 'Logs' do
-        = render_datatable(poll.log_changes_datatable)
+        = render_datatable(poll.logs_datatable)

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

@@ -1,27 +1,23 @@
+%p Each of the following content areas will be displayed on the ballot wizard.
+
 = effective_form_with(model: [:admin, poll], engine: true) do |f|
-  .card.mb-4
-    .card-body
-      %h5.card-title All Steps Content
-      = f.rich_text_area :all_steps_content, label: false, hint: 'displayed on all ballot steps'
+  = card("All Steps") do
+    - if defined?(EffectiveArticleEditor)
+      = f.article_editor "rich_text_all_steps_content", label: false, hint: "displayed on all steps"
+    - else
+      = f.rich_text_area "rich_text_all_steps_content", label: false, hint: "displayed on all steps"
 
-  .card.mb-4
-    .card-body
-      %h5.card-title Start Step
-      = f.rich_text_area :start_content, label: false, hint: 'displayed on the start step only'
+  %hr
 
-  .card.mb-4
-    .card-body
-      %h5.card-title Vote Step
-      = f.rich_text_area :vote_content, label: false, hint: 'displayed on the vote step only'
+  - enabled = Effective::Ballot.all_wizard_steps
 
-  .card.mb-4
-    .card-body
-      %h5.card-title Review and Submit Step
-      = f.rich_text_area :submit_content, label: false, hint: 'displayed on the review and submit step only'
+  - Effective::Ballot::WIZARD_STEPS.each do |step, title|
+    - next unless enabled.include?(step)
 
-  .card.mb-4
-    .card-body
-      %h5.card-title Complete Step
-      = f.rich_text_area :complete_content, label: false, hint: 'displayed on the complete step only'
+    = card("#{title}") do
+      - if defined?(EffectiveArticleEditor)
+        = f.article_editor "rich_text_#{step}_content", label: false, hint: "displayed on the ballot #{step} wizard step only"
+      - else
+        = f.rich_text_area "rich_text_#{step}_content", label: false, hint: "displayed on the ballot #{step} wizard step only"
 
   = f.submit

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

@@ -1,32 +1,41 @@
 = effective_form_with(model: [:admin, poll], engine: true) do |f|
+
   = f.text_field :title, hint: 'The title of your poll or election.'
 
-  = f.datetime_field :start_at, input_js: { minDate: Time.zone.now.beginning_of_day.strftime('%F') }
+  = f.datetime_field :start_at
   = f.datetime_field :end_at
 
+  - if f.object.poll_notifications.present?
+    .alert.alert-info
+      Please be aware of the existing #{ets(f.object.poll_notifications)} when changing the start or end availability date.
+
   -# Audience
+  - f.object.audience_class_name ||= current_user.class.name
+
+  = f.hidden_field :audience_class_name
   = f.radios :audience, Effective::Poll::AUDIENCES
 
   = f.show_if :audience, 'All Users' do
     .card
       .card-body
         %h5 All Users
-        %p All users may complete this poll
+        %p All users may complete this #{etd(poll)} 
 
   = f.show_if :audience, 'Individual Users' do
     .card
       .card-body
         %h5 Individual Users
-        %p Only the following individual users may complete this poll
+        %p Only the following individual users may complete this #{etd(poll)} 
 
-        - user_ids = User.respond_to?(:sorted) ? User.sorted : User.all
-        = f.select :audience_scope, user_ids, multiple: true, label: false
+        -# Audience Users
+        - ajax_url = (@select2_users_ajax_path || effective_resources.users_admin_select2_ajax_index_path) unless Rails.env.test?
+        = f.select :audience_scope, current_user.class.all, ajax_url: ajax_url, multiple: true
 
   = f.show_if :audience, 'Selected Users' do
     .card
       .card-body
         %h5 Selected Users
-        %p Users within any of the following groups may complete this poll
-        = f.checks :audience_scope, effective_polls_audience_scope_collection(), multiple: true, label: false
+        %p Users within any of the following groups may complete this #{etd(poll)} 
+        = f.checks :audience_scope, effective_polls_audience_scope_collection(f.object), multiple: true, label: false
 
   = effective_submit(f)

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

@@ -0,0 +1,5 @@
+= render 'effective/poll_results/results', poll: @poll
+
+= card('Raw Data') do
+  - datatable = Admin::EffectivePollResultsDatatable.new(poll: @poll)
+  = render_datatable(datatable)

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

@@ -0,0 +1,10 @@
+- all_steps_content = resource.poll&.rich_text_all_steps_content
+- step_content = resource.poll&.send("rich_text_#{step}_content")
+
+- if all_steps_content.present?
+  .card.mb-4
+    .card-body= all_steps_content.to_s
+
+- if step_content.present?
+  .card.mb-4
+    .card-body= step_content.to_s

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

@@ -0,0 +1,3 @@
+.row
+  .col-lg-3.mb-3= render_wizard_sidebar(resource)
+  .col-lg-9= yield

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

@@ -1,11 +1,16 @@
-= render_wizard_sidebar(resource) do
-  %h1= @page_title
+= render 'layout' do
+  = render 'effective/ballots/content', resource: resource
 
-  - if resource.poll.all_steps_content.present?
-    .mb-2= resource.poll.all_steps_content
+  - raise('expected a completed? poll') unless resource.completed?
 
-  - if resource.poll.complete_content.present?
-    .mb-2= resource.poll.complete_content
+  .alert.alert-warning.mb-4
+    Successfully completed on #{resource.completed_at.strftime('%F')}.
 
-  .text-center
-    %p= link_to 'Home', root_path, class: 'btn btn-primary'
+  .mb-4
+    = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'
+
+  = card do
+    %p= resource.poll
+    = render 'effective/ballots/ballot', ballot: resource
+
+  = link_to "Return to Dashboard", return_to_dashboard_path, class: 'btn btn-lg btn-primary btn-block'

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

@@ -1,17 +1,34 @@
-= render_wizard_sidebar(resource) do
-  %h1= resource.poll
+= render 'layout' do
+  = render 'effective/ballots/content', resource: resource
 
-  .alert.alert-warning
-    This is a <strong>Secret Ballot</strong>.
-    Only you will know what you have submitted and no one has access to individual ballots.
+  - # Signed out
+  - if resource.user.blank?
+    = card do
+      %p Welcome!
 
-  - if resource.poll.all_steps_content.present?
-    .mb-2= resource.poll.all_steps_content
+      %p You are about to register for #{resource.poll}.
 
-  - if resource.poll.start_content.present?
-    .mb-2= resource.poll.start_content
+      %p 
+        Please 
+        = link_to 'sign in', '/users/sign_in'
+        or
+        = link_to 'sign up', '/users/sign_up'
+        to continue.
+        
+      %p= link_to 'Sign In to Continue', '/users/sign_in', class: 'btn btn-primary'
 
-  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-    = f.hidden_field :current_step
+  - # Signed in
+  - if resource.user.present?
+    .alert.alert-warning.mb-4
+      This is a <strong>Secret Ballot</strong>.
+      Only you will know what you have submitted and no one has access to individual ballots.
 
-    = f.submit 'Start', center: true
+    = card do
+      %p Welcome #{current_user}!
+
+      %p You are starting a #{etd(resource.poll)} for #{resource.poll}.
+
+      = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+        = f.hidden_field :current_step
+
+        = f.submit 'Start', center: true

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

@@ -1,17 +1,14 @@
-= render_wizard_sidebar(resource) do
-  %h1= resource.poll
+= render 'layout' do
+  = render 'effective/ballots/content', resource: resource
 
-  - if resource.poll.all_steps_content.present?
-    .mb-2= resource.poll.all_steps_content
+  = card do
+    %p= resource.poll
 
-  - if resource.poll.submit_content.present?
-    .mb-2= resource.poll.submit_content
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :current_step
 
-  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-    = f.hidden_field :current_step
+      = render(resource)
 
-    = render(resource)
-
-    = f.submit(center: true) do
-      = link_to 'Change Ballot', wizard_path(:vote), class: 'btn btn-secondary'
-      = f.save 'Submit Ballot'
+      = f.submit(center: true) do
+        = link_to 'Change Ballot', wizard_path(:vote), class: 'btn btn-secondary'
+        = f.save 'Submit Ballot'

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

@@ -1,19 +1,14 @@
-= render_wizard_sidebar(resource) do
-  %h1= resource.poll
+= render 'layout' do
+  = render 'effective/ballots/content', resource: resource
 
-  - if resource.poll.all_steps_content.present?
-    .mb-2= resource.poll.all_steps_content
+  = card do
+    = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
+      = f.hidden_field :current_step
 
-  - if resource.poll.vote_content.present?
-    .mb-2= resource.poll.vote_content
+      - resource.poll.poll_questions.deep.all.each_with_index do |poll_question, index|
+        - ballot_response = resource.ballot_response(poll_question)
 
-  = effective_form_with(model: resource, url: wizard_path(step), method: :put) do |f|
-    = f.hidden_field :current_step
+        = f.fields_for :ballot_responses, ballot_response do |fbr|
+          = render('/effective/ballot_responses/fields', f: fbr, poll_question: poll_question)
 
-    - resource.poll.poll_questions.deep.all.each_with_index do |poll_question, index|
-      - 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)
-
-    = f.submit 'Save and Continue', center: true
+      = f.submit 'Save and Continue', center: true

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

@@ -6,11 +6,11 @@
 
     %p
       %strong
-        = pluralize(poll.completed_ballots.count, 'users')
+        = pluralize(poll.completed_ballots.count, 'user')
         completed
       ballots from an audience of
       = succeed('.') do
-        %strong= pluralize(poll.users.count, 'total users')
+        %strong= pluralize(poll.users.count, 'total user')
 
 .card.mb-3
   .card-body

data/app/views/effective/polls/_dashboard.html.haml

@@ -0,0 +1,25 @@
+-# In progress ballot
+- ballot = Effective::Ballot.in_progress.where(user: current_user).first
+- datatable = EffectiveResources.best('EffectivePollsAvailablePollsDatatable').new(self, namespace: :effective)
+
+- if ballot.present?
+  %h2 In Progress #{et(Effective::Ballot)}
+
+  %p Your submission for #{ballot.poll} is incomplete
+
+  %p
+    Please
+    = link_to("Continue #{ballot.poll}", effective_polls.poll_ballot_build_path(ballot.poll, ballot, ballot.next_step), 'data-turbolinks' => false, class: 'btn btn-primary')
+    or you can
+    = link_to('Abandon', effective_polls.poll_ballot_path(ballot.poll, ballot), 'data-confirm': "Really delete #{ballot}?", 'data-method': :delete, class: 'btn btn-danger')
+    to begin again.
+
+  %hr
+
+%h2 #{polls_name_label}
+
+- if datatable.present?
+  %p The following #{etsd(Effective::Poll)} are available:
+  = render_datatable(datatable, simple: true)
+- else
+  %p There are no available #{etsd(Effective::Poll)}. When there are, we'll show them here.

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

@@ -1,6 +1,5 @@
 ---
 subject: 'Please submit your ballot for {{ title }}'
-from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 

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

@@ -1,6 +1,5 @@
 ---
 subject: 'Reminder - Please submit your ballot for {{ title }}'
-from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 

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

@@ -1,6 +1,5 @@
 ---
 subject: '{{ title }} is upcoming'
-from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 

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

@@ -1,6 +1,5 @@
 ---
 subject: '{{ title }} has ended'
-from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 

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

@@ -1,6 +1,5 @@
 ---
 subject: '{{ title }} has started'
-from: 'admin@example.com'
 ---
 Hello {{ user.name }},
 

data/config/effective_polls.rb

@@ -3,19 +3,9 @@ EffectivePolls.setup do |config|
   # Configure the Layout per controller, or all at once
   # config.layout = { application: 'application', admin: 'admin' }
 
-  # Audience Scope Collection
-  #
-  # When creating a new poll, an Array of User scopes can be provided
-  # The User model must respond to these
-  #
-  # config.audience_user_scopes = [:all, :registered]
-  # config.audience_user_scopes = [['All Users', :all], ['Registered Users', :registered]]
-  #
-  config.audience_user_scopes = [['All Users', :all]]
-
   # Notifications Mailer Settings
   #
-  # Schedule rake effective_polls:notify to run every 10 minutes
+  # Schedule rake effective_polls:send_notifications to run every 10 minutes
   # to send out email poll notifications
   #
   # Please see config/initializers/effective_resources.rb for default effective_* gem mailer settings
@@ -29,6 +19,7 @@ EffectivePolls.setup do |config|
   # config.deliver_method = nil     # The deliver method, deliver_later or deliver_now
   # config.mailer_layout = nil      # Default mailer layout
   # config.mailer_sender = nil      # Default From value
+  # config.mailer_froms = nil       # Default Froms collection
   # config.mailer_admin = nil       # Default To value for Admin correspondence
 
   # Use effective email templates for event notifications

data/config/locales/effective_polls.yml

@@ -0,0 +1,14 @@
+en:
+  effective_polls:
+    name: 'Elections and Polls'
+    acronym: 'Polls'
+
+  activerecord:
+    models:
+      effective/poll: 'Poll'
+      effective/poll_question: 'Poll Question'
+      effective/poll_question_option: 'Poll Question Option'
+      effective/poll_notification: 'Poll Notification'
+      effective/ballot: 'Ballot'
+      effective/ballot_response: 'Ballot Response'
+      effective/ballot_response_option: 'Ballot Response Option'

data/config/routes.rb

@@ -5,17 +5,14 @@ end
 EffectivePolls::Engine.routes.draw do
   scope module: 'effective' do
     resources :polls, only: [:show] do
-      resources :ballots, only: [:new, :show] do
+      resources :ballots, only: [:new, :show, :destroy] do
         resources :build, controller: :ballots, only: [:show, :update]
       end
     end
   end
 
   namespace :admin do
-    resources :polls, except: [:show] do
-      get :results, on: :member
-    end
-
+    resources :polls
     resources :poll_notifications, except: [:show]
     resources :poll_questions, except: [:show]
   end

data/db/migrate/101_create_effective_polls.rb

@@ -8,6 +8,8 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
       t.datetime :end_at
 
       t.string :audience
+
+      t.string :audience_class_name
       t.text :audience_scope
 
       t.datetime :updated_at
@@ -15,7 +17,7 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
     end
 
     create_table :poll_notifications do |t|
-      t.integer :poll_id
+      t.references :poll, polymorphic: false
 
       t.string :category
       t.integer :reminder
@@ -32,7 +34,7 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
     end
 
     create_table :poll_questions do |t|
-      t.integer :poll_id
+      t.references :poll, polymorphic: false
 
       t.string :title
       t.string :category
@@ -45,7 +47,7 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
     end
 
     create_table :poll_question_options do |t|
-      t.integer :poll_question_id
+      t.references :poll_question, polymorphic: false
 
       t.string :title
       t.integer :position
@@ -55,8 +57,8 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
     end
 
     create_table :ballots do |t|
-      t.integer :poll_id
-      t.integer :user_id
+      t.references :poll, polymorphic: false
+      t.references :user, polymorphic: true
 
       t.string :token
       t.text :wizard_steps
@@ -67,9 +69,9 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
     end
 
     create_table :ballot_responses do |t|
-      t.integer :ballot_id
-      t.integer :poll_id
-      t.integer :poll_question_id
+      t.references :ballot, polymorphic: false
+      t.references :poll, polymorphic: false
+      t.references :poll_question, polymorphic: false
 
       t.date :date
       t.string :email
@@ -82,8 +84,8 @@ class CreateEffectivePolls < ActiveRecord::Migration[6.0]
     end
 
     create_table :ballot_response_options do |t|
-      t.integer  :ballot_response_id
-      t.integer :poll_question_option_id
+      t.references :ballot_response, polymorphic: false
+      t.references :poll_question_option, polymorphic: false
 
       t.datetime :updated_at
       t.datetime :created_at

data/db/seeds.rb

@@ -9,7 +9,8 @@ def build_effective_poll
     title: 'Effective Poll',
     start_at: (Time.zone.now + 1.day).beginning_of_day,
     end_at: (Time.zone.now + 1.day).end_of_day,
-    audience: 'All Users'
+    audience: 'All Users',
+    audience_class_name: 'User'
   )
 
   build_poll_question(poll, Effective::PollQuestion::CATEGORIES)

data/lib/effective_polls/engine.rb

@@ -7,5 +7,12 @@ module EffectivePolls
       eval File.read("#{config.root}/config/effective_polls.rb")
     end
 
+    # Include effective_polls_user concern and allow any ActiveRecord object to call it
+    initializer 'effective_polls.active_record' do |app|
+      app.config.to_prepare do
+        ActiveRecord::Base.extend(EffectivePollsUser::Base)
+      end
+    end
+
   end
 end

data/lib/effective_polls/version.rb

@@ -1,3 +1,3 @@
 module EffectivePolls
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/effective_polls.rb

@@ -7,10 +7,8 @@ module EffectivePolls
 
   def self.config_keys
     [
-      :polls_table_name, :poll_notifications_table_name, :poll_questions_table_name, :poll_question_options_table_name,
-      :ballots_table_name, :ballot_responses_table_name, :ballot_response_options_table_name,
-      :layout, :audience_user_scopes,
-      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_admin, :mailer_subject, :use_effective_email_templates
+      :layout,
+      :mailer, :parent_mailer, :deliver_method, :mailer_layout, :mailer_sender, :mailer_froms, :mailer_admin, :mailer_subject, :use_effective_email_templates
     ]
   end
 

data/lib/tasks/effective_polls_tasks.rake

@@ -1,23 +1,34 @@
-# rake effective_polls:notify
+# rake effective_polls:send_notifications
 
 namespace :effective_polls do
   desc 'Send email notifications for effective polls'
-  task notify: :environment do
-    poll_notifications = Effective::PollNotification.all.deep.notifiable
+  task send_notifications: :environment do
+    puts 'Sending notifications'
 
-    poll_notifications.find_each do |notification|
-      begin
-        notified = notification.notify!
-        puts "Sent #{notification.category} for #{notification.poll}" if notified
-      rescue => e
-        if defined?(ExceptionNotifier)
-          ExceptionNotifier.notify_exception(e, data: { poll_notification_id: notification.id, poll_id: notification.poll_id })
-        end
+    table = ActiveRecord::Base.connection.table_exists?(:poll_notifications)
+    blank_tenant = defined?(Tenant) && Tenant.current.blank?
 
-        puts "Error with effective poll_notification #{notification.id}: #{e.errors.inspect}"
+    if table && !blank_tenant
+      poll_notifications = Effective::PollNotification.deep.notifiable
+
+      poll_notifications.find_each do |notification|
+        begin
+          notified = notification.notify!
+          puts "Sent #{notification.category} for #{notification.poll}" if notified
+        rescue StandardError => e
+          data = { poll_notification_id: notification.id, poll_id: notification.poll_id }
+          ExceptionNotifier.notify_exception(e, data: data) if defined?(ExceptionNotifier)
+          puts "Error with effective poll_notification #{notification.id}: #{e.errors.inspect}"
+        end
       end
     end
 
     puts 'All done'
   end
+
+  # Deprecated version
+  task notify: :environment do
+    Rake::Task['effective_polls:send_notifications'].invoke
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_polls
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-05 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -227,9 +227,10 @@ files:
 - app/datatables/admin/effective_poll_questions_datatable.rb
 - app/datatables/admin/effective_poll_results_datatable.rb
 - app/datatables/admin/effective_polls_datatable.rb
-- app/datatables/effective_polls_datatable.rb
+- app/datatables/effective_polls_available_polls_datatable.rb
 - app/helpers/effective_polls_helper.rb
 - app/mailers/effective/polls_mailer.rb
+- app/models/concerns/effective_polls_user.rb
 - app/models/effective/ballot.rb
 - app/models/effective/ballot_response.rb
 - app/models/effective/ballot_response_option.rb
@@ -247,7 +248,7 @@ files:
 - app/views/admin/polls/_form.html.haml
 - app/views/admin/polls/_form_content.html.haml
 - app/views/admin/polls/_form_poll.html.haml
-- app/views/admin/polls/results.html.haml
+- app/views/admin/polls/_poll.html.haml
 - app/views/effective/ballot_responses/_ballot_response.html.haml
 - app/views/effective/ballot_responses/_fields.html.haml
 - app/views/effective/ballot_responses/fields/_choose_one.html.haml
@@ -277,6 +278,8 @@ files:
 - 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
+- app/views/effective/ballots/_content.html.haml
+- app/views/effective/ballots/_layout.html.haml
 - app/views/effective/ballots/complete.html.haml
 - app/views/effective/ballots/start.html.haml
 - app/views/effective/ballots/submit.html.haml
@@ -297,12 +300,14 @@ files:
 - 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/_dashboard.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
 - app/views/effective/polls_mailer/poll_when_poll_starts.liquid
 - config/effective_polls.rb
+- config/locales/effective_polls.yml
 - config/routes.rb
 - db/migrate/101_create_effective_polls.rb
 - db/seeds.rb

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

@@ -1,6 +0,0 @@
-%h1= @page_title
-
-= render 'effective/poll_results/results', poll: @poll
-
-%h2 Raw Results
-= render_datatable(@datatable)