Merge lp:~aelkner/schooltool/schooltool.gradebook_september_fixes into lp:~schooltool-owners/schooltool/schooltool.gradebook

[Alan Elkner]

[lp:~aelkner/schooltool/schooltool.gradebook_september_fixes]

80. By Alan Elkner on 2009-09-10

protect evolve1 script from failing if there is no gradebook root yet

81. By Alan Elkner on 2009-09-10

fixed bug with deleting report sheet template activities, bug #417924

82. By Alan Elkner on 2009-09-10

Report Card Layout view re-wording of text and adding OK button, bug #400499

83. By Alan Elkner on 2009-09-10

fixed filename of report card pdf, bug #422915

84. By Alan Elkner on 2009-09-10

replaced Report Worksheet with Report Sheet in ui, bug #400402

85. By Alan Elkner on 2009-09-15

manage view for a worksheet has no activities message, bug #400406
also don't show delete button for no activities
added Worksheets link that was long overdue, and used in test

86. By Alan Elkner on 2009-09-15

changed Print Report Card links to Download Report Card, bug #400512

87. By Alan Elkner on 2009-09-15

changed Column Preferences link to Preferences, bug #427976

88. By Alan Elkner on 2009-09-18

report sheet activities now support ranged values, bug #417926

89. By Alan Elkner on 2009-09-20

added abbreviations column to discrete score systems, bug #409038

90. By Alan Elkner on 2009-09-21

added protection against duplicate scores and abbreviations in score systems

91. By Alan Elkner on 2009-09-29

added new linked column activities feature, bug #417918

92. By Alan Elkner on 2009-10-05

added absent and tardy columns to report card grid, bug #410005

93. By Alan Elkner on 2009-10-06

Added framework for the four new reports
This includes navigation and dummy reports, no real cells yet

94. By Alan Elkner on 2009-10-06

added date to absences by day report

95. By Alan Elkner on 2009-10-08

added request failing report view

96. By Alan Elkner on 2009-10-08

oops, forgot this file on last commit

97. By Alan Elkner on 2009-10-08

added request absences by day view

98. By Alan Elkner on 2009-10-09

made the sample data better

99. By Alan Elkner on 2009-10-11

added auto-create summary sheets feature, bug #427994

100. By Alan Elkner on 2009-10-12

string changes requested by Tom for the string freeze

101. By Alan Elkner on 2009-10-12

made sure all string constants in the templates are translatable

102. By Alan Elkner on 2009-10-12

fixed mixed strings in a couple templates

103. By Alan Elkner on 2009-10-12

replaced some sample data with real functionality in student detail report

[Gediminas Paulauskas (menesis)]

Merged into lp:schooltool.gradebook

review: Approve

=== modified file 'src/schooltool/gradebook/README.txt'
--- src/schooltool/gradebook/README.txt	2009-06-01 21:32:36 +0000
+++ src/schooltool/gradebook/README.txt	2009-10-12 08:13:10 +0000
@@ -375,7 +375,7 @@
 a cell in the worksheet.
 
     >>> gradebook.getEvaluation(paul, hw1)
-    <Evaluation for <Activity u'HW 1'>, value=10>
+    (10, <RangedValuesScoreSystem None>)
 
 We can get a student average for the worksheet, an integer percentage that
 can later be used to formulate a letter grade.

=== modified file 'src/schooltool/gradebook/__init__.py'
--- src/schooltool/gradebook/__init__.py	2007-06-04 15:01:11 +0000
+++ src/schooltool/gradebook/__init__.py	2009-10-12 08:13:10 +0000
@@ -21,3 +21,31 @@
 
 makeDecimalARock()
 del makeDecimalARock
+
+def sliceString(source, start, end=None, startIndex=0, endIndex=0,
+                includeEnd=False):
+    index = -1 * len(start)
+    while startIndex >= 0:
+        index += len(start)
+        index = source[index:].find(start)
+        if index < 0:
+            index = 0
+            break
+        startIndex -= 1
+    if end is None:
+        last = len(source)
+    else:
+        last = index - len(end)
+        while endIndex >= 0:
+            last += len(end)
+            next = source[last:].find(end)
+            if next < 0:
+                last = len(source)
+                break
+            else:
+                last += next
+            endIndex -= 1
+        if last < len(source) and includeEnd:
+            last += len(end)
+    return source[index:last]
+

=== modified file 'src/schooltool/gradebook/activity.py'
--- src/schooltool/gradebook/activity.py	2009-04-09 00:41:49 +0000
+++ src/schooltool/gradebook/activity.py	2009-10-12 08:13:10 +0000
@@ -35,6 +35,7 @@
 from zope.component import queryAdapter, getAdapters
 from zope.schema.interfaces import IVocabularyFactory
 
+from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.common import SchoolToolMessage as _
 from schooltool.requirement import requirement, scoresystem
 from schooltool.gradebook import interfaces
@@ -55,6 +56,45 @@
     activities[name] = sheet1
 
 
+def createSourceString(sourceObj):
+    if interfaces.IActivity.providedBy(sourceObj):
+        act_hash = unicode(hash(IKeyReference(sourceObj)))
+        worksheet = sourceObj.__parent__
+    else:
+        act_hash = 'ave'
+        worksheet = sourceObj
+    section = worksheet.__parent__.__parent__
+    sectionContainer = section.__parent__
+    return '%s_%s_%s_%s' % (sectionContainer.__name__, section.__name__,
+        unicode(hash(IKeyReference(worksheet))), act_hash)
+
+
+def getSourceObj(source):
+    scid, sid, ws_hash, act_hash = source.split('_')
+
+    app = ISchoolToolApplication(None)
+    sectionContainer = app['schooltool.course.section'].get(scid, None)
+    if sectionContainer is None:
+        return None
+
+    section = sectionContainer.get(sid, None)
+    if section is None:
+        return None
+
+    for worksheet in interfaces.IActivities(section).values():
+        if ws_hash == unicode(hash(IKeyReference(worksheet))):
+            break
+    else:
+        return None
+
+    if act_hash == 'ave':
+        return worksheet
+    for activity in worksheet.values():
+        if act_hash == unicode(hash(IKeyReference(activity))):
+            return activity
+    return None
+
+
 class Activities(requirement.Requirement):
     zope.interface.implements(interfaces.IActivities)
 
@@ -243,3 +283,13 @@
     def __call__(self, context):
         section = context.context.__parent__.__parent__
         return ExternalActivitiesSource(section)
+
+
+class LinkedColumnActivity(Activity):
+    zope.interface.implements(interfaces.ILinkedColumnActivity)
+
+    def __init__(self, title, category, label, source):
+        super(LinkedColumnActivity, self).__init__(title, category, None, '',
+            label)
+        self.source = source
+

=== modified file 'src/schooltool/gradebook/browser/README.txt'
--- src/schooltool/gradebook/browser/README.txt	2009-08-25 20:24:41 +0000
+++ src/schooltool/gradebook/browser/README.txt	2009-10-12 08:13:10 +0000
@@ -10,6 +10,10 @@
     >>> from schooltool.app.browser.ftests import setup
     >>> manager = setup.logIn('manager', 'schooltool')
 
+Some imports:
+
+    >>> from schooltool.gradebook import sliceString
+
 
 Initial School Setup
 --------------------
@@ -75,6 +79,7 @@
 
    >>> setup.addSchoolYear('2007', '2007-01-01', '2007-12-31')
    >>> setup.addTerm('Winter', '2007-01-01', '2007-06-01', schoolyear='2007')
+   >>> setup.addTerm('Fall', '2007-07-01', '2007-12-31', schoolyear='2007')
 
 Next the administrator defines the courses that are available in the school.
 
@@ -86,6 +91,13 @@
     >>> manager.getControl('Add').click()
     >>> manager.getLink('Physics I').click()
 
+    >>> manager.getLink('2007').click()
+    >>> manager.getLink('Courses').click()
+    >>> manager.getLink('New Course').click()
+    >>> manager.getControl('Title').value = 'English I'
+    >>> manager.getControl('Add').click()
+    >>> manager.getLink('English I').click()
+
 This completes the initial school setup.
 
 
@@ -93,10 +105,11 @@
 ----------
 
 Every term, the administrators of a school are going to setup sections. So
-let's add a section for our course:
+let's add some sections:
 
     >>> from schooltool.app.browser.ftests import setup
     >>> setup.addSection('Physics I', '2007', 'Winter')
+    >>> setup.addSection('English I', '2007', 'Fall')
 
 But what would a section be without some students and a teacher?
 
@@ -106,7 +119,7 @@
     >>> addPerson('Claudia', 'Richter', 'claudia', 'pwd', browser=manager)
     >>> addPerson('Stephan', 'Richter', 'stephan', 'pwd', browser=manager)
 
-Now we can add those people to the section:
+Now we can add those people to our sections:
 
     >>> manager.getLink('2007').click()
     >>> manager.getLink('Courses').click()
@@ -125,6 +138,23 @@
     >>> manager.getControl('Add').click()
     >>> manager.getControl('OK').click()
 
+    >>> manager.getLink('2007').click()
+    >>> manager.getLink('Courses').click()
+    >>> manager.getLink('English I').click()
+    >>> manager.getLink('(1)').click()
+
+    >>> manager.getLink('edit individuals').click()
+    >>> manager.getControl(name='add_item.paul').value = 'checked'
+    >>> manager.getControl(name='add_item.tom').value = 'checked'
+    >>> manager.getControl(name='add_item.claudia').value = 'checked'
+    >>> manager.getControl('Add').click()
+    >>> manager.getControl('OK').click()
+
+    >>> manager.getLink('edit instructors').click()
+    >>> manager.getControl(name='add_item.stephan').value = 'checked'
+    >>> manager.getControl('Add').click()
+    >>> manager.getControl('OK').click()
+
 
 Instructor should be automatically capable of manipulating activities
 and other section data.
@@ -161,6 +191,15 @@
     >>> 'Week 1' in stephan.contents
     True
 
+We'll note the message that appears for empty worksheets.  Also, the fact that
+there's no delete button.
+
+    >>> stephan.getLink('Week 1').click()
+    >>> analyze.printQuery("id('content-body')/form/div[1]", stephan.contents)
+    <div>This worksheet has no activities.</div>
+    >>> analyze.printQuery("id('content-body')/form/div[3]", stephan.contents)
+    >>> stephan.getLink('Worksheets').click()
+
 Then, we can use the 'New Worksheet' action link to create our second worksheet.
 
     >>> stephan.getLink('New Worksheet').click()
@@ -274,23 +313,26 @@
     ...     < stephan.contents.find('Final')
     True
 
-You can also delete activities that you have created:
+We'll switch to the Fall term and add some activities to the English I section:
 
+    >>> stephan.open('http://localhost/schoolyears/2007/winter/sections/1/activities/Worksheet-2/gradebook?currentTerm=Fall')
     >>> stephan.getLink('New Activity').click()
-    >>> stephan.getControl('Title').value = 'HW 3'
-    >>> stephan.getControl('Description').value = 'Homework 3'
+    >>> stephan.getControl('Title').value = 'Lab 1'
+    >>> stephan.getControl('Description').value = 'Laboratory 1'
     >>> stephan.getControl('Category').value = ['assignment']
     >>> stephan.getControl('Add').click()
-    >>> stephan.getLink('Manage Activities').click()
-    >>> 'HW 3' in stephan.contents
-    True
-    >>> stephan.getControl(name='delete:list').value = ['Activity-3']
-    >>> stephan.getControl('Delete').click()
-    >>> 'HW 3' in stephan.contents
-    False
+    >>> 'Lab 1' in stephan.contents
+    True
+    >>> stephan.getLink('New Activity').click()
+    >>> stephan.getControl('Title').value = 'Final'
+    >>> stephan.getControl('Description').value = 'Final Exam'
+    >>> stephan.getControl('Category').value = ['exam']
+    >>> stephan.getControl('Add').click()
+    >>> 'Final' in stephan.contents
+    True
 
-Fianlly, let's change the current workskeet back to 'Week 1'.  This setting
-of current worksheet will be in effect for the gradebook as well.
+Finally, we'll change the section back to the Winter Physics section and the
+current workskeet back to 'Week 1'.
 
     >>> stephan.open('http://localhost/schoolyears/2007/winter/sections/1/gradebook/')
     >>> stephan.getLink('Week 1').click()
@@ -639,15 +681,15 @@
     >>> manager.getLink('Score Systems').click()
     >>> manager.getLink('Add Score System').click()
     >>> url = manager.url + '?form-submitted&UPDATE_SUBMIT&title=Good/Bad'
-    >>> url = url + '&displayed1=G&value1=1&percent1=60'
-    >>> url = url + '&displayed2=B&value2=0&percent2=0'
+    >>> url = url + '&displayed1=G&abbr1=&value1=1&percent1=60'
+    >>> url = url + '&displayed2=B&abbr2=&value2=0&percent2=0'
     >>> manager.open(url)
 
 We'll start by calling up the current column preferences and note that there
 are none set yet.
 
     >>> stephan.getLink('Return to Gradebook').click()
-    >>> stephan.getLink('Column Preferences').click()
+    >>> stephan.getLink('Preferences').click()
     >>> analyze.printQuery("id('content-body')/form/table//input", stephan.contents)
     <input type="checkbox" name="hide_total" />
     <input type="text" name="label_total" value="" />
@@ -670,7 +712,7 @@
     >>> url += '&scoresystem_average=goodbad'
     >>> stephan.open(url)
 
-    >>> stephan.getLink('Column Preferences').click()
+    >>> stephan.getLink('Preferences').click()
     >>> analyze.printQuery("id('content-body')/form/table//input", stephan.contents)
     <input type="checkbox" checked="checked" name="hide_total" />
     <input type="text" name="label_total" value="Summe" />
@@ -1058,3 +1100,133 @@
     ...Tom...59.00...79%...44...15.00...
     ...Paul...40...80%...40...
 
+
+Column Linking
+--------------
+
+To add a spreadsheet feature we created LindedColumnActivity objects to allow
+the user to pull in columns from other worksheets.  These columns will not only
+display the contents of the source column, but the values will be factored
+into the average for the worksheet where the linked column activity lives.
+
+There are two types of linked activities, a link to an other worksheet's
+activity, or a link to the average column of the worksheet.  Activity links
+will use the score system of the source activity whereas worksheet average
+links will use an assumed 100 point system.
+ 
+We'll switch to the Fall term and enter some scores to the English I section:
+
+    >>> stephan.open('http://localhost/schoolyears/2007/winter/sections/1/activities/Worksheet-2/gradebook?currentTerm=Fall')
+    >>> stephan.getLink('Lab1').click()
+    >>> stephan.getControl('Cardune, Paul').value = u'89'
+    >>> stephan.getControl('Hoffman, Tom').value = u'72'
+    >>> stephan.getControl('Save').click()
+
+    >>> stephan.getLink('Final').click()
+    >>> stephan.getControl('Cardune, Paul').value = u'99'
+    >>> stephan.getControl('Hoffman, Tom').value = u'88'
+    >>> stephan.getControl('Save').click()
+
+We'll test the totals and averages so that we can check the linked values below:
+
+    >>> results = analyze.queryHTML("id('content-body')//table//b", stephan.contents)
+    >>> results = [result.strip() for result in results]
+    >>> for result in results: print result
+    <b>188</b>
+    <b>94%</b>
+    <b>160</b>
+    <b>80%</b>
+    <b>0</b>
+    <b>0%</b>
+
+Now we'll return to the Winter Physics section and add our first linked column
+to the Week 1 worksheet:
+
+    >>> stephan.open('http://localhost/schoolyears/2007/winter/sections/1/gradebook/')
+    >>> stephan.getLink('Week 1').click()
+    >>> stephan.getLink('New Linked Column').click()
+
+First we'll test the contents of the table of available activities and worksheet
+averages that can be chosen as the link.  We have to slice and dice the query
+results becuase the ... feature is erratic:
+
+    >>> results = analyze.queryHTML("id('content-body')/form/table//td", stephan.contents)
+    >>> slice_results = []
+    >>> for low, high in [(0, 3), (4, 7), (8, 11), (12, 15), (16, 19), (20, 23)]:
+    ...     slice_results.extend(results[low:high])
+    >>> for result in slice_results: print result
+    <td class="cell padded odd">Winter</td>
+    <td class="cell padded odd">Physics I</td>
+    <td class="cell padded odd">Week 2</td>
+    <td class="cell padded even"></td>
+    <td class="cell padded even"></td>
+    <td class="cell padded even"></td>
+    <td class="cell padded odd"></td>
+    <td class="cell padded odd"></td>
+    <td class="cell padded odd"></td>
+    <td class="cell padded even">Fall</td>
+    <td class="cell padded even">English I</td>
+    <td class="cell padded even">Sheet1</td>
+    <td class="cell padded odd"></td>
+    <td class="cell padded odd"></td>
+    <td class="cell padded odd"></td>
+    <td class="cell padded even"></td>
+    <td class="cell padded even"></td>
+    <td class="cell padded even"></td>
+
+    >>> results = analyze.queryHTML("id('content-body')/form/table//input", stephan.contents)
+    >>> for result in results: print sliceString(result, 'value', '"', endIndex=1, includeEnd=True)
+    value="HW 2"
+    value="Final"
+    value="Average"
+    value="Lab 1"
+    value="Final"
+    value="Average"
+
+We'll add a link to HW 2 from Week 2, then the average of the worksheet from the
+Fall English I section, Sheet1:
+
+    >>> stephan.getControl('HW 2').click()
+    >>> stephan.getLink('New Linked Column').click()
+    >>> stephan.getControl('Average', index=1).click()
+
+The gradebook now has two new columns whose values are pulled in from the
+sources of the links.  First we'll test the editable fields:
+
+    >>> results = analyze.queryHTML("id('content-body')//input", stephan.contents)
+    >>> results = [result.strip() for result in results]
+    >>> for result in results[7:-1]: print sliceString(result, 'value', '"', endIndex=1, includeEnd=True)
+    value=""
+    value="86"
+    value="10.00"
+    value="44"
+    value=""
+    value="15.00"
+    value="40"
+    value=""
+    value=""
+
+Next we'll test the linked column data:
+
+    >>> results = analyze.queryHTML("id('content-body')//span", stephan.contents)
+    >>> results = [result.strip() for result in results]
+    >>> for result in results[7:]: print result
+    <span>42</span>
+    <span>0</span>
+    <span>72</span>
+    <span>80</span>
+    <span>90</span>
+    <span>94</span>
+
+Finally we'll test the totals and averages:
+
+    >>> results = analyze.queryHTML("id('content-body')//table//b", stephan.contents)
+    >>> results = [result.strip() for result in results]
+    >>> for result in results: print result
+    <b>138.00</b>
+    <b>62%</b>
+    <b>211.00</b>
+    <b>77%</b>
+    <b>224</b>
+    <b>90%</b>
+

=== added file 'src/schooltool/gradebook/browser/absences_by_day_rml.pt'
--- src/schooltool/gradebook/browser/absences_by_day_rml.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/absences_by_day_rml.pt	2009-10-12 08:13:10 +0000
@@ -0,0 +1,100 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+  <!ENTITY nbsp    "&#160;">
+]>
+
+<document
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="context/@@rml_macros/report"
+  i18n:domain="schooltool">
+
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
+<stylesheet>
+  <metal:block fill-slot="extra_initialize">
+  </metal:block>
+  <metal:block fill-slot="stylesheet">
+
+    <paraStyle
+      name="normal"
+      fontName="Arial_Normal"
+      fontSize="10"
+      leading="12"/>
+
+    <paraStyle
+      name="bold"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="left"
+      leading="12"/>
+
+    <paraStyle
+      name="heading"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="right"
+      leading="12"/>
+
+    <paraStyle
+      name="section_heading"
+      fontName="Arial_Bold"
+      fontSize="12"
+      alignment="center"
+      leading="12"/>
+
+    <blockTableStyle id="headings_table">
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="grid">
+    	<lineStyle kind="OUTLINE"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+  </metal:block>
+</stylesheet>
+
+<story metal:fill-slot="story">
+  <para style="section_heading" tal:content="view/date_heading" />
+  <spacer length="1cm" />
+
+  <blockTable style="headings_table" colWidths="8cm,4cm">
+    <tr>
+      <td />
+      <td><para style="bold" tal:content="view/periods_heading" /></td>
+    </tr>
+  </blockTable>
+  <spacer length=".2cm" />
+
+  <blockTable style="grid"
+              tal:attributes="colWidths view/widths">
+    <tr>
+      <td><para style="bold" tal:content="view/name_heading" /></td>
+      <td tal:repeat="period view/periods">
+        <para style="bold" tal:content="period" />
+      </td>
+    </tr>
+  </blockTable>
+
+  <blockTable style="headings_table"
+              tal:attributes="colWidths view/widths">
+    <tr tal:repeat="student view/students">
+      <td><para style="bold" tal:content="student/name" /></td>
+      <td tal:repeat="period student/periods">
+        <para style="normal" tal:content="period" />
+      </td>
+    </tr>
+  </blockTable>
+
+  <condPageBreak height="88cm"/>
+
+</story>
+
+</document>
+

