hackathon_manager 0.5.9 → 0.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2e21c09fe4f13fff062eb78c01cca1a70f528ea
-  data.tar.gz: e3358739189286f47332e13d7a835fad10db34d1
+  metadata.gz: b559e8c65a13ad6d2ba8ac77b4e8dbed6945c743
+  data.tar.gz: 6a3188bb8f656931e763d6696e931c71ec3ee925
 SHA512:
-  metadata.gz: b247e8aca8d851af7b9eb59865f9fe690fdbdcff20835e6c0f575952192321867381e74523c955be90b55b0e8fccfe955ee95343806d2c530cc19ca25c2628de
-  data.tar.gz: 063cc9f56440ca9f82bcca75585bd1b077fb425f92dfa197eb226c23c727309b2304325849cb5ff54156cbb1646b20791abf45935201cb50cf310d1347b21a1d
+  metadata.gz: 9729f692a84b2299c8448a22e9e8d0ed0f0a37a67991912f9f4cf875c5c8c34cbbb4182c54fe739ffd8fbfb1407a6c1ceed2a1bc732932c7a855531c5b5163d9
+  data.tar.gz: 8a201491d32bda0907cf34988543633677957e067ae977621c9d746605a81cadd5bd46c4b03ca591a05614b8ab1ac4c687a0d7e6b36e3eca201327b34a6689e1

data/app/controllers/manage/questionnaires_controller.rb

@@ -167,6 +167,6 @@ class Manage::QuestionnairesController < Manage::ApplicationController
     Mailer.delay.rsvp_confirmation_email(questionnaire.id) if new_status == "rsvp_confirmed"
     Mailer.delay.denied_email(questionnaire.id) if new_status == "denied"
 
-    questionnaire.invite_to_slack if ENV['INVITE_TO_SLACK_WHEN_ACCEPTED'] == 'true' && ['accepted', 'rsvp_confirmed'].include?(new_status)
+    questionnaire.invite_to_slack if ENV['INVITE_TO_SLACK_UPON_RSVP'] == 'true' && new_status == 'rsvp_confirmed'
   end
 end

data/app/controllers/rsvps_controller.rb

@@ -20,6 +20,8 @@ class RsvpsController < ApplicationController
     @questionnaire.acc_status_author_id = current_user.id
     @questionnaire.acc_status_date = Time.now
     if @questionnaire.save
+      flash[:notice] = "Thank you for confirming your attendance! "
+      flash[:notice] += @questionnaire.eligible_for_a_bus? ? "See below for additional bus information." : "You're all set to attend."
       Mailer.delay.rsvp_confirmation_email(@questionnaire.id)
     else
       flash[:notice] = rsvp_error_notice
@@ -35,6 +37,7 @@ class RsvpsController < ApplicationController
     unless @questionnaire.save
       flash[:notice] = rsvp_error_notice
     end
+    flash[:notice] = "Your RSVP has been updated." if flash[:notice].blank?
     redirect_to rsvp_path
   end
 
@@ -79,6 +82,8 @@ class RsvpsController < ApplicationController
 
     Mailer.delay.rsvp_confirmation_email(@questionnaire.id) if acc_status_changed && @questionnaire.acc_status == "rsvp_confirmed"
 
+    flash[:notice] = "Your RSVP has been updated." if flash[:notice].blank?
+
     redirect_to rsvp_path
   end
 

data/app/models/message.rb

@@ -18,6 +18,7 @@ class Message < ApplicationRecord
     "rsvp-denied"                      => "RSVP Denied Attendees",
     "checked-in"                       => "Checked-In Attendees",
     "non-checked-in"                   => "Non-Checked-In, Accepted & RSVP'd Applications",
+    "non-checked-in-excluding"         => "Non-Checked-In Applications, Excluding Accepted & RSVP'd",
     "bus-list-cornell-bing"            => "Bus List: Cornell + Binghamton (Confirmed)",
     "bus-list-buffalo"                 => "Bus List: Buffalo (Confirmed)",
     "bus-list-albany"                  => "Bus List: Albany (Confirmed)",

data/app/views/bus_lists/show.html.haml

@@ -3,7 +3,6 @@
   %h1.section-title
     Bus
     %span.emphasized Captain
-  %p#notice= notice
 
   %p Thank you for being a bus captain! Below is any information you may need about your passengers.
 

data/app/views/manage/admins/show.html.haml

@@ -2,8 +2,6 @@
   %h1.section-title= title "Edit Admin"
 
   .form-container
-    %p#notice= notice
-
     %p
       %b Email Address:
       = @user.email

data/app/views/manage/bus_lists/show.html.haml

@@ -1,6 +1,5 @@
 %section.section.manage
   %h1.section-title= title "Bus List"
-  %p#notice= notice
 
   %p
     %b Name:

data/app/views/manage/messages/show.html.haml

