Changeset 5952

Timestamp:

16 Apr 2011, 14:26:00 (14 years ago)

Author:

uli

Message:

Add a confirm_passport attribute to applicants and reflect that change in form.

Location:

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

Files:

• applicants.py (modified) (1 diff)
• browser.py (modified) (2 diffs)
• browser_templates/form_edit_pde.pt (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)

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

@@ -44 +44 @@
     fst_sit_results = FieldProperty(IApplicant['fst_sit_results'])
     locked = False
+    confirm_passport = False
     
     def __init__(self):

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

@@ -381 +381 @@
         super(EditApplicant, self).update()
         return
-    
+
+    def filteredWidgets(self):
+        for widget in self.widgets:
+            if widget.name == 'form.confirm_passport':
+                continue
+            yield widget
+
     @property
     def label(self):
@@ -412 +418 @@
 
     def dataComplete(self):
-        if self.request.form.get('confirm', False) is False:
+        if context.confirm_passport is not True:
             return False
         if len(self.errors) > 0:

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/form_edit_pde.pt

@@ -23 +23 @@
   <table class="form-fields">
     <tbody>
-      <tal:block repeat="widget view/widgets">
+      <tal:block repeat="widget view/filteredWidgets">
         <tr>
           <td class="label" tal:define="hint widget/hint">
@@ -51 +51 @@
       <tr>
         <td colspan="2">
-          <input type="checkbox" name="confirm" />
+          <input class="hiddenType" id="form.confirm_passport.used" 
+                 name="form.confirm_passport.used" type="hidden" value="" />
+          <input type="checkbox" name="form.confirm_passport"
+                 tal:attributes="checked context/confirm_passport"
+                 />
           <label for="confirm"></label>
 <span>

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

@@ -445 +445 @@
         required = False,
         )
+    confirm_passport = schema.Bool(
+        title = u"Confirmation that photograph represents applicant ticked.",
+        default = False,
+        required = True,
+        )
 
     
@@ -676 +681 @@
         required = True,
         )
-
+    confirm_passport = schema.Bool(
+        title = u"Confirmation that photograph represents applicant ticked.",
+        default = False,
+        required = True,
+        )
+
+    
 class IApplicantPrincipalInfo(IPrincipalInfo):
     """Infos about principals that are applicants.