Merge lp:~justas.sadzevicius/schooltool/timetables-section-time-boundaries into lp:schooltool/1.7

[Justas Sadzevičius]

Please review and merge to trunk, then release to the development PPA.

[Gediminas Paulauskas (menesis)]

Five tests in schooltool.timetable.tests.test_model now fail with

Traceback (most recent call last):
  ...
  File "/home/menesis/src/schooltool/trunk/build/schooltool-timetables/src/schooltool/timetable/model.py", line 130, in createCalendar
    if not first <= date <= last:
TypeError: can't compare datetime.date to NoneType

review: Needs Fixing

[Gediminas Paulauskas (menesis)]

I have fixed the test failures and merged the branch.

I don't like that the UI changed so that everyone now has to click "Add Timetable" even when there is one timetable for the school.

This breaks Journal tests as well.

review: Abstain

=== modified file 'src/schooltool/app/browser/ftests/setup.py'
--- src/schooltool/app/browser/ftests/setup.py	2009-06-24 13:58:38 +0000
+++ src/schooltool/app/browser/ftests/setup.py	2010-07-02 14:38:26 +0000
@@ -252,7 +252,8 @@
 
     manager.open('http://localhost/schoolyears/2005-2006/2005-fall/sections/1')
     manager.getLink('Schedule').click()
-
+    manager.getLink('Add Timetable').click()
+    manager.getControl('Add').click()
     manager.getControl(name="Monday.09:30-10:25").value = True
     manager.getControl(name="Wednesday.11:35-12:20").value = True
     manager.getControl('Save').click()

=== modified file 'src/schooltool/app/utils.py'
--- src/schooltool/app/utils.py	2009-06-24 11:55:24 +0000
+++ src/schooltool/app/utils.py	2010-07-02 14:38:26 +0000
@@ -22,6 +22,10 @@
 """
 
 import zope.schema
+from zope.proxy import sameProxiedObjects
+from zope.interface import implements
+
+from schooltool.table.table import simple_form_key
 
 
 def vocabulary(choices):
@@ -64,3 +68,41 @@
                     token=unicode(item.__name__).encode('punycode'),
                     title=item.title)
          for item in items])
+
+
+class TitledContainerItemSource(object):
+    """Source of titled items in a container."""
+    implements(zope.schema.interfaces.IIterableSource)
+
+    def __init__(self, context):
+        self.context = context
+
+    @property
+    def container(self):
+        raise NotImplementedError("Don't know how to get the container from context")
+
+    def __len__(self):
+        return len(self.container)
+
+    def __contains__(self, item):
+        return sameProxiedObjects(item, self.container.get(item.__name__))
+
+    def __iter__(self):
+        for item in self.container.values():
+            yield self.getTerm(item)
+
+    def getTermByToken(self, token):
+        terms = [self.getTerm(item) for item in self.container.values()]
+        by_token = dict([(term.token, term) for term in terms])
+        if token not in by_token:
+            raise LookupError(token)
+        return by_token[token]
+
+    def getTerm(self, item):
+        return zope.schema.vocabulary.SimpleTerm(
+            item,
+            token=simple_form_key(item),
+            title=self.getTitle(item))
+
+    def getTitle(self, item):
+        return item.title

=== modified file 'src/schooltool/course/browser/section.py'
--- src/schooltool/course/browser/section.py	2010-04-08 08:28:24 +0000
+++ src/schooltool/course/browser/section.py	2010-07-02 14:38:26 +0000
@@ -60,7 +60,6 @@
 from schooltool.course.section import Section
 from schooltool.course.section import copySection
 from schooltool.app.browser.app import RelationshipViewBase
-from schooltool.timetable.browser import TimetableConflictMixin
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.table.interfaces import ITableFormatter
 
@@ -501,23 +500,7 @@
         return BaseEditView.update(self)
 
 
-class ConflictDisplayMixin(TimetableConflictMixin):
-    """A mixin for use in views that display event conflicts."""
-
-    def update(self):
-        """Set self.busy_periods."""
-        ttschema = self.getSchema()
-        term = self.getTerm()
-        if ttschema and term:
-            section_map = self.sectionMap(term, ttschema)
-            self.busy_periods = [(key, sections)
-                                 for key, sections in section_map.items()
-                                 if self.context in sections]
-        else:
-            self.busy_periods = []
-
-
-class RelationshipEditConfView(RelationshipViewBase, ConflictDisplayMixin):
+class RelationshipEditConfView(RelationshipViewBase):
     """A relationship editing view that displays conflicts."""
 
     __call__ = ViewPageTemplateFile('templates/edit_relationships.pt')
@@ -530,12 +513,8 @@
     def school_year(self):
         return ISchoolYear(self.context)
 
-    def update(self):
-        RelationshipViewBase.update(self)
-        ConflictDisplayMixin.update(self)
-
-
-class SectionInstructorView(RelationshipEditConfView, ConflictDisplayMixin):
+
+class SectionInstructorView(RelationshipEditConfView):
     """View for adding instructors to a Section."""
 
     __used_for__ = ISection

=== modified file 'src/schooltool/course/browser/tests.py'
--- src/schooltool/course/browser/tests.py	2010-04-08 05:42:14 +0000
+++ src/schooltool/course/browser/tests.py	2010-07-02 14:38:26 +0000
@@ -678,125 +678,6 @@
     """
 
 
