cafe-grader-web Commit - r762:c6677423b846

cafe-grader-web

Commit `r762:c6677423b846` public

parent | child

Description:

add current score by group

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

r762:c6677423b846 - Mon, 07 Oct 2019 13:32:43 - 10 files changed: 165 inserted, 84 deleted

app/views/user_admin/new_list.html.haml created 644 ¶ +45

@@ -0,0 +1,45
	1	+ .container-fluid
	2	+ .row
	3	+ .col-md-6
	4	+ %h1 Adding list of users
	5	+ .row
	6	+ .col-md-6
	7	+ .panel.panel-default
	8	+ .panel-heading
	9	+ .panel-title Info
	10	+ .panel-body
	11	+ %ul
	12	+ %li
	13	+ List of user information in this format:
	14	+ %tt user_id,name(,passwd(,alias(,remark)))
	15	+ %li
	16	+ Note that
	17	+ %tt passwd, alias
	18	+ and
	19	+ %tt remark
	20	+ is optional.
	21	+ %li
	22	+ When
	23	+ %tt passwd
	24	+ or
	25	+ %tt alias
	26	+ is empty, the original value will be used instead.
	27	+ %li
	28	+ If the users with the same user_id already exists, existing information will be overwritten.
	29	+
	30	+ .row
	31	+ .col-md-6
	32	+ = form_tag :action => 'create_from_list' do
	33	+ .form-group
	34	+ = submit_tag 'Create following users',class: 'btn btn-success'
	35	+ .form-group
	36	+ .div.checkbox
	37	+ %label
	38	+ = check_box_tag :add_to_group
	39	+ Also add these users to the following group
	40	+ = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
	41	+ .form-group
	42	+ = text_area_tag 'user_list', nil, :rows => 50, :cols => 80
	43	+ .col-md-6
	44	+
	45	+

app/controllers/report_controller.rb ¶ +6 -1

                 before_action(only: [:problem_hof]) { |c|
                   return false unless check_valid_login
                   admin_authorization unless GraderConfiguration["right.user_view_submission"]
                 }
                 def max_score
                 end
                 def current_score
                   @problems = Problem.available_problems
-            -     @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
+            +     if params[:group_id]
+            +       @group = Group.find(params[:group_id])
+            +       @users = @group.users.where(enabled: true)
+            +     else
+            +       @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
+            +     end
                   @scorearray = calculate_max_score(@problems, @users,0,0,true)
                   #rencer accordingly
                   if params[:button] == 'download' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'max_score.csv'
                   else
                     #render template: 'user_admin/user_stat'
                     render 'current_score'
                   end
                 end

app/controllers/tasks_controller.rb ¶ +2 -3

                   if !FileTest.exists?(filename)
                     redirect_to :action => 'index' and return
                   end
                   send_file_to_user(filename, base_filename)
                 end
                 # this has problem-level access control
                 def download
                   problem = Problem.find(params[:id])
                   unless @current_user.can_view_problem? problem
+            +       flash[:notice] = 'You are not authorized to access this file'
                     redirect_to :action => 'index' and return
                   end
                   base_name = params[:file]
                   base_filename = File.basename("#{base_name}.#{params[:ext]}")
                   filename = "#{Problem.download_file_basedir}/#{params[:id]}/#{base_filename}"
-            -     puts "SENDING: #{filename}"
                   if !FileTest.exists?(filename)
+            +       flash[:notice] = 'File does not exists'
                     redirect_to :action => 'index' and return
                   end
-            -     puts "SENDING: #{filename}"
                   send_file_to_user(filename, base_filename)
                 end
                 protected
                 def send_file_to_user(filename, base_filename)
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
                     response.headers["X-Sendfile"] = filename
                     response.headers['Content-length'] = File.size(filename)
                     render :nothing => true

