cafe-grader-web Commit - r515:25e5802e70aa

cafe-grader-web

Commit `r515:25e5802e70aa` public

parent | child

Description:

merge

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r515:25e5802e70aa - Tue, 30 Sep 2014 03:51:51 - 7 files changed: 89 inserted, 23 deleted

app/views/report/stuck.html.haml created 644 ¶ +17

@@ -0,0 +1,17
	1	+ %table.info
	2	+ %thead
	3	+ %tr.info-head
	4	+ %th Problem
	5	+ %th User
	6	+ %th tries
	7	+ %tbody
	8	+ - @struggle.each do \|s\|
	9	+ %tr
	10	+ %td
	11	+ = link_to "(#{s[:problem].name})", controller: :problems, action: :stat, id: s[:problem]
	12	+ = s[:problem].full_name
	13	+ %td
	14	+ = link_to "(#{s[:user].login})", controller: :users, action: :profile, id: s[:user]
	15	+ = s[:user].full_name
	16	+ %td
	17	+ = s[:tries]

app/controllers/graders_controller.rb ¶ +1

               class GradersController < ApplicationController
                 before_filter :admin_authorization, except: [ :submission ]
                 before_filter(only: [:submission]) {
                   return false unless authenticate
                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 verify :method => :post, :only => ['clear_all',
                                                    'start_exam',
                                                    'start_grading',
                                                    'stop_all',
                                                    'clear_terminated'],
                        :redirect_to => {:action => 'index'}
                 def index
                   redirect_to :action => 'list'
                 end
                 def list
                   @grader_processes = GraderProcess.find_running_graders
                   @stalled_processes = GraderProcess.find_stalled_process
                   @terminated_processes = GraderProcess.find_terminated_graders
                   @last_task = Task.find(:first,
                                          :order => 'created_at DESC')
                   @last_test_request = TestRequest.find(:first,
                                                         :order => 'created_at DESC')
+            +     @submission = Submission.order("id desc").limit(20)
                 end
                 def clear
                   grader_proc = GraderProcess.find(params[:id])
                   grader_proc.destroy if grader_proc!=nil
                   redirect_to :action => 'list'
                 end
                 def clear_terminated
                   GraderProcess.find_terminated_graders.each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def clear_all
                   GraderProcess.find(:all).each do |p|
                     p.destroy
                   end
                   redirect_to :action => 'list'
                 end
                 def view
                   if params[:type]=='Task'
                     redirect_to :action => 'task', :id => params[:id]
                   else
                     redirect_to :action => 'test_request', :id => params[:id]
                   end
                 end
                 def test_request
                   @test_request = TestRequest.find(params[:id])
                 end
                 def task
                   @task = Task.find(params[:id])
                 end
                 def submission
                   @submission = Submission.find(params[:id])
                   formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true )
                   lexer = case @submission.language.name
                     when "c"      then Rouge::Lexers::C.new
                     when "cpp"    then Rouge::Lexers::Cpp.new
                     when "pas"    then Rouge::Lexers::Pas.new
                     when "ruby"   then Rouge::Lexers::Ruby.new
                     when "python" then Rouge::Lexers::Python.new
                     when "java"   then Rouge::Lexers::Java.new

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

                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @announcements = Announcement.find_for_frontpage
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def help
                   @user = User.find(session[:user_id])
                 end
                 def submit
                   user = User.find(session[:user_id])
                   @submission = Submission.new
                   @submission.problem_id = params[:submission][:problem_id]
                   @submission.user = user
                   @submission.language_id = 0
                   if (params['file']) and (params['file']!='')
