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

[Alan Elkner]

[Justas Sadzevičius (justas.sadzevicius)]

review: Approve

=== modified file 'src/schooltool/gradebook/browser/README.txt'
--- src/schooltool/gradebook/browser/README.txt	2009-05-08 01:30:55 +0000
+++ src/schooltool/gradebook/browser/README.txt	2009-06-01 21:32:36 +0000
@@ -7,8 +7,8 @@
 SchoolTool setup is the configuration of the categories. So let's log in as a
 manager:
 
-   >>> from schooltool.app.browser.ftests import setup
-   >>> manager = setup.logInManager()
+    >>> from schooltool.app.browser.ftests import setup
+    >>> manager = setup.logIn('manager', 'schooltool')
 
 
 Initial School Setup
@@ -557,6 +557,74 @@
     '62'
 
 
+Column Preferences
+------------------
+
+Teachers may want to hide or change the label of the summary columns or, in
+the case of the average column, they may want to choose a score system to
+be used in converting the average to a discrete value.  To support this, we
+provide the column preferences view.
+
+First we will add a custom score system which we will use as a column
+preference.
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Score Systems').click()
+    >>> manager.getLink('Add Score System').click()
+    >>> url = manager.url + '?form-submitted&SAVE&title=Good/Bad'
+    >>> url = url + '&displayed1=G&value1=1&percent1=60'
+    >>> url = url + '&displayed2=B&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()
+    >>> analyze.printQuery("id('content-body')/form/table//input", stephan.contents)
+    <input type="checkbox" name="hide_total" />
+    <input type="text" name="label_total" value="" />
+    <input type="checkbox" name="hide_average" />
+    <input type="text" name="label_average" value="" />
+
+    >>> analyze.printQuery("id('content-body')/form/table//option", stephan.contents)
+    <option selected="selected" value="">-- No score system --</option>
+    <option value="extended-letter-grade">Extended Letter Grade</option>
+    <option value="goodbad">Good/Bad</option>
+    <option value="letter-grade">Letter Grade</option>
+    <option value="passfail">Pass/Fail</option>
+
+Now we'll set all of the preferences to something and test that the changes
+were saved.
+
+    >>> url = stephan.url + '?form-submitted&UPDATE_SUBMIT'
+    >>> url += '&hide_total=on&label_total=Summe'
+    >>> url += '&hide_average=on&label_average=Durchschnitt'
+    >>> url += '&scoresystem_average=goodbad'
+    >>> stephan.open(url)
+
+    >>> stephan.getLink('Column 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" />
+    <input type="checkbox" checked="checked" name="hide_average" />
+    <input type="text" name="label_average" value="Durchschnitt" />
+
+    >>> analyze.printQuery("id('content-body')/form/table//option", stephan.contents)
+    <option value="">-- No score system --</option>
+    <option value="extended-letter-grade">Extended Letter Grade</option>
+    <option selected="selected" value="goodbad">Good/Bad</option>
+    <option value="letter-grade">Letter Grade</option>
+    <option value="passfail">Pass/Fail</option>
+
+Finally, we will reset the preferences to none so that the rest of the tests
+pass.
+
+    >>> url = stephan.url + '?form-submitted&UPDATE_SUBMIT'
+    >>> url += '&scoresystem_average='
+    >>> stephan.open(url)
+
+
 My Grades
 ---------
 
@@ -575,7 +643,7 @@
     True
     >>> 'HW 2' in claudia.contents or 'Final' in claudia.contents
     False
-    >>> claudia.contents.find('Current Grade: 86%') \
+    >>> claudia.contents.find('Ave.: 86%') \
     ...     < claudia.contents.find('HW 1') \
     ...     < claudia.contents.find('Quiz') \
     ...     < claudia.contents.find('86 / 100')
@@ -737,12 +805,12 @@
     >>> claudia.open('http://localhost/schoolyears/2007/winter/sections/1/mygrades')
     >>> print claudia.contents
     <BLANKLINE>
-    ... Current Grade: 86%...
+    ... Ave.: 86%...
     >>> tom = setup.logIn('tom', 'pwd')
     >>> tom.open('http://localhost/schoolyears/2007/winter/sections/1/mygrades')
     >>> print tom.contents
     <BLANKLINE>
-    ...Current Grade: 88%...
+    ...Ave.: 88%...
 
 Students should not be able to view a teacher's gradebook.
 

=== modified file 'src/schooltool/gradebook/browser/configure.zcml'
--- src/schooltool/gradebook/browser/configure.zcml	2009-05-08 01:30:55 +0000
+++ src/schooltool/gradebook/browser/configure.zcml	2009-06-08 01:43:13 +0000
@@ -352,6 +352,13 @@
       action="../weights.html"
       permission="schooltool.view"
       />
+  <menuItem
+      menu="schooltool_actions"
+      title="Column Preferences"
+      for="..interfaces.IGradebook"
+      action="column_preferences.html"
+      permission="schooltool.view"
+      />
 
   <!-- Special navagation viewlet for update linked activity grades action -->
   <navigationViewlet
@@ -420,9 +427,15 @@
       class=".gradebook.UpdateLinkedActivityGrades"
       permission="schooltool.edit"
       />
+  <page
+      name="column_preferences.html"
+      for="..interfaces.IGradebook"
+      class=".gradebook.GradebookColumnPreferences"
+      template="gradebook_column_preferences.pt"
+      permission="schooltool.view"
+      />
 
   <!-- Terms -->
-
   <zope:adapter
       for="schooltool.gradebook.interfaces.IExternalActivitiesSource
            zope.publisher.interfaces.browser.IBrowserRequest"
@@ -488,7 +501,7 @@
       permission="schooltool.edit"
       />
 
-  <!-- Views for IBasicPerson-->
+  <!-- Views for IBasicPerson -->
   <page
       name="print_report_card.html"
       for="schooltool.person.interfaces.IPerson"
@@ -513,6 +526,15 @@
       permission="schooltool.edit"
       />
 
+  <!-- Views for ISchoolToolApplication -->
+  <page
+      name="no_current_term.html"
+      for="schooltool.app.interfaces.ISchoolToolApplication"
+      class=".gradebook.NoCurrentTerm"
+      template="no_current_term.pt"
+      permission="schooltool.view"
+      />
+
   <zope:adapter
       factory=".report_card.ExistingScoresSystem" />
 

=== modified file 'src/schooltool/gradebook/browser/gradebook.css'
--- src/schooltool/gradebook/browser/gradebook.css	2009-05-08 01:30:55 +0000
+++ src/schooltool/gradebook/browser/gradebook.css	2009-06-01 21:32:36 +0000
@@ -148,3 +148,7 @@
     border: solid 1px black;
 }
 
+.bold {
+    font-weight: bold;
+}
+

