Changeset 9484 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

31 Oct 2012, 16:01:42 (12 years ago)

Author:

Henrik Bettermann

Message:

Add clearance_comment attribute. When CO rejects clearance she is requested to enter a comment. This comment is stored with the student object and logged. The contact form is pre-filled with the comment. When a student is cleared the comment will be automatically removed.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (6 diffs)

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

@@ -390 +390 @@
     form_fields = grok.AutoFields(IContactForm).select('subject', 'body')
 
-    def update(self, subject=u''):
+    def update(self, subject=u'', body=u''):
         self.form_fields.get('subject').field.default = subject
+        self.form_fields.get('body').field.default = body
         self.subject = subject
         return
@@ -586 +587 @@
             form_fields = grok.AutoFields(
                 IUGStudentClearance).omit('clearance_locked')
+        if not getattr(self.context, 'clearance_comment'):
+            form_fields = form_fields.omit('clearance_comment')
+        else:
+            form_fields['clearance_comment'].custom_widget = BytesDisplayWidget
         return form_fields
 
@@ -610 +615 @@
             form_fields = grok.AutoFields(
                 IUGStudentClearance).omit('clearance_locked')
+        if not getattr(self.context, 'clearance_comment'):
+            form_fields = form_fields.omit('clearance_comment')
         return form_fields
 
@@ -694 +701 @@
         return
 
-class StudentRejectClearancePage(UtilityView, grok.View):
+class StudentRejectClearancePage(KofaEditFormPage):
     """ Reject clearance by clearance officers
     """
     grok.context(IStudent)
     grok.name('reject_clearance')
+    label = _('Reject clearance')
     grok.require('waeup.clearStudent')
-
-    def update(self):
+    form_fields = grok.AutoFields(
+        IUGStudentClearance).select('clearance_comment')
+
+    @action(_('Save comment and reject clearance now'), style='primary')
+    def reject(self, **data):
         if self.context.state == CLEARED:
             IWorkflowInfo(self.context).fireTransition('reset4')
@@ -714 +725 @@
             self.redirect(self.url(self.context,'view_clearance'))
             return
-        args = {'subject':message}
+        self.applyData(self.context, **data)
+        comment = data['clearance_comment']
+        self.context.writeLogMessage(
+            self, 'comment: %s' % comment.replace('\n', '<br>'))
+        args = {'subject':message, 'body':comment}
         self.redirect(self.url(self.context) +
             '/contactstudent?%s' % urlencode(args))
         return
 
-    def render(self):
-        return
+    #def render(self):
+    #    return
 
 class StudentPersonalDisplayFormPage(KofaDisplayFormPage):
@@ -1938 +1953 @@
         if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance).omit(
-                'clearance_locked', 'clr_code')
+                'clearance_locked', 'clr_code', 'clearance_comment')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit(
-                'clearance_locked', 'clr_code')
+                'clearance_locked', 'clr_code', 'clearance_comment')
         return form_fields