cafe-grader-web Commit - r446:d9ae0ff1e3ea

cafe-grader-web

Commit `r446:d9ae0ff1e3ea` public

parent | child

Description:

add ip to submission

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r446:d9ae0ff1e3ea - Wed, 17 Sep 2014 16:21:13 - 5 files changed: 31 inserted, 12 deleted

db/migrate/20140917150629_add_ip_to_submissions.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddIpToSubmissions < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :submissions, :ip_address, :string
	4	+ end
	5	+ end

app/controllers/main_controller.rb ¶ +1

                   @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_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

app/views/graders/submission.html.haml ¶ +4

                         = "(#{@submission.problem.name}) #{@submission.problem.full_name}"
                       - else
                         = "(n/a)"
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Tries:
                     %td.value= @submission.number
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Submitted:
                     %td.value #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Graded:
                     %td.value #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Points:
                     %td.value #{@submission.points}/#{@submission.problem.full_score}
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Comment:
                     %td.value #{@submission.grader_comment}
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Runtime (s):
                     %td.value #{@submission.max_runtime}
                   %tr{class: cycle('info-even','info-odd')}
                     %td.field Memory (kb):
                     %td.value #{@submission.peak_memory}
+            +     - if session[:admin]
+            +       %tr{class: cycle('info-even','info-odd')}
+            +         %td.field IP:
+            +         %td.value #{@submission.ip_address}
               %h2 Source code
               //%div.highlight{:style => "border: 1px solid black;"}
               =@formatted_code.html_safe

app/views/users/profile.html.haml ¶ +4

                 .fix-width {
                   font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
                 }
               %h1= @user.full_name + ' Profile'
               %h2 Basic info
               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
               %h2 Submissions
               %table.tablesorter-cafe#submission_table
                 %thead
                   %tr
                     %th ID
                     %th Problem code
                     %th Problem name
                     %th Language
                     %th Result
                     %th Score
+            +       - if session[:admin]
+            +         %th IP
                 %tbody
                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
                       %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
                       %td= s.problem.name
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td.fix-width= s.grader_comment
                       %td= (s.points*100)/s.problem.full_score
+            +         - if session[:admin]
+            +           %td= s.ip_address

db/schema.rb ¶ +17 -12

               # encoding: UTF-8
               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record 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 => 20140826095949) do
+            + ActiveRecord::Schema.define(:version => 20140917150629) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
-            -     t.text     "body",         :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at",                      :null => false
                   t.datetime "updated_at",                      :null => false
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "name"
                 end
                 create_table "contests_problems", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
                 create_table "contests_users", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "descriptions", :force => true do |t|
-            -     t.text     "body",       :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "grader_configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at",  :null => false
                   t.datetime "updated_at",  :null => false
-            -     t.text     "description", :limit => 16777215
+            +     t.text     "description"
                 end
                 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",               :null => false
                   t.datetime "updated_at",               :null => false
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 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
                   t.string "common_ext"
                 end
                 create_table "logins", :force => true do |t|
                   t.string   "user_id"
                   t.string   "ip_address"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
-            -     t.text     "body",                :limit => 16777215
+            +     t.text     "body"
                   t.boolean  "replied"
                   t.datetime "created_at",          :null => false
                   t.datetime "updated_at",          :null => false
                 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"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string  "description_filename"
                 end
                 create_table "rights", :force => true do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
                 create_table "rights_roles", :id => false, :force => true do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
                 add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
                 create_table "roles", :force => true do |t|
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 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",       :limit => 16777215
+            +     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 "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.integer  "country_id"
                   t.string   "password"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
-            -     t.text     "source",           :limit => 16777215
+            +     t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message", :limit => 16777215
+            +     t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
-            -     t.text     "grader_comment",   :limit => 16777215
+            +     t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
+            +     t.float    "max_runtime"
+            +     t.integer  "peak_memory"
+            +     t.integer  "effective_code_length"
+            +     t.string   "ip_address"
                 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 "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
-            -     t.text     "input",      :limit => 2147483647
+            +     t.text     "input",      :limit => 16777215
-            -     t.text     "solution",   :limit => 2147483647
+            +     t.text     "solution",   :limit => 16777215
                   t.datetime "created_at",                     :null => false
                   t.datetime "updated_at",                     :null => false
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at",       :null => false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message", :limit => 16777215
+            +     t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at",       :null => false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                 create_table "user_contest_stats", :force => true do |t|
                   t.integer  "user_id"
                   t.datetime "started_at"
                   t.datetime "created_at",    :null => false
                   t.datetime "updated_at",    :null => false
                   t.boolean  "forced_logout"
                 end
                 create_table "users", :force => true do |t|
                   t.string   "login",           :limit => 50
                   t.string   "full_name"
                   t.string   "hashed_password"
                   t.string   "salt",            :limit => 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.string   "section"
                 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

r446:d9ae0ff1e3ea - Wed, 17 Sep 2014 16:21:13 - 5 files changed: 31 inserted, 12 deleted

Sign in to your account

Commit r446:d9ae0ff1e3ea public

Author

r446:d9ae0ff1e3ea - Wed, 17 Sep 2014 16:21:13 - 5 files changed: 31 inserted, 12 deleted

Commit `r446:d9ae0ff1e3ea` public