app/controllers/user_admin_controller.rb ¶ +24 -4

                 def clear_last_ip
                   @user = User.find(params[:id])
                   @user.last_ip = nil
                   @user.save
                   redirect_to action: 'index', page: params[:page]
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
+            +     error_note = []
+            +     ok_user = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       remark =''
                       user_alias = ''
                       added_random_password = false
                       if items.length >= 3 and items[2].chomp(" ").length > 0;
                         password = items[2].chomp(" ")
                         user.full_name = full_name
                         user.password = password
                         user.remark = remark
                       else
                         user = User.new({:login => login,
                                           :full_name => full_name,
                                           :password => password,
                                           :password_confirmation => password,
                                           :alias => user_alias,
                                           :remark => remark})
                       end
                       user.activated = true
-            -         user.save
-            -         if added_random_password
+            +         if user.save
-            -           note << "'#{login}' (+)"
+            +           if added_random_password
+            +             note << "'#{login}' (+)"
+            +           else
+            +             note << login
+            +           end
+            +           ok_user << user
                       else
-            -           note << login
+            +           error_note << "#{login}"
                       end
+            +
                     end
                   end
+            +
+            +     #add to group
+            +     if params[:add_to_group]
+            +       group = Group.where(id: params[:group_id]).first
+            +       if group
+            +         group.users << ok_user
+            +       end
+            +     end
+            +
+            +     # show flash
                   flash[:success] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
+            +     if error_note.size > 0
+            +       flash[:error] = "Following user(s) failed to be created: " + error_note.join(', ')
+            +     end
                   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

app/helpers/main_helper.rb ¶ +1

               module MainHelper
                 def link_to_description_if_any(name, problem, options={})
                   if !problem.url.blank?
                     return link_to name, problem.url, options
                   elsif !problem.description_filename.blank?
+            +       #build a link to a problem (via task controller)
                     basename, ext = problem.description_filename.split('.')
                     options[:controller] = 'tasks'
                     options[:action] = 'download'
                     options[:id] = problem.id
                     options[:file] = basename
                     options[:ext] = ext
                     return link_to name, options
                   else
                     return ''
                   end
                 end

app/models/user.rb ¶ +5

                 def solve_all_available_problems?
                   available_problems.each do |p|
                     u = self
                     sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                     return false if !p or !sub or sub.points < p.full_score
                   end
                   return true
                 end
                 #get a list of available problem
                 def available_problems
+            +     # first, we check if this is normal mode
                   if not GraderConfiguration.multicontests?
+            +
+            +       #if this is a normal mode
+            +       #we show problem based on problem_group, if the config said so
                     if GraderConfiguration.use_problem_group?
                       return available_problems_in_group
                     else
                       return Problem.available_problems
                     end
                   else
+            +       #this is multi contest mode
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems

app/views/groups/show.html.haml ¶ +71 -64

@@ -1,73 +1,80
1	- %p	1	+ .container-fluid
2	- %b Name:	2	+ .row
3	- = @group.name	3	+ .col-md-6
4	- %p	4	+ %h1 Group #{@group.name}
5	- %b Description:	5	+ .row
6	- = @group.description	6	+ .col-md-6
7	-	7	+ %b Description:
8	- %br	8	+ = @group.description
9	- = link_to 'Edit', edit_group_path(@group)	9	+ %br
10	- \\|	10	+ = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'
11	- = link_to 'Back', groups_path	11	+ .row
12	-	12	+ .col-md-12
13	- .row	13	+ %h1 Group details
14	- .col-md-12	14	+ .row
15	- %h1 Group details	15	+ .col-md-6
16	- .row	16	+ .panel.panel-default
17	- .col-md-6	17	+ .panel-heading
18	- .panel.panel-default	18	+ .panel-title Users in this group
19	- .panel-~~heading~~	19	+ .panel-body
20	- .panel-title Users in this group	20	+ %ul
21	- .panel-body	21	+ %li
22	- =form_tag add_user_group_path(@group), class: 'form-inline' do	22	+ If you want to add several users to a group, it may be easier to just re-import those users in
23	- .form-group	23	+ = link_to 'New list of users', new_list_user_admin_index_path
24	- =label_tag :user_id, "User"	24	+ page
25	- =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2'	25	+ =form_tag add_user_group_path(@group), class: 'form-inline' do
26	- =submit_tag "Add",class: 'btn btn-primary'	26	+ .form-group
		27	+ =label_tag :user_id, "User"
		28	+ =select_tag :user_id, options_from_collection_for_select(User.all,'id','full_name'), class: 'select2'
		29	+ =submit_tag "Add",class: 'btn btn-primary'
