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

               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
                 before_filter :check_viewability, :except => [:index, :login]
                 append_before_filter :confirm_and_update_start_time,
                                      :except => [:index,
                                                  :login,
                                                  :confirm_contest_start]
                 # to prevent log in box to be shown when user logged out of the
                 # system only in some tab
                 prepend_before_filter :reject_announcement_refresh_when_logged_out,
                                       :only => [:announcements]
                 # COMMENTED OUT: filter in each action instead
                 # before_filter :verify_time_limit, :only => [:submit]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 # COMMENT OUT: only need when having high load
                 # caches_action :index, :login
                 # NOTE: This method is not actually needed, 'config/routes.rb' has
                 # assigned action login as a default action.
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
                   saved_notice = flash[:notice]
                   reset_session
                   flash.now[:notice] = saved_notice
                   # EXPERIMENT:
                   # Hide login if in single user mode and the url does not
                   # explicitly specify /login
                   #
                   # logger.info "PATH: #{request.path}"
                   # if GraderConfiguration['system.single_user_mode'] and
                   #     request.path!='/main/login'
                   #   @hidelogin = true
                   # end
                   @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
                       (submission.problem != nil) and
                       (submission.problem.available))
                     send_data(submission.source,
               		{:filename => submission.download_filename,
                                 :type => 'text/plain'})
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   if @submission.user_id == session[:user_id]
                     render :action => 'compiler_msg', :layout => 'empty'
                   else
                     flash[:notice] = 'Error viewing source'
                     redirect_to :action => 'list'
                   end
                 end
                 def submission
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   if params[:id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_name(params[:id])
                     if not @problem.available
                       redirect_to :action => 'list'
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id)
                   end
                 end
                 def result
                   if !GraderConfiguration.show_grading_result
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   prepare_grading_result(@submission)
                 end
                 def load_output
                   if !GraderConfiguration.show_grading_result or params[:num]==nil
                     redirect_to :action => 'list' and return
                   end
                   @user = User.find(session[:user_id])
                   @submission = Submission.find(params[:id])
                   if @submission.user!=@user
                     flash[:notice] = 'You are not allowed to view result of other users.'
                     redirect_to :action => 'list' and return
                   end
                   case_num = params[:num].to_i
                   out_filename = output_filename(@user.login,
                                                  @submission.problem.name,
                                                  @submission.id,
                                                  case_num)
                   if !FileTest.exists?(out_filename)
                     flash[:notice] = 'Output not found.'
                     redirect_to :action => 'list' and return
                   end
                   if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
                     response.headers['Content-Type'] = "application/force-download"
                     response.headers['Content-Disposition'] = "attachment; filename=\"output-#{case_num}.txt\""
                     response.headers["X-Sendfile"] = out_filename
                     response.headers['Content-length'] = File.size(out_filename)
                     render :nothing => true
                   else
                     send_file out_filename, :stream => false, :filename => "output-#{case_num}.txt", :type => "text/plain"
                   end
                 end
                 def error
                   @user = User.find(session[:user_id])
                 end
                 # announcement refreshing and hiding methods
                 def announcements
                   if params.has_key? 'recent'
                     prepare_announcements(params[:recent])
                   else
                     prepare_announcements
                   end
                   render(:partial => 'announcement',
                          :collection => @announcements,
                          :locals => {:announcement_effect => true})
                 end
                 def confirm_contest_start
                   user = User.find(session[:user_id])
                   if request.method == :post
                     user.update_start_time
                     redirect_to :action => 'list'
                   else
                     @contests = user.contests
                     @user = user
                   end
                 end
                 protected
                 def prepare_announcements(recent=nil)
                   if GraderConfiguration.show_tasks_to?(@user)
                     @announcements = Announcement.find_published(true)
                   else
                     @announcements = Announcement.find_published
                   end
                   if recent!=nil
                     recent_id = recent.to_i
                     @announcements = @announcements.find_all { |a| a.id > recent_id }
                   end
                 end
                 def prepare_list_information
                   @user = User.find(session[:user_id])
                   if not GraderConfiguration.multicontests?
                     @problems = @user.available_problems
                   else
                     @contest_problems = @user.available_problems_group_by_contests
                     @problems = @user.available_problems
                   end
                   @prob_submissions = {}
                   @problems.each do |p|
                     sub = Submission.find_last_by_user_and_problem(@user.id,p.id)
                     if sub!=nil
                       @prob_submissions[p.id] = { :count => sub.number, :submission => sub }
                     else
                       @prob_submissions[p.id] = { :count => 0, :submission => nil }
                     end
                   end
                   prepare_announcements
                 end
                 def check_viewability
                   @user = User.find(session[:user_id])
                   if (!GraderConfiguration.show_tasks_to?(@user)) and
                       ((action_name=='submission') or (action_name=='submit'))
                     redirect_to :action => 'list' and return
                   end
                 end
                 def prepare_grading_result(submission)
                   if GraderConfiguration.task_grading_info.has_key? submission.problem.name
                     grading_info = GraderConfiguration.task_grading_info[submission.problem.name]
                   else
                     # guess task info from problem.full_score
                     cases = submission.problem.full_score / 10
                     grading_info = {
                       'testruns' => cases,
                       'testcases' => cases
                     }
                   end
                   @test_runs = []
                   if grading_info['testruns'].is_a? Integer
                     trun_count = grading_info['testruns']
                     trun_count.times do |i|
                       @test_runs << [ read_grading_result(@user.login,
                                                           submission.problem.name,
                                                           submission.id,
                                                           i+1) ]
                     end
                   else
                     grading_info['testruns'].keys.sort.each do |num|
                       run = []
                       testrun = grading_info['testruns'][num]
                       testrun.each do |c|
                         run << read_grading_result(@user.login,
                                                    submission.problem.name,
                                                    submission.id,
                                                    c)
                       end
                       @test_runs << run
                     end
                   end
                 end
                 def grading_result_dir(user_name, problem_name, submission_id, case_num)
                   return "#{GRADING_RESULT_DIR}/#{user_name}/#{problem_name}/#{submission_id}/test-result/#{case_num}"
                 end
                 def output_filename(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   return "#{dir}/output.txt"
                 end
                 def read_grading_result(user_name, problem_name, submission_id, case_num)
                   dir = grading_result_dir(user_name,problem_name, submission_id, case_num)
                   result_file_name = "#{dir}/result"
                   if !FileTest.exists?(result_file_name)
                     return {:num => case_num, :msg => 'program did not run'}
                   else
                     results = File.open(result_file_name).readlines
                     run_stat = extract_running_stat(results)
                     output_filename = "#{dir}/output.txt"
                     if FileTest.exists?(output_filename)
                       output_file = true
                       output_size = File.size(output_filename)
                     else
                       output_file = false
                       output_size = 0
                     end
                     return {
                       :num => case_num,
                       :msg => results[0],
                       :run_stat => run_stat,
                       :output => output_file,
                       :output_size => output_size
                     }
                   end
                 end
                 # copied from grader/script/lib/test_request_helper.rb
                 def extract_running_stat(results)
                   running_stat_line = results[-1]
                   # extract exit status line
                   run_stat = ""
                   if !(/[Cc]orrect/.match(results[0]))
                     run_stat = results[0].chomp
                   else
                     run_stat = 'Program exited normally'
                   end
                   logger.info "Stat line: #{running_stat_line}"
                   # extract running time
                   if res = /r(.*)u(.*)s/.match(running_stat_line)
                     seconds = (res[1].to_f + res[2].to_f)
                     time_stat = "Time used: #{seconds} sec."
                   else
                     seconds = nil
                     time_stat = "Time used: n/a sec."
                   end
                   # extract memory usage
                   if res = /s(.*)m/.match(running_stat_line)
                     memory_used = res[1].to_i
                   else
                     memory_used = -1
                   end
                   return {
                     :msg => "#{run_stat}\n#{time_stat}",
                     :running_time => seconds,
                     :exit_status => run_stat,
                     :memory_usage => memory_used
                   }
                 end
                 def confirm_and_update_start_time
                   user = User.find(session[:user_id])
                   if (GraderConfiguration.indv_contest_mode? and
                       GraderConfiguration['contest.confirm_indv_contest_start'] and
                       !user.contest_started?)
                     redirect_to :action => 'confirm_contest_start' and return
                   end
                   if not GraderConfiguration.analysis_mode?
                     user.update_start_time
                   end
                 end
                 def reject_announcement_refresh_when_logged_out
                   if not session[:user_id]
                     render :text => 'Access forbidden', :status => 403
                   end
                   if GraderConfiguration.multicontests?
                     user = User.find(session[:user_id])
                     if user.contest_stat.forced_logout
                       render :text => 'Access forbidden', :status => 403
                     end
                   end
                 end
               end

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

               class ReportController < ApplicationController
                 before_filter :admin_authorization, only: [:login_stat,:submission_stat]
                 before_filter(only: [:problem_hof]) { |c|
                   return false unless authenticate
                   if GraderConfiguration["right.user_view_submission"]
                     return true;
                   end
                   admin_authorization
                 }
                 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,
                                  login: user.login,
                                  full_name: user.full_name,
                                  count: Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user.id,@since_time,@until_time)
                                         .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
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   @submissions = {}
                   User.find_each do |user|
                     @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
                   end
                   Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s|
                     if @submissions[s.user_id]
                       if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
                         a = nil
                         begin
                           a = Problem.find(s.problem_id)
                         rescue
                           a = nil
                         end
                         @submissions[s.user_id][:sub][s.problem_id] =
                           { prob_name: (a ? a.full_name : '(NULL)'),
                             sub_ids: [s.id] }
                       else
                         @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
                       end
                       @submissions[s.user_id][:count] += 1
                     end
                   end
                 end
                 def problem_hof
                   # gen problem list
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   # get selected problems or the default
                   if params[:id]
                     begin
                       @problem = Problem.available.find(params[:id])
                     rescue
                       redirect_to action: :problem_hof
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                   end
                   if @problem
                     #aggregrate by language
                     @by_lang = {}
                     Submission.where(problem_id: @problem.id).find_each do |sub|
                       lang = Language.find_by_id(sub.language_id)
                       next unless lang
                       next unless sub.points >= @problem.full_score
                       #initialize
                       unless @by_lang.has_key?(lang.pretty_name)
                         @by_lang[lang.pretty_name] = {
                           runtime: { avail: false, value: 2**30-1 },
                           memory: { avail: false, value: 2**30-1 },
                           length: { avail: false, value: 2**30-1 },
                           first: { avail: false, value: DateTime.new(3000,1,1) }
                         }
                       end
                       if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
                         @by_lang[lang.pretty_name][:runtime] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.max_runtime,
                           sub_id: sub.id
                         }
                       end
                       if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
                         @by_lang[lang.pretty_name][:memory] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.peak_memory,
                           sub_id: sub.id
                         }
                       end
                       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
                          !sub.user.admin?
                         @by_lang[lang.pretty_name][:first] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.submitted_at,
                           sub_id: sub.id
                         }
                       end
                       if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                         @by_lang[lang.pretty_name][:length] = {
                           avail: true,
                           user_id: sub.user_id,
                           value: sub.effective_code_length,
                           sub_id: sub.id
                         }
                       end
                     end
                     #process user_id
                     @by_lang.each do |lang,prop|
                       prop.each do |k,v|
                         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]
                           @best[:memory] = prop[:memory]
                           @best[:memory][:lang] = lang
                         end
                         if @best[:length][:value] >= prop[:length][:value]
                           @best[:length] = prop[:length]
                           @best[:length][:lang] = lang
                         end
                         if @best[:first][:value] >= prop[:first][:value]
                           @best[:first] = prop[:first]
                           @best[:first][:lang] = lang
                         end
                       end
                     end
                   end
                 end
               end

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>
                 at submission
                 = 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]}
                 using <span class="hof_language">#{@best[:length][:lang]}</span>
                 with  <span class="hof_value">#{@best[:length][:value]} bytes</span>
                 at submission
                 = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
                 %br/
                 %b First solver:
                 #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
                 using <span class="hof_language">#{@best[:first][:lang]}</span>
                 on <span class="hof_value">#{@best[:first][:value]}</span>
                 at submission
                 = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
                 %br/
                 %p
                   This counts only for submission with 100% score <br/>
                   Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
                 %h2 By language
                 %table.info
                   %thead
                     %tr.info-head
                       %th Language
                       %th Best runtime (ms)
                       %th Best memory (kbytes)
                       %th Shortest Code (bytes)
                       %th First solver
                   %tbody
                     - @by_lang.each do |lang,value|
                       %tr{class: cycle('info-even','info-odd')}
                         %td= lang
                         %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
                           - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
                             = link_to value[:first][:user], controller: 'users', action: 'profile', id: value[:first][:user_id]
                             = "(#{value[:first][:value]} @"
                             = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
               - else
                 %h3 No submissions

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

               - content_for :header do
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
                 $('#my_table').tablesorter({widthFixed: true, widgets: ['zebra']});
                 });
               %h1 Login status
               =render partial: 'report_menu'
               =render partial: 'date_range', locals: {param_text: 'Login date range:', title: 'Query login stat in the range'  }
               %table.tablesorter-cafe#my_table
                 %thead
                   %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

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#submission_table').tablesorter({widgets: ['zebra','filter']});
                 });
               :css
                 .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/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

               # 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

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