Merge lp:~aelkner/schooltool/schooltool.gradebook_migrate_sla 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-06-01 21:32:36 +0000
+++ src/schooltool/gradebook/browser/README.txt	2009-07-06 03:19:53 +0000
@@ -89,11 +89,11 @@
 
 But what would a section be without some students and a teacher?
 
-    >>> from schooltool.app.browser.ftests.setup import addPerson
-    >>> addPerson('Paul Cardune', 'paul', 'pwd')
-    >>> addPerson('Tom Hoffman', 'tom', 'pwd')
-    >>> addPerson('Claudia Richter', 'claudia', 'pwd')
-    >>> addPerson('Stephan Richter', 'stephan', 'pwd')
+    >>> from schooltool.basicperson.browser.ftests.setup import addPerson
+    >>> addPerson('Paul', 'Cardune', 'paul', 'pwd', browser=manager)
+    >>> addPerson('Tom', 'Hoffman', 'tom', 'pwd', browser=manager)
+    >>> addPerson('Claudia', 'Richter', 'claudia', 'pwd', browser=manager)
+    >>> addPerson('Stephan', 'Richter', 'stephan', 'pwd', browser=manager)
 
 Now we can add those people to the section:
 
@@ -103,17 +103,14 @@
     >>> manager.getLink('(1)').click()
 
     >>> manager.getLink('edit individuals').click()
-    >>> manager.getControl('Paul Cardune').click()
-    >>> manager.getControl('Tom Hoffman').click()
-    >>> manager.getControl('Claudia Richter').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()
 
-    >>> 'Paul Cardune' in manager.contents
-    True
-
     >>> manager.getLink('edit instructors').click()
-    >>> manager.getControl('Stephan Richter').click()
+    >>> manager.getControl(name='add_item.stephan').value = 'checked'
     >>> manager.getControl('Add').click()
     >>> manager.getControl('OK').click()
 
@@ -177,9 +174,9 @@
     ...New Activity...
     ...Manage Activities...
     ...Physics I (1)...
-    ...Claudia...
-    ...Paul...
-    ...Tom...
+    ...Cardune, Paul...
+    ...Hoffman, Tom...
+    ...Richter, Claudia...
     >>> '<span style="font-weight: bold;">Week 1</span>' in stephan.contents
     True
 
@@ -312,7 +309,7 @@
     >>> txt = contents[index:]
     >>> cell_name = txt[:txt.find('"')]
     >>> stephan.getControl(name=cell_name).value = '56'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Save').click()
 
 We should see the score reflected in the spreadsheet.
 
@@ -322,28 +319,28 @@
 If we enter an invalid score, we will get an error message.
 
     >>> stephan.getControl(name=cell_name).value = 'Bad'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Save').click()
     >>> 'The grade Bad for activity HW 1 is not valid.' in stephan.contents
     True
 
 We can change the score and see the change reflected in the spreadsheet.
 
     >>> stephan.getControl(name=cell_name).value = '88'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Save').click()
     >>> stephan.getControl(name=cell_name).value
     '88'
 
 Finally, we can remove the score by clearing out the cell.
 
     >>> stephan.getControl(name=cell_name).value = ''
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Save').click()
     >>> stephan.getControl(name=cell_name).value
     ''
 
 We need to put the score back for future tests to pass.
 
     >>> stephan.getControl(name=cell_name).value = '36'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Save').click()
 
 
 Entering Scores for a Column (Activity)
@@ -357,13 +354,13 @@
 Now we just enter the grades. Since Claudia has already a grade, we only need
 to grade Paul and Tom:
 
-    >>> stephan.getControl('Paul Cardune').value = u'-1'
-    >>> stephan.getControl('Tom Hoffman').value = u'42'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Cardune, Paul').value = u'-1'
+    >>> stephan.getControl('Hoffman, Tom').value = u'42'
+    >>> stephan.getControl('Save').click()
 
 Again, we entered an invalid value, this time for Paul:
 
-    >>> 'The grade -1 for Paul Cardune is not valid.' in stephan.contents
+    >>> 'The grade -1 for Cardune, Paul is not valid.' in stephan.contents
     True
 
 Also note that all the other entered values should be retained:
@@ -374,8 +371,8 @@
     True
     >>> 'value="36"' in stephan.contents
     True
-    >>> stephan.getControl('Paul Cardune').value = u'40'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Cardune, Paul').value = u'40'
+    >>> stephan.getControl('Save').click()
 
 The screen will return to the grade overview, where the grades are now
 visible:
@@ -390,16 +387,16 @@
 Now let's enter again and change a grade:
 
     >>> stephan.getLink('HW1').click()
-    >>> stephan.getControl('Claudia Richter').value = u'48'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Richter, Claudia').value = u'48'
+    >>> stephan.getControl('Save').click()
     >>> 'value="48"' in stephan.contents
     True
 
 When you want to delete an evaluation altogether, simply blank the value:
 
     >>> stephan.getLink('HW1').click()
-    >>> stephan.getControl('Claudia Richter').value = u''
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Richter, Claudia').value = u''
+    >>> stephan.getControl('Save').click()
     >>> 'value="98"' in stephan.contents
     False
 
@@ -415,10 +412,10 @@
 
     >>> stephan.getLink('Week 2').click()
     >>> stephan.getLink('HW2').click()
-    >>> stephan.getControl('Paul Cardune').value = u'90'
-    >>> stephan.getControl('Tom Hoffman').value = u'72'
-    >>> stephan.getControl('Claudia Richter').value = u'42'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Cardune, Paul').value = u'90'
+    >>> stephan.getControl('Hoffman, Tom').value = u'72'
+    >>> stephan.getControl('Richter, Claudia').value = u'42'
+    >>> stephan.getControl('Save').click()
 
 We'll set the current worksheet back to week 1 for the rest of the tests.
 
@@ -427,12 +424,70 @@
 We need to set Claudia's Quiz score to 86 to replace tests that we deleted.
 
     >>> stephan.getLink('Quiz').click()
-    >>> stephan.getControl('Claudia Richter').value = u'86'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Richter, Claudia').value = u'86'
+    >>> stephan.getControl('Save').click()
     >>> stephan.url
     'http://localhost/schoolyears/2007/winter/sections/1/activities/Worksheet/gradebook/index.html'
 
 
