cafe-grader-web

Commit r514:41d1cd2793ff public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r514:41d1cd2793ff - - 11 files changed: 228 inserted, 59 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,44
1 + - param = {} unless param
2 + - graph_height = param[:graph_height] || 100
3 + - bar_width = param[:bar_width] || 14
4 + - graph_width = (bar_width * histogram[:data].count) + 20
5 + :css
6 + .hist_bar {
7 + width: #{bar_width-1}px;
8 + position: absolute;
9 + background-color: lightblue;
10 + }
11 + .hist_fill {
12 + width: #{bar_width-1}px;
13 + position: absolute;
14 + background-color: #eee;
15 + }
16 + .hist_text {
17 + position: absolute;
18 + font-size:5px;
19 + }
20 +
21 + %div{style: "position: relative; width: #{graph_width}px; height: 125px; background-color:#fff;" }
22 + //draw background
23 + - histogram[:data].each_index do |i|
24 + - height = histogram[:data][i] * graph_height / histogram[:summary][:max]
25 + - top = graph_height - height
26 + - left = graph_width - (i+1)*bar_width
27 + %div.hist_fill{style: "top: 0px; height: #{graph_height - height}px; left: #{left}px;" }
28 + // draw horizontal line
29 + - line = 3
30 + - line.times do |i|
31 + - top = graph_height - graph_height * (i+0.5)/ line
32 + %div{style: "position:absolute;width: #{graph_width-21}px;height: 1px;left: 20px;top:#{top}px;background-color: #333;"}
33 + %div.hist_text{style: "position:absolute;left: 0px;top:#{top-6}px"}
34 + =((i+0.5) * histogram[:summary][:max] / line).to_i
35 + // draw the actual bar and text
36 + - @histogram[:data].each_index do |i|
37 + - height = histogram[:data][i] * graph_height / histogram[:summary][:max]
38 + - top = graph_height - height
39 + - left = graph_width - (i+1)*bar_width
40 + %div.hist_bar{style: "top: #{top}px; height: #{height}px; left: #{left}px; dae: #{histogram[:data][i]}" }
41 + - if i % 7 == 1
42 + %div.hist_text{style: "top:#{graph_height + 5}px;left: #{left}px;"} #{(Time.zone.today - i.day).strftime('%-d')}
43 + - if (Time.now.in_time_zone - i.day).day == 15
44 + %div.hist_text{style: "top:#{graph_height + 15}px;left: #{left}px;"} #{(Time.zone.today - i.day).strftime('%b')}
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -147,17 +147,31
147 147 end
148 148 redirect_to :action => 'list'
149 149 end
150 150
151 151 def stat
152 152 @problem = Problem.find(params[:id])
153 - if !@problem.available
153 + unless @problem.available or session[:admin]
154 154 redirect_to :controller => 'main', :action => 'list'
155 - else
155 + return
156 + end
156 157 @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
158 +
159 + #stat summary
160 + range =65
161 + @histogram = { data: Array.new(range,0), summary: {} }
162 + user = Hash.new(0)
163 + @submissions.find_each do |sub|
164 + d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
165 + @histogram[:data][d.to_i] += 1 if d < range
166 + user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
157 167 end
168 + @histogram[:summary][:max] = [@histogram[:data].max,1].max
169 +
170 + @summary = { attempt: user.count, solve: 0 }
171 + user.each_value { |v| @summary[:solve] += 1 if v == 1 }
158 172 end
159 173
160 174 def manage
161 175 @problems = Problem.find(:all, :order => 'date_added DESC')
162 176 end
163 177
@@ -254,7 +268,10
254 268 problems << Problem.find(id)
255 269 end
256 270 end
257 271 problems
258 272 end
259 273
274 + def get_problems_stat
260 275 end
276 +
277 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -102,16 +102,28
102 102 redirect_to action: :problem_hof
103 103 flash[:notice] = 'Error: submissions for that problem are not viewable.'
104 104 return
105 105 end
106 106 end
107 107
108 - if @problem
109 - #aggregrate by language
110 - @by_lang = {}
108 + return unless @problem
109 +
110 + @by_lang = {} #aggregrate by language
111 +
112 + range =65
113 + @histogram = { data: Array.new(range,0), summary: {} }
114 + @summary = {count: 0, solve: 0, attempt: 0}
115 + user = Hash.new(0)
111 116 Submission.where(problem_id: @problem.id).find_each do |sub|
117 + #histogram
118 + d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
119 + @histogram[:data][d.to_i] += 1 if d < range
120 +
121 + @summary[:count] += 1
122 + user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
123 +
112 124 lang = Language.find_by_id(sub.language_id)
113 125 next unless lang
114 126 next unless sub.points >= @problem.full_score
115 127
116 128 #initialize
117 129 unless @by_lang.has_key?(lang.pretty_name)
@@ -121,46 +133,26
121 133 length: { avail: false, value: 2**30-1 },
122 134 first: { avail: false, value: DateTime.new(3000,1,1) }
123 135 }
124 136 end
125 137
126 138 if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
127 - @by_lang[lang.pretty_name][:runtime] = {
128 - avail: true,
129 - user_id: sub.user_id,
130 - value: sub.max_runtime,
131 - sub_id: sub.id
132 - }
139 + @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
133 140 end
134 141
135 142 if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
136 - @by_lang[lang.pretty_name][:memory] = {
137 - avail: true,
138 - user_id: sub.user_id,
139 - value: sub.peak_memory,
140 - sub_id: sub.id
141 - }
143 + @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
142 144 end
143 145
144 146 if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
145 147 !sub.user.admin?
146 - @by_lang[lang.pretty_name][:first] = {
147 - avail: true,
148 - user_id: sub.user_id,
149 - value: sub.submitted_at,
150 - sub_id: sub.id
151 - }
148 + @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
152 149 end
153 150
154 151 if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
155 - @by_lang[lang.pretty_name][:length] = {
156 - avail: true,
157 - user_id: sub.user_id,
158 - value: sub.effective_code_length,
159 - sub_id: sub.id
160 - }
152 + @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
161 153 end
162 154 end
163 155
164 156 #process user_id
165 157 @by_lang.each do |lang,prop|
166 158 prop.each do |k,v|
@@ -187,9 +179,13
187 179 if @best[:first][:value] >= prop[:first][:value]
188 180 @best[:first] = prop[:first]
189 181 @best[:first][:lang] = lang
190 182 end
191 183 end
192 184 end
193 - end
185 +
186 + @histogram[:summary][:max] = [@histogram[:data].max,1].max
187 + @summary[:attempt] = user.count
188 + user.each_value { |v| @summary[:solve] += 1 if v == 1 }
194 189 end
190 +
195 191 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -108,13 +108,31
108 108 end
109 109 redirect_to :action => 'forget'
110 110 end
111 111
112 112 def profile
113 113 @user = User.find(params[:id])
114 - @submission = Submission.where(user_id: params[:id]).all
114 + @submission = Submission.includes(:problem).where(user_id: params[:id])
115 +
116 + range = 120
117 + @histogram = { data: Array.new(range,0), summary: {} }
118 + @summary = {count: 0, solve: 0, attempt: 0}
119 + problem = Hash.new(0)
120 +
121 + @submission.find_each do |sub|
122 + #histogram
123 + d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
124 + @histogram[:data][d.to_i] += 1 if d < range
125 +
126 + @summary[:count] += 1
127 + problem[sub.problem] = [problem[sub.problem], (sub.points >= sub.problem.full_score) ? 1 : 0].max
128 + end
129 +
130 + @histogram[:summary][:max] = [@histogram[:data].max,1].max
131 + @summary[:attempt] = problem.count
132 + problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
115 133 end
116 134
117 135 protected
118 136
119 137 def verify_online_registration
120 138 if !GraderConfiguration['system.online_registration']
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -52,12 +52,19
52 52 end
53 53
54 54 def self.download_file_basedir
55 55 return "#{Rails.root}/data/tasks"
56 56 end
57 57
58 + def get_submission_stat
59 + result = Hash.new
60 + #total number of submission
61 + result[:total_sub] = Submission.where(problem_id: self.id).count
62 + result[:attempted_user] = Submission.where(problem_id: self.id).group_by(:user_id)
63 + end
64 +
58 65 protected
59 66
60 67 def self.to_i_or_default(st, default)
61 68 if st!=''
62 69 result = st.to_i
63 70 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -18,18 +18,24
18 18 %tr.info-head
19 19 %th Field
20 20 %th Value
21 21 %tbody
22 22 %tr{class: cycle('info-even','info-odd')}
23 23 %td.field User:
24 - %td.value= "(#{@submission.user.login}) #{@submission.user.full_name}"
24 + %td.value
25 + - if @submission.user
26 + = link_to "(#{@submission.user.login})", controller: "users", action: "profile", id: @submission.user
27 + = @submission.user.full_name
28 + - else
29 + = "(n/a)"
25 30 %tr{class: cycle('info-even','info-odd')}
26 31 %td.field Problem:
27 32 %td.value
28 33 - if @submission.problem!=nil
29 - = "(#{@submission.problem.name}) #{@submission.problem.full_name}"
34 + = link_to "(#{@submission.problem.name})", controller: "problems", action: "stat", id: @submission.problem
35 + = @submission.problem.full_name
30 36 - else
31 37 = "(n/a)"
32 38 %tr{class: cycle('info-even','info-odd')}
33 39 %td.field Tries:
34 40 %td.value= @submission.number
35 41 %tr{class: cycle('info-even','info-odd')}
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -3,12 +3,29
3 3 font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
4 4 }
5 5
6 6 %h1 Problem stat: #{@problem.name}
7 7 %h2 Overview
8 8
9 +
10 + %table.info
11 + %thead
12 + %tr.info-head
13 + %th Stat
14 + %th Value
15 + %tbody
16 + %tr{class: cycle('info-even','info-odd')}
17 + %td Submissions
18 + %td= @submissions.count
19 + %tr{class: cycle('info-even','info-odd')}
20 + %td Solved/Attempted User
21 + %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
22 +
23 + %h2 Submissions Count
24 + = render partial: 'application/bar_graph', locals: { histogram: @histogram }
25 +
9 26 %h2 Submissions
10 27 - if @submissions and @submissions.count > 0
11 28 %table.info#main_table
12 29 %thead
13 30 %tr.info-head
14 31 %th ID
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,51 +1,102
1 + - content_for :header do
2 + = javascript_include_tag 'local_jquery'
3 +
4 + :javascript
5 + $(document).ready( function() {
6 + $("#mem_remark").hover( function() {
7 + $("#mem_remark_box").show();
8 + }, function() {
9 + $("#mem_remark_box").hide();
10 + });
11 + });
12 + alert("hahaha");
1 13 :css
2 14 .hof_user { color: orangered; font-style: italic; }
3 15 .hof_language { color: green; font-style: italic; }
4 16 .hof_value { color: deeppink;font-style: italic; }
5 -
6 - %h2 Overall of #{Problem.find(params[:id]).full_name}
17 + .info_param { font-weight: bold;text-align: right; }
18 + .tooltip {
19 + font-family: Verdana,sans-serif;
20 + font-weight: normal;
21 + text-align: left;
22 + font-size: 1.0em;
23 + color: black;
24 + line-height: 1.1;
25 + display: none;
26 + min-width: 20em;
27 + position: absolute;
28 + left: 25px;
29 + bottom: 5px;
30 + border: 1px solid;
31 + padding: 5px;
32 + background-color: #FFF;
33 + word-wrap: break-word;
34 + z-index: 9999;
35 + overflow: auto;
36 + }
7 37
38 + %h1 (#{Problem.find(params[:id]).name}) #{Problem.find(params[:id]).full_name}
39 +
40 + %h2 Problem Stat
41 + %table.info
42 + %thead
43 + %tr.info-head
44 + %th Stat
45 + %th Value
46 + %tbody
47 + %tr{class: cycle('info-even','info-odd')}
48 + %td.info_param Submissions
49 + %td= @summary[:count]
50 + %tr{class: cycle('info-even','info-odd')}
51 + %td.info_param Solved/Attempted User
52 + %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
8 53 - if @best
9 - %b Best Runtime:
54 + %tr{class: cycle('info-even','info-odd')}
55 + %td.info_param Best Runtime
56 + %td
10 57 by #{link_to @best[:runtime][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
11 58 using <span class="hof_language">#{@best[:runtime][:lang]}</span>
12 59 with <span class="hof_value">#{@best[:runtime][:value] * 1000} milliseconds</span>
13 60 at submission
14 61 = link_to("#" + @best[:runtime][:sub_id].to_s, controller: 'graders', action: 'submission', id:@best[:runtime][:sub_id])
15 - %br/
16 62
17 - %b Best Memory Usage:
63 + %tr{class: cycle('info-even','info-odd')}
64 + %td.info_param
65 + Best Memory Usage
66 + %sup{ id: "mem_remark", style: "position:relative; color: blue;"}
67 + [?]
68 + %span.tooltip#mem_remark_box
69 + This counts only for submission with 100% score.
70 + Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
71 + %td
18 72 by #{link_to @best[:memory][:user], controller:'users', action:'profile', id:@best[:memory][:user_id]}
19 73 using <span class="hof_language">#{@best[:memory][:lang]}</span>
20 74 with <span class="hof_value">#{number_with_delimiter(@best[:memory][:value])} kbytes </span>
21 75 at submission
22 76 = link_to("#" + @best[:memory][:sub_id].to_s, controller: 'graders' , action: 'submission', id:@best[:memory][:sub_id])
23 - %br/
24 77
25 - %b Shortest Code:
78 + %tr{class: cycle('info-even','info-odd')}
79 + %td.info_param Shortest Code
80 + %td
26 81 by #{link_to @best[:length][:user], controller:'users', action:'profile', id:@best[:length][:user_id]}
27 82 using <span class="hof_language">#{@best[:length][:lang]}</span>
28 83 with <span class="hof_value">#{@best[:length][:value]} bytes</span>
29 84 at submission
30 85 = link_to("#" + @best[:length][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:length][:sub_id])
31 - %br/
32 86
33 - %b First solver:
87 + %tr{class: cycle('info-even','info-odd')}
88 + %td.info_param First solver
89 + %td
34 90 #{link_to @best[:first][:user], controller:'users', action:'profile', id:@best[:first][:user_id]} is the first solver
35 91 using <span class="hof_language">#{@best[:first][:lang]}</span>
36 92 on <span class="hof_value">#{@best[:first][:value]}</span>
37 93 at submission
38 94 = link_to("#" + @best[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: @best[:first][:sub_id])
39 - %br/
40 95
41 -
42 - %p
43 - This counts only for submission with 100% score <br/>
44 - Right now, java is excluded from memory usage competition. (Because it always uses 2GB memory...)
45 -
96 + - if @best
46 97 %h2 By language
47 98
48 99 %table.info
49 100 %thead
50 101 %tr.info-head
51 102 %th Language
@@ -72,8 +123,6
72 123 %td
73 124 - if value[:first][:user] != '(NULL)' #TODO: i know... this is wrong...
74 125 = link_to value[:first][:user], controller: 'users', action: 'profile', id: value[:first][:user_id]
75 126 = "(#{value[:first][:value]} @"
76 127 = "#{link_to("#" + value[:first][:sub_id].to_s, controller: 'graders' , action: 'submission', id: value[:first][:sub_id])} )".html_safe
77 128
78 - - else
79 - %h3 No submissions
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -3,20 +3,21
3 3 / %h1 Tasks Hall of Fame
4 4 / = link_to('[back to All-Time Hall of Fame]', action: 'problem_hof', id: nil )
5 5 /- else
6 6 / %h1 All-Time Hall of Fame
7 7
8 8
9 - %h1 Tasks Hall of Fame
9 + %h1 Hall of Fame
10 10 .task-menu
11 11 Tasks
12 12 %br/
13 13 - @problems.each do |prob|
14 14 = link_to( "[#{prob.name}]", {id: prob.id})
15 15
16 16 - unless params[:id]
17 17 /=render partial: 'all_time_hof'
18 18 Please select a problem.
19 19 - else
20 20 =render partial: 'task_hof'
21 + %h2 Submission History
22 + =render partial: 'application/bar_graph', locals: { histogram: @histogram }
21 23
22 -
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,29 +1,43
1 1 - content_for :header do
2 2 = javascript_include_tag 'local_jquery'
3 3
4 - %script{:type=>"text/javascript"}
4 + :javascript
5 5 $(function () {
6 6 $('#submission_table').tablesorter({widgets: ['zebra']});
7 7 });
8 8
9 9 :css
10 10 .fix-width {
11 11 font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
12 12 }
13 13
14 - %h1= @user.full_name + ' Profile'
14 + %h1= @user.full_name
15 15
16 - %h2 Basic info
17 16 <b>Login:</b> #{@user.login} <br/>
18 17 <b>Full name:</b> #{@user.full_name} <br />
19 18
20 19
21 20 %h2 Problem Stat
21 + %table.info
22 + %thead
23 + %tr.info-head
24 + %th Stat
25 + %th Value
26 + %tbody
27 + %tr{class: cycle('info-even','info-odd')}
28 + %td.info_param Submissions
29 + %td= @summary[:count]
30 + %tr{class: cycle('info-even','info-odd')}
31 + %td.info_param Solved/Attempted Problem
32 + %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
22 33
23 - %h2 Submissions
34 + %h2 Submission History
35 +
36 + =render partial: 'application/bar_graph', locals: {histogram: @histogram, param: {bar_width: 7}}
37 +
24 38
25 39 %table.tablesorter-cafe#submission_table
26 40 %thead
27 41 %tr
28 42 %th ID
29 43 %th Problem code
@@ -36,13 +50,13
36 50 %th IP
37 51 %tbody
38 52 - @submission.each do |s|
39 53 - next unless s.problem
40 54 %tr
41 55 %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
42 - %td= s.problem.name
56 + %td= link_to s.problem.name, controller: "problems", action: "stat", id: s.problem
43 57 %td= s.problem.full_name
44 58 %td= s.language.pretty_name
45 59 %td #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
46 60 %td.fix-width= s.grader_comment
47 61 %td= (s.points*100)/s.problem.full_score
48 62 - if session[:admin]
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -26,14 +26,14
26 26 def self.stop_graders(pids)
27 27 pid_str = (pids.map { |process| process.pid.to_s }).join ' '
28 28 GraderScript.call_grader "stop #{pid_str}"
29 29 end
30 30
31 31 def self.start_grader(env)
32 - GraderScript.call_grader "#{env} queue &"
33 - GraderScript.call_grader "#{env} test_request &"
32 + GraderScript.call_grader "#{env} queue --err-log &"
33 + GraderScript.call_grader "#{env} test_request -err-log &"
34 34 end
35 35
36 36 def self.call_import_problem(problem_name,
37 37 problem_dir,
38 38 time_limit=1,
39 39 memory_limit=32,
You need to be logged in to leave comments. Login now