=== modified file 'src/schooltool/gradebook/browser/activity.py'
--- src/schooltool/gradebook/browser/activity.py	2009-08-25 20:24:41 +0000
+++ src/schooltool/gradebook/browser/activity.py	2009-10-12 08:13:10 +0000
@@ -26,10 +26,11 @@
 import xlwt
 from StringIO import StringIO
 
-from zope.viewlet.viewlet import ViewletBase
 from zope.app.container.interfaces import INameChooser
 from zope.app.form.browser.editview import EditView
+from zope.app.keyreference.interfaces import IKeyReference
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.publisher.browser import BrowserView
 from zope.schema import TextLine
 from zope.security.checker import canWrite
 from zope.security.interfaces import Unauthorized
@@ -43,23 +44,27 @@
 from zope.formlib import form
 from zope import interface, schema
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.viewlet.viewlet import ViewletBase
 
 from z3c.form import form as z3cform
 from z3c.form import field, button
 
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.app.browser import app
+from schooltool.basicperson.interfaces import IDemographics
 from schooltool.common import SchoolToolMessage as _
+from schooltool.course.interfaces import ISection, ILearner, IInstructor
+from schooltool.export import export
 from schooltool.gradebook import interfaces, activity
-from schooltool.gradebook.activity import Activity
+from schooltool.gradebook.activity import createSourceString, getSourceObj
+from schooltool.gradebook.activity import Activity, LinkedColumnActivity
 from schooltool.gradebook.category import getCategories
 from schooltool.person.interfaces import IPerson
 from schooltool.gradebook.browser.gradebook import LinkedActivityGradesUpdater
 from schooltool.requirement.interfaces import IRangedValuesScoreSystem
 from schooltool.requirement.scoresystem import RangedValuesScoreSystem
 from schooltool.requirement.scoresystem import UNSCORED
-from schooltool.export import export
-from schooltool.basicperson.interfaces import IDemographics
+from schooltool.term.interfaces import ITerm
 
 
 class ILinkedActivityFields(interface.Interface):
@@ -418,10 +423,8 @@
                      export.Text(student.first_name),
                      export.Text(student.last_name)]
             for activity in activities:
-                ev = gradebook.getEvaluation(student, activity)
-                if ev is not None and ev.value is not UNSCORED:
-                    value = ev.value
-                else:
+                value, ss = gradebook.getEvaluation(student, activity)
+                if value is None:
                     value = ''
                 cells.append(export.Text(value))
             for col, cell in enumerate(cells):
@@ -441,3 +444,172 @@
         data = datafile.getvalue()
         self.setUpHeaders(data)
         return data
+
+
+class LinkedColumnBase(BrowserView):
+    """Base class for add/edit linked column views"""
+    def __init__(self, context, request):
+        super(LinkedColumnBase, self).__init__(context, request)
+        if interfaces.IWorksheet.providedBy(self.context):
+            self.currentWorksheet = self.context
+        else:
+            self.currentWorksheet = self.context.__parent__
+        self.person = IPerson(self.request.principal)
+
+    def title(self):
+        if interfaces.IWorksheet.providedBy(self.context):
+            return ''
+        else:
+            return self.context.title
+
+    def label(self):
+        if interfaces.IWorksheet.providedBy(self.context):
+            return ''
+        else:
+            return self.context.label
+
+    def getCategories(self):
+        language = 'en' # XXX this need to be dynamic
+        categories = getCategories(ISchoolToolApplication(None))
+
+        results = []
+        for category in sorted(categories.getKeys()):
+            result = {
+                'name': category,
+                'value': categories.getValue(category, language),
+                }
+            results.append(result)
+        return results
+
+    def isLinked(self, activity):
+        return interfaces.ILinkedColumnActivity.providedBy(activity)
+
+    def getRows(self):
+        term_dict = {}
+        for section in IInstructor(self.person).sections():
+            term = ITerm(section)
+            term_dict.setdefault(term, []).append(section)
+        results = []
+        for term in sorted(term_dict.keys(), key=lambda t: t.first):
+            term_disp = term.title
+            for section_index, section in enumerate(term_dict[term]):
+                section_disp = list(section.courses)[0].title
+                worksheets = interfaces.IActivities(section).values()
+                worksheets = [worksheet for worksheet in worksheets
+                              if not worksheet.deployed
+                              and len(worksheet.values())
+                              and worksheet != self.currentWorksheet]
+                for ws_index, worksheet in enumerate(worksheets):
+                    ws_disp = worksheet.title
+                    activities = [activity for activity in worksheet.values()
+                                  if not self.isLinked(activity)]
+                    for act_index, activity in enumerate(activities):
+                        result = {
+                            'term': term_disp,
+                            'section': section_disp,
+                            'worksheet': ws_disp,
+                            'activity_name': createSourceString(activity),
+                            'activity_value': activity.title,
+                            }
+                        results.append(result)
+                        term_disp = section_disp = ws_disp = ''
+                    if len(activities):
+                        result = {
+                            'term': '',
+                            'section': '',
+                            'worksheet': '',
+                            'activity_name': createSourceString(worksheet),
+                            'activity_value': _('Average'),
+                            }
+                        results.append(result)
+        return results
+
+    def getRequestSource(self):
+        for key in self.request:
+            parts = key.split('_')
+            if len(parts) == 4:
+                try:
+                    int(parts[2])
+                    return key
+                except:
+                    pass
+        return None
+
+    def buildUpdateTarget(self, target=None):
+        title = self.request['title']
+        label = self.request['label']
+        category = self.request['category']
+        source = self.getRequestSource()
+        if not title:
+            sourceObj = getSourceObj(source)
+            if sourceObj is not None:
+                title = sourceObj.title
+        if target is None:
+            return LinkedColumnActivity(title, category, label, source)
+        else:
+            target.title = title
+            target.label = label
+            target.category = category
+            target.source = source
+
+
+class AddLinkedColumnView(LinkedColumnBase):
+    """View for adding a linked column to the gradebook"""
+
+    def viewTitle(self):
+        return _('Add Linked Column')
+
+    def actionURL(self):
+        return absoluteURL(self.context, self.request) + '/addLinkedColumn.html'
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
+    def update(self):
+        if 'form-submitted' not in self.request:
+            return
+        if 'CANCEL' in self.request:
+            self.request.response.redirect(self.nextURL())
+        else:
+            activity = self.buildUpdateTarget()
+            chooser = INameChooser(self.context)
+            name = chooser.chooseName('', activity)
+            self.context[name] = activity
+            self.request.response.redirect(self.nextURL())
+
+
+class EditLinkedColumnView(LinkedColumnBase):
+    """View for editing a linked column in the gradebook"""
+
+    def viewTitle(self):
+        sourceObj = getSourceObj(self.context.source)
+        if sourceObj is None:
+            details = ''
+        else:
+            if interfaces.IWorksheet.providedBy(sourceObj):
+                act_disp = _('Average')
+                worksheet = sourceObj
+            else:
+                act_disp = sourceObj.title
+                worksheet = sourceObj.__parent__
+            section = ISection(worksheet)
+            term = ITerm(section)
+        details = ' (%s - %s - %s - %s)' % (term.title, 
+            list(section.courses)[0].title, worksheet.title, act_disp)
+        return _('Edit Linked Column') + details
+
+    def actionURL(self):
+        return absoluteURL(self.context, self.request) + '/editLinkedColumn.html'
+
+    def nextURL(self):
+        return absoluteURL(self.context.__parent__, self.request)
+
+    def update(self):
+        if 'form-submitted' not in self.request:
+            return
+        if 'CANCEL' in self.request:
+            self.request.response.redirect(self.nextURL())
+        else:
+            self.buildUpdateTarget(self.context)
+            self.request.response.redirect(self.nextURL())
+

=== added file 'src/schooltool/gradebook/browser/add_edit_linked_column.pt'
--- src/schooltool/gradebook/browser/add_edit_linked_column.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/add_edit_linked_column.pt	2009-10-12 08:13:10 +0000
@@ -0,0 +1,68 @@
+<tal:define define="dummy view/update"/>
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" tal:content="view/viewTitle" />
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header" tal:content="view/viewTitle" />
+
+<metal:block metal:fill-slot="body">
+  <form method="post"
+        tal:attributes="action view/actionURL">
+    <input type="hidden" name="form-submitted" value="" />
+    <label for="title" i18n:translate="">Title</label>
+    <input type="text" name="title" 
+           tal:attributes="value view/title" />
+    <label for="label" i18n:translate="">Label</label>
+    <input type="text" name="label"
+           tal:attributes="value view/label" />
+    <label for="category" i18n:translate="">Category</label>
+    <select id="category" name="category">
+      <tal:block repeat="category view/getCategories">
+        <option tal:attributes="value category/name"
+                tal:content="category/value" />
+      </tal:block>
+    </select>
+    <br /><br />
+    <table class="schooltool_gradebook">
+      <tr>
+        <th class="cell even" style="border-bottom: solid thin; padding: .4em">Term</th>
+        <th class="cell even" style="border-bottom: solid thin; padding: .4em">Section</th>
+        <th class="cell even" style="border-bottom: solid thin; padding: .4em">Worksheet</th>
+        <th class="cell even" style="border-bottom: solid thin; padding: .4em">Activity</th>
+      </tr>
+      <tr tal:repeat="row view/getRows">
+        <tal:if condition="repeat/row/odd">
+          <td class="cell padded even" tal:content="row/term" />
+          <td class="cell padded even" tal:content="row/section" />
+          <td class="cell padded even" tal:content="row/worksheet" />
+          <td class ="even" style="padding: .1em 0 .1em">
+            <input type="submit"
+                   style="background: #83A67F; height: 1.7em; font-weight: bold;
+                          color: #FFFFFF"
+                   tal:attributes="name row/activity_name;value row/activity_value" />
+          </td>
+        </tal:if>
+        <tal:if condition="repeat/row/even">
+          <td class="cell padded odd" tal:content="row/term" />
+          <td class="cell padded odd" tal:content="row/section" />
+          <td class="cell padded odd" tal:content="row/worksheet" />
+          <td class ="odd" style="padding: .1em 0 .1em">
+            <input type="submit"
+                   style="background: #83A67F; height: 1.7em; font-weight: bold;
+                          color: #FFFFFF"
+                   tal:attributes="name row/activity_name;value row/activity_value" />
+          </td>
+        </tal:if>
+    </tr>
+    </table>
+    <div class="controls">
+      <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
+    </div>
+  </form>
+
+</metal:block>
+</body>
+</html>
+

=== modified file 'src/schooltool/gradebook/browser/categories.pt'
--- src/schooltool/gradebook/browser/categories.pt	2009-04-17 13:19:19 +0000
+++ src/schooltool/gradebook/browser/categories.pt	2009-10-12 08:13:10 +0000
@@ -16,6 +16,13 @@
       Manage Activity Categories
     </h3>
 
+    <p i18n:translate="">
+      Categories are used in SchoolTool's gradebook to organize activities and to allow teachers to weight different types of activities differently to calculate grades. For example, the grade in a section might be comprised of 60% test scores, 20% homework and 20% class participation.
+    </p>
+    <p i18n:translate="">
+      Currently, the list of available categories for all teachers is managed through this form. That is, if one or more teachers would like to use a category not in the current list, the site manager can add it here. Likewise, if some of the default categories are not relevant to your school, remove them below.
+    </p>
+
     <div class="info" tal:condition="view/message" tal:content="view/message" />
 
     <div class="row" tal:define="widget nocall:view/categories_widget">

=== modified file 'src/schooltool/gradebook/browser/configure.zcml'
--- src/schooltool/gradebook/browser/configure.zcml	2009-07-29 09:35:08 +0000
+++ src/schooltool/gradebook/browser/configure.zcml	2009-10-12 08:13:10 +0000
@@ -45,6 +45,13 @@
       permission="schooltool.edit"
       />
 
+  <!-- Report sheet activity vocabulary -->
+  <zope:utility
+      provides="zope.schema.interfaces.IVocabularyFactory"
+      component=".report_card.ReportScoreSystemsVocabulary"
+      name="schooltool.gradebook.reportscoresystems"
+      />
+
   <!-- Categories -->
   <form
       label="Activity Categories"
@@ -123,7 +130,7 @@
       <widget field="description" height="5" />
     </addform>
     <addform
-        label="Add a Report Worksheet"
+        label="Add a Report Sheet"
         name="addReportWorksheet.html"
         schema="schooltool.gradebook.interfaces.IReportWorksheet"
         fields="title"
@@ -147,7 +154,7 @@
         title="Edit"
         />
     <editform
-        label="Edit Report Worksheet"
+        label="Edit Report Sheet"
         name="edit.html"
         for="schooltool.gradebook.interfaces.IReportWorksheet"
         schema="schooltool.gradebook.interfaces.IReportWorksheet"
@@ -246,6 +253,20 @@
       for="..interfaces.ILinkedActivity"
       name="edit.html"
       />
+  <page
+     name="addLinkedColumn.html"
+     for="schooltool.gradebook.interfaces.IWorksheet"
+     class=".activity.AddLinkedColumnView"
+     template="add_edit_linked_column.pt"
+     permission="schooltool.edit"
+     />
+  <page
+     name="editLinkedColumn.html"
+     for="schooltool.gradebook.interfaces.ILinkedColumnActivity"
+     class=".activity.EditLinkedColumnView"
+     template="add_edit_linked_column.pt"
+     permission="schooltool.edit"
+     />
 
   <!-- Menu items for ISection -->
   <menuItem
@@ -259,7 +280,7 @@
   <!-- Menu items for IActivities -->
   <menuItem
       menu="schooltool_actions"
-      title="New Report Worksheet"
+      title="New Report Sheet"
       for="..interfaces.IGradebookTemplates"
       action="+/addReportWorksheet.html"
       permission="schooltool.view"
@@ -303,11 +324,25 @@
       />
   <menuItem
       menu="schooltool_actions"
+      title="New Linked Column"
+      for="..interfaces.IWorksheet"
+      action="addLinkedColumn.html"
+      permission="schooltool.view"
+      />
+  <menuItem
+      menu="schooltool_actions"
       title="Return to Gradebook"
       for="..interfaces.IWorksheet"
       action="gradebook"
       permission="schooltool.view"
       />
+  <menuItem
+      menu="schooltool_actions"
+      title="Worksheets"
+      for="..interfaces.IWorksheet"
+      action="../index.html"
+      permission="schooltool.view"
+      />
 
   <!-- Menu items for IGradebook -->
   <menuItem
@@ -340,6 +375,13 @@
       />
   <menuItem
       menu="schooltool_actions"
+      title="New Linked Column"
+      for="..interfaces.IGradebook"
+      action="../addLinkedColumn.html"
+      permission="schooltool.view"
+      />
+  <menuItem
+      menu="schooltool_actions"
       title="Manage Activities"
       for="..interfaces.IGradebook"
       action="../manage.html"
@@ -354,7 +396,7 @@
       />
   <menuItem
       menu="schooltool_actions"
-      title="Column Preferences"
+      title="Preferences"
       for="..interfaces.IGradebook"
       action="column_preferences.html"
       permission="schooltool.view"
@@ -469,7 +511,7 @@
   <!-- Menu items for ITerm -->
   <menuItem
       menu="schooltool_actions"
-      title="Deploy Report Worksheet"
+      title="Deploy Report Sheet"
       for="schooltool.term.interfaces.ITerm"
       action="deploy_report_worksheet.html"
       permission="schooltool.edit"
@@ -487,18 +529,25 @@
   <!-- Menu items for ISchoolYear -->
   <menuItem
       menu="schooltool_actions"
-      title="Deploy Report Worksheet"
+      title="Deploy Report Sheet"
       for="schooltool.schoolyear.interfaces.ISchoolYear"
       action="deploy_report_worksheet.html"
       permission="schooltool.edit"
       />
   <menuItem
       menu="schooltool_actions"
-      title="Layout Report Card"
+      title="Report Card Layout"
       for="schooltool.schoolyear.interfaces.ISchoolYear"
       action="layout_report_card.html"
       permission="schooltool.edit"
       />
+  <menuItem
+      menu="schooltool_actions"
+      title="Reports"
+      for="schooltool.schoolyear.interfaces.ISchoolYear"
+      action="report_pdfs.html"
+      permission="schooltool.edit"
+      />
 
   <!-- Views for ISchoolYear -->
   <page
@@ -515,40 +564,125 @@
       template="layout_report_card.pt"
       permission="schooltool.edit"
       />
+  <page
+      name="report_pdfs.html"
+      for="schooltool.schoolyear.interfaces.ISchoolYear"
+      class=".request_reports.SchoolYearReportsView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="request_failing_report.html"
+      for="schooltool.schoolyear.interfaces.ISchoolYear"
+      class=".request_reports.RequestFailingReportView"
+      template="request_failing_report.pt"
+      permission="schooltool.edit"
+      />
+  <page
+      name="failing_report.pdf"
+      for="schooltool.schoolyear.interfaces.ISchoolYear"
+      class=".pdf_views.FailingReportPDFView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="request_absences_by_day.html"
+      for="schooltool.schoolyear.interfaces.ISchoolYear"
+      class=".request_reports.RequestAbsencesByDayView"
+      template="request_absences_by_day.pt"
+      permission="schooltool.edit"
+      />
+  <page
+      name="absences_by_day.pdf"
+      for="schooltool.schoolyear.interfaces.ISchoolYear"
+      class=".pdf_views.AbsencesByDayPDFView"
+      permission="schooltool.edit"
+      />
 
   <!-- Menu items for IBasicPerson-->
   <menuItem
       menu="schooltool_actions"
-      title="Print Report Card"
+      title="Reports"
       for="schooltool.person.interfaces.IPerson"
-      action="print_report_card.html"
+      action="report_pdfs.html"
       permission="schooltool.edit"
       />
 
   <!-- Views for IBasicPerson -->
   <page
-      name="print_report_card.html"
+      name="report_pdfs.html"
+      for="schooltool.person.interfaces.IPerson"
+      class=".request_reports.StudentReportsView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="report_card.pdf"
       for="schooltool.person.interfaces.IPerson"
       class=".pdf_views.StudentReportCardPDFView"
       permission="schooltool.edit"
       />
+  <page
+      name="student_detail.pdf"
+      for="schooltool.person.interfaces.IPerson"
+      class=".pdf_views.StudentDetailPDFView"
+      permission="schooltool.edit"
+      />
 
   <!-- Menu items for IGroup -->
   <menuItem
       menu="schooltool_actions"
-      title="Print Report Card"
+      title="Reports"
       for="schooltool.group.interfaces.IGroup"
-      action="print_report_card.html"
+      action="report_pdfs.html"
       permission="schooltool.edit"
       />
 
   <!-- Views for IGroup -->
   <page
-      name="print_report_card.html"
+      name="report_pdfs.html"
+      for="schooltool.group.interfaces.IGroup"
+      class=".request_reports.GroupReportsView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="report_card.pdf"
       for="schooltool.group.interfaces.IGroup"
       class=".pdf_views.GroupReportCardPDFView"
       permission="schooltool.edit"
       />