+Entering Scores for a Row (Student)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+With the introduction of the comment score system, we need to provide the user
+with a way of entering comments into the gradebook.  Since comments have
+arbitrary length, we need a special view for entering them.  We will provide
+a row view (by student) for this purpose.  When the user clicks on a student,
+they will see a form with one field for each activity, comments having the
+fckEditor widget, the rest of the score system types just having a TextLine
+widget.
+
+Additionally, the user will have two special buttons, 'Previous' and 'Next',
+which allows them to go from student to student without having to return to
+the gradebook spreadsheet each time.  'Apply' and 'Cancel' return to the
+spreadsheet as one would expect.
+
+We'll start by clicking on Paul and testing the contents of the form.
+Since Paul is the first student in the list of students, there will be
+no 'Previous' button.
+ 
+    >>> stephan.getLink('Cardune, Paul').click()
+    >>> analyze.printQuery("id('form')/div[1]/h3", stephan.contents)
+    <h3>Enter grades for Cardune, Paul</h3>
+    >>> analyze.printQuery("id('form')/div[2]//input", stephan.contents)
+    <input type="submit" id="form-buttons-apply" name="form.buttons.apply" class="submit-widget button-field button-ok" value="Apply" />
+    <input type="submit" id="form-buttons-next" name="form.buttons.next" class="submit-widget button-field button-ok" value="Next" />
+    <input type="submit" id="form-buttons-cancel" name="form.buttons.cancel" class="submit-widget button-field button-cancel" value="Cancel" />
+
+When we click on the 'Next' button it takes us to the middle student, Tom.
+Here we will see both a 'Previous' and a 'Next' button.
+
+    >>> stephan.getControl('Next').click()
+    >>> analyze.printQuery("id('form')/div[1]/h3", stephan.contents)
+    <h3>Enter grades for Hoffman, Tom</h3>
+    >>> analyze.printQuery("id('form')/div[2]//input", stephan.contents)
+    <input type="submit" id="form-buttons-apply" name="form.buttons.apply" class="submit-widget button-field button-ok" value="Apply" />
+    <input type="submit" id="form-buttons-previous" name="form.buttons.previous" class="submit-widget button-field button-ok" value="Previous" />
+    <input type="submit" id="form-buttons-next" name="form.buttons.next" class="submit-widget button-field button-ok" value="Next" />
+    <input type="submit" id="form-buttons-cancel" name="form.buttons.cancel" class="submit-widget button-field button-cancel" value="Cancel" />
+
+When we click on the 'Next' button it takes us to the last student, Claudia.
+Here we will see no 'Next' button.
+
+    >>> stephan.getControl('Next').click()
+    >>> analyze.printQuery("id('form')/div[1]/h3", stephan.contents)
+    <h3>Enter grades for Richter, Claudia</h3>
+    >>> analyze.printQuery("id('form')/div[2]//input", stephan.contents)
+    <input type="submit" id="form-buttons-apply" name="form.buttons.apply" class="submit-widget button-field button-ok" value="Apply" />
+    <input type="submit" id="form-buttons-previous" name="form.buttons.previous" class="submit-widget button-field button-ok" value="Previous" />
+    <input type="submit" id="form-buttons-cancel" name="form.buttons.cancel" class="submit-widget button-field button-cancel" value="Cancel" />
+
+Hitting the 'Cancel' button takes the user back to the gradebook.
+
+    >>> stephan.getControl('Cancel').click()
+    >>> analyze.printQuery("id('content-body')/div/form/span[3]", stephan.contents)
+    <span>show only activities due in past</span>
+
+
 Sorting
 ~~~~~~~
 
@@ -440,9 +495,9 @@
 descending and ascending fashion. By default the student's name is sorted
 alphabetically:
 
-    >>> stephan.contents.find('Claudia') \
-    ...     < stephan.contents.find('Paul') \
-    ...     < stephan.contents.find('Tom')
+    >>> stephan.contents.find('Carduner, Paul') \
+    ...     < stephan.contents.find('Hoffman, Tom') \
+    ...     < stephan.contents.find('Richter, Claudia')
     True
 
 Then we want to sort by grade in Homework 1, so we should have:
@@ -474,18 +529,18 @@
     >>> stephan.getLink('Summary').click()
     >>> print stephan.contents
     <BLANKLINE>
-    ...Claudia Richter...
-    ...86</td>...
-    ...42</td>...
-    ...C</td>...
-    ...Paul Cardune...
+    ...Paul...
     ...80</td>...
     ...90</td>...
     ...A</td>...
-    ...Tom Hoffman...
+    ...Tom...
     ...84</td>...
     ...72</td>...
     ...B</td>...
+    ...Claudia...
+    ...86</td>...
+    ...42</td>...
+    ...C</td>...
     >>> stephan.open(stephan.url[:stephan.url.rfind('/')])
 
 
@@ -537,11 +592,11 @@
     >>> stephan.getControl('Update').click()
     >>> print stephan.contents
     <BLANKLINE>
-    ...Claudia Richter...
+    ...Claudia...
     ...86%</b>...
-    ...Tom Hoffman...
+    ...Tom...
     ...84%</b>...
-    ...Paul Cardune...
+    ...Paul...
     ...80%</b>...
 
 Finally, we'll test hitting the 'Cancel' button.  It should return to the
@@ -571,7 +626,7 @@
     >>> 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 = 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'
     >>> manager.open(url)
@@ -680,22 +735,15 @@
     >>> manager.getLink('(2)').click()
 
     >>> manager.getLink('edit individuals').click()
-    >>> manager.getControl('Stephan Richter').click()
+    >>> manager.getControl(name='add_item.stephan').value = 'checked'
     >>> manager.getControl('Add').click()
     >>> manager.getControl('OK').click()
 
     >>> manager.getLink('edit instructors').click()
-    >>> manager.getControl('Tom Hoffman').click()
+    >>> manager.getControl(name='add_item.tom').value = 'checked'
     >>> manager.getControl('Add').click()
     >>> manager.getControl('OK').click()
 
-    >>> print manager.contents
-    <BLANKLINE>
-    ...Instructors...
-    ...Tom Hoffman...
-    ...Students...
-    ...Stephan Richter...
-
 We'll have Tom set up a worksheet.
 
     >>> tom = setup.logIn('tom', 'pwd')
@@ -779,7 +827,7 @@
     >>> manager.open('http://localhost/schoolyears/2007/winter/sections/1/gradebook')
     >>> manager.getLink('HW1').click()
     >>> manager.getControl(name='tom').value = '45'
-    >>> manager.getControl('Update').click()
+    >>> manager.getControl('Save').click()
 
 Let's set the setting back to cover our tracks:
 
@@ -797,7 +845,7 @@
     ...Physics I (1)...
     >>> stephan.getLink('HW1').click()
     >>> stephan.getControl(name='tom').value = '44'
