cafe-grader-web Commit - r32:b72d6a6d5e32

cafe-grader-web

Commit `r32:b72d6a6d5e32` public

parent | child

Description:

add grader list git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@57 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r32:b72d6a6d5e32 - Thu, 21 Feb 2008 02:43:46 - 9 files changed: 115 inserted, 6 deleted

app/views/graders/_grader.html.haml created 644 ¶ +9

@@ -0,0 +1,9
	1	+
	2	+ %td= grader.ip
	3	+ %td= grader.pid
	4	+ %td= grader.updated_at.strftime("%H:%M:%S") if grader.updated_at!=nil
	5	+ %td
	6	+ - if grader.task_id==nil
	7	+ \-
	8	+ - else
	9	+ = grader.task_id

app/views/graders/_grader_list.html.haml created 644 ¶ +16

@@ -0,0 +1,16
	1	+
	2	+ %table.graders
	3	+ %tr
	4	+ %th ip
	5	+ %th pid
	6	+ %th last updated
	7	+ %th task
	8	+ - grader_list.each do \|grader\|
	9	+ - if grader.active
	10	+ - c = 'active'
	11	+ - else
	12	+ - c = 'inactive'
	13	+ %tr{:class => c}
	14	+ = render :partial => 'grader', :locals => {:grader => grader}
	15	+ %td= link_to 'clear', {:action => 'clear', :id => grader}
	16	+

app/views/graders/list.html.haml created 644 ¶ +10

@@ -0,0 +1,10
	1	+ - content_for :head do
	2	+ = stylesheet_link_tag 'graders'
	3	+
	4	+ %h3 Current graders
	5	+
	6	+ = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
	7	+
	8	+ %h3 Stalled graders
	9	+
	10	+ = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}

db/migrate/016_add_task_to_grader_process.rb created 644 ¶ +9

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

public/stylesheets/graders.css created 644 ¶ +12

@@ -0,0 +1,12
	1	+
	2	+ table.graders tr.active {
	3	+ border: 1px solid black;
	4	+ background: lightgreen;
	5	+ text-align: center;
	6	+ }
	7	+
	8	+ table.graders tr.inactive {
	9	+ border: 1px solid black;
	10	+ background: #ffcccc;
	11	+ text-align: center;
	12	+ } No newline at end of file

app/controllers/graders_controller.rb ¶ +16

@@ -1,2 +1,18
1	class GradersController < ApplicationController	1	class GradersController < ApplicationController
		2	+
		3	+
		4	+ before_filter :authenticate
		5	+
		6	+ def list
		7	+ @grader_processes = GraderProcess.find(:all,
		8	+ :order => 'updated_at desc')
		9	+ @stalled_processes = GraderProcess.find_stalled_process
		10	+ end
		11	+
		12	+ def clear
		13	+ grader_proc = GraderProcess.find(params[:id])
		14	+ grader_proc.destroy if grader_proc!=nil
		15	+ redirect_to :action => 'list'
		16	+ end
		17	+
2	end	18	end

app/controllers/main_controller.rb ¶ +4 -3

                 end
                 def login
                   reset_session
                   render :action => 'login', :layout => 'empty'
                 end
                 def list
                   prepare_list_information
                 end
                 def submit
                   @submission = Submission.new(params[:submission])
                   @submission.user_id = session[:user_id]
                   @submission.language_id = 0
                   @submission.source = params['file'].read if params['file']!=''
                   @submission.submitted_at = Time.new
                   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'
-            -     prepare_list_information
-            -     render :action => 'list'
                 end
                 def get_source
                   submission = Submission.find(params[:id])
                   if submission.user_id == session[:user_id]
                     fname = submission.problem.name + '.' + submission.language.ext
                     send_data(submission.source,
               		{:filename => fname,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                   end
                 end
                 protected
                 def prepare_list_information
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
                     @prob_submissions << [c,sub]
                   end
                 end

app/models/grader_process.rb ¶ +37 -2

@@ -1,17 +1,52
1	class GraderProcess < ActiveRecord::Base	1	class GraderProcess < ActiveRecord::Base
2		2
		3	+ belongs_to :task
		4	+
3	def self.find_by_ip_and_pid(ip,pid)	5	def self.find_by_ip_and_pid(ip,pid)
4	return GraderProcess.find(:first,	6	return GraderProcess.find(:first,
5	:conditions => {	7	:conditions => {
6	:ip => ip,	8	:ip => ip,
7	:pid => pid	9	:pid => pid
8	})	10	})
9	end	11	end
10		12
11	- def self.re~~port_active~~(ip,pid,mode)	13	+ def self.register(ip,pid,mode)
		14	+ grader = GraderProcess.find_by_ip_and_pid(ip,pid)
		15	+ if grader
		16	+ grader.mode = mode
		17	+ grader.active = nil
		18	+ grader.task_id = nil
		19	+ grader.save
		20	+ else
		21	+ grader = GraderProcess.create(:ip => ip,
		22	+ :pid => pid,
		23	+ :mode => mode)
		24	+ end
		25	+ grader
		26	+ end
		27	+
		28	+ def self.find_stalled_process()
		29	+ GraderProcess.find(:all,
		30	+ :conditions => ["active AND updated_at < ?",
		31	+ Time.now.gmtime - GraderProcess.stalled_time])
		32	+ end
		33	+
		34	+ def report_active(task=nil)
		35	+ self.active = true
		36	+ self.task = task
		37	+ self.save
12	end	38	end
13		39
14	- def ~~self~~.report_inactive(ip,~~pid~~,~~mode~~)	40	+ def report_inactive()
		41	+ self.active = false
		42	+ self.task = nil
		43	+ self.save
15	end	44	end
16		45
		46	+ protected
		47	+
		48	+ def self.stalled_time()
		49	+ return 1.minute
		50	+ end
		51	+
17	end	52	end

db/schema.rb ¶ +2 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 15) do
+            + ActiveRecord::Schema.define(:version => 16) do
                 create_table "grader_processes", :force => true do |t|
                   t.string   "ip",         :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.integer  "task_id"
                 end
                 add_index "grader_processes", ["ip", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",       :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end

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

r32:b72d6a6d5e32 - Thu, 21 Feb 2008 02:43:46 - 9 files changed: 115 inserted, 6 deleted

Sign in to your account

Commit r32:b72d6a6d5e32 public

Author

r32:b72d6a6d5e32 - Thu, 21 Feb 2008 02:43:46 - 9 files changed: 115 inserted, 6 deleted

Commit `r32:b72d6a6d5e32` public