hackathon_manager 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de045d24ad6751129f094dc294549b9eb0931d8619d3873142f862ba286ba0c8
-  data.tar.gz: 43adf2336dce9187e1a430f99b6ae87cc82f827b06dbffdaa83cb974c69c1d92
+  metadata.gz: b110c6f81f04a941dba3abb72df318fd8f861320fd400a23cfc60b07cb64abee
+  data.tar.gz: 489f044a7cd227ca530bf8439f8ed3ac81b487c66fbe61ee2c21e97cd41bf69f
 SHA512:
-  metadata.gz: d29229b913d9af245341d9826308a6fcf53bd5c1c4bff7aacf2aad0e50f0a5351de3766b4571ebc3bd63867fd6f89d60cb6850179a912544dc8f5a1e4974491b
-  data.tar.gz: 1c33c481248ac95f4ae82ee9ab150e42aa812a6529c5a010a9886478495d1ae77ee1f428de676869e36a8fb01f6467445fdffe86968e754e6a681d4b412cbf57
+  metadata.gz: 2dc4cc8c4da1a98ad2ec2e1dd49ec92793f1348ecd1fc00bf6ea7e6b9ecfa7e0304bed004ee9799146e35c6a2c2cdb0308e815964eff2f9817a5b08c631fc0e6
+  data.tar.gz: f150b6ed570e822bdbac891a8500daa9fb70e36bc4adb3ed1dc3a35da83191bec9a3f895eb4937e5b2842336d2e0d718cb955b1a55c65c17b61102cffa1c9729

data/app/controllers/manage/messages_controller.rb

@@ -17,7 +17,9 @@ class Manage::MessagesController < Manage::ApplicationController
   end
 
   def new
-    @message = Message.new
+    type = params[:type]
+    recipients = params[:recipients]
+    @message = Message.new(type: type, recipients: recipients)
     respond_with(:manage, @message)
   end
 

data/app/controllers/manage/questionnaires_controller.rb

@@ -1,7 +1,7 @@
 class Manage::QuestionnairesController < Manage::ApplicationController
   include QuestionnairesControllable
 
-  before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_admin, :update_acc_status, :message_events, :invite_to_slack]
+  before_action :set_questionnaire, only: [:show, :edit, :update, :destroy, :check_in, :convert_to_admin, :update_acc_status, :message_events]
 
   respond_to :html, :json
 
@@ -70,7 +70,6 @@ class Manage::QuestionnairesController < Manage::ApplicationController
       end
       @questionnaire.update_attribute(:checked_in_at, Time.now)
       @questionnaire.update_attribute(:checked_in_by_id, current_user.id)
-      @questionnaire.invite_to_slack
       flash[:notice] = "Checked in #{@questionnaire.full_name}."
     elsif params[:check_in] == "false"
       @questionnaire.update_attribute(:checked_in_at, nil)
@@ -116,8 +115,6 @@ class Manage::QuestionnairesController < Manage::ApplicationController
       flash[:notice] = "Failed to update acceptance status"
     end
 
-    process_acc_status_notifications(@questionnaire, new_status)
-
     redirect_to manage_questionnaire_path(@questionnaire)
   end
 
@@ -132,17 +129,11 @@ class Manage::QuestionnairesController < Manage::ApplicationController
       q.acc_status = action
       q.acc_status_author_id = current_user.id
       q.acc_status_date = Time.now
-      q.save(validate: false) && process_acc_status_notifications(q, action)
+      q.save(validate: false)
     end
     head :ok
   end
 
-  def invite_to_slack
-    @questionnaire.invite_to_slack
-    flash[:notice] = 'Slack invite has been queued for delivery'
-    redirect_to manage_questionnaire_path @questionnaire
-  end
-
   def message_events
     render json: @questionnaire.message_events
   end
@@ -165,8 +156,4 @@ class Manage::QuestionnairesController < Manage::ApplicationController
   def set_questionnaire
     @questionnaire = ::Questionnaire.find(params[:id])
   end
-
-  def process_acc_status_notifications(questionnaire, new_status)
-    questionnaire.invite_to_slack if ENV['INVITE_TO_SLACK_UPON_RSVP'] == 'true' && new_status == 'rsvp_confirmed'
-  end
 end

data/app/controllers/manage/trackable_events_controller.rb

