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

[Alan Elkner]

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

80. By Alan Elkner on 2009-07-10

returning invalid scores are now higlighted in red, bug #391305

81. By Alan Elkner on 2009-07-13

added call to setUpGradebookRoot to evolve1 script

82. By Alan Elkner on 2009-07-14

changed invalid score error messages to be only one message

[Justas Sadzevičius (justas.sadzevicius)]

review: Approve

=== modified file 'src/schooltool/gradebook/browser/README.txt'
--- src/schooltool/gradebook/browser/README.txt	2009-07-07 11:13:56 +0000
+++ src/schooltool/gradebook/browser/README.txt	2009-07-08 19:30:04 +0000
@@ -796,12 +796,19 @@
 schooltool.gradebook package where they belong, so here is where they will
 be.
 
-The first test will be for the unauthenticated user.  They should not be able
-to see a gradebook and certainly don't have a mygrades view.
+The first test will be for the unauthenticated user.  If they hit the
+'Gradebook' link at the top, they should be redirected to the login view.
 
     >>> from zope.testbrowser.testing import Browser
     >>> unauth = Browser()
     >>> unauth.handleErrors = False
+    >>> unauth.open('http://localhost/gradebook.html')
+    >>> unauth.url
+    'http://localhost/auth/@@login.html?nexturl=http://localhost/gradebook.html'
+
+They should not be able to see a gradebook and certainly don't have a mygrades
+view.
+
     >>> unauth.open('http://localhost/schoolyears/2007/winter/sections/1/gradebook')
     Traceback (most recent call last):
     ...
 
=== modified file 'src/schooltool/gradebook/browser/gradebook.py'
--- src/schooltool/gradebook/browser/gradebook.py	2009-07-06 14:41:36 +0000
+++ src/schooltool/gradebook/browser/gradebook.py	2009-07-08 19:30:04 +0000
@@ -96,6 +96,15 @@
 class GradebookStartup(object):
     """A view for entry into into the gradebook or mygrades views."""
 
+    def __call__(self):
+        if IPerson(self.request.principal, None) is None:
+            url = absoluteURL(ISchoolToolApplication(None), self.request)
+            url = '%s/auth/@@login.html?nexturl=%s' % (url, self.request.URL)
+            self.request.response.redirect(url)
+            return ''
+        template = ViewPageTemplateFile('gradebook_startup.pt')
+        return template(self)
+
     def update(self):
         self.person = IPerson(self.request.principal)
         self.sectionsTaught = list(IInstructor(self.person).sections())
 
=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.js.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-07-06 00:18:14 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.js.pt	2009-07-08 22:10:04 +0000
@@ -169,10 +169,11 @@
     var elementCell = document.getElementById(name+'_cell');
     var value = element.value;
 
-
-
-
-
+    return setBackgroundColor(name, activity, value);
+}
+
+function setBackgroundColor(name, activity, value)
+{
     changeBackgroundColor(name+'_cell', 'default_bg');
 
     if (value == '')
@@ -223,12 +224,14 @@
 	    return false;
 	}
     for(j=0;j!=numstudents;j++) {
-    	document.getElementById(activity+'_'+students[j]).value=fd.value;
-	    checkValid(null,activity+'_'+students[j]);
+        name = activity+'_'+students[j];
+        document.getElementById(name).value = fd.value;
+        setBackgroundColor(name, activity, fd.value);
     }
     document.getElementById('fd_'+activity).value = '';
     document.getElementById('fdbtn_'+activity).style.display = 'none';
     changeBackgroundColor('fd_'+activity+'_cell', 'default_bg');
+    edited = true;
 }
 
 function checkFillDown(activity)
 
=== modified file 'src/schooltool/gradebook/browser/gradebook_overview.pt'
--- src/schooltool/gradebook/browser/gradebook_overview.pt	2009-07-07 11:13:56 +0000
+++ src/schooltool/gradebook/browser/gradebook_overview.pt	2009-07-08 19:39:38 +0000
@@ -130,14 +130,14 @@
        <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">
+     <th class="cell title header" tal:repeat="activity view/activities"
+         tal:attributes="onmouseover string:tempDescription('${activity/hash}');
+                         onmouseout string:restoreDescription()">
        <div class="padded">
          <a href=""
             tal:attributes="href 
                             string:gradeActivity.html?activity=${activity/hash};
-                            title activity/longTitle;
-                            onmouseover string:tempDescription('${activity/hash}');
-                            onmouseout string:restoreDescription()"
+                            title activity/longTitle;"
             tal:content="activity/shortTitle">
            HW 1
          </a>
 
=== modified file 'src/schooltool/requirement/browser/README.txt'
--- src/schooltool/requirement/browser/README.txt	2009-07-06 02:39:56 +0000
+++ src/schooltool/requirement/browser/README.txt	2009-07-08 20:23:33 +0000
@@ -130,3 +130,9 @@
     <span>0</span>
     <span>0</span>
 
+There's an 'OK' button that takes the user back to the score systems overview.
+
+    >>> manager.getLink('OK').click()
+    >>> manager.url
+    'http://localhost/scoresystems'
+
 
=== modified file 'src/schooltool/requirement/browser/scoresystem.py'
--- src/schooltool/requirement/browser/scoresystem.py	2009-07-06 02:39:56 +0000
+++ src/schooltool/requirement/browser/scoresystem.py	2009-07-08 20:23:33 +0000
@@ -230,6 +230,10 @@
                 return removeSecurityProxy(ss)
         raise KeyError
 
+    @property
+    def nextURL(self):
+        return absoluteURL(self.context, self.request)
+
 
 class IWidgetData(interfaces.IRangedValuesScoreSystem):
     """A schema used to generate the score system widget."""
 
=== modified file 'src/schooltool/requirement/browser/scoresystem_view.pt'
--- src/schooltool/requirement/browser/scoresystem_view.pt	2009-06-05 00:11:04 +0000
+++ src/schooltool/requirement/browser/scoresystem_view.pt	2009-07-08 20:23:33 +0000
@@ -36,6 +36,11 @@
 
   </table>
 
+  <div class="controls" style="padding: 1em 0">
+    <a class="button-ok"
+       tal:attributes="href view/nextURL">OK</a>
+  </div>
+
 </metal:block>
 </body>
 </html>