-def doctest_ConflictDisplayMixin():
-    r"""Tests for ConflictDisplayMixin.
-
-#        >>> app = setup.setUpSchoolToolSite()
-#
-#        >>> class ItemStub(object):
-#        ...     def __init__(self, name):
-#        ...         self.__name__ = name
-#        ...         self.title = name.title()
-#        >>> class RelationshipPropertyStub(object):
-#        ...     items = [ItemStub('john'),
-#        ...              ItemStub('pete')]
-#        ...     def __iter__(self):
-#        ...         return iter(self.items)
-#        ...     def add(self, item):
-#        ...         print "Adding: %s" % item.title
-#        ...     def remove(self, item):
-#        ...         print "Removing: %s" % item.title
-#
-#    Inheriting views must implement getCollection() and
-#    getAvailableItems():
-#
-#        >>> from schooltool.course.browser.section import ConflictDisplayMixin
-#        >>> class SchemaStub(ItemStub):
-#        ...     def items(self):
-#        ...         return []
-#        >>> class RelationshipView(ConflictDisplayMixin):
-#        ...     def getCollection(self):
-#        ...         return RelationshipPropertyStub()
-#        ...     def getAvailableItems(self):
-#        ...         return [ItemStub('ann'), ItemStub('frog')]
-#        ...     def getTerm(self): return ItemStub('does not matter')
-#        ...     def getSchema(self): return SchemaStub('does not matter')
-#
-#    Let's add Ann to the list:
-#
-#        >>> request = TestRequest()
-#        >>> request.form = {'add_item.ann': 'on',
-#        ...                 'ADD_ITEMS': 'Apply'}
-#        >>> view = RelationshipView(None, request)
-#        >>> view.update()
-#        Adding: Ann
-#
-#    Someone might want to cancel a change.
-#
-#        >>> request = TestRequest()
-#        >>> request.form = {'add_item.ann': 'on', 'CANCEL': 'Cancel'}
-#        >>> view = RelationshipView(None, request)
-#        >>> view.update()
-#
-#    No one was added, but we got redirected:
-#
-#        >>> request.response.getStatus()
-#        302
-#        >>> request.response.getHeader('Location')
-#        'http://127.0.0.1'
-#
-#    We can remove items too:
-#
-#        >>> request.form = {'remove_item.john': 'on',
-#        ...                 'remove_item.pete': 'on',
-#        ...                 'REMOVE_ITEMS': 'Remove'}
-#        >>> view = RelationshipView(None, request)
-#        >>> view.update()
-#        Removing: John
-#        Removing: Pete
-#
-#    We also use a batch for available items in this view
-#
-#        >>> [i.title for i in view.batch]
-#        ['Ann', 'Frog']
-#
-#    Which is searchable
-#
-#        >>> request.form = {'SEARCH': 'ann'}
-#        >>> view = RelationshipView(None, request)
-#        >>> view.update()
-#        >>> [i.title for i in view.batch]
-#        ['Ann']
-#
-#    The search can be cleared, ignoring any search value passed:
-#
-#        >>> request.form = {'SEARCH': 'ann', 'CLEAR_SEARCH': 'on'}
-#        >>> view = RelationshipView(None, request)
-#        >>> view.update()
-#        >>> [i.title for i in view.batch]
-#        ['Ann', 'Frog']
-
-    """
-
-
-def doctest_ConflictDisplayMixin_no_timetables_terms():
-    r"""Tests for ConflictDisplayMixin.
-
-    ConflictDisplayMixin should work even if there are no timetables
-    defined.
-
-        >>> from schooltool.course.browser.section import ConflictDisplayMixin
-        >>> app = setup.setUpSchoolToolSite()
-        >>> view = ConflictDisplayMixin()
-        >>> view.getSchema = lambda: None
-        >>> view.getTerm = lambda: "I am a term"
-        >>> view.getAvailableItems = lambda: []
-
-        >>> view.update()
-        >>> view.busy_periods
-        []
-
-    If there are no terms, but there are timetables - it still works:
-
-        >>> view.getSchema = lambda: "I am a schema"
-        >>> view.getTerm = lambda: None
-        >>> view.update()
-        >>> view.busy_periods
-        []
-
-    """
-
-
 def doctest_SectionInstructorView():
     """Tests for SectionInstructorView.
 

=== modified file 'src/schooltool/level/level.py'
--- src/schooltool/level/level.py	2010-05-19 11:57:50 +0000
+++ src/schooltool/level/level.py	2010-07-02 14:38:26 +0000
@@ -40,6 +40,7 @@
 
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.app.app import InitBase, StartUpBase
+from schooltool.app.utils import TitledContainerItemSource
 from schooltool.schoolyear.interfaces import ISchoolYearContainer, ISchoolYear
 from schooltool.schoolyear.subscriber import ObjectEventAdapterSubscriber
 from schooltool.relationship import URIObject, RelationshipSchema
@@ -164,43 +165,17 @@
         del top_level_container[level_container.__name__]
 
 
-class LevelSource(object):
+class LevelSource(TitledContainerItemSource):
     """Source of levels for contexts adaptable to ISchoolYear"""
     implements(zope.schema.interfaces.IIterableSource)
 
-    def __init__(self, context):
-        self.context = context
-
     @property
-    def levels(self):
+    def container(self):
         schoolyear = ISchoolYear(self.context, None)
         if schoolyear is None:
             return {}
         return interfaces.ILevelContainer(schoolyear)
 
-    def __len__(self):
-        return len(self.levels)
-
-    def __contains__(self, level):
-        return sameProxiedObjects(level, self.levels.get(level.__name__))
-
-    def __iter__(self):
-        for level in self.levels.values():
-            yield self.getTerm(level)
-
-    def getTermByToken(self, token):
-        terms = [self.getTerm(level) for level in self.levels.values()]
-        by_token = dict([(term.token, term) for term in terms])
-        if token not in by_token:
-            raise LookupError(token)
-        return by_token[token]
-
-    def getTerm(self, level):
-        return SimpleTerm(
-            level,
-            token=simple_form_key(level),
-            title=level.title)
-
 
 def levelSourceVocabularyFactory():
     return LevelSource

=== modified file 'src/schooltool/level/tests/test_level.py'
--- src/schooltool/level/tests/test_level.py	2010-06-07 12:18:32 +0000
+++ src/schooltool/level/tests/test_level.py	2010-07-02 14:38:26 +0000
@@ -209,7 +209,7 @@
 
     When the context cannot be adapted to ISchoolYear, the vocabulary is empty.
 
-        >>> source.levels
+        >>> source.container
         {}
 
         >>> len(source)
@@ -266,7 +266,7 @@
         >>> verifyObject(IIterableSource, source)
         True
 
-        >>> source.levels
+        >>> source.container
         <schooltool.level.level.LevelContainer ...>
 
         >>> len(source)

=== modified file 'src/schooltool/timetable/__init__.py'
--- src/schooltool/timetable/__init__.py	2010-04-27 11:53:52 +0000
+++ src/schooltool/timetable/__init__.py	2010-07-02 14:38:26 +0000
@@ -125,6 +125,7 @@
 schema.  See ITimetableSchema, ITimetableSchemaDay.
 """
 
+import rwproperty
 import zope.event
 from persistent import Persistent
 from persistent.dict import PersistentDict
@@ -137,6 +138,8 @@
 from zope.interface import directlyProvides
 from zope.annotation.interfaces import IAnnotations
 from zope.location.interfaces import ILocation
+from zope.lifecycleevent.interfaces import IObjectAddedEvent
+from zope.lifecycleevent.interfaces import IObjectModifiedEvent
 from zope.traversing.api import getPath
 from zope.container.interfaces import INameChooser
 from zope.container.contained import NameChooser
@@ -145,6 +148,7 @@
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.app.interfaces import ISchoolToolCalendar
 from schooltool.calendar.simple import ImmutableCalendar
+from schooltool.common import IDateRange, DateRange
 from schooltool.timetable.interfaces import ITimetableCalendarEvent
 from schooltool.timetable.interfaces import ITimetable, ITimetableWrite
 from schooltool.timetable.interfaces import ITimetableDay, ITimetableDayWrite
@@ -163,6 +167,8 @@
 from schooltool.timetable.interfaces import Unchanged
 from schooltool.term.interfaces import ITerm
 from schooltool.app.app import InitBase
+from schooltool.schoolyear.subscriber import ObjectEventAdapterSubscriber
+
 
 from schooltool.common import SchoolToolMessage as _
 
@@ -172,6 +178,7 @@
 # Timetabling
 #
 
+
 class Timetable(Persistent):
 
     implements(ITimetable, ITimetableWrite)
@@ -179,6 +186,9 @@
     __name__ = None
     __parent__ = None
 
