Changeset 8503

Timestamp:

23 May 2012, 21:27:37 (12 years ago)

Author:

Henrik Bettermann

Message:

Use LGA source instead of vocabulary to catch LookupErrors? when LGA tuple has been changed.

Location:

main/waeup.aaue/trunk/src/waeup/aaue

Files:

• applicants/interfaces.py (modified) (4 diffs)
• interfaces.py (modified) (2 diffs)
• students/interfaces.py (modified) (3 diffs)

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

@@ -28 +28 @@
 from waeup.kofa.students.vocabularies import nats_vocab
 from waeup.aaue.interfaces import (
-    lgas_vocab, high_qual, high_grade, exam_types)
+    LGASource, high_qual, high_grade, exam_types)
 from waeup.aaue.interfaces import MessageFactory as _
 from waeup.aaue.payments.interfaces import ICustomOnlinePayment
@@ -43 +43 @@
         )
     lga = schema.Choice(
-        source = lgas_vocab,
+        source = LGASource(),
         title = _(u'State/LGA (Nigerians only)'),
         required = False,
@@ -66 +66 @@
         )
     lga = schema.Choice(
-        source = lgas_vocab,
+        source = LGASource(),
         title = _(u'State/LGA (Nigerians only)'),
         required = False,
@@ -138 +138 @@
         )
     nysc_lga = schema.Choice(
-        source = lgas_vocab,
+        source = LGASource(),
         title = _(u'Nysc Location'),
         required = False,

main/waeup.aaue/trunk/src/waeup/aaue/interfaces.py

@@ -19 +19 @@
 import zope.i18nmessageid
 from zope import schema
+from zc.sourcefactory.basic import BasicSourceFactory
 from waeup.kofa.interfaces import (SimpleKofaVocabulary,
     ISessionConfiguration, academic_sessions_vocab)
@@ -69 +70 @@
     )
 
+#lgas_vocab = SimpleKofaVocabulary(
+#    *sorted([(x[1],x[0]) for x in LGAS]))
 
-lgas_vocab = SimpleKofaVocabulary(
-    *sorted([(x[1],x[0]) for x in LGAS]))
+class LGASource(BasicSourceFactory):
+    """A source for school subjects used in exam documentation.
+    """
+    lga_dict = dict(LGAS)
+
+    def getValues(self):
+        return sorted(self.lga_dict.keys())
+
+    def getToken(self, value):
+        return str(value)
+
+    def getTitle(self, value):
+        return self.lga_dict.get(value,
+            _('Invalid key: ${a}', mapping = {'a':value}))
 
 # It's recommended to replicate all fields from the base package here.

main/waeup.aaue/trunk/src/waeup/aaue/students/interfaces.py

@@ -30 +30 @@
     nats_vocab, contextual_reg_num_source)
 from waeup.aaue.interfaces import (
-    lgas_vocab, high_qual, high_grade, exam_types)
+    high_qual, high_grade, exam_types, LGASource)
 from waeup.aaue.interfaces import MessageFactory as _
 from waeup.aaue.payments.interfaces import ICustomOnlinePayment
+from waeup.aaue.utils.lgas import LGAS
+
 
 class ICustomStudentBase(IStudentBase):
@@ -77 +79 @@
 
     lga = schema.Choice(
-        source = lgas_vocab,
+        source = LGASource(),
         title = _(u'State/LGA (Nigerians only)'),
         required = False,
@@ -269 +271 @@
 
     nysc_lga = schema.Choice(
-        source = lgas_vocab,
+        source = LGASource(),
         title = _(u'Nysc Location'),
         required = False,