-    >>> stephan.getControl('Update').click()
+    >>> stephan.getControl('Save').click()
 
 Students won't be able to see each other's grade's because the mygrades view
 uses the request's principal to determine which grades to display.
@@ -825,6 +873,11 @@
 
 Gradebook's worksheets can be exported to a XLS file:
 
+    >>> stephan.getLink('Export XLS').click()
+    >>> stephan.headers.get('Content-Type')
+    'application/excel'
+    >>> stephan.open('http://localhost/gradebook.html')
+    >>> stephan.getLink('Classes you teach').click()
     >>> stephan.getLink('Worksheets').click()
     >>> stephan.getLink('Export XLS').click()
     >>> stephan.headers.get('Content-Type')
@@ -878,9 +931,9 @@
     >>> stephan.contents
     <BLANKLINE>
     ...Name...Total...Ave...HW 1...Quiz...
-    ...Claudia Richter...<b>86</b>...<b>86%</b>...86...
-    ...Tom Hoffman...<b>44</b>...<b>88%</b>...44...
-    ...Paul Cardune...<b>40</b>...<b>80%</b>...40...
+    ...Claudia...<b>86</b>...<b>86%</b>...86...
+    ...Tom...<b>44</b>...<b>88%</b>...44...
+    ...Paul...<b>40</b>...<b>80%</b>...40...
 
 This state should change after we update the grades from external
 activities. Remember that the gradebook has weighting defined?:
@@ -930,9 +983,9 @@
     >>> stephan.contents
     <BLANKLINE>
     ...Name...Total...Ave...HW 1...Quiz...Hardware...
-    ...Claudia Richter...92.00...69%...86...6.00...
-    ...Tom Hoffman...53.00...82%...44...9.00...
-    ...Paul Cardune...40...80%...40...
+    ...Claudia...92.00...69%...86...6.00...
+    ...Tom...53.00...82%...44...9.00...
+    ...Paul...40...80%...40...
 
 Let's edit the external activity. The form doesn't allow to edit the
 score system. The edit view also shows an 'Update Grades' button to
@@ -982,7 +1035,7 @@
     >>> stephan.contents
     <BLANKLINE>
     ...Name...Total...Ave...HW 1...Quiz...Hardware As...
-    ...Claudia Richter...96.00...69%...86...10.00...
-    ...Tom Hoffman...59.00...79%...44...15.00...
-    ...Paul Cardune...40...80%...40...
+    ...Claudia...96.00...69%...86...10.00...
+    ...Tom...59.00...79%...44...15.00...
+    ...Paul...40...80%...40...
 

=== modified file 'src/schooltool/gradebook/browser/activity.py'
--- src/schooltool/gradebook/browser/activity.py	2009-05-05 00:01:47 +0000
+++ src/schooltool/gradebook/browser/activity.py	2009-06-28 00:30:06 +0000
@@ -59,6 +59,7 @@
 from schooltool.requirement.scoresystem import RangedValuesScoreSystem
 from schooltool.requirement.scoresystem import UNSCORED
 from schooltool.export import export
+from schooltool.basicperson.interfaces import IDemographics
 
 
 class ILinkedActivityFields(interface.Interface):
@@ -399,8 +400,9 @@
     def print_headers(self, ws, worksheet):
         gradebook = interfaces.IGradebook(worksheet)
         activities = gradebook.getWorksheetActivities(worksheet)
-        headers = [export.Header('Name')] + \
-                  [export.Header(activity.title) for activity in activities]
+        header_labels = ['ID', 'First name', 'Last name']
+        header_labels.extend([activity.title for activity in activities])
+        headers = [export.Header(label) for label in header_labels]
         for col, header in enumerate(headers):
             self.write(ws, 0, col, header.data, **header.style) 
 
@@ -408,8 +410,12 @@
         gradebook = interfaces.IGradebook(worksheet)
         activities = gradebook.getWorksheetActivities(worksheet)
         starting_row = 1
-        for row, student in enumerate(gradebook.students):
-            cells = [export.Text(student.title)]
+        students = sorted(gradebook.students,
+                          key=lambda x:IDemographics(x).get('ID', ''))
+        for row, student in enumerate(students):
+            cells = [export.Text(IDemographics(student).get('ID', '')),
+                     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:

=== modified file 'src/schooltool/gradebook/browser/configure.zcml'
--- src/schooltool/gradebook/browser/configure.zcml	2009-06-08 01:43:13 +0000
+++ src/schooltool/gradebook/browser/configure.zcml	2009-06-28 00:30:06 +0000
@@ -360,6 +360,14 @@
       permission="schooltool.view"
       />
 
+  <menuItem
+      menu="schooltool_actions"
+      title="Export XLS"
+      for="..interfaces.IGradebook"
+      action="../../export.xls"
+      permission="schooltool.view"
+      />
+
   <!-- Special navagation viewlet for update linked activity grades action -->
   <navigationViewlet
       name="update_grades"
@@ -435,6 +443,15 @@
       permission="schooltool.view"
       />
 
+  <!-- Student Gradebook -->
+  <page
+      name="index.html"
+      for="..interfaces.IStudentGradebook"
+      class=".gradebook.GradeStudent"
+      template="grade_student.pt"
+      permission="schooltool.edit"
+      />
+
   <!-- Terms -->
   <zope:adapter
       for="schooltool.gradebook.interfaces.IExternalActivitiesSource

=== modified file 'src/schooltool/gradebook/browser/ftesting.zcml'
--- src/schooltool/gradebook/browser/ftesting.zcml	2009-02-08 21:41:09 +0000
+++ src/schooltool/gradebook/browser/ftesting.zcml	2009-06-25 05:00:11 +0000
@@ -4,6 +4,7 @@
 
   <include package="schooltool.common" />
 
+  <include package="schooltool.basicperson" />
   <include package="schooltool.course" />
   <include package="schooltool.term" />
   <include package="schooltool.schoolyear" />
@@ -33,6 +34,15 @@
       name="samplesource"
       />
 
-  <browser:defaultSkin name="SchoolTool" />
+    <interface
+        interface="schooltool.basicperson.ftesting.IBasicPersonFtestingSkin"
+        type="zope.publisher.interfaces.browser.IBrowserSkinType"
+        name="BasicPerson"
+        />
+
+    <!-- Provide local overrides of standard configurations-->
+    <includeOverrides package="schooltool.basicperson" file="overrides.zcml" />
+
+    <browser:defaultSkin name="BasicPerson" />
 
 </configure>

=== added file 'src/schooltool/gradebook/browser/grade_student.pt'
--- src/schooltool/gradebook/browser/grade_student.pt	1970-01-01 00:00:00 +0000
+++ src/schooltool/gradebook/browser/grade_student.pt	2009-06-25 05:00:11 +0000
@@ -0,0 +1,8 @@
+<html metal:use-macro="view/@@standard_macros/page" i18n:domain="schooltool">
+  <body>
+    <metal:nothing metal:fill-slot="content-header" />
+    <metal:block metal:fill-slot="body">
+      <div metal:use-macro="macro:form" />
+    </metal:block>
+  </body>
+</html>

=== modified file 'src/schooltool/gradebook/browser/gradebook.css'
--- src/schooltool/gradebook/browser/gradebook.css	2009-06-01 21:32:36 +0000
+++ src/schooltool/gradebook/browser/gradebook.css	2009-07-06 02:39:56 +0000
@@ -152,3 +152,55 @@
     font-weight: bold;
 }
 
