Changeset 16456 for main/waeup.uniben/trunk/src

Timestamp:

13 Apr 2021, 10:32:16 (4 years ago)

Author:

Henrik Bettermann

Message:

Students must upload new passport picture before requesting clearance.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/students

Files:

• browser.py (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)

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

@@ -146 +146 @@
     def dataNotComplete(self):
         store = getUtility(IExtFileStore)
+        if not store.getFileByContext(self.context, attr=u'passport.jpg'):
+            return _('No red background passport picture uploaded.')
         if not store.getFileByContext(self.context, attr=u'birth_certificate.jpg'):
             return _('No birth certificate uploaded.')
@@ -780 +782 @@
             emit_lock_message(self)
             return
-        # Passport pictures must not be editable if application slip
-        # exists.
         slip = getUtility(IExtFileStore).getFileByContext(
             self.context, 'application_slip')
         PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.state not in PORTRAIT_CHANGE_STATES or slip is not None:
+        if self.context.state not in PORTRAIT_CHANGE_STATES:
             emit_lock_message(self)
             return

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

@@ -45 +45 @@
 
 SAMPLE_FPM = os.path.join(os.path.dirname(__file__), 'sample.fpm')
-SAMPLE_IMAGE = os.path.join(os.path.dirname(__file__), 'test_image.jpg')
+SAMPLE_PASSPORT = os.path.join(os.path.dirname(__file__), 'test_image.jpg')
 
 class OfficerUITests(StudentsFullSetup):
@@ -157 +157 @@
         # have been uploaded.
         self.browser.getControl("Save and request clearance").click()
+
+        self.assertTrue('No red background passport picture uploaded'
+            in self.browser.contents)
+        passport = 'My passport picture'
+        file_id = IFileStoreNameChooser(self.student).chooseName(
+            attr="passport.jpg")
+        image = open(SAMPLE_PASSPORT, 'rb')
+        file_store.createFile(file_id, image)
+        self.browser.open(self.edit_clearance_path)
+        self.browser.getControl("Save and request clearance").click()
+
         self.assertTrue('No birth certificate uploaded'
             in self.browser.contents)