Changeset 6635 for main/waeup.sirp/trunk/src/waeup/sirp/students

Timestamp:

26 Aug 2011, 20:54:25 (13 years ago)

Author:

Henrik Bettermann

Message:

Make action buttons smaller on studentpage.

Add StudentAccommodation? container class which contains the accommodation objects.

Add StudentPayments? container class which contains the payments objects.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• accommodation.py (added)
• browser.py (modified) (8 diffs)
• browser_templates/studentpage.pt (added)
• container.py (modified) (2 diffs)
• interfaces.py (modified) (1 diff)
• payments.py (added)
• tests/test_browser.py (modified) (3 diffs)
• tests/test_student.py (modified) (3 diffs)

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

@@ -46 +46 @@
 from waeup.sirp.browser.viewlets import (
     ManageActionButton, PrimaryNavTab, LeftSidebarLink,
-    AddActionButton, ActionButton,
+    AddActionButton, ActionButton, PlainActionButton,
     )
 from waeup.sirp.image.browser.widget import (
@@ -64 +64 @@
 from waeup.sirp.students.interfaces import (
     IStudentsContainer, IStudent, IStudentClearance,
-    IStudentPersonal, IStudentBase
+    IStudentPersonal, IStudentBase, IStudentStudyCourse,
+    IStudentPayments, IStudentAccommodation
     )
 from waeup.sirp.students.student import (
@@ -92 +93 @@
     grok.context(IStudentsContainer)
     title = u'Students'
+
+class SudyCourseBreadcrumb(Breadcrumb):
+    """A breadcrumb for the student study course.
+    """
+    grok.context(IStudentStudyCourse)
+    title = u'Study Course'
+
+class PaymentsBreadcrumb(Breadcrumb):
+    """A breadcrumb for the student payments folder.
+    """
+    grok.context(IStudentPayments)
+    title = u'Payments'
+
+class AccommodationBreadcrumb(Breadcrumb):
+    """A breadcrumb for the student accommodation folder.
+    """
+    grok.context(IStudentAccommodation)
+    title = u'Accommodation'
 
 class StudentsContainerPage(WAeUPPage):
@@ -229 +248 @@
     grok.name('index')
     grok.require('waeup.viewStudents')
+    grok.template('studentpage')
     form_fields = grok.AutoFields(IStudentBase)
 
@@ -244 +264 @@
     grok.view(StudentBaseDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit base data'
+    text = 'Edit'
     target = 'edit_base'
 
-class StudentClearanceViewActionButton(ActionButton):
+class StudentClearanceViewActionButton(PlainActionButton):
     grok.order(2)
-    icon = 'actionicon_view.png'
-    grok.context(IStudent)
-    grok.view(StudentBaseDisplayFormPage)
-    grok.require('waeup.viewStudents')
-    text = 'View clearance data'
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudents')
+    text = 'Clearance Data'
     target = 'view_clearance'
 
-class StudentPersonalViewActionButton(ActionButton):
+class StudentPersonalViewActionButton(PlainActionButton):
     grok.order(3)
-    icon = 'actionicon_view.png'
-    grok.context(IStudent)
-    grok.view(StudentBaseDisplayFormPage)
-    grok.require('waeup.viewStudents')
-    text = 'View personal data'
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudents')
+    text = 'Personal Data'
     target = 'view_personal'
+
+class StudyCourseViewActionButton(PlainActionButton):
+    grok.order(4)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudents')
+    text = 'Study Course'
+    target = 'studycourse'
+
+class PaymentsViewActionButton(PlainActionButton):
+    grok.order(5)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudents')
+    text = 'Payments'
+    target = 'payments'
+
+class AccommodationViewActionButton(PlainActionButton):
+    grok.order(6)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudents')
+    text = 'Accommodation'
+    target = 'accommodation'
 
 class StudentBaseManageFormPage(WAeUPEditFormPage):
@@ -300 +342 @@
     grok.view(StudentClearanceDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit clearance data'
+    text = 'Edit'
     target = 'edit_clearance'
 
@@ -337 +379 @@
     grok.view(StudentPersonalDisplayFormPage)
     grok.require('waeup.manageStudents')
-    text = 'Edit personal data'
+    text = 'Edit'
     target = 'edit_personal'
 
@@ -352 +394 @@
     def title(self):
         return 'Student: %s' % self.context.name
+
+class StudyCourseDisplayFormPage(WAeUPDisplayFormPage):
+    """ Page to display the student study course data
+    """
+    grok.context(IStudentStudyCourse)
+    grok.name('index')
+    grok.require('waeup.viewStudents')
+    form_fields = grok.AutoFields(IStudentStudyCourse)
+    #grok.template('studycoursepage')
+
+    @property
+    def title(self):
+        return 'Student: %s' % self.context.__parent__.name
+
+    @property
+    def label(self):
+        return '%s: Study Course Data' % self.context.__parent__.name
+
+class PaymentsDisplayFormPage(WAeUPDisplayFormPage):
+    """ Page to display the student payments
+    """
+    grok.context(IStudentPayments)
+    grok.name('index')
+    grok.require('waeup.viewStudents')
+    form_fields = grok.AutoFields(IStudentPayments)
+    #grok.template('paymentspage')
+
+    @property
+    def title(self):
+        return 'Student: %s' % self.context.__parent__.name
+
+    @property
+    def label(self):
+        return '%s: Payments' % self.context.__parent__.name
+
+class AccommodationDisplayFormPage(WAeUPDisplayFormPage):
+    """ Page to display the student accommodation data
+    """
+    grok.context(IStudentAccommodation)
+    grok.name('index')
+    grok.require('waeup.viewStudents')
+    form_fields = grok.AutoFields(IStudentAccommodation)
+    #grok.template('accommodationpage')
+
+    @property
+    def title(self):
+        return 'Student: %s' % self.context.__parent__.name
+
+    @property
+    def label(self):
+        return '%s: Accommodation Data' % self.context.__parent__.name

main/waeup.sirp/trunk/src/waeup/sirp/students/container.py

@@ -22 +22 @@
 from zope.interface import implementedBy
 from waeup.sirp.students.interfaces import (
-    IStudentsContainer, IStudent)
+    IStudentsContainer, IStudent, IStudentPayments, IStudentAccommodation)
 from waeup.sirp.students.studycourse import StudentStudyCourse
+from waeup.sirp.students.payments import StudentPayments
+from waeup.sirp.students.accommodation import StudentAccommodation
 
 class StudentsContainer(grok.Container):
@@ -46 +48 @@
         studycourse = StudentStudyCourse()
         self[student.student_id]['studycourse'] = studycourse
+        payments = StudentPayments()
+        self[student.student_id]['payments'] = payments
+        accommodation = StudentAccommodation()
+        self[student.student_id]['accommodation'] = accommodation
         return

main/waeup.sirp/trunk/src/waeup/sirp/students/interfaces.py

@@ -92 +92 @@
         required = True,
         )
+
+class IStudentAccommodation(IWAeUPObject):
+    """A container for student accommodation objects.
+
+    """
+
+class IStudentPayments(IWAeUPObject):
+    """A container for student payment objects.
+
+    """
+

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

@@ -72 +72 @@
 
 
-        # Add student
+        # Add student with subobjects (done by addStudent)
         student = Student()
         student.name = u'Anna Tester'
         student.student_id = u'Z654321'
-        self.app['students'][student.student_id] = student
+        self.app['students'].addStudent(student)
 
         self.container_path = 'http://localhost/app/students'
@@ -88 +88 @@
         self.edit_personal_student_path = self.student_path + '/edit_personal'
 
+        self.studycourse_student_path = self.student_path + '/studycourse'
+        self.payments_student_path = self.student_path + '/payments'
+        self.accommodation_student_path = self.student_path + '/accommodation'
+
         # Populate university
         certificate = createObject('waeup.Certificate')
@@ -188 +192 @@
         # and can perform actions
         self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+
         self.browser.open(self.student_path)
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.student_path)
-        self.browser.getLink("Edit base data").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.manage_student_path)
-        self.browser.open(self.student_path)
-        self.browser.getLink("View clearance data").click()
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Clearance Data").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.clearance_student_path)
-        self.browser.getLink("Edit clearance data").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_clearance_student_path)
-        self.browser.open(self.student_path)
-        self.browser.getLink("View personal data").click()
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Personal Data").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.personal_student_path)
-        self.browser.getLink("Edit personal data").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_personal_student_path)
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Study Course").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.studycourse_student_path)
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Payments").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.payments_student_path)
+
+        self.browser.open(self.student_path)
+        self.browser.getLink("Accommodation").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.accommodation_student_path)
+
         return

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_student.py

@@ -30 +30 @@
     Student, StudentFactory,
     )
-from waeup.sirp.students.studycourse import (
-    StudentStudyCourse,
-    )
+from waeup.sirp.students.studycourse import StudentStudyCourse
+from waeup.sirp.students.payments import StudentPayments
+from waeup.sirp.students.accommodation import StudentAccommodation
 from waeup.sirp.students.interfaces import (
-    IStudent, IStudentStudyCourse,
+    IStudent, IStudentStudyCourse, IStudentPayments, IStudentAccommodation,
     )
 from waeup.sirp.testing import FunctionalLayer
@@ -46 +46 @@
         self.student = Student()
         self.studycourse = StudentStudyCourse()
+        self.payments = StudentPayments()
+        self.accommodation = StudentAccommodation()
         return
 
@@ -57 +59 @@
         verify.verifyClass(IStudentStudyCourse, StudentStudyCourse)
         verify.verifyObject(IStudentStudyCourse, self.studycourse)
+        verify.verifyClass(IStudentPayments, StudentPayments)
+        verify.verifyObject(IStudentPayments, self.payments)
+        verify.verifyClass(IStudentAccommodation, StudentAccommodation)
+        verify.verifyObject(IStudentAccommodation, self.accommodation)
         return