Changeset 5983 for main/waeup.sirp/trunk/src/waeup/sirp

Timestamp:

26 Apr 2011, 11:17:38 (14 years ago)

Author:

uli

Message:

• Fix applicant/passport-image traverser to return a placeholder image if in doubt.

• Set Applicant attributes via FieldProperties?. No need to set initial values manually any more.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicants.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/applicants.py

@@ -24 +24 @@
 from zope.interface import implementedBy
 from zope.schema.fieldproperty import FieldProperty
-from waeup.sirp.image.schema import ImageFile
 from waeup.sirp.interfaces import IWAeUPSIRPPluggable
 from waeup.sirp.applicants.interfaces import (
-    IResultEntry, IApplicant, IApplicantPDEEditData
+    IResultEntry, IApplicant, IApplicantPDEEditData,
+    DEFAULT_PASSPORT_IMAGE_MALE,
     )
 
@@ -36 +36 @@
         self.subject = subject
         self.score = score
-    
+
 class Applicant(grok.Context):
-    # class Applicant(grok.Model):
     grok.implements(IApplicant, IApplicantPDEEditData)
     grok.provides(IApplicant)
 
-    fst_sit_results = FieldProperty(IApplicant['fst_sit_results'])
-    locked = False
-    confirm_passport = False
-    
-    def __init__(self):
-        self.reg_no = None
-        self.access_code = None
-        self.serial = None
-        self.course1 = None
-        self.course2 = None
-        self.course3 = None
-        self.firstname = None
-        self.middlenames = None
-        self.lastname = None
-        self.jamb_age = None
-        self.date_of_birth = None
-        self.jamb_state = None
-        self.jamb_lga = None
-        self.lga = None
-        self.sex = None
-        self.email = None
-        self.phone = None
-        self.passport = None
-        self.aos = None
-        self.subj1 = None
-        self.subj2 = None
-        self.subj3 = None
-        self.hq_matric_no = None
-        self.hq_type = None
-        self.hq_grade = None
-        self.hq_school = None
-        self.hq_session = None
-        self.hq_disc = None
-        self.fst_sit_fname = None
-        self.fst_sit_no = None
-        self.fst_sit_date = None
-        self.fst_sit_type = None
-        #self.fst_sit_results = []
-        self.fst_sit_results = None
-        #self.fst_sit_results = ResultEntry()
-        self.scd_sit_fname = None
-        self.scd_sit_no = None
-        self.scd_sit_date = None
-        self.scd_sit_type = None
-        self.scd_sit_results = None
-        self.eng_score = None
-        self.subj1score = None
-        self.subj2score = None
-        self.subj3score = None
-        self.application_date = None
-        self.status = None
-        self.screening_date = None
-        self.screening_type = None
-        self.screening_score = None
-        self.screening_venue = None
-        self.total_score = None
-        self.course_admitted = None
-        self.department = None
-        self.faculty = None
-        self.entry_session = None
-        self.notice = None
-        self.student_id = None
-        self.import_record_no = None
-        self.imported_by = None
-        self.import_date = None
-        self.import_from = None
+# Set all attributes of Applicant required in IApplicant as field
+# properties. Doing this, we do not have to set initial attributes
+# ourselves and as a bonus we get free validation when an attribute is
+# set.
+for field_name in list(IApplicant):
+    setattr(Applicant, field_name, FieldProperty(IApplicant[field_name]))
 
 class ApplicantTraverser(grok.Traverser):
@@ -134 +73 @@
             if self.context.passport is not None:
                 return self.context.passport
-            return ImageFile()
+            return DEFAULT_PASSPORT_IMAGE_MALE
         return