+FORM.addscoresystem, div.addscoresystem {
+    width: 48em;
+    margin: auto;
+}
+
+FORM.addscoresystem FIELDSET, div.addscoresystem FIELDSET {
+    margin: 1em;
+}
+
+FORM.addscoresystem h3, div.addscoresystem h3 {
+    margin: 0;
+    padding: 0.25em;
+}
+
+FORM.addscoresystem .controls, div.addscoresystem .controls {
+    margin: 0.5em 1em 1em 1em;
+}
+
+FORM.addscoresystem, div.addscoresystem, FORM div.oneline-form{
+    background: #eae8e3;
+    border: 1px #bab5ab solid;
+}
+
+FORM.addscoresystem h3, div.addscoresystem h3 {
+    background: #bab5ab;
+}
+
+FORM.addscoresystem FIELDSET, div.addscoresystem FIELDSET {
+    border: 1px #bab5ab solid;
+    /* Mozilla's default padding for fieldsets -- makes it nice in MSIE too */
+    padding: 0.35em 0.625em 0.75em 0.625em;
+}
+
+FORM.addscoresystem p, div.addscoresystem p {
+    margin: 0.5em;
+}
+
+FORM.addscoresystem p.hint, div.addscoresystem p.hint {
+    font-size: 80%;
+    font-style: italic;
+    color: #bab5ab;
+}
+
+FORM.addscoresystem .controls INPUT, div.addscoresystem .controls INPUT {
+    background: #fff;
+}
+
+FORM.addscoresystem DIV.label, div.addscoresystem DIV.label {
+    width: 10em;
+    padding-top: 0.5ex;
+}
+

=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2009-06-08 01:43:13 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2009-07-06 01:26:11 +0000
@@ -26,15 +26,20 @@
 import decimal
 
 from zope.app.keyreference.interfaces import IKeyReference
+from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.component import queryUtility
+from zope.html.field import HtmlFragment
 from zope.publisher.browser import BrowserView
-from zope.schema import ValidationError
+from zope.schema import ValidationError, Text, TextLine
 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.viewlet import viewlet
 
+from z3c.form import form as z3cform
+from z3c.form import field, button
+
 from schooltool.app import app
 from schooltool.app.interfaces import ISchoolToolApplication
 from schooltool.course.interfaces import ISection
@@ -43,6 +48,7 @@
 from schooltool.gradebook.activity import ensureAtLeastOneWorksheet
 from schooltool.person.interfaces import IPerson
 from schooltool.requirement.scoresystem import UNSCORED
+from schooltool.requirement.interfaces import ICommentScoreSystem
 from schooltool.requirement.interfaces import IValuesScoreSystem
 from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
 from schooltool.requirement.interfaces import IRangedValuesScoreSystem
@@ -55,6 +61,7 @@
 
 DISCRETE_SCORE_SYSTEM = 'd'
 RANGED_SCORE_SYSTEM = 'r'
+COMMENT_SCORE_SYSTEM = 'c'
 
 column_keys = [('total', _("Total")), ('average', _("Ave."))]
 
@@ -158,8 +165,10 @@
             if IDiscreteValuesScoreSystem.providedBy(ss):
                 result = [DISCRETE_SCORE_SYSTEM] + [score[0] 
                     for score in ss.scores]
-            else:
+            elif IRangedValuesScoreSystem.providedBy(ss):
                 result = [RANGED_SCORE_SYSTEM, ss.min, ss.max]
+            else:
+                result = [COMMENT_SCORE_SYSTEM]
             resultStr = ', '.join(["'%s'" % unicode(value) 
                 for value in result])
             results[hash(IKeyReference(activity))] = resultStr
@@ -313,7 +322,7 @@
     def update(self):
         self.person = IPerson(self.request.principal)
         gradebook = proxy.removeSecurityProxy(self.context)
-        self.message = ''
+        self.messages = []
 
         """Make sure the current worksheet matches the current url"""
         worksheet = gradebook.context
@@ -365,11 +374,12 @@
                         score = activity.scoresystem.fromUnicode(
                             self.request[cell_name])
                     except (ValidationError, ValueError):
