Merge pull request #6 from thaichat04/number-format

Formatting number with last char

Author: Hong-Thai Nguyen

.gitignore

@@ -0,0 +1 @@
+.idea

cfonb/tests/test_statement.py

@@ -6,7 +6,7 @@
 from nose.tools import assert_is_not_none, assert_equal
 
 from cfonb import StatementReader
-from cfonb.writer.statement import Statement
+from cfonb.writer.statement import Statement, number_format
 
 
 class TestStatement(unittest.TestCase):
@@ -25,12 +25,21 @@ def test_render_parse_cfonb(self):
             assert_equal(account.header.get('currency_code'), 'EUR')
             assert_equal(account.header.get('nb_of_dec'), '2')
             assert_equal(account.header.get('bank_code'), '20002')
-            print('{}'.format(account.header))
+
+    def test_number_format(self):
+        assert_equal(number_format(123), '12C')
+        assert_equal(number_format(123.45), '1234E')
+        assert_equal(number_format(-123.45), '1234N')
+        assert_equal(number_format(-12340), '1234}')
+        assert_equal(number_format(12340), '1234{')
+        assert_equal(number_format(None), '')
+        assert_equal(number_format(''), '')
 
 
 def suite():
     suite = unittest.TestSuite()
     suite.addTest(TestStatement('test_parse_cfonb'))
+    suite.addTest(TestStatement('test_number_format'))
     return suite
 
 

cfonb/writer/common.py

@@ -21,4 +21,4 @@ def save(header, body, footer, filename=None):
 
 
 def date_format(date):
-    return date.strftime(format='%d%m') + date.strftime(format='%y')
+    return date.strftime(format='%d%m') + date.strftime(format='%y')

cfonb/writer/statement.py

@@ -25,6 +25,10 @@
 """
 from cfonb.writer.common import write, date_format, save, BR_LINE
 
+LAST_LETTER_NUMBER = {'1': 'A', '2': 'B', '3': 'C', '4': 'D', '5': 'E', '6': 'F', '7': 'G', '8': 'H', '9': 'I',
+                 '-1': 'J', '-2': 'K', '-3': 'L', '-4': 'M', '-5': 'N', '-6': 'O', '-7': 'P', '-8': 'Q', '-9': 'R',
+                 '0': '{', '-0': '}'}
+
 
 class Statement(object):
     def __init__(self):
@@ -69,7 +73,7 @@ def add(self, bank_code, operation_code, agency_code, currency,
         line += write('       ', 7) # entry writing code
         line += write(' ', 1) # exoneration code
         line += write(' ', 1)  # reserve zone
-        line += write(str(amount).replace('.', '') + 'A', 14, rpad=True, fill_char='0')
+        line += write(number_format(amount), 14, rpad=True, fill_char='0')
         line += write(reference, 16)
         self._content.append(line)
         return self
@@ -90,7 +94,7 @@ def _render_header(self):
             line += write('  ', 2)  # reserved zone
             line += write(date_format(self._header['date']), 6)
             line += write(' ', 50)  # reserved zone
-            line += write(str(self._header['amount']).replace('.', '') + 'A', 14, rpad=True, fill_char='0')
+            line += write(number_format(self._header['amount']), 14, rpad=True, fill_char='0')
             line += write(' ', 16)  # reserved zone
             return line + BR_LINE
         return ''
@@ -108,7 +112,19 @@ def _render_footer(self):
             line += write('  ', 2)  # reserved zone
             line += write(date_format(self._footer['date']), 6)
             line += write(' ', 50)  # reserved zone
-            line += write(str(self._footer['amount']).replace('.', '') + 'A', 14, rpad=True, fill_char='0')
+            line += write(number_format(self._footer['amount']), 14, rpad=True, fill_char='0')
             line += write(' ', 16)  # reserved zone
             return line + BR_LINE
         return ''
+
+
+def number_format(number):
+    if not number:
+        return ''
+
+    _number = str(number).replace('.', '')
+    _number = _number.replace('-', '')
+    last_number = _number[-1]
+    if number < 0:
+        last_number = '-' + last_number
+    return _number[0:len(_number) - 1] + LAST_LETTER_NUMBER.get(last_number)