cafe-grader-web

Commit r262:9f069571bd87 public

parent | child
Description:
contest ends after user is dead, added status xml for visualization
Commit status:
[Not Reviewed]
References:
default
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

r262:9f069571bd87 - - 4 files changed: 33 inserted, 7 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,17
1 + <?xml version="1.0"?>
2 + <codejom>
3 + <% @dead_users.each do |user| %>
4 + <node>
5 + <name><%= user.login %></name>
6 + <depth>100</depth>
7 + </node>
8 + <% end %>
9 + <% @levels.each do |level| %>
10 + <% @level_users[level].each do |user| %>
11 + <node>
12 + <name><%= user.login %></name>
13 + <depth><%= level %></depth>
14 + </node>
15 + <% end %>
16 + <% end %>
17 + </codejom>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -12,10 +12,8
12 @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
12 @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
13 @levels.each { |l| @level_users[l] = [] }
13 @levels.each { |l| @level_users[l] = [] }
14 User.find(:all).find_all{|user| not user.admin? }.each do |user|
14 User.find(:all).find_all{|user| not user.admin? }.each do |user|
15 - if user.codejom_status==nil
16 user.update_codejom_status
15 user.update_codejom_status
17 user.codejom_status(true) # reload
16 user.codejom_status(true) # reload
18 - end
19
17
20 if not user.codejom_status.alive
18 if not user.codejom_status.alive
21 @dead_users << user
19 @dead_users << user
@@ -27,10 +25,7
27 respond_to do |format|
25 respond_to do |format|
28 format.html
26 format.html
29 format.xml do
27 format.xml do
30 - render :xml => {
28 + render :template => 'statuses/index.xml.erb'
31 - :levels => @level_users,
32 - :dead_users => @dead_users
33 - }
34 end
29 end
35 end
30 end
36 end
31 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -78,12 +78,20
78 # if the contest is over
78 # if the contest is over
79 if Configuration.time_limit_mode?
79 if Configuration.time_limit_mode?
80 if user.contest_finished?
80 if user.contest_finished?
81 + if (user.codejom_status) and (not user.codejom_status.alive)
82 + header = <<CONTEST_OVER
83 + <tr><td colspan="2" align="center">
84 + <span class="contest-over-msg">BYE-BYE. YOU ARE DEAD</span>
85 + </td></tr>
86 + CONTEST_OVER
87 + else
81 header = <<CONTEST_OVER
88 header = <<CONTEST_OVER
82 <tr><td colspan="2" align="center">
89 <tr><td colspan="2" align="center">
83 <span class="contest-over-msg">THE CONTEST IS OVER</span>
90 <span class="contest-over-msg">THE CONTEST IS OVER</span>
84 </td></tr>
91 </td></tr>
85 CONTEST_OVER
92 CONTEST_OVER
86 end
93 end
94 + end
87 if !user.contest_started?
95 if !user.contest_started?
88 time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
96 time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
89 else
97 else
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -209,7 +209,13
209 def contest_finished?
209 def contest_finished?
210 if Configuration.contest_mode?
210 if Configuration.contest_mode?
211 return false if site==nil
211 return false if site==nil
212 - return site.finished?
212 + if site.finished?
213 + return true
214 + elsif codejom_status!=nil
215 + return (not codejom_status.alive)
216 + else
217 + return false
218 + end
213 elsif Configuration.indv_contest_mode?
219 elsif Configuration.indv_contest_mode?
214 time_limit = Configuration.contest_time_limit
220 time_limit = Configuration.contest_time_limit
215
221
You need to be logged in to leave comments. Login now