hackathon_manager 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b2b4e0940990bd9d79779dc11df2261481e953a
-  data.tar.gz: 231e89a71e42dd25ed692d41c2bf285dbee54962
+  metadata.gz: 4cc3f7d2686f6f8c6ef43edde9822405515135d4
+  data.tar.gz: d56facacbfd9b47a5982219314d21ea0df5911ae
 SHA512:
-  metadata.gz: eeb9342f9cd545f46932c0330154888d8cc549f26199b19d5c96f31a47d4503ba801aadf4913d6e2908ff947841ddb39158306aa0eda9b3dca2bdb572774542a
-  data.tar.gz: c17ae7672d988fe083cce647d3c1e4e0edb4005961a433ab803d0d7f9af8f6adfdca2a260a7390a2b432e19a9f6b7d8d6243cc81666180c35425acd999f40bea
+  metadata.gz: b5279168bef47676d692e045c9e3ff9ea17cf343efc3cb6bf264dd87816ee60b149f81447be866399b5f63f3179a50e0c60c5493c553b5e2ea817509b8b7f843
+  data.tar.gz: 94b98a0f6d13a0100ab5eb53064646091792230626b00bd8d6dcbfce5dc2e868473f343efeef69df129b2ac43e10978260483475b85e45164f969d6f9f905975

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

@@ -38,11 +38,12 @@ var setupDataTables = function() {
   };
 
   window.questionnairesDataTable = setupDataTable($('.datatable.questionnaires'), {
-    order      : [2, 'desc'],
+    order      : [3, 'desc'],
     scrollX    : false,
     columns    : [
       { orderable : false, data: 'bulk' },
       { orderable : false, data: 'link' },
+      { orderable : false, data: 'note' },
       { orderable: true, data: 'id' },
       { orderable: true, data: 'first_name' },
       { orderable: true, data: 'last_name' },

data/app/datatables/questionnaire_datatable.rb

@@ -21,6 +21,7 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
       {
         bulk: current_user.admin_limited_access ? '' : "<input type=\"checkbox\" data-bulk-row-edit=\"#{record.id}\">".html_safe,
         link: link_to('<i class="fa fa-search"></i>'.html_safe, manage_questionnaire_path(record)),
+        note: record.minor? ? '<div class="center"><i class="fa fa-exclamation-triangle icon-space-r"></i> Minor</div>'.html_safe : '',
         id: record.id,
         first_name: record.first_name,
         last_name: record.last_name,

data/app/helpers/questionnaire_helper.rb

@@ -0,0 +1,7 @@
+module QuestionnaireHelper
+  def format_age(age)
+    parts = ActiveSupport::Duration.build(age).parts
+
+    "#{pluralize(parts[:years], 'year')}, #{pluralize(parts[:months], 'month')}, and #{pluralize(parts[:days], 'day')}"
+  end
+end

data/app/models/message.rb

@@ -75,11 +75,15 @@ class Message < ApplicationRecord
     status == "drafted" || trigger.present?
   end
 
+  def can_queue?
+    status == "drafted" && recipients_list.present?
+  end
+
   def using_default_template?
     template == "default"
   end
 
-  def self.possible_recipients
+  def possible_recipients
     # Produce an array like:
     # ["School: My University", "school::123"]
     option = ->(query, model) { [MessageRecipientQuery.friendly_name(query, model), query] }
@@ -102,6 +106,14 @@ class Message < ApplicationRecord
     recipients = POSSIBLE_SIMPLE_RECIPIENTS.invert.to_a
     recipients.push(*bus_list_recipients)
     recipients.push(*school_recipients)
+
+    # Add current recipients if not included
+    self.recipients.each do |recipient|
+      if recipients.none? { |recipient_pair| recipient_pair[1] == recipient }
+        recipients.push([recipient, recipient])
+      end
+    end
+
     recipients
   end
 

data/app/models/message_recipient_query.rb

@@ -1,4 +1,7 @@
 class MessageRecipientQuery
+  class ModelIdNotFound < StandardError
+  end
+
   attr_accessor :query
   attr_accessor :type
   attr_accessor :id
@@ -31,7 +34,7 @@ class MessageRecipientQuery
     else
       raise "Unknown recipient query type: #{type.inspect} (in message recipient query: #{query.inspect}"
     end
-    raise "Could not find #{model_name} with ID #{id.inspect} (in message recipient query: #{query.inspect}" if model.blank?
+    raise MessageRecipientQuery::ModelIdNotFound, "Could not find #{model_name} with ID #{id.inspect} (in message recipient query: #{query.inspect})" if model.blank?
 
     MessageRecipientQuery.new(
       query,
@@ -42,8 +45,12 @@ class MessageRecipientQuery
   end
 
   def self.friendly_name(query, model = nil)
-    recipient_query = parse(query, model)
-    model = recipient_query.model
+    begin
+      recipient_query = parse(query, model)
+      model = recipient_query.model
+    rescue MessageRecipientQuery::ModelIdNotFound
+      return "[invalid recipient]"
+    end
 
     case recipient_query.type
     when "bus-list"

data/app/models/questionnaire.rb

@@ -123,6 +123,14 @@ class Questionnaire < ApplicationRecord
     Fips.where(city: school.city, state: school.state).first
   end
 
+  def age_at_time_of_event
+    (Rails.configuration.hackathon['event_start_date'] - date_of_birth).to_i * 1.day
+  end
+
+  def minor?
+    age_at_time_of_event < 18.years
+  end
+
   def can_rsvp?
     ["accepted", "rsvp_confirmed", "rsvp_denied"].include? acc_status
   end

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

@@ -7,9 +7,9 @@
       = f.input :subject, hint: "All emails are from <pre>#{html_escape(Rails.configuration.hackathon['email_from'])}</pre>".html_safe
       = f.input :template, as: :select, collection: Message::POSSIBLE_TEMPLATES.map { |x| [x.titleize, x] }, include_blank: false
       - if @message.status == "drafted"
-        = f.input :recipients, as: :select, collection: Message.possible_recipients, input_html: { class: "selectize", multiple: true,  }, hint: "Sent manually, in bulk", placeholder: "Type to search by school or type..."
+        = f.input :recipients, as: :select, collection: @message.possible_recipients, input_html: { class: "selectize", multiple: true,  }, hint: "Sent manually, in bulk", placeholder: "Type to search by school or type..."
       - else
-        = f.input :recipients, as: :select, collection: Message.possible_recipients, input_html: { class: "selectize", multiple: true }, hint: "Cannot be edited once a message has been delivered", disabled: true
+        = f.input :recipients, as: :select, collection: @message.possible_recipients, input_html: { class: "selectize", multiple: true }, hint: "Cannot be edited once a message has been delivered", disabled: true
       = f.input :trigger, as: :select, collection: Message::POSSIBLE_TRIGGERS.invert, include_blank: "(no automatic trigger)", hint: "Sent automatically, to an individual applicant"
       = f.input :body, input_html: { rows: 10 }, hint: "Supports markdown and HTML"
 

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

@@ -1,7 +1,11 @@
 %section.section.manage
   %h1.section-title= title "Message"
 
-  - recipient_count = pluralize(BulkMessageWorker.build_recipients(@message.recipients).count, "recipient")
+  :ruby
+    begin
+      recipient_count = pluralize(BulkMessageWorker.build_recipients(@message.recipients).count, "recipient")
+    rescue => recipient_error
+    end
 
   %p
     %b Name:
@@ -21,7 +25,12 @@
     - if @message.recipients.present?
       %br
       %small
-        %em #{recipient_count} currently match this query
+        - if recipient_error.present?
+          %strong{style: 'color: red;'} Error parsing recipients:
+          = recipient_error
+          %br To resolve this, edit & remove the offending recipient.
+        - else
+          %em #{recipient_count} currently match this query
   %p
     %b Trigger:
     = Message::POSSIBLE_TRIGGERS[@message.trigger] || "(no automatic trigger)"
@@ -54,9 +63,15 @@
   %hr
 
   - unless current_user.admin_limited_access
-    - if @message.status == "drafted" && @message.recipients_list.present?
-      = 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_queue?
+      - if recipient_error.present?
+        %button.button{disabled: 'disabled'} Deliver
+        %small Cannot deliver when there is a recipient error; see error above.
+        %br
+        %br
+      - else
+        = 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

@@ -14,6 +14,7 @@
           - unless current_user.admin_limited_access?
             %input{ type: "checkbox", name: "select_allc", value: "1", data: { bulk_row_select: "" } }
         %th
+        %th
         %th ID
         %th First name
         %th Last name

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

@@ -1,5 +1,16 @@
 %section.section.manage
   .container.container-half
+    - if @questionnaire.minor?
+      #disclaimer
+        %p
+          %strong
+            %span.fa.fa-exclamation-triangle.icon-space-r
+            Applicant is a minor
+        %p
+          Will be
+          = format_age(@questionnaire.age_at_time_of_event)
+          old.
+
     = render partial: 'questionnaire_summary'
 
     %p

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

@@ -13,7 +13,7 @@
         = f.input :first_name, input_html: { "data-validate" => "presence" }, autofocus: true, wrapper_html: { class: 'input--half' }
         = f.input :last_name, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :phone, label: "Phone number", input_html: { "data-validate" => "presence" }
-        = f.input :date_of_birth, start_year: Date.today.year - 18, end_year: Date.today.year - 90, order: [:month, :day, :year], input_html: { "data-validate" => "presence" }
+        = f.input :date_of_birth, start_year: Date.today.year - 5, end_year: Date.today.year - 90, order: [:month, :day, :year], input_html: { "data-validate" => "presence" }
 
         = f.input :school_id, as: :school_selection, input_html: { "data-validate" => "presence" }
         = f.input :level_of_study, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -507,6 +507,7 @@ files:
 - app/datatables/school_datatable.rb
 - app/helpers/hackathon_manager_helper.rb
 - app/helpers/manage/dashboard_helper.rb
+- app/helpers/questionnaire_helper.rb
 - app/inputs/deletable_attachment_input.rb
 - app/inputs/formatted_boolean_input.rb
 - app/inputs/school_selection_input.rb