Changeset 15947

Timestamp:

23 Jan 2020, 14:35:44 (5 years ago)

Author:

Henrik Bettermann

Message:

Remove redundant components and make adjustments to base package.

Location:

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants

Files:

• applicant.py (modified) (1 diff)
• browser.py (modified) (6 diffs)
• browser_templates/applicantdisplaypage.pt (deleted)
• browser_templates/applicanteditpage.pt (deleted)
• tests/test_browser.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants/applicant.py

@@ -27 +27 @@
     ICustomApplicant, ICustomUGApplicantEdit, ICustomPGApplicantEdit, IPUTMEApplicantEdit)
 
-@grok.subscribe(ICustomApplicant, grok.IObjectRemovedEvent)
-def custom_handle_applicant_removed(applicant, event):
-    """If an applicant is removed also pdf files of this applicant are removed.
-    """
-    file_store = getUtility(IExtFileStore)
-    file_store.deleteFileByContext(applicant, attr='res_stat.pdf')
-    return
-
 class CustomApplicant(NigeriaApplicant):
 

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants/browser.py

@@ -26 +26 @@
 from waeup.kofa.utils.helpers import string_from_bytes, file_size, now
 from waeup.kofa.applicants.browser import (
-    ApplicantRegistrationPage, ApplicantsContainerPage)
+    ApplicantRegistrationPage, ApplicantsContainerPage, AdditionalFile)
 from waeup.kofa.applicants.interfaces import (
     ISpecialApplicant, IApplicantsContainer)
@@ -78 +78 @@
     'aggregate')
 
-def handle_file_upload(upload, context, view, attr=None):
-    """Handle upload of applicant files.
-
-    Returns `True` in case of success or `False`.
-
-    Please note that file pointer passed in (`upload`) most probably
-    points to end of file when leaving this function.
-    """
-    size = file_size(upload)
-    if size > MAX_FILE_UPLOAD_SIZE:
-        view.flash(_('Uploaded file is too big!'))
-        return False
-    dummy, ext = os.path.splitext(upload.filename)
-    ext.lower()
-    if ext != '.pdf':
-        view.flash(_('pdf file extension expected.'))
-        return False
-    upload.seek(0) # file pointer moved when determining size
-    store = getUtility(IExtFileStore)
-    file_id = IFileStoreNameChooser(context).chooseName(attr=attr)
-    store.createFile(file_id, upload)
-    return True
-
 class CustomApplicantsContainerPage(ApplicantsContainerPage):
     """The standard view for regular applicant containers.
@@ -121 +98 @@
     """A display view for applicant data.
     """
-
-    @property
-    def file_links(self):
-        html = ''
-        pdf = getUtility(IExtFileStore).getFileByContext(
-            self.context, attr='res_stat.pdf')
-        if pdf:
-            html += '<a href="%s">Statement of Result</a>' % self.url(
-                self.context, 'res_stat.pdf')
-        return html
 
     @property
@@ -172 +139 @@
         return form_fields
 
-    def update(self):
-        super(CustomApplicantManageFormPage, self).update()
-        upload_res_stat = self.request.form.get('form.res_stat', None)
-        if upload_res_stat:
-            # We got a fresh res_stat upload
-            success = handle_file_upload(
-                upload_res_stat, self.context, self, attr='res_stat.pdf')
-            if success:
-                self.context.writeLogMessage(self, 'saved: res_stat')
-            else:
-                self.upload_success = False
-        self.max_file_upload_size = string_from_bytes(MAX_FILE_UPLOAD_SIZE)
-        return
-
 class CustomApplicantEditFormPage(NigeriaApplicantEditFormPage):
     """An applicant-centered edit view for applicant data.
     """
+
+    def display_fileupload(self, filename):
+        if filename[1] == 'res_stat.pdf':
+            if self.context.subtype != 'transfer':
+                return False
+        return True
 
     def dataNotComplete(self, data):
@@ -217 +176 @@
         return form_fields
 
-    def update(self):
-        if self.context.locked or (
-            self.context.__parent__.expired and
-            self.context.__parent__.strict_deadline):
-            self.emit_lock_message()
-            return
-        super(CustomApplicantEditFormPage, self).update()
-        upload_res_stat = self.request.form.get('form.res_stat', None)
-        if upload_res_stat:
-            # We got a fresh res_stat upload
-            success = handle_file_upload(
-                upload_res_stat, self.context, self, attr='res_stat.pdf')
-            if not success:
-                self.upload_success = False
-        self.max_file_upload_size = string_from_bytes(MAX_FILE_UPLOAD_SIZE)
-        return
-
 class CustomPDFApplicationSlip(NigeriaPDFApplicationSlip):
 
@@ -256 +198 @@
         return form_fields
 
-class ResultStatement(grok.View):
+class ResultStatement(AdditionalFile):
     """Renders the pdf form extension for applicants.
     """
     grok.name('res_stat.pdf')
-    grok.context(ICustomApplicant)
-    grok.require('waeup.viewApplication')
-
-    def render(self):
-        pdf = getUtility(IExtFileStore).getFileByContext(
-            self.context, attr='res_stat.pdf')
-        self.response.setHeader('Content-Type', 'application/pdf')
-        return pdf
+
+class JAMBResult(AdditionalFile):
+    """Renders the pdf form extension for applicants.
+    """
+    grok.name('jamb.pdf')

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants/tests/test_browser.py

@@ -134 +134 @@
         pdf_content = 'A' * 1024 * 300  # A string of 300 KB size
         pseudo_pdf = StringIO(pdf_content)
-        ctrl = self.browser.getControl(name='form.res_stat')
+        ctrl = self.browser.getControl(name='res_stat.pdf')
         file_ctrl = ctrl.mech_control
         file_ctrl.add_file(pseudo_pdf, filename='myform.pdf')
@@ -167 +167 @@
         self.assertTrue(
             'zope.mgr - kofacustom.iuokada.applicants.browser.CustomApplicantManageFormPage'
-            ' - %s - saved: res_stat'
+            ' - %s - saved: res_stat.pdf'
             % (self.transapplicant.applicant_id)
             in logcontent)

main/kofacustom.iuokada/trunk/src/kofacustom/iuokada/applicants/utils.py

@@ -30 +30 @@
     """
 
-    #: A tuple of names of files to be copied over
-    #: to students section.
-    FILENAMES = ('res_stat.pdf',)
+    ADDITIONAL_FILES = (('Statement of Result','res_stat.pdf'),
+                 ('JAMB Result','jamb.pdf'))
 
     APP_TYPES_DICT = {