+  <page
+      name="student_detail.pdf"
+      for="schooltool.group.interfaces.IGroup"
+      class=".pdf_views.GroupDetailPDFView"
+      permission="schooltool.edit"
+      />
+
+  <!-- Menu items for ISection -->
+  <menuItem
+      menu="schooltool_actions"
+      title="Reports"
+      for="schooltool.course.interfaces.ISection"
+      action="report_pdfs.html"
+      permission="schooltool.edit"
+      />
+  <page
+      name="absences_by_day.pdf"
+      for="schooltool.course.interfaces.ISection"
+      class=".pdf_views.AbsencesByDayPDFView"
+      permission="schooltool.edit"
+      />
+
+  <!-- Views for ISection -->
+  <page
+      name="report_pdfs.html"
+      for="schooltool.course.interfaces.ISection"
+      class=".request_reports.SectionReportsView"
+      permission="schooltool.edit"
+      />
+  <page
+      name="section_absences.pdf"
+      for="schooltool.course.interfaces.ISection"
+      class=".pdf_views.SectionAbsencesPDFView"
+      permission="schooltool.edit"
+      />
 
   <!-- Views for ISchoolToolApplication -->
   <page
@@ -560,7 +694,7 @@
       />
 
   <zope:adapter
-      factory=".report_card.ExistingScoresSystem" />
+      factory=".report_card.ReportScoresSystem" />
 
   <!-- Handling sections that are added after deployment already made to a term -->
   <zope:subscriber

=== modified file 'src/schooltool/gradebook/browser/deploy_report_worksheet.pt'
--- src/schooltool/gradebook/browser/deploy_report_worksheet.pt	2009-03-10 08:17:21 +0000
+++ src/schooltool/gradebook/browser/deploy_report_worksheet.pt	2009-10-12 08:13:10 +0000
@@ -22,7 +22,8 @@
     </select>
     <div class="controls">
       <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
-      <input type="submit" class="button-ok" name="DEPLOY" value="Deploy" />
+      <input type="submit" class="button-ok" name="DEPLOY" value="Deploy"
+             i18n:attributes="value" />
     </div>
   </form>
 

=== added file 'src/schooltool/gradebook/browser/failing_report_rml.pt'
--- src/schooltool/gradebook/browser/failing_report_rml.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/failing_report_rml.pt	2009-10-12 08:13:10 +0000
@@ -0,0 +1,116 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+  <!ENTITY nbsp    "&#160;">
+]>
+
+<document
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="context/@@rml_macros/report"
+  i18n:domain="schooltool">
+
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
+<stylesheet>
+  <metal:block fill-slot="extra_initialize">
+  </metal:block>
+  <metal:block fill-slot="stylesheet">
+
+    <paraStyle
+      name="normal"
+      fontName="Arial_Normal"
+      fontSize="10"
+      leading="12"/>
+
+    <paraStyle
+      name="bold"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="left"
+      leading="12"/>
+
+    <paraStyle
+      name="heading"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="right"
+      leading="12"/>
+
+    <paraStyle
+      name="section_heading"
+      fontName="Arial_Bold"
+      fontSize="12"
+      alignment="center"
+      leading="12"/>
+
+    <blockTableStyle id="headings_table">
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="grid">
+    	<lineStyle kind="OUTLINE"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+  </metal:block>
+</stylesheet>
+
+<story metal:fill-slot="story">
+  <blockTable style="headings_table" colWidths="6cm,6cm"
+              alignment="center">
+    <tr>
+      <td><para style="heading" tal:content="view/worksheet_heading" /></td>
+      <td><para style="bold" tal:content="view/worksheet_value" /></td>
+    </tr>
+    <tr>
+      <td><para style="heading" tal:content="view/activity_heading" /></td>
+      <td><para style="bold" tal:content="view/activity_value" /></td>
+    </tr>
+    <tr>
+      <td><para style="heading" tal:content="view/score_heading" /></td>
+      <td><para style="bold" tal:content="view/score_value" /></td>
+    </tr>
+  </blockTable>
+
+  <spacer length=".5cm" />
+  <para style="bold" tal:content="view/heading_message" />
+
+  <spacer length=".5cm" />
+  <blockTable style="grid" colWidths="3cm,6cm,6cm,4cm"
+              alignment="left">
+    <tr>
+      <td><para style="bold" tal:content="view/name_heading" /></td>
+      <td><para style="bold" tal:content="view/course_heading" /></td>
+      <td><para style="bold" tal:content="view/teacher_heading" /></td>
+      <td><para style="bold" tal:content="view/grade_heading" /></td>
+    </tr>
+  </blockTable>
+  <spacer length=".5cm" />
+
+  <tal:block repeat="student view/students">
+
+    <para style="bold" tal:content="student/name" />
+
+    <blockTable style="headings_table" colWidths="3cm,6cm,6cm,4cm"
+                alignment="left">
+      <tr tal:repeat="row student/rows">
+        <td />
+        <td><para style="normal" tal:content="row/course" /></td>
+        <td><para style="normal" tal:content="row/teacher" /></td>
+        <td><para style="normal" tal:content="row/grade" /></td>
+      </tr>
+    </blockTable>
+    <spacer length=".5cm" />
+  </tal:block>
+
+  <condPageBreak height="88cm"/>
+
+</story>
+
+</document>
+

=== modified file 'src/schooltool/gradebook/browser/gradebook.css'
--- src/schooltool/gradebook/browser/gradebook.css	2009-07-06 08:33:03 +0000
+++ src/schooltool/gradebook/browser/gradebook.css	2009-10-12 08:13:10 +0000
@@ -204,3 +204,7 @@
     padding-top: 0.5ex;
 }
 
+.scoresystem_add_input {
+    width: 9em;
+}
+

=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2009-08-26 02:49:24 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2009-10-12 08:13:10 +0000
@@ -25,6 +25,7 @@
 import datetime
 import decimal
 
+from zope.app.container.interfaces import INameChooser
 from zope.app.keyreference.interfaces import IKeyReference
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import queryUtility
@@ -46,6 +47,8 @@
 from schooltool.course.interfaces import ILearner, IInstructor
 from schooltool.gradebook import interfaces
 from schooltool.gradebook.activity import ensureAtLeastOneWorksheet
+from schooltool.gradebook.activity import createSourceString, getSourceObj
+from schooltool.gradebook.activity import Worksheet, LinkedColumnActivity
 from schooltool.gradebook.browser.report_utils import buildHTMLParagraphs
 from schooltool.person.interfaces import IPerson
 from schooltool.requirement.scoresystem import UNSCORED
@@ -63,6 +66,7 @@
 DISCRETE_SCORE_SYSTEM = 'd'
 RANGED_SCORE_SYSTEM = 'r'
 COMMENT_SCORE_SYSTEM = 'c'
+SUMMARY_TITLE = _('Summary')
 
 column_keys = [('total', _("Total")), ('average', _("Ave."))]
 
@@ -171,6 +175,8 @@
         gradebook = proxy.removeSecurityProxy(self.context)
         worksheet = gradebook.getCurrentWorksheet(person)
         for activity in gradebook.getWorksheetActivities(worksheet):
+            if interfaces.ILinkedColumnActivity.providedBy(activity):
+                continue
             ss = activity.scoresystem
             if IDiscreteValuesScoreSystem.providedBy(ss):
                 result = [DISCRETE_SCORE_SYSTEM] + [score[0] 
@@ -387,16 +393,16 @@
                         self.message = _(
                             'Invalid scores (highlighted in red) were not saved.')
                         continue
-                    ev = gradebook.getEvaluation(student, activity)
+                    value, ss = gradebook.getEvaluation(student, activity)
                     # Delete the score
-                    if ev is not None and score is UNSCORED:
+                    if value is not None and score is UNSCORED:
                         self.context.removeEvaluation(student, activity)
                         self.changed = True
                     # Do nothing
-                    elif ev is None and score is UNSCORED:
+                    elif value is None and score is UNSCORED:
                         continue
                     # Replace the score or add new one/
-                    elif ev is None or score != ev.value:
+                    elif value is None or score != value:
                         self.changed = True
                         self.context.evaluate(
                             student, activity, score, evaluator)
@@ -415,30 +421,65 @@
         flag, weeks = self.context.getDueDateFilter(self.person)
         return weeks
 
+    def getActivityAttrs(self, activity):
+        shortTitle = activity.label
+        if shortTitle is None or len(shortTitle) == 0:
+            shortTitle = activity.title
+        shortTitle = shortTitle.replace(' ', '')
+        if len(shortTitle) > 5:
+            shortTitle = shortTitle[:5].strip()
+        longTitle = activity.title
+        if ICommentScoreSystem.providedBy(activity.scoresystem):
+            bestScore = ''
+        else:
+            bestScore = activity.scoresystem.getBestScore()
+        return shortTitle, longTitle, bestScore
+
     def activities(self):
         """Get  a list of all activities."""
         self.person = IPerson(self.request.principal)
-        result = []
+        results = []
         for activity in self.getFilteredActivities():
-            shortTitle = activity.label
-            if shortTitle is None or len(shortTitle) == 0:
-                shortTitle = activity.title
-            shortTitle = shortTitle.replace(' ', '')
-            if len(shortTitle) > 5:
-                shortTitle = shortTitle[:5].strip()
-
-            if ICommentScoreSystem.providedBy(activity.scoresystem):
-                bestScore = ''
+            if interfaces.ILinkedColumnActivity.providedBy(activity):
+                scorable = False
+                source = getSourceObj(activity.source)
+                if interfaces.IActivity.providedBy(source):
+                    shortTitle, longTitle, bestScore = \
+                        self.getActivityAttrs(source)
+                    if source.label is not None and len(source.label):
+                        shortTitle = source.label
+                    if source.title is not None and len(source.title):
+                        longTitle = source.title
+                elif interfaces.IWorksheet.providedBy(source):
+                    shortTitle = source.title
+                    if len(shortTitle) > 5:
+                        shortTitle = shortTitle[:5].strip()
+                    longTitle = source.title
+                    bestScore = '100'
+                else:
+                    shortTitle = longTitle = bestScore = ''
             else:
-                bestScore = activity.scoresystem.getBestScore()
-            result.append({'shortTitle': shortTitle,
-                           'longTitle': activity.title,
-                           'max': bestScore,
-                           'hash': hash(IKeyReference(activity))})
-            
-        return result
+                scorable = not ICommentScoreSystem.providedBy(
+                    activity.scoresystem)
+                shortTitle, longTitle, bestScore = \
+                    self.getActivityAttrs(activity)
+            result = {
+                'scorable': scorable,
+                'shortTitle': shortTitle,
+                'longTitle': longTitle,
+                'max': bestScore,
+                'hash': hash(IKeyReference(activity)),
+                }
+            results.append(result)
+        return results
+
+    def scorableActivities(self):
+        """Get a list of those activities that can be scored."""
+        return [result for result in self.activities() if result['scorable']]
 
     def isFiltered(self, activity):
+        if interfaces.ILinkedColumnActivity.providedBy(activity):
+            return False
         flag, weeks = self.context.getDueDateFilter(self.person)
         if not flag:
             return False
@@ -450,6 +491,22 @@
         return[activity for activity in activities
                if not self.isFiltered(activity)]
 
+    def getStudentActivityValue(self, student, activity):
+        gradebook = proxy.removeSecurityProxy(self.context)
+        value, ss = gradebook.getEvaluation(student, activity)
+        if value is None:
+            value = ''
+
+        act_hash = hash(IKeyReference(activity))
+        cell_name = '%s_%s' % (act_hash, student.username)
+        if cell_name in self.request:
+            value = self.request[cell_name]
+
+        if value and ICommentScoreSystem.providedBy(activity.scoresystem):
+            value = '...'
+
+        return value
+
     def table(self):
         """Generate the table of grades."""
         gradebook = proxy.removeSecurityProxy(self.context)
@@ -460,23 +517,12 @@
         for student in self.context.students:
             grades = []
             for act_hash, activity in activities:
-                ev = gradebook.getEvaluation(student, activity)
-                if ev is not None and ev.value is not UNSCORED:
-                    value = ev.value
-                else:
-                    value = ''
-
-                cell_name = '%s_%s' % (act_hash, student.username)
-                if cell_name in self.request:
-                    value = self.request[cell_name]
-
-                ss = activity.scoresystem
-                if ICommentScoreSystem.providedBy(ss):
+                value = self.getStudentActivityValue(student, activity)
+                if interfaces.ILinkedColumnActivity.providedBy(activity):
                     editable = False
-                    if value:
-                        value = '...'
                 else:
-                    editable = True
+                    editable = not ICommentScoreSystem.providedBy(
+                        activity.scoresystem)
 
                 grade = {
                     'activity': act_hash,
@@ -593,12 +639,12 @@
     def grades(self):
         gradebook = proxy.removeSecurityProxy(self.context)
         for student in self.context.students:
-            ev = gradebook.getEvaluation(student, self.activity['obj'])
-            value = self.request.get(student.username)
-            if ev is not None and ev.value is not UNSCORED:
-                value = value or ev.value
+            reqValue = self.request.get(student.username)
+            value, ss = gradebook.getEvaluation(student, self.activity['obj'])
+            if value is None:
+                value = reqValue or ''
             else:
-                value = value or ''
+                value = reqValue or value
 
             yield {'student': {'title': student.title, 'id': student.username},
                    'value': value}
@@ -629,15 +675,15 @@
                                      'name': student.title})
                         self.messages.append(message)
                         continue
-                    ev = gradebook.getEvaluation(student, activity)
+                    value, ss = gradebook.getEvaluation(student, activity)
                     # Delete the score
-                    if ev is not None and score is UNSCORED:
+                    if value is not None and score is UNSCORED:
                         self.context.removeEvaluation(student, activity)
                     # Do nothing
-                    elif ev is None and score is UNSCORED:
+                    elif value is None and score is UNSCORED:
                         continue
                     # Replace the score or add new one/
-                    elif ev is None or score != ev.value:
+                    elif value is None or score != value:
                         self.context.evaluate(
                             student, activity, score, evaluator)
 
@@ -653,17 +699,6 @@
     return (0, 0)
 
 
-def getEvaluationDiscreteValue(ev):
-    ss = ev.requirement.scoresystem
-    if IDiscreteValuesScoreSystem.providedBy(ss):
-        val = ss.getNumericalValue(ev.value)
-        if val is not None:
-            return val
-    elif IRangedValuesScoreSystem.providedBy(ss):
-        return ev.value
-    return 0
-
-
 class MyGradesView(SectionFinder):
     """Student view of own grades."""
 
@@ -693,19 +728,20 @@
         count = 0
         for activity in self.context.getCurrentActivities(self.person):
             activity = proxy.removeSecurityProxy(activity)
-            ev = proxy.removeSecurityProxy(
-                self.context.getEvaluation(self.person, activity))
+            value, ss = self.context.getEvaluation(self.person, activity)
 
-            if ev is not None and ev.value is not UNSCORED:
-                ss = ev.requirement.scoresystem
+            if value is not None:
                 if IValuesScoreSystem.providedBy(ss):
-                    grade = '%s / %s' % (ev.value, ss.getBestScore())
+                    grade = '%s / %s' % (value, ss.getBestScore())
                     s_min, s_max = getScoreSystemDiscreteValues(ss)
-                    value = getEvaluationDiscreteValue(ev)
+                    if IDiscreteValuesScoreSystem.providedBy(ss):
+                        value = ss.getNumericalValue(value)
+                        if value is None:
+                            value = 0
                     total += value - s_min
                     count += s_max - s_min
                 else:
-                    grade = ev.value
+                    grade = value
             else:
                 grade = None
 
@@ -754,6 +790,65 @@
 class GradebookColumnPreferences(BrowserView):
     """A view for editing a teacher's gradebook column preferences."""
 
+    def worksheets(self):
+        results = []
+        gradebook = proxy.removeSecurityProxy(self.context)
+        for worksheet in gradebook.context.__parent__.values():
+            if worksheet.deployed:
+                continue
+            results.append(worksheet)
+        return results
+
+    def addSummary(self):
+        gradebook = proxy.removeSecurityProxy(self.context)
+        worksheets = gradebook.context.__parent__
+
+        overwrite = self.request.get('overwrite', '') == 'on'
+        if overwrite:
+            currentWorksheets = []
+            for worksheet in worksheets.values():
+                if worksheet.deployed:
+                    continue
+                if worksheet.title == SUMMARY_TITLE:
+                    while len(worksheet.values()):
+                        del worksheet[worksheet.values()[0].__name__]
+                    summary = worksheet
+                else:
+                    currentWorksheets.append(worksheet)
+            next = SUMMARY_TITLE
+        else:
+            next = self.nextSummaryTitle()
+            currentWorksheets = self.worksheets()
+            summary = Worksheet(next)
+            chooser = INameChooser(worksheets)
+            name = chooser.chooseName('', summary)
+            worksheets[name] = summary
+
+        for worksheet in currentWorksheets:
+            if worksheet.title.startswith(SUMMARY_TITLE):
+                continue
+            activity = LinkedColumnActivity(worksheet.title, u'assignment', 
+                '', createSourceString(worksheet))
+            chooser = INameChooser(summary)
+            name = chooser.chooseName('', activity)
+            summary[name] = activity
+
+    def nextSummaryTitle(self):
+        index = 1
+        next = SUMMARY_TITLE
+        while True:
+            for worksheet in self.worksheets():
+                if worksheet.title == next:
+                    break
+            else:
+                break
+            index += 1
+            next = SUMMARY_TITLE + str(index)
+        return next
+
+    def summaryFound(self):
+        return self.nextSummaryTitle() != SUMMARY_TITLE
+
     def update(self):
         self.person = IPerson(self.request.principal)
         gradebook = proxy.removeSecurityProxy(self.context)
@@ -774,7 +869,10 @@
                     prefs['scoresystem'] = self.request['scoresystem_' + key]
             gradebook.setColumnPreferences(self.person, columnPreferences)
 
-        if 'CANCEL' in self.request or 'UPDATE_SUBMIT' in self.request:
+        if 'ADD_SUMMARY' in self.request:
+            self.addSummary()
+
+        if 'form-submitted' in self.request:
             self.request.response.redirect('index.html')
 
     @property
@@ -960,20 +1058,21 @@
         self.person = IPerson(self.request.principal)
         gradebook = proxy.removeSecurityProxy(self.context.gradebook)
 
-        self.student = '%s %s' % (self.context.student.first_name,
-            self.context.student.last_name)
-        self.worksheet = gradebook.context.title
-        self.section = '%s - %s' % (list(gradebook.section.courses)[0].title,
-            gradebook.section.title)
+        mapping = {
+            'worksheet': gradebook.context.title,
+            'student': '%s %s' % (self.context.student.first_name,
+                                  self.context.student.last_name),
+            'section': '%s - %s' % (list(gradebook.section.courses)[0].title,
+                                    gradebook.section.title),
+            }
+        self.title = _('$worksheet for $student in $section', mapping=mapping)
 
         self.blocks = []
         activities = [activity for activity in gradebook.context.values()
                       if not self.isFiltered(activity)]
         for activity in activities:
