Merge lp:~aelkner/schooltool.gradebook/csv_view into lp:schooltool.gradebook/0.9

[Alan Elkner]

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2010-09-16 14:54:02 +0000
+++ CHANGES.txt	2010-09-20 04:14:47 +0000
@@ -22,6 +22,7 @@
 
 - CSV export of all sections' grades (requested by SLA)
 - Custom Score Systems need min/max passing scores (https://launchpad.net/bugs/616451)
+- Grades rounding mismatch (https://launchpad.net/bugs/585796)
 
 Bug fixes
 +++++++++
 
=== modified file 'src/schooltool/gradebook/browser/README.txt'
--- src/schooltool/gradebook/browser/README.txt	2010-09-13 08:39:53 +0000
+++ src/schooltool/gradebook/browser/README.txt	2010-09-20 04:14:47 +0000
@@ -1536,6 +1536,22 @@
     'http://localhost/schoolyears/2007/winter/sections/1/activities/Worksheet/mygrades'
 
 
+Average tests
+-------------
+
+When we weren't using the same method to calculate the average in the gradebook
+and the mygrades views, that led to the averages sometimes coming out differently.
+Here we will test the the average is the same for Claudia in both views.
+
+    >>> stephan.open('http://localhost/schoolyears/2007/winter/sections/1/gradebook')
+    >>> stephan.printQuery("id('content-body')//table[2]/tr[4]/td[3]/b")
+    <b>69%</b>
+
+    >>> claudia.open('http://localhost/schoolyears/2007/winter/sections/1/mygrades')
+    >>> claudia.printQuery("id('content-body')//table[2]/tr[1]/td[1]/div")
+    <div> Ave.: 69%</div>
+
+
 CSV test
 --------
 
 
=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2010-09-14 22:05:14 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2010-09-20 04:14:47 +0000
@@ -710,6 +710,7 @@
     def update(self):
         self.person = IPerson(self.request.principal)
         gradebook = proxy.removeSecurityProxy(self.context)
+        worksheet = proxy.removeSecurityProxy(gradebook.context)
 
         """Make sure the current worksheet matches the current url"""
         worksheet = gradebook.context
@@ -720,7 +721,6 @@
         self.processColumnPreferences()
 
         self.table = []
-        total = 0
         count = 0
         for activity in self.context.getCurrentActivities(self.person):
             activity = proxy.removeSecurityProxy(activity)
@@ -739,7 +739,6 @@
                         value = ss.getNumericalValue(value)
                         if value is None:
                             value = 0
-                    total += value - s_min
                     count += s_max - s_min
                     grade = {
                         'comment': False,
@@ -769,7 +768,8 @@
             self.table.append(row)
 
         if count:
-            average = int(round(Decimal(100 * total) / Decimal(count)))
+            total, average = gradebook.getWorksheetTotalAverage(worksheet,
+                self.person)
             self.average = convertAverage(average, self.average_scoresystem)
         else:
             self.average = None