Changeset 9569 for main

Timestamp:

7 Nov 2012, 14:09:50 (12 years ago)

Author:

Henrik Bettermann

Message:

Activate personal data expiration checker.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/student.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (3 diffs)

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

@@ -222 +222 @@
                             self.request.principal.id)
                         self.flash(
-                          _('Your personal data record expired. '
-                            'Please update.'))
+                          _('Your personal data record is outdated. Please update.'))
                     self.redirect(self.application_url() + rel_link)
                     return

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

@@ -798 +798 @@
     def save(self, **data):
         msave(self, **data)
-        # XXX: Temporarily disabled until all personal forms have been properly
-        # configured
-        #self.context.personal_updated = datetime.utcnow()
+        self.context.personal_updated = datetime.utcnow()
         return
 

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

@@ -37 +37 @@
     IObjectHistory, IUserAccount, IFileStoreNameChooser, IFileStoreHandler,
     IKofaUtils, registration_states_vocab, IExtFileStore,
-    CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING)
+    CREATED, ADMITTED, CLEARANCE, PAID, REGISTERED, VALIDATED, RETURNING)
 from waeup.kofa.students.accommodation import StudentAccommodation
 from waeup.kofa.students.export import EXPORTER_NAMES
@@ -204 +204 @@
     @property
     def personal_data_expired(self):
+        if self.state in (CREATED, ADMITTED,):
+            return False
         now = datetime.utcnow()
-        if self.personal_updated:
-            days_ago = getattr(
-                now - self.personal_updated, 'days')
-            if days_ago > 180:
-                return True
+        if self.personal_updated is None:
+            return True
+        days_ago = getattr(now - self.personal_updated, 'days')
+        if days_ago > 180:
+            return True
         return False
 

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

@@ -1659 +1659 @@
     def test_student_change_password(self):
         # Students can change the password
+        self.student.personal_updated = datetime.utcnow()
         self.browser.open(self.login_path)
         self.browser.getControl(name="form.login").value = self.student_id
@@ -2487 +2488 @@
     def test_student_expired_personal_data(self):
         # Login
+        IWorkflowState(self.student).setState('school fee paid')
         delta = timedelta(days=180)
         self.student.personal_updated = datetime.utcnow() - delta
@@ -2510 +2512 @@
         self.assertEqual(self.browser.url, self.edit_personal_path)
         self.assertTrue(
-            'Your personal data record expired' in self.browser.contents)
+            'Your personal data record is outdated.' in self.browser.contents)
 
 class StudentRequestPWTests(StudentsFullSetup):