hackathon_manager 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f40107fc2cf80fe072926e73ff051505f8c6aa2631a7ff4f4aa780d4ca65536
-  data.tar.gz: b233ea4f63e164baafccdef3a4d924bc3d9b0f896f84d64ad80c25ffae47c6ea
+  metadata.gz: 42bb8fbade8f26eef5e53334f66e8ca79e763df6e69759dd0bc52cf7fd6308ad
+  data.tar.gz: 197276de127e1213e5741734a19cfeae498aed81016dc6eb907a454102ebd34b
 SHA512:
-  metadata.gz: 503a9996dce1f5ac31061896b6c941f5be460af220f7467f2e23d171178d188f3e61cad9e3938c9169c7b9aeabb99f62bb73eb2907e62837c99da4a7199eeb75
-  data.tar.gz: 6fc6587f1559941d51179bb41caed46cfd7883709d3d46c3671ac425485513203b164fd640a0d2ee6315d7b40c877aba462050b2aae8b0467420b357d8202299
+  metadata.gz: 302c4d953876425e55b177e234ccbdbdf1a496825a06f92b87899f74208ef8eec7575c749144cd8629b9e6bf45859567c85e499da6ea2f443ec4104deeb8933e
+  data.tar.gz: a1dd14af8ad7fd29a116a8c4ad778b80591073718cba15608a4b0fc2550f7af48d133a256e5e2aab83d3b7bb81302642dbcbaabb62103a1027be3d4df8731c91

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'

data/app/assets/javascripts/hackathon_manager/manage/application.js

@@ -16,4 +16,5 @@ $(document).ready(function() {
   setupDataTables();
   setupHighcharts();
   $('[data-toggle="popover"]').popover();
+  $('[data-message-live-preview="textarea"]').messageLivePreview();
 });

data/app/assets/javascripts/hackathon_manager/manage/lib/datatables.js

