cafe-grader-web

Commit r518:4d5c727a0d13 public

parent | child
Description:
fix displaying bug
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore 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

r518:4d5c727a0d13 - - 2 files changed: 2 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -103,114 +103,115
103 103 flash[:notice] = 'Error: submissions for that problem are not viewable.'
104 104 return
105 105 end
106 106 end
107 107
108 108 return unless @problem
109 109
110 110 @by_lang = {} #aggregrate by language
111 111
112 112 range =65
113 113 @histogram = { data: Array.new(range,0), summary: {} }
114 114 @summary = {count: 0, solve: 0, attempt: 0}
115 115 user = Hash.new(0)
116 116 Submission.where(problem_id: @problem.id).find_each do |sub|
117 117 #histogram
118 118 d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
119 119 @histogram[:data][d.to_i] += 1 if d < range
120 120
121 121 @summary[:count] += 1
122 122 user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
123 123
124 124 lang = Language.find_by_id(sub.language_id)
125 125 next unless lang
126 126 next unless sub.points >= @problem.full_score
127 127
128 128 #initialize
129 129 unless @by_lang.has_key?(lang.pretty_name)
130 130 @by_lang[lang.pretty_name] = {
131 131 runtime: { avail: false, value: 2**30-1 },
132 132 memory: { avail: false, value: 2**30-1 },
133 133 length: { avail: false, value: 2**30-1 },
134 134 first: { avail: false, value: DateTime.new(3000,1,1) }
135 135 }
136 136 end
137 137
138 138 if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
139 139 @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
140 140 end
141 141
142 142 if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
143 143 @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
144 144 end
145 145
146 146 if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
147 147 !sub.user.admin?
148 148 @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
149 149 end
150 150
151 151 if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
152 152 @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
153 153 end
154 154 end
155 155
156 156 #process user_id
157 157 @by_lang.each do |lang,prop|
158 158 prop.each do |k,v|
159 159 v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
160 160 end
161 161 end
162 162
163 163 #sum into best
164 164 if @by_lang and @by_lang.first
165 165 @best = @by_lang.first[1].clone
166 166 @by_lang.each do |lang,prop|
167 167 if @best[:runtime][:value] >= prop[:runtime][:value]
168 168 @best[:runtime] = prop[:runtime]
169 169 @best[:runtime][:lang] = lang
170 170 end
171 171 if @best[:memory][:value] >= prop[:memory][:value]
172 172 @best[:memory] = prop[:memory]
173 173 @best[:memory][:lang] = lang
174 174 end
175 175 if @best[:length][:value] >= prop[:length][:value]
176 176 @best[:length] = prop[:length]
177 177 @best[:length][:lang] = lang
178 178 end
179 179 if @best[:first][:value] >= prop[:first][:value]
180 180 @best[:first] = prop[:first]
181 181 @best[:first][:lang] = lang
182 182 end
183 183 end
184 184 end
185 185
186 186 @histogram[:summary][:max] = [@histogram[:data].max,1].max
187 187 @summary[:attempt] = user.count
188 188 user.each_value { |v| @summary[:solve] += 1 if v == 1 }
189 189 end
190 190
191 191 def stuck #report struggling user,problem
192 192 # init
193 193 user,problem = nil
194 194 solve = true
195 195 tries = 0
196 196 @struggle = Array.new
197 197 record = {}
198 198 Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
199 + next unless sub.user and sub.problem
199 200 if user != sub.user_id or problem != sub.problem_id
200 201 @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
201 202 record = {user: sub.user, problem: sub.problem}
202 203 user,problem = sub.user_id, sub.problem_id
203 204 solve = false
204 205 tries = 0
205 206 end
206 207 if sub.points >= sub.problem.full_score
207 208 solve = true
208 209 else
209 210 tries += 1
210 211 end
211 212 end
212 213 @struggle.sort!{|a,b| b[:tries] <=> a[:tries] }
213 214 @struggle = @struggle[0..50]
214 215 end
215 216
216 217 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,72 +1,72
1 1 - content_for :head do
2 2 = stylesheet_link_tag 'graders'
3 3 <meta http-equiv ="refresh" content="60"/>
4 4
5 5 %h1 Grader information
6 6
7 7 = link_to '[Refresh]', :action => 'list'
8 8 %br/
9 9
10 10 .submitbox
11 11 .item
12 12 Grader control:
13 13 .item
14 14 = form_for :clear, :url => {:action => 'start_grading'} do |f|
15 15 = submit_tag 'Start graders in grading env'
16 16 .item
17 17 = form_for :clear, :url => {:action => 'start_exam'} do |f|
18 18 = submit_tag 'Start graders in exam env'
19 19 .item
20 20 = form_for :clear, :url => {:action => 'stop_all'} do |f|
21 21 = submit_tag 'Stop all running graders'
22 22 .item
23 23 = form_for :clear, :url => {:action => 'clear_all'} do |f|
24 24 = submit_tag 'Clear all data'
25 25 %br{:style => 'clear:both'}/
26 26
27 27 %div{style: 'width:500px; float: left;'}
28 28 - if @last_task
29 29 Last task:
30 30 = link_to "#{@last_task.id}", :action => 'view', :id => @last_task.id, :type => 'Task'
31 31
32 32 %br/
33 33
34 34 - if @last_test_request
35 35 Last test_request:
36 36 = link_to "#{@last_test_request.id}", :action => 'view', :id => @last_test_request.id, :type => 'TestRequest'
37 37
38 38 %h2 Current graders
39 39
40 40 = render :partial => 'grader_list', :locals => {:grader_list => @grader_processes}
41 41
42 42 %h2 Stalled graders
43 43
44 44 = render :partial => 'grader_list', :locals => {:grader_list => @stalled_processes}
45 45
46 46 %h2 Terminated graders
47 47
48 48 = form_for :clear, :url => {:action => 'clear_terminated'} do |f|
49 49 = submit_tag 'Clear data for terminated graders'
50 50
51 51 = render :partial => 'grader_list', :locals => {:grader_list => @terminated_processes}
52 52 %div{}
53 53 %h2 Last 20 submissions
54 54 %table.graders
55 55 %thead
56 56 %th ID
57 57 %th User
58 58 %th Problem
59 59 %th Submitted
60 60 %th Graded
61 61 %th Result
62 62 %tbody
63 63 - @submission.each do |sub|
64 64 %tr.inactive
65 65 %td= link_to sub.id, controller: 'graders' ,action: 'submission', id: sub.id
66 66 %td= sub.try(:user).try(:full_name)
67 67 %td= sub.try(:problem).try(:full_name)
68 68 %td= "#{time_ago_in_words(sub.submitted_at)} ago"
69 - %td= "#{time_ago_in_words(sub.graded_at)} ago"
69 + %td= "#{sub.graded_at ? time_ago_in_words(sub.graded_at) : ''} ago"
70 70 %td= sub.grader_comment
71 71
72 72
You need to be logged in to leave comments. Login now