=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2009-05-11 13:16:00 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2009-06-08 01:43:13 +0000
@@ -20,38 +20,71 @@
 Gradebook Views
 """
 
-from schooltool.course.interfaces import ILearner
-from schooltool.course.interfaces import IInstructor
 __docformat__ = 'reStructuredText'
-import zope.schema
+
+import datetime
+import decimal
+
+from zope.app.keyreference.interfaces import IKeyReference
+from zope.component import queryUtility
+from zope.publisher.browser import BrowserView
+from zope.schema import ValidationError
+from zope.schema.interfaces import IVocabularyFactory
 from zope.security import proxy
+from zope.traversing.api import getName
 from zope.traversing.browser.absoluteurl import absoluteURL
-from zope.app.keyreference.interfaces import IKeyReference
 from zope.viewlet import viewlet
-from zope.traversing.api import getName
-from zope.publisher.browser import BrowserView
 
 from schooltool.app import app
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.course.interfaces import ISection
+from schooltool.course.interfaces import ILearner, IInstructor
 from schooltool.gradebook import interfaces
 from schooltool.gradebook.activity import ensureAtLeastOneWorksheet
 from schooltool.person.interfaces import IPerson
 from schooltool.requirement.scoresystem import UNSCORED
-from schooltool.common import SchoolToolMessage as _
 from schooltool.requirement.interfaces import IValuesScoreSystem
 from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
 from schooltool.requirement.interfaces import IRangedValuesScoreSystem
 from schooltool.term.interfaces import ITerm
 
-import datetime
-import decimal
+from schooltool.common import SchoolToolMessage as _
+
 
 GradebookCSSViewlet = viewlet.CSSViewlet("gradebook.css")
 
 DISCRETE_SCORE_SYSTEM = 'd'
 RANGED_SCORE_SYSTEM = 'r'
 
+column_keys = [('total', _("Total")), ('average', _("Ave."))]
+
+
+def escName(name):
+    """converts title-based scoresystem name to querystring format"""
+    chars = [c for c in name.lower() if c.isalnum() or c == ' ']
+    return u''.join(chars).replace(' ', '-')
+
+
+def getScoreSystemFromEscName(name):
+    """converts escaped scoresystem title to scoresystem"""
+    factory = queryUtility(IVocabularyFactory, 
+                           'schooltool.requirement.discretescoresystems')
+    vocab = factory(None)
+    for term in vocab:
+        if name == escName(term.token):
+            return term.value
+    return None
+
+
+def convertAverage(average, scoresystem):
+    """converts average to display value of the given scoresystem"""
+    if scoresystem is None:
+        return '%s%%' % average
+    for score in scoresystem.scores:
+        if average >= score[2]:
+            return score[0]
+    raise ValueError
+
 
 class GradebookStartup(object):
     """A view for entry into into the gradebook or mygrades views."""
@@ -241,6 +274,37 @@
                     return True
         return False
 
+    def processColumnPreferences(self):
+        gradebook = proxy.removeSecurityProxy(self.context)
+        if self.isTeacher:
+            person = self.person
+        else:
+            section = ISection(gradebook)
+            instructors = list(section.instructors)
+            if len(instructors) == 0:
+                return {}
+            person = instructors[0]
+        columnPreferences = gradebook.getColumnPreferences(person)
+        column_keys_dict = dict(column_keys)
+        prefs = columnPreferences.get('total', {})
+        self.total_hide = prefs.get('hide', False)
+        self.total_label = prefs.get('label', '')
+        if len(self.total_label) == 0:
+            self.total_label = column_keys_dict['total']
+        prefs = columnPreferences.get('average', {})
+        self.average_hide = prefs.get('hide', False)
+        self.average_label = prefs.get('label', '')
+        if len(self.average_label) == 0:
+            self.average_label = column_keys_dict['average']
+        self.average_scoresystem = getScoreSystemFromEscName(
+            prefs.get('scoresystem', ''))
+        self.apply_all_colspan = 1
+        if not self.total_hide:
+            self.apply_all_colspan += 1
+        if not self.average_hide:
+            self.apply_all_colspan += 1
+
+
 class GradebookOverview(SectionFinder):
     """Gradebook Overview/Table"""
 
@@ -255,6 +319,9 @@
         worksheet = gradebook.context
         gradebook.setCurrentWorksheet(self.person, worksheet)
 
+        """Retrieve column preferences."""
+        self.processColumnPreferences()
+
         """Retrieve sorting information and store changes of it."""
         if 'sort_by' in self.request:
             sort_by = self.request['sort_by']
@@ -297,7 +364,7 @@
                     try:
                         score = activity.scoresystem.fromUnicode(
                             self.request[cell_name])
-                    except (zope.schema.ValidationError, ValueError):
+                    except (ValidationError, ValueError):
                         self.message = _(
                             'The grade $value for activity $name is not valid.',
                             mapping={'value': self.request[cell_name],
@@ -387,6 +454,8 @@
             total, average = gradebook.getWorksheetTotalAverage(worksheet,
                 student)
 
+            average = convertAverage(average, self.average_scoresystem)
+
             rows.append(
                 {'student': {'title': student.title, 
                              'id': student.username,
@@ -518,7 +587,7 @@
                     try:
                         score = activity.scoresystem.fromUnicode(
                             self.request[id])
-                    except (zope.schema.ValidationError, ValueError):
+                    except (ValidationError, ValueError):
                         self.message = _(
                             'The grade $value for $name is not valid.',
                             mapping={'value': self.request[id],
@@ -579,6 +648,9 @@
         if self.handleSectionChange():
             return
 
+        """Retrieve column preferences."""
+        self.processColumnPreferences()
+
         self.table = []
         total = 0
         count = 0
@@ -602,8 +674,10 @@
 
             self.table.append({'activity': activity.title,
                                'grade': grade})
+
         if count:
-            self.average = int((float(100 * total) / float(count)) + 0.5)
+            average = int((float(100 * total) / float(count)) + 0.5)
+            self.average = convertAverage(average, self.average_scoresystem)
         else:
             self.average = None
 
@@ -638,3 +712,80 @@
         next_url = absoluteURL(self.context.__parent__, self.request) + \
                    '/gradebook'
         self.request.response.redirect(next_url)
+
+
+class GradebookColumnPreferences(BrowserView):
+    """A view for editing a teacher's gradebook column preferences."""
+
+    def update(self):
+        self.person = IPerson(self.request.principal)
+        gradebook = proxy.removeSecurityProxy(self.context)
+
+        if 'UPDATE_SUBMIT' in self.request:
+            columnPreferences = gradebook.getColumnPreferences(self.person)
+            for key, name in column_keys:
+                prefs = columnPreferences.setdefault(key, {})
+                if 'hide_' + key in self.request:
+                    prefs['hide'] = True
+                else:
+                    prefs['hide'] = False
+                if 'label_' + key in self.request:
+                    prefs['label'] = self.request['label_' + key]
+                else:
+                    prefs['label'] = ''
+                if key != 'total':
+                    prefs['scoresystem'] = self.request['scoresystem_' + key]
+            gradebook.setColumnPreferences(self.person, columnPreferences)
+
+        if 'CANCEL' in self.request or 'UPDATE_SUBMIT' in self.request:
+            self.request.response.redirect('index.html')
+
+    @property
+    def columns(self):
+        self.person = IPerson(self.request.principal)
+        gradebook = proxy.removeSecurityProxy(self.context)
+        results = []
+        columnPreferences = gradebook.getColumnPreferences(self.person)
+        for key, name in column_keys:
+            prefs = columnPreferences.get(key, {})
+            hide = prefs.get('hide', False)
+            label = prefs.get('label', '')
+            scoresystem = prefs.get('scoresystem', '')
+            result = {
+                'name': name,
+                'hide_name': 'hide_' + key,
+                'hide_value': hide,
+                'label_name': 'label_' + key,
+                'label_value': label,
+                'scoresystem_name': 'scoresystem_' + key,
+                'scoresystem_value': scoresystem,
+                }
+            results.append(result)
+        return results
+
+    @property
+    def scoresystems(self):
+        factory = queryUtility(IVocabularyFactory, 
+                               'schooltool.requirement.discretescoresystems')
+        vocab = factory(None)
+        result = {
+            'name': _('-- No score system --'),
+            'value': '',
+            }
+        results = [result]
+        for term in vocab:
+            result = {
+                'name': term.token,
+                'value': escName(term.token),
+                }
+            results.append(result)
+        return results
+
+
+class NoCurrentTerm(BrowserView):
+    """A view for informing the user of the need to set up a schoolyear
+       and at least one term."""
+
+    def update(self):
+        pass
+

=== added file 'src/schooltool/gradebook/browser/gradebook_column_preferences.pt'
--- src/schooltool/gradebook/browser/gradebook_column_preferences.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/gradebook_column_preferences.pt	2009-05-14 10:35:19 +0000
@@ -0,0 +1,67 @@
+<tal:define define="dummy view/update"/>
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">Set Column Preferences</title>
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header"
+    i18n:translate="">Set Column Preferences</h1>
+
+<metal:block metal:fill-slot="body">
+  <form method="post"
+        tal:attributes="action string:${context/@@absolute_url}/column_preferences.html">
+    <input type="hidden" name="form-submitted" value="" />
+
+    <table class="schooltool_gradebook">
+      <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>
+      </tr>
+
+      <tal:block repeat="column view/columns">
+        <tr class="bordered">
+          <td class="cell fully_padded">
+            <div tal:content="column/name" />
+          </td>
+          <td class="cell fully_padded">
+            <input type="checkbox"
+                   tal:attributes="name column/hide_name; checked column/hide_value" />
+          </td>
+          <td class="cell fully_padded">
+            <input type="text"
+                   tal:attributes="name column/label_name; value column/label_value" />
+          </td>
+          <td class="cell fully_padded">
+            <tal:block condition="python: column['hide_name'] != 'hide_total'">
+              <select tal:attributes="id column/scoresystem_name; name column/scoresystem_name">
+                <tal:block repeat="scoresystem view/scoresystems">
+                  <option tal:condition="python: scoresystem['value'] == column['scoresystem_value']"
+                          selected
+                          tal:attributes="value scoresystem/value"
+                          tal:content="scoresystem/name" />
+                  <option tal:condition="python: scoresystem['value'] != column['scoresystem_value']"
+                          tal:attributes="value scoresystem/value"
+                          tal:content="scoresystem/name" />
+                </tal:block>
+              </select>
+            </tal:block>
+          </td>
+        </tr>
+      </tal:block>
+
+    </table>
+    <div style="height: 11px;"></div>
+
+    <div class="controls">
+      <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Update" />
+      <input type="submit" class="button-cancel" name="CANCEL" value="Cancel" />
+    </div>
+  </form>
+
+</metal:block>
+</body>
+</html>
+

=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.js.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-04-17 04:22:56 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-04-30 19:20:05 +0000
@@ -160,7 +160,6 @@
 	}
     if (keynum < 48 || (keynum > 57 && keynum < 65) || (keynum > 90 && keynum < 97) || keynum > 122)
 	{
-	    document.getElementById(name).select();
 	    return true;
 	}
 

=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.pt	2009-04-29 00:39:08 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.pt	2009-05-15 06:01:23 +0000
@@ -114,7 +114,7 @@
   <table class="schooltool_gradebook">
     <tr tal:condition="python:len(view.descriptions) > 0">
       <td id="description" class="description"
-          tal:attributes="colspan python:len(view.descriptions) + 3" />
+          tal:attributes="colspan python:len(view.descriptions) + view.apply_all_colspan" />
     </tr>
 
     <tr>
@@ -122,11 +122,11 @@
        <div i18n:translate="">Name</div>
        <a href="?sort_by=student" i18n:translate="">(sort)</a>
      </th>
-     <th class="cell header">
-       <div i18n:translate="">Total</div>
+     <th tal:condition="not: view/total_hide" class="cell padded header">
+       <div tal:content="view/total_label" />
      </th>
-     <th class="cell header">
-       <div i18n:translate="">Ave.</div>
+     <th tal:condition="not: view/average_hide" class="cell padded header">
+       <div tal:content="view/average_label" />
        <a tal:condition="nothing" href="?sort_by=average" i18n:translate="">(sort)</a>
      </th>
      <th class="cell title header" tal:repeat="activity view/activities">
@@ -152,7 +152,8 @@
     </tr>
 
     <tr>
-      <td colspan="3" class="cell padded fd_cell empty" i18n:translate="">Apply a grade for all students:</td>
+      <td tal:attributes="colspan view/apply_all_colspan"
+          class="cell padded fd_cell empty" i18n:translate="">Apply a grade for all students:</td>
       <td class="cell padded fd_cell" tal:repeat="activity view/activities"
           tal:attributes="id string:fd_${activity/hash}_cell">
         <input type="text" size="4" class="data fd"
@@ -178,14 +179,14 @@
             Tom Hoffman
           </a>
         </td>
-        <td class="cell padded even">
+        <td tal:condition="not: view/total_hide" class="cell padded even">
 	      <tal:if condition="row/total|nothing">
 	        <b><span tal:replace="row/total" /></b>
 	      </tal:if>
         </td>
-        <td class="cell padded even">
+        <td tal:condition="not: view/average_hide" class="cell padded even">
 	      <tal:if condition="row/average|nothing">
-	        <b><span tal:replace="row/average" />%</b>
+	        <b><span tal:replace="row/average" /></b>
 	      </tal:if>
         </td>
         <td class="cell even" tal:repeat="grade row/grades"
@@ -207,14 +208,14 @@
             Tom Hoffman
           </a>
         </td>
-        <td class="cell padded odd">
+        <td tal:condition="not: view/total_hide" class="cell padded odd">
 	      <tal:if condition="row/total|nothing">
 	        <b><span tal:replace="row/total" /></b>
 	      </tal:if>
         </td>
-        <td class="cell padded odd">
+        <td tal:condition="not: view/average_hide" class="cell padded odd">
 	      <tal:if condition="row/average|nothing">
-	        <b><span tal:replace="row/average" />%</b>
+	        <b><span tal:replace="row/average" /></b>
 	      </tal:if>
         </td>
         <td class="cell odd" tal:repeat="grade row/grades"

