hackathon_manager 0.6.2 → 0.6.3

data/app/datatables/questionnaire_datatable.rb

@@ -7,10 +7,14 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
       first_name: { source: 'Questionnaire.first_name' },
       last_name: { source: 'Questionnaire.last_name' },
       email: { source: 'User.email' },
+      phone: { source: 'Questionnaire.phone' },
+      gender: { source: 'Questionnaire.gender' },
+      date_of_birth: { source: 'Questionnaire.date_of_birth', searchable: false },
       admin: { source: 'User.admin', cond: :eq, searchable: false },
       acc_status: { source: 'Questionnaire.acc_status', searchable: true },
       checked_in: { source: 'Questionnaire.checked_in_at', searchable: false },
-      school: { source: 'School.name' }
+      school: { source: 'School.name' },
+      created_at: { source: 'Questionnaire.created_at', searchable: false }
     }
   end
 
@@ -26,9 +30,13 @@ class QuestionnaireDatatable < AjaxDatatablesRails::Base
         first_name: record.first_name,
         last_name: record.last_name,
         email: record.email,
+        phone: record.phone,
+        gender: record.gender,
+        date_of_birth: record.date_of_birth_formatted,
         acc_status: "<span class=\"acc-status-#{record.acc_status}\">#{record.acc_status.titleize}</span>".html_safe,
         checked_in: record.checked_in? ? '<span class="acc-status-accepted">Yes</span>'.html_safe : 'No',
-        school: link_to(record.school.name, manage_school_path(record.school))
+        school: link_to(record.school.name, manage_school_path(record.school)),
+        created_at: record.created_at.present? ? record.created_at.strftime("%B %d, %Y at %I:%M %p") : ''
       }
     end
   end

data/app/models/questionnaire.rb

@@ -118,6 +118,10 @@ class Questionnaire < ApplicationRecord
     checked_in_at.present?
   end
 
+  def boarded_bus?
+    boarded_bus_at.present?
+  end
+
   def checked_in_by
     return unless checked_in_by_id.present?
     User.find(checked_in_by_id)

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

@@ -27,6 +27,7 @@
   %table.table
     %thead
       %tr
+        %th Boarded bus?
         %th First Name
         %th Last Name
         %th Email
@@ -36,6 +37,8 @@
     %tbody
       - @bus_list.passengers.each do |p|
         %tr
+          %td
+            %input{type: 'checkbox', checked: p.boarded_bus?, data: { "boarded-bus": true, action: boarded_bus_bus_list_path, id: p.id } }
           %td= p.first_name
           %td= p.last_name
           %td= p.email

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

@@ -30,6 +30,7 @@
         %th Email
         %th Phone Number
         %th School
+        %th Boarded bus?
         %th Checked in?
         - unless current_user.admin_limited_access
           %th Actions
@@ -42,6 +43,7 @@
           %td= p.email
           %td= phone_link_to p.phone
           %td= link_to p.school.name, manage_school_path(p.school)
+          %td= p.boarded_bus? ? '<span class="acc-status-accepted">Yes</span>'.html_safe : 'No'
           %td= p.checked_in? ? '<span class="acc-status-accepted">Yes</span>'.html_safe : 'No'
           - unless current_user.admin_limited_access
             %td

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

@@ -4,24 +4,25 @@
     - if f.error_notification.present?
       = f.error_notification
 
-    .form-inputs
-      %fieldset
-        - if @questionnaire&.user&.provider == 'mlh'
-          %legend Provided by My MLH
-        %br
-        = f.input :first_name, placeholder: "Joe", input_html: { "data-validate" => "presence" }, label: "First Name", autofocus: true
-        = f.input :last_name, placeholder: "Smith", input_html: { "data-validate" => "presence" }, label: "Last Name"
-        = f.input :email, placeholder: "joe@example.com", input_html: { "data-validate" => "presence email", value: @questionnaire.user.try(:email) }, required: true
-        = f.input :phone, placeholder: "(123) 456-7890", 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 :school_id, as: :school_selection, placeholder: "My University", input_html: { "data-validate" => "presence" }
-        = f.input :level_of_study, placeholder: "University (Undergraduate)", input_html: { "data-validate" => "presence" }
-        = f.input :major, placeholder: "Major", input_html: { "data-validate" => "presence" }
-        = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" }
-        = f.input :gender, placeholder: "Female, Male, Non-Binary, Prefer not to say, other", input_html: { "data-validate" => "presence" }
-        = f.input :dietary_restrictions, placeholder: "Allergies, medical assistance, etc. (optional)", label: "Health Restrictions"
-        = f.input :special_needs, placeholder: "Any special needs or requests (optional)", label: "Special needs"
+    %fieldset
+      - if @questionnaire&.user&.provider == 'mlh'
+        %legend Provided by My MLH
+      %br
+      = f.input :first_name, placeholder: "Joe", input_html: { "data-validate" => "presence" }, label: "First Name", autofocus: true
+      = f.input :last_name, placeholder: "Smith", input_html: { "data-validate" => "presence" }, label: "Last Name"
+      = f.input :email, placeholder: "joe@example.com", input_html: { "data-validate" => "presence email", value: @questionnaire.user.try(:email) }, required: true
+      = f.input :phone, placeholder: "(123) 456-7890", 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 :school_id, as: :school_selection, placeholder: "My University", input_html: { "data-validate" => "presence" }
+      = f.input :level_of_study, placeholder: "University (Undergraduate)", input_html: { "data-validate" => "presence" }
+      = f.input :major, placeholder: "Major", input_html: { "data-validate" => "presence" }
+      = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" }
+      = f.input :gender, placeholder: "Female, Male, Non-Binary, Prefer not to say, other", input_html: { "data-validate" => "presence" }
+      = f.input :dietary_restrictions, placeholder: "Allergies, medical assistance, etc. (optional)", label: "Health Restrictions"
+      = f.input :special_needs, placeholder: "Any special needs or requests (optional)", label: "Special needs"
+
+    %br
 
     .form-inputs
       %br