-            ev = gradebook.getEvaluation(self.context.student, activity)
-            if ev is not None and ev.value is not UNSCORED:
-                value = ev.value
-            else:
+            value, ss = gradebook.getEvaluation(self.context.student, activity)
+            if value is None:
                 value = ''
             if ICommentScoreSystem.providedBy(activity.scoresystem):
                 block = {

=== modified file 'src/schooltool/gradebook/browser/gradebook_column_preferences.pt'
--- src/schooltool/gradebook/browser/gradebook_column_preferences.pt	2009-05-14 10:35:19 +0000
+++ src/schooltool/gradebook/browser/gradebook_column_preferences.pt	2009-10-12 08:13:10 +0000
@@ -5,20 +5,20 @@
 </head>
 <body>
 
-<h1 metal:fill-slot="content-header"
-    i18n:translate="">Set Column Preferences</h1>
-
 <metal:block metal:fill-slot="body">
-  <form method="post"
+  <form method="post" class="addscoresystem"
         tal:attributes="action string:${context/@@absolute_url}/column_preferences.html">
     <input type="hidden" name="form-submitted" value="" />
 
-    <table class="schooltool_gradebook">
+	<h3 i18n:translate="">Set Column Preferences</h3>
+    <br />
+
+    <table class="schooltool_gradebook" style="margin-left: 1em">
       <tr>
-        <th class="cell header fully_padded">Column Type</th>
-        <th class="cell header fully_padded">Hide?</th>
-        <th class="cell header fully_padded">Label</th>
-        <th class="cell header fully_padded">Score System</th>
+        <th class="cell header fully_padded" i18n:translate="">Column Type</th>
+        <th class="cell header fully_padded" i18n:translate="">Hide?</th>
+        <th class="cell header fully_padded" i18n:translate="">Label</th>
+        <th class="cell header fully_padded" i18n:translate="">Score System</th>
       </tr>
 
       <tal:block repeat="column view/columns">
@@ -59,6 +59,27 @@
       <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Update" />
       <input type="submit" class="button-cancel" name="CANCEL" value="Cancel" />
     </div>
+
+    <fieldset>
+      <legend><b i18n:translate="">Summary</b><legend>
+      <p i18n:translate="">
+        You can add a summary worksheet to each of your gradebooks that automatically includes a column for the average of all existing worksheets.
+      </p>
+      <p i18n:translate="">
+        For example, if you have three worksheets in a section, "A," "B," and "C," and click "Create Summary Worksheets," an additional sheet, entitled "Summary" will be created, which includes the average scores from "A," "B" and "C" in the first three columns.
+      </p>
+      <tal:block tal:condition="view/summaryFound">
+        <input type="checkbox" name="overwrite">
+        <span i18n:translate="">Overwrite existing worksheets titled "Summary".</span>
+      </tal:block>
+
+      <br />
+      <div class="controls">
+        <input type="submit" class="button-ok" name="ADD_SUMMARY" value="Create Summary Worksheets"
+               i18n:attributes="value" />
+      </div>
+    </fieldset>
+
   </form>
 
 </metal:block>

=== modified file 'src/schooltool/gradebook/browser/gradebook_grade_activity.pt'
--- src/schooltool/gradebook/browser/gradebook_grade_activity.pt	2009-07-06 03:19:53 +0000
+++ src/schooltool/gradebook/browser/gradebook_grade_activity.pt	2009-10-12 08:13:10 +0000
@@ -95,7 +95,8 @@
     </table>
 
     <div class="controls">
-    <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save" />
+      <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save"
+             i18n:attributes="value" />
       <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
     </div>
 

=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.js.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-07-10 22:27:33 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-10-12 08:13:10 +0000
@@ -6,7 +6,7 @@
      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.activities())"/> 
+var numactivities = <tal:block replace="python: len(view.scorableActivities())"/> 
 var activities = new Array(numactivities);
 <tal:loop repeat="activity view/activities">
      activities[<tal:block replace="repeat/activity/index"/>] = '<tal:block replace="activity/hash"/>';

=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.pt	2009-07-14 01:24:47 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.pt	2009-10-12 08:13:10 +0000
@@ -13,7 +13,7 @@
 <body>
 <div metal:fill-slot="body">
 
-    <h1 style="color: red" id="javascript-warning">
+    <h1 style="color: red" id="javascript-warning" i18n:translate="">
     Your browser either has Javascript turned off, or it is not supported.
     Javascript is <b>required</b> for the gradebook.
     Please enable Javascript or use a browser with Javascript.
@@ -27,7 +27,7 @@
           tal:attributes="action string:${context/@@absolute_url}">
 
     <tal:if condition="python:not list(view.getSections())">
-      <b>Term:</b>
+      <b i18n:translate="">Term:</b>
       <span tal:content="view/getCurrentTerm" />
     </tal:if>
     <tal:if condition="python:list(view.getTerms())">
@@ -49,7 +49,7 @@
 
     <span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
     <tal:if condition="python:not list(view.getSections())">
-      <b>Section:</b>
+      <b i18n:translate="">Section:</b>
       <span tal:content="view/getCurrentSection" />
     </tal:if>
     <tal:if condition="python:list(view.getSections())">
@@ -74,7 +74,7 @@
            tal:condition="view/getDueDateFilter" />
     <input type="checkbox" name="due_date:list" 
            tal:condition="not: view/getDueDateFilter" />
-    <span>show only activities due in past</span>
+    <span i18n:translate="">show only activities due in past</span>
     <select name="num_weeks">
       <tal:block repeat="weeks view/weeksChoices">
         <option value="1"
@@ -87,7 +87,7 @@
             tal:content="weeks" />
       </tal:block>
     </select>
-    <span>weeks</span>
+    <span i18n:translate="">weeks</span>
     <br /><br />
 
   <div class="message" style="color:red"
@@ -135,12 +135,14 @@
                          onmouseout string:restoreDescription()">
        <div class="padded">
          <a href=""
+            tal:condition="activity/scorable"
             tal:attributes="href 
                             string:gradeActivity.html?activity=${activity/hash};
                             title activity/longTitle;"
-            tal:content="activity/shortTitle">
-           HW 1
-         </a>
+            tal:content="activity/shortTitle" />
+         <span
+            tal:condition="not: activity/scorable"
+            tal:content="activity/shortTitle" />
        </div>
        <a href="?sort_by="
           tal:attributes="href
@@ -159,6 +161,7 @@
           tal:attributes="id string:fd_${activity/hash}_cell">
         <input type="text" size="4" class="data fd"
                onkeydown="spreadsheetBehaviour(event)"
+               tal:condition="activity/scorable"
                tal:attributes="id string:fd_${activity/hash};
                                onkeyup string:checkFillDown('${activity/hash}');
                                onfocus string:handleCellFocus(this, '${activity/hash}')">
@@ -166,6 +169,7 @@
                style="display: none"
                class="fdbtn"
                value="Apply"
+               tal:condition="activity/scorable"
                tal:attributes="id string:fdbtn_${activity/hash};
                                onclick string:performFillDown('${activity/hash}')">
       </td>
@@ -196,7 +200,7 @@
         </td>
         <td class="cell even" tal:repeat="grade row/grades"
             tal:attributes="id string:${grade/activity}_${row/student/id}_cell">
-          <b tal:condition="not: grade/editable"
+          <span tal:condition="not: grade/editable"
              tal:content="grade/value" />
           <input class="data" type="text" name="" value="" size="4"
                  tal:condition="grade/editable"
@@ -232,7 +236,7 @@
         </td>
         <td class="cell odd" tal:repeat="grade row/grades"
             tal:attributes="id string:${grade/activity}_${row/student/id}_cell">
-          <b tal:condition="not: grade/editable"
+          <span tal:condition="not: grade/editable"
              tal:content="grade/value" />
           <input class="data" type="text" name="" value="" size="4"
                  tal:condition="grade/editable"
@@ -249,7 +253,7 @@
 
   <div class="controls">
     <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save" 
-           onclick="setNotEdited()"/>
+           onclick="setNotEdited()" i18n:attributes="value" />
   </div>
 
   </form>

=== modified file 'src/schooltool/gradebook/browser/gradebook_startup.pt'
--- src/schooltool/gradebook/browser/gradebook_startup.pt	2008-04-11 17:31:55 +0000
+++ src/schooltool/gradebook/browser/gradebook_startup.pt	2009-10-12 08:13:10 +0000
@@ -10,14 +10,14 @@
 <div metal:fill-slot="body">
 
   <tal:block condition="python:not view.sectionsTaught and not view.sectionsAttended">
-    <h1>You do not teach or attend any classes.</h1>
+    <h1 i18n:translate="">You do not teach or attend any classes.</h1>
   </tal:block>
   <tal:block condition="view/sectionsTaught">
-    <a class="navigation_header"
+    <a class="navigation_header" i18n:translate=""
        tal:attributes="href view/gradebookURL">Classes you teach</a>
   </tal:block>
   <tal:block condition="view/sectionsAttended">
-    <a class="navigation_header"
+    <a class="navigation_header" i18n:translate=""
        tal:attributes="href view/mygradesURL">Classes you attend</a>
   </tal:block>
 

=== modified file 'src/schooltool/gradebook/browser/layout_report_card.pt'
--- src/schooltool/gradebook/browser/layout_report_card.pt	2009-08-11 04:06:14 +0000
+++ src/schooltool/gradebook/browser/layout_report_card.pt	2009-10-12 08:13:10 +0000
@@ -10,16 +10,16 @@
         tal:attributes="action string:${context/@@absolute_url}/layout_report_card.html">
     <input type="hidden" name="form-submitted" value="" />
 
-	<h3>Layout Report Card</h3>
+	<h3 i18n:translate="">Report Card Layout</h3>
 
     <fieldset>
-    <legend><b>Grid Columns</b><legend>
+    <legend><b i18n:translate="">Grid Columns</b><legend>
     <table>
       <tr>
         <td></td>
-        <td align="center">Source</td>
-        <td align="center">Heading</td>
-        <td>Remove?</td>
+        <td align="center" i18n:translate="">Source</td>
+        <td align="center" i18n:translate="">Heading</td>
+        <td i18n:translate="">Remove?</td>
       </tr>
 
       <tal:block repeat="column view/columns">
@@ -58,7 +58,7 @@
         </td>
         <td>
           <select id="new_source" name="new_source">
-            <option selected value="">Choose a column to add</option>
+            <option selected value="" i18n:translate="">Choose a column to add</option>
             <tal:block repeat="choice view/column_choices">
               <option tal:attributes="value choice/value"
                       tal:content="choice/name" />
@@ -74,13 +74,13 @@
     </fieldset>
 
     <fieldset>
-    <legend><b>Outline Activities</b><legend>
+    <legend><b i18n:translate="">Outline Activities</b><legend>
     <table>
       <tr>
         <td></td>
-        <td align="center">Source</td>
-        <td align="center">Heading</td>
-        <td>Remove?</td>
+        <td align="center" i18n:translate="">Source</td>
+        <td align="center" i18n:translate="">Heading</td>
+        <td i18n:translate="">Remove?</td>
       </tr>
 
       <tal:block repeat="activity view/outline_activities">
@@ -119,7 +119,7 @@
         </td>
         <td>
           <select id="new_activity_source" name="new_activity_source">
-            <option selected value="">Choose an activity to add</option>
+            <option selected value="" i18n:translate="">Choose an activity to add</option>
             <tal:block repeat="choice view/activity_choices">
               <option tal:attributes="value choice/value"
                       tal:content="choice/name" />
@@ -135,7 +135,10 @@
     </fieldset>
 
     <div class="controls">
-      <input type="submit" class="button-ok" name="Update" value="Update" />
+      <input type="submit" class="button-ok" name="Update" value="Save"
+             i18n:attributes="value" />
+      <input type="submit" class="button-ok" name="OK" value="OK"
+             i18n:attributes="value" />
     </div>
   </form>
 

=== modified file 'src/schooltool/gradebook/browser/mygrades.pt'
--- src/schooltool/gradebook/browser/mygrades.pt	2009-06-19 09:39:10 +0000
+++ src/schooltool/gradebook/browser/mygrades.pt	2009-10-12 08:13:12 +0000
@@ -12,7 +12,7 @@
   <form method="post"
         tal:attributes="action string:${context/@@absolute_url}">
     <tal:if condition="python:not list(view.getSections())">
-      <b>Term:</b>
+      <b i18n:translate="">Term:</b>
       <span tal:content="view/getCurrentTerm" />
     </tal:if>
     <tal:if condition="python:list(view.getTerms())">
@@ -34,7 +34,7 @@
 
     <span>&nbsp;&nbsp;&nbsp;&nbsp;</span>
     <tal:if condition="python:not list(view.getSections())">
-      <b>Section:</b>
+      <b i18n:translate="">Section:</b>
       <span tal:content="view/getCurrentSection" />
     </tal:if>
     <tal:if condition="python:list(view.getSections())">
@@ -76,7 +76,7 @@
       <td colspan="2" class="gradebook_description">
         <div tal:condition="view/average"
              tal:content="string: ${view/average_label}: ${view/average}">Average</div>
-        <div tal:condition="not: view/average">Nothing Graded</div>
+        <div tal:condition="not: view/average" i18n:translate="">Nothing Graded</div>
       </td>
     </tr>
     <tr>

=== modified file 'src/schooltool/gradebook/browser/no_current_term.pt'
--- src/schooltool/gradebook/browser/no_current_term.pt	2009-06-08 01:43:13 +0000
+++ src/schooltool/gradebook/browser/no_current_term.pt	2009-10-12 08:13:12 +0000
@@ -8,7 +8,7 @@
 </head>
 <body>
 <div metal:fill-slot="body">
-  <h1>The operation you attempted cannot be completed because there are curently 
+  <h1 i18n:translate="">The operation you attempted cannot be completed because there are curently 
      no terms set up in your SchoolTool instance. Please have a user with
      administation access set up at least one term and try the operation again.</h1>
 </div>

=== modified file 'src/schooltool/gradebook/browser/no_current_term.txt'
--- src/schooltool/gradebook/browser/no_current_term.txt	2009-06-25 05:00:11 +0000
+++ src/schooltool/gradebook/browser/no_current_term.txt	2009-10-12 08:13:12 +0000
@@ -19,7 +19,8 @@
     >>> manager.getLink('Manage').click()
     >>> manager.getLink('Persons').click()
     >>> manager.getLink('One').click()
-    >>> manager.getLink('Print Report Card').click()
+    >>> manager.getLink('Reports').click()
+    >>> manager.getLink('Download Report Card').click()
     >>> manager.url
     'http://localhost/no_current_term.html'
 

=== modified file 'src/schooltool/gradebook/browser/pdf_views.py'
--- src/schooltool/gradebook/browser/pdf_views.py	2009-08-11 04:06:14 +0000
+++ src/schooltool/gradebook/browser/pdf_views.py	2009-10-12 08:13:12 +0000
@@ -20,6 +20,8 @@
 PDF Views
 """
 
+from datetime import datetime
+
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import getUtility
 from zope.traversing.browser.absoluteurl import absoluteURL
@@ -28,8 +30,11 @@
 from schooltool.app.browser.report import ReportPDFView
 from schooltool.common import SchoolToolMessage as _
 from schooltool.course.interfaces import ILearner
+from schooltool.gradebook.browser.report_card import (ABSENT_HEADING,
+    TARDY_HEADING, ABSENT_KEY, TARDY_KEY)
 from schooltool.gradebook.browser.report_utils import buildHTMLParagraphs
 from schooltool.gradebook.interfaces import IGradebookRoot, IActivities
+from schooltool.lyceum.journal.interfaces import ISectionJournalData
 from schooltool.requirement.interfaces import IEvaluations
 from schooltool.requirement.scoresystem import UNSCORED
 from schooltool.schoolyear.interfaces import ISchoolYear
@@ -37,20 +42,47 @@
 
 
 class BasePDFView(ReportPDFView):
-    """The report card (PDF) base class"""
-
-    template=ViewPageTemplateFile('report_card_rml.pt')
-
-    def __call__(self):
-        """Make sure there is a current term."""
-        current_term = getUtility(IDateManager).current_term
-        if current_term is None:
+    """A base class for all PDF views"""
+
+    def noCurrentTerm(self):
+        self.current_term = getUtility(IDateManager).current_term
+        if self.current_term is None:
             next_url = absoluteURL(ISchoolToolApplication(None), self.request)
             next_url += '/no_current_term.html'
             self.request.response.redirect(next_url)
+            return True
+        self.schoolyear = ISchoolYear(self.current_term)
+        return False
+
+
+class BaseStudentPDFView(BasePDFView):
+    """A base class for all student PDF views"""
+
+
+class BaseReportCardPDFView(BaseStudentPDFView):
+    """The report card (PDF) base class"""
+
+    template=ViewPageTemplateFile('report_card_rml.pt')
+
+    def __call__(self):
+        """Make sure there is a current term."""
+        if self.noCurrentTerm():
             return
-        self.schoolyear = ISchoolYear(current_term)
-        return super(BasePDFView, self).__call__()
+        return super(BaseReportCardPDFView, self).__call__()
+
+    def isJournalSource(self, layout):
+        return layout.source in [ABSENT_KEY, TARDY_KEY]
+
+    def getJournalScore(self, student, section, layout):
+        jd = ISectionJournalData(section)
+        result = 0
+        for meeting in jd.recordedMeetings(student):
+            grade = jd.getGrade(student, meeting)
+            if grade == 'n' and layout.source == ABSENT_KEY:
+                result += 1
+            if grade == 'p' and layout.source == TARDY_KEY:
+                result += 1
+        return result or None
 
     def getActivity(self, section, layout):
         termName, worksheetName, activityName = layout.source.split('|')
@@ -60,6 +92,10 @@
         return None
 
     def getLayoutActivityHeading(self, layout, truncate=True):
+        if layout.source == ABSENT_KEY:
+            return ABSENT_HEADING
+        if layout.source == TARDY_KEY:
+            return TARDY_HEADING
         termName, worksheetName, activityName = layout.source.split('|')
         root = IGradebookRoot(ISchoolToolApplication(None))
         heading = root.deployed[worksheetName][activityName].title
@@ -117,7 +153,6 @@
         else:
             layouts = []
 
-        evaluations = IEvaluations(student)
         courses = []
         for section in sections:
             course = tuple(section.courses)
@@ -125,15 +160,24 @@
                 courses.append(course)
 
         scores = {}
+        evaluations = IEvaluations(student)
         for layout in layouts:
             byCourse = {}
             for section in sections:
-                activity = self.getActivity(section, layout)
-                if activity is None:
-                    continue
-                score = evaluations.get(activity, None)
-                if score is not None and score.value is not UNSCORED:
-                    byCourse[course] = unicode(score.value)
+                course = tuple(section.courses)
+                if self.isJournalSource(layout):
+                    score = self.getJournalScore(student, section, layout)
+                    if score is not None:
+                        if course in byCourse:
+                            score += int(byCourse[course])
+                        byCourse[course] = unicode(score)
+                else:
+                    activity = self.getActivity(section, layout)
+                    if activity is None:
+                        continue
+                    score = evaluations.get(activity, None)
+                    if score is not None and score.value is not UNSCORED:
+                        byCourse[course] = unicode(score.value)
             if len(byCourse):
                 scores[layout.source] = byCourse
 
@@ -159,7 +203,7 @@
 
         return {
             'headings': headings,
-            'widths': '8.2cm' + ',1.2cm' * len(scoredLayouts),
+            'widths': '8.2cm' + ',1.6cm' * len(scoredLayouts),
             'rows': rows,
             }
 
@@ -216,16 +260,342 @@
         return section_list
 
 
-class StudentReportCardPDFView(BasePDFView):
-    """A view for printing a report card for a student"""
-
-    def collectStudents(self):
-        return [self.context]
-
-
-class GroupReportCardPDFView(BasePDFView):
-    """A view for printing a report card for each person in a group"""
-
-    def collectStudents(self):
-        return list(self.context.members)
+class StudentReportCardPDFView(BaseReportCardPDFView):
+    """A view for printing a report card for a student"""
+
+    def collectStudents(self):
+        return [self.context]
+
+
+class GroupReportCardPDFView(BaseReportCardPDFView):
+    """A view for printing a report card for each person in a group"""
+
+    def collectStudents(self):
+        return list(self.context.members)
+
+
+class BaseStudentDetailPDFView(BaseStudentPDFView):
+    """The report card (PDF) base class"""
+
+    template=ViewPageTemplateFile('student_detail_rml.pt')
+
+    def __call__(self):
+        """Make sure there is a current term."""
+        if self.noCurrentTerm():
+            return
+        return super(BaseStudentDetailPDFView, self).__call__()
+
+    @property
+    def title(self):
+        return _('Detailed Student Report') + ': ' + self.schoolyear.title
+
+    @property
+    def grades_heading(self):
+        return _('Grade Detail')
+
+    @property
+    def course_heading(self):
+        return _('Courses')
+
+    @property
+    def attendance_heading(self):
+        return _('Attendance Detail')
+
+    @property
+    def date_heading(self):
+        return _('Dates')
+
+    @property
+    def name_heading(self):
+        return _('Student Name')
+
+    @property
+    def userid_heading(self):
+        return _('User Id')
+
+    def getGradesColumns(self):
+        return ['Q1', 'Q2', 'Q3', 'Q4']
+
+    def getAttendanceColumns(self):
+        return ['1', '2', '3', '4', '5', '6', '7', '8']
+
+    def grades(self, student):
+        columns = self.getGradesColumns()
+        widths = '4cm' + ',1cm' * len(columns)
+        rows = []
+        for sdf in range(2):
+            row = {
+                'title': 'English I',
+                'scores': ['A', '', 'C', ''],
+                }
+            rows.append(row)
+        return {
+            'widths': widths,
+            'headings': columns,
+            'rows': rows,
+            }
+
+    def attendance(self, student):
+        columns = self.getAttendanceColumns()
+        widths = '4cm' + ',1cm' * len(columns)
+        rows = []
+        for sdf in range(2):
+            row = {
+                'title': '9/27/09',
+                'scores': ['', 'A', '', 'T', '', '', '', ''],
+                }
+            rows.append(row)
+        return {
+            'widths': widths,
+            'headings': columns,
+            'rows': rows,
+            }
+
+    def students(self):
+        results = []
+        for student in self.collectStudents():
+            name = u'%s %s' % (student.first_name, student.last_name)
+            result = {
+                'name': name,
+                'userid': student.username,
+                'grades': self.grades(student),
+                'attendance': self.attendance(student),
+                }
+            results.append(result)
+        return results
+
+
+class StudentDetailPDFView(BaseStudentDetailPDFView):
+    """A view for printing a report card for a student"""
+
+    def collectStudents(self):
+        return [self.context]
+
+
+class GroupDetailPDFView(BaseStudentDetailPDFView):
+    """A view for printing a report card for each person in a group"""
+
+    def collectStudents(self):
+        return list(self.context.members)
+
+
+class FailingReportPDFView(BasePDFView):
+    """A view for printing a report of all the students failing an activity"""
+
+    template=ViewPageTemplateFile('failing_report_rml.pt')
+
+    def __call__(self):
+        self.schoolyear = self.context
+        self.activity = self.getActivity()
+        return super(FailingReportPDFView, self).__call__()
+
+    def getActivity(self):
+        source = self.request.get('activity', None)
+        if source is None:
+            return None
+        termName, worksheetName, activityName = source.split('|')
+        root = IGradebookRoot(ISchoolToolApplication(None))
+        return root.deployed[worksheetName][activityName]
+
+    @property
+    def title(self):
+        return _('Failures by Term Report') + ': ' + self.schoolyear.title
+
+    @property
+    def worksheet_heading(self):
+        return _('Report Sheet:')
+
+    @property
+    def worksheet_value(self):
+        return self.activity.__parent__.title
+
+    @property
+    def activity_heading(self):
+        return _('Activity:')
+
+    @property
+    def activity_value(self):
+        return self.activity.title
+
+    @property
+    def score_heading(self):
+        return _('Passing Score:')
+
+    @property
+    def score_value(self):
+        return self.request.get('min', '')
+
+    @property
+    def heading_message(self):
+        return _('The following students are at risk of failing the following courses:')
+
+    @property
+    def name_heading(self):
+        return _('Student')
+
+    @property
+    def course_heading(self):
+        return _('Course')
+
+    @property
+    def teacher_heading(self):
+        return _('Teacher(s)')
+
+    @property
+    def grade_heading(self):
+        return _('Grade')
+
+    def students(self):
+        return [
+            {
+                'name': 'Alan Elkner',
+                'rows': [
+                    {
+                        'course': 'English I',
+                        'teacher': 'Tom Hoffman',
+                        'grade': 'D',
+                    },
+                    {
+                        'course': 'Algebra II',
+                        'teacher': 'Jeff Elkner',
+                        'grade': 'F',
+                    },
+                ],
+            },
+            {
+                'name': 'Jeff Elkner',
+                'rows': [
+                    {
+                        'course': 'English I',
+                        'teacher': 'Tom Hoffman',
+                        'grade': 'F',
+                    },
+                ],
+            },
+        ]
+
+
+class AbsencesByDayPDFView(BasePDFView):
+    """A view for printing a report with those students absent on a given day"""
+
+    template=ViewPageTemplateFile('absences_by_day_rml.pt')
+
+    def __call__(self):
+        self.schoolyear = self.context
+        return super(AbsencesByDayPDFView, self).__call__()
+
+    @property
+    def title(self):
+        return _('Absences By Day Report')
+
+    def getDay(self):
+        day = self.request.get('day', None)
+        if day is None:
+            return datetime.date(datetime.now())
+        try:
+            year, month, day = [int(part) for part in day.split('-')]
+            return datetime.date(datetime(year, month, day))
+        except:
+            return None
+
+    @property
+    def date_heading(self):
+        day = self.getDay()
+        if day is None:
+            return ''
+        else:
+            return day.strftime('%A %B %0d, %Y')
+
+    @property
+    def periods_heading(self):
+        return _('Period Number')
+
+    @property
+    def name_heading(self):
+        return _('Student')
+
+    @property
+    def widths(self):
+        return '8cm' + ',1cm' * 8
+
+    @property
+    def periods(self):
+        return ['1', '2', '3', '4', '5', '6', '7', '8']
+
+    @property
+    def students(self):
+        return [
+            {
+                'name': 'Alan Elkner',
+                'periods': ['A', 'T', '', 'T', '', '', '', ''],
+            },
+            {
+                'name': 'Tom Hoffman',
+                'periods': ['T', '', '', 'T', 'A', '', '', ''],
+            },
+        ]
+
+
+class SectionAbsencesPDFView(BasePDFView):
+    """A view for printing a report with absences for a given section"""
+
+    template=ViewPageTemplateFile('section_absences_rml.pt')
+
+    def __call__(self):
+        self.section = self.context
+        return super(SectionAbsencesPDFView, self).__call__()
+
+    @property
+    def title(self):
+        return _('Absences by Section Report')
+
+    @property
+    def course_heading(self):
+        return _('Course')
+
+    @property
+    def course(self):
+        return ', '.join([course.title for course in self.section.courses])
+
+    @property
+    def teacher_heading(self):
+        return _('Teacher')
+
+    @property
+    def teacher(self):
+        return ', '.join(['%s %s' % (teacher.first_name, teacher.last_name)
+                          for teacher in self.section.instructors])
+
+    @property
+    def student_heading(self):
+        return _('Student')
+
+    @property
+    def absences_heading(self):
+        return _('Absences')
+
+    @property
+    def tardies_heading(self):
+        return _('Tardies')
+
+    @property
+    def total_heading(self):
+        return _('Total')
+
+    @property
+    def students(self):
+        return [
+            {
+                'name': 'Alan Elkner',
+                'absences': '5',
+                'tardies': '4',
+                'total': '9',
+            },
+            {
+                'name': 'Tom Hoffman',
+                'absences': '',
+                'tardies': '3',
+                'total': '3',
+            },
+        ]
 

=== modified file 'src/schooltool/gradebook/browser/report_card.py'
--- src/schooltool/gradebook/browser/report_card.py	2009-08-11 04:06:14 +0000
+++ src/schooltool/gradebook/browser/report_card.py	2009-10-12 08:13:12 +0000
@@ -20,11 +20,12 @@
 Report Card Views
 """
 