=== modified file 'src/schooltool/gradebook/browser/mygrades.pt'
--- src/schooltool/gradebook/browser/mygrades.pt	2009-04-29 00:39:08 +0000
+++ src/schooltool/gradebook/browser/mygrades.pt	2009-05-15 06:01:23 +0000
@@ -72,10 +72,10 @@
   </table>
 
   <table class="schooltool_gradebook">
-    <tr>
+    <tr tal:condition="not: view/average_hide">
       <td colspan="2" class="description">
         <div tal:condition="view/average"
-             tal:content="string: Current Grade: ${view/average}%">Average</div>
+             tal:content="string: ${view/average_label}: ${view/average}">Average</div>
         <div tal:condition="not: view/average">Nothing Graded</div>
       </td>
     </tr>

=== added file 'src/schooltool/gradebook/browser/no_current_term.pt'
--- src/schooltool/gradebook/browser/no_current_term.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/no_current_term.pt	2009-06-08 01:43:13 +0000
@@ -0,0 +1,16 @@
+<tal:tag condition="view/update" />
+<html metal:use-macro="context/@@standard_macros/page"
+      i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">
+    No Current Term
+  </title>
+</head>
+<body>
+<div metal:fill-slot="body">
+  <h1>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>
+</body>
+</html>

=== added file 'src/schooltool/gradebook/browser/no_current_term.txt'
--- src/schooltool/gradebook/browser/no_current_term.txt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/no_current_term.txt	2009-06-08 01:43:13 +0000
@@ -0,0 +1,25 @@
+===============
+No Current Term
+===============
+
+If a schooltool operation relies on there being at least one term set up, and
+the administator has not gotten around to doing that, we need to fail
+gracefully.  That means giving the user an error message rather than crashing.
+
+Let's log in as manager and create a student.
+
+    >>> from schooltool.app.browser.ftests import setup
+    >>> manager = Browser('manager', 'schooltool')
+    >>> setup.addPerson('Student One', 'student1', 'pwd')
+
+We'll navigate to the student and request a report card, an operation that is
+impossible without there being at least one term set up.  We'll test that the
+user gets redirected to the error page.
+
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Persons').click()
+    >>> manager.getLink('Student One').click()
+    >>> manager.getLink('Print 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-05-11 13:08:19 +0000
+++ src/schooltool/gradebook/browser/pdf_views.py	2009-06-08 01:43:13 +0000
@@ -35,6 +35,7 @@
 from zope.component import getUtility, queryAdapter
 from zope.i18n import translate
 from zope.publisher.browser import BrowserView
+from zope.traversing.browser.absoluteurl import absoluteURL
 
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.app.browser import pdfcal
@@ -256,6 +257,13 @@
 
     def __call__(self):
         """Return the PDF of a report card for each student."""
+        current_term = getUtility(IDateManager).current_term
+        if current_term is None:
+            next_url = absoluteURL(ISchoolToolApplication(None), self.request)
+            next_url += '/no_current_term.html'
+            self.request.response.redirect(next_url)
+            return
+
         if self.pdf_support_disabled:
             return translate(self.pdf_disabled_text, context=self.request)
 

=== modified file 'src/schooltool/gradebook/configure.zcml'
--- src/schooltool/gradebook/configure.zcml	2009-04-17 13:26:14 +0000
+++ src/schooltool/gradebook/configure.zcml	2009-06-05 00:11:04 +0000
@@ -284,4 +284,11 @@
   <adapter factory=".gradebook_init.GradebookAppStartup"
            name="gradebook_startup_init" />
 
+  <!-- generations -->
+  <utility
+      name="schooltool.gradebook"
+      provides="zope.app.generations.interfaces.ISchemaManager"
+      component=".generations.schemaManager"
+      />
+
 </configure>

=== added directory 'src/schooltool/gradebook/generations'
=== added file 'src/schooltool/gradebook/generations/__init__.py'
--- src/schooltool/gradebook/generations/__init__.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/__init__.py	2009-06-05 00:11:04 +0000
@@ -0,0 +1,28 @@
+#
+# 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
+#
+"""
+Generations for database version upgrades.
+"""
+
+from zope.app.generations.generations import SchemaManager
+
+schemaManager = SchemaManager(
+    minimum_generation=1,
+    generation=1,
+    package_name='schooltool.gradebook.generations')

=== added file 'src/schooltool/gradebook/generations/evolve1.py'
--- src/schooltool/gradebook/generations/evolve1.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/evolve1.py	2009-06-05 00:11:04 +0000
@@ -0,0 +1,89 @@
+#
+# 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 schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.course.interfaces import ISectionContainer
+from schooltool.gradebook.interfaces import IActivities, IGradebookRoot
+from schooltool.person.interfaces import IPersonContainer
+from schooltool.schoolyear.interfaces import ISchoolYearContainer
+from schooltool.requirement.interfaces import IScoreSystemsProxy
+from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
+from schooltool.requirement.interfaces import IEvaluations
+from schooltool.requirement.scoresystem import CustomScoreSystem, PassFail
+from schooltool.requirement.scoresystem import AmericanLetterScoreSystem
+from schooltool.requirement.scoresystem import ExtendedAmericanLetterScoreSystem
+
+
+def updateEvaluations(app, ss, custom_ss):
+    """Update all evaluations using the hard-coded score system to use the 
+       newly created custom score system"""
+
+    for person in app['persons'].values():
+        evaluations = IEvaluations(person)
+        for evaluation in evaluations.values():
+            if evaluation.scoreSystem == ss:
+                evaluation.scoreSystem = custom_ss
+                person._p_changed = True
+
+
+def updateObjActivities(obj, activities, ss, custom_ss):
+    """Update the obj activities using the hard-coded score system to use the 
+       newly created custom score system"""
+
+    for worksheet in activities.values():
+        for activity in worksheet.values():
+            if activity.scoresystem == ss:
+                activity.scoresystem = custom_ss
+                obj._p_changed = True
+
+
+def updateAllActivities(app, ss, custom_ss):
+    """Update all activities using the hard-coded score system to use the 
+       newly created custom score system"""
+
+    for sections in app['schooltool.course.section'].values():
+        for section in sections.values():
+            updateObjActivities(section, IActivities(section), ss, custom_ss)
+
+    root = IGradebookRoot(app)
+    updateObjActivities(root, root.templates, ss, custom_ss)
+    updateObjActivities(root, root.deployed, ss, custom_ss)
+
+
+def evolve(context):
+    """Migrates hard-coded discrete values score systems found in
+       schooltool.requirement.scoresystem to the app site manager"""
+
+    app = getRootFolder(context)
+    ssProxy = IScoreSystemsProxy(app)
+    for ss in [PassFail, AmericanLetterScoreSystem, 
+               ExtendedAmericanLetterScoreSystem]:
+        custom_ss = CustomScoreSystem(ss.title, ss.description, ss.scores,
+            ss._bestScore, ss._minPassingScore)
+        ssProxy.addScoreSystem(custom_ss)
+        updateEvaluations(app, ss, custom_ss)
+        updateAllActivities(app, ss, custom_ss)
+

=== added file 'src/schooltool/gradebook/generations/install.py'
--- src/schooltool/gradebook/generations/install.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/install.py	2009-06-05 00:11:04 +0000
@@ -0,0 +1,31 @@
+#
+# 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
+#
+"""
+Initial deployment of generations to schooltool.gradebook.
+
+Manually evolves to generation 1.  Done to avoid double deployment when
+introducing generations.
+"""
+
+import evolve1
+
+
+def evolve(context):
+    evolve1.evolve(context)
+

=== added directory 'src/schooltool/gradebook/generations/tests'
=== added file 'src/schooltool/gradebook/generations/tests/__init__.py'
--- src/schooltool/gradebook/generations/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/tests/__init__.py	2009-06-05 00:11:04 +0000
@@ -0,0 +1,72 @@
+"""
+Tests for generation scripts.
+"""
+
+from persistent.interfaces import IPersistent
+
+from zope.app.keyreference.interfaces import IKeyReference
+from zope.app.publication.zopepublication import ZopePublication
+from zope.app.testing.setup import setUpAnnotations
+from zope.component import provideAdapter
+from zope.interface import implements
+
+from schooltool.app.app import SchoolToolApplication
+from schooltool.app.interfaces import ISchoolToolApplication
+from schooltool.course.interfaces import ISection
+from schooltool.gradebook.activity import getSectionActivities
+from schooltool.gradebook.interfaces import IGradebookRoot, IActivities
+from schooltool.gradebook.gradebook_init import getGradebookRoot
+from schooltool.requirement.evaluation import getEvaluations
+from schooltool.requirement.interfaces import IEvaluations
+from schooltool.requirement.interfaces import IHaveEvaluations
+from schooltool.requirement.scoresystem import ScoreSystemsProxy
+
+
+class ContextStub(object):
+    """Stub for the context argument passed to evolve scripts.
+
+        >>> from zope.app.zopeappgenerations import getRootFolder
+        >>> context = ContextStub()
+        >>> getRootFolder(context) is context.root_folder
+        True
+    """
+
+    class ConnectionStub(object):
+        def __init__(self, root_folder):
+            self.root_folder = root_folder
+        def root(self):
+            return {ZopePublication.root_name: self.root_folder}
+
+    def __init__(self):
+        self.root_folder = SchoolToolApplication()
+        self.connection = self.ConnectionStub(self.root_folder)
+
+
+_d = {}
+
+class StupidKeyReference(object):
+    implements(IKeyReference)
+    key_type_id = 'StupidKeyReference'
+    def __init__(self, ob):
+        global _d
+        self.id = id(ob)
+        _d[self.id] = ob
+    def __call__(self):
+        return _d[self.id]
+    def __hash__(self):
+        return self.id
+    def __cmp__(self, other):
+        return cmp(hash(self), hash(other))
+
+
+def provideAdapters():
+    setUpAnnotations()
+    provideAdapter(StupidKeyReference, [IPersistent], IKeyReference)
+    provideAdapter(ScoreSystemsProxy)
+    provideAdapter(getGradebookRoot, adapts=(ISchoolToolApplication,), 
+                                     provides=IGradebookRoot)
+    provideAdapter(getSectionActivities, adapts=(ISection,), 
+                                         provides=IActivities)
+    provideAdapter(getEvaluations, adapts=(IHaveEvaluations,), 
+                                   provides=IEvaluations)
+

=== added file 'src/schooltool/gradebook/generations/tests/test_evolve1.py'
--- src/schooltool/gradebook/generations/tests/test_evolve1.py	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/generations/tests/test_evolve1.py	2009-06-05 00:11:04 +0000
@@ -0,0 +1,140 @@
+# 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.evolve1
+"""
+
+import unittest
+
+from zope.app.zopeappgenerations import getRootFolder
+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.evolve1 import evolve
+from schooltool.requirement.interfaces import IHaveEvaluations
+
+
+def doctest_evolve1():
+    """Evolution to generation 1.
+
+    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.person.person import PersonContainer, Person
+        >>> app['persons'] = PersonContainer()
+        >>> student = Person('student')
+        >>> app['persons']['student'] = student
+
+        >>> from schooltool.course.section import SectionContainerContainer
+        >>> from schooltool.course.section import SectionContainer, Section
+        >>> app['schooltool.course.section'] = SectionContainerContainer()
+        >>> app['schooltool.course.section']['1'] = SectionContainer()
+        >>> section = Section('section')
+        >>> app['schooltool.course.section']['1']['1'] = section
+
+        >>> from schooltool.gradebook.gradebook_init import setUpGradebookRoot
+        >>> from schooltool.gradebook.interfaces import IGradebookRoot
+        >>> setUpGradebookRoot(app)
+        >>> root = IGradebookRoot(app)
+
+        >>> from schooltool.requirement.scoresystem import PassFail
+        >>> from schooltool.requirement.scoresystem import AmericanLetterScoreSystem
+        >>> from schooltool.gradebook.activity import ReportWorksheet
+        >>> from schooltool.gradebook.activity import ReportActivity
+        >>> root.templates['1'] = temp_ws = ReportWorksheet('1')
+        >>> temp_ws['1'] = temp_act = ReportActivity('1', None, PassFail)
+        >>> root.deployed['1'] = dep_ws = ReportWorksheet('1')
+        >>> dep_ws['1'] = dep_act = ReportActivity('1', None, AmericanLetterScoreSystem)
+
+        >>> from schooltool.gradebook.interfaces import IActivities
+        >>> activities = IActivities(section)
+
+        >>> from schooltool.requirement.scoresystem import ExtendedAmericanLetterScoreSystem
+        >>> from schooltool.gradebook.activity import Worksheet, Activity
+        >>> activities['1'] = worksheet = Worksheet('1')
+        >>> worksheet['1'] = activity = Activity('1', None, ExtendedAmericanLetterScoreSystem)
+
+        >>> from schooltool.requirement.interfaces import IHaveEvaluations
+        >>> from schooltool.requirement.interfaces import IEvaluations
+        >>> from zope.interface import alsoProvides
+        >>> alsoProvides(student, IHaveEvaluations)
+        >>> evaluations = IEvaluations(student)
+
+        >>> from schooltool.requirement.evaluation import Evaluation
+        >>> ev = Evaluation(activity, ExtendedAmericanLetterScoreSystem, 'A+', None)
+        >>> evaluations.addEvaluation(ev)
+
+    Finally, we'll run the evolve script, testing the effected values before and
+    after:
+
+        >>> from schooltool.requirement.interfaces import IScoreSystemsProxy
+        >>> proxy = IScoreSystemsProxy(app)
+        >>> proxy.getScoreSystems()
+        []
+
+        >>> temp_act.scoresystem
+        <GlobalDiscreteValuesScoreSystem u'Pass/Fail'>
+        >>> dep_act.scoresystem
+        <GlobalDiscreteValuesScoreSystem u'Letter Grade'>
+        >>> activity.scoresystem
+        <GlobalDiscreteValuesScoreSystem u'Extended Letter Grade'>
+        >>> ev.scoreSystem
+        <GlobalDiscreteValuesScoreSystem u'Extended Letter Grade'>
+
+        >>> evolve(context)
+
+        >>> proxy.getScoreSystems()
+        [(u'Extended Letter Grade', <CustomScoreSystem u'Extended Letter Grade'>),
+         (u'Letter Grade', <CustomScoreSystem u'Letter Grade'>),
+         (u'Pass/Fail', <CustomScoreSystem u'Pass/Fail'>)]
+
+        >>> temp_act.scoresystem
+        <CustomScoreSystem u'Pass/Fail'>
+        >>> dep_act.scoresystem
+        <CustomScoreSystem u'Letter Grade'>
+        >>> activity.scoresystem
+        <CustomScoreSystem u'Extended Letter Grade'>
+        >>> ev.scoreSystem
+        <CustomScoreSystem u'Extended Letter Grade'>
+    """
+
+
+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-05-08 22:20:00 +0000
+++ src/schooltool/gradebook/gradebook.py	2009-06-01 21:32:36 +0000
@@ -23,7 +23,7 @@
 from zope.component import adapts, queryMultiAdapter
 from schooltool.app.interfaces import ISchoolToolApplication
 __docformat__ = 'reStructuredText'
-import persistent.dict
+from persistent.dict import PersistentDict
 
 from decimal import Decimal
 
@@ -53,6 +53,7 @@
 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):
@@ -235,7 +236,7 @@
         person = proxy.removeSecurityProxy(person)
         ann = annotation.interfaces.IAnnotations(person)
         if CURRENT_WORKSHEET_KEY not in ann:
-            ann[CURRENT_WORKSHEET_KEY] = persistent.dict.PersistentDict()
+            ann[CURRENT_WORKSHEET_KEY] = PersistentDict()
         if self.worksheets:
             default = self.worksheets[0]
         else:
@@ -248,7 +249,7 @@
         worksheet = proxy.removeSecurityProxy(worksheet)
         ann = annotation.interfaces.IAnnotations(person)
         if CURRENT_WORKSHEET_KEY not in ann:
-            ann[CURRENT_WORKSHEET_KEY] = persistent.dict.PersistentDict()
+            ann[CURRENT_WORKSHEET_KEY] = PersistentDict()
         section_id = hash(IKeyReference(self.section))
         ann[CURRENT_WORKSHEET_KEY][section_id] = worksheet
 
@@ -264,6 +265,18 @@
         ann = annotation.interfaces.IAnnotations(person)
         ann[DUE_DATE_FILTER_KEY] = (flag, weeks)
 
+    def getColumnPreferences(self, person):
+        person = proxy.removeSecurityProxy(person)
+        ann = annotation.interfaces.IAnnotations(person)
+        if COLUMN_PREFERENCES_KEY not in ann:
+            return PersistentDict()
+        return ann[COLUMN_PREFERENCES_KEY]
+
+    def setColumnPreferences(self, person, columnPreferences):
+        person = proxy.removeSecurityProxy(person)
+        ann = annotation.interfaces.IAnnotations(person)
+        ann[COLUMN_PREFERENCES_KEY] = PersistentDict(columnPreferences)
+
     def getCurrentActivities(self, person):
         worksheet = self.getCurrentWorksheet(person)
         return self.getWorksheetActivities(worksheet)
@@ -297,7 +310,7 @@
         person = proxy.removeSecurityProxy(person)
         ann = annotation.interfaces.IAnnotations(person)
         if GRADEBOOK_SORTING_KEY not in ann:
-            ann[GRADEBOOK_SORTING_KEY] = persistent.dict.PersistentDict()
+            ann[GRADEBOOK_SORTING_KEY] = PersistentDict()
         section_id = hash(IKeyReference(self.section))
         return ann[GRADEBOOK_SORTING_KEY].get(section_id, ('student', False))
 
@@ -305,7 +318,7 @@
         person = proxy.removeSecurityProxy(person)
         ann = annotation.interfaces.IAnnotations(person)
         if GRADEBOOK_SORTING_KEY not in ann:
-            ann[GRADEBOOK_SORTING_KEY] = persistent.dict.PersistentDict()
+            ann[GRADEBOOK_SORTING_KEY] = PersistentDict()
         section_id = hash(IKeyReference(self.section))
         ann[GRADEBOOK_SORTING_KEY][section_id] = value
 

=== modified file 'src/schooltool/gradebook/interfaces.py'
--- src/schooltool/gradebook/interfaces.py	2009-05-08 01:30:55 +0000
+++ src/schooltool/gradebook/interfaces.py	2009-06-01 21:32:36 +0000
@@ -236,6 +236,12 @@
     def setDueDateFilter(person, flag, weeks):
         """Set the user's current due date filter setting."""
 
+    def getColumnPreferences(person):
+        """Get the user's column preferences."""
+
+    def setColumnPreferences(columnPreferences):
+        """Set the user's column preferences."""
+
     def getCurrentActivities(person):
         """Get the activities for the user's currently active worksheet."""
 

=== modified file 'src/schooltool/requirement/README.txt'
--- src/schooltool/requirement/README.txt	2008-09-25 03:01:46 +0000
+++ src/schooltool/requirement/README.txt	2009-05-14 08:34:27 +0000
@@ -179,7 +179,8 @@
   >>> from decimal import Decimal
   >>> check = scoresystem.DiscreteValuesScoreSystem(
   ...    u'Check', u'Check-mark score system',
-  ...    [('+', Decimal(1)), ('v', Decimal(0)), ('-', Decimal(-1))])
+  ...    [('+', 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
@@ -247,9 +248,9 @@
   >>> from schooltool.requirement import scoresystem
   >>> check = scoresystem.DiscreteValuesScoreSystem(
   ...    u'Check', u'Check-mark score system',
-  ...    [('+', Decimal(1)),
-  ...     ('v', Decimal(0)),
-  ...     ('-', Decimal(-1))],
+  ...    [('+', Decimal(1), Decimal(80)),
+  ...     ('v', Decimal(0), Decimal(60)),
+  ...     ('-', Decimal(-1), Decimal(0))],
   ...     minPassingScore='v')
   >>> check
   <DiscreteValuesScoreSystem u'Check'>
@@ -279,7 +280,8 @@
   >>> from schooltool.requirement import scoresystem
   >>> check = scoresystem.DiscreteValuesScoreSystem(
   ...    u'Check', u'Check-mark score system',
-  ...    [('+', Decimal(1)), ('v', Decimal(0)), ('-', Decimal(-1))],
+  ...    [('+', Decimal(1), Decimal(80)), ('v', Decimal(0), Decimal(60)), 
+  ...     ('-', Decimal(-1)), Decimal(0)],
   ...    bestScore='+', minPassingScore='v')
 
   >>> check.getBestScore()
@@ -297,7 +299,8 @@
   >>> scoresystem.PassFail.title
   u'Pass/Fail'
   >>> scoresystem.PassFail.scores
-  [(u'Pass', Decimal("1")), (u'Fail', Decimal("0"))]
+  [(u'Pass', Decimal("1"), Decimal("60")), 
+   (u'Fail', Decimal("0"), Decimal("0"))]
   >>> scoresystem.PassFail.isValidScore('Pass')
   True
   >>> scoresystem.PassFail.isPassingScore('Pass')
@@ -324,8 +327,9 @@
   >>> scoresystem.AmericanLetterScoreSystem.title
   u'Letter Grade'
   >>> scoresystem.AmericanLetterScoreSystem.scores
-  [('A', Decimal("4")), ('B', Decimal("3")), ('C', Decimal("2")),
-   ('D', Decimal("1")), ('F', Decimal("0"))]
+  [('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"))]
   >>> scoresystem.AmericanLetterScoreSystem.isValidScore('C')
   True
   >>> scoresystem.AmericanLetterScoreSystem.isValidScore('E')
@@ -353,7 +357,7 @@
   'ExtendedAmericanLetterScoreSystem'
   >>> scoresystem.ExtendedAmericanLetterScoreSystem.title
   u'Extended Letter Grade'
-  >>> [s for s, v in scoresystem.ExtendedAmericanLetterScoreSystem.scores]
+  >>> [s for s, v, p in scoresystem.ExtendedAmericanLetterScoreSystem.scores]
   ['A+', 'A', 'A-', 'B+', 'B', 'B-', 'C+', 'C', 'C-', 'D+', 'D', 'D-', 'F']
   >>> scoresystem.ExtendedAmericanLetterScoreSystem.isValidScore('B-')
   True
@@ -842,6 +846,126 @@
   >>> len(evals)
   2
 
+
+The ScoresSystemsProxy
+~~~~~~~~~~~~~~~~~~~~~~
+
+Score systems are utilities that are pre-created in code (eventually we will
+migrate these to the application's site manager) and user created ones that
+we add to the site manager by way of the ScoresSystemsProxy class.
+
+First we'll set up the site and initialize the app object.
+
+    >>> from schooltool.testing import setup
+    >>> app = setup.setUpSchoolToolSite()
+
+The ScoresSystemsProxy class is itself an adapter of the app object.
+
+    >>> from schooltool.app.interfaces import ISchoolToolApplication
+    >>> from schooltool.requirement.interfaces import IScoreSystemsProxy
+    >>> from schooltool.requirement.scoresystem import ScoreSystemsProxy
+    >>> from zope.component import provideAdapter
+    >>> provideAdapter(ScoreSystemsProxy)
+    >>> ssProxy = IScoreSystemsProxy(app)
+    >>> ssProxy
+    <schooltool.requirement.scoresystem.ScoreSystemsProxy object at ...>
+
+At fist, there are no scoresystems registered with the app.
+
+    >>> ssProxy.getScoreSystems()
+    []
+
+We'll create a couple of custom score systems and add them to the proxy.
+
+    >>> from schooltool.requirement.scoresystem import CustomScoreSystem
+    >>> custom1 = CustomScoreSystem('Custom 1')
+    >>> ssProxy.addScoreSystem( custom1)
+    >>> custom2 = CustomScoreSystem('Custom 2')
+    >>> ssProxy.addScoreSystem(custom2)
+
+Now, when we ask the proxy for what score systems it has, it will return both
+of the newly added ones.
+
+    >>> ssProxy.getScoreSystems()
+    [(u'Custom 1', <CustomScoreSystem 'Custom 1'>), 
+     (u'Custom 2', <CustomScoreSystem 'Custom 2'>)]
+
+We can get one of them by name.
+
+    >>> ssProxy.getScoreSystem('Custom 1')
+    <CustomScoreSystem 'Custom 1'>
+
+
+Score System Vocabularies
+-------------------------
+
+Score System vocabularies are used to provide a pulldown for fields
+requiring scoresystem input.  Let's register the utilities.
+
+    >>> from zope.component import provideUtility
+    >>> from schooltool.requirement import scoresystem
+
+First, the discrete values score systems.
+
+    >>> zope.component.provideUtility(
+    ...     scoresystem.PassFail, interfaces.IDiscreteValuesScoreSystem,
+    ...     u'Pass/Fail')
+    >>> zope.component.provideUtility(
+    ...     scoresystem.AmericanLetterScoreSystem, interfaces.IDiscreteValuesScoreSystem,
+    ...     u'Letter Grade')
+    >>> zope.component.provideUtility(
+    ...     scoresystem.ExtendedAmericanLetterScoreSystem, interfaces.IDiscreteValuesScoreSystem,
+    ...     u'Extended Letter Grade')
+
+Secondly, the ranged values score systems.
+
+    >>> zope.component.provideUtility(
+    ...     scoresystem.PercentScoreSystem, interfaces.IScoreSystem,
+    ...     u'Percent')
+    >>> zope.component.provideUtility(
+    ...     scoresystem.HundredPointsScoreSystem, interfaces.IScoreSystem,
+    ...     u'100 Points')
+
+Finally, the vocabularies.
+
+    >>> from zope.schema.vocabulary import getVocabularyRegistry
+    >>> getVocabularyRegistry().register(
+    ...     'schooltool.requirement.scoresystems',
+    ...     scoresystem.ScoreSystemsVocabulary)
+    >>> getVocabularyRegistry().register(
+    ...     'schooltool.requirement.discretescoresystems',
+    ...     scoresystem.DiscreteScoreSystemsVocabulary)
+
+Now, when we access the vocabularies as the application views will, we can test
+that they deliver the desired list of utilities.  
+
+First the discrete values score systems vocabulary, used when only discrete
+values score systems are valid, like when converting an average into a discrete
+grade.  Note the presence of the custom score systems we just created.
+
+    >>> from zope.app.component.vocabulary import UtilityVocabulary
+    >>> vocab = UtilityVocabulary(None, interface=interfaces.IDiscreteValuesScoreSystem)
+    >>> for v in vocab: print v
+    <UtilityTerm Custom 1, instance of CustomScoreSystem>
+    <UtilityTerm Custom 2, instance of CustomScoreSystem>
+    <UtilityTerm Extended Letter Grade, instance of GlobalDiscreteValuesScoreSystem>
+    <UtilityTerm Letter Grade, instance of GlobalDiscreteValuesScoreSystem>
+    <UtilityTerm Pass/Fail, instance of GlobalDiscreteValuesScoreSystem>
+
+Secondly, we have the general score systems vocabulary, returning all score
+systems registered.  This is used for report sheet activities.
+
+    >>> vocab = UtilityVocabulary(None, interface=interfaces.IScoreSystem)
+    >>> for v in vocab: print v
+    <UtilityTerm 100 Points, instance of GlobalRangedValuesScoreSystem>
+    <UtilityTerm Custom 1, instance of CustomScoreSystem>
+    <UtilityTerm Custom 2, instance of CustomScoreSystem>
+    <UtilityTerm Extended Letter Grade, instance of GlobalDiscreteValuesScoreSystem>
+    <UtilityTerm Letter Grade, instance of GlobalDiscreteValuesScoreSystem>
+    <UtilityTerm Pass/Fail, instance of GlobalDiscreteValuesScoreSystem>
+    <UtilityTerm Percent, instance of GlobalRangedValuesScoreSystem>
+
+
 Epilogue
 --------
 

=== modified file 'src/schooltool/requirement/browser/README.txt'
--- src/schooltool/requirement/browser/README.txt	2008-04-17 17:22:08 +0000
+++ src/schooltool/requirement/browser/README.txt	2009-06-05 00:11:04 +0000
@@ -64,3 +64,69 @@
     >>> browser.getControl('1').click()
     >>> 'Be kind to your fellow students.' not in browser.contents
     True
+
+
+Score System Management
+-----------------------
+
+Score Systems can be created by the user to supplement the ones that are
+already delivered with schooltool.  To do so, as manager, the user goes
+to the 'Manage' tab and clicks on the 'Score Systems' link.
+
+    >>> from schooltool.app.browser.ftests import setup
+    >>> manager = setup.logIn('manager', 'schooltool')
+    >>> manager.getLink('Manage').click()
+    >>> manager.getLink('Score Systems').click()
+
+We see the score systems that come with schooltool.
+
+    >>> analyze.printQuery("id('content-body')/form//a", manager.contents)
+    <a href="http://localhost/scoresystems/view.html?name=extended-letter-grade">Extended Letter Grade</a>
+    <a href="http://localhost/scoresystems/view.html?name=letter-grade">Letter Grade</a>
+    <a href="http://localhost/scoresystems/view.html?name=passfail">Pass/Fail</a>
+
+To add a new score system, the user clicks 'Add Score System'.
+
+    >>> manager.getLink('Add Score System').click()
+    >>> base_url = manager.url + '?form-submitted'
+    >>> cancel_url = base_url + '&CANCEL'
+    >>> update_url = base_url + '&UPDATE_SUBMIT'
+    >>> save_url = base_url + '&SAVE'
+
+We'll send the form values necessary to add a score system called 'Good/Bad'.
+
+    >>> url = save_url + '&title=Good/Bad&displayed1=G&value1=1&percent1=60'
+    >>> url = url + '&displayed2=B&value2=0&percent2=0'
+    >>> manager.open(url)
+
+Now we see the two score systems 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>
+    <a href="http://localhost/scoresystems/view.html?name=goodbad">Good/Bad</a>
+    <a href="http://localhost/scoresystems/view.html?name=letter-grade">Letter Grade</a>
+    <a href="http://localhost/scoresystems/view.html?name=passfail">Pass/Fail</a>
+
+Let's hide the 'Pass/Fail' one.
+
+    >>> hide_url = manager.url + '?form-submitted&hide_passfail'
+    >>> manager.open(hide_url)
+
+Now we won't see it 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>
+    <a href="http://localhost/scoresystems/view.html?name=goodbad">Good/Bad</a>
+    <a href="http://localhost/scoresystems/view.html?name=letter-grade">Letter Grade</a>
+
+Let's click on 'Good/Bad' and test it's view.
+
+    >>> manager.getLink('Good/Bad').click()
+    >>> analyze.printQuery("id('content-body')/table//span", manager.contents)
+    <span>G</span>
+    <span>1</span>
+    <span>60</span>
+    <span>B</span>
+    <span>0</span>
+    <span>0</span>
+

=== modified file 'src/schooltool/requirement/browser/configure.zcml'
--- src/schooltool/requirement/browser/configure.zcml	2008-03-20 20:43:52 +0000
+++ src/schooltool/requirement/browser/configure.zcml	2009-05-08 18:19:21 +0000
@@ -3,8 +3,54 @@
            xmlns:zope="http://namespaces.zope.org/zope"
            i18n_domain="schooltool">
 
+  <!-- Manage Tab -->
+  <configure package="schooltool.skin">
+    <navigationViewlet
+        name="scoresystems"
+        for="*"
+        manager="schooltool.app.browser.interfaces.IManageMenuViewletManager"
+        template="templates/navigationViewlet.pt"
+        class="schooltool.skin.skin.NavigationViewlet"
+        permission="schooltool.edit"
+        link="scoresystems"
+        title="Score Systems"
+        order="220"
+        />
+  </configure>
+
+  <!-- Menu items for IScoreSystemsProxy -->
+  <menuItem
+      menu="schooltool_actions"
+      title="Add Score System"
+      for="schooltool.requirement.interfaces.IScoreSystemsProxy"
+      action="add.html"
+      permission="schooltool.edit"
+      />
+
+  <!-- Score System Views -->
+  <page
+      name="index.html"
+      for="schooltool.requirement.interfaces.IScoreSystemsProxy"
+      class=".scoresystem.ScoreSystemsView"
+      template="scoresystems_overview.pt"
+      permission="schooltool.edit"
+      />
+  <page
+      name="add.html"
+      for="schooltool.requirement.interfaces.IScoreSystemsProxy"
+      class=".scoresystem.ScoreSystemAddView"
+      template="scoresystem_add.pt"
+      permission="schooltool.edit"
+      />
+  <page
+      name="view.html"
+      for="schooltool.requirement.interfaces.IScoreSystemsProxy"
+      class=".scoresystem.ScoreSystemViewView"
+      template="scoresystem_view.pt"
+      permission="schooltool.edit"
+      />
+
   <!-- Score system widget registration -->
-
   <zope:view
       type="zope.publisher.interfaces.browser.IBrowserRequest"
       for="schooltool.requirement.scoresystem.IScoreSystemField"
@@ -12,7 +58,6 @@
       factory=".scoresystem.ScoreSystemWidget"
       permission="zope.Public"
       />
-
   <page
       name="index.html"
       for="schooltool.requirement.interfaces.IRequirement"
@@ -22,14 +67,12 @@
       menu="zmi_views"
       title="View"
       />
-
   <page
       name="treenode"
       for="schooltool.requirement.interfaces.IRequirement"
       template="treenode.pt"
       permission="schooltool.view"
       />
-
   <containerViews
       for="..interfaces.IRequirement"
       contents="zope.ManageContent"

=== modified file 'src/schooltool/requirement/browser/ftesting.zcml'
--- src/schooltool/requirement/browser/ftesting.zcml	2008-10-22 15:50:26 +0000
+++ src/schooltool/requirement/browser/ftesting.zcml	2009-05-08 18:19:21 +0000
@@ -9,6 +9,7 @@
   <include package="schooltool.schoolyear" />
   <include package="schooltool.timetable" />
   <include package="schooltool.requirement" />
+  <include package="schooltool.gradebook" />
 
   <configure
       package="schooltool.skin"

=== modified file 'src/schooltool/requirement/browser/scoresystem.py'
--- src/schooltool/requirement/browser/scoresystem.py	2008-04-16 18:57:28 +0000
+++ src/schooltool/requirement/browser/scoresystem.py	2009-05-14 08:34:27 +0000
@@ -21,14 +21,216 @@
 $Id$
 """
 __docformat__ = 'reStructuredText'
+
+from decimal import Decimal
+
 import zope.interface
 import zope.schema
 from zope.app import form
 from zope.app.pagetemplate import ViewPageTemplateFile
+from zope.publisher.browser import BrowserView
+from zope.security.proxy import removeSecurityProxy
+from zope.traversing.browser.absoluteurl import absoluteURL
 
 from schooltool.common import SchoolToolMessage as _
 from schooltool.requirement import interfaces, scoresystem
 
+
+MISSING_TITLE = _('The Title field must not be empty.')
+VALUE_NOT_NUMERIC = _('Value field must contain a valid number.')
+PERCENT_NOT_NUMERIC = _('Percent field must contain a valid number.')
+NO_NEGATIVE_VALUES = _('All values must be non-negative.')
+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.')
+
+
+def escName(name):
+    """converts title-based scoresystem name to querystring format"""
+    chars = [c for c in name.lower() if c.isalnum() or c == ' ']
+    return u''.join(chars).replace(' ', '-')
+
+
+class ScoreSystemsView(BrowserView):
+    """A view for maintaining user-created scoresystem utilities"""
+
+    def update(self):
+        if 'form-submitted' in self.request:
+            for name, ss in self.context.getScoreSystems():
+                ss = removeSecurityProxy(ss)
+                if 'hide_' + escName(name) in self.request:
+                    ss.hidden = True
+
+    def scoresystems(self):
+        url = absoluteURL(self.context, self.request) + '/view.html'
+        results = []
+        for name, ss in self.context.getScoreSystems():
+            ss = removeSecurityProxy(ss)
+            result = {
+                'title': ss.title,
+                'url': '%s?name=%s' % (url, escName(name)),
+                'hide_name': 'hide_' + escName(name),
+                }
+            results.append(result)
+        return results
+
+
+class ScoreSystemAddView(BrowserView):
+    """A view for adding a user-created scoresystem utility"""
+
+    def update(self):
+        self.message = ''
+
+        if 'form-submitted' in self.request:
+            if 'CANCEL' in self.request:
+                self.request.response.redirect(self.nextURL())
+
+            if not self.validateForm():
+                return
+            if 'SAVE' in self.request:
+                if not self.validateScores():
+                    return
+                target = scoresystem.CustomScoreSystem()
+                self.updateScoreSystem(target)
+                self.context.addScoreSystem(target)
+                self.request.response.redirect(self.nextURL())
+
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
+    def scores(self):
+        rownum = 1
+        results = []
+        for displayed, value, percent in self.getRequestScores():
+            results.append(self.buildScoreRow(rownum, displayed, value, 
+                percent))
+            rownum += 1
+        results.append(self.buildScoreRow(rownum, '', '', ''))
+        return results
+
+    def buildScoreRow(self, rownum, displayed, value, percent):
+        return {
+            'displayed_name': 'displayed' + unicode(rownum),
+            'displayed_value': displayed,
+            'value_name': 'value' + unicode(rownum),
+            'value_value': value,
+            'percent_name': 'percent' + unicode(rownum),
+            'percent_value': percent,
+            }
+
+    def getRequestScores(self):
+        rownum = 0
+        results = []
+        while True:
+            rownum += 1
+            displayed_name = 'displayed' + unicode(rownum)
+            value_name = 'value' + unicode(rownum)
+            percent_name = 'percent' + unicode(rownum)
+            if displayed_name not in self.request:
+                break
+            if not len(self.request[displayed_name]):
+                continue
+            result = (self.request[displayed_name],
+                      self.request[value_name],
+                      self.request[percent_name])
+            results.append(result)
+        return results
+
+    def validateForm(self):
+        title = self.request['title']
+        if not len(title):
+            return self.setMessage(MISSING_TITLE)
+
+        scores = []
+        for displayed, value, percent in self.getRequestScores():
+            try:
+                decimal_value = Decimal(value)
+            except:
+                return self.setMessage(VALUE_NOT_NUMERIC)
+            if decimal_value < 0:
+                return self.setMessage(NO_NEGATIVE_VALUES)
+            try:
+                decimal_percent = Decimal(percent)
+            except:
+                return self.setMessage(PERCENT_NOT_NUMERIC)
+            if decimal_percent < 0:
+                return self.setMessage(NO_NEGATIVE_PERCENTS)
+            if decimal_percent > 100:
+                return self.setMessage(NO_PERCENTS_OVER_100)
+            scores.append([displayed, decimal_value, decimal_percent])
+
+        self.validTitle = title
+        self.validScores = scores
+        return True
+
+    def validateScores(self):
+        if len(self.validScores) < 2:
+            return self.setMessage(MUST_HAVE_AT_LEAST_2_SCORES)
+
+        last_value, last_percent = None, None
+        for displayed, 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)
+            last_value = value
+            last_percent = percent
+
+        if last_percent <> 0:
+            return self.setMessage(LAST_PERCENT_NOT_ZERO)
+
+        return True
+
+    def setMessage(self, message):
+        self.message = message
+        return False
+
+    def updateScoreSystem(self, target):
+        target.title = self.validTitle
+        target.scores = self.validScores
+        target._bestScore = target.scores[0][1]
+
+    @property
+    def title_value(self):
+        if 'form-submitted' in self.request:
+            return self.request['title']
+        else:
+            return ''
+
+
+class ScoreSystemViewView(BrowserView):
+    """A view for viewing a user-created scoresystem utility"""
+
+    def scores(self):
+        target = self.getScoreSystem()
+        return [self.buildScoreRow(displayed, value, percent)
+                for displayed, value, percent in target.scores]
+
+    def buildScoreRow(self, displayed, value, percent):
+        return {
+            'displayed_value': displayed,
+            'value_value': value,
+            'percent_value': percent,
+            }
+
+    @property
+    def title_value(self):
+        target = self.getScoreSystem()
+        return target.title
+
+    def getScoreSystem(self):
+        name = self.request['QUERY_STRING'].split('=')[1]
+        for n, ss in self.context.getScoreSystems():
+            if escName(n) == name:
+                return removeSecurityProxy(ss)
+        raise KeyError
+
+
 class IWidgetData(interfaces.IRangedValuesScoreSystem):
     """A schema used to generate the score system widget."""
 

=== added file 'src/schooltool/requirement/browser/scoresystem_add.pt'
--- src/schooltool/requirement/browser/scoresystem_add.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/requirement/browser/scoresystem_add.pt	2009-05-08 18:19:21 +0000
@@ -0,0 +1,65 @@
+<tal:define define="dummy view/update"/>
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">Add Score System</title>
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header"
+    i18n:translate="">Add Score System</h1>
+
+<metal:block metal:fill-slot="body">
+
+  <div class="message" style="color:red; padding:1em"
+       tal:condition="view/message"
+       tal:content="view/message">
+    Message
+  </div>
+
+
+  <form method="post"
+        tal:attributes="action string:${context/@@absolute_url}/add.html">
+    <input type="hidden" name="form-submitted" value="" />
+
+    <label for="title" class="bold padded" i18n:translate="">Title</label>
+    <input type="text" name="title" id="title"
+           tal:attributes="value view/title_value" />
+    <span>&nbsp&nbsp</span>
+    <input type="submit" class="button-ok" name="SAVE" value="Submit" />
+    <div style="height: 31px;"></div>
+
+    <table class="schooltool_gradebook">
+      <tr>
+        <th class="cell header fully_padded">Score Displayed</th>
+        <th class="cell header fully_padded">Score Value</th>
+        <th class="cell header fully_padded">Low Persntage</th>
+      </tr>
+
+      <tal:block repeat="score view/scores">
+        <tr class="bordered">
+          <td class="cell fully_padded">
+            <input type="text"
+                   tal:attributes="name score/displayed_name; value score/displayed_value" />
+          </td>
+          <td class="cell fully_padded">
+            <input type="text"
+                   tal:attributes="name score/value_name; value score/value_value" />
+          </td>
+          <td class="cell fully_padded">
+            <input type="text"
+                   tal:attributes="name score/percent_name; value score/percent_value" />
+          </td>
+        </tr>
+      </tal:block>
+
+    </table>
+    <div style="height: 11px;"></div>
+
+    <div class="controls">
+      <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Update" />
+      <input type="submit" class="button-cancel" name="CANCEL" value="Cancel" />
+    </div>
+  </form>
+</metal:block>
+</body>
+</html>

=== added file 'src/schooltool/requirement/browser/scoresystem_view.pt'
--- src/schooltool/requirement/browser/scoresystem_view.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/requirement/browser/scoresystem_view.pt	2009-06-05 00:11:04 +0000
@@ -0,0 +1,41 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">View Score System</title>
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header"
+    i18n:translate="">View Score System</h1>
+
+<metal:block metal:fill-slot="body">
+
+  <b>Title:</b>
+  <span tal:content="view/title_value" />
+  <div style="height: 31px;"></div>
+
+  <table class="schooltool_gradebook">
+    <tr>
+      <th class="cell header fully_padded">Score Displayed</th>
+      <th class="cell header fully_padded">Score Value</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">
+          <span tal:content="score/displayed_value" />
+        </td>
+        <td class="cell fully_padded">
+          <span tal:content="score/value_value" />
+        </td>
+        <td class="cell fully_padded">
+          <span tal:content="score/percent_value" />
+        </td>
+      </tr>
+    </tal:block>
+
+  </table>
+
+</metal:block>
+</body>
+</html>

=== added file 'src/schooltool/requirement/browser/scoresystems_overview.pt'
--- src/schooltool/requirement/browser/scoresystems_overview.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/requirement/browser/scoresystems_overview.pt	2009-05-08 18:19:21 +0000
@@ -0,0 +1,44 @@
+<tal:define define="dummy view/update"/>
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+<head>
+  <title metal:fill-slot="title" i18n:translate="">Score Systems</title>
+</head>
+<body>
+
+<h1 metal:fill-slot="content-header"
+    i18n:translate="">Score Systems</h1>
+
+<metal:block metal:fill-slot="body"
+             tal:define="scoresystems view/scoresystems">
+
+  <form method="post"
+        tal:attributes="action string:${context/@@absolute_url}/index.html">
+    <input type="hidden" name="form-submitted" value="" />
+
+    <table class="schooltool_gradebook">
+      <tr>
+        <th class="cell header fully_padded">Hide?</th>
+        <th class="cell header fully_padded">Score System</th>
+      </tr>
+
+      <tr class="bordered"
+          tal:repeat="scoresystem scoresystems">
+        <td class="cell fully_padded">
+          <input type="checkbox"
+                 tal:attributes="name scoresystem/hide_name;" />
+        </td>
+        <td class="cell fully_padded">
+          <a tal:content="scoresystem/title"
+             tal:attributes="href scoresystem/url">Score System</a>
+        </td>
+      </tr>
+    </table>
+
+    <div class="controls">
+      <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Update" />
+    </div>
+
+  </form>
+</metal:block>
+</body>
+</html>

=== modified file 'src/schooltool/requirement/browser/tests.py'
--- src/schooltool/requirement/browser/tests.py	2008-03-19 04:22:15 +0000
+++ src/schooltool/requirement/browser/tests.py	2009-05-08 18:19:21 +0000
@@ -243,12 +243,14 @@
     return unittest.TestSuite((
         doctest.DocTestSuite(setUp=setUp, tearDown=tearDown,
                              optionflags=doctest.ELLIPSIS|
-                                         doctest.REPORT_NDIFF),
+                                         doctest.REPORT_NDIFF|
+                                         doctest.REPORT_ONLY_FIRST_FAILURE),
         doctest.DocFileSuite('scoresystem.txt',
                              setUp=setUp, tearDown=tearDown,
                              globs={'pprint': doctestunit.pprint},
                              optionflags=doctest.NORMALIZE_WHITESPACE|
-                                         doctest.ELLIPSIS),
+                                         doctest.ELLIPSIS|
+                                         doctest.REPORT_ONLY_FIRST_FAILURE),
         ))
 
 

=== modified file 'src/schooltool/requirement/configure.zcml'
--- src/schooltool/requirement/configure.zcml	2008-09-14 22:04:05 +0000
+++ src/schooltool/requirement/configure.zcml	2009-06-05 00:11:04 +0000
@@ -10,29 +10,26 @@
       factory=".requirement.getRequirement"
       trusted="true"
       />
-
   <adapter
       for=".interfaces.IHaveEvaluations"
       provides=".interfaces.IEvaluations"
       factory=".evaluation.getEvaluations"
       trusted="true"
       />
-
   <view
       name="requirement" type="*"
       provides="zope.traversing.interfaces.ITraversable"
-      for="schooltool.requirement.interfaces.IHaveRequirement"
+      for=".interfaces.IHaveRequirement"
       factory=".requirement.requirementNamespace"
       />
   <adapter
       name="requirement"
       provides="zope.traversing.interfaces.ITraversable"
-      for="schooltool.requirement.interfaces.IHaveRequirement"
+      for=".interfaces.IHaveRequirement"
       factory=".requirement.requirementNamespace"
       />
 
   <!-- Requirement Content -->
-
   <class class=".requirement.Requirement">
     <allow interface="zope.app.container.interfaces.ISimpleReadContainer" />
     <require
@@ -50,7 +47,6 @@
   </class>
 
   <!-- Scoresystem Content -->
-
   <class class=".scoresystem.DiscreteValuesScoreSystem">
     <require
         permission="zope.View"
@@ -61,7 +57,6 @@
         set_schema=".interfaces.IScoreSystem"
         />
   </class>
-
   <class class=".scoresystem.GlobalDiscreteValuesScoreSystem">
     <require
         permission="zope.View"
@@ -72,7 +67,6 @@
         set_schema=".interfaces.IScoreSystem"
         />
   </class>
-
   <class class=".scoresystem.RangedValuesScoreSystem">
     <require
         permission="zope.View"
@@ -83,7 +77,6 @@
         set_schema=".interfaces.IScoreSystem"
         />
   </class>
-
   <class class=".scoresystem.GlobalRangedValuesScoreSystem">
     <require
         permission="zope.View"
@@ -94,55 +87,46 @@
         set_schema=".interfaces.IScoreSystem"
         />
   </class>
+  <class class=".scoresystem.CustomScoreSystem">
+    <require
+        permission="zope.View"
+        interface=".interfaces.ICustomScoreSystem"
+        />
+    <require
+        permission="schooltool.edit"
+        set_schema=".interfaces.ICustomScoreSystem"
+        />
+  </class>
 
   <!-- Score System registrations -->
-
   <utility
       provides="zope.schema.interfaces.IVocabularyFactory"
-      component="schooltool.requirement.scoresystem.ScoreSystemsVocabulary"
+      component=".scoresystem.ScoreSystemsVocabulary"
       name="schooltool.requirement.scoresystems"
       />
-
-  <utility
-      provides="schooltool.requirement.interfaces.IScoreSystem"
-      component="schooltool.requirement.scoresystem.PassFail"
-      name="Pass/Fail"
-      />
-
-  <utility
-      provides="schooltool.requirement.interfaces.IScoreSystem"
-      component="schooltool.requirement.scoresystem.AmericanLetterScoreSystem"
-      name="Letter Grade"
-      />
-
-  <utility
-      provides="schooltool.requirement.interfaces.IScoreSystem"
-      component="
-          schooltool.requirement.scoresystem.ExtendedAmericanLetterScoreSystem"
-      name="Extended Letter Grade"
-      />
-
-  <utility
-      provides="schooltool.requirement.interfaces.IScoreSystem"
-      component="schooltool.requirement.scoresystem.PercentScoreSystem"
+  <utility
+      provides="zope.schema.interfaces.IVocabularyFactory"
+      component=".scoresystem.DiscreteScoreSystemsVocabulary"
+      name="schooltool.requirement.discretescoresystems"
+      />
+  <utility
+      provides="schooltool.requirement.interfaces.IScoreSystem"
+      component=".scoresystem.PercentScoreSystem"
       name="Percent"
       />
-
   <utility
       provides="schooltool.requirement.interfaces.IScoreSystem"
-      component="schooltool.requirement.scoresystem.HundredPointsScoreSystem"
+      component=".scoresystem.HundredPointsScoreSystem"
       name="100 Points"
       />
 
   <!-- Evaluations Content -->
-
   <class class=".evaluation.Evaluations">
     <require
         permission="schooltool.edit"
         interface=".interfaces.IEvaluations"
         />
   </class>
-
   <class class=".evaluation.Evaluation">
     <require
 	permission="schooltool.view"
@@ -155,24 +139,42 @@
   </class>
 
   <!-- These declarations should go somewhere else eventually -->
-
   <class class="schooltool.app.app.SchoolToolApplication">
     <implements
-        interface="schooltool.requirement.interfaces.IHaveRequirement" />
+        interface=".interfaces.IHaveRequirement" />
   </class>
-
   <class class="schooltool.course.course.Course">
     <implements interface=".interfaces.IHaveRequirement" />
   </class>
-
   <class class="schooltool.course.section.Section">
     <implements interface=".interfaces.IHaveRequirement" />
   </class>
-
   <class class="schooltool.person.person.Person">
     <implements interface=".interfaces.IHaveEvaluations" />
   </class>
 
+  <!-- ScoreSystemsProxy adapter -->
+  <class class=".scoresystem.ScoreSystemsProxy">
+    <require
+        permission="schooltool.edit"
+        interface=".interfaces.IScoreSystemsProxy" />
+  </class>
+  <adapter
+      for="schooltool.app.app.SchoolToolApplication"
+      provides=".interfaces.IScoreSystemsProxy"
+      factory=".scoresystem.ScoreSystemsProxy"
+      trusted="true"
+      />
+
+  <!-- Pluggable traverser plugins for HTTP paths -->
+  <adapterTraverserPlugin
+      for="schooltool.app.interfaces.ISchoolToolApplication"
+      layer="zope.publisher.interfaces.http.IHTTPRequest"
+      name="scoresystems"
+      adapter=".interfaces.IScoreSystemsProxy"
+      permission="schooltool.edit"
+      />
+
   <include package=".browser" />
 
 </configure>

=== modified file 'src/schooltool/requirement/interfaces.py'
--- src/schooltool/requirement/interfaces.py	2009-04-29 00:26:02 +0000
+++ src/schooltool/requirement/interfaces.py	2009-05-08 18:19:21 +0000
@@ -116,13 +116,22 @@
 class IDiscreteValuesScoreSystem(IValuesScoreSystem):
     """A score system that consists of discrete values."""
 
+    hidden = zope.schema.Bool(
+        title=u"Hidden Score System",
+        required=False
+        )
+
     scores = zope.schema.List(
         title=u'Scores',
-        description=u'A list of 2-tuples of the form (score, numerical value).',
+        description=u'A list of 3-tuples of the form (score, value, percent).',
         value_type=zope.schema.Tuple(),
         required=True)
 
 
+class ICustomScoreSystem(IDiscreteValuesScoreSystem):
+    """A user-created score system that consists of discrete values."""
+
+
 class IRangedValuesScoreSystem(IValuesScoreSystem):
     """A score system that allows for a randge of values."""
 
@@ -232,3 +241,16 @@
         name that the original ``IEvaluations`` object had.
         """
 
+
+class IScoreSystemsProxy(zope.interface.Interface):
+    """The Proxy class for adding/editing score systems"""
+
+    def getScoreSystems():
+        """Return list of tuples (name, scoresystem)"""
+
+    def addScoreSystem(scoresystem):
+        """Add scoresystem to app utilitiles"""
+
+    def getScoreSystem(name):
+        """Get scoresystem from app utilitiles by the given name"""
+

=== modified file 'src/schooltool/requirement/scoresystem.py'
--- src/schooltool/requirement/scoresystem.py	2008-09-25 03:01:46 +0000
+++ src/schooltool/requirement/scoresystem.py	2009-05-14 08:34:27 +0000
@@ -22,20 +22,34 @@
 """
 __docformat__ = 'restructuredtext'
 
+from decimal import Decimal
+
+from persistent import Persistent
+
+from zope.app.component.vocabulary import UtilityVocabulary
+from zope.component import adapts, queryMultiAdapter
+from zope.interface import implements
 import zope.interface
 import zope.schema
 import zope.security.checker
-from zope.app.component.vocabulary import UtilityVocabulary
-
-from decimal import Decimal
-
+from zope.security.proxy import removeSecurityProxy
+
+from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.requirement import interfaces
+from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
+from schooltool.requirement.interfaces import IScoreSystemsProxy
 
 
 def ScoreSystemsVocabulary(context):
     return UtilityVocabulary(context,
                              interface=interfaces.IScoreSystem)
 
+
+def DiscreteScoreSystemsVocabulary(context):
+    return UtilityVocabulary(context,
+                             interface=interfaces.IDiscreteValuesScoreSystem)
+
+
 class UNSCORED(object):
     """This object behaves like a string.
 
@@ -49,9 +63,11 @@
     def __repr__(self):
         return 'UNSCORED'
 
+
 zope.security.checker.BasicTypes[UNSCORED] = zope.security.checker.NoProxy
 UNSCORED = UNSCORED()
 
+
 class AbstractScoreSystem(object):
     zope.interface.implements(interfaces.IScoreSystem)
 
@@ -88,6 +104,7 @@
     def __reduce__(self):
         return 'CommentScoreSystem'
 
+
 # Singelton
 CommentScoreSystem = CommentScoreSystem(
     u'Comments', u'Scores are commentary text.')
@@ -126,6 +143,7 @@
     scores = None
     _minPassingScore = None
     _bestScore = None
+    hidden = False
 
     def __init__(self, title=None, description=None,
                  scores=None, bestScore=None, minPassingScore=None):
@@ -141,12 +159,12 @@
             return None
         if self._minPassingScore is None:
             return None
-        scores = dict(self.scores)
+        scores = self.scoresDict()
         return scores[score] >= scores[self._minPassingScore]
 
     def isValidScore(self, score):
         """See interfaces.IScoreSystem"""
-        scores = dict(self.scores).keys()
+        scores = self.scoresDict().keys()
         return score in scores + [UNSCORED]
 
     def getBestScore(self):
@@ -167,7 +185,7 @@
         """See interfaces.IScoreSystem"""
         if score is UNSCORED:
             return None
-        scores = dict(self.scores)
+        scores = self.scoresDict()
         return scores[score]
 
     def getFractionalValue(self, score):
@@ -179,6 +197,10 @@
         value = self.getNumericalValue(score) - minimum
         return value / (maximum - minimum)
 
+    def scoresDict(self):
+        scores = [(score, value) for score, value, percent in self.scores]
+        return dict(scores)
+
 class GlobalDiscreteValuesScoreSystem(DiscreteValuesScoreSystem):
 
     def __init__(self, name, *args, **kwargs):
@@ -188,25 +210,41 @@
     def __reduce__(self):
         return self.__name__
 
+
 PassFail = GlobalDiscreteValuesScoreSystem(
     'PassFail',
     u'Pass/Fail', u'Pass or Fail score system.',
-    [(u'Pass', Decimal(1)), (u'Fail', Decimal(0))], u'Pass', u'Pass')
+    [(u'Pass', Decimal(1), Decimal(60)), 
+     (u'Fail', Decimal(0), Decimal(0))], 
+     u'Pass', u'Pass')
 
 AmericanLetterScoreSystem = GlobalDiscreteValuesScoreSystem(
     'AmericanLetterScoreSystem',
     u'Letter Grade', u'American Letter Grade',
-    [('A', Decimal(4)), ('B', Decimal(3)), ('C', Decimal(2)),
-     ('D', Decimal(1)), ('F', Decimal(0))], 'A', 'D')
+    [('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', 'D')
 
 ExtendedAmericanLetterScoreSystem = GlobalDiscreteValuesScoreSystem(
     'ExtendedAmericanLetterScoreSystem',
     u'Extended Letter Grade', u'American Extended Letter Grade',
-    [('A+', Decimal('4.0')), ('A', Decimal('4.0')), ('A-', Decimal('3.7')),
-     ('B+', Decimal('3.3')), ('B', Decimal('3.0')), ('B-', Decimal('2.7')),
-     ('C+', Decimal('2.3')), ('C', Decimal('2.0')), ('C-', Decimal('1.7')),
-     ('D+', Decimal('1.3')), ('D', Decimal('1.0')), ('D-', Decimal('0.7')),
-     ('F',  Decimal('0.0'))], 'A+', 'D-')
+    [('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+', 'D-')
 
 
 class RangedValuesScoreSystem(AbstractValuesScoreSystem):
@@ -271,6 +309,7 @@
         value = self.getNumericalValue(score) - self.min
         return value / (self.max - self.min)
 
+
 class GlobalRangedValuesScoreSystem(RangedValuesScoreSystem):
 
     def __init__(self, name, *args, **kwargs):
@@ -294,9 +333,61 @@
 class ICustomScoreSystem(zope.interface.Interface):
     """Marker interface for score systems created in the widget."""
 
+
 class IScoreSystemField(zope.schema.interfaces.IField):
     """A field that represents score system."""
 
+
 class ScoreSystemField(zope.schema.Field):
     """Score System Field."""
     zope.interface.implements(IScoreSystemField)
+
+
+class CustomScoreSystem(DiscreteValuesScoreSystem, Persistent):
+    """ScoreSystem class for custom (user-created) score systems"""
+
+    implements(interfaces.ICustomScoreSystem)
+
+
+class ScoreSystemsProxy(object):
+    """The Proxy class for adding/editing score systems"""
+
+    implements(IScoreSystemsProxy)
+    adapts(ISchoolToolApplication)
+
+    def __init__(self, app):
+        self.app = app
+        self.siteManager = app.getSiteManager()
+        self.__parent__ = app
+        self.__name__ = 'scoresystems'
+
+    def getScoreSystems(self):
+        """Return list of tuples (name, scoresystem)"""
+        results = []
+        for name, util in sorted(self.siteManager.getUtilitiesFor(
+                                 interfaces.ICustomScoreSystem)):
+            util = removeSecurityProxy(util)
+            if util.hidden:
+                continue
+            results.append((name, util))
+        return results
+
+    def addScoreSystem(self, scoresystem):
+        """Add scoresystem to app utilitiles"""
+        names = [name for name, util in self.getScoreSystems()]
+        name = scoresystem.title
+        n = name
+        i = 1
+        while n in names:
+            n = name + u'-' + unicode(i)
+            i += 1
+        self.siteManager.registerUtility(scoresystem, 
+            interfaces.ICustomScoreSystem, name=n)
+
+    def getScoreSystem(self, name):
+        """Get scoresystem from app utilitiles by the given name"""
+        for n, util in self.getScoreSystems():
+            if n == name:
+                return removeSecurityProxy(util)
+        raise KeyError
+

=== modified file 'src/schooltool/requirement/tests.py'
--- src/schooltool/requirement/tests.py	2006-01-15 23:50:25 +0000
+++ src/schooltool/requirement/tests.py	2009-05-08 18:19:21 +0000
@@ -47,12 +47,14 @@
                              setUp=setUp, tearDown=tearDown,
                              globs={'pprint': doctestunit.pprint},
                              optionflags=doctest.NORMALIZE_WHITESPACE|
-                                         doctest.ELLIPSIS),
+                                         doctest.ELLIPSIS|
+                                         doctest.REPORT_ONLY_FIRST_FAILURE),
         doctest.DocFileSuite('grades.txt',
                              setUp=setUp, tearDown=tearDown,
                              globs={'pprint': doctestunit.pprint},
                              optionflags=doctest.NORMALIZE_WHITESPACE|
-                                         doctest.ELLIPSIS),
+                                         doctest.ELLIPSIS|
+                                         doctest.REPORT_ONLY_FIRST_FAILURE),
         ))
 
 if __name__ == '__main__':