@@ -1,6 +1,7 @@
 %section.section.manage
   %h1.section-title= title "Message"
-  %p#notice= notice
+
+  - recipient_count = pluralize(BulkMessageWorker.build_recipients(@message.recipients).count, "recipient")
 
   %p
     %b Name:
@@ -14,6 +15,9 @@
   %p
     %b Recipients:
     = @message.recipients_list
+    %br
+    %small
+      %em #{recipient_count} currently match this query.
   %p
     %b Preview:
     = link_to "Open full preview »".html_safe, preview_manage_message_path
@@ -38,7 +42,7 @@
 
   - unless current_user.admin_limited_access
     - if @message.status == "drafted"
-      = btn_link_to 'Deliver', deliver_manage_message_path(@message), method: :patch, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be sent out to all recipients." }
+      = btn_link_to 'Deliver', deliver_manage_message_path(@message), method: :patch, data: { confirm: "Are you sure? The message \"#{@message.name}\" will be sent to #{recipient_count}." }
       \|
     - if @message.can_edit?
       = link_to 'Edit', edit_manage_message_path(@message)

data/app/views/manage/questionnaires/index.html.haml

@@ -1,11 +1,11 @@
 %section.section.manage
   %h1.section-title= title "Listing Questionnaires"
 
-  - if ENV['INVITE_TO_SLACK_WHEN_ACCEPTED']
+  - if ENV['INVITE_TO_SLACK_UPON_RSVP']
     %p
       %small
-        %span.fa.fa-warning.icon-space-r
-        Slack invites will be sent upon acceptance.
+        %span.fa.fa-info-circle.icon-space-r
+        Slack invites will automatically be sent upon RSVP confirmation.
 
   %table.questionnaires.datatable.row-border.stripe.hover.order-column{ "data-source" => datatable_manage_questionnaires_path(format: :json) }
     %thead

data/app/views/manage/questionnaires/show.html.haml

@@ -1,7 +1,4 @@
 %section.section.manage
-  - if notice
-    #disclaimer= notice
-
   .container.container-half
     = render partial: 'questionnaire_summary'
 

data/app/views/manage/schools/show.html.haml

@@ -1,6 +1,5 @@
 %section.section{ style: "padding-left: 20px; padding-right: 20px" }
   %h1.section-title= title "School"
-  %p#notice= notice
 
   %p
     %b Name:

data/app/views/questionnaires/show.html.haml

@@ -24,6 +24,8 @@
             %br
           %p.center
             = btn_link_to "RSVP NOW »".html_safe, rsvp_path
+      - elsif @questionnaire.acc_status == "denied"
+        %p
       - else
         - if Rails.configuration.hackathon['registration_is_open']
           - if Rails.configuration.hackathon['thanks_for_applying']

data/app/workers/bulk_message_worker.rb

@@ -6,7 +6,7 @@ class BulkMessageWorker
     return unless message.present? && message.status == "queued"
     message.update_attribute(:started_at, Time.now)
 
-    recipients = build_recipients(message.recipients)
+    recipients = self.class.build_recipients(message.recipients)
 
     recipients.each do |recipient|
       Mailer.delay.bulk_message_email(message.id, recipient)
@@ -15,9 +15,7 @@ class BulkMessageWorker
     message.update_attribute(:delivered_at, Time.now)
   end
 
-  private
-
-  def build_recipients(recipient_types)
+  def self.build_recipients(recipient_types)
     recipients = Set.new
     recipient_types.each do |type|
       recipients += recipients_query(type)
@@ -26,7 +24,7 @@ class BulkMessageWorker
   end
 
   # rubocop:disable CyclomaticComplexity
-  def recipients_query(type)
+  def self.recipients_query(type)
     case type
     when "all"
       User.where(admin: false).pluck(:id)
@@ -49,7 +47,9 @@ class BulkMessageWorker
     when "checked-in"
       Questionnaire.where("checked_in_at IS NOT NULL").pluck(:user_id)
     when "non-checked-in"
-      Questionnaire.where("(acc_status = 'accepted' OR acc_status = 'accepted' OR acc_status = 'rsvp_denied') AND checked_in_at IS NULL").pluck(:user_id)
+      Questionnaire.where("(acc_status = 'accepted' OR acc_status = 'rsvp_confirmed' OR acc_status = 'rsvp_denied') AND checked_in_at IS NULL").pluck(:user_id)
+    when "non-checked-in-excluding"
+      Questionnaire.where("acc_status != 'accepted' AND acc_status != 'rsvp_confirmed' AND acc_status != 'rsvp_denied' AND checked_in_at IS NULL").pluck(:user_id)
     when "bus-list-cornell-bing"
       BusList.find(1).passengers.pluck(:user_id)
     when "bus-list-buffalo"

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.5.9'.freeze
+  VERSION = '0.5.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-11 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails