Merge lp:~justas.sadzevicius/schooltool.lyceum.journal/journal_overlap_fix into lp:schooltool.lyceum.journal/flourish

[Justas Sadzevičius]

As explained here: http://schooltool.pov.lt/irclogs/%23schooltool.2013-03-25.log.html#t2013-03-25T15:45:34

[Gediminas Paulauskas (menesis)]

review: Approve

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2013-02-18 22:52:54 +0000
+++ CHANGES.txt	2013-03-26 15:54:32 +0000
@@ -5,7 +5,8 @@
 2.3.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fix journals when section out-of-term-bounds schedules overlap
+- Journals now display all scheduled dates for selected section
 
 
 2.3.1 (2013-02-19)

=== modified file 'src/schooltool/lyceum/journal/browser/journal.py'
--- src/schooltool/lyceum/journal/browser/journal.py	2012-10-12 14:28:51 +0000
+++ src/schooltool/lyceum/journal/browser/journal.py	2013-03-26 15:54:32 +0000
@@ -743,6 +743,15 @@
     def has_header(self):
         return not self.render_journal
 
+    def allMeetings(self):
+        term = removeSecurityProxy(self.selected_term)
+        if not term:
+            return ()
+        by_uid = dict([(removeSecurityProxy(e).unique_id, e)
+                       for e in self.context.meetings])
+        meetings = sorted(by_uid.values())
+        return meetings
+
     def updateGradebook(self):
         members = self.members()
         for meeting in self.meetings:
@@ -1080,7 +1089,7 @@
                  'selected': term is currentTerm and 'selected' or None}
                 for term in sorted(terms, key=lambda x:x.first)]
 
-    def getCourse(self, section):        
+    def getCourse(self, section):
         try:
             return list(section.courses)[0]
         except (IndexError,):

=== modified file 'src/schooltool/lyceum/journal/ftests/advanced-sections.txt'
--- src/schooltool/lyceum/journal/ftests/advanced-sections.txt	2012-04-17 16:59:21 +0000
+++ src/schooltool/lyceum/journal/ftests/advanced-sections.txt	2013-03-26 15:54:32 +0000
@@ -135,12 +135,12 @@
     'http://localhost/schoolyears/2005/2005-fall-1/sections/1/journal/index.html?month=10'
     >>> teacher.getLink('October').click()
     >>> printGradebookTable(teacher.contents) # doctest: -REPORT_NDIFF
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 05 B | 06 A | 06 B | 11 A | 11 B | 12 A | 12 B | 13 A | 13 B | 18 A | 18 B | 19 A | 19 B | 20 A | 20 B | 25 A | 25 B | 26 A | 26 B | 27 A | 27 B | Average | Absences | Tardies |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | 1   | Frum       | Student   |      |      |      |      | X    | X    |      |      |      |      | X    | X    |      |      |      |      | X    | X    |      |      |      |      | X    | X    |         |          |         |
-    | 2   | Grum       | Student   |      |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |         |          |         |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 11 A | 11 B | 12 A | 18 A | 18 B | 19 A | 25 A | 25 B | 26 A | Average | Absences | Tardies |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | 1   | Frum       | Student   |      |      |      |      |      |      |      |      |      |      |      |      |         |          |         |
+    | 2   | Grum       | Student   |      |      |      |      |      |      |      |      |      |      |      |      |         |          |         |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
 
     >>> unquote(teacher.getLink('04').url)
     'http://localhost/schoolyears/2005/2005-fall-1/sections/1/journal/index.html?event_id=...&month=10'
