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: 69 inserted, 3 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

                 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

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

                 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?

app/controllers/report_controller.rb ¶ +25

@@ -179,13 +179,38
179	if @best[:first][:value] >= prop[:first][:value]	179	if @best[:first][:value] >= prop[:first][:value]
180	@best[:first] = prop[:first]	180	@best[:first] = prop[:first]
181	@best[:first][:lang] = lang	181	@best[:first][:lang] = lang
182	end	182	end
183	end	183	end
184	end	184	end
185		185
186	@histogram[:summary][:max] = [@histogram[:data].max,1].max	186	@histogram[:summary][:max] = [@histogram[:data].max,1].max
187	@summary[:attempt] = user.count	187	@summary[:attempt] = user.count
188	user.each_value { \|v\| @summary[:solve] += 1 if v == 1 }	188	user.each_value { \|v\| @summary[:solve] += 1 if v == 1 }
189	end	189	end
190		190
		191	+ def stuck #report struggling user,problem
		192	+ # init
		193	+ user,problem = nil
		194	+ solve = true
		195	+ tries = 0
		196	+ @struggle = Array.new
		197	+ record = {}
		198	+ Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do \|sub\|
		199	+ if user != sub.user_id or problem != sub.problem_id
		200	+ @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
		201	+ record = {user: sub.user, problem: sub.problem}
		202	+ user,problem = sub.user_id, sub.problem_id
		203	+ solve = false
		204	+ tries = 0
191	end	205	end
		206	+ if sub.points >= sub.problem.full_score
		207	+ solve = true
		208	+ else
		209	+ tries += 1
		210	+ end
		211	+ end
		212	+ @struggle.sort!{\|a,b\| b[:tries] <=> a[:tries] }
		213	+ @struggle = @struggle[0..50]
		214	+ end
		215	+
		216	+ end

app/controllers/users_controller.rb ¶ +1

                   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']

app/views/graders/list.html.haml ¶ +22 -1

                     = submit_tag 'Start graders in grading env'
                 .item
                   = form_for :clear, :url => {:action => 'start_exam'} do |f|
                     = submit_tag 'Start graders in exam env'
                 .item
                   = form_for :clear, :url => {:action => 'stop_all'} do |f|
                     = submit_tag 'Stop all running graders'
                 .item
                   = form_for :clear, :url => {:action => 'clear_all'} do |f|
                     = submit_tag 'Clear all data'
                 %br{:style => 'clear:both'}/
+            + %div{style: 'width:500px; float: left;'}
                 - if @last_task
                   Last task:
                   = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
                   %br/
                 - if @last_test_request
                   Last test_request:
                   = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
                 %h2 Current graders
                 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
                 %h2 Stalled graders
                 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
                 %h2 Terminated graders
                 = form_for :clear, :url => {:action => 'clear_terminated'} do |f|
                   = submit_tag 'Clear data for terminated graders'
                 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
+            + %div{}
+            +   %h2 Last 20 submissions
+            +   %table.graders
+            +     %thead
+            +       %th ID
+            +       %th User
+            +       %th Problem
+            +       %th Submitted
+            +       %th Graded
+            +       %th Result
+            +     %tbody
+            +       - @submission.each do |sub|
+            +         %tr.inactive
+            +           %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
+            +           %td= sub.try(:user).try(:full_name)
+            +           %td= sub.try(:problem).try(:full_name)
+            +           %td= "#{time_ago_in_words(sub.submitted_at)} ago"
+            +           %td= "#{time_ago_in_words(sub.graded_at)} ago"
+            +           %td= sub.grader_comment
+            +
+            +

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: 69 inserted, 3 deleted

Sign in to your account

Commit r515:25e5802e70aa public

Author

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

Commit `r515:25e5802e70aa` public