Update contest scoreboard

app/assets/stylesheets/main_table.css

@@ -69,4 +69,3 @@ table.main_table > tbody > tr > td, table.main_table > thead > tr > th {
 table.main_table > thead > tr > th {
   font-weight: bold;
 }
-

app/controllers/contests_controller.rb

@@ -1,7 +1,7 @@
 class ContestsController < ApplicationController
   def permitted_params
     @_permitted_params ||= begin
-      permitted_attributes = [:name, :start_time, :end_time, :duration, :problem_set_id, :startcode, :observation]
+      permitted_attributes = [:name, :start_time, :end_time, :duration, :problem_set_id, :startcode, :observation, :live_scoreboard, :show_unofficial_contestants]
       permitted_attributes << :owner_id if policy(@contest || Contest).transfer?
       params.require(:contest).permit(*permitted_attributes)
     end
@@ -49,7 +49,7 @@ def browse
   def show
     @contest = Contest.find(params[:id])
     if !policy(@contest).overview?
-      redirect_to info_contest_path(@contest)
+      redirect_to scoreboard_contest_path(@contest)
       return
     end
     @problem_associations = @contest.problem_set.problem_associations.includes(:problem)
@@ -64,15 +64,6 @@ def show
     render :layout => 'contest'
   end
 
-  def info
-    @contest = Contest.find(params[:id])
-    authorize @contest, :show?
-    @groups = Group.all
-    @contest_relation = @contest.get_relation(current_user.id) if user_signed_in?
-
-    render :layout => 'contest'
-  end
-
   def scoreboard
     @contest = Contest.find(params[:id])
     authorize @contest, :scoreboard?

app/models/contest.rb

@@ -72,7 +72,7 @@ def ended?
   end
 
   def scoreboard
-    scoreboard = self.contestant_records.select([:score, :time_taken, :user_id]).order("contest_relations.score DESC, time_taken").includes(:user)
+    scoreboard = self.contestant_records.select([:score, :time_taken, :user_id, :school_id, :school_year, :country_code]).order("contest_relations.score DESC, time_taken").includes(:user)
     problem_set.problems.each do |problem| # for each problem, query problem score as well
       scoreboard = scoreboard.select("scores_#{problem.id}.score AS score_#{problem.id}, scores_#{problem.id}.attempt AS attempt_#{problem.id}, scores_#{problem.id}.attempts AS attempts_#{problem.id}, scores_#{problem.id}.submission_id AS sub_#{problem.id}").joins("LEFT OUTER JOIN contest_scores AS scores_#{problem.id} ON scores_#{problem.id}.contest_relation_id = contest_relations.id AND scores_#{problem.id}.problem_id = #{problem.id}")
     end

app/models/contest_relation.rb

@@ -31,6 +31,11 @@ def status_text
     return "You have been registered, but the contest has not started yet." if !started?
   end
 
+  def country_name
+    country = ISO3166::Country[country_code || 'NZ']
+    country.name
+  end
+
   def start! checkin = true
     return false if started?
     self.checked_in = true

app/models/user.rb

@@ -14,6 +14,7 @@ class User < ActiveRecord::Base
   validates :name, :length => {:maximum => 100, :minimum => 2}
   validates :username, :length => { :in => 2..32 }, :format => { :with => /\A\w(\.?\w)*\z/, :message => "Only letters, numbers, underscores or non-adjacent dots allowed in username" }, :presence => true, :uniqueness => { :case_sensitive => false }
   validates :avatar, :file_size => { :maximum => 40.kilobytes.to_i }
+  validates :school, :absence => { message: "must be blank if outside New Zealand"}, if: -> {country_code != "NZ"}
 
   before_save do
     self.can_change_username = false if self.username_changed? # can only change username once

app/views/contests/_admin.html.erb

@@ -16,3 +16,7 @@
 <% end %>
 </ul>
 
+<p>
+  <b> Problem set: </b>
+  <%= link_to @contest.problem_set.name, @contest.problem_set %>
+</p>

app/views/contests/_form.html.erb

@@ -29,11 +29,18 @@
   </div>
   <div class="field">
     <%= f.label :duration %><br />
-    <%= f.text_field :duration %>
+    <%= f.text_field :duration, :value => @contest.duration || 3.0 %> hours
   </div>
   <div class="field">
     <%= f.label :observation %><br />
-    <%= f.select :observation, Contest::OBSERVATION.entries.invert %>
+    <%= f.select :observation, Contest::OBSERVATION.entries.invert %><br />
+    Users can only join a contest if they have been added manually, or belong to a group with access to the contest.
+    <ul>
+        <li>Public: Anyone can see the contest.</li>
+        <li>Protected: Only those in one of the contest's groups can see the contest.</li>
+        <li>Private: Only those explicitly added as contestants can see the contest.</li>
+    </ul>
+
   </div>
   <div class="field">
     <%= f.label :startcode %><br />
@@ -46,8 +53,16 @@
     <% else %>
       <%= handle(@contest.owner) %>
     <% end %>
-
   </div>
+  <div class="field">
+    <%= f.check_box :live_scoreboard %>
+    <%= f.label :live_scoreboard %> - If checked, other users' scores are shown during the contest. Otherwise, you may only see your own scores until the end of the contest.<br />
+  <div>
+  <div class="field">
+    <%= f.check_box :show_unofficial_contestants %>
+    <%= f.label :show_unofficial_contestants %> - If checked, unofficial contestants are not ranked. An offical contestant is any student enrolled in a NZ school.<br />
+  <div>
+  <br>
   <div class="actions">
     <%= f.submit %>
   </div>

app/views/contests/edit.html.erb

@@ -4,12 +4,3 @@
 <p>
 <%= render 'form' %>
 </p>
-<% if false # COMMENTED %>
-<p>
-<b> Problems: </b>
-<% @problems.each do |problem| %>
-  <%= link_to problem.name, problem_path(problem) %>
-  (<%= link_to "remove", :controller => "problem_contest", :action => "remove", :method => "post", :problem_id => problem, :contest_id => @contest %>)
-<% end %>
-</p>
-<% end %>

app/views/contests/scoreboard.html.erb

@@ -9,17 +9,27 @@
   //-->
   </script>
 <% end %>
+<% show_scoreboard = @contest.live_scoreboard || @contest.ended? || policy(@contest).inspect? %>
 <% if [email protected]? %>
   <em>The contest has not started yet.</em>
+<% elsif !show_scoreboard && (!user_signed_in? || [email protected]_competitor?(current_user)) %>
+  <em>The scoreboard is hidden until the end of the contest.</em>
 <% else %>
+  <% if @contest.show_unofficial_contestants && show_scoreboard %>
+    <div style="float:right">
+      <input type="checkbox" id="show_unofficial" onclick="toggle_unofficial()">
+      <label for="show_unofficial">Show Unofficial Contestants</label>
+    </div>
+  <% end %>
   <h2><%= @contest.finalized? ? "Final Results" : "Preliminary Results" %></h2>
-
-  <table class="main_table" >
+  <table class="main_table">
     <thead>
       <tr>
-        <th style="min-width: 25%;"> User </th>
+        <th style="width:1%; text-align: right"> # </th>
+        <th style="width:1%"></th>
+        <th>Username</th>
         <% @contest.problem_set.problems.each_with_index do |problem, prob_num|%>
-          <th style="min-width: 6em;">
+          <th >
             <% if policy(@contest).show_details? %>
               <%= link_to problem.name, problem_path(problem) %>
             <% else %>
@@ -29,20 +39,25 @@
             (<%= @weighting[problem.id] %>)
           </th>
         <% end %>
-        <th style="text-align: right"> Score </th>
-        <th> Time </th>
-        <th> Rank </th>
+        <th style="width:1%; text-align: right"> Score </th>
+        <th style="width:1%"> Time </th>
       </tr>
     </thead>
     <tbody>
-      <% median = @scoreboard[@scoreboard.length/2-1] %>
       <% rank = 1 %>
+      <% num_unofficial = 0 %>
       <% previous_record = @scoreboard.first %>
       <% @scoreboard.each_with_index do |record,index| %>
-        <% if !user_signed_in? or record.user && record.user.id != current_user.id && !policy(@contest).inspect? %>
-          <% next if record.score < median.score || (record.score == median.score && record.time_taken > median.time_taken) # no permission to view %>
-        <% end %>
-        <tr <% if user_signed_in? && record.user && record.user.id == current_user.id %> class="emphasized"<% end %>>
+        <% next if !show_scoreboard && (!user_signed_in? or record.user && record.user.id != current_user.id) # no permission to view %>
+        <% is_unofficial = @contest.show_unofficial_contestants && (record.school.nil? || record.school_year.nil?) %>
+        <tr class="<% if user_signed_in? && record.user && record.user.id == current_user.id %>emphasized<% end %><% if is_unofficial %> unofficial<% end %>">
+          <% num_unofficial += 1 if is_unofficial %>
+          <% rank = index + 1 - num_unofficial unless previous_record.score == record.score && previous_record.time_taken == record.time_taken %>
+          <% previous_record = record %>
+          <td style="text-align: right"> <%= rank unless is_unofficial || !show_scoreboard %> </td>
+          <td style="padding-left: 0; padding-right: 0;">
+            <%= flag_list(24){ flag(record.country_code.downcase, record.country_name, title: true) } if record.country_code %>
+          </td>
           <td>
             <% if record.user %>
               <%= link_to handle(record.user), record.user %>
@@ -52,7 +67,7 @@
           </td>
           <% link_to_submissions = user_signed_in? && record.user && (record.user.id == current_user.id || current_user.is_admin?) %>
           <% @problems.each do |prob|%>
-            <td style="min-width: 5em;">
+            <td>
               <span style="float: left; width: 2em; text-align: right;">
                 <%= record["score_#{prob.id}"].nil? ? "-":link_to_if(link_to_submissions, record["score_#{prob.id}"], submission_path(record["sub_#{prob.id}"])) %>
               </span>
@@ -66,11 +81,23 @@
           <% end %>
           <td style="text-align: right"> <%= record.score %> </td>
           <td> <%= format("%d:%02d:%02d",record.time_taken.to_i/3600,record.time_taken.to_i/60%60,record.time_taken.to_i%60) %> </td>
-          <% rank = index + 1 unless previous_record.score == record.score and previous_record.time_taken == record.time_taken %>
-          <% previous_record = record %>
-          <td align="right"> <%= rank %> </td>
         </tr>
       <% end %>
     </tbody>
   </table>
 <% end %>
+<script>
+  function toggle_unofficial() {
+    show_unofficial_contestants = document.getElementById("show_unofficial").checked;
+    unofficial = document.getElementsByClassName("unofficial");
+    for (let row of unofficial) {
+      if (row.classList.contains("emphasized")) continue  // always show current user
+      // row.style.visibility = show_unofficial_contestants ? "visible" : "collapse";  // has issues on safari
+      row.style.display = show_unofficial_contestants ? "table-row" : "none";  // can cause column widths to change
+    }
+    localStorage.setItem("show_unofficial", JSON.stringify(show_unofficial_contestants));
+  }
+
+  document.getElementById("show_unofficial").checked = JSON.parse(localStorage.getItem("show_unofficial"));
+  toggle_unofficial();  // run on page load to match checkbox state
+</script>

app/views/contests/show.html.erb

@@ -23,7 +23,7 @@
         <% if @contest.has_competitor?(current_user) %>
           <td><%= progress_bar(@contest.problem_score(current_user, problem), problem_association.weighting) %></td>
         <% end %>
-        <td><%= @contest.num_solved(problem) %></td>
+        <td><%= (@contest.live_scoreboard || @contest.ended? || policy(@contest).inspect?) ? @contest.num_solved(problem) : "?" %></td>
       </tr>
     <% end %>
   </tbody>

app/views/layouts/contest.html.erb

@@ -87,7 +87,6 @@
 #  SimpleNavigation::ItemContainer.new do |menu|
   render_navigation do |menu|
     menu.dom_class = :tab_menu
-    menu.item :info, "info", info_contest_path(@contest) if policy(@contest).show?
     menu.item :problems, "problems", contest_path(@contest) if policy(@contest).overview?
     menu.item :contestants, "contestants", contestants_contest_path(@contest) if policy(@contest).contestants?
     menu.item :supervisors, "supervisors", supervisors_contest_path(@contest) if policy(@contest).manage?

db/migrate/20200418113600_add_live_scoreboard_field.rb

@@ -0,0 +1,5 @@
+class AddLiveScoreboardField < ActiveRecord::Migration
+    def change
+      add_column :contests, :live_scoreboard, :boolean, :default => true
+    end
+  end

db/migrate/20200418113601_add_offical_contestants.rb

@@ -0,0 +1,5 @@
+class AddOfficalContestants < ActiveRecord::Migration
+    def change
+      add_column :contests, :show_unofficial_contestants, :boolean, :default => false
+    end
+  end

db/migrate/20210206104409_remove_schools_for_foreign_users.rb

@@ -0,0 +1,13 @@
+class RemoveSchoolsForForeignUsers < ActiveRecord::Migration
+  def up
+    User.find_each do |user|
+      if user.country_code != "NZ" && user.school
+        user.school = nil
+        user.save
+      end
+    end
+  end
+
+  def down
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160131000430) do
+ActiveRecord::Schema.define(version: 20210206104409) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -114,9 +114,11 @@
     t.integer  "problem_set_id"
     t.datetime "finalized_at"
     t.string   "startcode"
-    t.integer  "observation",    default: 1
-    t.integer  "registration",   default: 0
-    t.integer  "affiliation",    default: 0
+    t.integer  "observation",                 default: 1
+    t.integer  "registration",                default: 0
+    t.integer  "affiliation",                 default: 0
+    t.boolean  "live_scoreboard",             default: true
+    t.boolean  "show_unofficial_contestants", default: false
   end
 
   create_table "entities", force: true do |t|