-                        self.message = _(
+                        message = _(
                             'The grade $value for activity $name is not valid.',
                             mapping={'value': self.request[cell_name],
                                      'name': activity.title})
-                        return
+                        self.messages.append(message)
+                        continue
                     ev = gradebook.getEvaluation(student, activity)
                     # Delete the score
                     if ev is not None and score is UNSCORED:
@@ -410,9 +420,13 @@
             if len(shortTitle) > 5:
                 shortTitle = shortTitle[:5].strip()
 
+            if ICommentScoreSystem.providedBy(activity.scoresystem):
+                bestScore = ''
+            else:
+                bestScore = activity.scoresystem.getBestScore()
             result.append({'shortTitle': shortTitle,
                            'longTitle': activity.title,
-                           'max': activity.scoresystem.getBestScore(),
+                           'max': bestScore,
                            'hash': hash(IKeyReference(activity))})
             
         return result
@@ -449,7 +463,20 @@
                 if cell_name in self.request:
                     value = self.request[cell_name]
 
-                grades.append({'activity': act_hash, 'value': value})
+                ss = activity.scoresystem
+                if ICommentScoreSystem.providedBy(ss):
+                    editable = False
+                    if value:
+                        value = '...'
+                else:
+                    editable = True
+
+                grade = {
+                    'activity': act_hash,
+                    'editable': editable,
+                    'value': value
+                    }
+                grades.append(grade)
 
             total, average = gradebook.getWorksheetTotalAverage(worksheet,
                 student)
@@ -459,7 +486,8 @@
             rows.append(
                 {'student': {'title': student.title, 
                              'id': student.username,
-                             'url': absoluteURL(student, self.request),
+                             'url': absoluteURL(self.context, self.request) +
+                                    ('/%s' % student.username) 
                             },
                  'grades': grades, 'total': unicode(total),
                  'average': unicode(average)
@@ -543,8 +571,6 @@
 class GradeActivity(object):
     """Grading a single activity"""
 
-    message = ''
-
     @property
     def activity(self):
         act_hash = int(self.request['activity'])
@@ -570,6 +596,7 @@
                    'value': value}
 
     def update(self):
+        self.messages = []
         if 'CANCEL' in self.request:
             self.request.response.redirect('index.html')
 
@@ -588,11 +615,12 @@
                         score = activity.scoresystem.fromUnicode(
                             self.request[id])
                     except (ValidationError, ValueError):
-                        self.message = _(
+                        message = _(
                             'The grade $value for $name is not valid.',
                             mapping={'value': self.request[id],
                                      'name': student.title})
-                        return
+                        self.messages.append(message)
+                        continue
                     ev = gradebook.getEvaluation(student, activity)
                     # Delete the score
                     if ev is not None and score is UNSCORED:
@@ -605,7 +633,8 @@
                         self.context.evaluate(
                             student, activity, score, evaluator)
 
-            self.request.response.redirect('index.html')
+            if not len(self.messages):
+                self.request.response.redirect('index.html')
 
 
 def getScoreSystemDiscreteValues(ss):
@@ -789,3 +818,123 @@
     def update(self):
         pass
 
+
+class GradeStudent(z3cform.EditForm):
+    """Edit form for a student's grades."""
+    z3cform.extends(z3cform.EditForm)
+    template = ViewPageTemplateFile('grade_student.pt')
+
+    def __init__(self, context, request):
+        super(GradeStudent, self).__init__(context, request)
+
+    def update(self):
+        self.person = IPerson(self.request.principal)
+        for index, activity in enumerate(self.getFilteredActivities()):
+            if ICommentScoreSystem.providedBy(activity.scoresystem):
+                field_cls = HtmlFragment
+            else:
+                field_cls = TextLine
+            newSchemaFld = field_cls(
+                title=activity.title,
+                description=activity.description,
+                constraint=activity.scoresystem.fromUnicode,
+                required=False)
+            newSchemaFld.__name__ = str(hash(IKeyReference(activity)))
+            newSchemaFld.interface = interfaces.IStudentGradebookForm
+            newFormFld = field.Field(newSchemaFld)
+            self.fields += field.Fields(newFormFld)
+        super(GradeStudent, self).update()
+
+    @button.buttonAndHandler(_("Previous"))
+    def handle_previous_action(self, action):
+        if self.applyData():
+            return
+        prev, next = self.prevNextStudent()
+        if prev is not None:
+            url = '%s/%s' % (self.nextURL(), prev.username)
+            self.request.response.redirect(url)
+
+    @button.buttonAndHandler(_("Next"))
+    def handle_next_action(self, action):
+        if self.applyData():
+            return
+        prev, next = self.prevNextStudent()
+        if next is not None:
+            url = '%s/%s' % (self.nextURL(), next.username)
+            self.request.response.redirect(url)
+
+    @button.buttonAndHandler(_("Cancel"))
+    def handle_cancel_action(self, action):
+        self.request.response.redirect(self.nextURL())
+
+    def applyData(self):
+        data, errors = self.extractData()
+        if errors:
+            self.status = self.formErrorsMessage
+            return True
+        changes = self.applyChanges(data)
+        if changes:
+            self.status = self.successMessage
+        else:
+            self.status = self.noChangesMessage
+        return False
+
+    def updateActions(self):
+        super(GradeStudent, self).updateActions()
+        self.actions['apply'].addClass('button-ok')
+        self.actions['previous'].addClass('button-ok')
+        self.actions['next'].addClass('button-ok')
+        self.actions['cancel'].addClass('button-cancel')
+
+        prev, next = self.prevNextStudent()
+        if prev is None:
+            del self.actions['previous']
+        if next is None:
+            del self.actions['next']
+
+    def applyChanges(self, data):
+        super(GradeStudent, self).applyChanges(data)
+        self.request.response.redirect(self.nextURL())
+
+    def prevNextStudent(self):
+        gradebook = proxy.removeSecurityProxy(self.context.gradebook)
+        section = ISection(gradebook)
+        student = self.context.student
+
+        prev, next = None, None
+        members = [member for name, member in
+                   sorted([(m.last_name + m.first_name, m) for m in section.members])]
+        if len(members) < 2:
+            return prev, next
+        for index, member in enumerate(members):
+            if member == student:
+                if index == 0:
+                    next = members[1]
+                elif index == len(members) - 1:
+                    prev = members[-2]
+                else:
+                    prev = members[index - 1]
+                    next = members[index + 1]
+                break
+        return prev, next
+
+    def isFiltered(self, activity):
+        flag, weeks = self.context.gradebook.getDueDateFilter(self.person)
+        if not flag:
+            return False
+        cutoff = datetime.date.today() - datetime.timedelta(7 * int(weeks))
+        return activity.due_date < cutoff
+
+    def getFilteredActivities(self):
+        activities = self.context.gradebook.getCurrentActivities(self.person)
+        return[activity for activity in activities
+               if not self.isFiltered(activity)]
+
+    @property
+    def label(self):
+        return _(u'Enter grades for ${fullname}',
+                 mapping={'fullname': self.context.student.title})
+
+    def nextURL(self):
+        return absoluteURL(self.context.gradebook, self.request)
+

=== modified file 'src/schooltool/gradebook/browser/gradebook_grade_activity.pt'
--- src/schooltool/gradebook/browser/gradebook_grade_activity.pt	2009-04-03 20:34:21 +0000
+++ src/schooltool/gradebook/browser/gradebook_grade_activity.pt	2009-07-06 03:19:53 +0000
@@ -19,11 +19,12 @@
   </h3>
   <br />
 
-  <div class="message"
-       tal:condition="view/message"
-       tal:content="view/message">
+  <div class="message" style="color:red"
+       tal:repeat="message view/messages"
+       tal:content="message">
     Message
   </div>
+  <br />
 
   <form tal:attributes="action request/URL"
         method="post" enctype="multipart/form-data">
@@ -94,7 +95,7 @@
     </table>
 
     <div class="controls">
-      <tal:block metal:use-macro="view/@@standard_macros/update-button" />
+    <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save" />
       <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-04-30 19:20:05 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-07-06 00:18:14 +0000
@@ -1,8 +1,9 @@
+<tal:tag condition="view/update" />
 /* This is the Javascript to be included when rendering the gradebook overview. */
 var numstudents = <tal:block replace="python: len(view.students)"/> 
 var students = new Array(numstudents);
-<tal:loop repeat="student view/students">
-     students[<tal:block replace="repeat/student/index"/>] = '<tal:block replace="python: view.breakJSString(student.username)"/>';
+<tal:loop repeat="row view/table">
+     students[<tal:block replace="repeat/row/index"/>] = '<tal:block replace="python: view.breakJSString(row['student']['id'])"/>';
      </tal:loop>
 
 var numactivities = <tal:block replace="python: len(view.activities())"/> 
@@ -167,6 +168,11 @@
     var element = document.getElementById(name);
     var elementCell = document.getElementById(name+'_cell');
     var value = element.value;
+
+
+
+
+
     changeBackgroundColor(name+'_cell', 'default_bg');
 
     if (value == '')

=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.pt	2009-05-15 06:01:23 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.pt	2009-07-06 03:19:53 +0000
@@ -90,11 +90,12 @@
     <span>weeks</span>
     <br /><br />
 
-  <div class="message" style="color:red; padding:1em"
-       tal:condition="view/message"
-       tal:content="view/message">
+  <div class="message" style="color:red"
+       tal:repeat="message view/messages"
+       tal:content="message">
     Message
   </div>
+  <br />
 
   <table class="schooltool_gradebook">
     <tr>
@@ -191,7 +192,10 @@
         </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"
+             tal:content="grade/value" />
           <input class="data" type="text" name="" value="" size="4"
+                 tal:condition="grade/editable"
                  onkeydown="spreadsheetBehaviour(event)"
                  tal:attributes="name string:${grade/activity}_${row/student/id};
                                  id string:${grade/activity}_${row/student/id};
@@ -220,7 +224,10 @@
         </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"
+             tal:content="grade/value" />
           <input class="data" type="text" name="" value="" size="4"
+                 tal:condition="grade/editable"
                  onkeydown="spreadsheetBehaviour(event)"
                  tal:attributes="name string:${grade/activity}_${row/student/id};
                                  id string:${grade/activity}_${row/student/id};
@@ -233,7 +240,7 @@
   </table>
 
   <div class="controls">
-    <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Update" 
+    <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save" 
            onclick="setNotEdited()"/>
   </div>
 

=== modified file 'src/schooltool/gradebook/browser/no_current_term.txt'
--- src/schooltool/gradebook/browser/no_current_term.txt	2009-06-08 01:43:13 +0000
+++ src/schooltool/gradebook/browser/no_current_term.txt	2009-06-25 05:00:11 +0000
@@ -8,9 +8,9 @@
 
 Let's log in as manager and create a student.
 
-    >>> from schooltool.app.browser.ftests import setup
+    >>> from schooltool.basicperson.browser.ftests import setup
     >>> manager = Browser('manager', 'schooltool')
-    >>> setup.addPerson('Student One', 'student1', 'pwd')
+    >>> 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
@@ -18,7 +18,7 @@
 
     >>> manager.getLink('Manage').click()
     >>> manager.getLink('Persons').click()
-    >>> manager.getLink('Student One').click()
+    >>> manager.getLink('One').click()
     >>> manager.getLink('Print Report Card').click()
     >>> manager.url
     'http://localhost/no_current_term.html'

=== modified file 'src/schooltool/gradebook/browser/report_card.txt'
--- src/schooltool/gradebook/browser/report_card.txt	2009-04-28 23:46:54 +0000
+++ src/schooltool/gradebook/browser/report_card.txt	2009-06-25 05:00:11 +0000
@@ -95,18 +95,19 @@
 terms with some sections.  Of course, we'll need a teacher and some students
 in order to do that.
 
-    >>> setup.addPerson('Teacher One', 'teacher1', 'pwd')
-    >>> setup.addPerson('Student One', 'student1', 'pwd')
-    >>> setup.addPerson('Student Two', 'student2', 'pwd')
+    >>> from schooltool.basicperson.browser.ftests.setup import addPerson
+    >>> addPerson('Teacher1', 'One', 'teacher1', 'pwd')
+    >>> addPerson('Student1', 'One', 'student1', 'pwd')
+    >>> addPerson('Student2', 'Two', 'student2', 'pwd')
     >>> setup.addCourse('CompSci I', '2005-2006')
     >>> setup.addSection('CompSci I', '2005-2006', 'Spring',
     ...                  title='Morning CompSci I',
-    ...                  instructors=['Teacher One'],
-    ...                  members=['Student One','Student Two'])
+    ...                  instructors=['Teacher1'],
+    ...                  members=['Student1','Student2'])
     >>> setup.addSection('CompSci I', '2005-2006', 'Spring',
     ...                  title='Afternoon CompSci I',
-    ...                  instructors=['Teacher One'],
-    ...                  members=['Student One','Student Two'])
+    ...                  instructors=['Teacher1'],
+    ...                  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.
@@ -214,8 +215,8 @@
 
     >>> setup.addSection('CompSci I', '2005-2006', 'Spring',
     ...                  title='Evening CompSci I',
-    ...                  instructors=['Teacher One'],
-    ...                  members=['Student One','Student Two'])
+    ...                  instructors=['Teacher1'],
+    ...                  members=['Student1','Student2'])
 
     >>> manager.open(term_url)
     >>> manager.getLink('Sections').click()
@@ -257,8 +258,8 @@
 
     >>> setup.addSection('CompSci I', '2005-2006', 'Fall',
     ...                  title='Evening CompSci I',
-    ...                  instructors=['Teacher One'],
-    ...                  members=['Student One','Student Two'])
+    ...                  instructors=['Teacher1'],
+    ...                  members=['Student1','Student2'])
 
     >>> manager.getLink('Manage').click()
     >>> manager.getLink('Report Sheet Templates').click()