@@ -151,12 +151,12 @@
 
     >>> teacher.getLink('18').click()
     >>> printGradebookTable(teacher.contents)
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 05 B | 06 A | 06 B | 11 A | 11 B | 12 A | 12 B | 13 A | 13 B | 18      | 18 B | 19 A | 19 B | 20 A | 20 B | 25 A | 25 B | 26 A | 26 B | 27 A | 27 B | Average | Absences | Tardies |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | 1   | Frum       | Student   |      |      |      |      | X    | X    |      |      |      |      | X    | X    | [_____] |      |      |      | X    | X    |      |      |      |      | X    | X    |         |          |         |
-    | 2   | Grum       | Student   |      |      |      | X    |      |      |      |      |      | X    |      |      | [_____] |      |      | X    |      |      |      |      |      | X    |      |      |         |          |         |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    +-----+------------+-----------+------+------+------+------+------+------+---------+------+------+------+------+------+---------+----------+---------+
+    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 11 A | 11 B | 12 A | 18      | 18 B | 19 A | 25 A | 25 B | 26 A | Average | Absences | Tardies |
+    +-----+------------+-----------+------+------+------+------+------+------+---------+------+------+------+------+------+---------+----------+---------+
+    | 1   | Frum       | Student   |      |      |      |      |      |      | [_____] |      |      |      |      |      |         |          |         |
+    | 2   | Grum       | Student   |      |      |      |      |      |      | [_____] |      |      |      |      |      |         |          |         |
+    +-----+------------+-----------+------+------+------+------+------+------+---------+------+------+------+------+------+---------+----------+---------+
 
     >>> cells = analyze.queryHTML('//table[@class="data"]//input[@type="text"]/@name', teacher.contents)
     >>> teacher.getControl(name=cells[0]).value = '10'
@@ -167,23 +167,23 @@
     >>> teacher.getControl(name=cells[0]).value = '5'
     >>> teacher.getControl('Update').click()
     >>> printGradebookTable(teacher.contents)
-    +-----+------------+-----------+------+------+------+------+------+------+---------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 05 B | 06 A | 06 B | 11      | 11 B | 12 A | 12 B | 13 A | 13 B | 18 A | 18 B | 19 A | 19 B | 20 A | 20 B | 25 A | 25 B | 26 A | 26 B | 27 A | 27 B | Average | Absences | Tardies |
-    +-----+------------+-----------+------+------+------+------+------+------+---------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | 1   | Frum       | Student   |      |      |      |      | X    | X    | [5____] |      |      |      | X    | X    | 10   |      |      |      | X    | X    |      |      |      |      | X    | X    | 7.500   |          |         |
-    | 2   | Grum       | Student   |      |      |      | X    |      |      | [_____] |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |         |          |         |
-    +-----+------------+-----------+------+------+------+------+------+------+---------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    +-----+------------+-----------+------+------+------+---------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 11      | 11 B | 12 A | 18 A | 18 B | 19 A | 25 A | 25 B | 26 A | Average | Absences | Tardies |
+    +-----+------------+-----------+------+------+------+---------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | 1   | Frum       | Student   |      |      |      | [5____] |      |      | 10   |      |      |      |      |      | 7.500   |          |         |
+    | 2   | Grum       | Student   |      |      |      | [_____] |      |      |      |      |      |      |      |      |         |          |         |
+    +-----+------------+-----------+------+------+------+---------+------+------+------+------+------+------+------+------+---------+----------+---------+
 
     >>> teacher.open('http://localhost/schoolyears/2005/2005-fall-1/sections/1')
     >>> teacher.getLink('Journal', index=1).click()
     >>> teacher.getLink('October').click()
     >>> printGradebookTable(teacher.contents) # doctest: -REPORT_NDIFF
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 05 B | 06 A | 06 B | 11 A | 11 B | 12 A | 12 B | 13 A | 13 B | 18 A | 18 B | 19 A | 19 B | 20 A | 20 B | 25 A | 25 B | 26 A | 26 B | 27 A | 27 B | Average | Absences | Tardies |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | 1   | Frum       | Student   |      |      |      |      | X    | X    | 5    |      |      |      | X    | X    | 10   |      |      |      | X    | X    |      |      |      |      | X    | X    | 7.500   |          |         |
-    | 2   | Grum       | Student   |      |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |         |          |         |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 11 A | 11 B | 12 A | 18 A | 18 B | 19 A | 25 A | 25 B | 26 A | Average | Absences | Tardies |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | 1   | Frum       | Student   |      |      |      | 5    |      |      | 10   |      |      |      |      |      | 7.500   |          |         |
+    | 2   | Grum       | Student   |      |      |      |      |      |      |      |      |      |      |      |      |         |          |         |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
 
 A test for a regresion when teacher has no permission to see one of
 the sections, even though he is teaching another one:
