Changeset 15941 for main/waeup.kofa/trunk

Timestamp:

20 Jan 2020, 14:01:54 (5 years ago)

Author:

Henrik Bettermann

Message:

Copy also files from applicants to students section.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/applicants/applicant.py (modified) (6 diffs)
• src/waeup/kofa/applicants/tests/test_applicantcopier.py (modified) (3 diffs)
• src/waeup/kofa/applicants/utils.py (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Copy also files from applicants to students section.
 
 * Reset _curr_stud_id if student could not be created.

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

@@ -40 +40 @@
 from waeup.kofa.utils.helpers import attrs_to_fields
 from waeup.kofa.applicants.interfaces import (
-    IApplicant, IApplicantEdit, ISpecialApplicant)
+    IApplicant, IApplicantEdit, ISpecialApplicant, IApplicantsUtils)
 from waeup.kofa.applicants.workflow import application_states_dict
 from waeup.kofa.applicants.payment import ApplicantOnlinePayment
@@ -153 +153 @@
 
     def createStudent(self, view=None):
-        """Create a student, fill with base data, create an application slip
-        and copy applicant data.
+        """Create a student, fill with base data, create an application slip,
+        copy applicant data and files.
         """
         site = grok.getSite()
@@ -218 +218 @@
         self._setStudyCourseAttributes(student['studycourse'])
         self._copyPassportImage(student)
+        self._copyFiles(student)
         # Update the catalog
         notify(grok.ObjectModifiedEvent(student))
@@ -247 +248 @@
         return
 
+    def _copyFiles(self, student):
+        """Copy all other files over to student location. Not
+        used in base package but tested with fake file.
+        """
+        file_store = getUtility(IExtFileStore)
+        filenames = getUtility(IApplicantsUtils).FILENAMES
+        for filename in filenames:
+            appl_file = file_store.getFileByContext(self, attr=filename)
+            if appl_file is None:
+                return
+            stud_file_id = IFileStoreNameChooser(student).chooseName(
+                attr=filename)
+            file_store.createFile(stud_file_id, appl_file)
+        return
+
 # Set all attributes of Applicant required in IApplicant as field
 # properties. Doing this, we do not have to set initial attributes
@@ -345 +361 @@
         In the beginning the `attr` parameter was not taken into account for
         :class:`Applicant` context as the single passport image was the
-        only file we store for applicants. Meanwhile FUTMinna requires
+        only file we store for applicants. Meanwhile many universities require
         uploads of other documents too. Now we store passport image
         files without attribute but all other documents with.
@@ -439 +455 @@
     file_store = getUtility(IExtFileStore)
     file_store.deleteFileByContext(applicant)
+    # Remove all other files too
+
+
     # Remove global role
     role_manager = IPrincipalRoleManager(grok.getSite())

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

@@ -21 +21 @@
 import os
 import grok
+from StringIO import StringIO
 from datetime import datetime
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
@@ -59 +60 @@
         self.prepare_applicant()
         storage = getUtility(IExtFileStore)
+        # The stored image can be fetched
         file_id = IFileStoreNameChooser(self.applicant).chooseName()
-        # The stored image can be fetched
         fd = storage.getFile(file_id)
         file_len_orig = len(fd.read())
+        # We store a test pdf file
+        dummy_file = StringIO('test file')
+        testfile_id = IFileStoreNameChooser(
+            self.applicant).chooseName(attr='testfile.pdf')
+        test_file = storage.createFile(testfile_id, dummy_file)
+        # The stored file can be fetched
+        fd = storage.getFile(testfile_id)
+        testfile_len_orig = len(fd.read())
         self.assertEqual(self.app['students']._curr_stud_id, 1000000)
         # Let's try to create the student
@@ -111 +120 @@
         self.assertEqual(self.applicant.student_id, student.student_id)
         # Check if passport image has been copied
-        storage = getUtility(IExtFileStore)
-        file_id = IFileStoreNameChooser(
-            student).chooseName(attr='passport.jpg')
+        file_id = IFileStoreNameChooser(student).chooseName(attr='passport.jpg')
         fd = storage.getFile(file_id)
         file_len = len(fd.read())
         self.assertEqual(file_len_orig, file_len)
+        # Check if test file has been copied too (new)
+        file_id = IFileStoreNameChooser(student).chooseName(attr='testfile.jpg')
+        fd = storage.getFile(file_id)
+        file_len = len(fd.read())
+        self.assertEqual(testfile_len_orig, file_len)
         # Check if application slip exists and is a PDF file
         file_id = IFileStoreNameChooser(

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

@@ -47 +47 @@
       'form.notice': _(u'Application Process Data'),
       }
+
+    #: A tuple of names of files to be copied over
+    #: to students section.
+    FILENAMES = ('testfile.pdf',)
 
     def setPaymentDetails(self, container, payment, applicant):

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

@@ -2174 +2174 @@
 
     This view is used for browser tests only and
-    must be neutralized in custom pages!
+    must be neutralized on custom pages!
     """
     grok.name('fake_approve')