Changeset 14594 for main/waeup.aaue/trunk/src/waeup

Timestamp:

27 Feb 2017, 06:50:46 (8 years ago)

Author:

Henrik Bettermann

Message:

Hide firstname, middlename or surname if the character length is less than two.

Location:

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

Files:

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

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

@@ -18 +18 @@
 from waeup.kofa.testing import FunctionalTestCase
 from waeup.aaue.testing import FunctionalLayer
+from waeup.aaue.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), 'STREEP, John')
+        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), 'IRON, Babatunde')

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

@@ -215 +215 @@
         except AttributeError:
             pass
-        # We do not necessarily have the middlename attribute
-        if middlename:
+        # 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)
-        else:
-            givennames = '%s' % firstname
+        elif firstname:
+            givennames = firstname
+        elif middlename:
+            givennames = middlename
         givennames = string.capwords(
             givennames.replace('-', ' - ')).replace(' - ', '-')
-        fullname = '%s, %s' % (lastname, givennames)
+        # We construct fullname
+        fullname = ''
+        if lastname and givennames:
+            fullname = '%s, %s' % (lastname, givennames)
+        elif lastname:
+            fullname = lastname
+        elif givennames:
+            fullname = givennames
         if '<' in fullname:
             return 'XXX'