Add delay_time

Author: lw

cms/db/__init__.py

@@ -76,7 +76,7 @@
 
 # Instantiate or import these objects.
 
-version = 11
+version = 12
 
 
 engine = create_engine(config.database, echo=config.database_debug,

cms/db/contest.py

@@ -157,6 +157,7 @@ class Contest(Base):
     # Max contest time for each user in seconds.
     per_user_time = Column(
         Interval,
+        CheckConstraint("per_user_time >= '0 seconds'"),
         nullable=True)
 
     # Maximum number of submissions or user_tests allowed for each user

cms/db/user.py

@@ -5,7 +5,7 @@
 # Copyright © 2010-2012 Giovanni Mascellani <mascellani@poisson.phc.unipi.it>
 # Copyright © 2010-2012 Stefano Maggiolo <s.maggiolo@gmail.com>
 # Copyright © 2010-2012 Matteo Boscariol <boscarim@hotmail.com>
-# Copyright © 2012 Luca Wehrstedt <luca.wehrstedt@gmail.com>
+# Copyright © 2012-2014 Luca Wehrstedt <luca.wehrstedt@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -30,7 +30,8 @@
 
 from datetime import timedelta
 
-from sqlalchemy.schema import Column, ForeignKey, UniqueConstraint
+from sqlalchemy.schema import Column, ForeignKey, CheckConstraint, \
+    UniqueConstraint
 from sqlalchemy.types import Boolean, Integer, String, Unicode, DateTime, \
     Interval
 from sqlalchemy.orm import relationship, backref
@@ -131,9 +132,18 @@ class User(Base):
         DateTime,
         nullable=True)
 
+    # A shift in the time interval during which the user is allowed to
+    # submit.
+    delay_time = Column(
+        Interval,
+        CheckConstraint("delay_time >= '0 seconds'"),
+        nullable=False,
+        default=timedelta())
+
     # An extra amount of time allocated for this user.
     extra_time = Column(
         Interval,
+        CheckConstraint("extra_time >= '0 seconds'"),
         nullable=False,
         default=timedelta())
 

cms/server/AdminWebServer.py

@@ -1763,6 +1763,7 @@ def post(self, user_id):
 
             self.get_string(attrs, "timezone", empty=None)
             self.get_datetime(attrs, "starting_time")
+            self.get_timedelta_sec(attrs, "delay_time")
             self.get_timedelta_sec(attrs, "extra_time")
 
             self.get_bool(attrs, "hidden")
@@ -1803,6 +1804,7 @@ def post(self, contest_id):
 
             self.get_string(attrs, "timezone", empty=None)
             self.get_datetime(attrs, "starting_time")
+            self.get_timedelta_sec(attrs, "delay_time")
             self.get_timedelta_sec(attrs, "extra_time")
 
             self.get_bool(attrs, "hidden")

cms/server/ContestWebServer.py

@@ -304,7 +304,7 @@ def render_params(self):
             res = compute_actual_phase(
                 self.timestamp, self.contest.start, self.contest.stop,
                 self.contest.per_user_time, self.current_user.starting_time,
-                timedelta(), self.current_user.extra_time)
+                self.current_user.delay_time, self.current_user.extra_time)
 
             ret["actual_phase"], ret["current_phase_begin"], \
                 ret["current_phase_end"], ret["valid_phase_begin"], \

cms/server/templates/admin/add_user.html

@@ -42,6 +42,10 @@ <h2 id="title_general_info" class="toggling_on">General information</h2>
         <td>First login time during contest</td>
         <td><input type="text" name="starting_time" value=""></td>
       </tr>
+      <tr>
+        <td>Delay time (in seconds)</td>
+        <td><input type="text" name="delay_time" value="0"></td>
+      </tr>
       <tr>
         <td>Extra time (in seconds)</td>
         <td><input type="text" name="extra_time" value="0"></td>

cms/server/templates/admin/user.html

@@ -192,6 +192,10 @@ <h2 id="title_general_info" class="toggling_on">General Information</h2>
         <td>First login time during contest (in UTC)</td>
         <td><input type="text" name="starting_time" value="{{ str(selected_user.starting_time) if selected_user.starting_time is not None else "" }}"></td>
       </tr>
+      <tr>
+        <td>Delay (in seconds)</td>
+        <td><input type="text" name="delay_time" value="{{ int(selected_user.delay_time.total_seconds()) }}"></td>
+      </tr>
       <tr>
         <td>Extra time (in seconds)</td>
         <td><input type="text" name="extra_time" value="{{ int(selected_user.extra_time.total_seconds()) }}"></td>

cmscontrib/updaters/update_12.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python2
+# -*- coding: utf-8 -*-
+
+# Contest Management System - http://cms-dev.github.io/
+# Copyright © 2014 Luca Wehrstedt <luca.wehrstedt@gmail.com>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""A class to update a dump created by CMS.
+
+Used by ContestImporter and DumpUpdater.
+
+This adapts the dump to some changes in the model introduced in the
+commit that created this same file.
+
+"""
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+from __future__ import print_function
+
+
+class Updater(object):
+
+    def __init__(self, data):
+        assert data["_version"] == 11
+        self.objs = data
+
+    def run(self):
+        for k, v in self.objs.iteritems():
+            if k.startswith("_"):
+                continue
+            if v["_class"] == "User":
+                v["delay_time"] = 0
+
+        return self.objs