@@ -198,12 +198,12 @@
 
     >>> teacher2.open(teacher.url)
     >>> printGradebookTable(teacher2.contents)
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 05 B | 06 A | 06 B | 11 A | 11 B | 12 A | 12 B | 13 A | 13 B | 18 A | 18 B | 19 A | 19 B | 20 A | 20 B | 25 A | 25 B | 26 A | 26 B | 27 A | 27 B | Average | Absences | Tardies |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | 1   | Frum       | Student   |      |      |      |      | X    | X    | 5    |      |      |      | X    | X    | 10   |      |      |      | X    | X    |      |      |      |      | X    | X    | 7.500   |          |         |
-    | 2   | Grum       | Student   |      |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |      |      |      | X    |      |      |         |          |         |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 11 A | 11 B | 12 A | 18 A | 18 B | 19 A | 25 A | 25 B | 26 A | Average | Absences | Tardies |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | 1   | Frum       | Student   |      |      |      | 5    |      |      | 10   |      |      |      |      |      | 7.500   |          |         |
+    | 2   | Grum       | Student   |      |      |      |      |      |      |      |      |      |      |      |      |         |          |         |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
 
 Now let's change the teacher for the adjacent section section:
 
@@ -216,10 +216,9 @@
 
     >>> teacher2.reload()
     >>> printGradebookTable(teacher2.contents)
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 06 A | 06 B | 11 A | 11 B | 12 A | 13 A | 13 B | 18 A | 18 B | 19 A | 20 A | 20 B | 25 A | 25 B | 26 A | 27 A | 27 B | Average | Absences | Tardies |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-    | 1   | Frum       | Student   |      |      |      | X    | X    | 5    |      |      | X    | X    | 10   |      |      | X    | X    |      |      |      | X    | X    | 7.500   |          |         |
-    | 2   | Grum       | Student   |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |      |         |          |         |
-    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
-
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | Nr. | First Name | Last Name | 04 A | 04 B | 05 A | 11 A | 11 B | 12 A | 18 A | 18 B | 19 A | 25 A | 25 B | 26 A | Average | Absences | Tardies |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+
+    | 1   | Frum       | Student   |      |      |      | 5    |      |      | 10   |      |      |      |      |      | 7.500   |          |         |
+    | 2   | Grum       | Student   |      |      |      |      |      |      |      |      |      |      |      |      |         |          |         |
+    +-----+------------+-----------+------+------+------+------+------+------+------+------+------+------+------+------+---------+----------+---------+

=== modified file 'src/schooltool/lyceum/journal/generations/__init__.py'
--- src/schooltool/lyceum/journal/generations/__init__.py	2011-07-06 09:52:15 +0000
+++ src/schooltool/lyceum/journal/generations/__init__.py	2013-03-26 15:54:32 +0000
@@ -24,6 +24,6 @@
 
 
 schemaManager = SchemaManager(
-    minimum_generation=2,
-    generation=2,
+    minimum_generation=3,
+    generation=3,
     package_name='schooltool.lyceum.journal.generations')

