cafe-grader-web Commit - r643:39e4a808eb76

cafe-grader-web

Commit `r643:39e4a808eb76` public

parent | child

Description:

add bulk manage for enablind users

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r643:39e4a808eb76 - Thu, 09 Mar 2017 08:49:46 - 7 files changed: 132 inserted, 7 deleted

app/views/user_admin/bulk_manage.html.haml created 644 ¶ +77

@@ -0,0 +1,77
	1	+ %h1 Bulk Manage User
	2	+
	3	+ = form_tag bulk_manage_user_admin_path
	4	+ .row
	5	+ .col-md-6
	6	+ .panel.panel-primary
	7	+ .panel-title.panel-heading
	8	+ Filter User
	9	+ .panel-body
	10	+ Filtering users whose login match the following MySQL regex
	11	+ .form-group
	12	+ = label_tag "regex", 'Regex Pattern'
	13	+ = text_field_tag "regex", params[:regex], class: 'form-control'
	14	+ %p
	15	+ Example
	16	+ %ul
	17	+ %li
	18	+ %code root
	19	+ matches every user whose login contains "root"
	20	+ %li
	21	+ %code ^56
	22	+ matches every user whose login starts with "56"
	23	+ %li
	24	+ %code 21$
	25	+ matches every user whose login ends with "21"
	26	+ .col-md-6
	27	+ .panel.panel-primary
	28	+ .panel-title.panel-heading
	29	+ Action
	30	+ .panel-body
	31	+ .row.form-group
	32	+ .col-md-6
	33	+ %label.checkbox-inline
	34	+ = check_box_tag "enabled", true, params[:enabled]
	35	+ Change "Enabled" to
	36	+ .col-md-3
	37	+ %label.radio-inline
	38	+ = radio_button_tag "enable", 1, params[:enable] == '1', id: 'enable-yes'
	39	+ Yes
	40	+ .col-md-3
	41	+ %label.radio-inline
	42	+ = radio_button_tag "enable", 0, params[:enable] == '0', id: 'enable-no'
	43	+ No
	44	+ .row.form-group
	45	+ .col-md-6
	46	+ %label.checkbox-inline
	47	+ = check_box_tag "gen_password", true, params[:gen_password]
	48	+ Generate new random password
	49	+
	50	+ .row
	51	+ .col-md-12
	52	+ = submit_tag "Preview Result", class: 'btn btn-default'
	53	+ - if @users
	54	+ .row
	55	+ .col-md-4
	56	+ - if @action
	57	+ %h2 Confirmation
	58	+ - if @action[:set_enable]
	59	+ .alert.alert-info The following users will be set #{(@action[:enabled] ? 'enable' : 'disable')}.
	60	+ - if @action[:gen_password]
	61	+ .alert.alert-info The password of the following users will be randomly generated.
	62	+ .row
	63	+ .col-md-4
	64	+ = submit_tag "Perform", class: 'btn btn-primary'
	65	+ .row
	66	+ .col-md-12
	67	+ The pattern matches #{@users.count} following users.
	68	+ %br
	69	+ - @users.each do \|user\|
	70	+ = user.login
	71	+ = ' '
	72	+ = user.full_name
	73	+ = ' '
	74	+ = "(#{user.remark})" if user.remark
	75	+ %br
	76	+
	77	+

app/controllers/user_admin_controller.rb ¶ +33

                     redirect_to :action => 'admin' and return
                   end
                   admin_role = Role.find_by_name('admin')
                   user.roles.delete(admin_role)
                   flash[:notice] = 'User permission revoked'
                   redirect_to :action => 'admin'
                 end
                 # mass mailing
                 def mass_mailing
                 end
                 def bulk_mail
                   lines = params[:login_list]
                   if !lines or lines.blank?
                     flash[:notice] = 'You entered an empty list.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_subject = params[:subject]
                   if !mail_subject or mail_subject.blank?
                     flash[:notice] = 'You entered an empty mail subject.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   mail_body = params[:email_body]
                   if !mail_body or mail_body.blank?
                     flash[:notice] = 'You entered an empty mail body.'
                     redirect_to :action => 'mass_mailing' and return
                   end
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       send_mail(user.email, mail_subject, mail_body)
                       note << user.login
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully modified.  '
                   redirect_to :action => 'mass_mailing'
                 end
