hackathon_manager 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c58a704ae8b7dbe7c60e7d346291e843a41dccddcb599f14f45fe7ffa314b7f0
-  data.tar.gz: 724aa46d5d2daa6ede4cfca4418c52be743efa49d5104792887b0f8afe34ab20
+  metadata.gz: 206af0094a1b5b93d65868d634fcf363be9b1a04a47325db43fa116fcc0f1223
+  data.tar.gz: d64945622dbed549e05d0a6b46388c81dafd0033d41abd40e11202f5a47ce93d
 SHA512:
-  metadata.gz: 345caf9ec10d34970e60c16df519473d97f0c3150bb975fab263b7f729255e63337d625d24cc053d7631c093cb24ea2f7b9218e3d3263403f3b3088a5feabf10
-  data.tar.gz: 29ae8d5e018acc37da83ea02047d1d849b156cd5b98a865ab4c8cc89ad19dd10c0d92c196dff8fc53035be5e39f3cc9301c17808920407700af88baedff1069e
+  metadata.gz: 7562395536c84986c8173db5b09d8246beefa644a36a6385cc6c97aada6c285a04f0590d054e1d373e775e0202184bf74011c93a58789ce3a78ab426d9869bff
+  data.tar.gz: ce686751c30d9521434b1285304d5e48a5961ddd8c47ad10f79c44e607d46c48477eab6cf38f32d7cd17e18a4876af9b6a4d4a9b6e29f8eedba7f2a5e3fffd89

data/app/controllers/rsvps_controller.rb

@@ -61,12 +61,16 @@ class RsvpsController < ApplicationController
     @questionnaire.acc_status_author_id = current_user.id
 
     bus_list_id = params[:questionnaire][:bus_list_id].presence
-    is_joining_bus = !@questionnaire.bus_list_id && bus_list_id
     bus_list = bus_list_id && BusList.find(bus_list_id)
+    is_joining_bus = @questionnaire.bus_list != bus_list
     if is_joining_bus && bus_list.full?
-      flash[:notice] = "Sorry, that bus is full! You may need to arrange other plans for transportation."
+      if @questionnaire.bus_list_id?
+        flash[:notice] = "Sorry, that bus is full. You are still signed up for the '#{@questionnaire.bus_list.name}' bus."
+      else
+        flash[:notice] = "Sorry, that bus is full. You may need to arrange other plans for transportation."
+      end
     else
-      @questionnaire.bus_list_id = bus_list_id
+      @questionnaire.bus_list = bus_list
       @questionnaire.bus_captain_interest = params[:questionnaire][:bus_captain_interest]
     end
 

data/app/models/bus_list.rb

@@ -29,4 +29,8 @@ class BusList < ApplicationRecord
   def captains
     passengers.where(is_bus_captain: true)
   end
+
+  def name_maybe_full
+    full? ? "(full) #{name}" : name
+  end
 end

data/app/models/questionnaire.rb

@@ -2,6 +2,7 @@ class Questionnaire < ApplicationRecord
   include ActiveModel::Dirty
 
   before_validation :consolidate_school_names
+  before_validation :clean_for_non_rsvp
   after_create :queue_triggered_email_create
   after_update :queue_triggered_email_update
   after_save :update_school_questionnaire_count
@@ -212,6 +213,14 @@ class Questionnaire < ApplicationRecord
 
   private
 
+  def clean_for_non_rsvp
+    if acc_status != "rsvp_confirmed"
+      self.bus_list_id = nil
+      self.is_bus_captain = false
+      self.bus_captain_interest = false
+    end
+  end
+
   def consolidate_school_names
     return if school.blank?
     duplicate = SchoolNameDuplicate.find_by(name: school.name)

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

@@ -52,8 +52,8 @@
             %strong You must sign up here if you want to ride.
 
         .form-inputs
-          - bus_list_options = ([OpenStruct.new({ name: 'Not riding a sponsored bus', id: '' })] + BusList.all.to_a)
-          = f.association :bus_list, as: :radio_buttons, collection: bus_list_options, label_method: :name, value_method: :id, label: false, wrapper_html: { class: 'radio_buttons_vertical' }
+          - bus_list_options = ([OpenStruct.new({ name_maybe_full: 'Not riding a sponsored bus', id: '' })] + BusList.all.to_a)
+          = f.association :bus_list, as: :radio_buttons, collection: bus_list_options, label_method: :name_maybe_full, value_method: :id, label: false, wrapper_html: { class: 'radio_buttons_vertical' }
           - if BusList.where(needs_bus_captain: true).any?
             = f.input :bus_captain_interest, as: :radio_buttons, collection: { " Yes!" => true, " No thank you." => false }, label: "Would you be interested in being a bus captain?"
         %p

data/config/initializers/doorkeeper.rb

@@ -83,8 +83,8 @@ Doorkeeper.configure do
   # `client` - the OAuth client application (see Doorkeeper::OAuth::Client)
   # `grant_type` - the grant type of the request (see Doorkeeper::OAuth)
   # `scopes` - the requested scopes (see Doorkeeper::OAuth::Scopes)
-  #
-  # use_refresh_token
+
+  use_refresh_token
 
   # Forbids creating/updating applications with arbitrary scopes that are
   # not in configuration, i.e. `default_scopes` or `optional_scopes`.

data/lib/hackathon_manager/version.rb

@@ -1,3 +1,3 @@
 module HackathonManager
-  VERSION = '0.13.3'.freeze
+  VERSION = '0.13.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hackathon_manager
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Stuart Olivera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails