Changeset 16164

Timestamp:

13 Jul 2020, 07:17:03 (4 years ago)

Author:

Henrik Bettermann

Message:

Enable file upload and change prefixes.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• browser.py (modified) (7 diffs)
• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

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

@@ -33 +33 @@
     ExportPDFPageApplicationSlip,
     ApplicantBaseDisplayFormPage,
-    CheckTranscriptStatus)
+    CheckTranscriptStatus,
+    AdditionalFile)
 from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.applicants.interfaces import (
@@ -223 +224 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target == 'transfull':
+        if self.target is not None and self.target == 'tscf':
             form_fields = grok.AutoFields(ITranscriptApplicant)
             for field in TRANS_OMIT_FIELDS:
@@ -230 +231 @@
             #form_fields['perm_address'].custom_widget = BytesDisplayWidget
             return form_fields
-        if self.target is not None and self.target == 'transshort':
+        if self.target is not None and self.target == 'tscs':
             form_fields = grok.AutoFields(ITranscriptApplicant)
             for field in TRANS_SHORT_OMIT_FIELDS:
@@ -402 +403 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target == 'transfull':
+        if self.target is not None and self.target == 'tscf':
             form_fields = grok.AutoFields(ITranscriptApplicant)
             for field in TRANS_OMIT_FIELDS:
                 form_fields = form_fields.omit(field)
             return form_fields
-        if self.target is not None and self.target == 'transshort':
+        if self.target is not None and self.target == 'tscs':
             form_fields = grok.AutoFields(ITranscriptApplicant)
             for field in TRANS_SHORT_OMIT_FIELDS:
@@ -472 +473 @@
     @property
     def form_fields(self):
-        if self.target is not None and self.target == 'transfull':
+        if self.target is not None and self.target == 'tscf':
             form_fields = grok.AutoFields(ITranscriptApplicant)
             for field in TRANS_OMIT_FIELDS:
                 form_fields = form_fields.omit(field)
             return form_fields
-        if self.target is not None and self.target == 'transshort':
+        if self.target is not None and self.target == 'tscs':
             form_fields = grok.AutoFields(ITranscriptApplicant)
             for field in TRANS_SHORT_OMIT_FIELDS:
@@ -533 +534 @@
                 'a':container_title, 'b':self.context.application_number})
         return super(CustomApplicantEditFormPage, self).label
+
+    def display_fileupload(self, filename):
+        if filename[1] == 'res_stat.pdf' \
+            and self.target is not None \
+            and not self.target.startswith('tscf'):
+            return False
+        if filename[1] == 'eligibility.pdf' \
+            and self.target is not None \
+            and not self.target.startswith('tsc'):
+            return False
+        return True
+
+    def dataNotComplete(self, data):
+        store = getUtility(IExtFileStore)
+        if self.context.__parent__.with_picture:
+            store = getUtility(IExtFileStore)
+            if not store.getFileByContext(self.context, attr=u'passport.jpg'):
+                return _('No passport picture uploaded.')
+        if self.target is not None \
+            and self.target.startswith('tscf') \
+            and not store.getFileByContext(self.context, attr=u'res_stat.pdf'):
+            return _('No statement of result pdf file uploaded.')
+        if self.target is not None \
+            and self.target.startswith('tsc') \
+            and not store.getFileByContext(self.context, attr=u'eligibility.pdf'):
+            return _('No eligibility form pdf file uploaded.')
+        return False
 
 class CustomOnlinePaymentApprovePage(OnlinePaymentApprovePage):
@@ -722 +750 @@
     websites = (('Uniben Alumni Portal', 'https://uniben-alumni.waeup.org/'),
                 ('Uniben Student Portal', 'https://uniben.waeup.org/'),)
-    appl_url1 = 'https://uniben-alumni.waeup.org/applicants/transfull1/register'
-    appl_url2 = 'https://uniben-alumni.waeup.org/applicants/transshort1/register'
+    appl_url1 = 'https://uniben-alumni.waeup.org/applicants/tscf1/register'
+    appl_url2 = 'https://uniben-alumni.waeup.org/applicants/tscs1/register'
+
+class ResultStatement(AdditionalFile):
+    grok.name('res_stat.pdf')
+
+class EligibilityForm(AdditionalFile):
+    grok.name('eligibility.pdf')

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

@@ -303 +303 @@
         applicantscontainer.application_fee = 1.0 # Must be set but is not used.
         applicantscontainer.code = u'trans1234'
-        applicantscontainer.prefix = 'transfull'
+        applicantscontainer.prefix = 'tscf'
         applicantscontainer.title = u'This is a trans container'
         applicantscontainer.application_category = 'no'

main/waeup.uniben/trunk/src/waeup/uniben/applicants/utils.py

@@ -31 +31 @@
     """
 
+    ADDITIONAL_FILES = (
+                 ('Eligibility Form','eligibility.pdf'),
+                 ('Statement of Result','res_stat.pdf'),
+                 )
+
     APP_TYPES_DICT = {
         'pude': ['Post-UDE Screening', 'PUDE'],
@@ -60 +65 @@
                  '(2nd supplementary advert)', 'ASE'],
         'spft': ['Special Full-Time Programmes', 'SP'],
-        'transfull': ['Transcript Application (without student record)', 'TRF'],
-        'transshort': ['Transcript Application (with student record)', 'TRS'],
+        'tscf': ['Transcript Application (without student record)', 'TRF'],
+        'tscs': ['Transcript Application (with student record)', 'TRS'],
         }