27		30
28		31
29	- %table.table.table-hover	32	+ %table.table.table-hover
30	- %thead	33	+ %thead
31	- %tr
32	- %th Login
33	- %th Full name
34	- %th Remark
35	- %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'
36	-
37	- %tbody
38	- - @group.users.each do \|user\|
39	%tr	34	%tr
40	- %td= ~~user~~.login	35	+ %th Login
41	- %td= ~~user~~.~~full_~~name	36	+ %th Full name
42	- %td= ~~user~~.remark	37	+ %th Remark
43	- %td= link_to 'Remove', remove_user_group_path(@group,~~user~~), :method => :delete, :data => { :confirm => "Remove #{~~user~~.~~full_name~~}?" }, class: 'btn btn-danger btn-sm'	38	+ %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'
44	- .col-md-6
45	- .panel.panel-default
46	- .panel-heading
47	- .panel-title Problems
48	- .panel-body
49		39
50	- =form_tag add_problem_group_path(@group), class: 'form-inline' do	40	+ %tbody
51	- .form-group	41	+ - @group.users.each do \|user\|
52	- =label_tag :problem_id, "Problem"	42	+ %tr
53	- =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2'	43	+ %td= user.login
54	- =submit_tag "Add",class: 'btn btn-primary'	44	+ %td= user.full_name
		45	+ %td= user.remark
		46	+ %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger btn-sm'
		47	+ .col-md-6
		48	+ .panel.panel-default
		49	+ .panel-heading
		50	+ .panel-title Problems
		51	+ .panel-body
		52	+ %ul
		53	+ %li
		54	+ If you want to add several problem to a group, it may be easier to bulk manage them in the
		55	+ = link_to 'Bulk Manage', manage_problems_path
		56	+ page
		57	+ =form_tag add_problem_group_path(@group), class: 'form-inline' do
		58	+ .form-group
		59	+ =label_tag :problem_id, "Problem"
		60	+ =select_tag :problem_id, options_from_collection_for_select(Problem.all,'id','full_name'), class: 'select2'
		61	+ =submit_tag "Add",class: 'btn btn-primary'
55		62
56		63
57	- %table.table.table-hover	64	+ %table.table.table-hover
58	- %thead	65	+ %thead
59	- %tr	66	+ %tr
60	- %th name	67	+ %th name
61	- %th Full name	68	+ %th Full name
62	- %th Full score	69	+ %th Full score
63	- %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'	70	+ %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'
64		71
65	- %tbody	72	+ %tbody
66	- - @group.problems.each do \|problem\|	73	+ - @group.problems.each do \|problem\|
67	- %tr	74	+ %tr
68	- %td= problem.name	75	+ %td= problem.name
69	- %td= problem.full_name	76	+ %td= problem.full_name
70	- %td= problem.full_score	77	+ %td= problem.full_score
71	- %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger btn-sm'	78	+ %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger btn-sm'
72		79
73		80

app/views/report/current_score.html.haml ¶ +10 -2

@@ -1,3 +1,11
1	- %h1 Current Score	1	+ .container-fluid
		2	+ %h1 Current Score
		3	+ = form_tag current_score_report_path, method: 'get' do
		4	+ Show only users from this group
		5	+ = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
		6	+ = submit_tag 'Apply',class: 'btn btn-default'
2		7
3	- = render "score_table"	8	+ %br
		9	+
		10	+
		11	+ = render "score_table"

config/routes.rb ¶ +1 -1

                 #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 'current_score(/:group_id)', action: 'current_score', as: '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 'login'
                   get 'logout'

app/views/user_admin/new_list.html.erb removed ¶ -9

deleted file

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

r762:c6677423b846 - Mon, 07 Oct 2019 13:32:43 - 10 files changed: 165 inserted, 84 deleted

Sign in to your account

Commit r762:c6677423b846 public

Author

r762:c6677423b846 - Mon, 07 Oct 2019 13:32:43 - 10 files changed: 165 inserted, 84 deleted

Commit `r762:c6677423b846` public