=== modified file 'src/schooltool/gradebook/configure.zcml'
--- src/schooltool/gradebook/configure.zcml	2009-06-05 00:11:04 +0000
+++ src/schooltool/gradebook/configure.zcml	2009-06-25 05:00:11 +0000
@@ -189,6 +189,23 @@
       trusted="true"
       />
 
+  <!-- Student Gradebook Adapter -->
+  <class class=".gradebook.StudentGradebook">
+    <require
+        permission="schooltool.view"
+        interface=".interfaces.IStudentGradebook" />
+  </class>
+  <adapter
+      factory=".gradebook.StudentGradebook"
+      trusted="true"
+      />
+
+
+  <!-- Student Gradebook Form Adapter -->
+  <adapter
+      factory=".gradebook.StudentGradebookFormAdapter"
+      />
+
   <!-- MyGrades Adapter -->
   <class class=".gradebook.MyGrades">
     <require
@@ -250,6 +267,14 @@
       provides="zope.publisher.interfaces.IPublishTraverse"
       factory=".gradebook.WorksheetGradebookTraverser" />
 
+  <!-- special traversal adapter for traversing from a section gradebook
+       to a student gradebook -->
+  <adapter
+      for=".interfaces.IGradebook
+           zope.publisher.interfaces.http.IHTTPRequest"
+      provides="zope.publisher.interfaces.IPublishTraverse"
+      factory=".gradebook.StudentGradebookTraverser" />
+
   <!-- apidoc help setup -->
   <configure
       xmlns:zcml="http://namespaces.zope.org/zcml"

