Merge lp:~aelkner/schooltool/schooltool.intervention_august_fixes into lp:~schooltool-owners/schooltool/schooltool.intervention

[Alan Elkner]

[Gediminas Paulauskas (menesis)]

In fact it was merged to lp:schooltool.intervention

=== modified file 'src/schooltool/intervention/browser/README.txt'
--- src/schooltool/intervention/browser/README.txt	2009-07-23 04:51:31 +0000
+++ src/schooltool/intervention/browser/README.txt	2009-08-25 22:36:56 +0000
@@ -762,7 +762,6 @@
     >>> print manager.contents
     <BLANKLINE>
     ...course1 - section1's Student Interventions...
-    ...Intervention...
     <p>Messages</p> ...
     <a ...Goals</a> ...
     ...Student1 Student1...
@@ -778,7 +777,6 @@
     >>> print manager.contents
     <BLANKLINE>
     ...course1 - section1's Student Interventions...
-    ...Intervention...
     <a ...Messages</a> ...
     <p>Goals</p> ...
     ...Student1 Student1...

=== modified file 'src/schooltool/intervention/browser/intervention.pt'
--- src/schooltool/intervention/browser/intervention.pt	2009-07-29 04:50:33 +0000
+++ src/schooltool/intervention/browser/intervention.pt	2009-08-25 23:52:33 +0000
@@ -89,16 +89,21 @@
   <br />
   <fieldset>
     <legend><b>Report Sheets</b><legend>
-    <tal:if condition="not: view/sheets">
+    <tal:if condition="not: view/terms">
       <ul><li>There are none.<br /></li></ul>
     </tal:if>
-    <tal:if condition="view/sheets">
+    <tal:if condition="view/terms">
       <ul>
-        <li tal:repeat="sheet view/sheets">
-          <a href="" tal:content="sheet/text"
-             tal:attributes="href sheet/url">
-             Report Sheet
-          </a>
+        <li tal:repeat="term view/terms">
+          <span tal:content="term/title" />
+          <ul>
+            <li tal:repeat="sheet term/sheets">
+              <a href="" tal:content="sheet/text"
+                 tal:attributes="href sheet/url">
+                 Report Sheet
+              </a>
+            </li>
+          </ul>
         </li>
       </ul>
     </tal:if>

=== modified file 'src/schooltool/intervention/browser/intervention.py'
--- src/schooltool/intervention/browser/intervention.py	2009-07-29 09:33:38 +0000
+++ src/schooltool/intervention/browser/intervention.py	2009-08-26 02:50:06 +0000
@@ -218,12 +218,13 @@
         self.newGoalURL = interventionURL + '/goals/+/addGoal.html'
         self.allGoalsURL = interventionURL + '/goals/allGoals.html'
 
-        self.sheets = []
         studentId = self.context.student.username
         currentYear = ISchoolYear(self.context.__parent__)
+        terms = {}
         for section in self.learnerOf():
             if ISchoolYear(ITerm(section)) != currentYear:
                 continue
+            sheets = terms.setdefault(ITerm(section), [])
             for worksheet in IActivities(section).values():
                 if not worksheet.deployed:
                     continue
@@ -236,7 +237,9 @@
                         studentId),
                     'text': title
                     }
-                self.sheets.append(sheet)
+                sheets.append(sheet)
+        self.terms = [{'title': term.title, 'sheets': terms[term]}
+                      for term in sorted(terms.keys())]
 
         self.statusMessages = []
         for k, v in sorted(self.context['messages'].items()):
@@ -296,12 +299,15 @@
 
     def reportSheetLinks(self, student):
         studentId = student.__name__
+        nexturl = absoluteURL(self.context, self.request) + \
+            '/@@interventions.html'
         results = []
         for worksheet in self.worksheets:
             worksheet_url = absoluteURL(worksheet, self.request)
             result = {
                 'title': worksheet.title,
-                'url': '%s/gradebook/%s' % (worksheet_url, studentId)
+                'url': '%s/gradebook/%s?nexturl=%s' % (worksheet_url, 
+                    studentId, nexturl)
                 }
             results.append(result)
         return results

=== modified file 'src/schooltool/intervention/browser/section_interventions.pt'
--- src/schooltool/intervention/browser/section_interventions.pt	2009-01-05 12:53:51 +0000
+++ src/schooltool/intervention/browser/section_interventions.pt	2009-08-25 22:36:56 +0000
@@ -22,7 +22,7 @@
 <table class="students_nav">
 
   <tr>
-    <th>Intervention</th>
+    <th />
     <th>
     <tal:block tal:repeat="tab view/iterTabs">
       <tal:block condition="tab/active">