Changeset 12306 for main/waeup.ikoba/trunk/src/waeup/ikoba/utils

Timestamp:

24 Dec 2014, 07:38:53 (10 years ago)

Author:

Henrik Bettermann

Message:

Turn ResultEntry? (school grades) components into ProductOptionEntry? components.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/utils

Files:

• converters.py (modified) (2 diffs)
• tests/test_converters.py (modified) (7 diffs)
• utils.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/converters.py

@@ -30 +30 @@
 from zope.schema.interfaces import IList
 from waeup.ikoba.interfaces import (
-    IObjectConverter, IResultEntryField, IFieldConverter, SubjectSource,
-    GradeSource, DELETION_MARKER, IGNORE_MARKER)
+    IObjectConverter, IProductOptionEntryField, IFieldConverter,
+    DELETION_MARKER, IGNORE_MARKER)
 from waeup.ikoba.schema.interfaces import IPhoneNumber
-from waeup.ikoba.schoolgrades import ResultEntry
+from waeup.ikoba.schoolgrades import ProductOptionEntry
 
 class ExtendedCheckBoxWidget(CheckBoxWidget):
@@ -175 +175 @@
         return result
 
-class ResultEntryConverter(grok.Adapter):
-    grok.context(IResultEntryField)
+class ProductOptionEntryConverter(grok.Adapter):
+    grok.context(IProductOptionEntryField)
     grok.implements(IFieldConverter)
 
     def request_data(self, name, value, schema_field, prefix='',
                      mode='create'):
-        """Turn CSV values into ResultEntry-compatible form data.
-
-        Expects as `value` a _string_ like ``(u'mysubject',
-        u'mygrade')`` and turns it into some dict like::
+        """Turn CSV values into ProductOptionEntry-compatible form data.
+
+        Expects as `value` a _string_ like ``(u'mytitle',
+        u'myfee')`` and turns it into some dict like::
 
           {
-            'form.grade.subject': u'9234896395...',
-            'form.grade.grade': u'7e67e9e777..'
+            'form.option.title': u'9234896395...',
+            'form.option.fee': 7698769
+            'form.option.currency': u'7e67e9e777..'
             }
 
         where the values are tokens from appropriate sources.
 
