Changeset 8119

Timestamp:

12 Apr 2012, 06:54:46 (12 years ago)

Author:

Henrik Bettermann

Message:

Add view buttons and fix test.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (3 diffs)

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

@@ -469 +469 @@
     """
     grok.context(IStudent)
-    grok.name('edit_clearance')
+    grok.name('manage_clearance')
     grok.require('waeup.manageStudent')
     grok.template('clearanceeditpage')
@@ -566 +566 @@
             mapping = {'a':self.context.display_fullname})
 
-class StudentPersonalManageFormPage(KofaEditFormPage):
+class StudentPersonalEditFormPage(KofaEditFormPage):
     """ Page to edit student clearance data
     """
     grok.context(IStudent)
     grok.name('edit_personal')
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.handleStudent')
     form_fields = grok.AutoFields(IStudentPersonal)
-    label = _('Manage personal data')
+    label = _('Edit personal data')
     pnav = 4
 

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

@@ -112 +112 @@
         self.personal_path = self.student_path + '/view_personal'
         self.edit_clearance_path = self.student_path + '/cedit'
-        self.manage_clearance_path = self.student_path + '/edit_clearance'
+        self.manage_clearance_path = self.student_path + '/manage_clearance'
         self.edit_personal_path = self.student_path + '/edit_personal'
         self.studycourse_path = self.student_path + '/studycourse'
@@ -1179 +1179 @@
         self.browser.getLink("View").click()
         self.browser.getLink("Download clearance slip").click()
-        print self.browser.contents
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
         # Students can request clearance
+        self.browser.open(self.edit_clearance_path)
         self.browser.getControl("Save and request clearance").click()
         self.browser.getControl(name="ac_series").value = self.existing_clrseries

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

@@ -41 +41 @@
     StudyCourseDisplayFormPage, StudyLevelDisplayFormPage,
     CourseTicketDisplayFormPage, OnlinePaymentDisplayFormPage,
-    AccommodationManageFormPage, BedTicketDisplayFormPage,)
+    AccommodationManageFormPage, BedTicketDisplayFormPage,
+    StudentClearanceEditFormPage, StudentPersonalEditFormPage)
 from waeup.kofa.students.interfaces import (
     IStudentsContainer, IStudent,
@@ -172 +173 @@
     grok.require('waeup.manageStudent')
     text = _('Manage')
-    target = 'edit_clearance'
+    target = 'manage_clearance'
 
 class StudentClearActionButton(ManageActionButton):
@@ -212 +213 @@
     text = _('Download clearance slip')
     target = 'clearance.pdf'
+
+class ClearanceViewActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentClearanceEditFormPage)
+    grok.require('waeup.viewStudent')
+    icon = 'actionicon_view.png'
+    text = _('View')
+    target = 'view_clearance'
+
+class PersonalViewActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(IStudent)
+    grok.view(StudentPersonalEditFormPage)
+    grok.require('waeup.viewStudent')
+    icon = 'actionicon_view.png'
+    text = _('View')
+    target = 'view_personal'
 
 class StudentPersonalEditActionButton(ManageActionButton):