Changeset 6637

Timestamp:

27 Aug 2011, 13:19:07 (13 years ago)

Author:

Henrik Bettermann

Message:

Add logger, student workflow and student workflow history.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• browser_templates/studenthistory.pt (added)
• container.py (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)
• student.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• workflow.py (added)

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

@@ -307 +307 @@
     target = 'accommodation'
 
+class HistoryViewActionButton(PlainActionButton):
+    grok.order(7)
+    grok.context(IStudent)
+    grok.view(StudentBaseDisplayFormPage)
+    grok.require('waeup.viewStudents')
+    text = 'History'
+    target = 'history'
+
 class StudentBaseManageFormPage(WAeUPEditFormPage):
     """ View to edit student base data
@@ -445 +453 @@
     def label(self):
         return '%s: Accommodation Data' % self.context.__parent__.name
+
+class StudentHistoryPage(WAeUPPage):
+    """ Page to display student clearance data
+    """
+    grok.context(IStudent)
+    grok.name('history')
+    grok.require('waeup.viewStudents')
+    grok.template('studenthistory')
+
+    @property
+    def title(self):
+        return 'Student: %s' % self.context.name
+
+    @property
+    def label(self):
+        return '%s: History' % self.context.name

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

@@ -26 +26 @@
 from waeup.sirp.students.payments import StudentPayments
 from waeup.sirp.students.accommodation import StudentAccommodation
+from waeup.sirp.utils.helpers import get_current_principal
+from waeup.sirp.utils.logger import Logger
 
-class StudentsContainer(grok.Container):
+class StudentsContainer(grok.Container, Logger):
     """
     The node containing the student models
@@ -53 +55 @@
         self[student.student_id]['accommodation'] = accommodation
         return
+
+    logger_name = 'waeup.sirp.${sitename}.students'
+    logger_filename = 'students.log'
+
+    def logger_info(self, target, ob_class, comment=None):
+        """Get the logger's info method.
+        """
+        user = get_current_principal()
+        if user is None:
+            user = 'system'
+        else:
+            user = user.id
+        self.logger.info('%s - %s - %s - %s' % (
+                user, target, ob_class, comment))
+        return

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

@@ -1 +1 @@
 ##
 ## interfaces.py
-from zope.interface import Interface
+from zope.interface import Interface, Attribute
 from zope import schema
 from waeup.sirp.interfaces import IWAeUPObject
@@ -8 +8 @@
     """Representation of student base data.
     """
+    history = Attribute('Object history, a list of messages.')
+    state = Attribute('Returns the registration state of a student')
+
+    def loggerInfo(ob_class, comment):
+        """Adds an INFO message to the log file
+        """
+
     student_id = schema.TextLine(
         title = u'Student Id',

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

@@ -21 +21 @@
 from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
+from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
+from waeup.sirp.interfaces import IObjectHistory
 from waeup.sirp.students.interfaces import IStudent
 from waeup.sirp.utils.helpers import attrs_to_fields
@@ -33 +35 @@
     def __init__(self):
         super(Student, self).__init__()
-        #IWorkflowInfo(self).fireTransition('init')
+        IWorkflowInfo(self).fireTransition('create')
         return
+
+    def loggerInfo(self, ob_class, comment=None):
+        target = self.__name__
+        return grok.getSite()['students'].logger_info(ob_class,target,comment)
+
+    @property
+    def state(self):
+        state = IWorkflowState(self).getState()
+        return state
+
+    @property
+    def history(self):
+        history = IObjectHistory(self)
+        return history
 
 # Set all attributes of Student required in IStudent as field

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

@@ -91 +91 @@
         self.payments_student_path = self.student_path + '/payments'
         self.accommodation_student_path = self.student_path + '/accommodation'
+        self.history_student_path = self.student_path + '/history'
 
         # Populate university
@@ -231 +232 @@
         self.assertEqual(self.browser.url, self.accommodation_student_path)
 
+        self.browser.open(self.student_path)
+        self.browser.getLink("History").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.url, self.history_student_path)
+        self.assertMatches('...Student object created by system...', self.browser.contents)
+
         return