Merge lp:~ubuntu-branches/ubuntu/precise/schooltool.lyceum.journal/precise-201112231905 into lp:ubuntu/precise/schooltool.lyceum.journal

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/precise/schooltool.lyceum.journal reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/precise/schooltool.lyceum.journal/precise-201112231905. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

10. By Gediminas Paulauskas on 2011-12-23

* New upstream release.
* debian/patches/cells-css.patch: remove, fixed upstream.
* debian/rules: install upstream changelog.

=== added directory '.pc'
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2011-12-23 19:10:30 +0000
@@ -0,0 +1,1 @@
+2

=== added file '.pc/applied-patches'
--- .pc/applied-patches	1970-01-01 00:00:00 +0000
+++ .pc/applied-patches	2011-12-23 19:10:30 +0000
@@ -0,0 +1,1 @@
+cells-css.patch

=== added directory '.pc/cells-css.patch'
=== added directory '.pc/cells-css.patch/src'
=== added directory '.pc/cells-css.patch/src/schooltool'
=== added directory '.pc/cells-css.patch/src/schooltool/lyceum'
=== added directory '.pc/cells-css.patch/src/schooltool/lyceum/journal'
=== added directory '.pc/cells-css.patch/src/schooltool/lyceum/journal/browser'
=== added file '.pc/cells-css.patch/src/schooltool/lyceum/journal/browser/journal.py'
--- .pc/cells-css.patch/src/schooltool/lyceum/journal/browser/journal.py	1970-01-01 00:00:00 +0000
+++ .pc/cells-css.patch/src/schooltool/lyceum/journal/browser/journal.py	2011-12-23 19:10:30 +0000
@@ -0,0 +1,1190 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2007 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
+#
+"""
+Lyceum journal views.
+"""
+import pytz
+import urllib
+import base64
+
+from zope.security.proxy import removeSecurityProxy
+from zope.security import checkPermission
+from zope.proxy import sameProxiedObjects
+from zope.viewlet.interfaces import IViewlet
+from zope.exceptions.interfaces import UserError
+from zope.publisher.browser import BrowserView
+from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+from zope.formlib.widget import quoteattr
+from zope.component import queryMultiAdapter
+from zope.i18n import translate
+from zope.i18n.interfaces.locales import ICollator
+from zope.interface import implements
+from zope.traversing.browser.absoluteurl import absoluteURL
+from zope.component import getUtility
+
+from zc.table.column import GetterColumn
+from zc.table.interfaces import IColumn
+from zope.cachedescriptors.property import Lazy
+
+from schooltool.skin import flourish
+from schooltool.course.interfaces import ILearner, IInstructor
+from schooltool.common.inlinept import InlineViewPageTemplate
+from schooltool.person.interfaces import IPerson
+from schooltool.app.browser.cal import month_names
+from schooltool.app.interfaces import IApplicationPreferences
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.term.interfaces import ITerm
+from schooltool.term.interfaces import ITermContainer
+from schooltool.term.interfaces import IDateManager
+from schooltool.table.interfaces import ITableFormatter, IIndexedTableFormatter
+from schooltool.table.table import simple_form_key
+from schooltool.timetable.interfaces import IScheduleCalendarEvent
+from schooltool.timetable.interfaces import IScheduleContainer
+from schooltool.schoolyear.interfaces import ISchoolYear
+
+from schooltool.lyceum.journal.journal import (ABSENT, TARDY,
+    getCurrentSectionTaught, setCurrentSectionTaught)
+from schooltool.lyceum.journal.interfaces import ISectionJournal
+from schooltool.lyceum.journal.browser.interfaces import IIndependentColumn
+from schooltool.lyceum.journal.browser.interfaces import ISelectableColumn
+from schooltool.lyceum.journal.browser.table import SelectStudentCellFormatter
+from schooltool.lyceum.journal.browser.table import SelectableRowTableFormatter
+from schooltool.lyceum.journal import LyceumMessage as _
+
+
+# set up translation from data base data to locale representation and back
+ABSENT_LETTER = translate(_(u"Single letter that represents an absent mark for a student",
+                           default='a'))
+TARDY_LETTER = translate(_(u"Single letter that represents an tardy mark for a student",
+                          default='t'))
+
+ATTENDANCE_DATA_TO_TRANSLATION = {ABSENT: ABSENT_LETTER,
+                                  TARDY:  TARDY_LETTER}
+ATTENDANCE_TRANSLATION_TO_DATA = {ABSENT_LETTER: ABSENT,
+                                  TARDY_LETTER:  TARDY}
+
+
+class JournalCalendarEventViewlet(object):
+    """Viewlet for section meeting calendar events.
+
+    Adds an Attendance link to all section meeting events.
+    """
+
+    def attendanceLink(self):
+        """Construct the URL for the attendance form for a section meeting.
+
+        Returns None if the calendar event is not a section meeting event.
+        """
+        event_for_display = self.manager.event
+        calendar_event = event_for_display.context
+        journal = ISectionJournal(calendar_event, None)
+        if journal:
+            return '%s/index.html?event_id=%s' % (
+                absoluteURL(journal, self.request),
+                urllib.quote(event_for_display.context.unique_id.encode('utf-8')))
+
+
+class FlourishJournalCalendarEventViewlet(JournalCalendarEventViewlet):
+
+    def attendanceLink(self):
+        """Construct the URL for the attendance form for a section meeting.
+
+        Returns None if the calendar event is not a section meeting event.
+        """
+        event_for_display = self.manager.event
+        calendar_event = event_for_display.context
+        journal = ISectionJournal(calendar_event, None)
+        if journal and checkPermission('schooltool.view', journal):
+            return '%s/index.html?event_id=%s' % (
+                absoluteURL(journal, self.request),
+                urllib.quote(event_for_display.context.unique_id.encode('utf-8')))
+
+
+class StudentNumberColumn(GetterColumn):
+
+    def getter(self, item, formatter):
+        return formatter.row
+
+    def renderCell(self, item, formatter):
+        value = self.getter(item, formatter)
+        cell = u'%d<input type="hidden" value=%s class="person_id" />' % (
+            value, quoteattr(item.__name__))
+        return cell
+
+    def renderHeader(self, formatter):
+        return '<span>%s</span>' % translate(_("Nr."),
+                                             context=formatter.request)
+
+class GradesColumn(object):
+    def getGrades(self, person):
+        """Get the grades for the person."""
+        grades = []
+        for meeting in self.journal.recordedMeetings(person):
+            if meeting.dtstart.date() in self.term:
+                grade = self.journal.getGrade(person, meeting)
+                if grade and grade.strip():
+                    grades.append(grade)
+        return grades
+
+
+class PersonGradesColumn(GradesColumn):
+    implements(ISelectableColumn, IIndependentColumn)
+
+    def __init__(self, meeting, journal, selected=False):
+        self.meeting = meeting
+        self.selected = selected
+        self.journal = journal
+
+    def today(self):
+        return getUtility(IDateManager).today
+
+    @property
+    def name(self):
+        return self.meeting.unique_id
+
+    def meetingDate(self):
+        app = ISchoolToolApplication(None)
+        tzinfo = pytz.timezone(IApplicationPreferences(app).timezone)
+        date = self.meeting.dtstart.astimezone(tzinfo).date()
+        return date
+
+    def extra_parameters(self, request):
+        parameters = []
+        for info in ['TERM', 'month', 'student']:
+            if info in request:
+                parameters.append((info, request[info].encode('utf-8')))
+        return parameters
+
+    def journalUrl(self, request):
+        return absoluteURL(self.journal, request)
+
+    def renderHeader(self, formatter):
+        meetingDate = self.meetingDate()
+        header = meetingDate.strftime("%d")
+
+        today_class = ""
+        if meetingDate == self.today():
+            today_class = ' today'
+
+        if not self.selected:
+            url = "%s/index.html?%s" % (
+                self.journalUrl(formatter.request),
+                urllib.urlencode([('event_id', self.meeting.unique_id.encode('utf-8'))] +
+                                 self.extra_parameters(formatter.request)))
+            try:
+                if self.meeting.period is not None:
+                    short_title = self.meeting.period.title[:3]
+                else:
+                    short_title = ''
+                period = '<br />' + short_title
+                if period[-1] == ':':
+                    period = period[:-1]
+            except:
+                period = ''
+            header = '<a href="%s">%s%s</a>' % (url, header, period)
+
+        span = '<span class="select-column%s" title="%s">%s</span>' % (
+            today_class, meetingDate.strftime("%Y-%m-%d"), header)
+        event_id = '<input type="hidden" value="%s" class="event_id" />' % (
+            urllib.quote(base64.encodestring(self.meeting.unique_id.encode('utf-8'))))
+        return span + event_id
+
+    def getCellValue(self, item):
+        if self.hasMeeting(item):
+            grade = self.journal.getGrade(item, self.meeting, default="")
+            return ATTENDANCE_DATA_TO_TRANSLATION.get(grade, grade)
+        return "X"
+
+    def hasMeeting(self, item):
+        return self.journal.hasMeeting(item, self.meeting)
+
+    def template(self, item, selected):
+        value = self.getCellValue(item)
+        name = "%s.%s" % (item.__name__, self.meeting.__name__)
+
+        if not selected:
+            return "<td>%s</td>" % value
+        else:
+            klass = ' class="selected-column"'
+            input = """<td%(class)s><input type="text" style="width: 1.4em"
+                                           name="%(name)s"
+                                           value="%(value)s" /></td>"""
+            return input % {'class': klass, 'name':name, 'value':value}
+
+    def renderSelectedCell(self, item, formatter):
+        selected = self.hasMeeting(item)
+        return self.template(item, selected)
+
+    def renderCell(self, item, formatter):
+        selected = self.selected and self.hasMeeting(item)
+        return self.template(item, selected)
+
+
+class SectionTermGradesColumn(GradesColumn):
+    implements(IColumn)
+
+    def __init__(self, journal, term):
+        self.term = term
+        self.name = term.__name__ + "grades"
+        self.journal = journal
+
+    def renderCell(self, person, formatter):
+        grades = []
+        for grade in self.getGrades(person):
+            try:
+                grade = int(grade)
+            except ValueError:
+                continue
+            grades.append(grade)
+        if not grades:
+            return ""
+        else:
+            return ",".join(["%s" % grade for grade in grades])
+
+    def renderHeader(self, formatter):
+        return '<span>%s</span>' % translate(_("Grades"),
+                                             context=formatter.request)
+
+class SectionTermAverageGradesColumn(GradesColumn):
+    implements(IColumn)
+
+    def __init__(self, journal, term):
+        self.term = term
+        self.name = term.__name__ + "average"
+        self.journal = journal
+
+    def renderCell(self, person, formatter):
+        grades = []
+        for grade in self.getGrades(person):
+            try:
+                grade = int(grade)
+            except ValueError:
+                continue
+            grades.append(grade)
+        if not grades:
+            return ""
+        else:
+            return "%.3f" % (sum(grades) / float(len(grades)))
+
+    def renderHeader(self, formatter):
+        return '<span>%s</span>' % translate(_("Average"),
+                                             context=formatter.request)
+
+
+class SectionTermAttendanceColumn(GradesColumn):
+    implements(IColumn)
+
+    def __init__(self, journal, term):
+        self.term = term
+        self.name = term.__name__ + "attendance"
+        self.journal = journal
+
+    def renderCell(self, person, formatter):
+        absences = 0
+        for grade in self.getGrades(person):
+            if (grade.strip().lower() == ABSENT):
+                absences += 1
+
+        if absences == 0:
+            return ""
+        else:
+            return str(absences)
+
+    def renderHeader(self, formatter):
+        return '<span>%s</span>' % translate(_("Absences"),
+                                             context=formatter.request)
+
+
+class SectionTermTardiesColumn(GradesColumn):
+    implements(IColumn)
+
+    def __init__(self, journal, term):
+        self.term = term
+        self.name = term.__name__ + "tardies"
+        self.journal = journal
+
+    def renderCell(self, person, formatter):
+        tardies = 0
+        for grade in self.getGrades(person):
+            if (grade.strip().lower() == TARDY):
+                tardies += 1
+
+        if tardies == 0:
+            return ""
+        else:
+            return str(tardies)
+
+    def renderHeader(self, formatter):
+        return '<span>%s</span>' % translate(_("Tardies"),
+                                             context=formatter.request)
+
+def journal_grades():
+    grades = [
+        {'keys': [ABSENT_LETTER.lower(), ABSENT_LETTER.upper()],
+         'value': ABSENT_LETTER,
+         'legend': _('Absent')},
+        {'keys': [TARDY_LETTER.lower(), TARDY_LETTER.upper()],
+         'value': TARDY_LETTER,
+         'legend': _('Tardy')}]
+    for i in range(9):
+        grades.append({'keys': [chr(i + ord('1'))],
+                       'value': unicode(i+1),
+                       'legend': u''})
+    grades.append({'keys': ['0'],
+                   'value': u'10',
+                   'legend': u''})
+    return grades
+
+
+class SectionJournalJSView(BrowserView):
+
+    def grading_events(self):
+        for grade in journal_grades():
+            event_check = ' || '.join([
+                'event.which == %d' % ord(key)
+                for key in grade['keys']])
+            yield {'js_condition': event_check,
+                   'grade_value': "'%s'" % grade['value']}
+
+
+class StudentSelectionMixin(object):
+
+    selected_students = None
+
+    def selectStudents(self, table_formatter):
+        self.selected_students = []
+        if 'student' in self.request:
+            student_id = self.request['student']
+            app = ISchoolToolApplication(None)
+            student = app['persons'].get(student_id)
+            self.selected_students = [student]
+
+        if IIndexedTableFormatter.providedBy(table_formatter):
+            self.selected_students = table_formatter.indexItems(
+                self.selected_students)
+
+
+class LyceumSectionJournalView(StudentSelectionMixin):
+
+    template = ViewPageTemplateFile("templates/journal.pt")
+    no_timetable_template = ViewPageTemplateFile("templates/no_timetable_journal.pt")
+    no_periods_template = ViewPageTemplateFile("templates/no_periods_journal.pt")
+
+    def __init__(self, context, request):
+        self.context, self.request = context, request
+
+    def __call__(self):
+        schedules = IScheduleContainer(self.context.section)
+        if not schedules:
+            return self.no_timetable_template()
+
+        meetings = self.all_meetings
+        if not meetings:
+            return self.no_periods_template()
+
+        if 'UPDATE_SUBMIT' in self.request:
+            self.updateGradebook()
+
+        app = ISchoolToolApplication(None)
+        person_container = app['persons']
+        self.gradebook = queryMultiAdapter((person_container, self.request),
+                                           ITableFormatter)
+
+        self.selectStudents(self.gradebook)
+
+        columns_before = [StudentNumberColumn(title=_('Nr.'), name='nr')]
+
+        self.gradebook.setUp(items=self.members(),
+                             formatters=[SelectStudentCellFormatter(self.context)] * 2,
+                             columns_before=columns_before,
+                             columns_after=self.gradeColumns(),
+                             table_formatter=self.formatterFactory,
+                             batch_size=0)
+
+        return self.template()
+
+    def getLegendItems(self):
+        for grade in journal_grades():
+            yield {'keys': u', '.join(grade['keys']),
+                   'value': grade['value'],
+                   'description': grade['legend']}
+
+    def encodedSelectedEventId(self):
+        event = self.selectedEvent()
+        if event:
+            return urllib.quote(base64.encodestring(event.unique_id.encode('utf-8')))
+
+    def formatterFactory(self, *args, **kwargs):
+        kwargs['selected_items'] = self.selected_students
+        return SelectableRowTableFormatter(*args, **kwargs)
+
+    def allMeetings(self):
+        term = removeSecurityProxy(self.selected_term)
+
+        # maybe expand would be better in here
+        by_uid = dict([(removeSecurityProxy(e).unique_id, e)
+                       for e in self.context.meetings])
+
+        insecure_events = [removeSecurityProxy(e)
+                           for e in by_uid.values()]
+        insecure_events[:] = filter(lambda e: e.dtstart.date() in term,
+                                    insecure_events)
+        meetings = [by_uid[e.unique_id] for e in sorted(insecure_events)]
+        return meetings
+
+    @Lazy
+    def all_meetings(self):
+        return self.allMeetings()
+
+    def meetings(self):
+        for event in self.all_meetings:
+            insecure_event = removeSecurityProxy(event)
+            if insecure_event.dtstart.date().month == self.active_month:
+                yield event
+
+    def members(self):
+        members = list(self.context.members)
+        collator = ICollator(self.request.locale)
+        members.sort(key=lambda a: collator.key(
+                removeSecurityProxy(a).first_name))
+        members.sort(key=lambda a: collator.key(
+                removeSecurityProxy(a).last_name))
+        return members
+
+    def updateGradebook(self):
+        members = self.members()
+        for meeting in self.meetings():
+            for person in members:
+                cell_id = "%s.%s" % (person.__name__, meeting.__name__)
+                cell_value = self.request.get(cell_id, None)
+                if cell_value is not None:
+                    cell_value = ATTENDANCE_TRANSLATION_TO_DATA.get(cell_value, cell_value)
+                    self.context.setGrade(person, meeting, cell_value)
+
+    def gradeColumns(self):
+        columns = []
+        selected_meeting = self.selectedEvent()
+        for meeting in self.meetings():
+            # Arguably anyone who can look at this journal
+            # should be able to look at meeting grades
+            insecure_meeting = removeSecurityProxy(meeting)
+            selected = selected_meeting and selected_meeting == insecure_meeting
+            columns.append(PersonGradesColumn(insecure_meeting, self.context,
+                                              selected=selected))
+        columns.append(SectionTermAverageGradesColumn(self.context,
+                                                      self.selected_term))
+        columns.append(SectionTermAttendanceColumn(self.context,
+                                                   self.selected_term))
+        columns.append(SectionTermTardiesColumn(self.context,
+                                                self.selected_term))
+        return columns
+
+    def getSelectedTerm(self):
+        terms = ITermContainer(self.context)
+        term_id = self.request.get('TERM', None)
+        if term_id and term_id in terms:
+            term = terms[term_id]
+            if term in self.scheduled_terms:
+                return term
+
+        return self.getCurrentTerm()
+
+    @Lazy
+    def selected_term(self):
+        return self.getSelectedTerm()
+
+    def selectedEvent(self):
+        event_id = self.request.get('event_id', None)
+        if event_id is not None:
+            try:
+                return self.context.findMeeting(event_id)
+            except KeyError:
+                pass
+
+    def selectedDate(self):
+        event = self.selectedEvent()
+        if event:
+            app = ISchoolToolApplication(None)
+            tzinfo = pytz.timezone(IApplicationPreferences(app).timezone)
+            date = event.dtstart.astimezone(tzinfo).date()
+            return date
+        else:
+            return getUtility(IDateManager).today
+
+    def getCurrentTerm(self):
+        event = self.selectedEvent()
+        if event:
+            calendar = event.__parent__
+            owner = calendar.__parent__
+            term = ITerm(owner)
+            return term
+        return self.scheduled_terms[-1]
+
+    @property
+    def scheduled_terms(self):
+        linked_sections = self.context.section.linked_sections
+        linked_sections = [section for section in linked_sections
+                           if IScheduleContainer(section)]
+        terms = [ITerm(section) for section in linked_sections]
+        return sorted(terms, key=lambda term: term.last)
+
+    def monthsInSelectedTerm(self):
+        month = -1
+        for meeting in self.all_meetings:
+            insecure_meeting = removeSecurityProxy(meeting)
+            # XXX: what about time zones?
+            if insecure_meeting.dtstart.date().month != month:
+                yield insecure_meeting.dtstart.date().month
+                month = insecure_meeting.dtstart.date().month
+
+    @Lazy
+    def selected_months(self):
+        return list(self.monthsInSelectedTerm())
+
+    def monthTitle(self, number):
+        return translate(month_names[number], context=self.request)
+
+    def monthURL(self, month_id):
+        url = absoluteURL(self.context, self.request)
+        url = "%s/index.html?%s" % (
+            url,
+            urllib.urlencode([('month', month_id)] +
+                             self.extra_parameters(self.request)))
+        return url
+
+    @Lazy
+    def active_year(self):
+        event = self.selectedEvent()
+        if event:
+            return event.dtstart.year
+
+        available_months = list(self.selected_months)
+        selected_month = None
+        if 'month' in self.request:
+            month = int(self.request['month'])
+            if month in available_months:
+                selected_month = month
+
+        if not selected_month:
+            selected_month = available_months[0]
+
+        for meeting in self.all_meetings:
+            insecure_meeting = removeSecurityProxy(meeting)
+            if insecure_meeting.dtstart.date().month == selected_month:
+                return insecure_meeting.dtstart.year
+
+    @Lazy
+    def active_month(self):
+        available_months = list(self.selected_months)
+        if 'month' in self.request:
+            month = int(self.request['month'])
+            if month in available_months:
+                return month
+
+        term = self.selected_term
+        date = self.selectedDate()
+        if term.first <= date <= term.last:
+            month = date.month
+            if month in available_months:
+                return month
+
+        return available_months[0]
+
+    def extra_parameters(self, request):
+        parameters = []
+        for info in ['TERM', 'student']:
+            if info in request:
+                parameters.append((info, request[info].encode('utf-8')))
+        return parameters
+
+
+class SectionJournalAjaxView(BrowserView):
+
+    def __call__(self):
+        person_id = self.request['person_id']
+        app = ISchoolToolApplication(None)
+        person = app['persons'].get(person_id)
+        if not person:
+            raise UserError('Person was invalid!')
+        meeting = self.context.findMeeting(base64.decodestring(urllib.unquote(self.request['event_id'])).decode("utf-8"))
+        grade = self.request['grade']
+        grade = ATTENDANCE_TRANSLATION_TO_DATA.get(grade, grade)
+        self.context.setGrade(person, meeting, grade);
+        return ""
+
+
+class SectionListView(BrowserView):
+
+    def getSectionsForPerson(self, person):
+        current_term = getUtility(IDateManager).current_term
+        sections = IInstructor(person).sections()
+        results = []
+        for section in sections:
+            term = ITerm(section)
+            if sameProxiedObjects(current_term, term):
+                url = "%s/journal/" % absoluteURL(section, self.request)
+                results.append({'title': removeSecurityProxy(section).title,
+                                'url': url})
+
+        collator = ICollator(self.request.locale)
+        results.sort(key=lambda s: collator.key(s['title']))
+        return results
+
+
+class TeacherJournalView(SectionListView):
+    """A view that lists all the sections teacher is teaching to.
+
+    The links go to the journals of these sections and only sections
+    in the current term are displayed.
+    """
+
+    def getSections(self):
+        return self.getSectionsForPerson(self.context)
+
+
+class TeacherJournalTabViewlet(SectionListView):
+    implements(IViewlet)
+
+    def enabled(self):
+        person = IPerson(self.request.principal, None)
+        if not person:
+            return False
+        return bool(list(self.getSectionsForPerson(person)))
+
+
+class JournalNavViewlet(flourish.page.LinkViewlet, SectionListView):
+
+    @property
+    def person(self):
+        return IPerson(self.request.principal, None)
+
+    @property
+    def title(self):
+        person = self.person
+        if person is None:
+            return ''
+        taught_sections = list(self.getSectionsForPerson(person))
+        learner_sections = list(ILearner(person).sections())
+        if not (taught_sections or learner_sections):
+            return ''
+        return _('Journal')
+
+    @property
+    def url(self):
+        if self.person is None:
+            return ''
+        base_url = absoluteURL(self.person, self.request)
+        return '%s/journal.html' % base_url
+
+    def getSectionsForPerson(self, person):
+        return list(IInstructor(person).sections())
+
+
+class StudentGradebookTabViewlet(object):
+    implements(IViewlet)
+
+    def enabled(self):
+        person = IPerson(self.request.principal, None)
+        if not person:
+            return False
+        return bool(list(ILearner(person).sections()))
+
+
+class FlourishLyceumSectionJournalView(flourish.page.WideContainerPage,
+                                       LyceumSectionJournalView):
+
+    has_header = False
+    page_class = 'page grid'
+    no_timetable = False
+    no_periods = False
+    render_journal = True
+
+    def updateGradebook(self):
+        members = self.members()
+        for meeting in self.meetings:
+            for person in members:
+                cell_id = "%s_%s" % (meeting.__name__, person.__name__)
+                cell_value = self.request.get(cell_id, None)
+                if cell_value is not None:
+                    cell_value = ATTENDANCE_TRANSLATION_TO_DATA.get(cell_value, cell_value)
+                    self.context.setGrade(person, meeting, cell_value)
+
+    def update(self):
+        schedules = IScheduleContainer(self.context.section)
+        if not schedules:
+            self.no_timetable = True
+            self.render_journal = False
+            return
+
+        meetings = self.all_meetings
+        if not meetings:
+            self.no_periods = True
+            self.render_journal = False
+            return
+
+        person = IPerson(self.request.principal, None)
+        if person is not None:
+            setCurrentSectionTaught(person, self.context.section)
+
+        if 'UPDATE_SUBMIT' in self.request:
+            self.updateGradebook()
+
+        app = ISchoolToolApplication(None)
+        self.tzinfo = pytz.timezone(IApplicationPreferences(app).timezone)
+
+    def table(self):
+        result = []
+        collator = ICollator(self.request.locale)
+        for person in self.members():
+            grades = []
+            for meeting in self.meetings:
+                insecure_meeting = removeSecurityProxy(meeting)
+                grade = self.context.getGrade(person, insecure_meeting, default='')
+                value = ATTENDANCE_DATA_TO_TRANSLATION.get(grade, grade)
+                grade_data = {
+                    'id': '%s_%s' % (meeting.__name__, person.__name__),
+                    'sortKey': meeting.__name__,
+                    'value': value,
+                    'editable': True,
+                    }
+                grades.append(grade_data)
+            if flourish.canView(person):
+                person = removeSecurityProxy(person)
+            result.append(
+                {'student': {'title': person.title,
+                             'id': person.username,
+                             'sortKey': collator.key(person.title),
+                             'url': absoluteURL(person, self.request)},
+                 'grades': grades,
+                 'average': self.average(person),
+                 'absences': self.absences(person),
+                 'tardies': self.tardies(person),
+                })
+        self.sortBy = self.request.get('sort_by')
+        return sorted(result, key=self.sortKey)
+
+    def sortKey(self, row):
+        if self.sortBy == 'student':
+            return row['student']['sortKey']
+        elif self.sortBy == 'average':
+            try:
+                return (float(row['average']), row['student']['sortKey'])
+            except (ValueError,):
+                return ('', row['student']['sortKey'])
+        elif self.sortBy == 'absences':
+            return (int(row['absences']), row['student']['sortKey'])
+        elif self.sortBy == 'tardies':
+            return (int(row['tardies']), row['student']['sortKey'])
+        else:
+            grades = dict([(grade['sortKey'], grade['value'])
+                          for grade in row['grades']])
+            if self.sortBy in grades:
+                grade = grades.get(self.sortBy)
+                try:
+                    grade = int(grade)
+                except (ValueError,):
+                    grade = ATTENDANCE_TRANSLATION_TO_DATA.get(grade)
+                    if grade == ABSENT:
+                        return (1, row['student']['sortKey'])
+                    elif grade == TARDY:
+                        return (2, row['student']['sortKey'])
+                    else:
+                        return (3, row['student']['sortKey'])
+                return (0, grade, row['student']['sortKey'])
+            else:
+                return (1, row['student']['sortKey'])
+
+    def activities(self):
+        result = []
+        for meeting in self.meetings:
+            info = {'hash': meeting.__name__}
+            insecure_meeting = removeSecurityProxy(meeting)
+            meetingDate = insecure_meeting.dtstart.astimezone(self.tzinfo).date()
+            info['shortTitle'] = meetingDate.strftime("%d")
+            info['longTitle'] = meetingDate.strftime("%Y-%m-%d")
+            try:
+                if meeting.period is not None:
+                    short_title = meeting.period.title[:3]
+                else:
+                    short_title = ''
+                period = short_title
+                if period[-1] == ':':
+                    period = period[:-1]
+            except:
+                period = ''
+            info['period'] = period
+            result.append(info)
+        return result
+
+    def getSelectedTerm(self):
+        term = ITerm(self.context.section)
+        if term in self.scheduled_terms:
+            return term
+
+    def getGrades(self, person):
+        grades = []
+        term = self.selected_term
+        for meeting in self.context.recordedMeetings(person):
+            insecure_meeting = removeSecurityProxy(meeting)
+            if insecure_meeting.dtstart.date() in term:
+                grade = self.context.getGrade(
+                    person, insecure_meeting, default=None)
+                if (grade is not None) and (grade.strip() != ""):
+                    grades.append(grade)
+        return grades
+
+    def average(self, person):
+        grades = []
+        for grade in self.getGrades(person):
+            try:
+                grade = int(grade)
+            except ValueError:
+                continue
+            grades.append(grade)
+        if not grades:
+            return _('N/A')
+        else:
+            return "%.1f" % (sum(grades) / float(len(grades)))
+
+    def absences(self, person):
+        absences = 0
+        for grade in self.getGrades(person):
+            if (grade.strip().lower() == "n"):
+                absences += 1
+        if absences == 0:
+            return "0"
+        else:
+            return str(absences)
+
+    def tardies(self, person):
+        tardies = 0
+        for grade in self.getGrades(person):
+            if (grade.strip().lower() == "p"):
+                tardies += 1
+
+        if tardies == 0:
+            return "0"
+        else:
+            return str(tardies)
+
+    def breakJSString(self, origstr):
+        newstr = unicode(origstr)
+        newstr = newstr.replace('\n', '')
+        newstr = newstr.replace('\r', '')
+        newstr = "\\'".join(newstr.split("'"))
+        newstr = '\\"'.join(newstr.split('"'))
+        return newstr
+
+    def scorableActivities(self):
+        return self.activities()
+
+    @property
+    def warningText(self):
+        return _('You have some changes that have not been saved.  Click OK to save now or CANCEL to continue without saving.')
+
+    @Lazy
+    def meetings(self):
+        result = []
+        for event in self.all_meetings:
+            insecure_event = removeSecurityProxy(event)
+            if insecure_event.dtstart.date().month == self.active_month:
+                result.append(event)
+        return result
+
+
+class JournalTertiaryNavigationManager(flourish.page.TertiaryNavigationManager):
+
+    template = InlineViewPageTemplate("""
+        <ul tal:attributes="class view/list_class">
+          <li tal:repeat="item view/items"
+              tal:attributes="class item/class"
+              tal:content="structure item/viewlet">
+          </li>
+        </ul>
+    """)
+
+    @Lazy
+    def items(self):
+        result = []
+        for month_id in self.view.selected_months:
+            url = self.view.monthURL(month_id)
+            title = self.view.monthTitle(month_id)
+            result.append({
+                'class': month_id == self.view.active_month and 'active' or None,
+                'viewlet': u'<a href="%s" title="%s">%s</a>' % (url, title, title),
+                })
+        return result
+
+
+class FlourishJournalNavigationViewletBase(flourish.viewlet.Viewlet):
+
+    @property
+    def person(self):
+        return IPerson(self.request.principal)
+
+    def render(self, *args, **kw):
+        return self.template(*args, **kw)
+
+    def getUserSections(self):
+        return list(IInstructor(self.person).sections())
+
+
+class FlourishJournalYearNavigation(flourish.page.RefineLinksViewlet):
+    """Journal year navigation viewlet."""
+
+
+class FlourishJournalYearNavigationViewlet(FlourishJournalNavigationViewletBase):
+    template = InlineViewPageTemplate('''
+    <form method="post"
+          tal:attributes="action string:${context/@@absolute_url}">
+      <select name="currentYear" class="navigator"
+              onchange="this.form.submit()">
+        <tal:block repeat="year view/getYears">
+          <option
+              tal:attributes="value year/form_id;
+                              selected year/selected"
+              tal:content="year/title" />
+        </tal:block>
+      </select>
+    </form>
+    ''')
+
+    def getYears(self):
+        currentSection = self.context.section
+        currentYear = ISchoolYear(ITerm(currentSection))
+        years = []
+        for section in self.getUserSections():
+            year = ISchoolYear(ITerm(section))
+            if year not in years:
+                years.append(year)
+        return [{'title': year.title,
+                 'form_id': year.__name__,
+                 'selected': year is currentYear and 'selected' or None}
+                for year in years]
+
+    def update(self):
+        super(FlourishJournalYearNavigationViewlet, self).update()
+        if 'currentYear' in self.request:
+            currentSection = self.context.section
+            currentYear = ISchoolYear(ITerm(currentSection))
+            requestYearId = self.request['currentYear']
+            if requestYearId != currentYear.__name__:
+                for section in self.getUserSections():
+                    year = ISchoolYear(ITerm(section))
+                    if year.__name__ == requestYearId:
+                        newSection = section
+                        break
+                else:
+                    return
+                url = absoluteURL(newSection, self.request) + '/journal'
+                self.request.response.redirect(url)
+
+
+class FlourishJournalTermNavigation(flourish.page.RefineLinksViewlet):
+    """Journal term navigation viewlet."""
+
+
+class FlourishJournalTermNavigationViewlet(FlourishJournalNavigationViewletBase):
+    template = InlineViewPageTemplate('''
+    <form method="post"
+          tal:attributes="action string:${context/@@absolute_url}">
+      <select name="currentTerm" class="navigator"
+              onchange="this.form.submit()">
+        <tal:block repeat="term view/getTerms">
+          <option
+              tal:attributes="value term/form_id;
+                              selected term/selected"
+              tal:content="term/title" />
+        </tal:block>
+      </select>
+    </form>
+    ''')
+
+    def getTerms(self):
+        currentSection = self.context.section
+        currentTerm = ITerm(currentSection)
+        currentYear = ISchoolYear(currentTerm)
+        terms = []
+        for section in self.getUserSections():
+            term = ITerm(section)
+            if term not in terms and ISchoolYear(term) == currentYear:
+                terms.append(term)
+        return [{'title': term.title,
+                 'form_id': self.getTermId(term),
+                 'selected': term is currentTerm and 'selected' or None}
+                for term in terms]
+
+    def update(self):
+        super(FlourishJournalTermNavigationViewlet, self).update()
+        if 'currentTerm' in self.request:
+            currentSection = self.context.section
+            try:
+                currentCourse = list(currentSection.courses)[0]
+            except (IndexError,):
+                currentCourse = None
+            currentTerm = ITerm(currentSection)
+            requestTermId = self.request['currentTerm']
+            if requestTermId != self.getTermId(currentTerm):
+                newSection = None
+                for section in self.getUserSections():
+                    term = ITerm(section)
+                    if self.getTermId(term) == requestTermId:
+                        try:
+                            temp = list(section.courses)[0]
+                        except (IndexError,):
+                            temp = None
+                        if currentCourse == temp:
+                            newSection = section
+                            break
+                        if newSection is None:
+                            newSection = section
+                url = absoluteURL(newSection, self.request) + '/journal'
+                self.request.response.redirect(url)
+
+    def getTermId(self, term):
+        year = ISchoolYear(term)
+        return '%s.%s' % (simple_form_key(year), simple_form_key(term))
+
+
+class FlourishJournalSectionNavigation(flourish.page.RefineLinksViewlet):
+    """Journal section navigation viewlet."""
+
+
+class FlourishJournalSectionNavigationViewlet(FlourishJournalNavigationViewletBase):
+    template = InlineViewPageTemplate('''
+    <form method="post"
+          tal:attributes="action string:${context/@@absolute_url}">
+      <select name="currentSection" class="navigator"
+              onchange="this.form.submit()">
+        <tal:block repeat="section view/getSections">
+	  <option
+	      tal:attributes="value section/form_id;
+			      selected section/selected;"
+	      tal:content="section/title" />
+        </tal:block>
+      </select>
+    </form>
+    ''')
+
+    def getSections(self):
+        currentSection = self.context.section
+        currentTerm = ITerm(currentSection)
+        for section in self.getUserSections():
+            term = ITerm(section)
+            if term != currentTerm:
+                continue
+            yield {
+                'title': section.title,
+                'form_id': self.getSectionId(section),
+                'selected': section == currentSection and 'selected' or None,
+                }
+
+    def getSectionId(self, section):
+        term = ITerm(section)
+        year = ISchoolYear(term)
+        return '%s.%s.%s' % (simple_form_key(year), simple_form_key(term),
+                             simple_form_key(section))
+
+    def update(self):
+        super(FlourishJournalSectionNavigationViewlet, self).update()
+        if 'currentSection' in self.request:
+            for section in self.getUserSections():
+                if self.getSectionId(section) == self.request['currentSection']:
+                    if section == self.context.section:
+                        break
+                    url = absoluteURL(section, self.request) + '/journal'
+                    self.request.response.redirect(url)
+                    return
+
+
+class FlourishJournalRedirectView(flourish.page.Page):
+
+    def render(self):
+        url = absoluteURL(self.context, self.request)
+        person = IPerson(self.request.principal, None)
+        if person is not None:
+            section = getCurrentSectionTaught(person)
+            if section is None:
+                sections = list(IInstructor(person).sections())
+                if sections:
+                    section = sections[0]
+            if section is not None:
+                url = absoluteURL(section, self.request) + '/journal'
+        self.request.response.redirect(url)
+
+
+class FlourishJournalActionsLinks(flourish.page.RefineLinksViewlet):
+    """Journal action links viewlet."""
+
+
+class FlourishJournalHelpViewlet(flourish.page.ModalFormLinkViewlet):
+
+    @property
+    def dialog_title(self):
+        title = _(u'Journal Help')
+        return translate(title, context=self.request)
+
+
+class FlourishJournalHelpView(flourish.form.Dialog):
+
+    def updateDialog(self):
+        # XXX: fix the width of dialog content in css
+        if self.ajax_settings['dialog'] != 'close':
+            self.ajax_settings['dialog']['width'] = 144 + 16
+
+    def initDialog(self):
+        self.ajax_settings['dialog'] = {
+            'autoOpen': True,
+            'modal': False,
+            'resizable': True,
+            'draggable': True,
+            'position': ['center','middle'],
+            'width': 'auto',
+            }
+
+    def getLegendItems(self):
+        for grade in journal_grades():
+            yield {'keys': u', '.join(grade['keys']),
+                   'value': grade['value'],
+                   'description': grade['legend']}
+
+
+class SectionJournalLinkViewlet(flourish.page.LinkViewlet):
+
+    @Lazy
+    def journal(self):
+        journal = ISectionJournal(self.context, None)
+        return journal
+
+    @property
+    def url(self):
+        journal = self.journal
+        if journal is None:
+            return None
+        return absoluteURL(journal, self.request)
+
+    @property
+    def enabled(self):
+        if not super(SectionJournalLinkViewlet, self).enabled:
+            return False
+        journal = self.journal
+        if journal is None:
+            return None
+        can_view = flourish.canView(journal)
+        return can_view