=== added file 'src/schooltool/lyceum/journal/generations/evolve3.py'
--- src/schooltool/lyceum/journal/generations/evolve3.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/lyceum/journal/generations/evolve3.py	2013-03-26 15:54:32 +0000
@@ -0,0 +1,138 @@
+#
+# - common information systems platform for school administration
+# Copyright (c) 2013 Shuttleworth Foundation
+#
+# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+"""
+Move grades from overlapped journal schedules to respective journals.
+"""
+from zope.app.generations.utility import findObjectsProviding
+from zope.app.publication.zopepublication import ZopePublication
+from zope.component.hooks import getSite, setSite
+from zope.component import getUtility
+from zope.intid.interfaces import IIntIds
+
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.app.interfaces import ISchoolToolCalendar
+from schooltool.course.interfaces import ISection
+from schooltool.person.interfaces import IPerson
+from schooltool.lyceum.journal.interfaces import ISectionJournalData
+from schooltool.term.interfaces import ITerm
+
+
+def student_sections(students):
+    sections = set()
+    for student in students:
+        for section in student.groups:
+            if ISection.providedBy(section):
+                sections.add(section)
+    return sections
+
+
+def adjacent_sections(section):
+    courses = section.courses
+    instructors = section.instructors
+    sections = set()
+    sections.add(section)
+    members = [member for member in section.members
+               if IPerson.providedBy(member)]
+    for section in student_sections(members):
+        for course in section.courses:
+            if course in courses:
+                for instructor in section.instructors:
+                    if instructor in instructors:
+                        sections.add(section)
+                        break
+    return sections
+
+
+def collect_meeting_ids(section):
+    calendar = ISchoolToolCalendar(section)
+    unique_meeting_ids = set()
+    for event in sorted(calendar, key=lambda e: e.dtstart):
+        entry_id = event.meeting_id
+        if entry_id is None:
+            entry_id = event.unique_id
+        if entry_id not in unique_meeting_ids:
+            unique_meeting_ids.add(entry_id)
+    return unique_meeting_ids
+
+
+def collect_student_names(section):
+    return set([person.__name__ for person in section.members])
+
+
+def evolveSectionJournal(section, journal):
+    adjacent_journals = sorted([
+        (ITerm(adj_sec).first,
+         ISectionJournalData(adj_sec),
+         collect_meeting_ids(adj_sec),
+         collect_student_names(adj_sec))
+        for adj_sec in adjacent_sections(section)
+        if ITerm(adj_sec).first > ITerm(section).first
+        ])
+
+    for key in journal.__grade_data__:
+        person_name, grade_date = key
+        for adj_date, adj_journal, adj_eids, adj_students in reversed(adjacent_journals):
+            if adj_date > grade_date:
+                continue # journal starts later then grade recorded
+
+            if person_name not in adj_students:
+                continue # person is not attending this section
+
+            # process day records
+            recorded_entries = list(journal.__grade_data__.get(key, ()))
+            for eid, entries in recorded_entries:
+                # is the move possible for this grade?
+                if eid not in adj_eids:
+                    continue
+                journal.__grade_data__[key] = tuple([
+                        (k, v)
+                        for k, v in journal.__grade_data__[key]
+                        if k != eid])
+                adj_journal.__grade_data__[key] = tuple(sorted(
+                        [(k, v)
+                         for k, v in adj_journal.__grade_data__.get(key, ())
+                         if k != eid] +
+                        [(eid, entries)]
+                        ))
+
+
+def evolveJournals(app):
+    container = app['schooltool.lyceum.journal']
+    int_ids = getUtility(IIntIds)
+
+    for section_id, journal in container.items():
+        section = int_ids.queryObject(int(section_id))
+        if section:
+            evolveSectionJournal(section, journal)
+        else:
+            # Section was deleted, delete journal data for it
+            del container[section_id]
+
+
+def evolve(context):
+    root = context.connection.root().get(ZopePublication.root_name, None)
+    old_site = getSite()
+
+    apps = findObjectsProviding(root, ISchoolToolApplication)
+    for app in apps:
+        setSite(app)
+        if 'schooltool.lyceum.journal' in app:
+            evolveJournals(app)
+
+    setSite(old_site)

=== modified file 'src/schooltool/lyceum/journal/journal.py'
--- src/schooltool/lyceum/journal/journal.py	2012-05-16 16:03:21 +0000
+++ src/schooltool/lyceum/journal/journal.py	2013-03-26 15:54:32 +0000
@@ -70,33 +70,6 @@
     ann[CURRENT_SECTION_TAUGHT_KEY] = removeSecurityProxy(section)
 
 
-def student_sections(students):
-    sections = set()
-    for student in students:
-        for section in student.groups:
-            if ISection.providedBy(section):
-                sections.add(section)
-    return sections
-
-
-def adjacent_sections(section):
-    courses = section.courses
-    instructors = section.instructors
-    sections = set()
-    sections.add(section)
-    members = [member for member in section.members
-               if IPerson.providedBy(member)]
-    for section in student_sections(members):
-        section = removeSecurityProxy(section)
-        for course in section.courses:
-            if course in courses:
-                for instructor in section.instructors:
-                    if instructor in instructors:
-                        sections.add(section)
-                        break
-    return sections
-
-
 class LyceumJournalContainer(BTreeContainer):
     """A container for all the journals in the system."""
 
@@ -255,36 +228,26 @@
                 if IPerson.providedBy(member)]
 
     @Lazy
-    def adjacent_sections(self):
-        """Sections in the same course that share members and at least one
-        teacher with this section."""
-        return adjacent_sections(removeSecurityProxy(self.section))
-
-    @Lazy
     def meetings(self):
-        """Ordered list of all meetings for this and adjacent sections with
+        """Ordered list of all meetings for this section with
            consecutive periods removed if the timetable is so configured."""
         events = []
         unique_meetings = set()