+    _first = None
+    _last = None
+
     timezone = 'UTC'
 
     @property
@@ -200,6 +210,32 @@
         self.days = PersistentDict()
         self.model = None
 
+    @rwproperty.getproperty
+    def first(self):
+        if self._first is None:
+            term = getattr(self, 'term', None)
+            if term is None:
+                return None
+            return term.first
+        return self._first
+
+    @rwproperty.setproperty
+    def first(self, value):
+        self._first = value
+
+    @rwproperty.getproperty
+    def last(self):
+        if self._last is None:
+            term = getattr(self, 'term', None)
+            if term is None:
+                return None
+            return term.last
+        return self._last
+
+    @rwproperty.setproperty
+    def last(self, value):
+        self._last = value
+
     def keys(self):
         return list(self.day_ids)
 
@@ -236,6 +272,8 @@
             raise ValueError("Timetables have different schemas")
         for day, period, activity in other.activities():
             self[day].add(period, activity, send_events=False)
+        self.first = other.first
+        self.last = other.last
 
     def cloneEmpty(self):
         other = Timetable(self.day_ids)
@@ -541,16 +579,6 @@
 
     def __setitem__(self, key, value):
         assert ITimetable.providedBy(value)
-
-        for k, v in self.items():
-            if (sameProxiedObjects(v.term, value.term) and
-                sameProxiedObjects(v.schooltt, value.schooltt) and
-                k != key):
-                raise DuplicateTimetableError("There already is a timetable "
-                                              "for term %s and section %s, but "
-                                              "it's key is %s!" % (v.term.__name__,
-                                                                   v.schooltt.__name__,
-                                                                   k))
         old_value = self.get(key)
         if old_value is not None:
             old_value.__parent__ = None
@@ -724,3 +752,98 @@
 @implementer(ITerm)
 def getTermForTimetable(timetable):
     return ITerm(timetable.__parent__)
+
+
+class TimetableOverlapError(Exception):
+
+    def __init__(self, schema, first, last, overlapping):
+        self.schema = schema
+        self.first = first
+        self.last = last
+        self.overlapping = overlapping
+
+    def _formatTitle(self, timetable):
+        if (timetable.first is not None or
+            timetable.last is not None):
+            return "%s (%s-%s)" % (
+                timetable.title, timetable.first, timetable.last)
+        else:
+            return timetable.title
+
+    def __repr__(self):
+        return "Timetable %s overlaps other(s) (%s)" % (
+            '%s (%s-%s)' % (self.schema.title, self.first, self.last),
+            ", ".join(sorted(self._formatTitle(timetable)
+                             for timetable in self.overlapping)))
+
+    __str__ = __repr__
+
+
+class TimetableOverflowError(Exception):
+    def __init__(self, schema, first, last, term):
+        self.schema = schema
+        self.first = first
+        self.last = last
+        self.term = term
+
+    def __repr__(self):
+        return "Timetable %s (%s - %s) does not fit in term %s (%s - %s)" % (
+            self.schema.title, self.first, self.last,
+            self.term.title, self.term.first, self.term.last)
+
+    __str__ = __repr__
+
+
+
+class TimetableModifiedSubscriber(ObjectEventAdapterSubscriber):
+    adapts(IObjectModifiedEvent, ITimetable)
+
+    def __call__(self):
+        if ITimetableDict.providedBy(self.object.__parent__):
+            validateTimetable(self.object)
+
+
+class TimetableAddedSubscriber(ObjectEventAdapterSubscriber):
+    adapts(IObjectAddedEvent, ITimetable)
+
+    def __call__(self):
+        if ITimetableDict.providedBy(self.object.__parent__):
+            validateTimetable(self.object)
+
+
+def validateAgainstTerm(schema, first, last, term):
+    term_daterange = IDateRange(term)
+    if ((first is not None and first not in term_daterange) or
+        (last is not None and last not in term_daterange)):
+        raise TimetableOverflowError(
+            schema, first, last, term)
+
+
+def validateAgainstOthers(schema, first, last, timetables):
+    if first is None or last is None:
+        return
+
+    daterange = DateRange(first, last)
+    overlapping_timetables = []
+    for other_tt in timetables:
+        if (other_tt.schooltt is None or
+            not sameProxiedObjects(other_tt.schooltt, schema)):
+            continue
+        if (other_tt.first is None or other_tt.last is None):
+            continue
+        if daterange.overlaps(DateRange(other_tt.first, other_tt.last)):
+            overlapping_timetables.append(other_tt)
+    if overlapping_timetables:
+        raise TimetableOverlapError(
+            schema, first, last, overlapping_timetables)
+
+
+def validateTimetable(timetable):
+    validateAgainstTerm(
+        timetable.schooltt, timetable.first, timetable.last,
+        timetable.term)
+    validateAgainstOthers(
+        timetable.schooltt, timetable.first, timetable.last,
+        [tt for tt in timetable.__parent__.values()
+         if tt.__name__ != timetable.__name__])
+

=== modified file 'src/schooltool/timetable/browser/__init__.py'
--- src/schooltool/timetable/browser/__init__.py	2010-06-07 12:43:25 +0000
+++ src/schooltool/timetable/browser/__init__.py	2010-07-02 14:38:26 +0000
@@ -22,27 +22,44 @@
 import datetime
 import re
 
+import zope.event
+import zope.schema
 from zope.container.interfaces import INameChooser
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import adapts
+from zope.component import getMultiAdapter
+from zope.interface.exceptions import Invalid
 from zope.interface import implements
+from zope.interface import Interface
 from zope.publisher.browser import BrowserView
 from zope.publisher.interfaces import NotFound
 from zope.security.proxy import removeSecurityProxy
 from zope.traversing.browser.absoluteurl import absoluteURL
 
+from z3c.form import form, field, button, widget, validator
+from z3c.form.util import getSpecification
+
 from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.app.utils import TitledContainerItemSource
 from schooltool.calendar.utils import parse_date, parse_time
 from schooltool.course.interfaces import ISection
+from schooltool.common import DateRange
 from schooltool.term.interfaces import ITerm
 from schooltool.term.term import getTermForDate
 from schooltool.timetable import SchooldaySlot
 from schooltool.timetable import Timetable, TimetableDay
 from schooltool.timetable import TimetableActivity
+from schooltool.timetable import TimetableReplacedEvent
 from schooltool.timetable.interfaces import ITimetableSchemaContainer
 from schooltool.timetable.interfaces import ITimetable, IOwnTimetables
-from schooltool.timetable.interfaces import ITimetables
+from schooltool.timetable.interfaces import ITimetables, ITimetableDict
+from schooltool.timetable import TimetableOverlapError, TimetableOverflowError
+from schooltool.timetable import validateAgainstTerm
+from schooltool.timetable import validateAgainstOthers
+from schooltool.timetable.interfaces import ITimetableSchemaContainer
 from schooltool.traverser.interfaces import ITraverserPlugin
+from schooltool.schoolyear.interfaces import ISchoolYear
+
 from schooltool.common import SchoolToolMessage as _
 
 
