cafe-grader-web Commit - r752:3a8a3897c926

cafe-grader-web

Commit `r752:3a8a3897c926` public

parent | child

Description:

more test on user_admin

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r752:3a8a3897c926 - Fri, 05 Jul 2019 08:54:05 - 6 files changed: 71 inserted, 59 deleted

test/system/users_test.rb created 644 ¶ +50

@@ -0,0 +1,50
	1	+ require "application_system_test_case"
	2	+
	3	+ class UsersTest < ApplicationSystemTestCase
	4	+ # test "visiting the index" do
	5	+ # visit users_url
	6	+ #
	7	+ # assert_selector "h1", text: "User"
	8	+ # end
	9	+
	10	+ test "add new user and edit" do
	11	+ login('admin','admin')
	12	+ within 'header' do
	13	+ click_on 'Manage'
	14	+ click_on 'Users', match: :first
	15	+ end
	16	+
	17	+ assert_text "Users"
	18	+ assert_text "New user"
	19	+
	20	+ click_on "New user", match: :first
	21	+ fill_in 'Login', with: 'test1'
	22	+ fill_in 'Full name', with: 'test1 McTestface'
	23	+ fill_in 'e-mail', with: 'a@a.com'
	24	+ fill_in 'Password', with: 'abcdef'
	25	+ fill_in 'Password confirmation', with: 'abcdef'
	26	+
	27	+ click_on 'Create'
	28	+
	29	+ assert_text 'User was successfully created'
	30	+ assert_text 'a@a.com'
	31	+ assert_text 'test1 McTestface'
	32	+
	33	+ within('tr', text: 'McTestface') do
	34	+ click_on 'Edit'
	35	+ end
	36	+
	37	+ fill_in 'Alias', with: 'hahaha'
	38	+ fill_in 'Remark', with: 'section 2'
	39	+ click_on 'Update User'
	40	+
	41	+ assert_text 'section 2'
	42	+ end
	43	+
	44	+ def login(username,password)
	45	+ visit root_path
	46	+ fill_in "Login", with: username
	47	+ fill_in "Password", with: password
	48	+ click_on "Login"
	49	+ end
	50	+ end

app/controllers/user_admin_controller.rb ¶ +1 -2

                   redirect_to :action => 'index'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(user_params)
                     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 => 'index'
                 end
                 def user_stat
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.available_problems
                   end
                   @users = User.includes(: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
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'last_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def user_stat_max
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.available_problems
                   end
                   @users = User.includes(:contests).includes(:contest_stat).all
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i
                   until_id = params.fetch(:until_id, 0).to_i
                   @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 => 'index' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.all
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
-            -     if request.request_method == 'POST'
+            +     if params[:commit] == 'Go ahead'
                     @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])
                   @contests = Contest.enabled
                 end
                 def assign_from_list
                   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 => '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 => '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
                   note = []
                   users = []
                   lines.split("\n").each do |line|
                     user = User.find_by_login(line.chomp)
                     if user
                       if operation=='add'
                         if ! user.contests.include? contest
                           user.contests << contest
                         end
                       elsif operation=='remove'
                         user.contests.delete(contest)
                       else
                         user.contests = [contest]
                       end
                       if params[:reset_timer]
                         user.contest_stat.forced_logout = true
                         user.contest_stat.reset_timer_and_save
                       end
                       if params[:notification_emails]
                         send_contest_update_notification_email(user, contest)
                       end
                       note << user.login
                       users << user
                     end
                   end

app/views/user_admin/_form.html.haml ¶ +14 -38

@@ -1,38 +1,14
1	- = error_messages_for 'user'	1	+ = simple_form_for(@user) do \|f\|
2	- / [form:user]	2	+ = f.error_notification
3	- .form-group	3	+ .row
4	- %label.col-md-2.control-label{for: :login} Login	4	+ .col-md-6.col-md-offset-2
5	- .col-md-4	5	+ = f.input :login, label: 'Login'
6	- = text_field 'user', 'login', class: 'form-control'	6	+ = f.input :full_name, label: 'Full name'
7	- .col-md-6	7	+ = f.input :password
8	- .form-group	8	+ = f.input :password_confirmation
9	- %label.col-md-2.control-label{for: :full_name} Full name	9	+ = f.input :email
10	- .col-md-4	10	+ = f.input :alias
11	- = text_field 'user', 'full_name', class: 'form-control'	11	+ = f.input :remark
12	- .col-md-6	12	+ = f.button :submit, class: 'btn btn-success'
13	- .form-group	13	+ = link_to 'Cancel', :back, class: 'btn btn-default'
14	- %label.col-md-2.control-label{for: :password} Password	14	+
15	- .col-md-4
16	- = password_field 'user', 'password', class: 'form-control'
17	- .col-md-6
18	- .form-group
19	- %label.col-md-2.control-label{for: :password_confirmation} Password (confirm)
20	- .col-md-4
21	- = password_field 'user', 'password_confirmation', class: 'form-control'
22	- .col-md-6
23	- .form-group
24	- %label.col-md-2.control-label{for: :email} E-mail
25	- .col-md-4
26	- = email_field 'user', 'email', class: 'form-control'
27	- .col-md-6
28	- .form-group
29	- %label.col-md-2.control-label{for: :alias} Alias
30	- .col-md-4
31	- = text_field 'user', 'alias', class: 'form-control'
32	- .col-md-6
33	- .form-group
34	- %label.col-md-2.control-label{for: :remark} Remark
35	- .col-md-4
36	- = text_field 'user', 'remark', class: 'form-control'
37	- .col-md-6
38	- / [eoform:user]

