cafe-grader-web Commit - r509:bb124a034509

cafe-grader-web

Commit `r509:bb124a034509` public

parent | child

Description:

merge algo feature

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

r509:bb124a034509 - Thu, 18 Sep 2014 05:22:08 - 8 files changed: 95 inserted, 36 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

                   @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

app/controllers/report_controller.rb ¶ +10 -4

                 def login_stat
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
-            -       @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
+            +       md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
+            +       @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
-            -       @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
+            +       md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
+            +       @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   User.all.each do |user|
                     @logins << { id: user.id,
                                         .count(:id),
                                  min: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .minimum(:created_at),
                                  max: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
-            -                           .maximum(:created_at)
+            +                           .maximum(:created_at),
+            +                     ip: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
+            +                                       user.id,@since_time,@until_time)
+            +                           .select(:ip_address).uniq
+            +
                                }
                   end
                 end
                 def submission_stat
                         v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                       end
                     end
                     #sum into best
                     if @by_lang and @by_lang.first
-            -         @best = @by_lang.first[1]
+            +         @best = @by_lang.first[1].clone
                       @by_lang.each do |lang,prop|
                         if @best[:runtime][:value] >= prop[:runtime][:value]
                           @best[:runtime] = prop[:runtime]
                           @best[:runtime][:lang] = lang
                         end
                         if @best[:memory][:value] >= prop[:memory][:value]

app/views/graders/submission.html.haml ¶ +49 -15

@@ -1,27 +1,61
1	%style{type: "text/css"}	1	%style{type: "text/css"}
2	= @css_style	2	= @css_style
		3	+ :css
		4	+ .field {
		5	+ font-weight: bold;
		6	+ text-align: right;
		7	+ padding: 3px;
		8	+ }
		9	+
3		10
4	%h1= "Submission: #{@submission.id}"	11	%h1= "Submission: #{@submission.id}"
5		12
6	- %p	13	+
7	- User:	14	+ %h2 Stat
8	- = "(#{@submission.user.login}) #{@submission.user.full_name}"	15	+
9	- %br/	16	+ %table.info
10	- Problem:	17	+ %thead
		18	+ %tr.info-head
		19	+ %th Field
		20	+ %th Value
		21	+ %tbody
		22	+ %tr{class: cycle('info-even','info-odd')}
		23	+ %td.field User:
		24	+ %td.value= "(#{@submission.user.login}) #{@submission.user.full_name}"
		25	+ %tr{class: cycle('info-even','info-odd')}
		26	+ %td.field Problem:
		27	+ %td.value
11	- if @submission.problem!=nil	28	- if @submission.problem!=nil
12	- = "#{@submission.problem.full_name}"	29	+ = "(#{@submission.problem.name}) #{@submission.problem.full_name}"
13	- else	30	- else
14	= "(n/a)"	31	= "(n/a)"
15	- %br/	32	+ %tr{class: cycle('info-even','info-odd')}
16	- = "Number: #{@submission.number}"	33	+ %td.field Tries:
17	- %br/	34	+ %td.value= @submission.number
18	- = "Submitted at: #{format_short_time(@submission.submitted_at)}"	35	+ %tr{class: cycle('info-even','info-odd')}
19	- %br/	36	+ %td.field Submitted:
20	- = "Points : #{@submission.points}/#{@submission.problem.full_score}"	37	+ %td.value #{time_ago_in_words(@submission.submitted_at)} ago (at #{@submission.submitted_at.to_formatted_s(:long)})
21	- %br/	38	+ %tr{class: cycle('info-even','info-odd')}
22	- = "Comment : #{@submission.grader_comment}"	39	+ %td.field Graded:
		40	+ %td.value #{time_ago_in_words(@submission.graded_at)} ago (at #{@submission.graded_at.to_formatted_s(:long)})
		41	+ %tr{class: cycle('info-even','info-odd')}
		42	+ %td.field Points:
		43	+ %td.value #{@submission.points}/#{@submission.problem.full_score}
		44	+ %tr{class: cycle('info-even','info-odd')}
		45	+ %td.field Comment:
		46	+ %td.value #{@submission.grader_comment}
		47	+ %tr{class: cycle('info-even','info-odd')}
		48	+ %td.field Runtime (s):
		49	+ %td.value #{@submission.max_runtime}
		50	+ %tr{class: cycle('info-even','info-odd')}
		51	+ %td.field Memory (kb):
		52	+ %td.value #{@submission.peak_memory}
		53	+ - if session[:admin]
		54	+ %tr{class: cycle('info-even','info-odd')}
		55	+ %td.field IP:
		56	+ %td.value #{@submission.ip_address}
