Merge lp:~ivle-dev/ivle/submissions into lp:ivle

[William Grant]

Allow students to submit projects from personal or group repositories.

[William Grant (wgrant)]

This is the first bit of the student end of the submission functionality. It only includes creation of submissions - viewing them is out of scope.

[Matt Giuca (mgiuca)]

Code looks good to me. Haven't run it though.

review: Approve

[Nick Chadwick (chadnickbok)]

I approve.

I dislike that there is an extension object in our database, yet this object is not respected.

review: Approve

[lp:~ivle-dev/ivle/submissions]

1210. By William Grant on 2009-04-07

Remove the NOT NULL and default from project_set.max_students_per_group.

NULL now means it's a solo project - 0 means there is no limit.

1211. By William Grant on 2009-04-07

Respect the new max_students_per_group semantics in Python.

=== modified file 'bin/ivle-config'
--- bin/ivle-config	2009-03-03 23:19:52 +0000
+++ bin/ivle-config	2009-03-26 05:33:03 +0000
@@ -387,6 +387,7 @@
 [ivle.webapp.tos#Plugin]
 [ivle.webapp.userservice#Plugin]
 [ivle.webapp.fileservice#Plugin]
+[ivle.webapp.submit#Plugin]
 """)
     plugindefault.close()
     print "Successfully wrote %s" % plugindefaultfile

=== modified file 'ivle/database.py'
--- ivle/database.py	2009-03-17 01:42:19 +0000
+++ ivle/database.py	2009-04-06 10:21:22 +0000
@@ -38,6 +38,7 @@
             'User',
             'Subject', 'Semester', 'Offering', 'Enrolment',
             'ProjectSet', 'Project', 'ProjectGroup', 'ProjectGroupMembership',
+            'Assessed', 'ProjectSubmission', 'ProjectExtension',
             'Exercise', 'Worksheet', 'WorksheetExercise',
             'ExerciseSave', 'ExerciseAttempt',
             'TestCase', 'TestSuite', 'TestSuiteVar'
@@ -117,6 +118,10 @@
         return self.hash_password(password) == self.passhash
 
     @property
+    def display_name(self):
+        return self.fullname
+
+    @property
     def password_expired(self):
         fieldval = self.pass_exp
         return fieldval is not None and datetime.datetime.now() > fieldval
@@ -184,6 +189,29 @@
         '''A sanely ordered list of all of the user's enrolments.'''
         return self._get_enrolments(False) 
 
+    def get_projects(self, offering=None, active_only=True):
+        '''Return Projects that the user can submit.
+
+        This will include projects for offerings in which the user is
+        enrolled, as long as the project is not in a project set which has
+        groups (ie. if maximum number of group members is 0).
+
+        Unless active_only is False, only projects for active offerings will
+        be returned.
+
+        If an offering is specified, returned projects will be limited to
+        those for that offering.
+        '''
+        return Store.of(self).find(Project,
+            Project.project_set_id == ProjectSet.id,
+            ProjectSet.max_students_per_group == 0,
+            ProjectSet.offering_id == Offering.id,
+            (offering is None) or (Offering.id == offering.id),
+            Semester.id == Offering.semester_id,
+            (not active_only) or (Semester.state == u'current'),
+            Enrolment.offering_id == Offering.id,
+            Enrolment.user_id == self.id)
+
     @staticmethod
     def hash_password(password):
         return md5.md5(password).hexdigest()
@@ -198,7 +226,7 @@
 
     def get_permissions(self, user):
         if user and user.admin or user is self:
-            return set(['view', 'edit'])
+            return set(['view', 'edit', 'submit_project'])
         else:
             return set()
 
@@ -363,18 +391,53 @@
     __storm_table__ = "project"
 
     id = Int(name="projectid", primary=True)
+    name = Unicode()
+    short_name = Unicode()
     synopsis = Unicode()
     url = Unicode()
     project_set_id = Int(name="projectsetid")
     project_set = Reference(project_set_id, ProjectSet.id)
     deadline = DateTime()
 
+    assesseds = ReferenceSet(id, 'Assessed.project_id')
+    submissions = ReferenceSet(id,
+                               'Assessed.project_id',
+                               'Assessed.id',
+                               'ProjectSubmission.assessed_id')
+
     __init__ = _kwarg_init
 
     def __repr__(self):
-        return "<%s '%s' in %r>" % (type(self).__name__, self.synopsis,
+        return "<%s '%s' in %r>" % (type(self).__name__, self.short_name,
                                   self.project_set.offering)
 
+    def can_submit(self, principal):
+        return (self in principal.get_projects() and
+                self.deadline > datetime.datetime.now())
+
+    def submit(self, principal, path, revision, who):
+        """Submit a Subversion path and revision to a project.
+
+        'principal' is the owner of the Subversion repository, and the
+        entity on behalf of whom the submission is being made. 'path' is
+        a path within that repository, and 'revision' specifies which
+        revision of that path. 'who' is the person making the submission.
+        """
+
+        if not self.can_submit(principal):
+            raise Exception('cannot submit')
+
+        a = Assessed.get(Store.of(self), principal, self)
+        ps = ProjectSubmission()
+        ps.path = path
+        ps.revision = revision
+        ps.date_submitted = datetime.datetime.now()
+        ps.assessed = a
+        ps.submitter = who
+
+        return ps
+
+
 class ProjectGroup(Storm):
     __storm_table__ = "project_group"
 
@@ -398,6 +461,39 @@
         return "<%s %s in %r>" % (type(self).__name__, self.name,
                                   self.project_set.offering)
 
+    @property
+    def display_name(self):
+        return '%s (%s)' % (self.nick, self.name)
+
+    def get_projects(self, offering=None, active_only=True):
+        '''Return Projects that the group can submit.
+
+        This will include projects in the project set which owns this group,
+        unless the project set disallows groups (in which case none will be
+        returned).
+
+        Unless active_only is False, projects will only be returned if the
+        group's offering is active.
+
+        If an offering is specified, projects will only be returned if it
+        matches the group's.
+        '''
+        return Store.of(self).find(Project,
+            Project.project_set_id == ProjectSet.id,
+            ProjectSet.id == self.project_set.id,
+            ProjectSet.max_students_per_group > 0,
+            ProjectSet.offering_id == Offering.id,
+            (offering is None) or (Offering.id == offering.id),
+            Semester.id == Offering.semester_id,
+            (not active_only) or (Semester.state == u'current'))
+
+
+    def get_permissions(self, user):
+        if user.admin or user in self.members:
+            return set(['submit_project'])
+        else:
+            return set()
+
 class ProjectGroupMembership(Storm):
     __storm_table__ = "group_member"
     __storm_primary__ = "user_id", "project_group_id"
@@ -413,6 +509,72 @@
         return "<%s %r in %r>" % (type(self).__name__, self.user,
                                   self.project_group)
 
+class Assessed(Storm):
+    __storm_table__ = "assessed"
+
+    id = Int(name="assessedid", primary=True)
+    user_id = Int(name="loginid")
+    user = Reference(user_id, User.id)
+    project_group_id = Int(name="groupid")
+    project_group = Reference(project_group_id, ProjectGroup.id)
+
+    project_id = Int(name="projectid")
+    project = Reference(project_id, Project.id)
+
+    extensions = ReferenceSet(id, 'ProjectExtension.assessed_id')
+    submissions = ReferenceSet(id, 'ProjectSubmission.assessed_id')
+
+    def __repr__(self):
+        return "<%s %r in %r>" % (type(self).__name__,
+            self.user or self.project_group, self.project)
+
+    @classmethod
+    def get(cls, store, principal, project):
+        t = type(principal)
+        if t not in (User, ProjectGroup):
+            raise AssertionError('principal must be User or ProjectGroup')
+
+        a = store.find(cls,
+            (t is User) or (cls.project_group_id == principal.id),
+            (t is ProjectGroup) or (cls.user_id == principal.id),
+            Project.id == project.id).one()
+
+        if a is None:
+            a = cls()
+            if t is User:
+                a.user = principal
+            else:
+                a.project_group = principal
+            a.project = project
+            store.add(a)
+
+        return a
+
+
+class ProjectExtension(Storm):
+    __storm_table__ = "project_extension"
+
+    id = Int(name="extensionid", primary=True)
+    assessed_id = Int(name="assessedid")
+    assessed = Reference(assessed_id, Assessed.id)
+    deadline = DateTime()
+    approver_id = Int(name="approver")
+    approver = Reference(approver_id, User.id)
+    notes = Unicode()
+
+class ProjectSubmission(Storm):
+    __storm_table__ = "project_submission"
+
+    id = Int(name="submissionid", primary=True)
+    assessed_id = Int(name="assessedid")
+    assessed = Reference(assessed_id, Assessed.id)
+    path = Unicode()
+    revision = Int()
+    submitter_id = Int(name="submitter")
+    submitter = Reference(submitter_id, User.id)
+    date_submitted = DateTime()
+
+
 # WORKSHEETS AND EXERCISES #
 
 class Exercise(Storm):

=== modified file 'ivle/date.py'
--- ivle/date.py	2009-03-26 09:20:56 +0000
+++ ivle/date.py	2009-03-31 05:53:01 +0000
@@ -66,3 +66,62 @@
     # Else, include the year (mmm dd, yyyy)
     else:
         return dt.strftime("%b %d, %Y")
+
+def format_datetime_for_paragraph(datetime_or_seconds):
+    """Generate a compact representation of a datetime for use in a paragraph.
+
+    Given a datetime or number of seconds elapsed since the epoch, generates
+    a compact string representing the date and time in human-readable form.
+
+    Unlike make_date_nice_short, the time will always be included.
+
+    Also unlike make_date_nice_short, it is suitable for use in the middle of
+    a block of prose and properly handles timestamps in the future nicely.
+    """
+
+    dt = get_datetime(datetime_or_seconds)
+    now = datetime.datetime.now()
+
+    delta = dt - now
+
+    # If the date is earlier than now, we want to either say something like
+    # '5 days ago' or '25 seconds ago', 'yesterday at 08:54' or
+    # 'on 2009-03-26 at 20:09'.
+
+    # If the time is within one hour of now, we show it nicely in either
+    # minutes or seconds.
+
+    if abs(delta).days == 0 and abs(delta).seconds <= 1:
+        return 'now'
+
+    if abs(delta).days == 0 and abs(delta).seconds < 60*60:
+        if abs(delta) == delta:
+            # It's in the future.
+            prefix = 'in '
+            suffix = ''
+        else:
+            prefix = ''
+            suffix = ' ago'
+
+        # Show the number of minutes unless we are within two minutes.
+        if abs(delta).seconds >= 120:
+            return (prefix + '%d minutes' + suffix) % (abs(delta).seconds / 60)
+        else:
+            return (prefix + '%d seconds' + suffix) % (abs(delta).seconds)
+
+    if dt < now:
+        if dt.date() == now.date():
+            # Today.
+            return dt.strftime('today at %I:%M %p')
+        elif dt.date() == now.date() - datetime.timedelta(days=1):
+            # Yesterday.
+            return dt.strftime('yesterday at %I:%M %p')
+    elif dt > now:
+        if dt.date() == now.date():
+            # Today.
+            return dt.strftime('today at %I:%M %p')
+        elif dt.date() == now.date() + datetime.timedelta(days=1):
+            # Tomorrow
+            return dt.strftime('tomorrow at %I:%M %p')
+
+    return dt.strftime('on %Y-%m-%d at %I:%M %p')

=== modified file 'ivle/fileservice_lib/__init__.py'
--- ivle/fileservice_lib/__init__.py	2009-02-18 05:14:29 +0000
+++ ivle/fileservice_lib/__init__.py	2009-04-06 08:24:32 +0000
@@ -80,6 +80,8 @@
 
 import urllib
 
+import cjson
+
 import ivle.fileservice_lib.action
 import ivle.fileservice_lib.listing
 
@@ -102,12 +104,19 @@
     fields = req.get_fieldstorage()
     if req.method == 'POST':
         act = fields.getfirst('action')
-    
+
+    out = None
+
     if act is not None:
         try:
-            ivle.fileservice_lib.action.handle_action(req, act, fields)
+            out = ivle.fileservice_lib.action.handle_action(req, act, fields)
         except action.ActionError, message:
             req.headers_out['X-IVLE-Action-Error'] = urllib.quote(str(message))
 
-    return_type = fields.getfirst('return')
-    ivle.fileservice_lib.listing.handle_return(req, return_type == "contents")
+    if out:
+        req.content_type = 'application/json'
+        req.write(cjson.encode(out))
+    else:
+        return_type = fields.getfirst('return')
+        ivle.fileservice_lib.listing.handle_return(req,
+                                                   return_type == "contents")

=== modified file 'ivle/fileservice_lib/action.py'
--- ivle/fileservice_lib/action.py	2009-01-22 04:02:36 +0000
+++ ivle/fileservice_lib/action.py	2009-04-06 08:39:35 +0000
@@ -197,7 +197,7 @@
     except KeyError:
         # Default, just send an error but then continue
         raise ActionError("Unknown action")
-    action(req, fields)
+    return action(req, fields)
 
 def actionpath_to_urlpath(req, path):
     """Determines the URL path (relative to the student home) upon which the
@@ -738,15 +738,22 @@
 def action_svnrepostat(req, fields):
     """Discovers whether a path exists in a repo under the IVLE SVN root.
 
+    If it does exist, returns a dict containing its metadata.
+
     Reads fields: 'path'
     """
     path = fields.getfirst('path')
     url = ivle.conf.svn_addr + "/" + path
-    svnclient.exception_style = 1 
+    svnclient.exception_style = 1
 
     try:
         svnclient.callback_get_login = get_login
-        svnclient.info2(url)
+        info = svnclient.info2(url,
+            revision=pysvn.Revision(pysvn.opt_revision_kind.head))[0][1]
+        return {'svnrevision': info['rev'].number
+                  if info['rev'] and
+                     info['rev'].kind == pysvn.opt_revision_kind.number
+                  else None}
     except pysvn.ClientError, e:
         # Error code 170000 means ENOENT in this revision.
         if e[1][0][1] == 170000:

=== modified file 'ivle/fileservice_lib/listing.py'
--- ivle/fileservice_lib/listing.py	2009-01-22 02:14:14 +0000
+++ ivle/fileservice_lib/listing.py	2009-04-02 06:38:57 +0000
@@ -327,6 +327,15 @@
         filename = os.path.basename(fullpath)
     text_status = status.text_status
     d = {'svnstatus': str(text_status)}
+
+    if status.entry is not None:
+        d.update({
+           'svnurl': status.entry.url,
+           'svnrevision': status.entry.revision.number
+             if status.entry.revision.kind == pysvn.opt_revision_kind.number
+             else None,
+        })
+
     try:
         d.update(_fullpath_stat_fileinfo(fullpath))
     except OSError:

=== modified file 'ivle/webapp/base/ivle-headings.html'
--- ivle/webapp/base/ivle-headings.html	2009-03-25 04:29:35 +0000
+++ ivle/webapp/base/ivle-headings.html	2009-04-02 07:08:27 +0000
@@ -13,6 +13,7 @@
       <script py:if="not publicmode and write_javascript_settings" type="text/javascript">
         root_dir = "${root_dir}";
         public_host = "${public_host}";
+        svn_base = "${svn_base}";
         username = "${login}";
       </script>
 

=== modified file 'ivle/webapp/base/xhtml.py'
--- ivle/webapp/base/xhtml.py	2009-03-17 04:40:20 +0000
+++ ivle/webapp/base/xhtml.py	2009-04-02 07:08:27 +0000
@@ -103,6 +103,7 @@
         ctx['favicon'] = None
         ctx['root_dir'] = ivle.conf.root_dir
         ctx['public_host'] = ivle.conf.public_host
+        ctx['svn_base'] = ivle.conf.svn_addr
         ctx['write_javascript_settings'] = req.write_javascript_settings
         if req.user:
             ctx['login'] = req.user.login

=== modified file 'ivle/webapp/filesystem/browser/__init__.py'
--- ivle/webapp/filesystem/browser/__init__.py	2009-02-25 07:47:58 +0000
+++ ivle/webapp/filesystem/browser/__init__.py	2009-04-02 07:12:43 +0000
@@ -135,7 +135,7 @@
           ('Publishing', True, [
             ('publish', ['Publish',          'Make it so this directory can be seen by anyone on the web']),
             ('share',   ['Share this file',  'Get a link to this published file, to give to friends']),
-            ('submit',  ['Submit', 'Submit the selected files for an assignment'])
+            ('submit',  ['Submit', 'Submit the selected files for a project'])
           ]),
           ('File actions', True, [
             ('rename',  ['Rename',           'Change the name of this file']),

=== modified file 'ivle/webapp/filesystem/browser/media/browser.js'
--- ivle/webapp/filesystem/browser/media/browser.js	2009-03-25 11:25:11 +0000
+++ ivle/webapp/filesystem/browser/media/browser.js	2009-04-06 09:26:16 +0000
@@ -781,6 +781,15 @@
     /* Log should be available for revisions as well. */
     set_action_state("svnlog", single_versioned_path, true);
 
+    single_ivle_versioned_path = (
+         (
+          (numsel == 1 && (stat = file_listing[selected_files[0]])) ||
+          (numsel == 0 && (stat = current_file))
+         ) && stat.svnstatus != "unversioned"
+           && stat.svnurl
+           && stat.svnurl.substr(0, svn_base.length) == svn_base);
+    set_action_state(["submit"], single_ivle_versioned_path);
+
     /* There is currently nothing on the More Actions menu of use
      * when the current file is not a directory. Hence, just remove
      * it entirely.
@@ -838,8 +847,25 @@
         window.open(public_app_path("~" + current_path, filename), 'share')
         break;
     case "submit":
-        // TODO
-        alert("Not yet implemented: Submit");
+        if (selected_files.length == 1)
+            stat = file_listing[selected_files[0]];
+        else
+            stat = current_file;
+        path = stat.svnurl.substr(svn_base.length);
+
+        /* The working copy might not have an up-to-date version of the
+         * directory. While submitting like this could yield unexpected
+         * results, we should really submit the latest revision to minimise
+         * terrible mistakes - so we run off and ask fileservice for the
+         * latest revision.*/
+        $.post(app_path(service_app, current_path),
+            {"action": "svnrepostat", "path": path},
+            function(result)
+            {
+                window.location = path_join(app_path('+submit'), path) + '?revision=' + result.svnrevision;
+            },
+            "json");
+
         break;
     case "rename":
         action_rename(filename);

=== added directory 'ivle/webapp/submit'
=== added file 'ivle/webapp/submit/__init__.py'
--- ivle/webapp/submit/__init__.py	1970-01-01 00:00:00 +0000
+++ ivle/webapp/submit/__init__.py	2009-04-06 10:30:09 +0000
@@ -0,0 +1,147 @@
+# IVLE
+# Copyright (C) 2007-2009 The University of Melbourne
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+# Author: Will Grant
+
+"""Project submissions user interface."""
+
+import os.path
+import datetime
+
+from storm.locals import Store
+
+from ivle.database import (User, ProjectGroup, Offering, Subject, Semester,
+                           ProjectSet, Project, Enrolment)
+from ivle.webapp.errors import NotFound, BadRequest
+from ivle.webapp.base.xhtml import XHTMLView
+from ivle.webapp.base.plugins import ViewPlugin
+
+import ivle.date
+
+
+class SubmitView(XHTMLView):
+    """A view to submit a Subversion repository path for a project."""
+    template = 'submit.html'
+    tab = 'files'
+    permission = 'submit_project'
+
+    def __init__(self, req, name, path):
+        # We need to work out which entity owns the repository, so we look
+        # at the first two path segments. The first tells us the type.
+        self.context = self.get_repository_owner(req.store, name)
+        self.path = os.path.normpath(path)
+
+        if self.context is None:
+            raise NotFound()
+
+        self.offering = self.get_offering()
+
+    def get_repository_owner(self, store, name):
+        """Return the owner of the repository given the name and a Store."""
+        raise NotImplementedError()
+
+    def get_offering(self):
+        """Return the offering that this path can be submitted to."""
+        raise NotImplementedError()
+
+    def populate(self, req, ctx):
+        if req.method == 'POST':
+            data = dict(req.get_fieldstorage())
+            if 'revision' not in data:
+                raise BadRequest('No revision selected.')
+
+            try:
+                revision = int(data['revision'])
+            except ValueError:
+                raise BadRequest('Revision must be an integer.')
+
+            if 'project' not in data:
+                raise BadRequest('No project selected.')
+
+            try:
+                projectid = int(data['project'])
+            except ValueError:
+                raise BadRequest('Project must be an integer.')
+
+            project = req.store.find(Project, Project.id == projectid).one()
+
+            # This view's offering will be the sole offering for which the
+            # path is permissible. We need to check that.
+            if project.project_set.offering is not self.offering:
+                raise BadRequest('Path is not permissible for this offering')
+
+            if project is None:
+                raise BadRequest('Specified project does not exist')
+
+            project.submit(self.context, self.path, revision, req.user)
+
+            self.template = 'submitted.html'
+            ctx['project'] = project
+
+        ctx['req'] = req
+        ctx['principal'] = self.context
+        ctx['offering'] = self.offering
+        ctx['path'] = self.path
+        ctx['now'] = datetime.datetime.now()
+        ctx['format_datetime'] = ivle.date.format_datetime_for_paragraph
+
+
+class UserSubmitView(SubmitView):
+    def get_repository_owner(self, store, name):
+        '''Resolve the user name into a user.'''
+        return User.get_by_login(store, name)
+
+    def get_offering(self):
+        return Store.of(self.context).find(Offering,
+            Offering.id == Enrolment.offering_id,
+            Enrolment.user_id == self.context.id,
+            Offering.semester_id == Semester.id,
+            Semester.state == u'current',
+            Offering.subject_id == Subject.id,
+            Subject.short_name == self.path.split('/')[0],
+            ).one()
+
+
+class GroupSubmitView(SubmitView):
+    def get_repository_owner(self, store, name):
+        '''Resolve the subject_year_semester_group name into a group.'''
+        namebits = name.split('_', 3)
+        if len(namebits) != 4:
+            return None
+
+        # Find the project group with the given name in any project set in the
+        # offering of the given subject in the semester with the given year
+        # and semester.
+        return store.find(ProjectGroup,
+            ProjectGroup.name == namebits[3],
+            ProjectGroup.project_set_id == ProjectSet.id,
+            ProjectSet.offering_id == Offering.id,
+            Offering.subject_id == Subject.id,
+            Subject.short_name == namebits[0],
+            Offering.semester_id == Semester.id,
+            Semester.year == namebits[1],
+            Semester.semester == namebits[2]).one()
+
+    def get_offering(self):
+        return self.context.project_set.offering
+
+
+class Plugin(ViewPlugin):
+    urls = [
+        ('+submit/users/:name/*path', UserSubmitView),
+        ('+submit/groups/:name/*path', GroupSubmitView),
+    ]

=== added file 'ivle/webapp/submit/submit.html'
--- ivle/webapp/submit/submit.html	1970-01-01 00:00:00 +0000
+++ ivle/webapp/submit/submit.html	2009-04-06 10:30:09 +0000
@@ -0,0 +1,43 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://genshi.edgewall.org/">
+  <head>
+    <title>Submit project</title>
+  </head>
+  <body>
+    <h1>Submit project</h1>
+    <div id="ivle_padding">
+      <py:choose test="offering">
+        <div py:when="None">
+          <p>You may not submit files from <span style="font-family: monospace">${path}</span> in
+            <py:choose test="">
+              <span py:when="principal is req.user">your repository.</span>
+              <span py:otherwise="">the repository for ${principal.display_name}.</span>
+            </py:choose>
+            You can only submit files from a subject directory.
+          </p>
+        </div>
+        <div py:otherwise="">
+          <p>You are submitting <span style="font-family: monospace">${path}</span> from
+            <py:choose test="">
+              <span py:when="principal is req.user">your repository.</span>
+              <span py:otherwise="">the repository for ${principal.display_name}.</span>
+            </py:choose>
+          </p>
+          <p>You may submit to any open project in ${offering.subject.name}. Which project do you wish to submit this for?</p>
+          <form action="" method="post">
+            <ul style="list-style: none">
+              <li py:for="project in principal.get_projects(offering=offering)"
+                  py:with="attrs = {'disabled': 'disabled'} if project.deadline &lt; now else {}">
+                <input type="radio" name="project" id="project_${project.id}" value="${project.id}" py:attrs="attrs" />
+                <label for="project_${project.id}">${project.name} - <em>${project.synopsis}</em> - (due ${format_datetime(project.deadline)})</label>
+              </li>
+            </ul>
+            <p>Ensure that you have committed all changes - only changes in the repository will be submitted.</p>
+            <p>You may resubmit a project again at any time until its deadline.</p>
+            <p><input type="submit" value="Submit Project" /></p>
+          </form>
+        </div>
+      </py:choose>
+    </div>
+  </body>
+</html>

=== added file 'ivle/webapp/submit/submitted.html'
--- ivle/webapp/submit/submitted.html	1970-01-01 00:00:00 +0000
+++ ivle/webapp/submit/submitted.html	2009-04-06 10:30:09 +0000
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:py="http://genshi.edgewall.org/">
+  <head>
+    <title>Project submitted</title>
+  </head>
+  <body>
+    <h1>Project submitted</h1>
+    <div id="ivle_padding">
+      <p>You successfully submitted ${project.name} for ${offering.subject.name}.</p>
+    </div>
+  </body>
+</html>

=== added file 'userdb/migrations/20090406-01.sql'
--- userdb/migrations/20090406-01.sql	1970-01-01 00:00:00 +0000
+++ userdb/migrations/20090406-01.sql	2009-04-06 10:41:54 +0000
@@ -0,0 +1,40 @@
+BEGIN;
+
+ALTER TABLE project ALTER COLUMN synopsis TYPE TEXT;
+ALTER TABLE project ALTER COLUMN url TYPE TEXT;
+ALTER TABLE project ADD COLUMN short_name TEXT NOT NULL;
+ALTER TABLE project ADD COLUMN name TEXT NOT NULL;
+
+CREATE OR REPLACE FUNCTION check_project_namespacing_insertupdate()
+RETURNS trigger AS '
+    DECLARE
+        oid INTEGER;
+    BEGIN
+        IF TG_OP = ''UPDATE'' THEN
+            IF NEW.projectsetid = OLD.projectsetid AND NEW.short_name = OLD.short_name THEN
+                RETURN NEW;
+            END IF;
+        END IF;
+        SELECT offeringid INTO oid FROM project_set WHERE project_set.projectsetid = NEW.projectsetid;
+        PERFORM 1 FROM project, project_set
+        WHERE project_set.offeringid = oid AND
+              project.projectsetid = project_set.projectsetid AND
+              project.short_name = NEW.short_name;
+        IF found THEN
+            RAISE EXCEPTION ''a project named % already exists in offering ID %'', NEW.short_name, oid;
+        END IF;
+        RETURN NEW;
+    END;
+' LANGUAGE 'plpgsql';
+
+CREATE TRIGGER check_project_namespacing
+    BEFORE INSERT OR UPDATE ON project
+    FOR EACH ROW EXECUTE PROCEDURE check_project_namespacing_insertupdate();
+
+ALTER TABLE project_extension ADD COLUMN extensionid SERIAL PRIMARY KEY;
+
+ALTER TABLE project_submission ADD COLUMN submissionid SERIAL PRIMARY KEY;
+ALTER TABLE project_submission ADD COLUMN date_submitted TIMESTAMP NOT NULL;
+ALTER TABLE project_submission ADD COLUMN submitter INT4 REFERENCES login (loginid) NOT NULL;
+
+COMMIT;

=== modified file 'userdb/users.sql'
--- userdb/users.sql	2009-02-25 04:44:54 +0000
+++ userdb/users.sql	2009-04-06 10:21:22 +0000
@@ -61,12 +61,40 @@
 
 CREATE TABLE project (
     projectid   SERIAL PRIMARY KEY NOT NULL,
-    synopsis    VARCHAR,
-    url         VARCHAR,
+    short_name  TEXT NOT NULL,
+    name        TEXT NOT NULL,
+    synopsis    TEXT,
+    url         TEXT,
     projectsetid  INTEGER REFERENCES project_set (projectsetid) NOT NULL,
     deadline    TIMESTAMP
 );
 
+CREATE OR REPLACE FUNCTION check_project_namespacing_insertupdate()
+RETURNS trigger AS '
+    DECLARE
+        oid INTEGER;
+    BEGIN
+        IF TG_OP = ''UPDATE'' THEN
+            IF NEW.projectsetid = OLD.projectsetid AND NEW.short_name = OLD.short_name THEN
+                RETURN NEW;
+            END IF;
+        END IF;
+        SELECT offeringid INTO oid FROM project_set WHERE project_set.projectsetid = NEW.projectsetid;
+        PERFORM 1 FROM project, project_set
+        WHERE project_set.offeringid = oid AND
+              project.projectsetid = project_set.projectsetid AND
+              project.short_name = NEW.short_name;
+        IF found THEN
+            RAISE EXCEPTION ''a project named % already exists in offering ID %'', NEW.short_name, oid;
+        END IF;
+        RETURN NEW;
+    END;
+' LANGUAGE 'plpgsql';
+
+CREATE TRIGGER check_project_namespacing
+    BEFORE INSERT OR UPDATE ON project
+    FOR EACH ROW EXECUTE PROCEDURE check_project_namespacing_insertupdate();
+
 CREATE TABLE project_group (
     groupnm     VARCHAR NOT NULL,
     groupid     SERIAL PRIMARY KEY NOT NULL,
@@ -135,6 +163,7 @@
 );
 
 CREATE TABLE project_extension (
+    extensionid SERIAL PRIMARY KEY,
     assessedid  INT4 REFERENCES assessed (assessedid) NOT NULL,
     deadline    TIMESTAMP NOT NULL,
     approver    INT4 REFERENCES login (loginid) NOT NULL,
@@ -142,9 +171,12 @@
 );
 
 CREATE TABLE project_submission (
+    submissionid SERIAL PRIMARY KEY,
     assessedid  INT4 REFERENCES assessed (assessedid) NOT NULL,
     path        VARCHAR NOT NULL,
-    revision    INT4 NOT NULL
+    revision    INT4 NOT NULL,
+    date_submitted TIMESTAMP NOT NULL,
+    submitter   INT4 REFERENCES login (loginid) NOT NULL
 );
 
 CREATE TABLE project_mark (