app/views/user_admin/edit.html.haml ¶ +2 -11

@@ -1,13 +1,4
1	%h1 Editing user	1	%h1 Editing user
		2	+ = simple_form_for @user, url: user_admin_path(@user) do \|f\|
		3	+ = render partial: 'form', local: f
2		4
3	- = form_tag( {:action => 'update', :id => @user}, {class: 'form-horizontal'}) do
4	- = error_messages_for 'user'
5	- = render partial: "form"
6	- .form-group
7	- .col-md-offset-2.col-md-4
8	- = submit_tag "Edit", class: 'btn btn-primary'
9	-
10	-
11	- = link_to 'Show', :action => 'show', :id => @user
12	- \|
13	- = link_to 'Back', :action => 'index'

app/views/user_admin/new.html.haml ¶ +2 -6

@@ -1,7 +1,3
1	%h1 New user	1	%h1 New user
2	- = form_tag( {action: 'create'}, { class: 'form-horizontal'}) do	2	+ = simple_form_for @user, url: user_admin_index_path do \|f\|
3	- = render :partial => 'form'	3	+ = render partial: 'form', local: f
4	- .form-group
5	- .col-md-offset-2.col-md-10
6	- = submit_tag "Create", class: 'btn btn-primary'
7	- = link_to 'Back', :action => 'index'

config/routes.rb ¶ +2 -2

                 #logins
                 match 'login/login',  to: 'login#login', via: [:get,:post]
                 resources :contests
                 resources :sites
                 resources :test
                 resources :messages do
                   collection do
                     get 'console'
                   end
                 end
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 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'
                     get 'quick_create'
                     post 'do_manage'
                   end
                 end
                 resources :groups do
                   member do
                     post 'add_user', to: 'groups#add_user', as: 'add_user'
                     delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
                     delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
                     post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
                     delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
                     delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
                   end
                   collection do
                   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'
                     get 'rejudge'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id(/:user_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
                 #user admin
                 resources :user_admin do
                   collection do
                     match 'bulk_manage', via: [:get, :post]
                     get 'bulk_mail'
                     get 'user_stat'
                     get 'import'
                     get 'new_list'
                     get 'admin'
-            -       get 'random_all_passwords'
                     get 'active'
                     get 'mass_mailing'
+            +       post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
-            -       post 'grant_admin'
+            +       match 'random_all_passwords', via: [:get, :post]
                   end
                   member do
                     get 'clear_last_ip'
                   end
                 end
                 resources :contest_management, only: [:index] do
                   collection do
                     get 'user_stat'
                     get 'clear_stat'
                     get 'clear_all_stat'
                   end
                 end
                 #get 'user_admin', to: 'user_admin#index'
                 #get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
                 #post 'user_admin', to: 'user_admin#create'
                 #delete 'user_admin/:id', to: 'user_admin#destroy', as: 'user_admin_destroy'
                 #singular resource
                 #---- BEWARE ---- singular resource maps to plural controller by default, we can override by provide controller name directly
                 #report
                 resource :report, only: [], controller: 'report' do
                   get 'login'
                   get 'multiple_login'
                   get 'problem_hof/:id', action: 'problem_hof'
                   get 'current_score'
                   get 'max_score'
                   post 'show_max_score'
                 end
                 #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'
                 resource :main, only: [], controller: 'main' do
                   get 'list'
                   get 'submission(/:id)', action: 'submission', as: 'main_submission'
                   post 'submit'
                   get 'announcements'
                   get 'help'
                 end
                 #main
                 #get "main/list"
                 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #post 'main/submit', to: 'main#submit'
                 #get 'main/announcements', to: 'main#announcements'
                 #
                 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'
                 # 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

r752:3a8a3897c926 - Fri, 05 Jul 2019 08:54:05 - 6 files changed: 71 inserted, 59 deleted

Sign in to your account

Commit r752:3a8a3897c926 public

Author

r752:3a8a3897c926 - Fri, 05 Jul 2019 08:54:05 - 6 files changed: 71 inserted, 59 deleted

Commit `r752:3a8a3897c926` public