-        calendars = [ISchoolToolCalendar(section)
-                     for section in self.adjacent_sections]
-        for calendar in calendars:
-            sorted_events = sorted(calendar, key=lambda e: e.dtstart)
-            for event in sorted_events:
-                if event.meeting_id not in unique_meetings:
-                    events.append(event)
-                    unique_meetings.add(event.meeting_id)
+        calendar = ISchoolToolCalendar(removeSecurityProxy(self.section))
+        sorted_events = sorted(calendar, key=lambda e: e.dtstart)
+        for event in sorted_events:
+            if event.meeting_id not in unique_meetings:
+                events.append(event)
+                unique_meetings.add(event.meeting_id)
         return sorted(events)
 
     def recordedMeetings(self, person):
         """Ordered list of all recorded meetings for this person.
 
-        For this and adjacent sections.
+        For this section.
         """
-        meetings = []
-        for section in self.adjacent_sections:
-            sd = ISectionJournalData(section)
-            meetings.extend(sd.recordedMeetings(person))
+        sd = ISectionJournalData(removeSecurityProxy(self.section))
+        meetings = sd.recordedMeetings(person)
         return sorted(meetings)
 
     def hasMeeting(self, person, meeting):
@@ -293,14 +256,9 @@
         return owner in ILearner(person).sections()
 
     def findMeeting(self, meeting_id):
-        calendars = [ISchoolToolCalendar(section)
-                     for section in self.adjacent_sections]
-        for calendar in calendars:
-            try:
-                return calendar.find(meeting_id)
-            except KeyError:
-                pass
-        raise KeyError("Could not find a meeting.")
+        calendar = ISchoolToolCalendar(removeSecurityProxy(self.section))
+        meeting = calendar.find(meeting_id)
+        return meeting
 
 
 def getSectionJournalData(section):