@@ -7,6 +7,11 @@ class Manage::TrackableEventsController < Manage::ApplicationController
   # GET /manage/trackable_events
   def index
     @trackable_events = TrackableEvent.all
+    @params = {}
+    if params[:trackable_event]
+      @params = params.require(:trackable_event).permit(:user_id, :band_id).reject{|_, v| v.blank?}
+      @trackable_events = @trackable_events.where(@params)
+    end
     respond_with(:manage, @trackable_events)
   end
 

data/app/helpers/manage/bootstrap_form_helper.rb

@@ -1,6 +1,6 @@
 module Manage
   module BootstrapFormHelper
-    def bs_vertical_simple_form(path, options, &block)
+    def bs_vertical_simple_form(path, options = {}, &block)
       bootstrap_options = {
         wrapper: :bootstrap_vertical_form,
         wrapper_mappings: {
@@ -20,7 +20,7 @@ module Manage
       end
     end
 
-    def bs_horizontal_simple_form_for(path, options, &block)
+    def bs_horizontal_simple_form_for(path, options = {}, &block)
       bootstrap_options = {
         wrapper: :bootstrap_horizontal_form,
         wrapper_mappings: {

data/app/mailers/mail_preview.rb

@@ -14,10 +14,6 @@ if defined?(ActionMailer::Preview)
       Mailer.bus_captain_confirmation_email(buslist.id, buslist.captains.first.id)
     end
 
-    def slack_invite_email
-      Mailer.slack_invite_email(Questionnaire.first.id)
-    end
-
     def bus_list_update_email
       Mailer.bus_list_update_email(BusList.first.passengers.first.id)
     end

data/app/mailers/mailer.rb

@@ -31,12 +31,6 @@ class Mailer < ApplicationMailer
     mail_questionnaire("You're a bus captain!")
   end
 
-  def slack_invite_email(questionnaire_id)
-    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
-    return if @questionnaire.blank?
-    mail_questionnaire("Slack Invite!")
-  end
-
   def bus_list_update_email(questionnaire_id)
     @questionnaire = Questionnaire.find_by_id(questionnaire_id)
     @bus_list = @questionnaire.bus_list

data/app/models/message_recipient_query.rb

@@ -57,11 +57,11 @@ class MessageRecipientQuery
 
     case recipient_query.type
     when "bus-list"
-      "Bus List: #{model.name} (signed up for bus)"
+      "Bus List: #{model.name} (signed up passengers)"
     when "bus-list--eligible"
       "Bus List: #{model.name} (eligible, not signed up for bus)"
     when "bus-list--applied"
-      "Bus List: #{model.name} (applied/not accepted)"
+      "Bus List: #{model.name} (applied/not yet accepted)"
     when "school"
       "Confirmed or Accepted: #{model.name}"
     when "blazer"

data/app/models/questionnaire.rb

@@ -199,10 +199,6 @@ class Questionnaire < ApplicationRecord
     simple_spark.message_events.search(recipients: email)
   end
 
-  def invite_to_slack
-    SlackInviteWorker.perform_async(id)
-  end
-
   def verbal_status
     if acc_status == "rsvp_denied"
       "Not Attending"

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

@@ -2,7 +2,15 @@
   .btn-group
     = link_to 'Edit', edit_manage_bus_list_path(@bus_list), class: 'btn btn-sm btn-outline-secondary'
     = link_to 'Delete', manage_bus_list_path(@bus_list), method: :delete, data: { confirm: "Are you sure? The bus list \"#{@bus_list.name}\" will be permanently erased. This action is irreversible." }, class: 'btn btn-sm btn-outline-secondary'
-    = link_to 'Send Email Update', send_update_email_manage_bus_list_path(@bus_list), method: :patch, data: { confirm: "Are you sure? All passengers for \"#{@bus_list.name}\" will be emailed the current bus notes." }, class: 'btn btn-sm btn-outline-secondary'
+    .btn-group{role: "group"}
+      %button.btn.btn-sm.btn-outline-secondary.dropdown-toggle#title-actions{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button"}
+        .fa.fa-envelope-o.pr-1
+        Send email
+      .dropdown-menu.dropdown-menu-right{"aria-labelledby" => "title-actions"}
+        = link_to 'Send Bus Notes Update', send_update_email_manage_bus_list_path(@bus_list), method: :patch, data: { confirm: "Are you sure? All passengers for \"#{@bus_list.name}\" will be immediatley emailed the current bus notes." }, class: 'dropdown-item'
+        = link_to 'Create message (signed up passengers)', new_manage_message_path(type: 'bulk', recipients: ["bus-list::#{@bus_list.id}"]), class: 'dropdown-item'
+        = link_to 'Create message (eligible, not signed up)', new_manage_message_path(type: 'bulk', recipients: ["bus-list::#{@bus_list.id}"]), class: 'dropdown-item'
+        = link_to 'Create message (applied/not yet accepted)', new_manage_message_path(type: 'bulk', recipients: ["bus-list::#{@bus_list.id}"]), class: 'dropdown-item'
 
 .row
   .col-lg-6

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

@@ -22,12 +22,6 @@
         %h6.card-subtitle.mb-2.text-muted
           Environment variables are configured on the production server.
         %hr
-        %p
-          %b Carpool Link:
-          %pre= ENV['CARPOOL_LINK'] || '[No value]'
-        %p
-          %b Slack Sign Up URL:
-          %pre= ENV['SLACK_SIGNUP_URL'] || '[No value]'
         %p
           %b AWS S3 Bucket for Resumes:
           %pre= ENV['AWS_BUCKET'] || '[No value]'

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

@@ -34,7 +34,3 @@
             = f.input :email, input_html: { "data-validate" => "presence email", value: @questionnaire.user.try(:email) }, required: true
           = hidden_field_tag("check_in", !@questionnaire.checked_in?)
           = f.button :submit, value: ( @questionnaire.checked_in? ? "Remove check-in" : "Check In" ), class: 'btn-primary'
-          - if !@questionnaire.checked_in?
-            %p.card-text
-              %small
-                %i An invite to Slack will be sent if they haven't joined already.

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

@@ -2,13 +2,6 @@
   = link_to "New Questionnaire", new_manage_questionnaire_path, class: "btn btn-sm btn-outline-secondary"
 
 %div
-  - if ENV['INVITE_TO_SLACK_UPON_RSVP']
-    %p.small
-      %strong.text-info
-        %span.fa.fa-info-circle.icon-space-r-half
-        Slack auto-invite enabled.
-      %span.text-muted Invites will automatically be sent upon RSVP confirmation.
-
   %table.questionnaires.datatable.table.table-striped.table-hover{ "data-source" => datatable_manage_questionnaires_path(format: :json) }
     %thead
       %tr

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

@@ -11,7 +11,6 @@
   .btn-group{role: "group"}
     - unless current_user.admin_limited_access
       = link_to 'Edit', edit_manage_questionnaire_path(@questionnaire), class: 'btn btn-sm btn-outline-secondary'
-    = link_to 'Invite to Slack', invite_to_slack_manage_questionnaire_path(@questionnaire), method: :patch, class: 'btn btn-sm btn-outline-secondary'
     - unless current_user.admin_limited_access
       .btn-group{role: "group"}
         %button.btn.btn-sm.btn-outline-secondary.dropdown-toggle#title-actions{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button"}

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

@@ -2,6 +2,13 @@
   .btn-group
     = link_to 'Edit', edit_manage_school_path(@school), class: 'btn btn-sm btn-outline-secondary'
     = link_to 'Merge', merge_manage_school_path(@school), class: 'btn btn-sm btn-outline-secondary'
+    .btn-group{role: "group"}
+      %button.btn.btn-sm.btn-outline-secondary.dropdown-toggle#title-actions{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", type: "button"}
+        .fa.fa-envelope-o.pr-1
+        Send email
+      .dropdown-menu.dropdown-menu-right{"aria-labelledby" => "title-actions"}
+        = link_to 'Create message (confirmed or accepted applicants)', new_manage_message_path(type: 'bulk', recipients: ["school::#{@school.id}"]), class: 'dropdown-item'
+
 
 .row
   .col-md-6

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

@@ -1,5 +1,14 @@
 = render "layouts/manage/page_title", title: "Trackable Events"
 
+= bs_horizontal_simple_form_for :trackable_event, method: 'get' do |f|
+  .form-row
+    .col-auto
+      = f.input :user_id, collection: User.where(admin: true), label_method: :email, value_method: :id, include_blank: '(show all)', required: false, selected: @params['user_id']
+    .col-auto
+      = f.input :band_id, as: :string, required: false, input_html: { value: @params['band_id'] }, placeholder: '(show all)'
+    .col-auto
+      = f.button :submit, 'Filter', class: 'btn btn-primary'
+
 %table.table.table-striped
   %thead
     %tr

data/config/routes.rb

@@ -47,7 +47,6 @@ Rails.application.routes.draw do
       patch :update_acc_status, on: :member
       patch :bulk_apply, on: :collection
       get :message_events, on: :member
-      patch :invite_to_slack, on: :member
     end
     resources :admins do
       post :datatable, on: :collection

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.11.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -590,7 +590,6 @@ files:
 - app/views/mailer/bus_captain_confirmation_email.html.erb
 - app/views/mailer/bus_list_update_email.html.erb
 - app/views/mailer/incomplete_reminder_email.html.erb
-- app/views/mailer/slack_invite_email.html.erb
 - app/views/manage/admins/_form.html.haml
 - app/views/manage/admins/edit.html.haml
 - app/views/manage/admins/index.html.haml
@@ -642,7 +641,6 @@ files:
 - app/views/questionnaires/show.html.haml
 - app/views/rsvps/show.html.haml
 - app/workers/bulk_message_worker.rb
-- app/workers/slack_invite_worker.rb
 - config/blazer.yml
 - config/initializers/0_hackathon.rb
 - config/initializers/ajax_datatables_rails.rb

data/app/views/mailer/slack_invite_email.html.erb

@@ -1,10 +0,0 @@
-<% raise 'Slack invite URL missing' if ENV['SLACK_SIGNUP_URL'].blank? %>
-<h1>Join Slack!</h1>
-<p>Hey <%= @questionnaire.first_name %>,
-<p><a href="https://slack.com/is">Slack</a> is being used as a central communication platform at <%= Rails.configuration.hackathon['name'] %>.</p>
-<p>You can create private <strong>team chats</strong>, reach out to <strong>mentors</strong>, and more. Don't like notifications? Don't worry - you can <a href="https://get.slack.help/hc/en-us/articles/218074567-Customizing-notifications">customize them</a> or <a href="https://get.slack.help/hc/en-us/articles/214908388-Do-Not-Disturb-and-snooze-settings">turn them off entirely</a>.
-<p style="text-align: center;">
-  <a href="<%= ENV['SLACK_SIGNUP_URL'] %>" class="button">Join our Slack &raquo;</a><br>
-  <small><i>Link not working? Go to:</i></small><br />
-  <small><i><%= ENV['SLACK_SIGNUP_URL'] %></i></small>
-</p>

data/app/workers/slack_invite_worker.rb

@@ -1,49 +0,0 @@
-require 'httparty'
-
-class SlackInviteWorker
-  include Sidekiq::Worker
-
-  def perform(questionnaire_id)
-    questionnaire = Questionnaire.find(questionnaire_id)
-    email = questionnaire.email
-    first_name = questionnaire.first_name
-    last_name = questionnaire.last_name
-    json = query_api('users.admin.invite', "&email=#{email}&first_name=#{first_name}&last_name=#{last_name}&set_active=true")
-
-    return if json[:ok]
-
-    if json[:error]
-      return if ok_errors.include?(json[:error])
-      return attempt_manual_invite(questionnaire.id, email) if use_manual_errors.include?(json[:error])
-      raise "Slack error: #{json[:error]}"
-    end
-
-    raise "Failed to invite to Slack."
-  end
-
-  private
-
-  def query_api(method, params = '')
-    response = HTTParty.post("https://#{ENV['SLACK_SUBDOMAIN']}.slack.com/api/#{method}?token=#{ENV['SLACK_API_TOKEN']}#{params}")
-    json = JSON.parse(response.body, symbolize_names: true)
-    raise "Could not read Slack response" unless json
-    json
-  end
-
-  def attempt_manual_invite(questionnaire_id, email)
-    json = query_api('users.list')
-    raise "Slack error: #{json[:error]}" if json[:error]
-
-    return if json[:members].find { |member| member[:profile][:email] == email }
-
-    Mailer.delay.slack_invite_email(questionnaire_id)
-  end
-
-  def ok_errors
-    ['already_invited', 'already_in_team']
-  end
-
-  def use_manual_errors
-    ['invalid_email', 'invite_limit_reached']
-  end
-end