+from zope.app.component.vocabulary import UtilityVocabulary, UtilityTerm
 from zope.app.container.interfaces import INameChooser
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import adapts, queryUtility
 from zope.interface import Interface, implements
-from zope.schema import Choice
+from zope.schema import Choice, Int
 from zope.security.checker import canWrite
 from zope.security.interfaces import Unauthorized
 from zope.traversing.api import getName
@@ -46,7 +47,14 @@
 from schooltool.gradebook.gradebook_init import ReportLayout, ReportColumn
 from schooltool.gradebook.gradebook_init import OutlineActivity
 from schooltool.requirement.interfaces import ICommentScoreSystem
+from schooltool.requirement.interfaces import IScoreSystem
+from schooltool.requirement.interfaces import IRangedValuesScoreSystem
+from schooltool.requirement.scoresystem import RangedValuesScoreSystem
 
+ABSENT_HEADING = _('Absent')
+TARDY_HEADING = _('Tardy')
+ABSENT_KEY = 'absent'
+TARDY_KEY = 'tardy'
 
 def copyActivities(sourceWorksheet, destWorksheet):
     """Copy the activities from the source worksheet to the destination."""
@@ -102,30 +110,94 @@
                     self.context.changePosition(name, new_pos-1)
 
 
-class IExistingScoreSystem(Interface):
+def ReportScoreSystemsVocabulary(context):
+    vocab = UtilityVocabulary(context, interface=IScoreSystem)
+    rangedTerm = UtilityTerm('ranged', _('-- Use range below --'))
+    vocab._terms[rangedTerm.token] = rangedTerm
+    return vocab
+
+
+class IReportScoreSystem(Interface):
     """A schema used to choose an existing score system."""
 
     scoresystem = Choice(
-        title=_('Existing Score System'),
-        vocabulary='schooltool.requirement.scoresystems',
+        title=_('Score System'),
+        description=_('Choose an existing score system or use range below'),
+        vocabulary='schooltool.gradebook.reportscoresystems',
         required=True)
 
-
-class ExistingScoresSystem(object):
-    implements(IExistingScoreSystem)
+    min = Int(
+        title=_("Minimum"),
+        description=_("Lowest integer score value possible"),
+        min=0,
+        required=False)
+
+    max = Int(
+        title=_("Maximum"),
+        description=_("Highest integer score value possible"),
+        min=0,
+        required=False)
+
+
+class ReportScoresSystem(object):
+    implements(IReportScoreSystem)
     adapts(IReportActivity)
 
     def __init__(self, context):
         self.__dict__['context'] = context
 
+    def isRanged(self, ss):
+        return (IRangedValuesScoreSystem.providedBy(ss) and
+                ss.title == 'generated')
+
+    def getValue(self, name, default):
+        if default is None:
+            default = 0
+        value = self.__dict__.get(name, default)
+        if value is None:
+            return default
+        return value
+
     def __setattr__(self, name, value):
+        self.__dict__[name] = value
+        ss = self.context.scoresystem
+
         if name == 'scoresystem':
-            self.context.scoresystem = value
-        else:
-            setattr(self.context, name, value)
+            if value == 'ranged':
+                if self.isRanged(ss):
+                    minimum = self.getValue('min', ss.min)
+                    maximum = self.getValue('max', ss.max)
+                else:
+                    minimum = self.getValue('min', 0)
+                    maximum = self.getValue('max', 100)
+                self.context.scoresystem = RangedValuesScoreSystem(u'generated', 
+                    min=minimum, max=maximum)
+            else:
+                self.context.scoresystem = value
+
+        else: # min, max
+            if self.isRanged(ss):
+                minimum = self.getValue('min', ss.min)
+                maximum = self.getValue('max', ss.max)
+                self.context.scoresystem = RangedValuesScoreSystem(u'generated', 
+                    min=minimum, max=maximum)
 
     def __getattr__(self, name):
-        return getattr(self.context, name)
+        ss = self.context.scoresystem
+        if ss is None:
+            return None
+        rv = None
+        if self.isRanged(ss):
+            if name == 'scoresystem':
+                rv = 'ranged'
+            elif name == 'min':
+                rv = ss.min
+            elif name == 'max':
+                rv = ss.max
+        else:
+            if name == 'scoresystem':
+                rv = ss
+        return rv
 
 
 class ReportActivityAddView(form.AddForm):
@@ -135,7 +207,7 @@
 
     fields = field.Fields(IReportActivity)
     fields = fields.select('title', 'label', 'description')
-    fields += field.Fields(IExistingScoreSystem)
+    fields += field.Fields(IReportScoreSystem)
 
     def updateActions(self):
         super(ReportActivityAddView, self).updateActions()
@@ -160,8 +232,19 @@
 
     def create(self, data):
         categories = getCategories(ISchoolToolApplication(None))
+        if data['scoresystem'] == 'ranged':
+            minimum = data['min']
+            if minimum is None:
+                minimum = 0
+            maximum = data['max']
+            if maximum is None:
+                maximum = 100
+            scoresystem = RangedValuesScoreSystem(u'generated', 
+                min=minimum, max=maximum)
+        else:
+            scoresystem = data['scoresystem']
         activity = ReportActivity(data['title'], categories.getDefaultKey(), 
-                                  data['scoresystem'], data['description'],
+                                  scoresystem, data['description'],
                                   data['label'])
         return activity
 
@@ -183,7 +266,7 @@
 
     fields = field.Fields(IReportActivity)
     fields = fields.select('title', 'label', 'description')
-    fields += field.Fields(IExistingScoreSystem)
+    fields += field.Fields(IReportScoreSystem)
 
     @button.buttonAndHandler(_("Cancel"))
     def handle_cancel_action(self, action):
@@ -310,13 +393,13 @@
 
     @property
     def column_choices(self):
-        return self.choices()
+        return self.choices(no_journal=False)
 
     @property
     def activity_choices(self):
         return self.choices(no_comment=False)
 
-    def choices(self, no_comment=True):
+    def choices(self, no_comment=True, no_journal=True):
         """Get  a list of the possible choices for layout activities."""
         results = []
         root = IGradebookRoot(ISchoolToolApplication(None))
@@ -338,10 +421,21 @@
                             'value': value,
                             }
                         results.append(result)
+        if not no_journal:
+            result = {
+                'name': ABSENT_HEADING,
+                'value': ABSENT_KEY,
+                }
+            results.append(result)
+            result = {
+                'name': TARDY_HEADING,
+                'value': TARDY_KEY,
+                }
+            results.append(result)
         return results
 
     def update(self):
-        if 'Update' in self.request:
+        if 'Update' in self.request or 'OK' in self.request:
             columns = self.updatedColumns()
             outline_activities = self.updatedOutlineActivities()
 
@@ -355,6 +449,9 @@
             layout.columns = columns
             layout.outline_activities = outline_activities
 
+            if 'OK' in self.request:
+                self.request.response.redirect(self.nextURL())
+
     def updatedColumns(self):
         columns = []
         index = 1
@@ -397,6 +494,9 @@
             activities.append(column)
         return activities
 
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
 
 def handleSectionAdded(event):
     """Make sure the same worksheets are deployed to newly added sections."""

=== modified file 'src/schooltool/gradebook/browser/report_card.txt'
--- src/schooltool/gradebook/browser/report_card.txt	2009-08-05 05:42:54 +0000
+++ src/schooltool/gradebook/browser/report_card.txt	2009-10-12 08:13:12 +0000
@@ -29,7 +29,7 @@
 
 We'll add one.
 
-    >>> manager.getLink('New Report Worksheet').click()
+    >>> manager.getLink('New Report Sheet').click()
     >>> manager.getControl('Title').value = 'Test'
     >>> manager.getControl('Add').click()
 
@@ -43,12 +43,11 @@
     >>> manager.getLink('Test').click()
     >>> analyze.printQuery("id('content-body')//a", manager.contents)
 
-To add a report activity to it, we'll click on the supplied link.  We need only
-fill in the title as the other required fields default to the first value
-in the vocabulary.
+To add a report activity to it, we'll click on the supplied link.
 
     >>> manager.getLink('New Report Activity').click()
     >>> manager.getControl('Title').value = 'Activity 1'
+    >>> manager.getControl('Score System').value = ['100 Points']
     >>> manager.getControl('Add').click()
 
 Now we see that the new report activity appears in the list.
@@ -57,28 +56,68 @@
     <a href="http://localhost/schooltool.gradebook/templates/ReportWorksheet/ReportActivity">Activity 1</a>
 
 Next, we'll click on the newly added activity link to edit its score system.
-We see that, when it was added, it was defaulted to the first existing score
-system in the list.
+We see that it is currently set to the 100 points score system we selected
+when we added it.
 
     >>> manager.getLink('Activity 1').click()
-    >>> manager.getControl('Existing Score System').value
+    >>> manager.getControl('Score System').value
     ['100 Points']
 
 We'll change it, apply the change, and revisit the activity to see that the
 change took.
 
-    >>> manager.getControl('Existing Score System').value = ['Letter Grade']
+    >>> manager.getControl('Score System').value = ['Letter Grade']
     >>> manager.getControl('Apply').click()
     >>> manager.getLink('Activity 1').click()
-    >>> manager.getControl('Existing Score System').value
+    >>> manager.getControl('Score System').value
     ['Letter Grade']
 
+Now we'll change it to use a dynamically generated ranged values score system.
+The min and max fields don't need to be filled in as they defualt to 0 and 100.
+
+    >>> manager.getControl('Score System').value = ['-- Use range below --']
+    >>> manager.getControl('Apply').click()
+    >>> manager.getLink('Activity 1').click()
+    >>> manager.getControl('Score System').value
+    ['-- Use range below --']
+    >>> manager.getControl('Minimum').value
+    '0'
+    >>> manager.getControl('Maximum').value
+    '100'
+
+Next we'll simply change the ranges and verify.
+
+    >>> manager.getControl('Minimum').value = '1'
+    >>> manager.getControl('Maximum').value = '5'
+    >>> manager.getControl('Apply').click()
+    >>> manager.getLink('Activity 1').click()
+    >>> manager.getControl('Score System').value
+    ['-- Use range below --']
+    >>> manager.getControl('Minimum').value
+    '1'
+    >>> manager.getControl('Maximum').value
+    '5'
+
+Finally, we'll make sure we can change it back to an existing score system.
+We'll note that, in doing so, the min and max fields are cleared out.  They
+are only relavent when '-- Use range below --' is chosen as the score system.
+
+    >>> manager.getControl('Score System').value = ['100 Points']
+    >>> manager.getControl('Apply').click()
+    >>> manager.getLink('Activity 1').click()
+    >>> manager.getControl('Score System').value
+    ['100 Points']
+    >>> manager.getControl('Minimum').value
+    ''
+    >>> manager.getControl('Maximum').value
+    ''
+
 Later we will want to test the handling of deployment of multiple templates
 to a term, so here we'll set up a second template.
 
     >>> manager.getLink('Manage').click()
     >>> manager.getLink('Report Sheet Templates').click()
-    >>> manager.getLink('New Report Worksheet').click()
+    >>> manager.getLink('New Report Sheet').click()
     >>> manager.getControl('Title').value = 'Test2'
     >>> manager.getControl('Add').click()
     >>> manager.getLink('Test2').click()
@@ -110,12 +149,12 @@
     ...                  members=['Student1','Student2'])
 
 We'll navigate to the 'Spring' term where we just created the two sections,
-and we'll click on the 'Deploy Report Worksheet' link.
+and we'll click on the 'Deploy Report Sheet' link.
 
     >>> manager.getLink('2005-2006').click()
     >>> manager.getLink('Spring').click()
     >>> term_url = manager.url
-    >>> manager.getLink('Deploy Report Worksheet').click()
+    >>> manager.getLink('Deploy Report Sheet').click()
 
 Hitting the 'Cancel' button brings us back to the term view.
 
@@ -127,12 +166,12 @@
 also bring us back to the term view.  First we'll deploy the first template,
 then the second.
 
-    >>> manager.getLink('Deploy Report Worksheet').click()
+    >>> manager.getLink('Deploy Report Sheet').click()
     >>> manager.getControl('Template').value = ['ReportWorksheet']
     >>> manager.getControl('Deploy').click()
     >>> manager.url == term_url
     True
-    >>> manager.getLink('Deploy Report Worksheet').click()
+    >>> manager.getLink('Deploy Report Sheet').click()
     >>> manager.getControl('Template').value = ['ReportWorksheet-2']
     >>> manager.getControl('Deploy').click()
 
@@ -264,7 +303,7 @@
 
     >>> manager.getLink('Manage').click()
     >>> manager.getLink('Report Sheet Templates').click()
-    >>> manager.getLink('New Report Worksheet').click()
+    >>> manager.getLink('New Report Sheet').click()
     >>> manager.getControl('Title').value = 'Test3'
     >>> manager.getControl('Add').click()
     >>> manager.getLink('Test3').click()
@@ -275,7 +314,7 @@
     >>> manager.getLink('2005-2006').click()
     >>> manager.getLink('Fall').click()
     >>> term_url = manager.url
-    >>> manager.getLink('Deploy Report Worksheet').click()
+    >>> manager.getLink('Deploy Report Sheet').click()
     >>> manager.getControl('Template').value = ['ReportWorksheet-3']
     >>> manager.getControl('Deploy').click()
 
@@ -284,7 +323,7 @@
 we have.
 
     >>> manager.getLink('2005-2006').click()
-    >>> manager.getLink('Layout Report Card').click()
+    >>> manager.getLink('Report Card Layout').click()
 
 The view starts off with no columns set up.  The 'New Column' select control is
 the only list box present.
@@ -294,11 +333,13 @@
     <option value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
     <option value="spring|2005-2006_spring|ReportActivity">Spring - Test - Activity 1</option>
     <option value="spring|2005-2006_spring-2|ReportActivity">Spring - Test2 - Activity 2</option>
