Changeset 9485

Timestamp:

31 Oct 2012, 16:23:36 (12 years ago)

Author:

Henrik Bettermann

Message:

Indicate existing comment by 'yes'.

Location:

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

Files:

• browser/templates/showstudentspage.pt (modified) (2 diffs)
• students/catalog.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/showstudentspage.pt

@@ -8 +8 @@
     <th i18n:translate="">Current Session</th>
     <th i18n:translate="">Current Level</th>
+    <th i18n:translate="">Comment</th>
         </tr>
   </thead>
@@ -26 +27 @@
     <td tal:content="item/current_session">SESSION</td>
     <td tal:content="item/current_level">LEVEL</td>
+    <td><span tal:condition="item/comment">yes</span></td>
         </tr>
   </tbody>

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

@@ -71 +71 @@
         self.current_session = current_session
         self.certificate = context['studycourse'].certificate
+        self.comment = getattr(context, 'clearance_comment', None)
 
 def search(query=None, searchtype=None, view=None):

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

@@ -1256 +1256 @@
         self.assertTrue('Student is in wrong state'
             in self.browser.contents)
-        # The CO can go to his department throug the my_roles page
+        # The CO can go to his department throug the my_roles page ...
         self.browser.open('http://localhost/app/users/mrclear/my_roles')
         self.browser.getLink("http://localhost/app/faculties/fac1/dep1").click()
-        # and view the list of students
+        # ... and view the list of students
         self.browser.getLink("Show students").click()
         self.assertTrue(self.student_id in self.browser.contents)
-
-
+        # The comment is indicated by 'yes'
+        self.assertTrue('<td><span>yes</span></td>' in self.browser.contents)
         # When a student is cleared the comment is automatically deleted
         IWorkflowInfo(self.student).fireTransition('request_clearance')
         IWorkflowInfo(self.student).fireTransition('clear')
         self.assertEqual(self.student.clearance_comment, None)
-
 
     def test_handle_courses_by_ca(self):