+            +   #bulk manage
+            +   def bulk_manage
+            +
+            +     begin
+            +       @users = User.where('login REGEXP ?',params[:regex]) if params[:regex]
+            +       @users.count if @users #i don't know why I have to call count, but if I won't exception is not raised
+            +     rescue Exception
+            +       flash[:error] = 'Regular Expression is malformed'
+            +       @users = nil
+            +     end
+            +
+            +     if params[:commit]
+            +       @action = {}
+            +       @action[:set_enable] = params[:enabled]
+            +       @action[:enabled] = params[:enable] == "1"
+            +       @action[:gen_password] = params[:gen_password]
+            +     end
+            +
+            +     if params[:commit] == "Perform"
+            +       if @action[:set_enable]
+            +         @users.update_all(enabled: @action[:enabled])
+            +       end
+            +       if @action[:gen_password]
+            +         @users.each do |u|
+            +           password = random_password
+            +           u.password = password
+            +           u.password_confirmation = password
+            +           u.save
+            +         end
+            +       end
+            +     end
+            +   end
+            +
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""
                   country_data = data_hash[:countries]
                   site_data = data_hash[:sites]
                   user_data = data_hash[:users]
                   # import country
                   countries = {}
                   country_data.each_pair do |id,country|
                     c = Country.find_by_name(country[:name])
                     if c!=nil
                       countries[id] = c
                       @import_log << "Found #{country[:name]}\n"
                     else
                       countries[id] = Country.new(:name => country[:name])
                       countries[id].save
                       @import_log << "Created #{country[:name]}\n"
                     end
                   end
                   # import sites
                   sites = {}
                   site_data.each_pair do |id,site|
                     s = Site.find_by_name(site[:name])
                     if s!=nil
                       @import_log << "Found #{site[:name]}\n"
                     else
                       s = Site.new(:name => site[:name])
                       @import_log << "Created #{site[:name]}\n"
                     end
                     s.password = site[:password]
                     s.country = countries[site[:country_id]]
                     s.save
                     sites[id] = s
                   end
                   # import users

app/models/problem.rb ¶ +3 -1

                 def self.available_problems
                   available.order(date_added: :desc).order(:name)
                   #Problem.available.all(:order => "date_added DESC, name ASC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   org_problem = old_problem || Problem.new
                   import_params, problem = Problem.extract_params_and_check(params,
                                                                             org_problem)
                   if !problem.errors.empty?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_params[:checker_name],
                                                    import_to_db)
                     problem.errors.add(:base,'Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir
                   return "#{Rails.root}/data/tasks"
                 end
                 def get_submission_stat
                   result = Hash.new
                   #total number of submission
                   result[:total_sub] = Submission.where(problem_id: self.id).count
-            -     result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id)
+            +     result[:attempted_user] = Submission.where(problem_id: self.id).group(:user_id)
+            +     result[:pass] = Submission.where(problem_id: self.id).where("points >= ?",self.full_score).count
+            +     return result
                 end
                 def long_name
                   "[#{name}] #{full_name}"
                 end
                 protected
                 def self.to_i_or_default(st, default)
                   if st!=''
                     result = st.to_i
                   end
                   result ||= default
                 end
                 def self.to_f_or_default(st, default)
                   if st!=''
                     result = st.to_f
                   end
                   result ||= default
                 end
                 def self.extract_params_and_check(params, problem)
                   time_limit = Problem.to_f_or_default(params[:time_limit],
                                                        DEFAULT_TIME_LIMIT)
                   memory_limit = Problem.to_i_or_default(params[:memory_limit],
                                                          DEFAULT_MEMORY_LIMIT)
                   if time_limit<=0 or time_limit >60
                     problem.errors.add(:base,'Time limit out of range.')
                   end
                   if memory_limit==0 and params[:memory_limit]!='0'
                     problem.errors.add(:base,'Memory limit format errors.')
                   elsif memory_limit<=0 or memory_limit >512
                     problem.errors.add(:base,'Memory limit out of range.')
                   end
                   if params[:file]==nil or params[:file]==''
                     problem.errors.add(:base,'No testdata file.')
                   end
                   checker_name = 'text'
                   if ['text','float'].include? params[:checker]
                     checker_name = params[:checker]
                   end
                   file = params[:file]

app/views/main/_problem.html.haml ¶ +4

               %tr
                 %td
+            +     - if @current_user and @current_user.admin?
+            +       = link_to problem.name, stat_problem_path(problem)
+            +     - else
                     = "#{problem.name}"
                 %td
                   = "#{problem.full_name}"
+            +
                   %br
                   = link_to_description_if_any "[#{t 'main.problem_desc'}] <span class='glyphicon glyphicon-file'></span>".html_safe, problem
                 %td
                   = @prob_submissions[problem.id][:count]
                   = link_to "[subs]", main_submission_path(problem.id)
                 %td
                   = render :partial => 'submission_short',
                     :locals => {:submission => @prob_submissions[problem.id][:submission], :problem_name => problem.name, :problem_id => problem.id }
                 %td
                   - if @prob_submissions[problem.id][:submission]
                     = link_to 'Edit', edit_submission_path(@prob_submissions[problem.id][:submission]), class: 'btn btn-success'
                   - else
                     = link_to 'New', direct_edit_problem_submissions_path(problem.id), class: 'btn btn-success'

