hackathon_manager 0.13.4 → 0.13.5
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 10df4760297b3fcc6238b3fd35a83c159b947c21eb14101c54d280d4a854cdda
|
|
4
|
+
data.tar.gz: 4c78b6cf6a3ebf95a1173158177684802fc66ae7701b4e7cae90550b2f668d1e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a51c0aa9f0456518e9fbaa0c169982eba71ddbcafeb189f91aa49adb7c2fced6a07d1a505cdf473f7deaad0f98ef566204280735f791abe16c788ead884d47d4
|
|
7
|
+
data.tar.gz: 43d73ce9e9d541823e6d827681fe5effce5e7b6b02034dccfb5256a2e3acf470ea8a8d07ff14031fd412fcefd8b953a4552f36040851fefa27e44077c8f0a3aa
|
|
@@ -60,17 +60,17 @@ class RsvpsController < ApplicationController
|
|
|
60
60
|
@questionnaire.acc_status = params[:questionnaire][:acc_status]
|
|
61
61
|
@questionnaire.acc_status_author_id = current_user.id
|
|
62
62
|
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
is_joining_bus = @questionnaire.bus_list !=
|
|
66
|
-
if is_joining_bus &&
|
|
63
|
+
new_bus_list_id = params[:questionnaire][:bus_list_id].presence
|
|
64
|
+
new_bus_list = new_bus_list_id && BusList.find(new_bus_list_id)
|
|
65
|
+
is_joining_bus = new_bus_list.present? && @questionnaire.bus_list != new_bus_list
|
|
66
|
+
if is_joining_bus && new_bus_list.full?
|
|
67
67
|
if @questionnaire.bus_list_id?
|
|
68
68
|
flash[:notice] = "Sorry, that bus is full. You are still signed up for the '#{@questionnaire.bus_list.name}' bus."
|
|
69
69
|
else
|
|
70
70
|
flash[:notice] = "Sorry, that bus is full. You may need to arrange other plans for transportation."
|
|
71
71
|
end
|
|
72
72
|
else
|
|
73
|
-
@questionnaire.bus_list =
|
|
73
|
+
@questionnaire.bus_list = new_bus_list
|
|
74
74
|
@questionnaire.bus_captain_interest = params[:questionnaire][:bus_captain_interest]
|
|
75
75
|
end
|
|
76
76
|
|
|
@@ -60,7 +60,13 @@
|
|
|
60
60
|
%th Checked in?
|
|
61
61
|
%th Bus Captain
|
|
62
62
|
%tbody
|
|
63
|
-
-
|
|
63
|
+
- was_bus_captain = false
|
|
64
|
+
- @bus_list.passengers.reorder('is_bus_captain DESC, last_name ASC').each do |p|
|
|
65
|
+
- # Visual separator between captains and passengers
|
|
66
|
+
- if was_bus_captain && !p.is_bus_captain
|
|
67
|
+
%tr
|
|
68
|
+
%td{colspan: 9}
|
|
69
|
+
- was_bus_captain = p.is_bus_captain
|
|
64
70
|
%tr
|
|
65
71
|
%td= link_to '<i class="fa fa-search"></i>'.html_safe, manage_questionnaire_path(p)
|
|
66
72
|
%td= p.first_name
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: hackathon_manager
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.13.
|
|
4
|
+
version: 0.13.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Stuart Olivera
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2019-02-
|
|
11
|
+
date: 2019-02-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|