hackathon_manager 0.8.2 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5775620daf8c377219c92030597cc0a434171196d7a870f6cc02dfac917300ba
-  data.tar.gz: a547d9b36e8f2f162d7e74d2a580e267638df51e160e5c89aac4dccf28d3bbbc
+  metadata.gz: 1f89949d65a0c100dfd2b6d0d31156b77ccabfefdea2432d6e22bec6bcc50ee8
+  data.tar.gz: 5b827226987d2e296b3775c0b2c102332e6e9c6b8351cd77945c5254fad348b5
 SHA512:
-  metadata.gz: 1b4a9207773c048fc5b5bcd5e7fe3676845013701a338d65d8e9a4fd7a9c602ac0d45fa95d002d7e3f0a5e5a0912075f50ce57cabb0b6200ac80547a7ce1be2f
-  data.tar.gz: 2ea117e9b78d5e447025eb07cd94e333bb3d83c725e682b16255e48a7d0f560bd752540643fe652fdf2e3733734a271913246b36b4072b21e271d62fd8042ed7
+  metadata.gz: ddffa76edd2a4eae2136629598070ae83319b618cf63035844545c58931bb9dfdcb0b10317a86ff8d5403977a167dc00ef2670085f00bdbf094096e3ff777ca1
+  data.tar.gz: c9881ea59a09602e0a01a0a108423b9f013a1fda0a0fcdff9b5a202354626e2d05419552026e0e10606f2aa92b3707115855b7faf40be0309b084f3afda11357

data/app/assets/stylesheets/hackathon_manager/manage.sass

@@ -130,4 +130,4 @@ $grey-med: #999
 .email-preview
   width: 100%
   border: 2px solid $grey-med
-  min-height: 500px
+  min-height: 800px

data/app/controllers/manage/questionnaires_controller.rb

@@ -156,7 +156,8 @@ class Manage::QuestionnairesController < Manage::ApplicationController
       :portfolio_url, :vcs_url, :agreement_accepted, :bus_captain_interest,
       :riding_bus, :phone, :can_share_info, :code_of_conduct_accepted,
       :travel_not_from_school, :travel_location, :data_sharing_accepted,
-      :resume, :delete_resume, :is_bus_captain, :why_attend
+      :graduation_year, :race_ethnicity, :resume, :delete_resume, :why_attend,
+      :is_bus_captain
     )
   end
 

data/app/controllers/questionnaires_controller.rb

@@ -127,7 +127,7 @@ class QuestionnairesController < ApplicationController
       :portfolio_url, :vcs_url, :agreement_accepted, :bus_captain_interest,
       :riding_bus, :phone, :can_share_info, :code_of_conduct_accepted,
       :travel_not_from_school, :travel_location, :data_sharing_accepted,
-      :resume, :delete_resume, :why_attend
+      :graduation_year, :race_ethnicity, :resume, :delete_resume, :why_attend
     )
   end
 

data/app/datatables/admin_datatable.rb

@@ -1,5 +1,5 @@
 class AdminDatatable < AjaxDatatablesRails::Base
