Changeset 9702

Timestamp:

21 Nov 2012, 15:18:31 (12 years ago)

Author:

Henrik Bettermann

Message:

Add field 'suspended_comment'. This attribute will be used to render flash messages for deactivated students. The field is only displayed on the student manage page.

Location:

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

Files:

• browser.py (modified) (5 diffs)
• interfaces.py (modified) (1 diff)
• tests/test_export.py (modified) (3 diffs)

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

@@ -356 +356 @@
     grok.require('waeup.viewStudent')
     grok.template('basepage')
-    form_fields = grok.AutoFields(IStudentBase).omit('password', 'suspended')
+    form_fields = grok.AutoFields(IStudentBase).omit(
+        'password', 'suspended', 'suspended_comment')
     pnav = 4
 
@@ -610 +611 @@
     grok.require('waeup.viewStudent')
     prefix = 'form'
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code')
+    omit_fields = (
+        'password', 'suspended', 'phone',
+        'adm_code', 'suspended_comment')
 
     @property
@@ -1047 +1050 @@
         'validation_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     prefix = 'form'
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code', 'sex')
+    omit_fields = (
+        'password', 'suspended', 'phone',
+        'adm_code', 'sex', 'suspended_comment')
 
     @property
@@ -1501 +1506 @@
     prefix = 'form'
     note = None
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code', 'sex')
+    omit_fields = (
+        'password', 'suspended', 'phone',
+        'adm_code', 'sex', 'suspended_comment')
 
     @property
@@ -1744 +1751 @@
     form_fields['booking_date'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     prefix = 'form'
-    omit_fields = ('password', 'suspended', 'phone', 'adm_code')
+    omit_fields = (
+        'password', 'suspended', 'phone', 'adm_code', 'suspended_comment')
 
     @property

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

@@ -169 +169 @@
         )
 
+    suspended_comment = schema.Text(
+        title = _(u"Reasons for Deactivation"),
+        required = False,
+        description = _(
+            u'This message will be shown if and only if deactivated '
+            'students try to login.'),
+        )
+
     student_id = schema.TextLine(
         title = _(u'Student Id'),

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

@@ -52 +52 @@
             'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
             'perm_address,personal_updated,'
-            'phone,reg_number,sex,student_id,suspended,password,'
+            'phone,reg_number,sex,student_id,suspended,suspended_comment,password,'
             'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
-            '+234-123-12345#,123,f,A111111,0,,created'
+            '+234-123-12345#,123,f,A111111,0,,,created'
             in result
             )
@@ -73 +73 @@
             'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
             'perm_address,personal_updated'
-            ',phone,reg_number,sex,student_id,suspended,password,'
+            ',phone,reg_number,sex,student_id,suspended,suspended_comment,password,'
             'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
-            '+234-123-12345#,123,f,A111111,0,,created'
+            '+234-123-12345#,123,f,A111111,0,,,created'
             in result
             )
@@ -93 +93 @@
             'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
             'perm_address,personal_updated'
-            ',phone,reg_number,sex,student_id,suspended,password,'
+            ',phone,reg_number,sex,student_id,suspended,suspended_comment,password,'
             'state,history,certcode,is_postgrad,current_level,current_session\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
-            '+234-123-12345#,123,f,A111111,0,,created'
+            '+234-123-12345#,123,f,A111111,0,,,created'
             in result
             )