hackathon_manager 0.13.1 → 0.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edbee88bd48b0012031f81d0c2a0c919a5947c4a5939edd1bb0afc4e873bac82
-  data.tar.gz: f1076092210ee338b5a6bdc764b7af0b917c41a0a4389cfd5a5912b8b3ad9317
+  metadata.gz: 7496dfde19a105b82b8ad9ed044127c612d9edeffe215d8aaca871cb9542fa65
+  data.tar.gz: 2beec10c47c9e6e2bf5df5f8310414c100a784bb11195c5bea90f8b1fcebfc4c
 SHA512:
-  metadata.gz: 591427e0bc9e78d9188c852cb9e7861e99cbd50e2172bb3617410762f9b4a504fc6efe07ae909591a90a740d1ba91841d557df40d521f5fae6a422f7bd5e7981
-  data.tar.gz: 30e6bc7c85b75ab71fe60ed1265492368c09d2535d3c3ecb3d5797013ebd7f34c18527791a0d24fb39cd08d4baedd2821b690104cf2830af632d33faeb49b3d9
+  metadata.gz: 3f28ad43a041257be5a9fd335ca7855d89b4a66bddacd732459587c8c13e49d4f00800eaee3b724942e70100bafc6019ece1f014fedca4a972a0548c00703dcb
+  data.tar.gz: '09e7f61155f287b0432fde7255d3065c60efa8565ffecb653bf1a507b5e56f8c7125e36c70773d4812f95a7c7cd6de822405a2d7dc3280596c58c2a07605f8d7'

data/app/assets/javascripts/hackathon_manager/manage/lib/jquery.bulkRowedit.js

@@ -16,6 +16,16 @@ $.fn.bulkRowEdit = function() {
       return false;
     }
 
+    var number = ids.length;
+    var questionnaires = number === 1 ? 'questionnaire' : 'questionnaires';
+    var status = $('select[data-bulk-row-edit] option[value=' + action + ']').text();
+    var message = 'Are you sure? This will set ' + number + ' ' + questionnaires + ' to "' + status + '".\n\nThis may trigger an automatic email to each applicant depending on your automated messages.';
+
+    if (!confirm(message)) {
+      $('[type=submit][data-bulk-row-edit]').prop('disabled', false);
+      return false;
+    }
+
     $.ajax({
       url: $('form[data-bulk-row-edit]').attr('action'),
       type: 'PATCH',

data/app/controllers/manage/questionnaires_controller.rb

@@ -31,7 +31,8 @@ class Manage::QuestionnairesController < Manage::ApplicationController
     create_params = convert_school_name_to_id(create_params)
     @questionnaire = ::Questionnaire.new(create_params)
     if @questionnaire.valid?
-      user = User.new(email: email, password: Devise.friendly_token.first(10))
+      users = User.where(email: email)
+      user = users.count == 1 ? users.first : User.new(email: email, password: Devise.friendly_token.first(10))
       if user.save
         @questionnaire.user = user
         @questionnaire.save

data/app/models/questionnaire.rb

@@ -7,12 +7,22 @@ class Questionnaire < ApplicationRecord
   after_save :update_school_questionnaire_count
   after_destroy :update_school_questionnaire_count
 
+  belongs_to :user
+  belongs_to :school
+  belongs_to :bus_list, optional: true
+
+  validates_uniqueness_of :user_id
+
   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, :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"
 
+  DIETARY_SPECIAL_NEEDS_MAX_LENGTH = 500
+  validates_length_of :dietary_restrictions, maximum: DIETARY_SPECIAL_NEEDS_MAX_LENGTH
+  validates_length_of :special_needs, maximum: DIETARY_SPECIAL_NEEDS_MAX_LENGTH
+
   # if HackathonManager.field_enabled?(:why_attend)
   #   validates_presence_of :why_attend
   # end
@@ -27,9 +37,6 @@ class Questionnaire < ApplicationRecord
   validates :vcs_url, url: { allow_blank: true }
   validates_format_of :vcs_url, with: %r{((github.com\/\w+\/?)|(bitbucket.org\/\w+\/?))}, allow_blank: true, message: "Must be a GitHub or BitBucket url"
 
-  belongs_to :school
-  belongs_to :bus_list, optional: true
-
   strip_attributes
 
   POSSIBLE_EXPERIENCES = {
@@ -110,8 +117,6 @@ class Questionnaire < ApplicationRecord
   validates_inclusion_of :shirt_size, in: POSSIBLE_SHIRT_SIZES
   validates_inclusion_of :acc_status, in: POSSIBLE_ACC_STATUS
 
-  belongs_to :user
-
   def email
     user&.email
   end

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

@@ -10,7 +10,7 @@
       %br
       = f.input :first_name, input_html: { "data-validate" => "presence" }, label: "First Name", autofocus: true
       = f.input :last_name, input_html: { "data-validate" => "presence" }, label: "Last Name"
-      = f.input :email, input_html: { "data-validate" => "presence email", value: @questionnaire.user.try(:email) }, required: true
+      = f.input :email, input_html: { "data-validate" => "presence email", value: @questionnaire.user.try(:email) }, required: true, hint: 'Can be an existing user (without a questionnaire) or a new user. If this is a new user, they will receive a randomly-generated password that they must request a password reset for.'
       = f.input :phone, 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" }
 

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

@@ -20,8 +20,8 @@
         = f.input :major, input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :gender, collection: collection_or_text(@questionnaire.gender, Questionnaire::POSSIBLE_GENDERS), include_blank: "(select one...)", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
         = f.input :shirt_size, as: :select, collection: Questionnaire::POSSIBLE_SHIRT_SIZES, include_blank: "(select one...)", input_html: { "data-validate" => "presence" }, wrapper_html: { class: 'input--half' }
-        = f.input :dietary_restrictions, as: :text, label: "Health restrictions", wrapper_html: { class: 'input--half' }
-        = f.input :special_needs, as: :text, label: "Special needs", wrapper_html: { class: 'input--half' }
+        = f.input :dietary_restrictions, as: :text, label: "Health restrictions", wrapper_html: { class: 'input--half' }, maxlength: Questionnaire::DIETARY_SPECIAL_NEEDS_MAX_LENGTH
+        = f.input :special_needs, as: :text, label: "Special needs", wrapper_html: { class: 'input--half' }, maxlength: Questionnaire::DIETARY_SPECIAL_NEEDS_MAX_LENGTH
 
       .right
         %button.button{ type: "button", "data-wizard" => "next" } Next

data/db/migrate/20190125021648_change_questionnaire_dietary_special_needs_string_to_text.rb

@@ -0,0 +1,6 @@
+class ChangeQuestionnaireDietarySpecialNeedsStringToText < ActiveRecord::Migration[5.2]
+  def change
+    change_column :questionnaires, :dietary_restrictions, :text
+    change_column :questionnaires, :special_needs, :text
+  end
+end

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.13.1'.freeze
+  VERSION = '0.13.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -708,6 +708,7 @@ files:
 - db/migrate/20190107233210_create_trackable_events.rb
 - db/migrate/20190113231044_refactor_bus_lists.rb
 - db/migrate/20190118204143_add_role_to_users.rb
+- db/migrate/20190125021648_change_questionnaire_dietary_special_needs_string_to_text.rb
 - db/schools.csv
 - db/seed_messages/questionnaire--accepted.md
 - db/seed_messages/questionnaire--denied.md