23		57
24	- %b Source code ~~(first 10kb)~~	58	+ %h2 Source code
25	//%div.highlight{:style => "border: 1px solid black;"}	59	//%div.highlight{:style => "border: 1px solid black;"}
26	=@formatted_code.html_safe	60	=@formatted_code.html_safe
27		61

app/views/report/_task_hof.html.haml ¶ +3 -3

               :css
                 .hof_user { color: orangered; font-style: italic; }
                 .hof_language { color: green; font-style: italic; }
                 .hof_value { color: deeppink;font-style: italic; }
-            - %h2 Overall
+            + %h2 Overall of #{Problem.find(params[:id]).full_name}
               - if @best
                 %b Best Runtime:
                 by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
                 using <span class="hof_language">#{@best[:runtime][:lang]}</span>
                 with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
                 = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
                 %br/
                 %b Best Memory Usage:
                 by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
                 using <span class="hof_language">#{@best[:memory][:lang]}</span>
-            -   with <span class="hof_value">#{@best[:memory][:value]} kbytes </span>
+            +   with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
                 at submission
                 = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
                 %br/
                 %b Shortest Code:
                 by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
                         %td
                           = link_to value[:runtime][:user], controller: 'users', action: 'profile', id: value[:runtime][:user_id]
                           = "(#{(value[:runtime][:value] * 1000).to_i} @"
                           = "#{link_to("#" + value[:runtime][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:runtime][:sub_id])} )".html_safe
                         %td
                           = link_to value[:memory][:user], controller: 'users', action: 'profile', id: value[:memory][:user_id]
-            -             = "(#{value[:memory][:value]} @"
+            +             = "(#{number_with_delimiter(value[:memory][:value])} @"
                           = "#{link_to("#" + value[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:memory][:sub_id])} )".html_safe
                         %td
                           = link_to value[:length][:user], controller: 'users', action: 'profile', id: value[:length][:user_id]
                           = "(#{value[:length][:value]} @"
                           = "#{link_to("#" + value[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:length][:sub_id])} )".html_safe
                         %td

app/views/report/login_stat.html.haml ¶ +5 -1

                   %tr
                     %th login
                     %th full name
                     %th login count
                     %th earliest
                     %th latest
+            +       %th IP
                 %tbody
                   - @logins.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
                       %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
                       %td= l[:full_name]
                       %td= l[:count]
                       %td= l[:min] ? l[:min].in_time_zone.strftime('%Y-%m-%d %H:%M') : ''
-            -         %td= l[:max] ? time_ago_in_words(l[:max].in_time_zone) + ' ago' : ''
+            +         %td= l[:max] ? "#{l[:max].in_time_zone.strftime('%Y-%m-%d %H:%M.%S')} (#{time_ago_in_words(l[:max].in_time_zone)}  ago)" : ''
+            +         %td
+            +           - l[:ip].each do |ip|
+            +             #{ip.ip_address} <br/>

app/views/users/profile.html.haml ¶ +5 -1

                     %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/s.problem.full_score * 100
+            +         %td= (s.points*100)/s.problem.full_score
+            +         - if session[:admin]
+            +           %td= s.ip_address

db/schema.rb ¶ +17 -12

               # 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   "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"
                 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|
                 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"
                 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  "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.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"
                   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

r509:bb124a034509 - Thu, 18 Sep 2014 05:22:08 - 8 files changed: 95 inserted, 36 deleted

Sign in to your account

Commit r509:bb124a034509 public

Author

r509:bb124a034509 - Thu, 18 Sep 2014 05:22:08 - 8 files changed: 95 inserted, 36 deleted

Commit `r509:bb124a034509` public