=== modified file 'src/schooltool/gradebook/gradebook.py'
--- src/schooltool/gradebook/gradebook.py	2009-06-01 21:32:36 +0000
+++ src/schooltool/gradebook/gradebook.py	2009-06-29 07:43:38 +0000
@@ -30,11 +30,14 @@
 from zope.security import proxy
 from zope import annotation
 from zope.app.keyreference.interfaces import IKeyReference
+from zope.component import adapts, queryMultiAdapter, getMultiAdapter
 from zope.interface import implements
 from zope.location.location import LocationProxy
 from zope.publisher.interfaces import IPublishTraverse
+from zope.security.proxy import removeSecurityProxy
 
 from schooltool import course, requirement
+from schooltool.basicperson.interfaces import IBasicPerson
 from schooltool.traverser import traverser
 from schooltool.securitypolicy.crowds import ConfigurableCrowd
 from schooltool.securitypolicy.crowds import AggregateCrowd
@@ -45,7 +48,7 @@
 from schooltool.gradebook import interfaces
 from schooltool.gradebook.activity import Activities
 from schooltool.gradebook.activity import ensureAtLeastOneWorksheet
-from schooltool.requirement.scoresystem import UNSCORED
+from schooltool.requirement.scoresystem import UNSCORED, ScoreValidationError
 from schooltool.requirement.interfaces import IDiscreteValuesScoreSystem
 from schooltool.requirement.interfaces import IRangedValuesScoreSystem
 from schooltool.common import SchoolToolMessage as _
@@ -85,6 +88,35 @@
                 return queryMultiAdapter((self.context, request), name=name)
 
 
+class StudentGradebookTraverser(object):
+    '''Traverser that goes from a section's gradebook to a student
+    gradebook using the student's username as the path in the url.'''
+
+    implements(IPublishTraverse)
+
+    def __init__(self, context, request):
+        self.context = context
+        self.request = request
+
+    def publishTraverse(self, request, name):
+        app = ISchoolToolApplication(None)
+        context = removeSecurityProxy(self.context)
+
+        try:
+            student = app['persons'][name]
+        except KeyError:
+            return queryMultiAdapter((self.context, request), name=name)
+
+        try:
+            gb = getMultiAdapter((student, context), interfaces.IStudentGradebook)
+        except ValueError:
+            return queryMultiAdapter((self.context, request), name=name)
+
+        # location looks like http://host/path/to/gradebook/studentsUsername
+        gb = LocationProxy(gb, self.context, name)
+        return gb
+
+
 class GradebookBase(object):
     def __init__(self, context):
         self.context = context
@@ -365,6 +397,49 @@
         self.__name__ = 'mygrades'
 
 
+class StudentGradebook(object):
+    """Adapter of student and gradebook used for grading one student at a
+       time"""
+    implements(interfaces.IStudentGradebook)
+    adapts(IBasicPerson, interfaces.IGradebook)
+
+    def __init__(self, student, gradebook):
+        self.student = student
+        self.gradebook = gradebook
+        activities = [(unicode(hash(IKeyReference(activity))), activity)
+            for activity in gradebook.activities]
+        self.activities = dict(activities)
+
+
+class StudentGradebookFormAdapter(object):
+    """Adapter used by grade student view to interact with student
+       gradebook"""
+    implements(interfaces.IStudentGradebookForm)
+    adapts(interfaces.IStudentGradebook)
+
+    def __init__(self, context):
+        self.__dict__['context'] = context
+
+    def __setattr__(self, name, value):
+        activity = self.context.activities[name]
+        evaluator = None
+        try:
+            score = activity.scoresystem.fromUnicode(value)
+            self.context.gradebook.evaluate(self.context.student, activity,
+                                            score, evaluator)
+        except ScoreValidationError:
+            pass
+
+    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 ''
+    
+
 def getWorksheetSection(worksheet):
     """Adapt IWorksheet to ISection."""
     return worksheet.__parent__.__parent__

=== modified file 'src/schooltool/gradebook/interfaces.py'
--- src/schooltool/gradebook/interfaces.py	2009-06-01 21:32:36 +0000
+++ src/schooltool/gradebook/interfaces.py	2009-06-25 05:00:11 +0000
@@ -268,6 +268,20 @@
     """
 
 
+class IStudentGradebook(Interface):
+    """The gradebook for grading a student in a section."""
+
+    student = Attribute("""The student being graded""")
+
+    gradebook = Attribute("""The section gradebook""")
+
+    activities = Attribute("""A dictionary of activity hash to activity""")
+
+
+class IStudentGradebookForm(Interface):
+    """Interface for fields that are stored in student gradebook."""
+
+
 class IMyGrades(Interface):
     """The students gradebook for a section.
 

=== modified file 'src/schooltool/requirement/README.txt'
--- src/schooltool/requirement/README.txt	2009-05-14 08:34:27 +0000
+++ src/schooltool/requirement/README.txt	2009-06-25 05:00:11 +0000
@@ -229,7 +229,7 @@
   >>> check.fromUnicode('f')
   Traceback (most recent call last):
   ...
-  ValidationError: 'f' is not a valid score.
+  ScoreValidationError
 
   >>> check.fromUnicode('') is scoresystem.UNSCORED
   True
@@ -446,7 +446,7 @@
   >>> quizScore.fromUnicode('This causes a ValueError.')
   Traceback (most recent call last):
   ...
-  ValueError
+  ScoreValidationError
 
 Since we have not defined a minimum passing grade, we cannot get a meaningful
 answer from the passing score evaluation:

=== modified file 'src/schooltool/requirement/browser/README.txt'
--- src/schooltool/requirement/browser/README.txt	2009-06-05 00:11:04 +0000
+++ src/schooltool/requirement/browser/README.txt	2009-07-06 02:39:56 +0000
@@ -95,7 +95,7 @@
 
 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 = update_url + '&title=Good/Bad&displayed1=G&value1=1&percent1=60'
     >>> url = url + '&displayed2=B&value2=0&percent2=0'
     >>> manager.open(url)
 

