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

Timestamp:

30 Oct 2015, 08:09:05 (9 years ago)

Author:

Henrik Bettermann

Message:

Allow also reg_number on public page to check application status without password.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• browser_templates/applicantcheckstatus.pt (modified) (1 diff)
• tests/test_browser.py (modified) (3 diffs)

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

@@ -1323 +1323 @@
                 # No need to flash something.
                 return
-            applicant_id = form.get('applicant_id', None)
+            unique_id = form.get('unique_id', None)
             lastname = form.get('lastname', None)
-            if not applicant_id or not lastname:
+            if not unique_id or not lastname:
                 self.flash(
                     _('Required input missing.'), type='warning')
@@ -1331 +1331 @@
             cat = getUtility(ICatalog, name='applicants_catalog')
             results = list(
-                cat.searchResults(applicant_id=(applicant_id, applicant_id)))
+                cat.searchResults(applicant_id=(unique_id, unique_id)))
+            if not results:
+                results = list(
+                    cat.searchResults(reg_number=(unique_id, unique_id)))
             if results:
                 applicant = results[0]

main/waeup.kofa/trunk/src/waeup/kofa/applicants/browser_templates/applicantcheckstatus.pt

@@ -4 +4 @@
     <tr>
       <td i18n:translate="" class="fieldname">
-        Applicant Id:
+        Registration Number or Applicant Id:
       </td>
       <td>
-        <input class="textType half" type="text" name="applicant_id" />
+        <input class="textType half" type="text" name="unique_id" />
       </td>
     </tr>

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

@@ -1388 +1388 @@
         self.applicant.lastname = u'Lion '
         self.browser.open('http://localhost/app/applicants/checkstatus')
-        self.browser.getControl(name="applicant_id").value = 'nonsense'
+        self.browser.getControl(name="unique_id").value = 'nonsense'
         self.browser.getControl(name="lastname").value = 'Lion'
         self.browser.getControl("Submit").click()
         self.assertTrue('No application record found' in self.browser.contents)
-        self.browser.getControl(name="applicant_id").value = self.applicant.applicant_id
+        self.browser.getControl(name="unique_id").value = self.applicant.applicant_id
         self.browser.getControl(name="lastname").value = 'nonsense'
         self.browser.getControl("Submit").click()
         self.assertTrue('No application record found' in self.browser.contents)
-        self.browser.getControl(name="applicant_id").value = self.applicant.applicant_id
+        self.browser.getControl(name="unique_id").value = self.applicant.applicant_id
         self.browser.getControl(name="lastname").value = 'Lion'
         self.browser.getControl("Submit").click()
@@ -1403 +1403 @@
         IWorkflowState(self.applicant).setState('admitted')
         self.browser.open('http://localhost/app/applicants/checkstatus')
-        self.browser.getControl(name="applicant_id").value = self.applicant.applicant_id
+        self.browser.getControl(name="unique_id").value = self.applicant.applicant_id
         # whitespaces are ignored
         self.browser.getControl(name="lastname").value = 'Lion'
@@ -1411 +1411 @@
         self.applicant.course_admitted = self.certificate
         self.browser.open('http://localhost/app/applicants/checkstatus')
-        self.browser.getControl(name="applicant_id").value = self.applicant.applicant_id
+        self.browser.getControl(name="unique_id").value = self.applicant.applicant_id
+        self.browser.getControl(name="lastname").value = 'Lion'
+        self.browser.getControl("Submit").click()
+        self.assertTrue('Congratulations!' in self.browser.contents)
+        self.assertTrue('Unnamed Certificate (CERT1)' in self.browser.contents)
+        self.assertTrue('Department of Unnamed Department (dep1)' in self.browser.contents)
+        self.assertTrue('Faculty of Unnamed Faculty (NA)' in self.browser.contents)
+        # also the reg_number can be used
+        self.browser.open('http://localhost/app/applicants/checkstatus')
+        self.browser.getControl(name="unique_id").value = self.applicant.reg_number
         self.browser.getControl(name="lastname").value = 'Lion'
         self.browser.getControl("Submit").click()