Changeset 15427

Timestamp:

26 May 2019, 08:30:42 (6 years ago)

Author:

Henrik Bettermann

Message:

Construct fullname.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene

Files:

• interswitch/tests.py (modified) (1 diff)
• utils/tests.py (modified) (2 diffs)
• utils/utils.py (modified) (2 diffs)

main/waeup.fceokene/trunk/src/waeup/fceokene/interswitch/tests.py

@@ -65 +65 @@
         self.assertMatches('...Amount Authorized...',
                            self.browser.contents)
-        self.assertTrue(
-            '<span>70450.0</span>' in self.browser.contents)
         self.payment_url = self.browser.url
         self.payment = self.student['payments'][self.value]
 
+    def test_foo(self):
+        '''Test method foo.
+        '''
+        return
 
 #    def callback_url(self, payment_url, resp, apprAmt):

main/waeup.fceokene/trunk/src/waeup/fceokene/utils/tests.py

@@ -18 +18 @@
 from waeup.kofa.testing import FunctionalTestCase
 from waeup.fceokene.testing import FunctionalLayer
+from waeup.fceokene.utils.utils import CustomKofaUtils
 
 
@@ -24 +25 @@
     layer = FunctionalLayer
 
-    def test_foo(self):
-        '''Test method foo.
-        '''
-        return
+    def test_fullname(self):
+        util = CustomKofaUtils()
+        firstname = 'John'
+        middlename = 'Z'
+        lastname = 'Streep'
+        self.assertEqual(
+            util.fullname(firstname, lastname, middlename), 'John STREEP')
+        firstname = 'J'
+        self.assertEqual(
+            util.fullname(firstname, lastname, middlename), 'STREEP')
+        lastname = None
+        self.assertEqual(
+            util.fullname(firstname, lastname, middlename), '')
+        firstname = 'John'
+        self.assertEqual(
+            util.fullname(firstname, lastname, middlename), 'John')
+        firstname = 'J'
+        middlename = 'Babatunde'
+        lastname = 'Iron'
+        self.assertEqual(
+            util.fullname(firstname, lastname, middlename), 'Babatunde IRON')

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

@@ -18 +18 @@
 """Customize general helper utilities for Kofa.
 """
+import string
 from copy import deepcopy
 from kofacustom.nigeria.utils.utils import NigeriaKofaUtils
@@ -141 +142 @@
             return _('(visible after successful payment)')
         return payment.p_item
+
+    def fullname(self, firstname, lastname, middlename=None):
+        """Construct fullname.
+        """
+        try:
+            lastname = lastname.upper()
+        except AttributeError:
+            pass
+        # We remove single initial
+        if firstname and len(firstname) == 1:
+            firstname = ''
+        if middlename and len(middlename) == 1:
+            middlename = ''
+        if lastname and len(lastname) == 1:
+            lastname = ''
+        # We construct givennames
+        givennames = ''
+        if middlename and firstname:
+            givennames = '%s %s' % (firstname, middlename)
+        elif firstname:
+            givennames = firstname
+        elif middlename:
+            givennames = middlename
+        givennames = string.capwords(
+            givennames.replace('-', ' - ')).replace(' - ', '-')
+        # We construct fullname
+        fullname = ''
+        if lastname and givennames:
+            fullname = '%s %s' % (givennames, lastname)
+        elif lastname:
+            fullname = lastname
+        elif givennames:
+            fullname = givennames
+        if '<' in fullname:
+            return 'XXX'
+        return fullname