@@ -36,24 +37,41 @@
       = f.input :portfolio_url, label: "Portfolio Link", placeholder:"http://mywebsite.com"
       = f.input :vcs_url, label: "GitHub/BitBucket", placeholder:"https://github.com/coderit"
 
+      = f.input :can_share_info, as: :formatted_boolean, label: "Share resume with employers?"
+
+      %hr
+
       - travel_state = !@questionnaire.new_record? && @questionnaire.travel_not_from_school
       = f.input :travel_not_from_school, as: :formatted_boolean, label: "I will not be traveling from my school"
       = f.input :travel_location, input_html: { "data-validate" => "presence", disabled: !travel_state }, wrapper_html: { style: travel_state ? "" : "display: none" }, label: "Travel Location"
 
-      = f.input :can_share_info, as: :formatted_boolean, label: "Share resume with employers?"
-
       = f.input :riding_bus, as: :formatted_boolean, label: "Riding Bus", disabled: !@questionnaire.eligible_for_a_bus?
       = f.input :is_bus_captain, as: :formatted_boolean, label: "Is Bus Captain", disabled: !@questionnaire.eligible_for_a_bus?
       - if !@questionnaire.eligible_for_a_bus?
         %p (school not eligible for bus)
 
-      %p
-        %small
-          Please read the
-          = link_to asset_url(Rails.configuration.hackathon['agreement_pdf_asset']), target: '_blank' do
-            #{Rails.configuration.hackathon['name']} Agreement
-            %span.fa.fa-external-link.icon-space-l-half
-      = f.input :agreement_accepted, as: :formatted_boolean, label: "I accept the #{Rails.configuration.hackathon['name']} Agreement", input_html: { "data-validate" => "presence" }
+    %hr
+
+    .form-inputs
+      .supporting-text
+        Please read the
+        = link_to asset_url(Rails.configuration.hackathon['agreement_pdf_asset']), target: '_blank' do
+          #{Rails.configuration.hackathon['name']} Agreement
+          %span.fa.fa-external-link.icon-space-l-half
+      = f.input :agreement_accepted, as: :formatted_boolean, label: "I accept the #{Rails.configuration.hackathon['name']} agreement.", input_html: { "data-validate" => "presence" }
+
+      .supporting-text
+        Please read the
+        %a{ href:"http://static.mlh.io/docs/mlh-code-of-conduct.pdf", target: "_blank" }
+          MLH Code of Conduct
+          %span.fa.fa-external-link.icon-space-l-half
+      = f.input :code_of_conduct_accepted, as: :formatted_boolean, label: "I accept the MLH Code of Conduct.", input_html: { "data-validate" => "presence" }
+
+      .supporting-text
+        I agree to the terms of both the
+        <a href="https://github.com/MLH/mlh-policies/tree/master/prize-terms-and-conditions" target="_blank">MLH Contest Terms</a> and Conditions and the
+        <a href="https://mlh.io/privacy" target="_blank">MLH Privacy Policy</a>. Please note that you may receive pre and post-event informational e-mails and occasional messages about hackathons from MLH as per the MLH Privacy Policy.
+      = f.input :data_sharing_accepted, as: :formatted_boolean, label: "I accept the MLH policies.", input_html: { "data-validate" => "presence" }
 
     .center
       = f.button :submit, value: ( @questionnaire.new_record? ? 'Create' : 'Save' )

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

@@ -19,9 +19,13 @@
         %th First name
         %th Last name
         %th Email
