Changeset 7002 for main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/browser.py

Timestamp:

4 Nov 2011, 18:36:27 (13 years ago)

Author:

uli

Message:

Throw in the complete mess of last 2 weeks. External file storage now works basically (tests pass), although there are lots of things still to remove, finetune, document, etc.

File:

• main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/browser.py (modified) (9 diffs)

main/waeup.sirp/branches/ulif-extimgstore/src/waeup/sirp/applicants/browser.py

@@ -22 +22 @@
 """UI components for basic applicants and related components.
 """
+import os
 import sys
 import grok
@@ -57 +58 @@
     )
 from waeup.sirp.image.image import createWAeUPImageFile
-from waeup.sirp.interfaces import IWAeUPObject, ILocalRolesAssignable
+from waeup.sirp.interfaces import (
+    IWAeUPObject, ILocalRolesAssignable, IExtFileStore, IFileStoreNameChooser)
 from waeup.sirp.permissions import get_users_with_local_roles
 from waeup.sirp.university.interfaces import ICertificate
@@ -65 +67 @@
 from waeup.sirp.widgets.objectwidget import (
     WAeUPObjectWidget, WAeUPObjectDisplayWidget)
-from waeup.sirp.applicants import ResultEntry, Applicant, get_applicant_data
+from waeup.sirp.applicants import (
+    ResultEntry, Applicant, get_applicant_data, get_regno_or_ac)
 from waeup.sirp.applicants.interfaces import (
     IApplicant, IApplicantPrincipal,IApplicantEdit, IApplicantsRoot,
-    IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab
+    IApplicantsContainer, IApplicantsContainerAdd, application_types_vocab,
+    IMAGE_PATH,
     )
 from waeup.sirp.applicants.workflow import INITIALIZED, STARTED
@@ -551 +555 @@
         'locked').omit('course_admitted')
     #form_fields['fst_sit_results'].custom_widget = list_results_display_widget
-    form_fields['passport'].custom_widget = ThumbnailWidget
+    #form_fields['passport'].custom_widget = ThumbnailWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateDisplayWidget('le')
     label = 'Applicant'
     grok.template('form_display')
     pnav = 3
+
+    def update(self):
+        self.passport_url = self.url(self.context, 'passport.jpg')
+        return
 
     @property
@@ -705 +713 @@
     grok.require('waeup.manageApplications')
     form_fields = grok.AutoFields(IApplicant)
-    form_fields['passport'].custom_widget = EncodingImageFileWidget
+    #form_fields['passport'].custom_widget = EncodingImageFileWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
     grok.template('form_edit')
@@ -718 +726 @@
         if upload:
             # We got a fresh upload
-            image = createWAeUPImageFile(upload.filename, upload)
+            #from waeup.sirp.interfaces import IExtFileStorage
+            #from zope.component import queryUtility
+            #storage = queryUtility(IExtFileStorage)
+            # filename = '__img_appl__' + str(self.context.reg_no) #upload.filename
+            from waeup.sirp.interfaces import (
+                IExtFileStore, IFileStoreNameChooser)
+            store = getUtility(IExtFileStore)
+            file_id = IFileStoreNameChooser(self.context).chooseName()
+            store.createFile(file_id, upload)
+            #filename = '__img_appl__' + str(
+            #    self.context.access_code) + '.jpg' #upload.filename
+            print "FILENAME: ", file_id
+            # image = createWAeUPImageFile(upload.filename, upload)
+            #image = createWAeUPImageFile(filename, upload)
             # This would normally be totally illegal. We set context
             # data without the complete form data being
@@ -731 +752 @@
             # we set the image here and not in 'save()' or other
             # methods.
-            self.context.passport = image
+            #self.context.passport = image
             upload.seek(0)
             self.passport_changed = True
@@ -782 +803 @@
         'screening_score',
         )
-    form_fields['passport'].custom_widget = EncodingImageFileWidget
+    #form_fields['passport'].custom_widget = EncodingImageFileWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
     grok.template('form_edit')
@@ -868 +889 @@
     text = 'View application record'
     target = 'index'
+
+class PassportImage(grok.View):
+    """Renders the passport image for applicants.
+    """
+    grok.name('passport.jpg')
+    grok.context(IApplicant)
+    grok.require('waeup.handleApplication')
+
+    def render(self):
+        # A filename chooser turns a context into a filename suitable
+        # for file storage.
+        chooser = IFileStoreNameChooser(self.context)
+        file_id = chooser.chooseName()
+        image = getUtility(IExtFileStore).getFile(file_id)
+        self.response.setHeader(
+            'Content-Type', 'image/jpeg')
+        if image is None:
+            # show placeholder image
+            return open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg'), 'rb')
+        return image