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

Timestamp:

23 Aug 2015, 10:07:31 (9 years ago)

Author:

Henrik Bettermann

Message:

Take unused records instead of creating new records during self-registration.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (4 diffs)

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

@@ -1150 +1150 @@
             return
         if self.context.mode == 'create':
-            # Add applicant
-            applicant = createObject(u'waeup.Applicant')
+            # Check if there are unused records which can be taken
+            cat = getUtility(ICatalog, name='applicants_catalog')
+            results = list(
+               cat.searchResults(record_used=(False, False)))
+            if results:
+                applicant = results[0]
+            else:
+                # Add applicant
+                applicant = createObject(u'waeup.Applicant')
+                self.context.addApplicant(applicant)
             self.applyData(applicant, **data)
-            self.context.addApplicant(applicant)
             applicant.reg_number = applicant.applicant_id
             notify(grok.ObjectModifiedEvent(applicant))

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

@@ -144 +144 @@
         # reg_number is the only field which has to be preset here
         # because managers are allowed to edit this required field
+        self.applicant.firstname = u'Joan'
         self.applicant.reg_number = u'1234'
         self.applicant.course1 = certificate
@@ -1199 +1200 @@
 
     def test_register_applicant_create(self):
+        self.assertEqual(len(self.app['applicants'][container_name_1]), 1)
         # An applicant can register himself.
         self.browser.open(self.container_path)
@@ -1212 +1214 @@
         self.assertEqual(self.browser.url,
             self.container_path + '/registration_complete?email=xx%40yy.zz')
+        # A new applicant has been created
+        self.assertEqual(len(self.app['applicants'][container_name_1]), 2)
         # The new applicant can be found in the catalog via the email address
         cat = getUtility(ICatalog, name='applicants_catalog')
@@ -1225 +1229 @@
             reg_number=(applicant.reg_number, applicant.reg_number)))
         self.assertEqual(applicant,results[0])
+        return
+
+    def test_register_applicant_take_unused_record(self):
+        # Create an unused record
+        uu_applicant = createObject('waeup.Applicant')
+        self.app['applicants'][container_name_1].addApplicant(uu_applicant)
+        self.assertFalse(uu_applicant.record_used)
+        self.assertEqual(len(self.app['applicants'][container_name_1]), 2)
+        self.browser.open(self.container_path)
+        self.browser.getLink("Register for application").click()
+        # Fill the edit form with suitable values
+        self.browser.getControl(name="form.firstname").value = 'Anna'
+        self.browser.getControl(name="form.lastname").value = 'Kurios'
+        self.browser.getControl(name="form.email").value = 'xx@yy.zz'
+        self.browser.getControl(name="form.phone.country").value = ['+234']
+        self.browser.getControl(name="form.phone.area").value = '555'
+        self.browser.getControl(name="form.phone.ext").value = '6666666'
+        self.browser.getControl("Send login credentials").click()
+        # No applicant has been created ...
+        self.assertEqual(len(self.app['applicants'][container_name_1]), 2)
+        # ... and the existing, formerly unused record has been used instead
+        self.assertEqual(uu_applicant.lastname, 'Kurios')
+        self.assertTrue(uu_applicant.record_used)
         return