-            -       @submission.source = params['file'].read
+            +       @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
+            +       @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
                     @submission.source_filename = params['file'].original_filename
                   end
                   @submission.submitted_at = Time.new.gmtime
                   @submission.ip_address = request.remote_ip
                   if GraderConfiguration.time_limit_mode? and user.contest_finished?
                     @submission.errors.add_to_base "The contest is over."
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   if @submission.valid?
                     if @submission.save == false
               	flash[:notice] = 'Error saving your submission'
                     elsif Task.create(:submission_id => @submission.id,
                                       :status => Task::STATUS_INQUEUE) == false
               	flash[:notice] = 'Error adding your submission to task queue'
                     end
                   else
                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :action => 'list'
                 end
                 def source
                   submission = Submission.find(params[:id])
                   if ((submission.user_id == session[:user_id]) and
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end

app/controllers/report_controller.rb ¶ +25

                       @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
                     end
                     if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
                         !sub.user.admin?
                       @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
                     end
                     if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                       @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
                     end
                   end
                   #process user_id
                   @by_lang.each do |lang,prop|
                     prop.each do |k,v|
                       v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                     end
                   end
                   #sum into best
                   if @by_lang and @by_lang.first
                     @best = @by_lang.first[1].clone
                     @by_lang.each do |lang,prop|
                       if @best[:runtime][:value] >= prop[:runtime][:value]
                         @best[:runtime] = prop[:runtime]
                         @best[:runtime][:lang] = lang
                       end
                       if @best[:memory][:value] >= prop[:memory][:value]
                         @best[:memory] = prop[:memory]
                         @best[:memory][:lang] = lang
                       end
                       if @best[:length][:value] >= prop[:length][:value]
                         @best[:length] = prop[:length]
                         @best[:length][:lang] = lang
                       end
                       if @best[:first][:value] >= prop[:first][:value]
                         @best[:first] = prop[:first]
                         @best[:first][:lang] = lang
                       end
                     end
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = user.count
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
+            +   def stuck #report struggling user,problem
+            +     # init
+            +     user,problem = nil
+            +     solve = true
+            +     tries = 0
+            +     @struggle = Array.new
+            +     record = {}
+            +     Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
+            +       if user != sub.user_id or problem != sub.problem_id
+            +         @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
+            +         record = {user: sub.user, problem: sub.problem}
+            +         user,problem = sub.user_id, sub.problem_id
+            +         solve = false
+            +         tries = 0
+            +       end
+            +       if sub.points >= sub.problem.full_score
+            +         solve = true
+            +       else
+            +         tries += 1
+            +       end
+            +     end
+            +     @struggle.sort!{|a,b| b[:tries] <=> a[:tries] }
+            +     @struggle = @struggle[0..50]
+            +   end
+            +
               end

app/controllers/users_controller.rb ¶ +1

                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                 end
                 def retrieve_password
                   email = params[:email]
                   user = User.find_by_email(email)
                   if user
                     last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
                     if last_updated_time > Time.now.gmtime - 5.minutes
                       flash[:notice] = 'The account has recently created or new password has recently been requested.  Please wait for 5 minutes'
                     else
                       user.password = user.password_confirmation = User.random_password
                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
                 def profile
                   @user = User.find(params[:id])
                   @submission = Submission.includes(:problem).where(user_id: params[:id])
                   range = 120
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   problem = Hash.new(0)
                   @submission.find_each do |sub|
                     #histogram
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     @summary[:count] += 1
+            +       next unless sub.problem
                     problem[sub.problem] = [problem[sub.problem], (sub.points >= sub.problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = problem.count
                   problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   mail_subject = "[#{contest_name}] Confirmation"
                   mail_body = t('registration.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
                                   :admin_email => admin_email
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   mail_subject = "[#{contest_name}] Password recovery"
                   mail_body = t('registration.password_retrieval.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => admin_email
                                 })

app/views/graders/list.html.haml ¶ +42 -21

@@ -1,51 +1,72
1	- content_for :head do	1	- content_for :head do
2	= stylesheet_link_tag 'graders'	2	= stylesheet_link_tag 'graders'
3	<meta http-equiv ="refresh" content="60"/>	3	<meta http-equiv ="refresh" content="60"/>
4		4
5	%h1 Grader information	5	%h1 Grader information
6		6
7	= link_to '[Refresh]', :action => 'list'	7	= link_to '[Refresh]', :action => 'list'
8	%br/	8	%br/
9		9
10	.submitbox	10	.submitbox
11	.item	11	.item
12	Grader control:	12	Grader control:
13	.item	13	.item
14	= form_for :clear, :url => {:action => 'start_grading'} do \|f\|	14	= form_for :clear, :url => {:action => 'start_grading'} do \|f\|
15	= submit_tag 'Start graders in grading env'	15	= submit_tag 'Start graders in grading env'
16	.item	16	.item
17	= form_for :clear, :url => {:action => 'start_exam'} do \|f\|	17	= form_for :clear, :url => {:action => 'start_exam'} do \|f\|
18	= submit_tag 'Start graders in exam env'	18	= submit_tag 'Start graders in exam env'
19	.item	19	.item
20	= form_for :clear, :url => {:action => 'stop_all'} do \|f\|	20	= form_for :clear, :url => {:action => 'stop_all'} do \|f\|
21	= submit_tag 'Stop all running graders'	21	= submit_tag 'Stop all running graders'
22	.item	22	.item
23	= form_for :clear, :url => {:action => 'clear_all'} do \|f\|	23	= form_for :clear, :url => {:action => 'clear_all'} do \|f\|
24	= submit_tag 'Clear all data'	24	= submit_tag 'Clear all data'
25	%br{:style => 'clear:both'}/	25	%br{:style => 'clear:both'}/
26		26
27	- - if @last_task	27	+ %div{style: 'width:500px; float: left;'}
28	- ~~Last task:~~	28	+ - if @last_task
29	- = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'	29	+ Last task:
		30	+ = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
		31	+
		32	+ %br/
		33	+
		34	+ - if @last_test_request
		35	+ Last test_request:
		36	+ = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
		37	+
		38	+ %h2 Current graders
		39	+
		40	+ = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
		41	+
		42	+ %h2 Stalled graders
		43	+
		44	+ = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
		45	+
		46	+ %h2 Terminated graders
30		47
31	- %br/	48	+ = form_for :clear, :url => {:action => 'clear_terminated'} do \|f\|
		49	+ = submit_tag 'Clear data for terminated graders'
32		50
33	- - if @last_test_request	51	+ = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
34	- Last test_request:	52	+ %div{}
35	- = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'	53	+ %h2 Last 20 submissions
		54	+ %table.graders
		55	+ %thead
		56	+ %th ID
		57	+ %th User
		58	+ %th Problem
		59	+ %th Submitted
		60	+ %th Graded
		61	+ %th Result
		62	+ %tbody
		63	+ - @submission.each do \|sub\|
		64	+ %tr.inactive
		65	+ %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
		66	+ %td= sub.try(:user).try(:full_name)
		67	+ %td= sub.try(:problem).try(:full_name)
		68	+ %td= "#{time_ago_in_words(sub.submitted_at)} ago"
		69	+ %td= "#{time_ago_in_words(sub.graded_at)} ago"
		70	+ %td= sub.grader_comment
36		71
37		72
38	- %h2 Current graders
39	-
40	- = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
41	-
42	- %h2 Stalled graders
43	-
44	- = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
45	-
46	- %h2 Terminated graders
47	-
48	- = form_for :clear, :url => {:action => 'clear_terminated'} do \|f\|
49	- = submit_tag 'Clear data for terminated graders'
50	-
51	- = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}

app/views/report/_report_menu.html.haml ¶ +1 -1

               .task-menu
                 Reports
                 %br/
                 = link_to '[Hall of Fame]', :action => 'problem_hof'
-            -   = link_to '[Submission]', :action => 'submission_stat'
+            +   = link_to '[Struggle]', :action => 'stuck'
                 = link_to '[Login]', :action => 'login_stat'

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

r515:25e5802e70aa - Tue, 30 Sep 2014 03:51:51 - 7 files changed: 89 inserted, 23 deleted

Sign in to your account

Commit r515:25e5802e70aa public

Author

r515:25e5802e70aa - Tue, 30 Sep 2014 03:51:51 - 7 files changed: 89 inserted, 23 deleted

Commit `r515:25e5802e70aa` public