@@ -378,9 +395,15 @@
             ttschema = ttschemas.values()[0]
         return ttschema
 
+    @property
+    def owner(self):
+        # XXX: make this property obsolete as soon as possible
+        return self.context
+
     def getTerm(self):
         """Return the chosen term."""
-        return ITerm(self.context)
+        # XXX: make this method obsolete as soon as possible
+        return ITerm(self.owner)
 
     def getSections(self, item):
         raise NotImplementedError(
@@ -391,7 +414,8 @@
             "This method should be implemented in subclasses")
 
     def getTimetable(self):
-        timetables = ITimetables(self.context)
+        # XXX: somewhat broken as of now.
+        timetables = ITimetables(self.owner)
         term = self.getTerm()
         ttschema = self.getSchema()
         return timetables.lookup(term, ttschema)
@@ -530,13 +554,11 @@
         return absoluteURL(self.context, self.request)
 
 
-class TimetableEditView(TimetableSetupViewBase):
-
-    __used_for__ = ITimetable
-
+class TimetableEditView(form.EditForm, TimetableConflictMixin):
     template = ViewPageTemplateFile('templates/timetable-edit.pt')
+    fields = field.Fields(ITimetable).select('first', 'last')
 
-    def getDays(self, ttschema):
+    def getDays(self):
         """Return the current selection.
 
         Returns a list of dicts with the following keys
@@ -551,6 +573,7 @@
                             for this shcema
 
         """