@@ -3,6 +3,7 @@
 $.extend( $.fn.dataTable.defaults, {
   processing : true,
   serverSide : true,
+  scrollX    : false,
   ajax       : {
     url   : $(this).data('source'),
     type  : "POST"

data/app/assets/javascripts/hackathon_manager/manage/lib/debounce.js

@@ -0,0 +1,19 @@
+// Source: https://davidwalsh.name/javascript-debounce-function
+// Returns a function, that, as long as it continues to be invoked, will not
+// be triggered. The function will be called after it stops being called for
+// N milliseconds. If `immediate` is passed, trigger the function on the
+// leading edge, instead of the trailing.
+function debounce(func, wait, immediate) {
+  var timeout;
+  return function() {
+    var context = this, args = arguments;
+    var later = function() {
+      timeout = null;
+      if (!immediate) func.apply(context, args);
+    };
+    var callNow = immediate && !timeout;
+    clearTimeout(timeout);
+    timeout = setTimeout(later, wait);
+    if (callNow) func.apply(context, args);
+  };
+};

data/app/assets/javascripts/hackathon_manager/manage/lib/forms.js

@@ -0,0 +1,34 @@
+$(document).ready(function() {
+  var disable = function($element) {
+    $element.hide();
+    $element.find('input').prop('disabled', true);
+  };
+  var enable = function($element) {
+    $element.show();
+    $element.find('input').prop('disabled', false);
+  };
+
+  var updateMessageForm = function() {
+    var $type = $('[name="message[type]"]');
+    if (typeof $type === 'undefined') {
+      return;
+    }
+
+    $recipients = $('.message_recipients');
+    $trigger = $('.message_trigger');
+
+    var type = $type.val();
+    if (type === "automated") {
+      disable($recipients);
+      enable($trigger);
+    } else {
+      disable($trigger);
+      enable($recipients);
+    }
+  };
+
+  updateMessageForm();
+  $('[name="message[type]"]').on('change', function() {
+    updateMessageForm();
+  });
+});

data/app/assets/javascripts/hackathon_manager/manage/lib/messageLivePreview.js

@@ -0,0 +1,16 @@
+$.fn.messageLivePreview = function() {
+
+  var updateLivePreview = function() {
+    var textarea = $('[data-message-live-preview="textarea"]');
+    var iframe = $('[data-message-live-preview="iframe"]');
+    var baseSrc = iframe.data('message-live-preview-base-src') ;
+    var newSrc = baseSrc + '?body=' + encodeURIComponent(textarea.val());
+    console.log(newSrc);
+    iframe.attr('src', newSrc);
+  };
+
+  var debouncedUpdateLivePreview = debounce(updateLivePreview, 1000);
+
+  $('[data-message-live-preview="textarea"]').on('change', debouncedUpdateLivePreview);
+  $('[data-message-live-preview="textarea"]').on('input', debouncedUpdateLivePreview);
+};

data/app/assets/javascripts/hackathon_manager/manage/lib/setupDataTables.js

@@ -2,11 +2,10 @@ var setupDataTables = function() {
 
   window.questionnairesDataTable = $('.datatable.questionnaires').DataTable({
     order      : [3, 'desc'],
-    scrollX    : false,
     columns    : [
-      { orderable : false, data: 'bulk' },
-      { orderable : false, data: 'link' },
-      { orderable : false, data: 'note' },
+      { orderable: false, data: 'bulk' },
+      { orderable: false, data: 'link' },
+      { orderable: false, data: 'note' },
       { orderable: true, data: 'id', visible: false },
       { orderable: true, data: 'first_name' },
       { orderable: true, data: 'last_name' },
@@ -17,13 +16,14 @@ var setupDataTables = function() {
       { orderable: true, data: 'acc_status' },
       { orderable: true, data: 'checked_in' },
       { orderable: true, data: 'school' },
-      { orderable: true, data: 'created_at' }
+      { orderable: true, data: 'created_at' },
+      { orderable: true, data: 'dietary_restrictions', visible: false },
+      { orderable: true, data: 'special_needs', visible: false },
     ]
   });
 
   $('.datatable.users').DataTable({
     order      : [1, 'asc'],
-    scrollX    : false,
     columns    : [
       { orderable: true, data: 'id', visible: false },
       { orderable: true, data: 'email' },
@@ -31,22 +31,21 @@ var setupDataTables = function() {
     ]
   });
 
-  $('.datatable.messages').DataTable({
-    order      : [0, 'desc'],
-    scrollX    : false,
+  $('.datatable.bulk-messages').DataTable({
+    order      : [4, 'desc'],
     columns    : [
       { orderable: true, data: 'id', visible: false},
       { orderable: true, data: 'name'},
       { orderable: true, data: 'subject'},
-      { orderable: true, data: 'trigger'},
       { orderable: false, data: 'status'},
+      { orderable: true, data: 'created_at'},
+      { orderable: true, data: 'updated_at', visible: false},
       { orderable: true, data: 'delivered_at'}
     ]
   });
 
   $('.datatable.schools').DataTable({
     order      : [4, 'desc'],
-    scrollX    : false,
     columns    : [
       { orderable: true, data: 'id', visible: false },
       { orderable: true, data: 'name' },
@@ -58,7 +57,6 @@ var setupDataTables = function() {
   });
 
   $('.datatable.stats').DataTable({
-    scrollX    : false,
     processing : false,
     serverSide : false
   });

data/app/assets/stylesheets/hackathon_manager/dashboard.css

@@ -35,6 +35,9 @@ body {
 .sidebar .nav-link {
   font-weight: 500;
   color: #333;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .sidebar .nav-link .fa {
@@ -62,6 +65,7 @@ body {
   margin-left: 26px;
   color: #999;
   line-height: 1.2;
+  white-space: normal;
 }
 
 /*
@@ -82,6 +86,8 @@ body {
   font-size: 1rem;
   background-color: rgba(0, 0, 0, .25);
   box-shadow: inset -1px 0 0 rgba(0, 0, 0, .25);
+  text-overflow: ellipsis;
+  overflow: hidden;
 }
 
 .navbar .form-control {

data/app/controllers/manage/application_controller.rb

@@ -1,6 +1,6 @@
 class Manage::ApplicationController < ApplicationController
   before_action :logged_in
-  before_action :limit_admin_access, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email"]
+  before_action :limit_admin_access, only: ["edit", "update", "new", "create", "destroy", "convert_to_admin", "deliver", "merge", "perform_merge", "toggle_bus_captain", "duplicate", "update_acc_status", "send_update_email", "live_preview"]
 
   def logged_in
     authenticate_user!

data/app/controllers/manage/messages_controller.rb

@@ -8,7 +8,7 @@ class Manage::MessagesController < Manage::ApplicationController
   end
 
   def datatable
-    render json: MessageDatatable.new(view_context)
+    render json: BulkMessageDatatable.new(view_context)
   end
 
   def show
@@ -40,6 +40,10 @@ class Manage::MessagesController < Manage::ApplicationController
   end
 
   def deliver
+    if @message.automated?
+      flash[:notice] = "Automated messages cannot be manually delivered. Only bulk messages can."
+      return redirect_to manage_message_path(@message)
+    end
     if @message.status != "drafted"
       flash[:notice] = "Message cannot be re-delivered"
       return redirect_to manage_messages_path
@@ -55,6 +59,13 @@ class Manage::MessagesController < Manage::ApplicationController
     render html: email.body.raw_source.html_safe
   end
 
+  def live_preview
+    body = params[:body] || ''
+    message = Message.new(body: body)
+    email = Mailer.bulk_message_email(nil, current_user.id, message)
+    render html: email.body.raw_source.html_safe
+  end
+
   def duplicate
     new_message = @message.dup
     new_message.update_attributes(
@@ -71,7 +82,7 @@ class Manage::MessagesController < Manage::ApplicationController
 
   def message_params
     params.require(:message).permit(
-      :name, :subject, :template, :body, :trigger, recipients: []
+      :type, :name, :subject, :template, :body, :trigger, recipients: []
     )
   end
 

data/app/controllers/manage/questionnaires_controller.rb

@@ -165,10 +165,6 @@ class Manage::QuestionnairesController < Manage::ApplicationController
   end
 
   def process_acc_status_notifications(questionnaire, new_status)
-    Mailer.delay.accepted_email(questionnaire.id) if new_status == "accepted"
-    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_UPON_RSVP'] == 'true' && new_status == 'rsvp_confirmed'
   end
 end

data/app/controllers/questionnaires_controller.rb

@@ -70,7 +70,6 @@ class QuestionnairesController < ApplicationController
       if @questionnaire.save
         current_user.questionnaire = @questionnaire
         @questionnaire.update_attribute(:acc_status, default_acc_status)
-        Mailer.delay.application_confirmation_email(@questionnaire.id)
         format.html { redirect_to questionnaires_path }
         format.json { render json: @questionnaire, status: :created, location: @questionnaire }
       else

data/app/controllers/rsvps_controller.rb

@@ -22,7 +22,6 @@ class RsvpsController < ApplicationController
     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
     end
@@ -72,16 +71,12 @@ class RsvpsController < ApplicationController
       @questionnaire.bus_captain_interest = params[:questionnaire][:bus_captain_interest]
     end
 
-    acc_status_changed = @questionnaire.acc_status_changed?
-
     unless @questionnaire.save
       flash[:notice] = @questionnaire.errors.full_message.join(", ")
       redirect_to rsvp_path
       return
     end
 
-    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

data/app/datatables/{message_datatable.rb → bulk_message_datatable.rb}

@@ -1,4 +1,4 @@
-class MessageDatatable < AjaxDatatablesRails::Base
+class BulkMessageDatatable < AjaxDatatablesRails::Base
   def_delegators :@view, :link_to, :manage_message_path, :display_datetime
 
   def view_columns
@@ -6,7 +6,8 @@ class MessageDatatable < AjaxDatatablesRails::Base
       id: { source: "Message.id" },
       name: { source: "Message.name" },
       subject: { source: "Message.subject" },
-      trigger: { source: "Message.trigger" },
+      created_at: { source: "Message.created_at", searchable: false },
+      updated_at: { source: "Message.updated_at", searchable: false },
       delivered_at: { source: "Message.delivered_at", searchable: false }
     }
   end
@@ -19,8 +20,9 @@ class MessageDatatable < AjaxDatatablesRails::Base
         id: record.id,
         name: link_to(record.name, manage_message_path(record)),
         subject: record.subject,
-        trigger: Message::POSSIBLE_TRIGGERS[record.trigger],
         status: record.status.titleize,
+        created_at: display_datetime(record.created_at),
+        updated_at: record.updated_at.present? ? display_datetime(record.updated_at) : '',
         delivered_at: record.delivered_at.present? ? display_datetime(record.delivered_at) : ''
       }
     end
@@ -28,7 +30,7 @@ class MessageDatatable < AjaxDatatablesRails::Base
 
   # rubocop:disable Naming/AccessorMethodName
   def get_raw_records
-    Message.unscoped
+    Message.where(type: 'bulk')
   end
   # rubocop:enable Naming/AccessorMethodName
 end

data/app/datatables/questionnaire_datatable.rb

@@ -14,7 +14,9 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
       acc_status: { source: 'Questionnaire.acc_status', searchable: true },
       checked_in: { source: 'Questionnaire.checked_in_at', searchable: false },
       school: { source: 'School.name' },
-      created_at: { source: 'Questionnaire.created_at', searchable: false }
+      created_at: { source: 'Questionnaire.created_at', searchable: false },
+      dietary_restrictions: { source: 'Questionnaire.dietary_restrictions', searchable: true },
+      special_needs: { source: 'Questionnaire.special_needs', searchable: true }
     }
   end
 
@@ -36,7 +38,9 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
         acc_status: "<span class=\"text-#{acc_status_class(record.acc_status)}\">#{record.acc_status.titleize}</span>".html_safe,
         checked_in: record.checked_in? ? '<span class="text-success">Yes</span>'.html_safe : 'No',
         school: link_to(record.school.name, manage_school_path(record.school)),
-        created_at: record.created_at.present? ? display_datetime(record.created_at) : ''
+        created_at: record.created_at.present? ? display_datetime(record.created_at) : '',
+        dietary_restrictions: record.dietary_restrictions,
+        special_needs: record.special_needs
       }
     end
   end

data/app/mailers/mail_preview.rb

@@ -1,22 +1,5 @@
 if defined?(ActionMailer::Preview)
   class MailPreview < ActionMailer::Preview
-    def application_confirmation_email
-      questionnaire = Questionnaire.first
-      Mailer.application_confirmation_email(questionnaire.id)
-    end
-
-    def rsvp_confirmation_email
-      Mailer.rsvp_confirmation_email(Questionnaire.first.id)
-    end
-
-    def accepted_email
-      Mailer.accepted_email(Questionnaire.first.id)
-    end
-
-    def denied_email
-      Mailer.denied_email(Questionnaire.first.id)
-    end
-
     def bulk_message_email
       message = Message.first
       Mailer.bulk_message_email(message, User.first.id)

data/app/mailers/mailer.rb

@@ -4,32 +4,8 @@ class Mailer < ApplicationMailer
 
   default from: Rails.configuration.hackathon['email_from']
 
-  def application_confirmation_email(questionnaire_id)
-    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
-    return unless @questionnaire.present? && @questionnaire.user.present?
-    mail_questionnaire("Application Received", transactional: true)
-  end
-
-  def rsvp_confirmation_email(questionnaire_id)
-    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
-    return unless @questionnaire.present? && @questionnaire.user.present?
-    mail_questionnaire("RSVP Confirmation", transactional: true)
-  end
-
-  def accepted_email(questionnaire_id)
-    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
-    return unless @questionnaire.present? && @questionnaire.user.present?
-    mail_questionnaire("You've been accepted!")
-  end
-
-  def denied_email(questionnaire_id)
-    @questionnaire = Questionnaire.find_by_id(questionnaire_id)
-    return unless @questionnaire.present? && @questionnaire.user.present?
-    mail_questionnaire("Your application status")
-  end
-
-  def bulk_message_email(message_id, user_id)
-    @message = Message.find_by_id(message_id)
+  def bulk_message_email(message_id, user_id, message = nil)
+    @message = message || Message.find_by_id(message_id)
     @user    = User.find_by_id(user_id)
     return if @user.blank? || @message.blank?
     mail(

data/app/models/message.rb

@@ -6,6 +6,8 @@ class Message < ApplicationRecord
 
   POSSIBLE_TEMPLATES = ["default"].freeze
 
+  POSSIBLE_TYPES = ["bulk", "automated"].freeze
+
   POSSIBLE_SIMPLE_RECIPIENTS = {
     "all"                              => "Everyone",
     "incomplete"                       => "Incomplete Applications",
@@ -34,6 +36,7 @@ class Message < ApplicationRecord
   serialize :recipients, Array
 
   validates_inclusion_of :template, in: POSSIBLE_TEMPLATES
+  validates_inclusion_of :type, in: POSSIBLE_TYPES
 
   def recipients=(values)
     values.present? ? super(values.reject(&:blank?)) : super(values)
@@ -52,6 +55,14 @@ class Message < ApplicationRecord
     labels
   end
 
+  def bulk?
+    type == "bulk"
+  end
+
+  def automated?
+    type == "automated"
+  end
+
   def delivered?
     delivered_at.present?
   end
@@ -65,6 +76,7 @@ class Message < ApplicationRecord
   end
 
   def status
+    return "automated" if automated?
     return "delivered" if delivered?
     return "started" if started?
     return "queued" if queued?
@@ -72,7 +84,7 @@ class Message < ApplicationRecord
   end
 
   def can_edit?
-    status == "drafted" || trigger.present?
+    automated? || status == "drafted"
   end
 
   def can_queue?
@@ -127,4 +139,16 @@ class Message < ApplicationRecord
     messages_to_queue = Message.where(trigger: trigger)
     messages_to_queue.map { |message| Mailer.delay.bulk_message_email(message.id, user_id) }
   end
+
+  def self.bulk
+    where(type: 'bulk')
+  end
+
+  def self.automated
+    where(type: 'automated')
+  end
+
+  def self.inheritance_column
+    "class_type"
+  end
 end