cafe-grader-web Commit - r35:3d41a77d4876

cafe-grader-web

Commit `r35:3d41a77d4876` public

parent | child

Description:

added number (auto generated when submitting) to submissions git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@73 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

r35:3d41a77d4876 - Mon, 03 Mar 2008 17:22:16 - 6 files changed: 62 inserted, 18 deleted

db/migrate/018_add_number_to_submissions.rb created 644 ¶ +33

@@ -0,0 +1,33
	1	+ class AddNumberToSubmissions < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :submissions, :number, :integer
	4	+
	5	+ # add number field for all records
	6	+ Submission.reset_column_information
	7	+
	8	+ last_user_id = nil
	9	+ last_problem_id = nil
	10	+ current_number = 0
	11	+
	12	+ Submission.find(:all,
	13	+ :order => 'user_id, problem_id, submitted_at').each do \|submission\|
	14	+ if submission.user_id==last_user_id and submission.problem_id==last_problem_id
	15	+ current_number += 1
	16	+ else
	17	+ current_number = 1
	18	+ end
	19	+ submission.number = current_number
	20	+ submission.save
	21	+
	22	+ last_user_id = submission.user_id
	23	+ last_problem_id = submission.problem_id
	24	+ end
	25	+
	26	+ add_index :submissions, [:user_id, :problem_id, :number], :unique => true
	27	+ end
	28	+
	29	+ def self.down
	30	+ remove_index :submissions, :column => [:user_id, :problem_id, :number]
	31	+ remove_column :submissions, :number
	32	+ end
	33	+ end

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

                     prepare_list_information
                     render :action => 'list' and return
                   end
                   redirect_to :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)
+            +       sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
-            -       @prob_submissions << { :count => c, :submission => sub }
+            +       if sub!=nil
+            +         @prob_submissions << { :count => sub.number, :submission => sub }
+            +       else
+            +         @prob_submissions << { :count => 0, :submission => nil }
+            +       end
                   end
                 end
               end

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

                 def update
                   @problem = Problem.find(params[:id])
                   if @problem.update_attributes(params[:problem])
                     flash[:notice] = 'Problem was successfully updated.'
                     redirect_to :action => 'show', :id => @problem
                   else
                     render :action => 'edit'
                   end
                 end
                 def destroy
                   Problem.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def toggle_avail
                   problem = Problem.find(params[:id])
                   problem.available = !(problem.available)
                   problem.save
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
-            -     @submissions = Submission.find_last_by_problem(params[:id])
+            +     @submissions = Submission.find_all_last_by_problem(params[:id])
                 end
               end

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

                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(params[:user])
                     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 => 'list'
                 end
                 def user_stat
                   @problems = Problem.find_available_problems
                   @users = User.find(:all)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u.login
                     @problems.each do |p|
-            - 	c, sub = Submission.find_by_user_and_problem(u.id,p.id)
+            + 	sub = Submission.find_last_by_user_and_problem(u.id,p.id)
-            - 	if (c!=0) and (sub.points!=nil)
+            + 	if (sub!=nil) and (sub.points!=nil)
               	  ustat << [sub.points, (sub.points>=p.full_score)]
               	else
               	  ustat << [0,false]
               	end
                     end
                     @scorearray << ustat
                   end
                 end
               end

app/models/submission.rb ¶ +17 -12

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_specify_language
                 validate :must_have_valid_problem
-            -   def self.find_by_user_and_problem(user_id, problem_id)
+            +   before_save :assign_latest_number
-            -     subcount = count(:conditions => "user_id = #{user_id} AND problem_id = #{problem_id}")
-            -     if subcount != 0
+            +   def self.find_last_by_user_and_problem(user_id, problem_id)
-            -       last_sub = find(:first,
+            +     last_sub = find(:first,
-            - 		      :conditions => {:user_id => user_id,
+            +                     :conditions => {:user_id => user_id,
-            - 			:problem_id => problem_id},
+            +                       :problem_id => problem_id},
-            - 		      :order => 'submitted_at DESC')
+            +                     :order => 'submitted_at DESC')
-            -     else
+            +     return last_sub
-            -       last_sub = nil
-            -     end
-            -     return subcount, last_sub
                 end
-            -   def self.find_last_by_problem(problem_id)
+            +   def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id)")
                 end
+            +   protected
+            +
                 def self.find_option_in_source(option, source)
                   if source==nil
                     return nil
                   end
                   i = 0
                   source.each_line do |s|
                     if s =~ option
               	words = s.split
               	return words[1]
                     end
                     i = i + 1
                     if i==10
               	return nil
                     end
                   end
                   return nil
                 end
                 def self.find_language_in_source(source)
                   langopt = find_option_in_source(/^LANG:/,source)
                   if language = Language.find_by_name(langopt)
                     return language
                   elsif language = Language.find_by_pretty_name(langopt)
                     return language
                   end
                 end
                 # validation codes
                 def must_specify_language
                   return if self.source==nil
                   self.language = Submission.find_language_in_source(self.source)
                   errors.add_to_base("must specify programming language") unless self.language!=nil
                 end
                 def must_have_valid_problem
                   return if self.source==nil
                   if self.problem_id!=-1
                     problem = Problem.find(self.problem_id)
                   else
                     problem = Submission.find_problem_in_source(self.source)
                   end
                   if problem==nil
                     errors.add_to_base("must specify problem")
                   elsif !problem.available
                     errors.add_to_base("must specify valid problem")
                   end
                 end
+            +   # callbacks
+            +   def assign_latest_number
+            +     latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
+            +     self.number = (latest==nil) ? 1 : latest.number + 1;
+            +   end
+            +
               end

db/schema.rb ¶ +3 -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 => 17) do
+            + ActiveRecord::Schema.define(:version => 18) do
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :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", ["host", "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"
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
+            +     t.integer  "number"
                 end
+            +   add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "users", :force => true do |t|
                   t.string "login",           :limit => 10
                   t.string "full_name"
                   t.string "hashed_password"
                   t.string "salt",            :limit => 5
                   t.string "alias"
                   t.string "email"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               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

r35:3d41a77d4876 - Mon, 03 Mar 2008 17:22:16 - 6 files changed: 62 inserted, 18 deleted

Sign in to your account

Commit r35:3d41a77d4876 public

Author

r35:3d41a77d4876 - Mon, 03 Mar 2008 17:22:16 - 6 files changed: 62 inserted, 18 deleted

Commit `r35:3d41a77d4876` public