Changeset 9485 for main


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/showstudentspage.pt

    r7811 r9485  
    88    <th i18n:translate="">Current Session</th>
    99    <th i18n:translate="">Current Level</th>
     10    <th i18n:translate="">Comment</th>
    1011        </tr>
    1112  </thead>
     
    2627    <td tal:content="item/current_session">SESSION</td>
    2728    <td tal:content="item/current_level">LEVEL</td>
     29    <td><span tal:condition="item/comment">yes</span></td>
    2830        </tr>
    2931  </tbody>
  • main/waeup.kofa/trunk/src/waeup/kofa/students/catalog.py

    r9220 r9485  
    7171        self.current_session = current_session
    7272        self.certificate = context['studycourse'].certificate
     73        self.comment = getattr(context, 'clearance_comment', None)
    7374
    7475def search(query=None, searchtype=None, view=None):
  • main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

    r9484 r9485  
    12561256        self.assertTrue('Student is in wrong state'
    12571257            in self.browser.contents)
    1258         # The CO can go to his department throug the my_roles page
     1258        # The CO can go to his department throug the my_roles page ...
    12591259        self.browser.open('http://localhost/app/users/mrclear/my_roles')
    12601260        self.browser.getLink("http://localhost/app/faculties/fac1/dep1").click()
    1261         # and view the list of students
     1261        # ... and view the list of students
    12621262        self.browser.getLink("Show students").click()
    12631263        self.assertTrue(self.student_id in self.browser.contents)
    1264 
    1265 
     1264        # The comment is indicated by 'yes'
     1265        self.assertTrue('<td><span>yes</span></td>' in self.browser.contents)
    12661266        # When a student is cleared the comment is automatically deleted
    12671267        IWorkflowInfo(self.student).fireTransition('request_clearance')
    12681268        IWorkflowInfo(self.student).fireTransition('clear')
    12691269        self.assertEqual(self.student.clearance_comment, None)
    1270 
    12711270
    12721271    def test_handle_courses_by_ca(self):
Note: See TracChangeset for help on using the changeset viewer.