Changeset 6111

Timestamp:

16 May 2011, 10:09:08 (14 years ago)

Author:

Henrik Bettermann

Message:

Use APPLICATION_TYPES for both application_types_vocab and application_pins_vocab. This will ease the configuration and force officers not mix prefixes.

applicantscontainermanagepage.pt: Add missing colon.

Location:

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

Files:

• browser_templates/applicantscontainermanagepage.pt (modified) (2 diffs)
• interfaces.py (modified) (2 diffs)

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

@@ -36 +36 @@
                           <span class="required" tal:condition="widget/required"
                                 >*</span><span i18n:translate=""
-                                tal:content="widget/label">label</span>
+                                tal:content="widget/label">label</span>:
                         </label>
                         <label tal:condition="python:not hint"
@@ -42 +42 @@
                           <span class="required" tal:condition="widget/required"
                                 >*</span><span i18n:translate=""
-                                tal:content="widget/label">label</span>
+                                tal:content="widget/label">label</span>:
                         </label>
                       </td>

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

@@ -52 +52 @@
 #: Types of applications we support.
 APPLICATION_TYPES = (
-    ('Pre-NCE Programme', 'prence'),
-    ('Post UME Screening Test', 'pume'),
-    ('Post UDE Screening', 'pude'),
-    ('Part Time Degree in Education', 'sandwich'),
-    ('Part-Time Degree Programmes', 'pt'),
-    ('Diploma Programmes', 'dp'),
-    ('PCE Screening', 'pce'),
-    ('Certificate Programmes', 'ct'),
-    ('Common Entry Screening Test (CEST)', 'cest'),
+    ('General Studies', 'app','APP'),
+    ('Pre-NCE Programme', 'prence','PRE'),
+    ('Post UME Screening Test', 'pume','PUME'),
+    ('Post UDE Screening', 'pude','PUDE'),
+    ('Part Time Degree in Education', 'sandwich','SAND'),
+    ('Part-Time Degree Programmes', 'pt','PTP'),
+    ('Diploma Programmes', 'dp','DPP'),
+    ('PCE Screening', 'pce','PCE'),
+    ('Certificate Programmes', 'ct','CTP'),
+    ('Common Entry Screening Test', 'cest','CEST'),
     )
 
 #: A :class:`waeup.sirp.interfaces.SimpleWAeUPVocabulary` of supported
 #: application or screening types.
-application_types_vocab = SimpleWAeUPVocabulary(*APPLICATION_TYPES)
+application_types_vocab = SimpleWAeUPVocabulary(*[(x[0],x[1]) for x in APPLICATION_TYPES])
+application_pins_vocab = SimpleWAeUPVocabulary(*[(u"%s (%s)" % (x[2],x[0]),x[2]) for x in APPLICATION_TYPES])
 
 def yeararrange():
@@ -200 +202 @@
         required = True,
         default = None,
-        values = ['APP','CEST','PUME','PUDE'],
+        source = application_pins_vocab,
         )