Changeset 9260

Timestamp:

30 Sep 2012, 20:28:32 (12 years ago)

Author:

Henrik Bettermann

Message:

Archive also the owner of an accesscode.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes

Files:

• accesscode.py (modified) (2 diffs)
• browser.txt (modified) (1 diff)
• tests/test_accesscode.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/accesscode.py

@@ -257 +257 @@
             )
         writer = csv.writer(open(csv_path, 'w'), quoting=csv.QUOTE_ALL)
-        writer.writerow(['prefix', 'serial', 'ac', 'state', 'history', 'cost'])
+        writer.writerow(['prefix', 'serial', 'ac', 'state', 'history',
+            'cost','owner'])
         writer.writerow([self.prefix, '%0.2f' % self.cost, str(self.num),
                          str(self.entry_num)])
@@ -266 +267 @@
             writer.writerow([
                     self.prefix, value.batch_serial, value.representation,
-                    value.state, value.history, value.cost
+                    value.state, value.history, value.cost, value.owner
                     ])
         return os.path.basename(csv_path)

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/browser.txt

@@ -438 +438 @@
     ...                             sorted(os.listdir(ac_storage))[-2])
     >>> print open(archive_file, 'rb').read()
-    "prefix","serial","ac","state","history","cost"
+    "prefix","serial","ac","state","history","cost","owner"
     "BLA","19.12","1","3"
-    "BLA","0","BLA-1-<10-DIGITS>","initialized","...","19.12"
-    "BLA","1","BLA-1-<10-DIGITS>","initialized","...","19.12"
-    "BLA","2","BLA-1-<10-DIGITS>","initialized","...","19.12"
+    "BLA","0","BLA-1-<10-DIGITS>","initialized","...","19.12",""
+    "BLA","1","BLA-1-<10-DIGITS>","initialized","...","19.12",""
+    "BLA","2","BLA-1-<10-DIGITS>","initialized","...","19.12",""
 
 Clean up:

main/waeup.kofa/trunk/src/waeup/kofa/accesscodes/tests/test_accesscode.py

@@ -301 +301 @@
         result_path = os.path.join(batch._getStoragePath(), basename)
         expected = '''
-"prefix","serial","ac","state","history","cost"
+"prefix","serial","ac","state","history","cost","owner"
 "FOO","9.99","1","0"
-"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ...","2345.0"
+"FOO","0","FOO-1-11111111","used","<YYYY-MM-DD hh:mm:ss> UTC - ...","2345.0",""
 "FOO","1","FOO-1-22222222","initialized","<YYYY-MM-DD hh:mm:ss> UTC - ...",""
 "FOO","2","FOO-1-33333333","disabled","<YYYY-MM-DD hh:mm:ss> UTC - ...",""