cafe-grader-web Commit - r262:9f069571bd87

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r262:9f069571bd87 - Thu, 11 Feb 2010 05:24:36 - 4 files changed: 36 inserted, 10 deleted

app/views/statuses/index.xml.erb created 644 ¶ +17

			@@ -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>

app/controllers/statuses_controller.rb ¶ +3 -8

               class StatusesController < ApplicationController
                 def index
                   if not SHOW_CONTEST_STATUS
                     render :status => 403 and return
                   end
                   problem_count = Problem.available_problem_count
                   @dead_users = []
                   @level_users = {}
                   @levels = (0..CODEJOM_MAX_ALIVE_LEVEL)
                   @levels.each { |l| @level_users[l] = [] }
                   User.find(:all).find_all{|user| not user.admin? }.each do |user|
-            -       if user.codejom_status==nil
-            -         user.update_codejom_status
-            -         user.codejom_status(true)  # reload
-            -       end
+            +       user.update_codejom_status
+            +       user.codejom_status(true)  # reload
                     if not user.codejom_status.alive
                       @dead_users << user
                     else
                       @level_users[user.codejom_level] << user
                     end
                   end
                   respond_to do |format|
                     format.html
                     format.xml do
-            -         render :xml => {
-            -           :levels => @level_users,
-            -           :dead_users => @dead_users
-            -         }
+            +         render :template => 'statuses/index.xml.erb'
                     end
                   end
                 end
               end

app/helpers/application_helper.rb ¶ +9 -1

                   if Configuration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.log_out'}]", 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def format_short_duration(duration)
                   return '' if duration==nil
                   d = duration.to_f
                   return Time.at(d).gmtime.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if Configuration.time_limit_mode?
                     if user.contest_finished?
-            -         header = <<CONTEST_OVER
+            +         if (user.codejom_status) and (not user.codejom_status.alive)
+            +           header = <<CONTEST_OVER
+            + <tr><td colspan="2" align="center">
+            + <span class="contest-over-msg">BYE-BYE. YOU ARE DEAD</span>
+            + </td></tr>
+            + CONTEST_OVER
+            +         else
+            +           header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
+            +         end
-                    end
                     if !user.contest_started?
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.contest_not_started')
                     else
                       time_left = "&nbsp;&nbsp;" + (t 'title_bar.remaining_time') +
                         " #{format_short_duration(user.contest_time_left)}"
                     end
                   end
                   #
                   # if the contest is in the anaysis mode
                   if Configuration.analysis_mode?
                     header = <<ANALYSISMODE
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">ANALYSIS MODE</span>
               </td></tr>
               ANALYSISMODE
                   end
                   contest_name = Configuration['contest.name']
                   #
                   # build real title bar
                   <<TITLEBAR
               <div class="title">
               <table>
               #{header}
               <tr>
               <td class="left-col">
               #{user.full_name}<br/>
               #{t 'title_bar.current_time'} #{format_short_time(Time.new)}
               #{time_left}
               <br/>
               </td>
               <td class="right-col">#{contest_name}</td>
               </tr>
               </table>
               </div>
               TITLEBAR
                 end
               end

app/models/user.rb ¶ +7 -1

                     encrypt_new_password
                   end
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
                 def self.random_password(length=5)
                   chars = 'abcdefghjkmnopqrstuvwxyz'
                   password = ''
                   length.times { password << chars[rand(chars.length - 1)] }
                   password
                 end
                 def self.find_non_admin_with_prefix(prefix='')
                   users = User.find(:all)
                   return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
                 end
                 # Contest information
                 def contest_time_left
                   if Configuration.contest_mode?
                     return nil if site==nil
                     return site.time_left
                   elsif Configuration.indv_contest_mode?
                     time_limit = Configuration.contest_time_limit
                     if contest_stat==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end
                 def contest_finished?
                   if Configuration.contest_mode?
                     return false if site==nil
-            -       return site.finished?
+            +       if site.finished?
+            +         return true
+            +       elsif codejom_status!=nil
+            +         return (not codejom_status.alive)
+            +       else
+            +         return false
+            +       end
                   elsif Configuration.indv_contest_mode?
                     time_limit = Configuration.contest_time_limit
                     return false if contest_stat==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
                   if Configuration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
                 # For Code Jom
                 def update_codejom_status
                   status = codejom_status || CodejomStatus.new(:user => self)
                   problem_count = Problem.available_problem_count
                   status.num_problems_passed = (self.submission_statuses.find_all {|s| s.passed and s.problem.available }).length
                   status.alive = (problem_count - (status.num_problems_passed)) <= CODEJOM_MAX_ALIVE_LEVEL
                   status.save
                 end
                 def codejom_level
                   problem_count = Problem.available_problem_count
                   if codejom_status!=nil
                     return problem_count - codejom_status.num_problems_passed
                   else
                     return problem_count
                   end
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
                   def assign_default_site
                     # have to catch error when migrating (because self.site is not available).
                     begin

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

r262:9f069571bd87 - Thu, 11 Feb 2010 05:24:36 - 4 files changed: 36 inserted, 10 deleted

Sign in to your account

Commit r262:9f069571bd87 public

Author

r262:9f069571bd87 - Thu, 11 Feb 2010 05:24:36 - 4 files changed: 36 inserted, 10 deleted

Commit `r262:9f069571bd87` public