-        Such dicts can be transformed into real ResultEntry objects by
+        Such dicts can be transformed into real ProductOptionEntry objects by
         input widgets used in converters.
         """
         try:
-            entry = ResultEntry.from_string(value)
-            subj, grade = entry.subject, entry.grade
+            entry = ProductOptionEntry.from_string(value)
+            title, fee, currency = entry.title, entry.fee, entry.currency
         except:
             return {prefix: value}
-        # web forms send tokens instead of real values
-        s_token = SubjectSource().factory.getToken(subj)
-        g_token = GradeSource().factory.getToken(grade)
         result = {
-            "%ssubject" % (prefix): s_token,
-            "%sgrade" % (prefix): g_token,
+            "%stitle" % (prefix): title,
+            "%sfee" % (prefix): fee,
+            "%scurrency" % (prefix): currency,
             }
         return result

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/tests/test_converters.py

@@ -23 +23 @@
 import tempfile
 import unittest
+from decimal import Decimal
 from zope import schema
 from zope.component import provideUtility
@@ -35 +36 @@
 from waeup.ikoba.testing import FunctionalLayer, FunctionalTestCase
 from waeup.ikoba.interfaces import (
-    SimpleIkobaVocabulary, SubjectSource, GradeSource, IFieldConverter,
+    SimpleIkobaVocabulary, IFieldConverter,
     DELETION_MARKER, IGNORE_MARKER)
-from waeup.ikoba.schoolgrades import ResultEntryField
+from waeup.ikoba.schoolgrades import ProductOptionEntryField
 from waeup.ikoba.utils.converters import (
     IObjectConverter, IFieldConverter, DefaultFieldConverter,
-    ListFieldConverter, PhoneNumberFieldConverter, ResultEntryConverter,
+    ListFieldConverter, PhoneNumberFieldConverter, ProductOptionEntryConverter,
     DefaultObjectConverter)
 from waeup.ikoba.utils.helpers import attrs_to_fields
@@ -91 +92 @@
         vocabulary = car_nums,
         )
-    grades = schema.List(
-        title = u'School Grades',
-        value_type = ResultEntryField(),
+    options = schema.List(
+        title = u'Options',
+        value_type = ProductOptionEntryField(),
         required = True,
         default = [],
@@ -136 +137 @@
         obj2 = ListFieldConverter(None)
         obj3 = PhoneNumberFieldConverter(None)
-        obj4 = ResultEntryConverter(None)
+        obj4 = ProductOptionEntryConverter(None)
         verify.verifyObject(IFieldConverter, obj1)
         verify.verifyObject(IFieldConverter, obj2)
@@ -144 +145 @@
         verify.verifyClass(IFieldConverter, ListFieldConverter)
         verify.verifyClass(IFieldConverter, PhoneNumberFieldConverter)
-        verify.verifyClass(IFieldConverter, ResultEntryConverter)
+        verify.verifyClass(IFieldConverter, ProductOptionEntryConverter)
         return
 
@@ -384 +385 @@
         return
 
-    def test_list_of_resultentries(self):
+    def test_list_of_optionentries(self):
         # We can handle lists of result entries
         converter = IObjectConverter(IContact)
         # get currently valid values
-        s_src, g_src = SubjectSource(), GradeSource()
-        s_val1, s_val2 = list(s_src.factory.getValues())[0:2]
-        g_val1, g_val2 = list(g_src.factory.getValues())[0:2]
-        req_string = u"[('%s', '%s'), ('%s', '%s')]" % (
-                s_val1, g_val1, s_val2, g_val2)
-        err, inv_err, data = converter.fromStringDict(
-            {"grades": req_string,
-             },
-            'contact')
-        result_grades = data['grades']
-        self.assertTrue(isinstance(result_grades, list))
-        self.assertEqual(len(result_grades), 2)
-        self.assertEqual(result_grades[0].subject, s_val1)
-        self.assertEqual(result_grades[0].grade, g_val1)
+        req_string = u"[(u'T1', u'55.6', u'usd'), (u'T2', u'66.6', u'eur')]"
+        err, inv_err, data = converter.fromStringDict(
+            {"options": req_string,}, 'contact')
+        result_options = data['options']
+        self.assertTrue(isinstance(result_options, list))
+        self.assertEqual(len(result_options), 2)
+        self.assertEqual(result_options[0].title, 'T1')
+        self.assertEqual(result_options[0].fee, Decimal('55.6'))
+        self.assertEqual(result_options[0].currency, 'usd')
+        self.assertEqual(result_options[1].title, 'T2')
+        self.assertEqual(result_options[1].fee, Decimal('66.6'))
+        self.assertEqual(result_options[1].currency, 'eur')
         return
 
@@ -420 +419 @@
         converter = IObjectConverter(IContact)
         err, inv_err, data = converter.fromStringDict(
-            {"grades": DELETION_MARKER,
+            {"options": DELETION_MARKER,
              "friends": DELETION_MARKER},
             'contact', mode='update')
         # grades are about to be set to default, friends to None
-        self.assertEqual(data, {'grades': [], 'friends': None})
-        return
+        self.assertEqual(data, {'options': [], 'friends': None})
+        return

main/waeup.ikoba/trunk/src/waeup/ikoba/utils/utils.py

@@ -107 +107 @@
         'no': 'no contract',
         }
-
-    EXAM_SUBJECTS_DICT = {
-        'math': 'Mathematics',
-        'computer_science': 'Computer Science',
-        }
-
-    #: Exam grades. The tuple is sorted as it should be displayed in
-    #: select boxes.
-    EXAM_GRADES = (
-        ('A', 'Best'),
-        ('B', 'Better'),
-        ('C', 'Good'),
-        )
 
     PAYMENT_CATEGORIES = {