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: 105 inserted, 24 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 ¶ +5

               require 'csv'
               class ReportController < ApplicationController
                 before_action :check_valid_login
                 before_action :admin_authorization, only: [:login_stat,:submission_stat, :stuck, :cheat_report, :cheat_scruntinize, :show_max_score, :current_score]
                 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
+            +     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
                 def show_max_score
                   #process parameters
                   #problems
                   @problems = []
                   if params[:problem_id]
                     params[:problem_id].each do |id|
                       next unless id.strip != ""
                       pid = Problem.find_by_id(id.to_i)
                       @problems << pid if pid
                     end
                   end
                   #users
                   @users = if params[:users] == "all" then
                              User.includes(:contests).includes(:contest_stat)
                            else
                              User.includes(:contests).includes(:contest_stat).where(enabled: true)
                            end
                   #set up range from param
                   @since_id = params.fetch(:from_id, 0).to_i
                   @until_id = params.fetch(:to_id, 0).to_i
                   @since_id = nil if @since_id == 0
                   @until_id = nil if @until_id == 0
                   #calculate the routine
                   @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
                   #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 'max_score'
                   end

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

               class TasksController < ApplicationController
                 before_action :check_valid_login, :check_viewability
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @problems = @user.available_problems
                 end
                 # this has contest-wide access control
                 def view
                   base_name = params[:file]
                   base_filename = File.basename("#{base_name}.#{params[:ext]}")
                   filename = "#{Problem.download_file_basedir}/#{base_filename}"
                   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
                   else
                     if params[:ext]=='pdf'
                       content_type = 'application/pdf'
                     else
                       content_type = 'application/octet-stream'
                     end
                     send_file filename, :stream => false, :disposition => 'inline', :filename => base_filename, :type => content_type
                   end
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if @user==nil or !GraderConfiguration.show_tasks_to?(@user)
                     redirect_to :controller => 'main', :action => 'list'
                     return false
                   end
                 end
               end

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

                     @users = User.paginate :page => params[:page]
                     @paginated = true
                   end
                   @users = User.all
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
                   @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.where("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(user_params)
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'User was successfully created.'
                     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: '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(" ")
                       else
                         password = random_password
                         add_random_password=true;
                       end
                       if items.length>= 4 and items[3].chomp(" ").length > 0;
                         user_alias = items[3].chomp(" ")
                       else
                         user_alias = login
                       end
                       if items.length>=5
                         remark = items[4].strip;
                       end
                       user = User.find_by_login(login)
                       if (user)
                         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 user.save
                         if added_random_password
                           note << "'#{login}' (+)"
                         else
                           note << login
                         end
+            +           ok_user << user
+            +         else
+            +           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
                   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'

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
               end

app/models/user.rb ¶ +5

                   end
                 end
                 def problem_in_user_contests?(problem)
                   problem_contests = problem.contests.all
                   if problem_contests.length == 0   # this is public contest
                     return true
                   end
                   contests.each do |contest|
                     if problem_contests.find {|c| c.id == contest.id }
                       return true
                     end
                   end
                   return false
                 end
                 def available_problems_group_by_contests
                   contest_problems = []
                   pin = {}
                   contests.enabled.each do |contest|
                     available_problems = contest.problems.available
                     contest_problems << {
                       :contest => contest,
                       :problems => available_problems
                     }
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
                 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
                   end
                 end
                 def available_problems_in_group
                   problem = []
                   self.groups.each do |group|
                     group.problems.where(available: true).each { |p| problem << p }
                   end
                   problem.uniq!
                   if problem
                     problem.sort! do |a,b|
                       case
                       when a.date_added < b.date_added
                       when a.date_added > b.date_added
                         -1
                       else
                         a.name <=> b.name
                       end
                     end
                     return problem
                   else
                     return []
                   end
                 end
                 def can_view_problem?(problem)
                   return true if admin?
                   return available_problems.include? problem
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end
                 protected

app/views/groups/show.html.haml ¶ +17 -10

-            - %p
+            + .container-fluid
-            -   %b Name:
+            +   .row
-            -   = @group.name
+            +     .col-md-6
-            - %p
+            +       %h1 Group #{@group.name}
+            +   .row
+            +     .col-md-6
                     %b Description:
                     = @group.description
                     %br
-            - = link_to 'Edit', edit_group_path(@group)
+            +       = link_to 'Edit', edit_group_path(@group), class: 'btn btn-primary'
-            - \|
-            - = link_to 'Back', groups_path
                 .row
                   .col-md-12
                     %h1 Group details
                 .row
                   .col-md-6
                     .panel.panel-default
                       .panel-heading
                         .panel-title Users in this group
                       .panel-body
+            +           %ul
+            +             %li
+            +               If you want to add several users to a group, it may be easier to just re-import those users in
+            +               = link_to 'New list of users', new_list_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'
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr
                               %th Login
                               %th Full name
                               %th Remark
                               %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'
                           %tbody
                             - @group.users.each do |user|
                               %tr
                                 %td= user.login
                                 %td= user.full_name
                                 %td= user.remark
                                 %td= link_to 'Remove', remove_user_group_path(@group,user), :method => :delete, :data => { :confirm => "Remove #{user.full_name}?" }, class: 'btn btn-danger btn-sm'
                   .col-md-6
                     .panel.panel-default
                       .panel-heading
                         .panel-title Problems
                       .panel-body
+            +           %ul
+            +             %li
+            +               If you want to add several problem to a group, it may be easier to bulk manage them in the
+            +               = link_to 'Bulk Manage', 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'
                           =submit_tag "Add",class: 'btn btn-primary'
                         %table.table.table-hover
                           %thead
                             %tr
                               %th name
                               %th Full name
                               %th Full score
                               %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'
                           %tbody
                             - @group.problems.each do |problem|
                               %tr
                                 %td= problem.name
                                 %td= problem.full_name
                                 %td= problem.full_score
                                 %td= link_to 'Remove', remove_problem_group_path(@group,problem), :method => :delete, :data => { :confirm => "Remove #{problem.full_name}?" }, class: 'btn btn-danger btn-sm'

app/views/report/current_score.html.haml ¶ +8

@@ -1,3 +1,11
		1	+ .container-fluid
1	%h1 Current Score	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'
		7	+
		8	+ %br
		9	+
2		10
3	= render "score_table"	11	= render "score_table"

config/routes.rb ¶ +1 -1

                     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 'active'
                     get 'mass_mailing'
                     get 'revoke_admin'
                     post 'grant_admin'
                     match 'create_from_list', via: [:get, :post]
                     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'
                     get 'change_contest_mode'
                   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 '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'
                   get 'list'
                   get 'submission(/:id)', action: 'submission', as: 'main_submission'
                   get 'announcements'
                   get 'help'
                   post 'submit'
                 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'
                 namespace :graders do
                   get 'task/:id/:type', action: 'task', as: 'task'
                   get 'view/:id/:type', action: 'view', as: 'view'
                   get 'clear/:id', action: 'clear', as: 'clear'
                   get 'stop'
                   get 'stop_all'
                   get 'clear_all'
                   get 'clear_terminated'
                   get 'start_grading'
                   get 'start_exam'
                 end
                 # See how all your routes lay out with "rake routes"

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: 105 inserted, 24 deleted

Sign in to your account

Commit r762:c6677423b846 public

Author

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

Commit `r762:c6677423b846` public