cafe-grader-web Commit - r105:0ea7f18fc18a

r105:0ea7f18fc18a - Sat, 03 May 2008 14:06:23 - 14 files changed: 149 inserted, 20 deleted

app/views/graders/submission.html.haml created 644 ¶ +22

@@ -0,0 +1,22
	1	+ %h1= "Submission: #{@submission.id}"
	2	+
	3	+ %p
	4	+ User:
	5	+ = "#{@submission.user.login}"
	6	+ %br/
	7	+ Problem:
	8	+ - if @submission.problem!=nil
	9	+ = "#{@submission.problem.full_name}"
	10	+ - else
	11	+ = "(n/a)"
	12	+ %br/
	13	+ = "Number: #{@submission.number}"
	14	+ %br/
	15	+ = "Submitted at: #{format_short_time(@submission.submitted_at)}"
	16	+
	17	+ %b Source code (first 10kb)
	18	+ %div{:style => "border: 1px solid black; background: lightgrey"}
	19	+ - if @submission.source
	20	+ %pre
	21	+ = truncate(@submission.source,10240)
	22	+

app/views/graders/task.html.haml created 644 ¶ +15

@@ -0,0 +1,15
	1	+ %h1= "Task: #{@task.id}"
	2	+
	3	+ %p
	4	+ User:
	5	+ = "#{@task.submission.user.login}"
	6	+ %br/
	7	+ Status:
	8	+ = "#{@task.status_str} (at #{format_short_time(@task.updated_at)})"
	9	+ %br/
	10	+ = "Submission: #{@task.submission_id}"
	11	+ - if @task.submission !=nil
	12	+ = link_to '[view submission]', :action => 'submission', :id => @task.submission.id
	13	+ %br/
	14	+ = "Submitted at: #{format_short_time(@task.created_at)}"
	15	+ %br/

app/views/graders/test_request.html.haml created 644 ¶ +40

@@ -0,0 +1,40
	1	+ %h1= "Test Request: #{@test_request.id}"
	2	+
	3	+ %p
	4	+ User:
	5	+ = "#{@test_request.user.login}"
	6	+ %br/
	7	+ Problem:
	8	+ - if @test_request.problem!=nil
	9	+ = "#{@test_request.problem.full_name}"
	10	+ - else
	11	+ = "(n/a)"
	12	+ %br/
	13	+ = "Submission: #{@test_request.submission.number}"
	14	+ = link_to '[view submission]', :action => 'submission', :id => @test_request.submission.id
	15	+ %br/
	16	+ = "Test submitted at: #{format_short_time(@test_request.submitted_at)}"
	17	+ %br/
	18	+ = "Execution time: #{@test_request.running_time} s."
	19	+ %br/
	20	+ = "Memory usage: #{@test_request.memory_usage}kb"
	21	+ %br/
	22	+ %b= @test_request.exit_status
	23	+ %br/
	24	+
	25	+ - if @test_request.compiler_message!=nil and @test_request.compiler_message!=''
	26	+ %b Compiler Message
	27	+ %div{:style => "border: 1px solid black; background: lightgrey"}
	28	+ = simple_format(truncate((@test_request.compiler_message or ''),200))
	29	+
	30	+ %b Input (first 2kb)
	31	+ %div{:style => "border: 1px solid black; background: lightgrey"}
	32	+ - if @test_request.input_file_name!=nil
	33	+ = simple_format(read_textfile(@test_request.input_file_name,2048))
	34	+
	35	+ %b Output (first 2kb)
	36	+ %div{:style => "border: 1px solid black; background: lightgrey"}
	37	+ - if @test_request.output_file_name!=nil
	38	+ = simple_format(read_textfile(@test_request.output_file_name,2048))
	39	+ - else
	40	+ (no output)

db/migrate/033_add_task_type_to_grader_processes.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddTaskTypeToGraderProcesses < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column 'grader_processes', 'task_type', :string
	4	+ end
	5	+
	6	+ def self.down
	7	+ remove_column 'grader_processes', 'task_type'
	8	+ end
	9	+ end

app/controllers/graders_controller.rb ¶ +35 -2

@@ -1,7 +1,13
1	class GradersController < ApplicationController	1	class GradersController < ApplicationController
2		2
3	-	3	+ before_filter :admin_authorization
4	- before_filter :authorization	4	+
		5	+ verify :method => :post, :only => ['clear_all'],
		6	+ :redirect_to => {:action => 'index'}
		7	+
		8	+ def index
		9	+ redirect_to :action => 'list'
		10	+ end
