Changeset 5530

Timestamp:

25 Sep 2010, 15:47:02 (14 years ago)

Author:

uli

Message:

Commit local changes (work inprogress)

Location:

main/waeup.sirp/branches/ulif-images/src/waeup/sirp/jambtables

Files:

• applicants.py (modified) (3 diffs)
• browser.py (modified) (6 diffs)
• interfaces.py (modified) (4 diffs)

main/waeup.sirp/branches/ulif-images/src/waeup/sirp/jambtables/applicants.py

@@ -28 +28 @@
     IResultEntry, IApplicant, IApplicantContainer, IApplicantPDEEditData
     )
+from waeup.sirp.widgets.passportwidget import PassportImage
 
 class ResultEntry(grok.Context):
@@ -37 +38 @@
     
 class Applicant(grok.Context):
+    # class Applicant(grok.Model):
     grok.implements(IApplicant, IApplicantPDEEditData)
     grok.provides(IApplicant)
@@ -105 +107 @@
         self.import_from = None
 
+class ApplicantTraverser(grok.Traverser):
+    grok.context(IApplicant)
+    def traverse(self, name):
+        passport_filename = self.context.passport.filename
+        print "FILENAME: ", passport_filename
+        if name == passport_filename:
+            print "USE FILE", self.context.passport
+            return self.context.passport
+        if name == 'passport.jpg':
+            if self.context.passport is not None:
+                print "PP: ", self.context.passport
+                return self.context.passport
+            return PassportImage(None)
+
 class ApplicantFactory(grok.GlobalUtility):
     """A factory for faculty containers.

main/waeup.sirp/branches/ulif-images/src/waeup/sirp/jambtables/browser.py

@@ -24 +24 @@
 import grok
 
+from zope.formlib.widgets import FileWidget
 from waeup.sirp.browser import (
     WAeUPPage, WAeUPEditFormPage, WAeUPAddFormPage,
@@ -33 +34 @@
 from waeup.sirp.jambtables.interfaces import (
     IApplicant, IApplicantContainer, IApplicantPrincipal, IApplicantPDEEditData)
-                                              
-
+from waeup.sirp.widgets.passportwidget import (
+    PassportWidget, PassportDisplayWidget
+    )
 #from zope.formlib.objectwidget import ObjectWidget
 from zope.formlib.sequencewidget import ListSequenceWidget, SequenceDisplayWidget
@@ -43 +45 @@
 from waeup.sirp.widgets.multilistwidget import (
     MultiListWidget, MultiListDisplayWidget)
+from waeup.sirp.image.browser.widget import (
+    ThumbnailWidget, EncodingImageFileWidget,
+    )
 
 results_widget = CustomWidgetFactory(
@@ -77 +82 @@
     form_fields = grok.AutoFields(IApplicant)
     form_fields['fst_sit_results'].custom_widget = list_results_widget
+    form_fields['passport'].custom_widget = EncodingImageFileWidget
     label = 'Add Applicant'
     title = 'Add Applicant'
@@ -100 +106 @@
     form_fields = grok.AutoFields(IApplicant)
     form_fields['fst_sit_results'].custom_widget = list_results_display_widget
+    #form_fields['passport'].custom_widget = PassportDisplayWidget
+    form_fields['passport'].custom_widget = ThumbnailWidget
     label = 'Applicant'
     title = 'Applicant'
@@ -108 +116 @@
     grok.name('edit')
     form_fields = grok.AutoFields(IApplicantPDEEditData)
+    #form_fields['passport'].custom_widget = FileWidget
+    #form_fields['passport'].custom_widget = PassportWidget
+    form_fields['passport'].custom_widget = EncodingImageFileWidget
     grok.template('form_edit_pde')
 
+    def update(self):
+        super(EditApplicant, self).update()
+        print self.request.form
+        return
+    
     @property
     def label(self):

main/waeup.sirp/branches/ulif-images/src/waeup/sirp/jambtables/interfaces.py

@@ -22 +22 @@
 """Interfaces for JAMB data tables and related components.
 """
-from waeup.sirp.interfaces import IWAeUPObject
+import os
+import waeup.sirp.browser
+from hurry.file import HurryFile
 from zc.sourcefactory.basic import BasicSourceFactory
 from zope import schema
+from zope.app.file.interfaces import IImage
 from zope.interface import Interface, Attribute
 from zope.pluggableauth.interfaces import IPrincipalInfo
 from zope.security.interfaces import IGroupClosureAwarePrincipal as IPrincipal
-
+from waeup.sirp.interfaces import IWAeUPObject
+from waeup.sirp.image.schema import ImageFile
+
+IMAGE_PATH = os.path.join(
+    os.path.dirname(waeup.sirp.browser.__file__),
+    'static'
+    )
+DEFAULT_PASSPORT_IMAGE_MALE = HurryFile(
+    'passport.jpg',
+    open(os.path.join(IMAGE_PATH, 'placeholder_m.jpg')).read(),
+    )
+DEFAULT_PASSPORT_IMAGE_FEMALE = HurryFile(
+    'passport.jpg',
+    open(os.path.join(IMAGE_PATH, 'placeholder_f.jpg')).read(),
+    )
 
 class GenderSource(BasicSourceFactory):
@@ -179 +196 @@
         required = False,
         )
-    passport = schema.Bool(
+    #passport = schema.Bool(
+    #    title = u'Passport Photograph',
+    #    default = True,
+    #    required = False,
+    #    )
+    passport = ImageFile(
         title = u'Passport Photograph',
-        default = True,
-        required = False,
+        default = DEFAULT_PASSPORT_IMAGE_MALE,
+        required = True,
         )
     aos = schema.TextLine(
@@ -422 +444 @@
         default = u'm',
         )
-    passport = schema.Bool(
+    #passport = schema.Bool(
+    #    title = u'Passport Photograph',
+    #    default = True,
+    #    )
+    passport = ImageFile(
         title = u'Passport Photograph',
-        default = True,
+        default = DEFAULT_PASSPORT_IMAGE_MALE,
+        required = True,
         )
     #
@@ -578 +605 @@
         readonly = True,
         )
-    passport = schema.Bool(
+    #passport = schema.Bool(
+    #    title = u'Passport Photograph',
+    #    default = True,
+    #    required = False,
+    #    ),
+    #passport = schema.Bytes(
+    #    title = u'Passport Photograph',
+    #    required = True,
+    #    )
+    #passport = schema.Object(
+    #    title = u'Passport Photograph',
+    #    required = True,
+    #    schema = IImage)
+    passport = ImageFile(
         title = u'Passport Photograph',
-        default = True,
-        required = False,
-        )
-
+        default = DEFAULT_PASSPORT_IMAGE_MALE,
+        required = True,
+        )
 
 class IApplicantPDEImportData(IApplicantBaseData):