Changeset 15951 for main

Timestamp:

24 Jan 2020, 12:58:03 (5 years ago)

Author:

Henrik Bettermann

Message:

Add trans_id field.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

• applicant.py (modified) (1 diff)
• browser.py (modified) (3 diffs)
• interfaces.py (modified) (5 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/applicants/applicant.py

@@ -28 +28 @@
     IPUTMEApplicantEdit, ITranscriptApplicant, ICertificateRequest,
     IFedexRequest)
-
-@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='stateresult.pdf')
-    file_store.deleteFileByContext(applicant, attr='verificationdoc.pdf')
-    return
 
 class CustomApplicant(NigeriaApplicant):

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

@@ -22 +22 @@
 from zope.component import getUtility, getAdapter
 from zope.i18n import translate
+from zope.catalog.interfaces import ICatalog
 from hurry.workflow.interfaces import IWorkflowState
 from waeup.kofa.interfaces import (
@@ -33 +34 @@
 from waeup.kofa.applicants.viewlets import PDFActionButton
 from waeup.kofa.applicants.interfaces import IApplicantRegisterUpdate
-from waeup.kofa.browser.layout import UtilityView
+from waeup.kofa.browser.layout import UtilityView, action
 from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.interfaces import IPDF
@@ -572 +573 @@
         return form_fields
 
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        if self.upload_success is False:  # False is not None!
+            # Error during image upload. Ignore other values.
+            return
+        if self.target == 'fedex':
+            cat = getUtility(ICatalog, name='applicants_catalog')
+            results = list(cat.searchResults(
+                applicant_id=(data['trans_id'], data['trans_id'])))
+            if not results:
+                self.flash(_('The transcript application id does not exist.'),
+                           type='danger')
+                return
+        self.applyData(self.context, **data)
+        self.flash(_('Form has been saved.'))
+        return
+
     def update(self):
         if self.context.locked or (

main/waeup.aaue/trunk/src/waeup/aaue/applicants/interfaces.py

@@ -563 +563 @@
 
     applicant_id = schema.TextLine(
-        title = _(u'Applicant Id'),
+        title = _(u'Application Id'),
         required = False,
         readonly = False,
@@ -722 +722 @@
 
     applicant_id = schema.TextLine(
-        title = _(u'Applicant Id'),
+        title = _(u'Application Id'),
         required = False,
         readonly = False,
@@ -837 +837 @@
 
     applicant_id = schema.TextLine(
-        title = _(u'Applicant Id'),
+        title = _(u'Application Id'),
         required = False,
         readonly = False,
@@ -916 +916 @@
 
     applicant_id = schema.TextLine(
-        title = _(u'Applicant Id'),
-        required = False,
+        title = _(u'Application Id'),
+        required = False,
+        readonly = False,
+        )
+
+    trans_id = schema.TextLine(
+        title = _(u'Id of Transcript Application'),
+        required = True,
         readonly = False,
         )
@@ -1052 +1058 @@
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,
                        ITranscriptApplicant, ICertificateRequest,
-                       IVerificationRequest, ISendByEmailRequest):
+                       IVerificationRequest, ISendByEmailRequest,
+                       IFedexRequest):
     """An interface for all types of applicants.