-  def_delegators :@view, :link_to, :manage_admin_path
+  def_delegators :@view, :link_to, :manage_admin_path, :bold
 
   def view_columns
     @view_columns ||= {
@@ -15,7 +15,7 @@ class AdminDatatable < AjaxDatatablesRails::Base
     records.map do |record|
       {
         id: record.id,
-        email: link_to(record.email, manage_admin_path(record)),
+        email: link_to(bold(record.email), manage_admin_path(record)),
         admin_limited_access: record.admin_limited_access ? 'Limited Access' : 'Full Access'
       }
     end

data/app/datatables/bulk_message_datatable.rb

@@ -1,5 +1,5 @@
 class BulkMessageDatatable < AjaxDatatablesRails::Base
-  def_delegators :@view, :link_to, :manage_message_path, :display_datetime
+  def_delegators :@view, :link_to, :manage_message_path, :display_datetime, :bold
 
   def view_columns
     @view_columns ||= {
@@ -18,7 +18,7 @@ class BulkMessageDatatable < AjaxDatatablesRails::Base
     records.map do |record|
       {
         id: record.id,
-        name: link_to(record.name, manage_message_path(record)),
+        name: link_to(bold(record.name), manage_message_path(record)),
         subject: record.subject,
         status: record.status.titleize,
         created_at: display_datetime(record.created_at),

data/app/datatables/questionnaire_datatable.rb

@@ -1,5 +1,5 @@
 class QuestionnaireDatatable < AjaxDatatablesRails::Base
-  def_delegators :@view, :link_to, :manage_questionnaire_path, :manage_school_path, :current_user, :acc_status_class, :display_datetime
+  def_delegators :@view, :link_to, :manage_questionnaire_path, :manage_school_path, :current_user, :acc_status_class, :display_datetime, :bold
 
   def view_columns
     @view_columns ||= {
@@ -29,8 +29,8 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
         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,
+        first_name: bold(record.first_name),
+        last_name: bold(record.last_name),
         email: record.email,
         phone: record.phone,
         gender: record.gender,

data/app/datatables/school_datatable.rb

@@ -1,5 +1,5 @@
 class SchoolDatatable < AjaxDatatablesRails::Base
-  def_delegators :@view, :link_to, :manage_school_path, :manage_bus_list_path
+  def_delegators :@view, :link_to, :manage_school_path, :manage_bus_list_path, :bold
 
   def view_columns
     @view_columns ||= {
@@ -17,7 +17,7 @@ class SchoolDatatable < AjaxDatatablesRails::Base
     records.map do |record|
       {
         id: record.id,
-        name: link_to(record.name, manage_school_path(record)),
+        name: link_to(bold(record.name), manage_school_path(record)),
         city: record.city,
         state: record.state,
         questionnaire_count: record.questionnaire_count,

data/app/helpers/hackathon_manager_helper.rb

@@ -26,6 +26,10 @@ module HackathonManagerHelper
     markdown.render(text).html_safe
   end
 
+  def bold(value)
+    "<strong>#{h(value)}</strong>".html_safe
+  end
+
   # Same as link_to, but adds a special active class whenever the link matches
   # the current page.
   # Only  https://github.com/rails/rails/blob/master/actionview/lib/action_view/helpers/url_helper.rb

data/app/models/message.rb

@@ -1,4 +1,6 @@
 class Message < ApplicationRecord
+  self.inheritance_column = nil # To enable using "type" field
+
   validates_presence_of :name, :subject, :template
   validates_presence_of :body, if: :using_default_template?
 

data/app/models/questionnaire.rb

@@ -8,7 +8,7 @@ class Questionnaire < ApplicationRecord
   after_destroy :update_school_questionnaire_count
 
   validates_presence_of :first_name, :last_name, :phone, :date_of_birth, :school_id, :experience, :shirt_size, :interest
-  validates_presence_of :gender, :major, :level_of_study
+  validates_presence_of :gender, :major, :level_of_study, :graduation_year, :race_ethnicity
   validates_presence_of :agreement_accepted, message: "Please read & accept"
   validates_presence_of :code_of_conduct_accepted, message: "Please read & accept"
   validates_presence_of :data_sharing_accepted, message: "Please read & accept"
@@ -67,6 +67,18 @@ class Questionnaire < ApplicationRecord
     "rsvp_denied"    => "RSVP Denied"
   }.freeze
 
+  POSSIBLE_GRAD_YEARS = (Date.today.year - 3...Date.today.year + 7).to_a.freeze
+
+  POSSIBLE_RACE_ETHNICITIES = [
+    "American Indian or Alaskan Native",
+    "Asian / Pacific Islander",
+    "Black or African American",
+    "Hispanic",
+    "White / Caucasian",
+    "Multiple ethnicities / Other",
+    "Prefer not to answer"
+  ].freeze
+
   # From My MLH's dropdown list.
   # Should *not* validate against this list in case My MLH changes their options,
   # as this would cause errors until a manual gem update

data/app/views/application/_triggered_email_summary.html.haml

@@ -21,7 +21,8 @@
           - if messages.present?
             %ul.list-unstyled.mb-0
               - messages.each do |message|
-                %li= link_to(message.name, manage_message_path(message))
+                %li
+                  %strong= link_to(message.name, manage_message_path(message))
           - else
             None
     %tr
@@ -31,6 +32,7 @@
         - if messages.present?
           %ul.list-unstyled.mb-0
             - messages.each do |message|
-              %li= link_to(message.name, manage_message_path(message))
+              %li
+                %strong= link_to(message.name, manage_message_path(message))
         - else
           None

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

@@ -13,7 +13,8 @@
     %tbody
       - @bus_lists.each do |bus_list|
         %tr
-          %td= link_to(bus_list.name, manage_bus_list_path(bus_list))
+          %td
+            %strong= link_to(bus_list.name, manage_bus_list_path(bus_list))
           %td #{bus_list.passengers.count} / #{bus_list.capacity}
           %td= bus_list.needs_bus_captain ? "<strong class=\"text-danger\">Needs bus captain</strong>".html_safe : "No"
           %td= bus_list.schools.count

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

@@ -17,7 +17,7 @@
     .row
       .col-lg-6.mb-3
         %h5.mb-3 Body
-        = f.input :body, input_html: { rows: 23, 'data-message-live-preview' => 'textarea', class: 'text-monospace', style: 'font-size: 14px' }, hint: "Supports markdown and HTML", label: false, wrapper: :bootstrap_inline_form
+        = f.input :body, input_html: { rows: 36, 'data-message-live-preview' => 'textarea', class: 'text-monospace', style: 'font-size: 14px' }, hint: "Supports markdown and HTML", label: false, wrapper: :bootstrap_inline_form
       .col-lg-6.mb-3
         %h5.mb-3 Preview
         %iframe.email-preview{src: live_preview_manage_messages_path(body: @message.body), 'data-message-live-preview' => 'iframe', 'data-message-live-preview-base-src' => live_preview_manage_messages_path}

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

@@ -32,6 +32,9 @@
       = f.input :experience, as: :select, collection: Questionnaire::POSSIBLE_EXPERIENCES.invert, include_blank: "(select one...)", label: "Experience", input_html: { "data-validate" => "presence" }
       = f.input :interest, as: :select, collection: Questionnaire::POSSIBLE_INTERESTS.invert, include_blank: "(select one...)", label: "Interest", input_html: { "data-validate" => "presence" }
 
+      = f.input :graduation_year, as: :select, collection: Questionnaire::POSSIBLE_GRAD_YEARS, include_blank: "(select one...)", label: "Graduation year", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+      = f.input :race_ethnicity, as: :select, collection: Questionnaire::POSSIBLE_RACE_ETHNICITIES, include_blank: "(select one...)", label: "Race/Ethnicity", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+
       = f.input :resume, as: :deletable_attachment, hint: "Must be under 2MB", input_html: { "data-validate" => "file-max-size file-content-type", "data-validate-file-max-size" => "2097152", "data-validate-file-content-type" => "application/pdf" }, label: "Resume (PDF)"
 
       = f.input :portfolio_url, label: "Portfolio Link"

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

@@ -34,6 +34,9 @@
         = f.input :experience, as: :select, collection: Questionnaire::POSSIBLE_EXPERIENCES.invert, include_blank: "(select one...)", label: "Experience", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :interest, as: :select, collection: Questionnaire::POSSIBLE_INTERESTS.invert, include_blank: "(select one...)", label: "Interest", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
 
+        = f.input :graduation_year, as: :select, collection: Questionnaire::POSSIBLE_GRAD_YEARS, include_blank: "(select one...)", label: "Graduation year", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+        = f.input :race_ethnicity, as: :select, collection: Questionnaire::POSSIBLE_RACE_ETHNICITIES, include_blank: "(select one...)", label: "Race/Ethnicity", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
+
         = f.input :portfolio_url, label: "Portfolio link", placeholder: "http://mywebsite.com"
         = f.input :vcs_url, label: "GitHub/Bitbucket link", placeholder: "https://github.com/coderit"
         = f.input :resume, as: :deletable_attachment, hint: "Must be a PDF, under 2MB", input_html: { "data-validate" => "file-max-size file-content-type", "data-validate-file-max-size" => "2097152", "data-validate-file-content-type" => "application/pdf" }, label: "Resume"

data/db/migrate/20181125213158_add_grad_year_and_race_ethnicity_to_questionnaires.rb

@@ -0,0 +1,6 @@
+class AddGradYearAndRaceEthnicityToQuestionnaires < ActiveRecord::Migration[5.2]
+  def change
+    add_column :questionnaires, :graduation_year, :integer, limit: 4
+    add_column :questionnaires, :race_ethnicity, :string
+  end
+end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.8.2'.freeze
+  VERSION = '0.9.0'.freeze
 end

data/test/factories/questionnaire.rb

@@ -18,6 +18,8 @@ FactoryBot.define do
     gender                { "Male" }
     major                 { "Computer Science" }
     level_of_study        { "University (Undergraduate)" }
+    graduation_year       { Date.today.year }
+    race_ethnicity        { "Other" }
     why_attend            { "This sounds cool" }
 
     association :user

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.9.0
 platform: ruby
 authors:
 - Stuart Olivera
@@ -655,6 +655,7 @@ files:
 - db/migrate/20180126174252_add_boarded_bus_to_questionnaires.rb
 - db/migrate/20180701160855_remove_email_from_questionnaires.rb
 - db/migrate/20180801144544_add_type_to_messages.rb
+- db/migrate/20181125213158_add_grad_year_and_race_ethnicity_to_questionnaires.rb
 - db/schools.csv
 - db/seed_messages/questionnaire--accepted.md
 - db/seed_messages/questionnaire--denied.md