+    <option value="absent">Absent</option>
+    <option value="tardy">Tardy</option>
 
 We'll add a first column to the layout.
 
     >>> manager.getControl('New Column').value = ['fall|2005-2006_fall|ReportActivity']
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
 Now the view has the first column and the select control below it to add
 another column.
@@ -307,41 +348,51 @@
     <option selected="selected" value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
     <option value="spring|2005-2006_spring|ReportActivity">Spring - Test - Activity 1</option>
     <option value="spring|2005-2006_spring-2|ReportActivity">Spring - Test2 - Activity 2</option>
+    <option value="absent">Absent</option>
+    <option value="tardy">Tardy</option>
 
     >>> analyze.printQuery("id('content-body')/form/fieldset[1]//table//tr[3]/td[2]//option", manager.contents)
     <option selected="selected" value="">Choose a column to add</option>
     <option value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
     <option value="spring|2005-2006_spring|ReportActivity">Spring - Test - Activity 1</option>
     <option value="spring|2005-2006_spring-2|ReportActivity">Spring - Test2 - Activity 2</option>
+    <option value="absent">Absent</option>
+    <option value="tardy">Tardy</option>
 
 We can change the first column to another activity.  We'll see that the change
 has taken effect.
 
     >>> manager.getControl('Column1').value = ['spring|2005-2006_spring|ReportActivity']
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
     >>> analyze.printQuery("id('content-body')/form/fieldset[1]//table//tr[2]/td[2]//option", manager.contents)
     <option value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
     <option selected="selected" value="spring|2005-2006_spring|ReportActivity">Spring - Test - Activity 1</option>
     <option value="spring|2005-2006_spring-2|ReportActivity">Spring - Test2 - Activity 2</option>
+    <option value="absent">Absent</option>
+    <option value="tardy">Tardy</option>
 
     >>> analyze.printQuery("id('content-body')/form/fieldset[1]//table//tr[3]/td[2]//option", manager.contents)
     <option selected="selected" value="">Choose a column to add</option>
     <option value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
     <option value="spring|2005-2006_spring|ReportActivity">Spring - Test - Activity 1</option>
     <option value="spring|2005-2006_spring-2|ReportActivity">Spring - Test2 - Activity 2</option>
+    <option value="absent">Absent</option>
+    <option value="tardy">Tardy</option>
 
 If we want, we can delete the column.  We'll see that the view no longer has
 any columns.
 
     >>> manager.getControl(name='delete:list').value = ['Column1']
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
     >>> analyze.printQuery("id('content-body')/form/fieldset[1]//table//tr[2]/td[2]//option", manager.contents)
     <option selected="selected" value="">Choose a column to add</option>
     <option value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
     <option value="spring|2005-2006_spring|ReportActivity">Spring - Test - Activity 1</option>
     <option value="spring|2005-2006_spring-2|ReportActivity">Spring - Test2 - Activity 2</option>
+    <option value="absent">Absent</option>
+    <option value="tardy">Tardy</option>
 
 Next, we'll repeat the same set of tests for the outline activities.  For
 starters, we see only choices for outline activities to add.
@@ -355,7 +406,7 @@
 We'll add a first activity to the layout.
 
     >>> manager.getControl('New Activity').value = ['fall|2005-2006_fall|ReportActivity']
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
 Now the view has the first activity and the select control below it to add
 another activity.
@@ -375,7 +426,7 @@
 has taken effect.
 
     >>> manager.getControl('Activity1').value = ['spring|2005-2006_spring|ReportActivity']
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
     >>> analyze.printQuery("id('content-body')/form/fieldset[2]//table//tr[2]/td[2]//option", manager.contents)
     <option value="fall|2005-2006_fall|ReportActivity">Fall - Test3 - Activity 3</option>
@@ -392,7 +443,7 @@
 any activities.
 
     >>> manager.getControl(name='delete:list').value = ['Activity1']
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
     >>> analyze.printQuery("id('content-body')/form/fieldset[2]//table//tr[2]/td[2]//option", manager.contents)
     <option selected="selected" value="">Choose an activity to add</option>

=== modified file 'src/schooltool/gradebook/browser/report_card_rml.pt'
--- src/schooltool/gradebook/browser/report_card_rml.pt	2009-08-11 04:06:14 +0000
+++ src/schooltool/gradebook/browser/report_card_rml.pt	2009-10-12 08:13:12 +0000
@@ -11,6 +11,10 @@
   metal:use-macro="context/@@rml_macros/report"
   i18n:domain="schooltool">
 
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
 <stylesheet>
   <metal:block fill-slot="extra_initialize">
   </metal:block>

=== added file 'src/schooltool/gradebook/browser/request_absences_by_day.pt'
--- src/schooltool/gradebook/browser/request_absences_by_day.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/request_absences_by_day.pt	2009-10-12 08:13:12 +0000
@@ -0,0 +1,42 @@
+<tal:define define="dummy view/update"/>
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" tal:content="view/title" />
+</head>
+<body>
+
+<metal:block metal:fill-slot="body">
+  <form method="post" class="addscoresystem"
+        tal:attributes="action string:${context/@@absolute_url}/request_absences_by_day.html">
+    <input type="hidden" name="form-submitted" value="" />
+    <h3 tal:content="view/title" />
+    <br />
+
+    <tal:block condition="view/message">
+      <span class="message" style="color: red"
+            tal:content="view/message" />
+      <br /><br />
+    </tal:block>
+
+    <table>
+      <tr>
+        <td>
+          <label for="day" i18n:translate="">Date</label>
+        </td>
+        <td>
+            <input type="text" id="day" name="day"
+                   tal:attributes="value view/currentDay">
+        </td>
+      </tr>
+    </table>
+    <div class="controls">
+      <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
+      <input type="submit" class="button-ok" name="DOWNLOAD" value="Download"
+             i18n:attributes="value" />
+    </div>
+  </form>
+
+</metal:block>
+</body>
+</html>
+

=== added file 'src/schooltool/gradebook/browser/request_failing_report.pt'
--- src/schooltool/gradebook/browser/request_failing_report.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/request_failing_report.pt	2009-10-12 08:13:12 +0000
@@ -0,0 +1,83 @@
+<tal:define define="dummy view/update"/>
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" tal:content="view/title" />
+</head>
+<body>
+
+<metal:block metal:fill-slot="body">
+  <tal:block condition="view/message">
+    <span class="message" style="color: red"
+          tal:content="view/message" />
+    <br /><br />
+  </tal:block>
+
+  <form method="post" class="addscoresystem"
+        tal:attributes="action string:${context/@@absolute_url}/request_failing_report.html">
+    <input type="hidden" name="form-submitted" value="" />
+
+	<h3 tal:content="view/title" />
+
+    <p i18n:translate="">
+      This report is a list of students achieving below a minimum score on a selected activity from a report sheet.
+    </p>
+    <p i18n:translate="">
+      For example, say the term is "Fall 2011," and you have deployed a report sheet entitled "Semester Grades,"
+      which includes an activity "First Quarter," using a grading scale where a "3" or higher is passing.
+      To create a report of students failing the first quarter grade, you would select the report activity "Fall 2011 - Semester
+      Grades - First Quarter" and choose "3" as the minimum passing grade.
+      And click "Download."
+    </p>
+
+    <table style="margin-left: 1em">
+      <tr>
+        <td>
+          <label for="source" i18n:translate="">Report Activity</label>
+        </td>
+        <td>
+            <select id="source" name="source" onchange="this.form.submit()">
+              <tal:block repeat="choice view/choices">
+              <option tal:condition="python: choice['value'] == view.current_source()"
+                      selected
+                      tal:attributes="value choice/value"
+                      tal:content="choice/name" />
+              <option tal:condition="python: choice['value'] != view.current_source()"
+                      tal:attributes="value choice/value"
+                      tal:content="choice/name" />
+              </tal:block>
+            </select>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label for="score" i18n:translate="">Minimum Passing Score</label>
+        </td>
+        <td>
+            <select id="score" name="score"
+                    tal:condition="python: len(view.scores()) > 0">
+              <tal:block repeat="score view/scores">
+              <option tal:condition="python: score['value'] == ''"
+                      selected
+                      tal:attributes="value score/value"
+                      tal:content="score/name" />
+              <option tal:condition="python: score['value'] != ''"
+                      tal:attributes="value score/value"
+                      tal:content="score/name" />
+              </tal:block>
+            </select>
+            <input type="text" id="score" name="score"
+                   tal:condition="python: len(view.scores()) == 0">
+        </td>
+      </tr>
+    </table>
+    <div class="controls">
+      <tal:block metal:use-macro="view/@@standard_macros/cancel-button" />
+      <input type="submit" class="button-ok" name="DOWNLOAD" value="Download"
+             i18n:attributes="value" />
+    </div>
+  </form>
+
+</metal:block>
+</body>
+</html>
+

=== added file 'src/schooltool/gradebook/browser/request_reports.pt'
--- src/schooltool/gradebook/browser/request_reports.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/request_reports.pt	2009-10-12 08:13:12 +0000
@@ -0,0 +1,17 @@
+<html metal:use-macro="context/@@standard_macros/page"
+      i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" tal:content="view/title" />
+</head>
+<body>
+<div metal:fill-slot="body">
+  <h1 style="font-size: 180%" tal:content="view/title" />
+  <br />
+  <tal:block repeat="link view/links">
+    <a class="navigation_header"
+       tal:attributes="href link/url"
+       tal:content="link/content" />
+  </tal:block>
+</div>
+</body>
+</html>

=== added file 'src/schooltool/gradebook/browser/request_reports.py'
--- src/schooltool/gradebook/browser/request_reports.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/request_reports.py	2009-10-12 08:13:12 +0000
@@ -0,0 +1,249 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2005 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
+#
+"""
+Request PDF Views
+"""
+
+from datetime import datetime
+
+from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
+from zope.publisher.browser import BrowserView
+from zope.traversing.browser.absoluteurl import absoluteURL
+
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.common import SchoolToolMessage as _
+
+from schooltool.gradebook.interfaces import IGradebookRoot
+from schooltool.requirement.interfaces import ICommentScoreSystem
+from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
+
+
+class BaseView(BrowserView):
+    """Base class for all request report views"""
+
+    template=ViewPageTemplateFile('request_reports.pt')
+
+    def __call__(self):
+        return self.template()
+
+
+class StudentReportsView(BaseView):
+
+    def title(self):
+        return _('Student Reports')
+
+    def links(self):
+        url = absoluteURL(self.context, self.request)
+        results = [
+            {
+                'url': url +  '/report_card.pdf',
+                'content': _('Download Report Card'),
+            },
+            {
+                'url': url +  '/student_detail.pdf',
+                'content': _('Download Student Detail Report'),
+            },
+        ]
+        return results
+
+
+class GroupReportsView(BaseView):
+
+    def title(self):
+        return _('Group Reports')
+
+    def links(self):
+        url = absoluteURL(self.context, self.request)
+        results = [
+            {
+                'url': url +  '/report_card.pdf',
+                'content': _('Download Report Card'),
+            },
+            {
+                'url': url +  '/student_detail.pdf',
+                'content': _('Download Detailed Student Report'),
+            },
+         ]
+        return results
+
+
+class SchoolYearReportsView(BaseView):
+
+    def title(self):
+        return _('School Year Reports')
+
+    def links(self):
+        url = absoluteURL(self.context, self.request)
+        results = [
+            {
+                'url': url +  '/request_failing_report.html',
+                'content': _('Failures by Term'),
+            },
+            {
+                'url': url +  '/request_absences_by_day.html',
+                'content': _('Absences By Day'),
+            },
+         ]
+        return results
+
+
+class SectionReportsView(BaseView):
+
+    def title(self):
+        return _('Section Reports')
+
+    def links(self):
+        url = absoluteURL(self.context, self.request)
+        results = [
+            {
+                'url': url +  '/section_absences.pdf',
+                'content': _('Download Absences by Section Report'),
+            },
+         ]
+        return results
+
+
+class RequestFailingReportView(BrowserView):
+
+    def title(self):
+        return _('Request Failing Report')
+
+    def current_source(self):
+        if 'source' in self.request:
+            return self.request['source']
+        return ''
+
+    def getScoreSystem(self, source):
+        termName, worksheetName, activityName = source.split('|')
+        root = IGradebookRoot(ISchoolToolApplication(None))
+        return root.deployed[worksheetName][activityName].scoresystem
+
+    def choices(self):
+        """Get  a list of the possible choices for report activities."""
+        result = {
+            'name': _('Choose a report activity'),
+            'value': '',
+            }
+        results = [result]
+        root = IGradebookRoot(ISchoolToolApplication(None))
+        for term in self.context.values():
+            deployedKey = '%s_%s' % (self.context.__name__, term.__name__)
+            for key in root.deployed:
+                if key.startswith(deployedKey):
+                    deployedWorksheet = root.deployed[key]
+                    for activity in deployedWorksheet.values():
+                        if ICommentScoreSystem.providedBy(activity.scoresystem):
+                            continue
+                        name = '%s - %s - %s' % (term.title,
+                            deployedWorksheet.title, activity.title)
+                        value = '%s|%s|%s' % (term.__name__,
+                            deployedWorksheet.__name__, activity.__name__)
+                        result = {
+                            'name': name,
+                            'value': value,
+                            }
+                        results.append(result)
+        return results
+
+    def scores(self):
+        results = []
+        current = self.current_source()
+        if current:
+            ss = self.getScoreSystem(current)
+            if IDiscreteValuesScoreSystem.providedBy(ss):
+                result = {
+                    'name': _('Choose a minimum passing score'),
+                    'value': '',
+                    }
+                results.append(result)
+                for score in ss.scores:
+                    result = {
+                        'name': score[0],
+                        'value': score[0],
+                        }
+                    results.append(result)
+        return results
+
+    def getErrorMessage(self):
+        return _('You must specify both a report activity and a minimum passing score.')
+
+    def update(self):
+        self.message = ''
+        if 'form-submitted' in self.request:
+            if 'CANCEL' in self.request:
+                self.request.response.redirect(self.nextURL())
+            elif 'DOWNLOAD' in self.request:
+                if not (self.request['source'] and self.request['score']):
+                    self.message = self.getErrorMessage()
+                else:
+                    url = '%s?activity=%s&min=%s' % (self.reportURL(),
+                        self.request['source'], self.request['score'])
+                    self.request.response.redirect(url)
+
+    def reportURL(self):
+        return absoluteURL(self.context, self.request) + '/failing_report.pdf'
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request) + '/report_pdfs.html'
+
+
+class RequestAbsencesByDayView(BrowserView):
+
+    def title(self):
+        return _('Request Absences By Day Report')
+
+    def currentDay(self):
+        day = self.request.get('day', None)
+        if day is None:
+            tod = datetime.now()
+            return '%d-%02d-%02d' % (tod.year, tod.month, tod.day)
+        else:
+            return day
+
+    def isValidDate(self):
+        day = self.currentDay()
+        try:
+            year, month, day = [int(part) for part in day.split('-')]
+        except:
+            return False
+        date = datetime.date(datetime(year, month, day))
+        return self.context.first <= date <= self.context.last
+
+    def getErrorMessage(self):
+        return _('You must specify a valid date within the school year.')
+
+    def update(self):
+        self.message = ''
+        if 'form-submitted' in self.request:
+            if 'CANCEL' in self.request:
+                self.request.response.redirect(self.nextURL())
+            elif 'DOWNLOAD' in self.request:
+                if not self.isValidDate():
+                    self.message = self.getErrorMessage()
+                else:
+                    url = '%s?day=%s' % (self.reportURL(),
+                        self.request['day'])
+                    self.request.response.redirect(url)
+
+    def reportURL(self):
+        return absoluteURL(self.context, self.request) + '/absences_by_day.pdf'
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request) + '/report_pdfs.html'
+

=== added file 'src/schooltool/gradebook/browser/section_absences_rml.pt'
--- src/schooltool/gradebook/browser/section_absences_rml.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/section_absences_rml.pt	2009-10-12 08:13:12 +0000
@@ -0,0 +1,98 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+  <!ENTITY nbsp    "&#160;">
+]>
+
+<document
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="context/@@rml_macros/report"
+  i18n:domain="schooltool">
+
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
+<stylesheet>
+  <metal:block fill-slot="extra_initialize">
+  </metal:block>
+  <metal:block fill-slot="stylesheet">
+
+    <paraStyle
+      name="normal"
+      fontName="Arial_Normal"
+      fontSize="10"
+      leading="12"/>
+
+    <paraStyle
+      name="bold"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="left"
+      leading="12"/>
+
+    <paraStyle
+      name="heading"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="right"
+      leading="12"/>
+
+    <paraStyle
+      name="section_heading"
+      fontName="Arial_Bold"
+      fontSize="12"
+      alignment="center"
+      leading="12"/>
+
+    <blockTableStyle id="headings_table">
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="grid">
+    	<lineStyle kind="OUTLINE"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+  </metal:block>
+</stylesheet>
+
+<story metal:fill-slot="story">
+  <blockTable style="headings_table" colWidths="4cm,4cm,4cm,4cm">
+    <tr>
+      <td><para style="heading" tal:content="view/course_heading" /></td>
+      <td><para style="normal" tal:content="view/course" /></td>
+      <td><para style="heading" tal:content="view/teacher_heading" /></td>
+      <td><para style="normal" tal:content="view/teacher" /></td>
+    </tr>
+  </blockTable>
+  <spacer length=".5cm" />
+
+  <blockTable style="grid" colWidths="7.5cm,2.5cm,2.5cm,2.5cm">
+    <tr>
+      <td><para style="bold" tal:content="view/student_heading" /></td>
+      <td><para style="bold" tal:content="view/absences_heading" /></td>
+      <td><para style="bold" tal:content="view/tardies_heading" /></td>
+      <td><para style="bold" tal:content="view/total_heading" /></td>
+    </tr>
+  </blockTable>
+  <spacer length=".2cm" />
+
+  <blockTable style="headings_table" colWidths="7.5cm,2.5cm,2.5cm,2.5cm">
+    <tr tal:repeat="student view/students">
+      <td><para style="normal" tal:content="student/name" /></td>
+      <td><para style="normal" tal:content="student/absences" /></td>
+      <td><para style="normal" tal:content="student/tardies" /></td>
+      <td><para style="normal" tal:content="student/total" /></td>
+    </tr>
+  </blockTable>
+
+  <condPageBreak height="88cm"/>
+
+</story>
+
+</document>
+

