Skip to content

More detailed roster error messages & sort by account status #1402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 33 commits into from
Nov 20, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
8a43b9a
added csv line number to error message
michellexliu Sep 20, 2021
09332ba
updated roster error message to include reason for failing (e.g. blan…
michellexliu Sep 20, 2021
3321626
added check for user.save! in the black cud case
michellexliu Sep 20, 2021
3058597
display multiple errors at once, updated duplicate email error messag…
michellexliu Sep 21, 2021
3ee306b
got initial sorted order; TODO: create checkbox option
michellexliu Sep 23, 2021
d127ca9
added checkbox to UI
michellexliu Oct 16, 2021
fd95bad
set checkbox to toggle table display
michellexliu Oct 16, 2021
7872621
moved js to a separate file
michellexliu Oct 23, 2021
291e054
new partial for displaying error messages
michellexliu Nov 6, 2021
5518fdd
initial working version of row error display
michellexliu Nov 6, 2021
a4947b3
Roster validation on upload
oliverli Nov 6, 2021
84f413b
Remove unneeded require
oliverli Nov 6, 2021
7fab5b2
resolved merge conflicts
michellexliu Nov 8, 2021
cd44610
merged oliver's changes
michellexliu Nov 8, 2021
830d8a8
added back .permit
michellexliu Nov 8, 2021
cc0cecd
fixed ActiveModel::ForbiddenAttributesError
michellexliu Nov 8, 2021
371128b
Merge branch 'master' of https://github.com/autolab/Autolab into rost…
michellexliu Nov 11, 2021
801d23a
removed extraneous error flash
michellexliu Nov 11, 2021
b457bb6
added error messages for all instances of a duplicate
michellexliu Nov 11, 2021
4fc0882
grouped duplicate rows together
michellexliu Nov 11, 2021
fb165d4
fixed bug where duplicates don't show up when other errors are present
michellexliu Nov 11, 2021
cd88f90
unstaged automatically generated Gemfile.lock changes
michellexliu Nov 11, 2021
24eccb9
fixed case where errors weren't showing up for newly-created users
michellexliu Nov 12, 2021
9eae476
added back original Gemfile.lock
michellexliu Nov 13, 2021
74b1f81
safe autocorrect
michellexliu Nov 13, 2021
a814ab7
corrected rubocop fixed, did another safe autocorrect
michellexliu Nov 13, 2021
8abd7af
fixed most remaining rubocop errors
michellexliu Nov 13, 2021
80342b0
added back updated Gemfile.lock
michellexliu Nov 13, 2021
18c805a
fixed bug where capitalization triggered duplicate email error, bold …
michellexliu Nov 13, 2021
17acf47
fixed another case-sensitive bug
michellexliu Nov 14, 2021
2265a93
Limit mini_racer to 0.4.0
victorhuangwq Nov 14, 2021
308eb8d
fixed issue where missing emails in Autolab-formatted rosters weren't…
michellexliu Nov 18, 2021
ae00aeb
Merge branch 'roster-fix' of https://github.com/autolab/Autolab into …
michellexliu Nov 18, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ gem 'terser', '>= 1.1.7'
gem 'coffee-rails', '>= 4.0.0'

# See https://github.com/sstephenson/execjs#readme for more supported runtimes
gem 'mini_racer', platforms: :ruby
gem 'mini_racer', '<= 0.4.0' , platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
Expand Down
48 changes: 25 additions & 23 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,9 @@ GEM
rails (>= 3.1)
builder (3.2.4)
byebug (11.1.3)
capybara (3.35.3)
capybara (3.36.0)
addressable
matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
Expand Down Expand Up @@ -105,7 +106,7 @@ GEM
warden (~> 1.2.3)
diff-lcs (1.4.4)
docile (1.1.5)
doorkeeper (5.5.2)
doorkeeper (5.5.4)
railties (>= 5)
dynamic_form (1.1.4)
erubi (1.10.0)
Expand Down Expand Up @@ -149,11 +150,11 @@ GEM
activesupport (>= 5.0)
hashdiff (1.0.1)
hashery (2.1.2)
hashie (4.1.0)
httparty (0.19.0)
hashie (5.0.0)
httparty (0.20.0)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.8.10)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
jbuilder (2.11.2)
activesupport (>= 5.0.0)
Expand All @@ -163,10 +164,10 @@ GEM
thor (>= 0.14, < 2.0)
js_cookie_rails (2.2.0)
railties (>= 3.1)
json (2.5.1)
json (2.6.1)
jstz-rails3-plus (1.0.5)
railties (>= 3.1)
jwt (2.2.3)
jwt (2.3.0)
libv8-node (15.14.0.1)
loofah (2.12.0)
crass (~> 1.0.2)
Expand All @@ -177,14 +178,15 @@ GEM
mimemagic (~> 0.3.2)
materialize-sass (1.0.0.1)
autoprefixer-rails (>= 6.0.3)
matrix (0.4.2)
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0901)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.1.1)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
mini_racer (0.4.0)
libv8-node (~> 15.14.0.0)
Expand All @@ -198,7 +200,7 @@ GEM
multipart-post (2.1.1)
mysql2 (0.4.10)
net-ldap (0.17.0)
newrelic_rpm (7.2.0)
newrelic_rpm (8.1.0)
nio4r (2.5.8)
nokogiri (1.12.5)
mini_portile2 (~> 2.6.1)
Expand All @@ -213,14 +215,14 @@ GEM
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
rack-protection
omniauth-facebook (8.0.0)
omniauth-facebook (9.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-google-oauth2 (1.0.0)
jwt (>= 2.0)
oauth2 (~> 1.1)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-oauth2 (1.7.1)
omniauth-oauth2 (1.7.2)
oauth2 (~> 1.4)
omniauth (>= 1.9, < 3)
omniauth-shibboleth (1.3.0)
Expand All @@ -242,7 +244,7 @@ GEM
ruby-rc4
ttfunk (~> 1.0.3)
public_suffix (4.0.6)
racc (1.5.2)
racc (1.6.0)
rack (2.2.3)
rack-attack (6.5.0)
rack (>= 1.0, < 3)
Expand Down Expand Up @@ -277,7 +279,7 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (3.0.0)
rake (13.0.6)
rdoc (6.3.2)
rdoc (6.3.3)
regexp_parser (2.1.1)
responders (3.0.1)
actionpack (>= 5.0)
Expand All @@ -299,17 +301,17 @@ GEM
rspec-expectations (~> 3.10)
rspec-mocks (~> 3.10)
rspec-support (~> 3.10)
rspec-support (3.10.2)
rubocop (1.21.0)
rspec-support (3.10.3)
rubocop (1.22.3)
parallel (~> 1.10)
parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.9.1, < 2.0)
rubocop-ast (>= 1.12.0, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.11.0)
rubocop-ast (1.13.0)
parser (>= 3.0.1.1)
ruby-progressbar (1.11.0)
ruby-rc4 (0.1.5)
Expand Down Expand Up @@ -337,9 +339,9 @@ GEM
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets-rails (3.3.0)
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.3.13)
terser (1.1.7)
Expand All @@ -354,7 +356,7 @@ GEM
ttfunk (1.0.3)
tzinfo (1.2.9)
thread_safe (~> 0.1)
tzinfo-data (1.2021.1)
tzinfo-data (1.2021.5)
tzinfo (>= 1.0.0)
unicode-display_width (2.1.0)
warden (1.2.9)
Expand Down Expand Up @@ -397,7 +399,7 @@ DEPENDENCIES
jstz-rails3-plus (>= 1.0)
materialize-sass
mimemagic (>= 0.3.7)
mini_racer
mini_racer (<= 0.4.0)
moment_timezone-rails
momentjs-rails (>= 2.9.0)
mysql2 (~> 0.4.10)
Expand Down Expand Up @@ -433,4 +435,4 @@ RUBY VERSION
ruby 2.6.8p205

BUNDLED WITH
1.17.3
2.2.31
10 changes: 10 additions & 0 deletions app/assets/javascripts/sort-toggle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
$("#sort-status").change(function () {
var checked = $(this).is(":checked");
if (checked) {
$("#unsorted_cuds").hide();
$("#sorted_cuds").show();
} else {
$("#sorted_cuds").hide();
$("#unsorted_cuds").show();
}
});
Loading