cafe-grader-web Commit - r843:2e56e1493802

cafe-grader-web

Commit `r843:2e56e1493802` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r843:2e56e1493802 - Mon, 09 Aug 2021 17:17:42 - 5 files changed: 35 inserted, 81 deleted

db/migrate/20210809105935_add_index_to_task_status.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddIndexToTaskStatus < ActiveRecord::Migration[5.2]
	2	+ def change
	3	+ add_index :tasks, :status
	4	+ end
	5	+ end

app/controllers/user_admin_controller.rb ¶ +15 -79

@@ -49,98 +49,29
49	redirect_to action: 'index', page: params[:page]	49	redirect_to action: 'index', page: params[:page]
50	end	50	end
51		51
52	def create_from_list	52	def create_from_list
53	lines = params[:user_list]	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	56	+ res = User.create_from_list(lines)
89	- if items.length>=5	57	+ error_logins = res[:error_logins]
90	- remark = items[4].strip;	58	+ error_msg = res[:first_error]
91	- has_remark = true	59	+ ok_user = res[:created_users]
92	- end
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	#add to group	62	#add to group
127	if params[:add_to_group]	63	if params[:add_to_group]
128	- group = Group.~~where~~(id: params[:group_id]).~~first~~	64	+ group = Group.find_by(id: params[:group_id])&.add_users_skip_existing(ok_user)
129	- if group
130	- group.users << ok_user
131	- end
132	end	65	end
133		66
134	# show flash	67	# show flash
135	- if note.size > 0	68	+ if ok_user.count > 0
136	- flash[:success] = 'User(s) ' + note.join(', ') +	69	+ flash[:success] = "#{ok_user.count} user(s) was created or updated successfully"
137	- ' were successfully created. ' +
138	- '( (+) - created with random passwords.)'
139	end	70	end
140	- if error_~~note~~.size > 0	71	+ if error_logins.size > 0
141	flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ') + ". The error of the first failed one are: " + error_msg;	72	flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ') + ". The error of the first failed one are: " + error_msg;
142	end	73	end
143	redirect_to :action => 'index'	74	redirect_to :action => 'index'
144	end	75	end
145		76
146	def edit	77	def edit
@@ -424,14 +355,19
424	end	355	end
425		356
426	#bulk manage	357	#bulk manage
427	def bulk_manage	358	def bulk_manage
428		359
429	begin	360	begin
430	- @users = User.where('(login REGEXP ?) OR (remark REGEXP ?)',params[:regex],params[:regex]) if params[:regex]	361	+ if params[:filter_group]
431	- @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised	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	rescue Exception	368	rescue Exception
433	flash[:error] = 'Regular Expression is malformed'	369	flash[:error] = 'Regular Expression is malformed'
434	@users = nil	370	@users = nil
435	end	371	end
436		372
437	if params[:commit]	373	if params[:commit]

app/models/group.rb ¶ +7

                 has_many :groups_users, class_name: 'GroupUser'
                 has_many :users, :through => :groups_users
                 #has_and_belongs_to_many :problems
                 #has_and_belongs_to_many :users
+            +   def add_users_skip_existing(users_list)
+            +     new_list = []
+            +     users_list.uniq.each do |u|
+            +       new_list << u unless users.include? u
+            +     end
+            +     users << new_list
+            +   end
               end

app/views/groups/show.html.haml ¶ +2 -2

                             page. You can also use
                             = link_to 'Bulk Manage User', bulk_manage_user_admin_index_path
                             page.
                         =form_tag add_user_group_path(@group), class: 'form-inline' do
                           .form-group
                             =label_tag :user_id, "User"
-            -               =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2', style: 'width: 10em';
+            +               =select_tag :user_id, options_from_collection_for_select(User.all,'id','login_with_name'), class: 'select2', style: 'width: 25em';
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr
                             If you want to add several problem to a group, it may be easier to bulk manage them in the
                             = link_to 'Bulk Manage Problems', manage_problems_path
                             page
                         =form_tag add_problem_group_path(@group), class: 'form-inline' do
                           .form-group
                             =label_tag :problem_id, "Problem"
-            -               =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2', style: 'width: 10em';
+            +               =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','long_name'), class: 'select2', style: 'width: 25em';
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr

app/views/user_admin/bulk_manage.html.haml ¶ +6

                         %li
                           %code ^56
                           matches every user whose login starts with "56"
                         %li
                           %code 21$
                           matches every user whose login ends with "21"
+            +         .form-group
+            +           .div.checkbox
+            +             %label
+            +               = check_box_tag :filter_group, 1, params[:filter_group] == '1'
+            +               Apply to this group only
+            +             = select_tag "filter_group_id", options_from_collection_for_select( Group.all, 'id','name',params[:filter_group_id]), id: 'group_name',class: 'select2'
                 .col-md-6
                   .panel.panel-primary
                     .panel-title.panel-heading
                       Action
                     .panel-body
                       .row.form-group

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r843:2e56e1493802 - Mon, 09 Aug 2021 17:17:42 - 5 files changed: 35 inserted, 81 deleted

Sign in to your account

Commit r843:2e56e1493802 public

Author

r843:2e56e1493802 - Mon, 09 Aug 2021 17:17:42 - 5 files changed: 35 inserted, 81 deleted

Commit `r843:2e56e1493802` public