Changeset 9543 for main/waeup.kofa/trunk/src/waeup

Timestamp:

5 Nov 2012, 18:03:39 (12 years ago)

Author:

Henrik Bettermann

Message:

Add timestamp to personal data. This timestamp will be checked when students log in. Students sould be remembered to frequently update their personal data.

Location:

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

Files:

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

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

@@ -745 +745 @@
     form_fields = grok.AutoFields(IStudentPersonal)
     form_fields['perm_address'].custom_widget = BytesDisplayWidget
+    form_fields[
+        'personal_updated'].custom_widget = FriendlyDatetimeDisplayWidget('le')
     pnav = 4
 
@@ -758 +760 @@
     grok.name('manage_personal')
     grok.require('waeup.manageStudent')
-    form_fields = grok.AutoFields(IStudentPersonal)
+    form_fields = grok.AutoFields(IStudentPersonal).omit('personal_updated')
     label = _('Manage personal data')
     pnav = 4
@@ -767 +769 @@
         return
 
-class StudentPersonalEditFormPage(StudentPersonalManageFormPage):
+class StudentPersonalEditFormPage(KofaEditFormPage):
     """ Page to edit personal data
     """
+    grok.context(IStudent)
     grok.name('edit_personal')
     grok.require('waeup.handleStudent')
+    form_fields = grok.AutoFields(IStudentPersonal).omit('personal_updated')
     label = _('Edit personal data')
     pnav = 4
+
+    @action(_('Save/Confirm'), style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        # XXX: Temporarily disabled until all personal forms have been properly
+        # configured
+        #self.context.personal_updated = datetime.utcnow()
+        return
 
 class StudyCourseDisplayFormPage(KofaDisplayFormPage):

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

@@ -250 +250 @@
 
     """
-    date_of_birth = FormattedDate(
-        title = _(u'Date of Birth'),
-        required = True,
-        show_year = True,
+    officer_comment = schema.Text(
+        title = _(u"Officer's Comment"),
+        required = False,
         )
 
@@ -268 +267 @@
         )
 
+    date_of_birth = FormattedDate(
+        title = _(u'Date of Birth'),
+        required = True,
+        show_year = True,
+        )
+
     nationality = schema.Choice(
         vocabulary = nats_vocab,
@@ -274 +279 @@
         )
 
-    officer_comment = schema.Text(
-        title = _(u"Officer's Comment"),
-        required = False,
-        #description = _(
-        #    u'This comment will be deleted when student is cleared.'),
-        )
-
 class IPGStudentClearance(IUGStudentClearance):
     """Representation of postgraduate student clearance data.
@@ -295 +293 @@
 
     """
+    personal_updated = schema.Datetime(
+        title = _(u'Updated'),
+        required = False,
+        readonly = False,
+        )
+
     perm_address = schema.Text(
         title = _(u'Permanent Address'),
@@ -669 +673 @@
         title = _(u'Payment Level'),
         required = False,
-        readonly = True,
         )
 

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

@@ -2422 +2422 @@
         self.assertTrue('An email with' in self.browser.contents)
 
+    def test_student_expired_personal_data(self):
+        # Login
+        delta = timedelta(days=180)
+        self.student.personal_updated = datetime.utcnow() - delta
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.assertEqual(self.browser.url, self.student_path)
+        self.assertTrue(
+            'You logged in' in self.browser.contents)
+        self.browser.getLink("Logout").click()
+        delta = timedelta(days=181)
+        self.student.personal_updated = datetime.utcnow() - delta
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.assertEqual(self.browser.url, self.edit_personal_path)
+        self.assertTrue(
+            'Your personal data record expired' in self.browser.contents)
+
 class StudentRequestPWTests(StudentsFullSetup):
     # Tests for student registration

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

@@ -45 +45 @@
             'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
-            'perm_address,phone,reg_number,sex,student_id,suspended,password,'
+            'perm_address,personal_updated,'
+            'phone,reg_number,sex,student_id,suspended,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",'
+            'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
             '+234-123-12345#,123,f,A111111,0,,created'
             in result
@@ -65 +66 @@
             'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
-            'perm_address,phone,reg_number,sex,student_id,suspended,password,'
+            'perm_address,personal_updated'
+            ',phone,reg_number,sex,student_id,suspended,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",'
+            'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
             '+234-123-12345#,123,f,A111111,0,,created'
             in result
@@ -84 +86 @@
             'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,officer_comment,'
-            'perm_address,phone,reg_number,sex,student_id,suspended,password,'
+            'perm_address,personal_updated'
+            ',phone,reg_number,sex,student_id,suspended,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",'
+            'Anna,Tester,234,M.,NG,,"Studentroad 21\nLagos 123456\n",,'
             '+234-123-12345#,123,f,A111111,0,,created'
             in result

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -190 +190 @@
     def tzinfo(self):
         # For Nigeria: pytz.timezone('Africa/Lagos')
+        # For Germany: pytz.timezone('Europe/Berlin')
         return pytz.utc