5		11
6	def list	12	def list
7	@grader_processes = GraderProcess.find(:all,	13	@grader_processes = GraderProcess.find(:all,
@@ -15,4 +21,31
15	redirect_to :action => 'list'	21	redirect_to :action => 'list'
16	end	22	end
17		23
		24	+ def clear_all
		25	+ GraderProcess.find(:all).each do \|p\|
		26	+ p.destroy
		27	+ end
		28	+ redirect_to :action => 'list'
		29	+ end
		30	+
		31	+ def view
		32	+ if params[:type]=='Task'
		33	+ redirect_to :action => 'task', :id => params[:id]
		34	+ else
		35	+ redirect_to :action => 'test_request', :id => params[:id]
		36	+ end
		37	+ end
		38	+
		39	+ def test_request
		40	+ @test_request = TestRequest.find(params[:id])
		41	+ end
		42	+
		43	+ def task
		44	+ @task = Task.find(params[:id])
		45	+ end
		46	+
		47	+ def submission
		48	+ @submission = Submission.find(params[:id])
		49	+ end
		50	+
18	end	51	end

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

               class UserAdminController < ApplicationController
-            -   before_filter :authenticate, :authorization
+            +   before_filter :admin_authorization
                 def index
                   list

app/helpers/application_helper.rb ¶ +9 -1

                     append_to menu_items, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
                     append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
-            -       #append_to menu_items, '[Graders]', 'graders', 'list'
+            +       append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Site config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
               TITLEBAR
                 end
+            +   def read_textfile(fname,max_size=2048)
+            +     begin
+            +       File.open(fname).read(max_size)
+            +     rescue
+            +       nil
+            +     end
+            +   end
+            +
               end

app/helpers/test_helper.rb ¶ -9

@@ -1,11 +1,2
1	module TestHelper	1	module TestHelper
2	-
3	- def read_textfile(fname,max_size=2048)
4	- begin
5	- File.open(fname).read(max_size)
6	- rescue
7	- nil
8	- end
9	- end
10	-
11	end	2	end

app/models/grader_process.rb ¶ +5 -4

               class GraderProcess < ActiveRecord::Base
-            -   belongs_to :task
                 def self.find_by_host_and_pid(host,pid)
                   return GraderProcess.find(:first,
                                             :conditions => {
                     grader.mode = mode
                     grader.active = nil
                     grader.task_id = nil
+            +       grader.task_type = nil
                     grader.save
                   else
                     grader = GraderProcess.create(:host => host,
                 def report_active(task=nil)
                   self.active = true
-            -     self.task = task
+            +     self.task_id = task.id
+            +     self.task_type = task.class.to_s
                   self.save
                 end
                 def report_inactive()
                   self.active = false
-            -     self.task = nil
+            +     self.task_id = nil
+            +     self.task_type = nil
                   self.save
                 end

app/models/task.rb ¶ +2

               class Task < ActiveRecord::Base
+            +   belongs_to :submission
+            +
                 STATUS_GRADING = 0
                 STATUS_INQUEUE = 1
                 STATUS_COMPLETE = 2

app/views/graders/_grader.html.haml ¶ +4 -2

               %td= grader.host
               %td= grader.pid
+            + %td= grader.mode
               %td= grader.updated_at.strftime("%H:%M:%S") if grader.updated_at!=nil
+            + %td= grader.task_type
               %td
                 - if grader.task_id==nil
-            -     \-
+            +     idle
                 - else
-            -     = grader.task_id
+            +     = link_to "#{grader.task_id}", :action => 'view', :id => grader.task_id, :type => grader.task_type

app/views/graders/_grader_list.html.haml ¶ +2

                 %tr
                   %th host
                   %th pid
+            +     %th mode
                   %th last updated
+            +     %th type
                   %th task
                 - grader_list.each do |grader|
                   - if grader.active

app/views/graders/list.html.haml ¶ +3

               %h2 (Under Experiments)
+            + - form_for :clear, nil, :url => {:action => 'clear_all'} do |f|
+            +   = submit_tag 'Clear all data'
+            +
               %h3 Current graders
               = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}

db/schema.rb ¶ +2 -1

               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 32) do
+            + ActiveRecord::Schema.define(:version => 33) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
+            +     t.string   "task_type"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"

	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

r105:0ea7f18fc18a - Sat, 03 May 2008 14:06:23 - 14 files changed: 149 inserted, 20 deleted

Sign in to your account

Commit r105:0ea7f18fc18a public

Author

r105:0ea7f18fc18a - Sat, 03 May 2008 14:06:23 - 14 files changed: 149 inserted, 20 deleted

Commit `r105:0ea7f18fc18a` public