Changeset 7515

Timestamp:

26 Jan 2012, 08:59:05 (13 years ago)

Author:

Henrik Bettermann

Message:

In import files we can use the hash symbol at the end of a date string to
avoid annoying automatic date transformation by Excel or Calc.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• students/tests/sample_student_data_migration.csv (modified) (1 diff)
• students/tests/test_batching.py (modified) (2 diffs)
• widgets/datewidget.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/sample_student_data_migration.csv

@@ -1 +1 @@
 student_id,firstname,lastname,reg_number,date_of_birth,matric_number,email,phone,password,reg_state
-A123456,Aaren,Pieri,1,1990-01-02,100000,aa@aa.ng,1234,mypw1,school fee paid
+A123456,Aaren,Pieri,1,1990-01-02#,100000,aa@aa.ng,1234,mypw1,school fee paid
 B123456,Aaren,Finau,2,1990-01-03,100001,aa@aa.ng,1234,mypw1,cleared
 C123456,Aaren,Berson,3,1990-01-04,100002,aa@aa.ng,1234,mypw1,admitted

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py

@@ -22 +22 @@
 import tempfile
 import unittest
+import datetime
 from zope.component import createObject
 from zope.component.hooks import setSite, clearSite
@@ -200 +201 @@
         self.assertTrue('A123456' in self.app['students'].keys())
         self.assertEqual(self.app['students']['A123456'].state,'school fee paid')
+        self.assertEqual(self.app['students']['A123456'].date_of_birth,
+            datetime.date(1990, 1, 2))
+        self.assertEqual(self.app['students']['B123456'].state,'cleared')
+        self.assertEqual(self.app['students']['B123456'].date_of_birth,
+            datetime.date(1990, 1, 3))
         shutil.rmtree(os.path.dirname(fin_file))
 

main/waeup.sirp/trunk/src/waeup/sirp/widgets/datewidget.py

@@ -39 +39 @@
         else:
             try:
+                # In import files we can use the hash symbol at the end of a
+                # date string to avoid annoying automatic date transformation
+                # by Excel or Calc
+                input = input.strip('#') 
                 value = datetime.strptime(input, self.date_format)
             except (ValueError, IndexError), v: