cafe-grader-web Commit - r571:f8d309d2e37e

cafe-grader-web

Commit `r571:f8d309d2e37e` public

parent | child

Description:

- bootstrap: user admin quick add

Commit status:

[Not Reviewed]

References:

bootstrap

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r571:f8d309d2e37e - Mon, 11 Jul 2016 07:50:39 - 2 files changed: 30 inserted, 29 deleted

app/controllers/user_admin_controller.rb ¶ +7 -7

                 def active
                   sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
-            -       redirect_to :action => 'list'
+            +       redirect_to :action => 'index'
                   else
                     render :action => 'new'
                   end
                 end
                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
-            -     redirect_to action: 'list', page: params[:page]
+            +     redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       added_random_password = false
                       if items.length>=3
                         password = items[2].chomp(" ")
                         user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
                         user_alias = (items.length>=4) ? items[3] : login
                         added_random_password = true
                       end
                       user = User.find_by_login(login)
                       if (user)
                         user.full_name = full_name
                         user.password = password
                       else
                         user = User.new({:login => login,
                                           :full_name => full_name,
                                           :password => password,
                                           :password_confirmation => password,
                                           :alias => user_alias})
                       end
                       user.activated = true
                       user.save
                       if added_random_password
                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(params[:user])
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'show', :id => @user
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   User.find(params[:id]).destroy
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def user_stat
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.find_available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true) #find(:all, :include => [:contests, :contest_stat]).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       max_points = 0
                       Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
                         max_points = sub.points if sub and sub.points and (sub.points > max_points)
                       end
                       ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def import
                   if params[:file]==''
                     flash[:notice] = 'Error importing no file'
-            -       redirect_to :action => 'list' and return
+            +       redirect_to :action => 'index' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.find(:all)
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == 'POST'
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
                 # contest management
                 def contests
                   @contest, @users = find_contest_and_user_from_contest_id(params[:id])
                   contest_id = params[:users_contest_id]
                   org_contest, users = find_contest_and_user_from_contest_id(contest_id)
                   contest = Contest.find(params[:new_contest][:id])
                   if !contest
                     flash[:notice] = 'Error: no contest'
                     redirect_to :action => 'contests', :id =>contest_id
                   end
                   note = []
                   users.each do |u|
                     u.contests = [contest]
                     note << u.login
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     " were successfully reassigned to #{contest.title}."
                   redirect_to :action => 'contests', :id =>contest.id
                 end
                 def add_to_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests << contest
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
-            -     redirect_to :action => 'list'
+            +     redirect_to :action => 'index'
                 end
                 def contest_management
                 end
                 def manage_contest
                   contest = Contest.find(params[:contest][:id])
                   if !contest
                     flash[:notice] = 'You did not choose the contest.'
                     redirect_to :action => 'contest_management' and return
                   end
                   operation = params[:operation]
                   if not ['add','remove','assign'].include? operation
                     flash[:notice] = 'You did not choose the operation to perform.'
                     redirect_to :action => 'contest_management' and return
                   end
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'contest_management' and return
                   end

app/views/user_admin/index.html.haml ¶ +23 -22

@@ -1,48 +1,49
1	%h1 Listing users	1	%h1 Listing users
		2	+
		3	+ .panel.panel-primary
		4	+ .panel-title.panel-heading
		5	+ Quick Add
		6	+ .panel-body
		7	+ = form_tag( {method: 'post'}, {class: 'form-inline'}) do
		8	+ .form-group
		9	+ = label_tag 'user_login', 'Login'
		10	+ = text_field 'user', 'login', :size => 10,class: 'form-control'
		11	+ .form-group
		12	+ = label_tag 'user_full_name', 'Full Name'
		13	+ = text_field 'user', 'full_name', :size => 10,class: 'form-control'
		14	+ .form-group
		15	+ = label_tag 'user_password', 'Password'
		16	+ = text_field 'user', 'password', :size => 10,class: 'form-control'
		17	+ .form-group
		18	+ = label_tag 'user_password_confirmation', 'Confirm'
		19	+ = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
		20	+ .form-group
		21	+ = label_tag 'user_email', 'email'
		22	+ = text_field 'user', 'email', :size => 10,class: 'form-control'
		23	+ =submit_tag "Create", class: 'btn btn-primary'
		24	+
2	.submitbox	25	.submitbox
3	- %b Quick add
4	- = form_tag :action => 'create' do
5	- %table{:border => "0"}
6	- %tr
7	- %td
8	- %label{:for => "user_login"} Login
9	- %td
10	- %label{:for => "user_full_name"} Full name
11	- %td
12	- %label{:for => "user_password"} Password
13	- %td
14	- %label{:for => "user_password_confirmation"} Confirm
15	- %td
16	- %label{:for => "user_email"} Email
17	- %tr
18	- %td= text_field 'user', 'login', :size => 10
19	- %td= text_field 'user', 'full_name', :size => 30
20	- %td= password_field 'user', 'password', :size => 10
21	- %td= password_field 'user', 'password_confirmation', :size => 10
22	- %td= email_field 'user', 'email', :size => 15
23	- %td= submit_tag "Create"
24	- %br/
25	%b Import from site management	26	%b Import from site management
26	= form_tag({:action => 'import'}, :multipart => true) do	27	= form_tag({:action => 'import'}, :multipart => true) do
27	File: #{file_field_tag 'file'} #{submit_tag 'Import'}	28	File: #{file_field_tag 'file'} #{submit_tag 'Import'}
28	%br/	29	%br/
29	%b What else:	30	%b What else:
30	= link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}	31	= link_to 'New user', {:action => 'new'}, { class: 'btn btn-default btn-sm'}
31	= link_to 'New list of users',{ :action => 'new_list'}, { class: 'btn btn-default btn-sm'}	32	= link_to 'New list of users',{ :action => 'new_list'}, { class: 'btn btn-default btn-sm'}
32	= link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default btn-sm'}	33	= link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default btn-sm'}
33	= link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default btn-sm'}	34	= link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default btn-sm'}
34	= link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default btn-sm'}	35	= link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default btn-sm'}
35	= link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default btn-sm'}	36	= link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default btn-sm'}
36	- if GraderConfiguration.multicontests?	37	- if GraderConfiguration.multicontests?
37	%br/	38	%br/
38	%b Multi-contest:	39	%b Multi-contest:
39	= link_to '[Manage bulk users in contests]', :action => 'contest_management'	40	= link_to '[Manage bulk users in contests]', :action => 'contest_management'
40	View users in:	41	View users in:
41	- @contests.each do \|contest\|	42	- @contests.each do \|contest\|
42	= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id	43	= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
43	= link_to "[no contest]", :action => 'contests', :id => 'none'	44	= link_to "[no contest]", :action => 'contests', :id => 'none'
44	Total #{@user_count} users \|	45	Total #{@user_count} users \|
45	- if !@paginated	46	- if !@paginated
46	Display all users.	47	Display all users.
47	\#{link_to '[show in pages]', :action => 'index', :page => '1'}	48	\#{link_to '[show in pages]', :action => 'index', :page => '1'}
48	- else	49	- else

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

r571:f8d309d2e37e - Mon, 11 Jul 2016 07:50:39 - 2 files changed: 30 inserted, 29 deleted

Sign in to your account

Commit r571:f8d309d2e37e public

Author

r571:f8d309d2e37e - Mon, 11 Jul 2016 07:50:39 - 2 files changed: 30 inserted, 29 deleted

Commit `r571:f8d309d2e37e` public