app/views/user_admin/index.html.haml ¶ +1

               %h1 Listing users
               .panel.panel-primary
                 .panel-title.panel-heading
                   Quick Add
                 .panel-body
                   = form_tag( {method: 'post'}, {class: 'form-inline'})  do
                     .form-group
                       = label_tag 'user_login', 'Login'
                       = text_field 'user', 'login', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_full_name', 'Full Name'
                       = text_field 'user', 'full_name', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_password', 'Password'
                       = text_field 'user', 'password', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_password_confirmation', 'Confirm'
                       = text_field 'user', 'password_confirmation', :size => 10,class: 'form-control'
                     .form-group
                       = label_tag 'user_email', 'email'
                       = text_field 'user', 'email', :size => 10,class: 'form-control'
                     =submit_tag "Create", class: 'btn btn-primary'
               .panel.panel-primary
                 .panel-title.panel-heading
                   Import from site management
                 .panel-body
                   = form_tag({:action => 'import'}, :multipart => true,class: 'form form-inline') do
                     .form-group
                       = label_tag :file, 'File:'
                       .input-group
                         %span.input-group-btn
                           %span.btn.btn-default.btn-file
                             Browse
                             = file_field_tag 'file'
                         = text_field_tag '' , nil, {readonly: true, class: 'form-control'}
                     = submit_tag 'Submit', class: 'btn btn-default'
               %p
                 = link_to '+ New user', { :action => 'new' }, { class: 'btn btn-success '}
                 = link_to '+ New list of users', { :action => 'new_list' }, { class: 'btn btn-success '}
                 = link_to 'View administrators',{ :action => 'admin'}, { class: 'btn btn-default '}
+            +   = link_to 'Bulk Manage', bulk_manage_user_admin_path , { class: 'btn btn-default '}
                 = link_to 'Random passwords',{ :action => 'random_all_passwords'}, { class: 'btn btn-default '}
                 = link_to 'View active users',{ :action => 'active'}, { class: 'btn btn-default '}
                 = link_to 'Mass mailing',{ :action => 'mass_mailing'}, { class: 'btn btn-default '}
               - if GraderConfiguration.multicontests?
                 %br/
                 %b Multi-contest:
                 = link_to '[Manage bulk users in contests]', :action => 'contest_management'
                 View users in:
                 - @contests.each do |contest|
                   = link_to "[#{contest.name}]", :action => 'contests', :id => contest.id
                 = link_to "[no contest]", :action => 'contests', :id => 'none'
               Total #{@user_count} users |
               - if !@paginated
                 Display all users.
                 \#{link_to '[show in pages]', :action => 'index', :page => '1'}
               - else
                 Display in pages.
                 \#{link_to '[display all]', :action => 'index', :page => 'all'} |
                 \#{will_paginate @users, :container => false}
               %table.table.table-hover.table-condense
                 %thead
                   %th Login
                   %th Full name
                   %th email
                   %th Remark
                   %th
                     Activated
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'User has already confirmed the email?' } [?]
                   %th
                     Enabled
                     %sup{class: 'text-primary',data: {toggle: 'tooltip', placement: 'top'}, title: 'Allow the user to login?' } [?]
                   %th Last IP
                   %th
                   %th
                   %th
                   %th
                 - for user in @users
                   %tr
                     %td= link_to user.login, stat_user_path(user)
                     %td= user.full_name
                     %td= user.email
                     %td= user.remark
                     %td= toggle_button(user.activated?, toggle_activate_user_path(user),"toggle_activate_user_#{user.id}")
                     %td= toggle_button(user.enabled?, toggle_enable_user_path(user),"toggle_enable_user_#{user.id}")

app/views/user_admin/new_list.html.erb ¶ +4 -3

               <h1>Adding list of users</h1>
               <%= form_tag :action => 'create_from_list' do %>
-            - <%= submit_tag 'create users' %><br/>
+            +   <%= submit_tag 'create users',class: 'btn btn-success'%><br/>
-            - List of user information in this format: <tt>user_id,name(,passwd(,alias))</tt><br/>
+            + List of user information in this format: <tt>user_id,name(,passwd(,alias(,remark)))</tt><br/>
-            - Note that <tt>passwd</tt> and <tt>alias</tt> is optional.<br/>
+            + Note that <tt>passwd, alias</tt> and <tt> remark </tt>is optional.<br />
+            + When <tt>passwd</tt> or <tt>alias</tt> is empty, the original value will be used instead.<br/>
               <%= text_area_tag 'user_list', nil, :rows => 50, :cols => 80 %>
               <% end %>

config/routes.rb ¶ +10 -3

                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                     get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
-            -   get 'tasks/view/:file.:ext' => 'tasks#view'
-            -   get 'tasks/download/:id/:file.:ext' => 'tasks#download'
-            -   get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
+            +   #user admin
+            +   get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
+            +
                 #report
                 get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
+            +
+            +   #
+            +   get 'tasks/view/:file.:ext' => 'tasks#view'
+            +   get 'tasks/download/:id/:file.:ext' => 'tasks#download'
+            +   get 'heartbeat/:id/edit' => 'heartbeat#edit'
+            +
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)', via:  [:get, :post]
               end

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

r643:39e4a808eb76 - Thu, 09 Mar 2017 08:49:46 - 7 files changed: 132 inserted, 7 deleted

Sign in to your account

Commit r643:39e4a808eb76 public

Author

r643:39e4a808eb76 - Thu, 09 Mar 2017 08:49:46 - 7 files changed: 132 inserted, 7 deleted

Commit `r643:39e4a808eb76` public