+        ttschema = self.context.schooltt
         def days(schema):
             for day_id, day in schema.items():
                 yield {'title': day_id,
@@ -564,42 +587,222 @@
 
         return list(days(ttschema))
 
-    def __call__(self):
-        self.has_timetables = bool(self.ttschemas)
-        if not self.has_timetables:
-            return self.template()
-        self.days = self.getDays(self.context.schooltt)
-        #XXX dumb, this doesn't space course names
+    @property
+    def timetable_dict(self):
+        return self.context.__parent__
+
+    def updateActions(self):
+        super(TimetableEditView, self).updateActions()
+        self.actions['apply'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+    @button.buttonAndHandler(_('Save'), name='apply')
+    def handleApply(self, action):
+        data, errors = self.extractData()
+        if errors:
+            self.status = self.formErrorsMessage
+            return
+        changes = self.applyChanges(data)
         section = removeSecurityProxy(self.context.__parent__.__parent__)
         course_title = ''.join([course.title
                                 for course in section.courses])
-
-        if 'CANCEL' in self.request:
-            self.request.response.redirect(
-                absoluteURL(self.context, self.request))
-        if 'SAVE' in self.request:
-            for day_id, day in removeSecurityProxy(self.context).items():
-                for period_id, period in list(day.items()):
-                    if '.'.join((day_id, period_id)) in self.request:
-                        if not period:
-                            # XXX Resource list is being copied
-                            # from section as this view can't do
-                            # proper resource booking
-                            act = TimetableActivity(title=course_title,
-                                                    owner=section,
-                                                    resources=section.resources)
-                            day.add(period_id, act)
-                    else:
-                        if period:
-                            for act in list(period):
-                                day.remove(period_id, act)
-
-            # TODO: find a better place to redirect to
-            self.request.response.redirect(
-                absoluteURL(self.context,
-                                 self.request))
-
-        return self.template()
+        timetable_changed = bool(changes)
+        for day_id, day in removeSecurityProxy(self.context).items():
+            for period_id, period in list(day.items()):
+                if '.'.join((day_id, period_id)) in self.request:
+                    if not period:
+                        # XXX Resource list is being copied
+                        # from section as this view can't do
+                        # proper resource booking
+                        act = TimetableActivity(title=course_title,
+                                                owner=section,
+                                                resources=section.resources)
+                        day.add(period_id, act)
+                        timetable_changed = True
+                else:
+                    if period:
+                        for act in list(period):
+                            day.remove(period_id, act)
+                            timetable_changed = True
+        self.status = self.successMessage
+
+        if timetable_changed:
+            timetable = removeSecurityProxy(self.context)
+            event = TimetableReplacedEvent(
+                timetable.__parent__.__parent__, timetable.__name__,
+                timetable, timetable)
+            zope.event.notify(event)
+        self.redirectToParent()
+
+    @button.buttonAndHandler(_("Cancel"), name='cancel')
+    def handle_cancel_action(self, action):
+        self.redirectToParent()
+
+    def redirectToParent(self):
+        self.request.response.redirect(
+            absoluteURL(self.context.__parent__,
+                        self.request))
+
+    @property
+    def ttschemas(self):
+        return ITimetableSchemaContainer(ISchoolToolApplication(None))
+
+    @property
+    def has_timetables(self):
+        return bool(self.ttschemas)
+
+
+class TimetableSchemaSource(TitledContainerItemSource):
+
+    @property
+    def container(self):
+        term = ITerm(self.context)
+        return ITimetableSchemaContainer(term, {})
+
+
+def timetableSchemaSourceVocabularyFactory():
+    return TimetableSchemaSource
+
+
+class ITimetableAddForm(Interface):
+    """Form schema for ITerm add/edit views."""
+
+    schooltt = zope.schema.Choice(
+        title=_("School timetable"),
+        source="schooltool.timetable.browser.timetable_schema_source",
+        required=True,
+    )
+
+    first = zope.schema.Date(title=_("Apply from"))
+
+    last = zope.schema.Date(title=_("Apply until"))
+
+
+class TimetableAddView(form.AddForm, TimetableConflictMixin):
+
+    template = ViewPageTemplateFile('templates/section-timetable-add.pt')
+    fields = field.Fields(ITimetableAddForm)
+
+    _object_added = None
+
+    buttons = button.Buttons(
+        button.Button('add', title=_('Add')),
+        button.Button('cancel', title=_('Cancel')))
+
+    @button.handler(buttons["add"])
+    def handleAdd(self, action):
+        return form.AddForm.handleAdd.func(self, action)
+
+    @button.handler(buttons["cancel"])
+    def handleCancel(self, action):
+        url = absoluteURL(self.context, self.request)
+        self.request.response.redirect(url)
+
+    def updateActions(self):
+        super(TimetableAddView, self).updateActions()
+        self.actions['add'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+    @property
+    def timetable_dict(self):
+        return self.context
+
+    @property
+    def term(self):
+        """Return the chosen term."""
+        return ITerm(self.context)
+
+    def create(self, data):
+        schema = data['schooltt']
+        timetable = schema.createTimetable(self.term)
+        timetable.first = data['first']
+        timetable.last = data['last']
+        return timetable
+
+    def add(self, timetable):
+        chooser = INameChooser(self.context)
+        name = chooser.chooseName('', timetable)
+        self.context[name] = timetable
+        self._object_added = timetable
+
+    def nextURL(self):
+        if self._object_added is not None:
+            return absoluteURL(self._object_added, self.request)
+        return absoluteURL(self.context, self.request)
+
+
+TimetableAdd_default_first = widget.ComputedWidgetAttribute(
+    lambda adapter: adapter.view.term.first,
+    view=TimetableAddView,
+    field=ITimetableAddForm['first']
+    )
+
+
+TimetableAdd_default_last = widget.ComputedWidgetAttribute(
+    lambda adapter: adapter.view.term.last,
+    view=TimetableAddView,
+    field=ITimetableAddForm['last']
+    )
+
+
+class TimetableFormValidator(validator.InvariantsValidator):
+
+    def _formatTitle(self, object):
+        if object is None:
+            return None
+        def dateTitle(date):
+            if date is None:
+                return '...'
+            formatter = getMultiAdapter((date, self.request), name='mediumDate')
+            return formatter()
+        return u"%s (%s - %s)" % (
+            object.title, dateTitle(object.first), dateTitle(object.last))
+
+    def validateObject(self, timetable):
+        errors = super(TimetableFormValidator, self).validateObject(timetable)
+        try:
+            dr = DateRange(timetable.first, timetable.last)
+            timetable_dict = self.view.timetable_dict
+            term = ITerm(timetable_dict)
+            try:
+                other_timetables = timetable_dict.values()
+                if getattr(timetable, '__name__', None) is not None:
+                    other_timetables = [tt for tt in other_timetables
+                                        if tt.__name__ != timetable.__name__]
+                validateAgainstOthers(
+                    timetable.schooltt, timetable.first, timetable.last,
+                    other_timetables)
+            except TimetableOverlapError, e:
+                for tt in e.overlapping:
+                    errors += (Invalid(
+                        u"%s %s" % (
+                            _("Timetable conflicts with another:"),
+                            self._formatTitle(tt))), )
+            try:
+                validateAgainstTerm(
+                    timetable.schooltt, timetable.first, timetable.last,
+                    term)
+            except TimetableOverflowError, e:
+                errors += (Invalid(u"%s %s" % (
+                    _("Timetable does not fit in term"),
+                    self._formatTitle(term))), )
+        except ValueError, e:
+            errors += (Invalid(_("Timetable must begin before it ends.")), )
+        except validator.NoInputData:
+            return errors
+        return errors
+
+
+validator.WidgetsValidatorDiscriminators(
+    TimetableFormValidator,
+    view=TimetableEditView,
+    schema=getSpecification(ITimetable, force=True))
+
+
+validator.WidgetsValidatorDiscriminators(
+    TimetableFormValidator,
+    view=TimetableAddView,
+    schema=getSpecification(ITimetableAddForm, force=True))
 
 
 class SpecialDayView(BrowserView):
@@ -711,7 +914,6 @@
                 self.request.response.redirect(
                     absoluteURL(self.context, self.request))
 
-
     def timeplustd(self, t, td):
         """Add a timedelta to time.
 
@@ -755,3 +957,103 @@
     def __call__(self):
         self.update()
         return self.template()
+
+
+class SectionTimetablesViewBase(TimetableSetupViewBase):
+
+    def formatTimetableForTemplate(self, timetable):
+        timetable = removeSecurityProxy(timetable)
+        has_activities = False
+        days = []
+        for day_id, day in timetable.items():
+            periods = []
+            for period, activities in day.items():
+                periods.append({
+                    'title': period,
+                    'activities': " / ".join(
+                        sorted([a.title for a in activities])),
+                    })
+                has_activities |= bool(len(activities))
+            days.append({
+                'title': day_id,
+                'periods': periods,
+                })
+        return {
+            'timetable': timetable,
+            'has_activities': has_activities,
+            'days': days,
+            }
+
+
+class SectionTimetablesView(SectionTimetablesViewBase):
+
+    __used_for__ = ITimetableDict
+    template = ViewPageTemplateFile('templates/section-timetable-view.pt')
+
+    @property
+    def owner(self):
+        # XXX: make this property obsolete as soon as possible
+        return self.context.__parent__
+
+    @property
+    def term(self):
+        return ITerm(self.owner)
+
+    @property
+    def school_year(self):
+        return ISchoolYear(self.term)
+
+    @property
+    def timetables(self):
+        timetables = sorted(self.context.values(),
+                            key=lambda tt: (tt.first, tt.title))
+        result = []
+        for timetable in timetables:
+            result.append(self.formatTimetableForTemplate(timetable))
+        return result
+
+    def hasTimetables(self):
+        return bool(self.context)
+
+    def __call__(self):
+        return self.template()
+
+
+class SectionTimetableDeleteView(SectionTimetablesViewBase):
+
+    __used_for__ = ITimetableDict
+    template = ViewPageTemplateFile('templates/confirm-timetable-delete.pt')
+
+    def owner(self):
+        # XXX: make this property obsolete as soon as possible
+        return self.context.__parent__
+
+    @property
+    def term(self):
+        return ITerm(self.owner)
+
+    @property
+    def school_year(self):
+        return ISchoolYear(self.term)
+
+    @property
+    def timetable(self):
+        name = self.request['timetable']
+        if name not in self.context:
+            return None
+        timetable = self.context[name]
+        return self.formatTimetableForTemplate(timetable)
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
+    def __call__(self):
+        timetable = self.timetable
+        if 'CONFIRM' in self.request and timetable is not None:
+            del self.context[timetable['timetable'].__name__]
+            self.request.response.redirect(self.nextURL())
+        elif 'CANCEL' in self.request:
+            self.request.response.redirect(self.nextURL())
+        else:
+            return self.template()
+

=== modified file 'src/schooltool/timetable/browser/configure.zcml'
--- src/schooltool/timetable/browser/configure.zcml	2009-12-30 17:38:37 +0000
+++ src/schooltool/timetable/browser/configure.zcml	2010-07-02 14:38:26 +0000
@@ -43,7 +43,7 @@
       manager="schooltool.skin.IActionMenuManager"
       template="templates/actionsViewlet.pt"
       permission="schooltool.edit"
-      link="schedule.html"
+      link="timetables"
       title="Schedule"
       order="10"
       />
@@ -117,22 +117,43 @@
       menu="zmi_views" title="View"
       />
 
+  <zope:adapter
+      factory=".TimetableFormValidator" />
+
   <page
       name="index.html"
       for="schooltool.timetable.interfaces.ITimetableDict"
-      class="schooltool.timetable.browser.event.TimetableContainerView"
-      template="templates/timetable_list.pt"
-      permission="schooltool.view"
-      menu="zmi_views" title="View"
-      />
+      class="schooltool.timetable.browser.SectionTimetablesView"
+      permission="schooltool.edit" />
+
+  <page
+      name="confirm-delete.html"
+      for="schooltool.timetable.interfaces.ITimetableDict"
+      class="schooltool.timetable.browser.SectionTimetableDeleteView"
+      permission="schooltool.edit" />
+
+  <zope:adapter
+       factory=".TimetableAdd_default_first"
+       name="default"
+       />
+
+  <zope:adapter
+       factory=".TimetableAdd_default_last"
+       name="default"
+       />
 
   <page
       name="addTimetable.html"
       for="schooltool.timetable.interfaces.ITimetableDict"
-      class=".TimetableAddForm"
+      class=".TimetableAddView"
       permission="schooltool.edit"
       />
 
+  <zope:utility
+     factory=".timetableSchemaSourceVocabularyFactory"
+     provides="zope.schema.interfaces.IVocabularyFactory"
+     name="schooltool.timetable.browser.timetable_schema_source" />
+
   <!-- ttwizard -->
   <page
       name="add.html"

=== modified file 'src/schooltool/timetable/browser/ftests/composite-timetables.txt'
--- src/schooltool/timetable/browser/ftests/composite-timetables.txt	2009-12-22 10:51:56 +0000
+++ src/schooltool/timetable/browser/ftests/composite-timetables.txt	2010-07-02 14:38:26 +0000
@@ -113,6 +113,8 @@
     >>> manager.getLink('Birding').click()
     >>> manager.getLink('Birding1').click()
     >>> manager.getLink('Schedule').click()
+    >>> manager.getLink('Add Timetable').click()
+    >>> manager.getControl('Add').click()
     >>> manager.getControl('C').click()
     >>> manager.getControl('Save').click()
 
@@ -121,6 +123,8 @@
     >>> manager.getLink('Birding').click()
     >>> manager.getLink('Birding2').click()
     >>> manager.getLink('Schedule').click()
+    >>> manager.getLink('Add Timetable').click()
+    >>> manager.getControl('Add').click()
     >>> manager.getControl('D').click()
     >>> manager.getControl('Save').click()
 

=== modified file 'src/schooltool/timetable/browser/ftests/timetable-events.txt'
--- src/schooltool/timetable/browser/ftests/timetable-events.txt	2009-01-27 08:11:56 +0000
+++ src/schooltool/timetable/browser/ftests/timetable-events.txt	2010-07-02 14:38:26 +0000
@@ -128,6 +128,8 @@
     >>> manager.getControl('Add').click()
 
     >>> manager.getLink('Schedule').click()
+    >>> manager.getLink('Add Timetable').click()
+    >>> manager.getControl('Add').click()
     >>> manager.getControl(name="Monday.13:35-14:20").value = True
     >>> manager.getControl(name="Tuesday.09:30-10:25").value = True
     >>> manager.getControl(name="Wednesday.09:30-10:25").value = True
@@ -141,6 +143,8 @@
     >>> manager.getControl('Add').click()
 
     >>> manager.getLink('Schedule').click()
+    >>> manager.getLink('Add Timetable').click()
+    >>> manager.getControl('Add').click()
     >>> manager.getControl(name="Monday.11:35-12:20").value = True
     >>> manager.getControl(name="Wednesday.12:45-13:30").value = True
     >>> manager.getControl(name="Thursday.10:30-11:25").value = True
@@ -154,6 +158,8 @@
     >>> manager.getControl('Add').click()
 
     >>> manager.getLink('Schedule').click()
+    >>> manager.getLink('Add Timetable').click()
+    >>> manager.getControl('Add').click()
     >>> manager.getControl(name="Tuesday.14:30-15:15").value = True
     >>> manager.getControl(name="Wednesday.14:30-15:15").value = True
     >>> manager.getControl(name="Thursday.11:35-12:20").value = True

=== modified file 'src/schooltool/timetable/browser/ftests/timetabling.txt'
--- src/schooltool/timetable/browser/ftests/timetabling.txt	2009-12-21 05:15:58 +0000
+++ src/schooltool/timetable/browser/ftests/timetabling.txt	2010-07-02 14:38:26 +0000
@@ -314,13 +314,13 @@
     >>> manager.getLink('Swimming - Frog').click()
     >>> manager.open(manager.url + '/timetables')
 
-    >>> manager.getLink('2005-fall.default')
-    <Link text='2005-fall.default'
+    >>> manager.getLink('edit periods')
+    <Link text='(edit periods)'
           url='.../sections/1/timetables/1'>
 
 We can have a look at the timetable too, and see a few timetable activities:
 
-    >>> manager.getLink('2005-fall.default').click()
+    >>> manager.getLink('edit periods').click()
 
     >>> print analyze.queryHTML('//table/tr[2]', manager.contents)[0]
     <tr><td>
@@ -423,9 +423,9 @@
     >>> manager.getControl('No').click()
 
     >>> manager.open('http://localhost/schoolyears/2005/2005-fall/sections/1/timetables/addTimetable.html')
-    >>> manager.getControl(name='ttschema').value = ['singleperiod']
+    >>> manager.getControl(name='form.widgets.schooltt:list').value = ['singleperiod-']
     >>> manager.getControl('Add').click()
-    >>> manager.getLink('2005-fall.singleperiod').click()
+    >>> manager.getControl('Save').click()
 
 The activities should show up in the calendar of the users that are in
 this section too:

=== added file 'src/schooltool/timetable/browser/templates/confirm-timetable-delete.pt'
--- src/schooltool/timetable/browser/templates/confirm-timetable-delete.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/timetable/browser/templates/confirm-timetable-delete.pt	2010-07-02 14:38:26 +0000
@@ -0,0 +1,89 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title">
+    Delete items
+  </title>
+</head>
+<body>
+
+<span metal:fill-slot="zonki">
+  <img src="zonki.png" alt="SchoolTool" i18n:attributes="alt"
+    tal:attributes="src context/++resource++zonki-question.png" />
+</span>
+
+<div metal:fill-slot="content-header" i18n:translate="">
+  <h1>Are you sure you want to unschedule this timetable?</h1>
+</div>
+
+
+<metal:block metal:fill-slot="body">
+
+  <form method="post"
+        tal:define="timetable view/timetable"
+        tal:attributes="action string:${context/@@absolute_url}/confirm-delete.html">
+
+  <tal:block condition="view/timetable">
+    <h2 i18n:translate="">
+      Timetable "<tal:block i18n:name="title" content="timetable/timetable/schooltt/title"/>"
+    </h2>
+    <table class="timetable">
+      <tr>
+        <tal:block repeat="day timetable/days">
+          <th class="day" tal:content="day/title">Day N</th>
+        </tal:block>
+      </tr>
+      <tal:block condition="not:timetable/has_activities">
+        <tr>
+          <td tal:attributes="colspan python:len(timetable['days'])">
+            <p i18n:translate="">No periods selected.</p>
+          </td>
+        </tr>
+      </tal:block>
+      <tal:block condition="timetable/has_activities">
+        <tr>
+          <tal:block repeat="day timetable/days">
+            <td >
+              <tal:block tal:repeat="period day/periods">
+                <ul>
+                  <li>
+                    <p tal:condition="period/activities">
+                      <tal:block content="period/title" />:
+                      <tal:block content="period/activities"/>
+                    </p>
+                  </li>
+                </ul>
+              </tal:block>
+            </td>
+          </tal:block>
+        </tr>
+      </tal:block>
+      <tr>
+        <td tal:attributes="colspan python:len(timetable['days'])">
+
+          <p i18n:translate="">
+            Scheduled from
+              <tal:block i18n:name="from" content="timetable/timetable/first/@@mediumDate" />
+            until
+              <tal:block i18n:name="until" content="timetable/timetable/last/@@mediumDate" />
+          </p>
+        </td>
+      </tr>
+    </table>
+
+  </tal:block>
+
+    <div class="controls">
+      <tal:block condition="view/timetable">
+        <input type="submit" class="button-cancel" name="CONFIRM" value="Confirm"
+               i18n:attributes="value"/>
+        <input type="hidden" name="timetable"
+               tal:attributes="value timetable/timetable/__name__" />
+      </tal:block>
+      <input type="submit" class="button-cancel" name="CANCEL" value="Cancel"
+             i18n:attributes="value" />
+    </div>
+  </form>
+
+
+</metal:block>
+</body></html>

=== added file 'src/schooltool/timetable/browser/templates/section-timetable-add.pt'
--- src/schooltool/timetable/browser/templates/section-timetable-add.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/timetable/browser/templates/section-timetable-add.pt	2010-07-02 14:38:26 +0000
@@ -0,0 +1,65 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">
+      Scheduling for <span i18n:name="section"
+                           tal:define="section context/__parent__"
+                           tal:replace="section/label" />
+  </title>
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header" i18n:translate="">
+  Scheduling for <span i18n:name="section"
+                       tal:define="section context/__parent__"
+                       tal:replace="section/label" />
+</h1>
+
+<metal:block metal:fill-slot="body">
+
+  <div tal:define="term view/term">
+    <div i18n:translate="">For term:
+      <strong i18n:name="term_title" tal:content="term/title" />
+      (from
+        <tal:block i18n:name="starts" tal:content="term/first/@@mediumDate"/>
+       to
+        <tal:block i18n:name="ends" tal:content="term/last/@@mediumDate"/>)
+    </div>
+
+  </div>
+
+
+  <div class="status" tal:condition="view/status">
+    <ul class="errors"
+        tal:condition="view/widgets/errors"
+        metal:define-macro="form-errors">
+      <li tal:repeat="error view/widgets/errors">
+        <tal:block condition="error/widget">
+          <span tal:replace="error/widget/label" />:
+        </tal:block>
+        <span tal:replace="structure error/render">Error Type</span>
+      </li>
+    </ul>
+  </div>
+
+<form action="." method="post" enctype="multipart/form-data"
+      metal:define-macro="form"
+      tal:attributes="method view/method;
+                      enctype view/enctype;
+                      acceptCharset view/acceptCharset;
+                      accept view/accept;
+                      action view/action;
+                      name view/name;
+                      id view/id">
+
+  <div metal:use-macro="macro:widget-rows">
+  </div>
+
+  <div metal:use-macro="macro:form-buttons">
+  </div>
+
+</form>
+
+
+</metal:block>
+</body>
+</html>

=== added file 'src/schooltool/timetable/browser/templates/section-timetable-view.pt'
--- src/schooltool/timetable/browser/templates/section-timetable-view.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/timetable/browser/templates/section-timetable-view.pt	2010-07-02 14:38:26 +0000
@@ -0,0 +1,112 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">
+      Scheduling for <span i18n:name="section"
+                           tal:replace="view/owner/label" />
+  </title>
+</head>
+<body>
+
+<div metal:fill-slot="content-header" i18n:translate="">
+
+<h1>
+  Time table schedule of
+    <tal:loop tal:repeat="course view/owner/courses" i18n:name="course">
+      <a tal:replace="structure course/@@title" />
+    </tal:loop>
+    <a i18n:name="section"
+       tal:attributes="href view/owner/@@absolute_url"
+       tal:content="view/owner/label" />,
+
+</h1>
+
+<p i18n:translate="">
+  For more information, see
+  <a tal:attributes="href view/term/@@absolute_url">school days</a> and
+  <a tal:attributes="href string:${view/school_year/@@absolute_url}/school_timetables">available timetables</a>
+  in
+    <tal:block i18n:name="term" tal:replace="structure view/term/@@title"/> of
+    <tal:block i18n:name="schoolyear" tal:replace="structure view/school_year/@@title" />
+</p>
+
+</div>
+
+<metal:block metal:fill-slot="body">
+
+
+<p tal:condition="not:view/hasTimetables"
+   i18n:translate="">There are no timetables assigned.</p>
+
+<tal:if tal:condition="view/hasTimetables">
+
+  <tal:block repeat="timetable view/timetables">
+  <div>
+
+    <h2 i18n:translate="">
+      Timetable "<tal:block i18n:name="title" content="timetable/timetable/schooltt/title"/>"
+      <a tal:attributes="href timetable/timetable/@@absolute_url">(edit periods)</a>
+    </h2>
+    <table class="timetable">
+      <tr>
+        <tal:block repeat="day timetable/days">
+          <th class="day" tal:content="day/title">Day N</th>
+        </tal:block>
+      </tr>
+      <tal:block condition="not:timetable/has_activities">
+        <tr>
+          <td tal:attributes="colspan python:len(timetable['days'])">
+            <p i18n:translate="">No periods selected.</p>
+          </td>
+        </tr>
+      </tal:block>
+      <tal:block condition="timetable/has_activities">
+        <tr>
+          <tal:block repeat="day timetable/days">
+            <td >
+              <tal:block tal:repeat="period day/periods">
+                <ul>
+                  <li>
+                    <p tal:condition="period/activities">
+                      <tal:block content="period/title" />:
+                      <tal:block content="period/activities"/>
+                    </p>
+                  </li>
+                </ul>
+              </tal:block>
+            </td>
+          </tal:block>
+        </tr>
+      </tal:block>
+      <tr>
+        <td tal:attributes="colspan python:len(timetable['days'])">
+
+          <p i18n:translate="">
+            Scheduled from
+              <tal:block i18n:name="from" content="timetable/timetable/first/@@mediumDate" />
+            until
+              <tal:block i18n:name="until" content="timetable/timetable/last/@@mediumDate" />
+          </p>
+        </td>
+      </tr>
+    </table>
+
+    <div>
+    <form method="post"
+          tal:attributes="action string:${context/@@absolute_url}/confirm-delete.html">
+      <input type="hidden" name="timetable" tal:attributes="value timetable/timetable/__name__" />
+      <div class="controls">
+        <input type="submit" class="button-cancel" name="DELETE" value="Remove"
+               i18n:attributes="value" />
+      </div>
+    </form>
+
+    </div>
+    <br>
+  </div>
+  </tal:block>
+
+</tal:if>
+
+</metal:block>
+</body>
+</html>

=== modified file 'src/schooltool/timetable/browser/templates/timetable-edit.pt'
--- src/schooltool/timetable/browser/templates/timetable-edit.pt	2008-09-04 12:25:48 +0000
+++ src/schooltool/timetable/browser/templates/timetable-edit.pt	2010-07-02 14:38:26 +0000
@@ -23,25 +23,53 @@
 
   <div tal:define="term view/getTerm;
 		   ttschemas view/ttschemas/values">
-    <div i18n:translate="">For term:</div>
-    <strong tal:content="term/title" />
-
-    <div i18n:translate="">Using timetable:</div>
-
-    <strong tal:repeat="ttschema ttschemas/sortby:title"
+    <div i18n:translate="">For term:
+      <strong i18n:name="term_title" tal:content="term/title" />
+      (from
+        <tal:block i18n:name="starts" tal:content="term/first/@@mediumDate"/>
+       to
+        <tal:block i18n:name="ends" tal:content="term/last/@@mediumDate"/>)
+    </div>
+
+    <div i18n:translate="">Using timetable:
+    <strong i18n:name="schema_titles"
+            tal:repeat="ttschema ttschemas/sortby:title"
             tal:content="ttschema/title" />
-  </div>
-
-<form tal:attributes="action request/URL" class="plain" method="post">
+    </div>
+  </div>
+
+
+  <div class="status" tal:condition="view/status">
+    <ul class="errors"
+        tal:condition="view/widgets/errors"
+        metal:define-macro="form-errors">
+      <li tal:repeat="error view/widgets/errors">
+        <tal:block condition="error/widget">
+          <span tal:replace="error/widget/label" />:
+        </tal:block>
+        <span tal:replace="structure error/render">Error Type</span>
+      </li>
+    </ul>
+  </div>
+
+<form action="." method="post" enctype="multipart/form-data"
+      metal:define-macro="form"
+      tal:attributes="method view/method;
+                      enctype view/enctype;
+                      acceptCharset view/acceptCharset;
+                      accept view/accept;
+                      action view/action;
+                      name view/name;
+                      id view/id">
 
   <table class="timetable">
     <tr>
-      <tal:block repeat="day view/days">
+      <tal:block repeat="day view/getDays">
         <th class="day" tal:content="day/title">Day N</th>
       </tal:block>
     </tr>
     <tr>
-      <tal:block repeat="day view/days">
+      <tal:block repeat="day view/getDays">
         <td >
           <ul>
             <tal:block tal:repeat="period day/periods">
@@ -62,16 +90,41 @@
         </td>
       </tal:block>
     </tr>
+    <tr>
+      <td tal:attributes="colspan python:len(view.getDays())">
+
+
+        <span i18n:translate="">Apply from:</span>
+
+          <tal:block define="widget python:view.widgets['first']">
+            <metal:block define-macro="render-widget">
+            <div class="row" tal:attributes="id string:${widget/id}-row">
+              <div class="widget" tal:content="structure widget/render">
+              </div>
+              <div class="error" tal:condition="widget/error">
+                <span tal:replace="structure widget/error/render">error</span>
+              </div>
+            </div>
+            </metal:block>
+          </tal:block>
+
+        <span i18n:translate="">Apply until:</span>
+
+          <tal:block define="widget python:view.widgets['last']">
+            <div metal:use-macro="template/macros/render-widget">
+            </div>
+          </tal:block>
+
+      </td>
+    </tr>
   </table>
 
-  <div class="controls">
-    <input class="button-ok" type="submit" name="SAVE" value="Save"
-           i18n:attributes="value" />
-    <input type="submit" class="button-cancel" name="CANCEL" value="Cancel"
-           i18n:attributes="value cancel-button" />
+  <div metal:use-macro="macro:form-buttons">
   </div>
 
+
 </form>
+
 </tal:if>
 
 </metal:block>

=== modified file 'src/schooltool/timetable/configure.zcml'
--- src/schooltool/timetable/configure.zcml	2010-05-26 12:35:03 +0000
+++ src/schooltool/timetable/configure.zcml	2010-07-02 14:38:26 +0000
@@ -14,6 +14,14 @@
 
   <!-- Subscribers -->
 
+   <adapter
+      factory="schooltool.timetable.TimetableModifiedSubscriber"
+      name="validate_timetable_modified" />
+
+   <adapter
+      factory="schooltool.timetable.TimetableAddedSubscriber"
+      name="validate_timetable_modified" />
+
   <subscriber
       for=".interfaces.IHaveTimetables"
       provides=".interfaces.ITimetableSource"

=== modified file 'src/schooltool/timetable/interfaces.py'
--- src/schooltool/timetable/interfaces.py	2010-01-19 12:09:22 +0000
+++ src/schooltool/timetable/interfaces.py	2010-07-02 14:38:26 +0000
@@ -415,6 +415,12 @@
 
     title = TextLine(title=u"Title", required=True)
 
+    first = Date(
+        title=u"Apply timetable from")
+
+    last = Date(
+        title=u"Apply timetable until")
+
     model = Object(
         title=u"A timetable model this timetable should be used with.",
         schema=ITimetableModel)

=== modified file 'src/schooltool/timetable/model.py'
--- src/schooltool/timetable/model.py	2008-06-09 18:04:16 +0000
+++ src/schooltool/timetable/model.py	2010-07-02 14:38:26 +0000
@@ -43,6 +43,7 @@
 from persistent.dict import PersistentDict
 from zope.interface import implements, classProvides
 from zope.traversing.api import getPath
+from zope.proxy import sameProxiedObjects
 
 from schooltool.app.cal import CalendarEvent
 from schooltool.calendar.simple import ImmutableCalendar
@@ -122,9 +123,9 @@
         events = []
         day_id_gen = self._dayGenerator()
         if first is None:
-            first = term.first
+            first = timetable.first
         if last is None:
-            last = term.last
+            last = timetable.last
         for date in term:
             if not first <= date <= last:
                 # must call getDayId to keep track of days
@@ -410,7 +411,8 @@
             if (cal_event.activity == event.activity and
                 cal_event.period_id == event.period_id and
                 cal_event.day_id == event.day_id and
-                cal_event.activity.timetable is event.activity.timetable):
+                sameProxiedObjects(cal_event.activity.timetable,
+                                   event.activity.timetable)):
                 section_calendar.removeEvent(cal_event)
 
 
@@ -418,7 +420,8 @@
     section_calendar = ISchoolToolCalendar(event.object)
     for cal_event in list(section_calendar):
         if ITimetableCalendarEvent.providedBy(cal_event):
-            if (cal_event.activity.timetable is event.old_timetable):
+            if sameProxiedObjects(cal_event.activity.timetable,
+                                  event.old_timetable):
                 section_calendar.removeEvent(cal_event)
 
 

=== modified file 'src/schooltool/timetable/tests/test_timetable.py'
--- src/schooltool/timetable/tests/test_timetable.py	2010-01-10 17:31:54 +0000
+++ src/schooltool/timetable/tests/test_timetable.py	2010-07-02 14:38:26 +0000
@@ -830,10 +830,6 @@
         td['1'] = TimetableStub(term1, schooltt1)
         td['1'] = TimetableStub(term1, schooltt1)
         td['1'] = TimetableStub(term2, schooltt1)
-
-        self.assertRaises(DuplicateTimetableError, td.__setitem__, '2',
-                          TimetableStub(term2, schooltt1))
-
         td['2'] = TimetableStub(term1, schooltt1)
         td['3'] = TimetableStub(term1, schooltt2)