+        %th Phone
+        %th Gender
+        %th Date of Birth
         %th Status
         %th Checked In
         %th School
+        %th Applied on
     %tbody
 
   - unless current_user.admin_limited_access?

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

@@ -1,21 +1,42 @@
-%section.section{ style: "padding-left: 20px; padding-right: 20px" }
-  %h1.section-title= title "School"
+%section.section.manage
+  %h1.section-title= title @school.name
 
-  %p
-    %b Name:
-    = @school.name
-  %p
-    %b Address:
-    = @school.address || "(not provided)"
-  %p
-    %b City:
-    = @school.city || "(not provided)"
-  %p
-    %b State:
-    = @school.state || "(not provided)"
-  %p
-    %b Bus List:
-    = @school.bus_list ? link_to(@school.bus_list.name, manage_bus_list_path(@school.bus_list)) : '(not assigned)'
+  .container.container-half
+    %p
+      %b Name:
+      = @school.name
+    %p
+      %b Address:
+      = @school.address || "(not provided)"
+    %p
+      %b City:
+      = @school.city || "(not provided)"
+    %p
+      %b State:
+      = @school.state || "(not provided)"
+    %p
+      %b Bus List:
+      = @school.bus_list ? link_to(@school.bus_list.name, manage_bus_list_path(@school.bus_list)) : '(not assigned)'
+
+  .container.container-half
+    %p
+      %strong Duplicate Names
+    %p If someone attempts to apply using a name below, they'll automatically be converted to this school.
+    %table.table
+      %thead
+        %tr
+          %th School Name
+          %th Date Created
+      %tbody
+        - dupes = SchoolNameDuplicate.where(school_id: @school.id)
+        - dupes.each do |dupe|
+          %tr
+            %td= dupe.name
+            %td= dupe.created_at
+        - if dupes.blank?
+          %tr
+            %td{colspan: 2}
+              %em No duplicate names exist for this school.
 
   %hr
 
@@ -30,7 +51,7 @@
   %hr
 
   %p
-    %strong Questionnaires:
+    %strong Questionnaires
   %table.table
     %thead
       %tr

data/config/routes.rb

@@ -21,6 +21,10 @@ Rails.application.routes.draw do
     get :deny, on: :collection
   end
 
+  resource :bus_list do
+    patch :boarded_bus, on: :collection
+  end
+
   namespace :manage do
     root to: "dashboard#index"
     resources :dashboard do
@@ -71,6 +75,4 @@ Rails.application.routes.draw do
     resource :config do
     end
   end
-
-  resource :bus_list
 end

data/db/migrate/20180126174252_add_boarded_bus_to_questionnaires.rb

@@ -0,0 +1,5 @@
+class AddBoardedBusToQuestionnaires < ActiveRecord::Migration[5.1]
+  def change
+    add_column :questionnaires, :boarded_bus_at, :datetime
+  end
+end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.3'.freeze
 end

data/test/factories/bus_list.rb

@@ -1,8 +1,9 @@
 # This will guess the User class
 FactoryBot.define do
   factory :bus_list do
-    id       1
-    name     "Cornell Bus"
+    sequence :name do |n|
+      "Bus List #{n}"
+    end
     capacity 50
     notes    "Notes!"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Stuart Olivera
@@ -444,6 +444,7 @@ files:
 - app/assets/images/hackathon_manager/arrow_down.svg
 - app/assets/images/hackathon_manager/arrow_down_hover.svg
 - app/assets/javascripts/hackathon_manager/application.js
+- app/assets/javascripts/hackathon_manager/bus_lists.js
 - app/assets/javascripts/hackathon_manager/forms.js
 - app/assets/javascripts/hackathon_manager/jquery.transit.min.js
 - app/assets/javascripts/hackathon_manager/manage/application.js
@@ -458,6 +459,7 @@ files:
 - app/assets/javascripts/hackathon_manager/sidebar.js
 - app/assets/javascripts/hackathon_manager/toggle.js
 - app/assets/javascripts/hackathon_manager/validate.js
+- app/assets/javascripts/hackathon_manager/vendor/buttons.colVis.min.js
 - app/assets/javascripts/hackathon_manager/vendor/buttons.html5.min.js
 - app/assets/javascripts/hackathon_manager/vendor/d3.v3.min.js
 - app/assets/javascripts/hackathon_manager/vendor/dataTables.buttons.min.js
@@ -644,6 +646,7 @@ files:
 - db/migrate/20180108231420_add_trigger_to_message.rb
 - db/migrate/20180116022530_set_default_count_on_schools.rb
 - db/migrate/20180118035548_convert_message_recipients_to_recipient_queries.rb
+- db/migrate/20180126174252_add_boarded_bus_to_questionnaires.rb
 - db/schools.csv
 - db/seeds.rb
 - lib/hackathon_manager.rb