=== added file 'src/schooltool/gradebook/browser/student_detail_rml.pt'
--- src/schooltool/gradebook/browser/student_detail_rml.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/student_detail_rml.pt	2009-10-12 08:13:12 +0000
@@ -0,0 +1,127 @@
+<?xml version="1.0" standalone="no" ?>
+<!DOCTYPE document SYSTEM "rml_1_0.dtd" [
+  <!ENTITY pound   "&#xA3;">
+  <!ENTITY nbsp    "&#160;">
+]>
+
+<document
+  xmlns:tal="http://xml.zope.org/namespaces/tal"
+  xmlns:metal="http://xml.zope.org/namespaces/metal"
+  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  metal:use-macro="context/@@rml_macros/report"
+  i18n:domain="schooltool">
+
+<metal:block fill-slot="page_templates">
+  <tal:block content="structure view/use_template/default" />
+</metal:block>
+
+<stylesheet>
+  <metal:block fill-slot="extra_initialize">
+  </metal:block>
+  <metal:block fill-slot="stylesheet">
+
+    <paraStyle
+      name="normal"
+      fontName="Arial_Normal"
+      fontSize="10"
+      leading="12"/>
+
+    <paraStyle
+      name="bold"
+      fontName="Arial_Bold"
+      fontSize="10"
+      leading="12"/>
+
+    <paraStyle
+      name="heading"
+      fontName="Arial_Bold"
+      fontSize="10"
+      alignment="right"
+      leading="12"/>
+
+    <paraStyle
+      name="section_heading"
+      fontName="Arial_Bold"
+      fontSize="12"
+      alignment="center"
+      leading="12"/>
+
+    <blockTableStyle id="headings_table">
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+
+    <blockTableStyle id="grid">
+    	<lineStyle kind="OUTLINE"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+    	<lineStyle kind="INNERGRID"
+          colorName="black" thickness="0.25"
+          start="0,0" stop="-1,-1" />
+        <blockValign value="top" start="0,0" stop="0,-1"/>
+    </blockTableStyle>
+  </metal:block>
+</stylesheet>
+
+<story metal:fill-slot="story">
+
+  <tal:block repeat="student view/students">
+  <tal:block define="grades student/grades; attendance student/attendance">
+    <blockTable style="headings_table" colWidths="4cm,4cm,4cm,4cm">
+      <tr>
+        <td><para style="heading" tal:content="view/name_heading" /></td>
+        <td><para style="normal" tal:content="student/name" /></td>
+        <td><para style="heading" tal:content="view/userid_heading" /></td>
+        <td><para style="normal" tal:content="student/userid" /></td>
+      </tr>
+    </blockTable>
+    <spacer length=".5cm" />
+
+    <para style="section_heading" tal:content="view/grades_heading" />
+    <spacer length=".5cm" />
+
+    <blockTable style="grid"
+                tal:attributes="colWidths grades/widths">
+      <tr>
+        <td><para style="bold" tal:content="view/course_heading" /></td>
+        <td tal:repeat="heading grades/headings">
+          <para style="bold" tal:content="heading" />
+        </td>
+      </tr>
+
+      <tr tal:repeat="row grades/rows">
+        <td><para style="normal" tal:content="row/title" /></td>
+        <td tal:repeat="score row/scores">
+          <para style="normal" tal:content="score" />
+        </td>
+      </tr>
+    </blockTable>
+    <spacer length=".5cm" />
+
+    <para style="section_heading" tal:content="view/attendance_heading" />
+    <spacer length=".5cm" />
+
+    <blockTable style="grid"
+                tal:attributes="colWidths attendance/widths">
+      <tr>
+        <td><para style="bold" tal:content="view/date_heading" /></td>
+        <td tal:repeat="heading attendance/headings">
+          <para style="bold" tal:content="heading" />
+        </td>
+      </tr>
+
+      <tr tal:repeat="row attendance/rows">
+        <td><para style="normal" tal:content="row/title" /></td>
+        <td tal:repeat="score row/scores">
+          <para style="normal" tal:content="score" />
+        </td>
+      </tr>
+    </blockTable>
+
+    <condPageBreak height="88cm"/>
+  </tal:block>
+  </tal:block>
+
+</story>
+
+</document>
+

=== modified file 'src/schooltool/gradebook/browser/student_gradebook.pt'
--- src/schooltool/gradebook/browser/student_gradebook.pt	2009-07-29 09:35:08 +0000
+++ src/schooltool/gradebook/browser/student_gradebook.pt	2009-10-12 08:13:12 +0000
@@ -1,10 +1,10 @@
 <html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
 <head>
-  <title metal:fill-slot="title" tal:content="string: ${view/worksheet} for ${view/student} in ${view/section}" />
+  <title metal:fill-slot="title" tal:content="view/title" />
 </head>
 <body>
   <h1 metal:fill-slot="content-header" i18n:translate="">
-    <span tal:replace="string: ${view/worksheet} for ${view/student} in ${view/section}" />
+    <span tal:replace="view/title" />
   </h1>
 
 <metal:block metal:fill-slot="body">

=== modified file 'src/schooltool/gradebook/browser/weight_categories.pt'
--- src/schooltool/gradebook/browser/weight_categories.pt	2008-10-12 02:23:54 +0000
+++ src/schooltool/gradebook/browser/weight_categories.pt	2009-10-12 08:13:12 +0000
@@ -8,18 +8,29 @@
 </head>
 <body>
 <div metal:fill-slot="body">
-  <h1 tal:content="string: Category weights for worksheet ${context/title}" />
-
-  <div class="message" style="color:red; padding:1em"
-       tal:condition="view/message"
-       tal:content="view/message">
-    Message
-  </div>
-  <br />
-
-  <form method="post"
+  <form method="post" class="addscoresystem"
         tal:attributes="action string:${context/@@absolute_url}/weights.html">
-    <table>
+    <h3 tal:content="string: Category weights for worksheet ${context/title}" />
+    <br />
+
+    <p i18n:translate="">
+      This form allows you to change the weighting of categories when calculating average scores within a worksheet.
+    </p>
+    <p i18n:translate="">
+      Enter numeric values for each relevant category. The total of all values must be exactly 100.
+    </p>
+    <p i18n:translate="">
+      For example, to weight exams as 60% of the grade, homework as 20% and quizzes as 20%, enter "60" next to "Exam," 20" next to "Homework" and "20" next to "quiz."
+    </p>
+
+    <div class="message" style="color:red; padding:1em"
+         tal:condition="view/message"
+         tal:content="view/message">
+      Message
+    </div>
+    <br />
+
+    <table style="margin-left: 1em">
       <tr tal:repeat="row view/rows">
         <td>
           <label tal:attributes="for row/category" 

=== modified file 'src/schooltool/gradebook/browser/worksheet.py'
--- src/schooltool/gradebook/browser/worksheet.py	2009-03-06 03:22:18 +0000
+++ src/schooltool/gradebook/browser/worksheet.py	2009-10-12 08:13:12 +0000
@@ -33,6 +33,8 @@
 from schooltool.gradebook.browser.activity import BaseEditView
 from schooltool.person.interfaces import IPerson
 
+from schooltool.common import SchoolToolMessage as _
+
 
 class WorksheetGradebookView(BrowserView):
     """A view that redirects from the worksheet to its gradebook."""
@@ -53,14 +55,21 @@
     
     def activities(self):
         pos = 0
+        results = []
         for activity in list(self.context.values()):
             pos += 1
+            url = absoluteURL(activity, self.request)
+            if interfaces.ILinkedColumnActivity.providedBy(activity):
+                url += '/editLinkedColumn.html'
             yield {'name': getName(activity),
                    'title': activity.title,
-                   'url': absoluteURL(activity, self.request),
+                   'url': url,
                    'pos': pos,
                    'deployed': self.context.deployed}
 
+    def isTemplate(self):
+        return interfaces.IReportWorksheet.providedBy(self.context)
+
     def canModify(self):
         return canWrite(self.context, 'title')
 
@@ -89,6 +98,10 @@
                 if new_pos != old_pos:
                     self.context.changePosition(name, new_pos-1)
 
+    @property
+    def noActivitiesMessage(self):
+        return _('This worksheet has no activities.')
+
 
 class WorksheetAddView(app.BaseAddView):
     """A view for adding a worksheet."""

=== modified file 'src/schooltool/gradebook/browser/worksheet_delete.pt'
--- src/schooltool/gradebook/browser/worksheet_delete.pt	2008-06-20 10:21:46 +0000
+++ src/schooltool/gradebook/browser/worksheet_delete.pt	2009-10-12 08:13:12 +0000
@@ -5,19 +5,20 @@
 </head>
 <body>
 
-<h1 metal:fill-slot="content-header"
-    tal:content="string:Delete Worksheet '${context/title}'">Delete Worksheet</h1>
+<h1 metal:fill-slot="content-header" tal:content="view/title" />
 
 <metal:block metal:fill-slot="body">
   <div style="padding-bottom: 1em">
-    <p>Are you sure you want to delete this workskeet together with all its activities?</p>
+    <p i18n:translate="">Are you sure you want to delete this workskeet together with all its activities?</p>
   </div>
 
   <form method="post"
         tal:attributes="action string:${context/@@absolute_url}/delete.html">
     <div class="controls">
-      <input type="submit" class="button-ok" name="DELETE" value="Delete"/>
-      <input type="submit" class="button-cancel" name="CANCEL" value="Cancel"/>
+      <input type="submit" class="button-ok" name="DELETE" value="Delete"
+             i18n:attributes="value" />
+      <input type="submit" class="button-cancel" name="CANCEL" value="Cancel"
+             i18n:attributes="value" />
     </div>
   </form>
 

=== modified file 'src/schooltool/gradebook/browser/worksheet_overview.pt'
--- src/schooltool/gradebook/browser/worksheet_overview.pt	2009-03-10 08:33:59 +0000
+++ src/schooltool/gradebook/browser/worksheet_overview.pt	2009-10-12 08:13:12 +0000
@@ -11,9 +11,15 @@
 <metal:block metal:fill-slot="body"
              tal:define="activities view/activities">
 
+  <p tal:condition="view/isTemplate" i18n:translate="">
+    A report sheet template defines the activities to be included in a report sheet deployed to each section in a term or year.
+  </p>
+
   <form method="post"
-        tal:attributes="action string:${context/@@absolute_url}/manage.html">
+        tal:attributes="action string:${context/@@absolute_url}">
     <input type="hidden" name="form-submitted" value="" />
+    <div tal:condition="python: len(list(context.values())) == 0"
+         tal:content="view/noActivitiesMessage" />
     <div tal:repeat="activity activities">
       <select name=""
               onchange="this.form.submit()"
@@ -41,8 +47,10 @@
 
     </div>
     <div class="controls" tal:condition="view/canModify">
-      <tal:block tal:condition="view/canModify"
-                 metal:use-macro="view/@@standard_macros/delete-button" />
+      <tal:block tal:condition="python: len(list(context.values())) > 0">
+        <tal:block tal:condition="view/canModify"
+                   metal:use-macro="view/@@standard_macros/delete-button" />
+      </tal:block>
     </div>
   </form>
 </metal:block>

=== modified file 'src/schooltool/gradebook/configure.zcml'
--- src/schooltool/gradebook/configure.zcml	2009-07-13 09:19:00 +0000
+++ src/schooltool/gradebook/configure.zcml	2009-10-12 08:13:10 +0000
@@ -161,6 +161,20 @@
         set_schema=".interfaces.ILinkedActivity"
         />
   </class>
+  <class class=".activity.LinkedColumnActivity">
+    <allow interface="zope.interface.common.mapping.IReadMapping" />
+    <require
+        permission="schooltool.view"
+        attributes="keys __iter__ values items __len__
+                    label due_date source title description category
+		            scoresystem"
+        />
+    <require
+        permission="schooltool.edit"
+        interface="zope.interface.common.mapping.IWriteMapping"
+        set_schema=".interfaces.ILinkedColumnActivity"
+        />
+  </class>
 
   <!-- External Activities Vocabulary -->
 

=== modified file 'src/schooltool/gradebook/generations/__init__.py'
--- src/schooltool/gradebook/generations/__init__.py	2009-06-05 00:11:04 +0000
+++ src/schooltool/gradebook/generations/__init__.py	2009-10-12 08:13:12 +0000
@@ -23,6 +23,6 @@
 from zope.app.generations.generations import SchemaManager
 
 schemaManager = SchemaManager(
-    minimum_generation=1,
-    generation=1,
+    minimum_generation=2,
+    generation=2,
     package_name='schooltool.gradebook.generations')

=== modified file 'src/schooltool/gradebook/generations/evolve1.py'
--- src/schooltool/gradebook/generations/evolve1.py	2009-07-13 00:12:34 +0000
+++ src/schooltool/gradebook/generations/evolve1.py	2009-10-12 08:13:12 +0000
@@ -70,6 +70,8 @@
             updateObjActivities(section, IActivities(section), ss, custom_ss)
 
     root = IGradebookRoot(app)
+    if root is None:
+        return
     updateObjActivities(root, root.templates, ss, custom_ss)
     updateObjActivities(root, root.deployed, ss, custom_ss)
 

=== added file 'src/schooltool/gradebook/generations/evolve2.py'
--- src/schooltool/gradebook/generations/evolve2.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/evolve2.py	2009-10-12 08:13:12 +0000
@@ -0,0 +1,44 @@
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2008 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
+#
+"""
+Evolve database to generation 1.
+
+Moves hard-coded score system utilities to the app site manager.
+"""
+
+from zope.app.zopeappgenerations import getRootFolder
+from zope.security.proxy import removeSecurityProxy
+
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.requirement.interfaces import ICustomScoreSystem
+from schooltool.requirement.scoresystem import CustomScoreSystem
+
+
+def evolve(context):
+    """Adds abbreviation column to all custom score systems"""
+
+    app = getRootFolder(context)
+    sm = app.getSiteManager()
+    for name, util in sorted(sm.getUtilitiesFor(ICustomScoreSystem)):
+        util = removeSecurityProxy(util)
+        new_scores = []
+        for score, value, percent in util.scores:
+            new_scores.append([score, '', value, percent])
+        util.scores = new_scores
+

=== added file 'src/schooltool/gradebook/generations/tests/test_evolve2.py'
--- src/schooltool/gradebook/generations/tests/test_evolve2.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/tests/test_evolve2.py	2009-10-12 08:13:12 +0000
@@ -0,0 +1,88 @@
+# coding=UTF8
+#
+# SchoolTool - common information systems platform for school administration
+# Copyright (c) 2008 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
+#
+"""
+Unit tests for schooltool.gradebook.generations.evolve2
+"""
+
+import unittest
+
+from zope.app.zopeappgenerations import getRootFolder
+from zope.interface import implements
+from zope.testing import doctest
+
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.gradebook.generations.tests import ContextStub
+from schooltool.gradebook.generations.tests import provideAdapters
+from schooltool.gradebook.generations.evolve2 import evolve
+from schooltool.requirement.interfaces import ICustomScoreSystem
+
+
+class CustomScoreSystemStub(object):
+    implements(ICustomScoreSystem)
+
+    scores = [('A', 0, 0), ('B', 0, 0)]
+    title = 'stub'
+    hidden = False
+
+
+def doctest_evolve2():
+    """Evolution to generation 2.
+
+    First, we'll set up the app object:
+
+        >>> provideAdapters()
+        >>> context = ContextStub()
+        >>> app = getRootFolder(context)
+
+        >>> from zope.app.component.site import LocalSiteManager
+        >>> app.setSiteManager(LocalSiteManager(app))
+
+    We'll set up our test with data that will be effected by running the
+    evolve script:
+
+        >>> from schooltool.requirement.interfaces import IScoreSystemsProxy
+        >>> proxy = IScoreSystemsProxy(app)
+        >>> custom_ss = CustomScoreSystemStub()
+        >>> proxy.addScoreSystem(custom_ss)
+
+    Finally, we'll run the evolve script, testing the effected values before and
+    after:
+
+        >>> custom_ss.scores
+        [('A', 0, 0), ('B', 0, 0)]
+
+        >>> evolve(context)
+
+        >>> custom_ss.scores
+        [['A', '', 0, 0], ['B', '', 0, 0]]
+    """
+
+
+def test_suite():
+    return unittest.TestSuite([
+        doctest.DocTestSuite(optionflags=doctest.ELLIPSIS
+                                         | doctest.NORMALIZE_WHITESPACE
+                                         | doctest.REPORT_NDIFF
+                                         | doctest.REPORT_ONLY_FIRST_FAILURE),
+        ])
+
+if __name__ == '__main__':
+    unittest.main(defaultTest='test_suite')
+

=== modified file 'src/schooltool/gradebook/gradebook.py'
--- src/schooltool/gradebook/gradebook.py	2009-06-29 07:43:38 +0000
+++ src/schooltool/gradebook/gradebook.py	2009-10-12 08:13:10 +0000
@@ -46,18 +46,19 @@
 from schooltool.securitypolicy.crowds import AdministratorsCrowd
 
 from schooltool.gradebook import interfaces
-from schooltool.gradebook.activity import Activities
+from schooltool.gradebook.activity import getSourceObj, Activities
 from schooltool.gradebook.activity import ensureAtLeastOneWorksheet
 from schooltool.requirement.scoresystem import UNSCORED, ScoreValidationError
 from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
 from schooltool.requirement.interfaces import IRangedValuesScoreSystem
+from schooltool.requirement.scoresystem import RangedValuesScoreSystem
 from schooltool.common import SchoolToolMessage as _
 
 GRADEBOOK_SORTING_KEY = 'schooltool.gradebook.sorting'
 CURRENT_WORKSHEET_KEY = 'schooltool.gradebook.currentworksheet'
 DUE_DATE_FILTER_KEY = 'schooltool.gradebook.duedatefilter'
 COLUMN_PREFERENCES_KEY = 'schooltool.gradebook.columnpreferences'
-        
+
 
 class WorksheetGradebookTraverser(object):
     '''Traverser that goes from a worksheet to the gradebook'''
@@ -159,12 +160,28 @@
             return True
         return False
 
-    def getEvaluation(self, student, activity, default=None):
+    def getEvaluation(self, student, activity):
         """See interfaces.IGradebook"""
         student = self._checkStudent(student)
         activity = self._checkActivity(activity)
         evaluations = requirement.interfaces.IEvaluations(student)
-        return evaluations.get(activity, default)
+        ev, value, ss = None, None, None
+        if interfaces.ILinkedColumnActivity.providedBy(activity):
+            sourceObj = getSourceObj(activity.source)
+            if interfaces.IActivity.providedBy(sourceObj):
+                ev = evaluations.get(sourceObj, None)
+                ss = sourceObj.scoresystem
+            elif interfaces.IWorksheet.providedBy(sourceObj):
+                gb = interfaces.IGradebook(sourceObj)
+                if student in gb.students:
+                    total, value = gb.getWorksheetTotalAverage(sourceObj, student) 
+                    ss = RangedValuesScoreSystem()
+        else:
+            ev = evaluations.get(activity, None)
+            ss = activity.scoresystem
+        if ev is not None and ev.value is not UNSCORED:
+            value = ev.value
+        return value, ss
 
     def evaluate(self, student, activity, score, evaluator=None):
         """See interfaces.IGradebook"""
@@ -197,9 +214,9 @@
         if weights:
             adjusted_weights = {}
             for activity in self.getWorksheetActivities(worksheet):
-                ev = self.getEvaluation(student, activity)
+                value, ss = self.getEvaluation(student, activity)
                 category = activity.category
-                if ev is not None and ev.value is not UNSCORED:
+                if value is not None:
                     if category in weights:
                         adjusted_weights[category] = weights[category]
             total_percentage = 0
@@ -212,17 +229,15 @@
             average_totals = {}
             average_counts = {}
             for activity in self.getWorksheetActivities(worksheet):
-                ev = self.getEvaluation(student, activity)
-                if ev is not None and ev.value is not UNSCORED:
-                    ss = ev.requirement.scoresystem
+                value, ss = self.getEvaluation(student, activity)
+                if value is not None:
                     if IDiscreteValuesScoreSystem.providedBy(ss):
-                        minimum = ss.scores[-1][1]
-                        maximum = ss.scores[0][1]
-                        value = ss.getNumericalValue(ev.value)
+                        minimum = ss.scores[-1][2]
+                        maximum = ss.scores[0][2]
+                        value = ss.getNumericalValue(value)
                     elif IRangedValuesScoreSystem.providedBy(ss):
                         minimum = ss.min
                         maximum = ss.max
-                        value = ev.value
                     else:
                         continue
                     totals.setdefault(activity.category, Decimal(0))
@@ -244,17 +259,15 @@
             total = 0
             count = 0
             for activity in self.getWorksheetActivities(worksheet):
-                ev = self.getEvaluation(student, activity)
-                if ev is not None and ev.value is not UNSCORED:
-                    ss = ev.requirement.scoresystem
+                value, ss = self.getEvaluation(student, activity)
+                if value is not None:
                     if IDiscreteValuesScoreSystem.providedBy(ss):
-                        minimum = ss.scores[-1][1]
-                        maximum = ss.scores[0][1]
-                        value = ss.getNumericalValue(ev.value)
+                        minimum = ss.scores[-1][2]
+                        maximum = ss.scores[0][2]
+                        value = ss.getNumericalValue(value)
                     elif IRangedValuesScoreSystem.providedBy(ss):
                         minimum = ss.min
                         maximum = ss.max
-                        value = ev.value
                     else:
                         continue
                     total += value - minimum
@@ -432,12 +445,11 @@
 
     def __getattr__(self, name):
         activity = self.context.activities[name]
-        ev = self.context.gradebook.getEvaluation(self.context.student, 
-                                                  activity)
-        if ev is not None and ev.value is not UNSCORED:
-            return ev.value
-        else:
-            return ''
+        value, ss = self.context.gradebook.getEvaluation(self.context.student, 
+            activity)
+        if value is None:
+            value = ''
+        return value
     
 
 def getWorksheetSection(worksheet):

