Changeset 10465 for main/waeup.kofa/trunk

Timestamp:

7 Aug 2013, 11:18:43 (11 years ago)

Author:

Henrik Bettermann

Message:

Let transcript officers find their students via the students container page.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• permissions.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/browser_templates/containerpage.pt (modified) (1 diff)
• students/catalog.py (modified) (1 diff)
• students/permissions.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -271 +271 @@
                      'waeup.viewAcademics',
                      'waeup.exportBursaryData')
-
-class TranscriptOfficer(grok.Role):
-    grok.name('waeup.TranscriptOfficer')
-    grok.title(u'Transcript Officer')
-    grok.permissions('waeup.showStudents',
-                     'waeup.viewAcademics',
-                     'waeup.viewTranscript',
-                     'waeup.viewStudent')
 
 class UsersManager(grok.Role):

main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

@@ -270 +270 @@
             self.searchtype = form['searchtype']
             self.searchterm = None
+        if form.get('searchtype', None) == 'transcript':
+            self.searchtype = form['searchtype']
+            self.searchterm = None
         elif 'searchterm' in form and form['searchterm']:
             self.searchterm = form['searchterm']

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/containerpage.pt

@@ -15 +15 @@
     <option i18n:translate="" value="suspended">
       with deactivated account (search term omitted)
+    </option>
+    <option i18n:translate="" value="transcript">
+      who requested transcript (search term omitted)
     </option>
   </select>

main/waeup.kofa/trunk/src/waeup/kofa/students/catalog.py

@@ -88 +88 @@
                 hitlist.append(StudentQueryResultItem(student, view=view))
         return hitlist
+    elif searchtype == 'transcript':
+        cat = queryUtility(ICatalog, name='students_catalog')
+        results = cat.searchResults(
+            state=('transcript requested', 'transcript requested'))
     else:
         # Temporary solution to display all students added

main/waeup.kofa/trunk/src/waeup/kofa/students/permissions.py

@@ -94 +94 @@
                      'waeup.viewStudentsTab', 'waeup.handleAccommodation')
 
+class TranscriptOfficer(grok.Role):
+    grok.name('waeup.TranscriptOfficer')
+    grok.title(u'Transcript Officer')
+    grok.permissions('waeup.viewAcademics',
+                     'waeup.viewTranscript',
+                     'waeup.viewStudent',
+                     'waeup.viewStudents',
+                     'waeup.viewStudentsTab',
+                     'waeup.viewStudentsContainer',
+                     )
+
 class StudentsClearanceOfficer(grok.Role):
     grok.name('waeup.StudentsClearanceOfficer')

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1926 +1926 @@
     def test_process_transcript_request(self):
         IWorkflowState(self.student).setState('transcript requested')
+        notify(grok.ObjectModifiedEvent(self.student))
         self.student.transcript_comment = (
             u'On 07/08/2013 08:59:54 UTC K1000000 wrote:\n\nComment line 1 \n'
@@ -1947 +1948 @@
             '...<div>Transcript Officer</div>...',
             self.browser.contents)
-        self.browser.open(self.student_path)
+        # Officer can search for students in state 'transcripr requested'
+        self.browser.open(self.container_path)
+        self.browser.getControl(name="searchtype").value = ['transcript']
+        self.browser.getControl("Search").click()
+        self.assertTrue('Anna Tester' in self.browser.contents)
+        self.browser.getLink("K1000000").click()
         self.browser.getLink("Manage transcript request").click()
         self.assertTrue(' UTC K1000000 wrote:<br><br>Comment line 1 <br>'