=== added directory '.pc/cells-css.patch/src/schooltool/lyceum/journal/browser/templates'
=== added file '.pc/cells-css.patch/src/schooltool/lyceum/journal/browser/templates/f_journal.pt'
--- .pc/cells-css.patch/src/schooltool/lyceum/journal/browser/templates/f_journal.pt	1970-01-01 00:00:00 +0000
+++ .pc/cells-css.patch/src/schooltool/lyceum/journal/browser/templates/f_journal.pt	2011-12-23 19:10:30 +0000
@@ -0,0 +1,231 @@
+<div i18n:domain="schooltool.lyceum.journal"
+     tal:define="table view/table;
+                 activities view/activities">
+  <tal:block replace="resource_library:schooltool.lyceum.journal.flourish" />
+  <div tal:condition="not:view/render_journal">
+    <h3 tal:condition="view/no_timetable" i18n:translate="">
+      This section is not scheduled for any term, to use the journal
+      you should add a timetable first.
+    </h3>
+    <h3 tal:condition="view/no_periods" i18n:translate="">
+      No periods have been assigned in timetables of this section.
+    </h3>
+    <h3 i18n:translate="">
+      You can manage timetables for this section here:
+      <a i18n:name="timetable_link"
+         tal:attributes="href string:${view/context/section/@@absolute_url}/schedule"
+         i18n:translate="">Schedule</a>
+    </h3>
+  </div>
+  <metal:block tal:replace="structure string:&lt;script type=&quot;text/javascript&quot;&gt;" />
+      var numstudents = <tal:block replace="python: len(view.members())"/>;
+      var students = new Array(numstudents);
+      <tal:loop repeat="row table">
+      students[<tal:block replace="repeat/row/index"/>] = '<tal:block replace="python: view.breakJSString(row['student']['id'])"/>';
+      </tal:loop>
+      var numactivities = <tal:block replace="python: len(view.scorableActivities())"/>;
+      var activities = new Array(numactivities);
+      <tal:loop repeat="activity activities">
+      activities[<tal:block replace="repeat/activity/index"/>] = '<tal:block replace="activity/hash"/>';
+      </tal:loop>
+      var edited = false;
+      var currentCell;
+      var currentDesc = '';
+      window.onload = onLoadHandler;
+      window.onunload = checkChanges;
+      warningText = '<tal:block replace="view/warningText" />';
+  <metal:block tal:replace="structure string:&lt;/script&gt;" />
+  <form method="post" class="grid-form"
+        tal:condition="view/render_journal"
+        tal:attributes="action request/URL">
+
+    <input tal:condition="request/month|nothing"
+           type="hidden"
+           name="month"
+           tal:attributes="value request/month" />
+    <input tal:condition="request/event_id|nothing"
+           type="hidden"
+           name="event_id"
+           tal:attributes="value request/event_id" />
+    <input tal:condition="request/student|nothing"
+           type="hidden"
+           name="student"
+           tal:attributes="value request/student" />
+
+    <div class="gradebook">
+      <div class="students gradebook-part">
+        <table>
+          <thead>
+            <tr>
+              <th rowspan="2" class="name">
+                <ul class="popup_menu">
+                  <li>
+                    <span i18n:translate="">Name</span>
+                  </li>
+                  <li>
+                    <a href="?sort_by=student" i18n:translate="">Sort by</a>
+                  </li>
+                </ul>
+                <div>
+                  <a class="popup_link" href="" i18n:translate="">Name</a>
+                </div>
+              </th>
+              <th i18n:translate="" class="activity-title">Day</th>
+            </tr>
+            <tr>
+              <th i18n:translate="">Period</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr tal:repeat="row table">
+              <td colspan="2">
+                <div>
+                  <a href=""
+                     tal:attributes="title row/student/title"
+                     tal:content="row/student/title" />
+                </div>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="grades gradebook-part">
+        <table>
+          <thead>
+            <tr>
+              <th tal:repeat="activity activities" class="activity-title">
+                <ul class="popup_menu">
+                  <li>
+                    <span tal:content="activity/longTitle" />
+                  </li>
+                  <li>
+                    <a tal:attributes="href string:${request/URL}?sort_by=${activity/hash}"
+                       i18n:translate="">Sort by</a>
+                  </li>
+                </ul>
+                <div>
+                  <a class="popup_link"
+                     href=""
+                     tal:attributes="title activity/longTitle;
+                                     href request/URL;"
+                     tal:content="activity/shortTitle" />
+                </div>
+              </th>
+              <th class="placeholder">&nbsp;</th>
+            </tr>
+            <tr>
+              <th tal:repeat="activity activities">
+                <div tal:content="activity/period" />
+              </th>
+              <th class="placeholder">&nbsp;</th>
+            </tr>
+          </thead>
+          <tbody>
+            <metal:block tal:repeat="row table">
+              <tr>
+                <td tal:repeat="grade row/grades"
+                    tal:attributes="id string:${grade/id}_cell">
+                  <span tal:condition="not: grade/editable"
+                        tal:content="grade/value" />
+                  <input type="text" name="" value="" size="4"
+                         tal:condition="grade/editable"
+                         onkeydown="return spreadsheetBehaviour(event)"
+                         tal:attributes="name string:${grade/id};
+                                         id string:${grade/id};
+                                         value grade/value;
+                                         onkeyup string:checkValid(event,'${grade/id}');
+                                         onfocus string:handleCellFocus(this, '${grade/id}')"/>
+                </td>
+                <td class="placeholder">&nbsp;</td>
+              </tr>
+            </metal:block>
+          </tbody>
+        </table>
+      </div>
+      <div class="totals gradebook-part">
+        <table>
+          <thead>
+            <tr>
+              <th rowspan="2">
+                <ul class="popup_menu">
+                  <li>
+                    <span i18n:translate="">Name</span>
+                  </li>
+                  <li>
+                    <a href="?sort_by=absences" i18n:translate="">Sort by</a>
+                  </li>
+                </ul>
+                <div>
+                  <a class="popup_link" href="" i18n:translate="">
+                    Abs.
+                  </a>
+                </div>
+              </th>
+              <th rowspan="2">
+                <ul class="popup_menu">
+                  <li>
+                    <span i18n:translate="">Name</span>
+                  </li>
+                  <li>
+                    <a href="?sort_by=tardies" i18n:translate="">Sort by</a>
+                  </li>
+                </ul>
+                <div>
+                  <a class="popup_link" href="" i18n:translate="">
+                    Tar.
+                  </a>
+                </div>
+              </th>
+              <th rowspan="2">
+                <ul class="popup_menu">
+                  <li>
+                    <span i18n:translate="">Name</span>
+                  </li>
+                  <li>
+                    <a href="?sort_by=average" i18n:translate="">Sort by</a>
+                  </li>
+                </ul>
+                <div>
+                  <a class="popup_link" href="" i18n:translate="">
+                    Ave.
+                  </a>
+                </div>
+              </th>
+            </tr>
+            <tr>
+            </tr>
+          </thead>
+          <tbody>
+            <tr tal:repeat="row table">
+              <td tal:content="row/absences" />
+              <td tal:content="row/tardies" />
+              <td tal:content="row/average" />
+            </tr>
+          </tbody>
+        </table>
+      </div>
+    </div>
+    <div class="gradebook-controls">
+      <div class="buttons">
+        <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save" 
+               onclick="setNotEdited()"
+               title="Shortcut: Alt-S" accesskey="S"
+               i18n:attributes="value; title; accesskey" />
+      </div>
+      <div class="buttons zoom-buttons">
+        <button type="button" class="button-neutral zoom-button" id="zoom-out"
+                title="Zoom Out" i18n:attributes="title">
+          <span class="ui-icon ui-icon-zoomout"></span>
+        </button>
+        <button type="button" class="button-neutral zoom-button" id="zoom-normal"
+                title="Zoom Normal" i18n:attributes="title">
+          <span class="ui-icon ui-icon-search"></span>
+        </button>
+        <button type="button" class="button-neutral zoom-button" id="zoom-in"
+                title="Zoom In" i18n:attributes="title">
+          <span class="ui-icon ui-icon-zoomin"></span>
+        </button>
+      </div>
+    </div>
+  </form>
+</div>