=== modified file 'src/schooltool/gradebook/gradebook_init.py'
--- src/schooltool/gradebook/gradebook_init.py	2009-08-14 09:53:09 +0000
+++ src/schooltool/gradebook/gradebook_init.py	2009-10-12 08:13:10 +0000
@@ -139,6 +139,8 @@
 
 
 def getGradebookRoot(app):
+    if GRADEBOOK_ROOT_KEY not in app:
+        return None
     return app[GRADEBOOK_ROOT_KEY]
 
 

=== modified file 'src/schooltool/gradebook/interfaces.py'
--- src/schooltool/gradebook/interfaces.py	2009-08-05 05:42:54 +0000
+++ src/schooltool/gradebook/interfaces.py	2009-10-12 08:13:10 +0000
@@ -210,7 +210,7 @@
     def hasEvaluation(student, activity):
         """Check whether an evaluation exists for a student-activity pair."""
 
-    def getEvaluation(student, activity, default=None):
+    def getEvaluation(student, activity):
         """Get the evaluation of a student for a given activity."""
 
     def getCurrentEvaluationsForStudent(student):
@@ -304,7 +304,7 @@
         title=_('Worksheets'),
         description=_('Worksheets in this gradebook.'))
 
-    def getEvaluation(student, activity, default=None):
+    def getEvaluation(student, activity):
         """Get the evaluation of a student for a given activity."""
 
     def getCurrentWorksheet():
@@ -329,7 +329,7 @@
         title=_(u"External Activity ID"),
         description=_(u"A unique identifier for the external activity"),
         required=True)
-    
+
     points = zope.schema.Int(
         title=_(u"Points"),
         description=_(u"Points value to calculate the activity grade"),
@@ -403,3 +403,13 @@
 
     def __eq__(another):
         """Compare equality with other external activities"""
+
+
+class ILinkedColumnActivity(IActivity):
+    """An activity that can be linked to an external activity"""
+
+    source = zope.schema.TextLine(
+        title=_(u"Linked Column Activity Source"),
+        description=_(u"A text string that specifies the source of the column"),
+        required=True)
+

=== modified file 'src/schooltool/requirement/README.txt'
--- src/schooltool/requirement/README.txt	2009-06-25 05:00:11 +0000
+++ src/schooltool/requirement/README.txt	2009-10-12 08:13:12 +0000
@@ -179,8 +179,9 @@
   >>> from decimal import Decimal
   >>> check = scoresystem.DiscreteValuesScoreSystem(
   ...    u'Check', u'Check-mark score system',
-  ...    [('+', Decimal(1), Decimal(80)), ('v', Decimal(0), Decimal(60)),
-  ...     ('-', Decimal(-1), Decimal(0))])
+  ...    [('+', '', Decimal(1), Decimal(80)),
+  ...     ('v', '', Decimal(0), Decimal(60)),
+  ...     ('-', '', Decimal(-1), Decimal(0))])
 
 The first and second arguments of the constructor are the title and
 description. The third argument is a list that really represents a mapping
@@ -248,9 +249,9 @@
   >>> from schooltool.requirement import scoresystem
   >>> check = scoresystem.DiscreteValuesScoreSystem(
   ...    u'Check', u'Check-mark score system',
-  ...    [('+', Decimal(1), Decimal(80)),
-  ...     ('v', Decimal(0), Decimal(60)),
-  ...     ('-', Decimal(-1), Decimal(0))],
+  ...    [('+', '', Decimal(1), Decimal(80)),
+  ...     ('v', '', Decimal(0), Decimal(60)),
+  ...     ('-', '', Decimal(-1), Decimal(0))],
   ...     minPassingScore='v')
   >>> check
   <DiscreteValuesScoreSystem u'Check'>
@@ -280,8 +281,9 @@
   >>> from schooltool.requirement import scoresystem
   >>> check = scoresystem.DiscreteValuesScoreSystem(
   ...    u'Check', u'Check-mark score system',
-  ...    [('+', Decimal(1), Decimal(80)), ('v', Decimal(0), Decimal(60)), 
-  ...     ('-', Decimal(-1)), Decimal(0)],
+  ...    [('+', '', Decimal(1), Decimal(80)),
+  ...     ('v', '', Decimal(0), Decimal(60)), 
+  ...     ('-', '', Decimal(-1)), Decimal(0)],
   ...    bestScore='+', minPassingScore='v')
 
   >>> check.getBestScore()
@@ -299,8 +301,8 @@
   >>> scoresystem.PassFail.title
   u'Pass/Fail'
   >>> scoresystem.PassFail.scores
-  [(u'Pass', Decimal("1"), Decimal("60")), 
-   (u'Fail', Decimal("0"), Decimal("0"))]
+  [(u'Pass', u'', Decimal("1"), Decimal("60")), 
+   (u'Fail', u'', Decimal("0"), Decimal("0"))]
   >>> scoresystem.PassFail.isValidScore('Pass')
   True
   >>> scoresystem.PassFail.isPassingScore('Pass')
@@ -327,9 +329,11 @@
   >>> scoresystem.AmericanLetterScoreSystem.title
   u'Letter Grade'
   >>> scoresystem.AmericanLetterScoreSystem.scores
-  [('A', Decimal("4"), Decimal("90")), ('B', Decimal("3"), Decimal("80")), 
-   ('C', Decimal("2"), Decimal("70")), ('D', Decimal("1"), Decimal("60")), 
-   ('F', Decimal("0"), Decimal("0"))]
+  [('A', u'', Decimal("4"), Decimal("90")),
+   ('B', u'', Decimal("3"), Decimal("80")), 
+   ('C', u'', Decimal("2"), Decimal("70")),
+   ('D', u'', Decimal("1"), Decimal("60")), 
+   ('F', u'', Decimal("0"), Decimal("0"))]
   >>> scoresystem.AmericanLetterScoreSystem.isValidScore('C')
   True
   >>> scoresystem.AmericanLetterScoreSystem.isValidScore('E')
@@ -357,7 +361,7 @@
   'ExtendedAmericanLetterScoreSystem'
   >>> scoresystem.ExtendedAmericanLetterScoreSystem.title
   u'Extended Letter Grade'
-  >>> [s for s, v, p in scoresystem.ExtendedAmericanLetterScoreSystem.scores]
+  >>> [s for s, a, v, p in scoresystem.ExtendedAmericanLetterScoreSystem.scores]
   ['A+', 'A', 'A-', 'B+', 'B', 'B-', 'C+', 'C', 'C-', 'D+', 'D', 'D-', 'F']
   >>> scoresystem.ExtendedAmericanLetterScoreSystem.isValidScore('B-')
   True

=== modified file 'src/schooltool/requirement/browser/README.txt'
--- src/schooltool/requirement/browser/README.txt	2009-07-08 20:23:33 +0000
+++ src/schooltool/requirement/browser/README.txt	2009-10-12 08:13:12 +0000
@@ -95,11 +95,11 @@
 
 We'll send the form values necessary to add a score system called 'Good/Bad'.
 
-    >>> url = update_url + '&title=Good/Bad&displayed1=G&value1=1&percent1=60'
-    >>> url = url + '&displayed2=B&value2=0&percent2=0'
+    >>> url = update_url + '&title=Good/Bad&displayed1=G&abbr1=&value1=1&percent1=60'
+    >>> url = url + '&displayed2=B&abbr2=&value2=0&percent2=0'
     >>> manager.open(url)
 
-Now we see the two score systems in the list.
+Now we see the new score system in the list.
 
     >>> analyze.printQuery("id('content-body')/form//a", manager.contents)
     <a href="http://localhost/scoresystems/view.html?name=extended-letter-grade">Extended Letter Grade</a>
@@ -124,9 +124,11 @@
     >>> manager.getLink('Good/Bad').click()
     >>> analyze.printQuery("id('content-body')/table//span", manager.contents)
     <span>G</span>
+    <span></span>
     <span>1</span>
     <span>60</span>
     <span>B</span>
+    <span></span>
     <span>0</span>
     <span>0</span>
 

=== modified file 'src/schooltool/requirement/browser/scoresystem.py'
--- src/schooltool/requirement/browser/scoresystem.py	2009-07-08 20:23:33 +0000
+++ src/schooltool/requirement/browser/scoresystem.py	2009-10-12 08:13:12 +0000
@@ -43,9 +43,11 @@
 NO_NEGATIVE_PERCENTS = _('All percentages must be non-negative.')
 NO_PERCENTS_OVER_100 = _('Percentages cannot be greater than 100.')
 MUST_HAVE_AT_LEAST_2_SCORES = _('A score system must have at least two scores.')
-VALUES_MUST_DESCEND =  _('Score values must go in descending order.')
-PERCENTS_MUST_DESCEND =  _('Score percentages must go in descending order.')
-LAST_PERCENT_NOT_ZERO =   _('The last percentage must be zero.')
+VALUES_MUST_DESCEND = _('Score values must go in descending order.')
+PERCENTS_MUST_DESCEND = _('Score percentages must go in descending order.')
+LAST_PERCENT_NOT_ZERO = _('The last percentage must be zero.')
+DUPLICATE_DISPLAYED = _('Duplicate scores are not allowed.')
+DUPLICATE_ABBREVIATION = _('Duplicate abbreviations are not allowed.')
 
 
 def escName(name):
@@ -104,17 +106,19 @@
     def scores(self):
         rownum = 1
         results = []
-        for displayed, value, percent in self.getRequestScores():
-            results.append(self.buildScoreRow(rownum, displayed, value, 
+        for displayed, abbr, value, percent in self.getRequestScores():
+            results.append(self.buildScoreRow(rownum, displayed, abbr, value, 
                 percent))
             rownum += 1
-        results.append(self.buildScoreRow(rownum, '', '', ''))
+        results.append(self.buildScoreRow(rownum, '', '', '', ''))
         return results
 
-    def buildScoreRow(self, rownum, displayed, value, percent):
+    def buildScoreRow(self, rownum, displayed, abbr, value, percent):
         return {
             'displayed_name': 'displayed' + unicode(rownum),
             'displayed_value': displayed,
+            'abbr_name': 'abbr' + unicode(rownum),
+            'abbr_value': abbr,
             'value_name': 'value' + unicode(rownum),
             'value_value': value,
             'percent_name': 'percent' + unicode(rownum),
@@ -127,6 +131,7 @@
         while True:
             rownum += 1
             displayed_name = 'displayed' + unicode(rownum)
+            abbr_name = 'abbr' + unicode(rownum)
             value_name = 'value' + unicode(rownum)
             percent_name = 'percent' + unicode(rownum)
             if displayed_name not in self.request:
@@ -134,6 +139,7 @@
             if not len(self.request[displayed_name]):
                 continue
             result = (self.request[displayed_name],
+                      self.request[abbr_name],
                       self.request[value_name],
                       self.request[percent_name])
             results.append(result)
@@ -145,7 +151,7 @@
             return self.setMessage(MISSING_TITLE)
 
         scores = []
-        for displayed, value, percent in self.getRequestScores():
+        for displayed, abbr, value, percent in self.getRequestScores():
             try:
                 decimal_value = Decimal(value)
             except:
@@ -160,7 +166,7 @@
                 return self.setMessage(NO_NEGATIVE_PERCENTS)
             if decimal_percent > 100:
                 return self.setMessage(NO_PERCENTS_OVER_100)
-            scores.append([displayed, decimal_value, decimal_percent])
+            scores.append([displayed, abbr, decimal_value, decimal_percent])
 
         self.validTitle = title
         self.validScores = scores
@@ -171,15 +177,25 @@
             return self.setMessage(MUST_HAVE_AT_LEAST_2_SCORES)
 
         last_value, last_percent = None, None
-        for displayed, value, percent in self.validScores:
+        disp_list, abbr_list = [], []
+        for displayed, abbr, value, percent in self.validScores:
             if last_value is not None:
                 if value >= last_value:
                     return self.setMessage(VALUES_MUST_DESCEND)
             if last_percent is not None:
                 if percent >= last_percent:
                     return self.setMessage(PERCENTS_MUST_DESCEND)
+            for d in disp_list:
+                if d.lower() == displayed.lower():
+                    return self.setMessage(DUPLICATE_DISPLAYED)
+            if abbr:
+                for a in abbr_list:
+                    if a.lower() == abbr.lower():
+                        return self.setMessage(DUPLICATE_ABBREVIATION)
             last_value = value
             last_percent = percent
+            disp_list.append(displayed)
+            abbr_list.append(abbr)
 
         if last_percent <> 0:
             return self.setMessage(LAST_PERCENT_NOT_ZERO)
@@ -208,12 +224,13 @@
 
     def scores(self):
         target = self.getScoreSystem()
-        return [self.buildScoreRow(displayed, value, percent)
-                for displayed, value, percent in target.scores]
+        return [self.buildScoreRow(displayed, abbr, value, percent)
+                for displayed, abbr, value, percent in target.scores]
 
-    def buildScoreRow(self, displayed, value, percent):
+    def buildScoreRow(self, displayed, abbr, value, percent):
         return {
             'displayed_value': displayed,
+            'abbr_value': abbr,
             'value_value': value,
             'percent_value': percent,
             }

=== modified file 'src/schooltool/requirement/browser/scoresystem_add.pt'
--- src/schooltool/requirement/browser/scoresystem_add.pt	2009-07-06 02:59:50 +0000
+++ src/schooltool/requirement/browser/scoresystem_add.pt	2009-10-12 08:13:12 +0000
@@ -33,6 +33,9 @@
       Each score is also associated with a minimum percentage necessary to achieve the corresponding grade. For example, 95% and above is an "A," 87% and up is a "B," etc.
 	</p>
 	<p>
+      Enter an abbreviation for a score only if the score has more than four characters and you wish to create an alternative abbreviation for the gradebook.
+	</p>
+	<p>
       Start with the highest score. Click "Add a lower score" to add scores until you have created a score with a minimum percentage of 0.
 	</p>
     <fieldset>
@@ -45,22 +48,27 @@
     <table class="schooltool_gradebook">
       <tr>
         <th class="cell header fully_padded">Score</th>
+        <th class="cell header fully_padded">Abbreviation</th>
         <th class="cell header fully_padded">Point Value</th>
-        <th class="cell header fully_padded">Minimum Percentage</th>
+        <th class="cell header fully_padded">Low Percentage</th>
       </tr>
 
       <tal:block repeat="score view/scores">
         <tr class="bordered">
           <td class="cell fully_padded">
-            <input type="text"
+            <input type="text" class="scoresystem_add_input"
                    tal:attributes="name score/displayed_name; value score/displayed_value" />
           </td>
           <td class="cell fully_padded">
-            <input type="text"
+            <input type="text" class="scoresystem_add_input"
+                   tal:attributes="name score/abbr_name; value score/abbr_value" />
+          </td>
+          <td class="cell fully_padded">
+            <input type="text" class="scoresystem_add_input"
                    tal:attributes="name score/value_name; value score/value_value" />
           </td>
           <td class="cell fully_padded">
-            <input type="text"
+            <input type="text" class="scoresystem_add_input"
                    tal:attributes="name score/percent_name; value score/percent_value" />
           </td>
         </tr>

=== modified file 'src/schooltool/requirement/browser/scoresystem_view.pt'
--- src/schooltool/requirement/browser/scoresystem_view.pt	2009-07-08 20:23:33 +0000
+++ src/schooltool/requirement/browser/scoresystem_view.pt	2009-10-12 08:13:12 +0000
@@ -16,6 +16,7 @@
   <table class="schooltool_gradebook">
     <tr>
       <th class="cell header fully_padded">Score Displayed</th>
+      <th class="cell header fully_padded">Abbreviation</th>
       <th class="cell header fully_padded">Score Value</th>
       <th class="cell header fully_padded">Low Percentage</th>
     </tr>
@@ -26,6 +27,9 @@
           <span tal:content="score/displayed_value" />
         </td>
         <td class="cell fully_padded">
+          <span tal:content="score/abbr_value" />
+        </td>
+        <td class="cell fully_padded">
           <span tal:content="score/value_value" />
         </td>
         <td class="cell fully_padded">

=== modified file 'src/schooltool/requirement/scoresystem.py'
--- src/schooltool/requirement/scoresystem.py	2009-06-29 07:43:38 +0000
+++ src/schooltool/requirement/scoresystem.py	2009-10-12 08:13:12 +0000
@@ -204,14 +204,14 @@
     def getFractionalValue(self, score):
         """See interfaces.IScoreSystem"""
         # get maximum and minimum score to determine the range
-        maximum = self.scores[0][1]
-        minimum = self.scores[-1][1]
+        maximum = self.scores[0][2]
+        minimum = self.scores[-1][2]
         # normalized numerical score
         value = self.getNumericalValue(score) - minimum
         return value / (maximum - minimum)
 
     def scoresDict(self):
-        scores = [(score, value) for score, value, percent in self.scores]
+        scores = [(score, value) for score, abbr, value, percent in self.scores]
         return dict(scores)
 
 class GlobalDiscreteValuesScoreSystem(DiscreteValuesScoreSystem):
@@ -227,36 +227,36 @@
 PassFail = GlobalDiscreteValuesScoreSystem(
     'PassFail',
     u'Pass/Fail', u'Pass or Fail score system.',
-    [(u'Pass', Decimal(1), Decimal(60)), 
-     (u'Fail', Decimal(0), Decimal(0))], 
+    [(u'Pass', u'', Decimal(1), Decimal(60)), 
+     (u'Fail', u'', Decimal(0), Decimal(0))], 
      u'Pass', u'Pass')
 
 AmericanLetterScoreSystem = GlobalDiscreteValuesScoreSystem(
     'AmericanLetterScoreSystem',
     u'Letter Grade', u'American Letter Grade',
-    [('A', Decimal(4), Decimal(90)), 
-     ('B', Decimal(3), Decimal(80)), 
-     ('C', Decimal(2), Decimal(70)),
-     ('D', Decimal(1), Decimal(60)), 
-     ('F', Decimal(0), Decimal(0))], 
+    [('A', u'', Decimal(4), Decimal(90)), 
+     ('B', u'', Decimal(3), Decimal(80)), 
+     ('C', u'', Decimal(2), Decimal(70)),
+     ('D', u'', Decimal(1), Decimal(60)), 
+     ('F', u'', Decimal(0), Decimal(0))], 
      'A', 'D')
 
 ExtendedAmericanLetterScoreSystem = GlobalDiscreteValuesScoreSystem(
     'ExtendedAmericanLetterScoreSystem',
     u'Extended Letter Grade', u'American Extended Letter Grade',
-    [('A+', Decimal('4.0'), Decimal(98)), 
-     ('A', Decimal('4.0'), Decimal(93)), 
-     ('A-', Decimal('3.7'), Decimal(90)),
-     ('B+', Decimal('3.3'), Decimal(88)), 
-     ('B', Decimal('3.0'), Decimal(83)), 
-     ('B-', Decimal('2.7'), Decimal(80)),
-     ('C+', Decimal('2.3'), Decimal(78)), 
-     ('C', Decimal('2.0'), Decimal(73)), 
-     ('C-', Decimal('1.7'), Decimal(70)),
-     ('D+', Decimal('1.3'), Decimal(68)), 
-     ('D', Decimal('1.0'), Decimal(63)), 
-     ('D-', Decimal('0.7'), Decimal(60)),
-     ('F',  Decimal('0.0'), Decimal(0))], 
+    [('A+', u'', Decimal('4.0'), Decimal(98)), 
+     ('A', u'', Decimal('4.0'), Decimal(93)), 
+     ('A-', u'', Decimal('3.7'), Decimal(90)),
+     ('B+', u'', Decimal('3.3'), Decimal(88)), 
+     ('B', u'', Decimal('3.0'), Decimal(83)), 
+     ('B-', u'', Decimal('2.7'), Decimal(80)),
+     ('C+', u'', Decimal('2.3'), Decimal(78)), 
+     ('C', u'', Decimal('2.0'), Decimal(73)), 
+     ('C-', u'', Decimal('1.7'), Decimal(70)),
+     ('D+', u'', Decimal('1.3'), Decimal(68)), 
+     ('D', u'', Decimal('1.0'), Decimal(63)), 
+     ('D-', u'', Decimal('0.7'), Decimal(60)),
+     ('F',  u'', Decimal('0.0'), Decimal(0))], 
      'A+', 'D-')