cafe-grader-web

Commit r843:2e56e1493802 public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge algo
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r843:2e56e1493802 - - 5 files changed: 39 inserted, 85 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddIndexToTaskStatus < ActiveRecord::Migration[5.2]
2 + def change
3 + add_index :tasks, :status
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -30,123 +30,54
30 30 def new
31 31 @user = User.new
32 32 end
33 33
34 34 def create
35 35 @user = User.new(user_params)
36 36 @user.activated = true
37 37 if @user.save
38 38 flash[:notice] = 'User was successfully created.'
39 39 redirect_to :action => 'index'
40 40 else
41 41 render :action => 'new'
42 - end
42 + end
43 43 end
44 44
45 45 def clear_last_ip
46 46 @user = User.find(params[:id])
47 47 @user.last_ip = nil
48 48 @user.save
49 49 redirect_to action: 'index', page: params[:page]
50 50 end
51 51
52 52 def create_from_list
53 53 lines = params[:user_list]
54 54
55 - note = []
56 - error_note = []
57 - error_msg = nil
58 - ok_user = []
59 -
60 - lines.split("\n").each do |line|
61 - #split with large limit, this will cause consecutive ',' to be result in a blank
62 - items = line.chomp.split(',',1000)
63 - if items.length>=2
64 - login = items[0]
65 - full_name = items[1]
66 - remark =''
67 - user_alias = ''
68 -
69 - added_random_password = false
70 - added_password = false
71 - if items.length >= 3
72 - if items[2].chomp(" ").length > 0
73 - password = items[2].chomp(" ")
74 - added_password = true
75 - end
76 - else
77 - password = random_password
78 - added_random_password=true;
79 - end
80 -
81 - if items.length>= 4 and items[3].chomp(" ").length > 0;
82 - user_alias = items[3].chomp(" ")
83 - else
84 - user_alias = login
85 - end
86 -
87 55
88 - has_remark = false
89 - if items.length>=5
90 - remark = items[4].strip;
91 - has_remark = true
92 - end
56 + res = User.create_from_list(lines)
57 + error_logins = res[:error_logins]
58 + error_msg = res[:first_error]
59 + ok_user = res[:created_users]
93 60
94 - user = User.find_by_login(login)
95 - if (user)
96 - user.full_name = full_name
97 - user.remark = remark if has_remark
98 - user.password = password if added_password || added_random_password
99 - else
100 - #create a random password if none are given
101 - password = random_password unless password
102 - user = User.new({:login => login,
103 - :full_name => full_name,
104 - :password => password,
105 - :password_confirmation => password,
106 - :alias => user_alias,
107 - :remark => remark})
108 - end
109 - user.activated = true
110 -
111 - if user.save
112 - if added_random_password
113 - note << "'#{login}' (+)"
114 - else
115 - note << login
116 - end
117 - ok_user << user
118 - else
119 - error_note << "'#{login}'"
120 - error_msg = user.errors.full_messages.to_sentence unless error_msg
121 - end
122 -
123 - end
124 - end
125 61
126 62 #add to group
127 63 if params[:add_to_group]
128 - group = Group.where(id: params[:group_id]).first
129 - if group
130 - group.users << ok_user
131 - end
64 + group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
132 65 end
133 66
134 67 # show flash
135 - if note.size > 0
136 - flash[:success] = 'User(s) ' + note.join(', ') +
137 - ' were successfully created. ' +
138 - '( (+) - created with random passwords.)'
68 + if ok_user.count > 0
69 + flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
139 70 end
140 - if error_note.size > 0
71 + if error_logins.size > 0
141 72 flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ') + ". The error of the first failed one are: " + error_msg;
142 73 end
143 74 redirect_to :action => 'index'
144 75 end
145 76
146 77 def edit
147 78 @user = User.find(params[:id])
148 79 end
149 80
150 81 def update
151 82 @user = User.find(params[:id])
152 83 if @user.update_attributes(user_params)
@@ -392,52 +323,57
392 323 def bulk_mail
393 324 lines = params[:login_list]
394 325 if !lines or lines.blank?
395 326 flash[:notice] = 'You entered an empty list.'
396 327 redirect_to :action => 'mass_mailing' and return
397 328 end
398 329
399 330 mail_subject = params[:subject]
400 331 if !mail_subject or mail_subject.blank?
401 332 flash[:notice] = 'You entered an empty mail subject.'
402 333 redirect_to :action => 'mass_mailing' and return
403 334 end
404 -
335 +
405 336 mail_body = params[:email_body]
406 337 if !mail_body or mail_body.blank?
407 338 flash[:notice] = 'You entered an empty mail body.'
408 339 redirect_to :action => 'mass_mailing' and return
409 340 end
410 341
411 342 note = []
412 343 users = []
413 344 lines.split("\n").each do |line|
414 345 user = User.find_by_login(line.chomp)
415 346 if user
416 347 send_mail(user.email, mail_subject, mail_body)
417 348 note << user.login
418 349 end
419 350 end
420 -
351 +
421 352 flash[:notice] = 'User(s) ' + note.join(', ') +
422 353 ' were successfully modified. '
423 354 redirect_to :action => 'mass_mailing'
424 355 end
425 356
426 357 #bulk manage
427 358 def bulk_manage
428 359
429 - begin
430 - @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]
431 - @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
360 + begin
361 + if params[:filter_group]
362 + @users = Group.find_by(id: params[:filter_group_id]).users
363 + else
364 + @users = User.all
365 + end
366 + @users = @users.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) unless params[:regex].blank?
367 + @users.count if @users #test the sql
432 368 rescue Exception
433 369 flash[:error] = 'Regular Expression is malformed'
434 370 @users = nil
435 371 end
436 372
437 373 if params[:commit]
438 374 @action = {}
439 375 @action[:set_enable] = params[:enabled]
440 376 @action[:enabled] = params[:enable] == "1"
441 377 @action[:gen_password] = params[:gen_password]
442 378 @action[:add_group] = params[:add_group]
443 379 @action[:group_name] = params[:group_name]
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,13 +1,20
1 1 class Group < ActiveRecord::Base
2 2 has_many :groups_problems, class_name: 'GroupProblem'
3 3 has_many :problems, :through => :groups_problems
4 4
5 5 has_many :groups_users, class_name: 'GroupUser'
6 6 has_many :users, :through => :groups_users
7 7
8 8 #has_and_belongs_to_many :problems
9 9 #has_and_belongs_to_many :users
10 10
11 + def add_users_skip_existing(users_list)
12 + new_list = []
13 + users_list.uniq.each do |u|
14 + new_list << u unless users.include? u
15 + end
16 + users << new_list
17 + end
11 18
12 19 end
13 20
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -18,25 +18,25
18 18 .panel-title Users in this group
19 19 .panel-body
20 20 %ul
21 21 %li
22 22 If you want to add several users to a group, it may be easier to just re-import those users in
23 23 = link_to 'New list of users', new_list_user_admin_index_path
24 24 page. You can also use
25 25 = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
26 26 page.
27 27 =form_tag add_user_group_path(@group), class: 'form-inline' do
28 28 .form-group
29 29 =label_tag :user_id, "User"
30 - =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2', style: 'width: 10em';
30 + =select_tag :user_id, options_from_collection_for_select(User.all,'id','login_with_name'), class: 'select2', style: 'width: 25em';
31 31 =submit_tag "Add",class: 'btn btn-primary'
32 32
33 33
34 34 %table.table.table-hover
35 35 %thead
36 36 %tr
37 37 %th Login
38 38 %th Full name
39 39 %th Remark
40 40 %th= link_to 'Remove All', remove_all_user_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL USERS from group?" }, class: 'btn btn-danger btn-sm'
41 41
42 42 %tbody
@@ -50,25 +50,25
50 50 .panel.panel-default
51 51 .panel-heading
52 52 .panel-title Problems
53 53 .panel-body
54 54 %ul
55 55 %li
56 56 If you want to add several problem to a group, it may be easier to bulk manage them in the
57 57 = link_to 'Bulk Manage Problems', manage_problems_path
58 58 page
59 59 =form_tag add_problem_group_path(@group), class: 'form-inline' do
60 60 .form-group
61 61 =label_tag :problem_id, "Problem"
62 - =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2', style: 'width: 10em';
62 + =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','long_name'), class: 'select2', style: 'width: 25em';
63 63 =submit_tag "Add",class: 'btn btn-primary'
64 64
65 65
66 66 %table.table.table-hover
67 67 %thead
68 68 %tr
69 69 %th name
70 70 %th Full name
71 71 %th Full score
72 72 %th= link_to 'Remove All', remove_all_problem_group_path(@group), method: :delete, :data => { :confirm => "Remove ALL PROBLEMS from group?" }, class: 'btn btn-danger btn-sm'
73 73
74 74 %tbody
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -14,24 +14,30
14 14 %p
15 15 Example
16 16 %ul
17 17 %li
18 18 %code root
19 19 matches every user whose login contains "root"
20 20 %li
21 21 %code ^56
22 22 matches every user whose login starts with "56"
23 23 %li
24 24 %code 21$
25 25 matches every user whose login ends with "21"
26 + .form-group
27 + .div.checkbox
28 + %label
29 + = check_box_tag :filter_group, 1, params[:filter_group] == '1'
30 + Apply to this group only
31 + = select_tag "filter_group_id", options_from_collection_for_select( Group.all, 'id','name',params[:filter_group_id]), id: 'group_name',class: 'select2'
26 32 .col-md-6
27 33 .panel.panel-primary
28 34 .panel-title.panel-heading
29 35 Action
30 36 .panel-body
31 37 .row.form-group
32 38 .col-md-6
33 39 %label.checkbox-inline
34 40 = check_box_tag "enabled", true, params[:enabled]
35 41 Change "Enabled" to
36 42 .col-md-3
37 43 %label.radio-inline
You need to be logged in to leave comments. Login now