=== modified file 'src/schooltool/lyceum/journal/tests/test_journal.py'
--- src/schooltool/lyceum/journal/tests/test_journal.py	2012-04-04 22:19:32 +0000
+++ src/schooltool/lyceum/journal/tests/test_journal.py	2013-03-26 15:54:32 +0000
@@ -244,70 +244,6 @@
     """
 
 
-def doctest_SectionJournal_adjacent_sections():
-    """Tests for SectionJournal.adjacent_sections:
-
-        >>> from schooltool.lyceum.journal.journal import SectionJournal
-        >>> from schooltool.course.interfaces import ISection
-        >>> class SectionStub(object):
-        ...     implements(ISection)
-        ...     def __init__(self, name):
-        ...         self.name = name
-        ...     def __repr__(self):
-        ...         return "<Section %s>" % self.name
-        ...     def __cmp__(self, other):
-        ...         return cmp(self.name, other.name)
-        ...     courses = []
-        ...     members = []
-        ...     instructors = []
-        >>> section = SectionStub("Math 1a")
-        >>> section.courses = ["math"]
-        >>> sj = SectionJournal(section)
-        >>> sorted(sj.adjacent_sections)
-        [<Section Math 1a>]
-
-        >>> from schooltool.person.interfaces import IPerson
-        >>> class PersonStub(object):
-        ...     implements(IPerson)
-        ...     groups = []
-        >>> john = PersonStub()
-        >>> pete = PersonStub()
-        >>> teacher = PersonStub()
-        >>> section.members = [john, pete, "something-else"]
-        >>> section.instructors = [teacher]
-        >>> sj = SectionJournal(section)
-        >>> sorted(sj.adjacent_sections)
-        [<Section Math 1a>]
-
-        >>> sj = SectionJournal(section)
-        >>> section2 = SectionStub("Math 1a A")
-        >>> john.groups = [section2, "something-else"]
-        >>> sorted(sj.adjacent_sections)
-        [<Section Math 1a>]
-
-        >>> sj = SectionJournal(section)
-        >>> section2.courses = ["math"]
-        >>> section2.instructors = [teacher]
-        >>> sorted(sj.adjacent_sections)
-        [<Section Math 1a>, <Section Math 1a A>]
-
-        >>> sj = SectionJournal(section)
-        >>> section2.courses = ["math", "history"]
-        >>> section.courses = ["math", "history"]
-        >>> sorted(sj.adjacent_sections)
-        [<Section Math 1a>, <Section Math 1a A>]
-
-        >>> sj = SectionJournal(section)
-        >>> section3 = SectionStub("Math 1a B")
-        >>> section3.courses = ["math"]
-        >>> section3.instructors = [teacher]
-        >>> pete.groups = [section3]
-        >>> sorted(sj.adjacent_sections)
-        [<Section Math 1a>, <Section Math 1a A>, <Section Math 1a B>]
-
-    """
-
-
 def doctest_SectionJournal_findMeeting():
     """Test for SectionJournal.findMeeting
 
@@ -328,14 +264,13 @@
         >>> section1.calendar = CalendarStub()
         >>> section1.calendar.events = ["section-meeting"]
         >>> sj = SectionJournal(section1)
-        >>> sj.adjacent_sections = [section1]
 
     If there is no such meeting, a key error is raised:
 
         >>> sj.findMeeting("some-meeting-id")
         Traceback (most recent call last):
         ...
-        KeyError: 'Could not find a meeting.'
+        KeyError: 'Event not found!'
 
     But if we are looking for a meeting that belongs to the calendar
     of the context section, we should get it:
@@ -343,17 +278,6 @@
         >>> sj.findMeeting("section-meeting")
         '<Event uid=section-meeting>'
 
-    If meeting belongs to some other section that is adjacent, we
-    should still get it's instance:
-
-        >>> section2 = SectionStub()
-        >>> section2.calendar = CalendarStub()
-        >>> section2.calendar.events = ["section2-meeting"]
-        >>> sj.adjacent_sections = [section1, section2]
-
-        >>> sj.findMeeting("section2-meeting")
-        '<Event uid=section2-meeting>'
-
     """