=== modified file 'src/schooltool/requirement/browser/scoresystem.py'
--- src/schooltool/requirement/browser/scoresystem.py	2009-05-14 08:34:27 +0000
+++ src/schooltool/requirement/browser/scoresystem.py	2009-07-06 02:39:56 +0000
@@ -90,7 +90,7 @@
 
             if not self.validateForm():
                 return
-            if 'SAVE' in self.request:
+            if 'UPDATE_SUBMIT' in self.request:
                 if not self.validateScores():
                     return
                 target = scoresystem.CustomScoreSystem()

=== modified file 'src/schooltool/requirement/browser/scoresystem_add.pt'
--- src/schooltool/requirement/browser/scoresystem_add.pt	2009-05-08 18:19:21 +0000
+++ src/schooltool/requirement/browser/scoresystem_add.pt	2009-07-06 02:59:50 +0000
@@ -5,34 +5,48 @@
 </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"
+  <form method="post" class="addscoresystem"
         tal:attributes="action string:${context/@@absolute_url}/add.html">
     <input type="hidden" name="form-submitted" value="" />
 
+	<h3>Add Score System</h3>
+
+    <div class="message" style="color:red; padding:1em"
+         tal:condition="view/message"
+         tal:content="view/message">
+      Message
+    </div>
+	<p>
+	  This form allows you to create a customized "score system" or grading scale.
+	</p>
+	<p>
+      Each score system needs a short title to identify it to users, for example, if your school's grades go from "A" to "E," the title could be "A-E."
+	</p>
+	<p>
+      A score system is made up of a sequence of possible scores with decreasing values.
+	</p>
+	<p>
+      Each score is associated with a numeric point value. For example, in the US, an "A" is usually worth 4 points, a "B," 3 points, etc. This value will be used in any calculations made with the scores, such as finding a grade point average.
+	</p>
+	<p>
+      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>
+      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>
+    <legend><b>New Score System</b><legend>
     <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>
+        <th class="cell header fully_padded">Score</th>
+        <th class="cell header fully_padded">Point Value</th>
+        <th class="cell header fully_padded">Minimum Percentage</th>
       </tr>
 
       <tal:block repeat="score view/scores">
@@ -53,10 +67,13 @@
       </tal:block>
 
     </table>
-    <div style="height: 11px;"></div>
+    <div class="controls">
+      <input type="submit" class="button-ok" name="SAVE" value="Add a lower score" />
+    </div>
+    </fieldset>
 
     <div class="controls">
-      <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Update" />
+      <input type="submit" class="button-ok" name="UPDATE_SUBMIT" value="Save" />
       <input type="submit" class="button-cancel" name="CANCEL" value="Cancel" />
     </div>
   </form>

=== modified file 'src/schooltool/requirement/configure.zcml'
--- src/schooltool/requirement/configure.zcml	2009-06-05 00:11:04 +0000
+++ src/schooltool/requirement/configure.zcml	2009-06-29 07:43:38 +0000
@@ -47,6 +47,16 @@
   </class>
 
   <!-- Scoresystem Content -->
+  <class class=".scoresystem.GlobalCommentScoreSystem">
+    <require
+        permission="zope.View"
+        interface=".interfaces.ICommentScoreSystem"
+        />
+    <require
+        permission="schooltool.edit"
+        set_schema=".interfaces.IScoreSystem"
+        />
+  </class>
   <class class=".scoresystem.DiscreteValuesScoreSystem">
     <require
         permission="zope.View"
@@ -119,6 +129,11 @@
       component=".scoresystem.HundredPointsScoreSystem"
       name="100 Points"
       />
+  <utility
+      provides="schooltool.requirement.interfaces.IScoreSystem"
+      component=".scoresystem.CommentScoreSystem"
+      name="Comment"
+      />
 
   <!-- Evaluations Content -->
   <class class=".evaluation.Evaluations">

=== modified file 'src/schooltool/requirement/interfaces.py'
--- src/schooltool/requirement/interfaces.py	2009-05-08 18:19:21 +0000
+++ src/schooltool/requirement/interfaces.py	2009-06-29 07:43:38 +0000
@@ -84,6 +84,10 @@
         """
 
 
+class ICommentScoreSystem(IScoreSystem):
+    """A Score System for free-form comments."""
+
+
 class IValuesScoreSystem(IScoreSystem):
     """A Score System that deal with specific score values."""
 

=== modified file 'src/schooltool/requirement/scoresystem.py'
--- src/schooltool/requirement/scoresystem.py	2009-05-14 08:34:27 +0000
+++ src/schooltool/requirement/scoresystem.py	2009-06-29 07:43:38 +0000
@@ -40,6 +40,15 @@
 from schooltool.requirement.interfaces import IScoreSystemsProxy
 
 
+class ScoreValidationError(zope.schema.ValidationError):
+    """Validation error for scores"""
+    def __init__(self, score):
+        self.score = score
+
+    def doc(self):
+        return "'%s' is not a valid score." % self.score
+
+
 def ScoreSystemsVocabulary(context):
     return UtilityVocabulary(context,
                              interface=interfaces.IScoreSystem)
@@ -87,7 +96,12 @@
         raise NotImplementedError
 
 
-class CommentScoreSystem(AbstractScoreSystem):
+class GlobalCommentScoreSystem(AbstractScoreSystem):
+    zope.interface.implements(interfaces.ICommentScoreSystem)
+
+    def __init__(self, title, description=None):
+        super(GlobalCommentScoreSystem, self).__init__(title, description)
+        self.__name__ = title
 
     def isValidScore(self, score):
         """See interfaces.IScoreSystem"""
@@ -106,7 +120,7 @@
 
 
 # Singelton
-CommentScoreSystem = CommentScoreSystem(
+CommentScoreSystem = GlobalCommentScoreSystem(
     u'Comments', u'Scores are commentary text.')
 
 
@@ -177,8 +191,7 @@
             return UNSCORED
 
         if not self.isValidScore(rawScore):
-            raise zope.schema.ValidationError(
-                "'%s' is not a valid score." %rawScore)
+            raise ScoreValidationError(rawScore)
         return rawScore
 
     def getNumericalValue(self, score):
@@ -290,11 +303,10 @@
         try:
             score = Decimal(rawScore)
         except:
-            raise ValueError
+            raise ScoreValidationError(rawScore)
 
         if not self.isValidScore(score):
-            raise zope.schema.ValidationError(
-                "%r is not a valid score." %score)
+            raise ScoreValidationError(rawScore)
         return score
 
     def getNumericalValue(self, score):