Merge lp:~flimm/wxbanker/sort-bugfix into lp:wxbanker

[David D Lowe]

Fixes bug #653697.

[Michael Rooney (mrooney)]

Thanks for this, let me make sure it all works well and then merge it!

[Michael Rooney (mrooney)]

Thanks, sorry for the delay, merged!

review: Approve

=== modified file 'wxbanker/tests/guitests.py'
--- wxbanker/tests/guitests.py	2010-08-09 00:31:45 +0000
+++ wxbanker/tests/guitests.py	2010-12-25 13:52:00 +0000
@@ -227,6 +227,8 @@
         
         a = self.Model.CreateAccount("B")
         
+        self.OLV.SortBy(self.OLV.COL_DATE)
+        
         # Super basic test, one transaction.
         t1 = a.AddTransaction(1)
         self.assertEqual(totals(), [1])
@@ -252,6 +254,23 @@
         t3.Date = testbase.yesterday
         self.assertEqual(totals(), [0.5, 2.25])
         
+        # Now add two transactions on the same date but in descending
+        # alphabetical order
+        t4 = a.AddTransaction(5, "BB", testbase.tomorrow)
+        t5 = a.AddTransaction(6, "AA", testbase.tomorrow)
+        self.assertEqual(totals(), [0.5, 2.25, 7.25, 13.25])
+        
+        # Test that sorting by date always sorts transactions in the
+        # correct order, even transactions on the same date (bug #653697)
+        self.OLV.SortBy(self.OLV.COL_DESCRIPTION)
+        self.OLV.SortBy(self.OLV.COL_DATE)
+        self.assertEqual(totals(), [0.5, 2.25, 7.25, 13.25])
+        
+        self.OLV.SortBy(self.OLV.COL_DESCRIPTION, ascending=False)
+        self.OLV.SortBy(self.OLV.COL_DATE, ascending=False)
+        self.assertEqual(totals(), [13.25, 7.25, 2.25, 0.5])
+        
+        
     def testSearch(self):
         a = self.Model.CreateAccount("A")
         b = self.Model.CreateAccount("B")
@@ -262,7 +281,7 @@
         t4 = b.AddTransaction(1, "Dog")
         
         # Ensure b is selected
-        self.assertEqual(self.OLV.GetObjects(), [t3, t4])
+        self.assertEqual(set(self.OLV.GetObjects()), set([t3, t4]))
         
         # Search for dog, make sure b's matching transaction is shown.
         Publisher.sendMessage("SEARCH.INITIATED", ("Dog", 1))
@@ -274,8 +293,8 @@
         
         # Switch to all accounts, make sure we see both matches.
         Publisher.sendMessage("user.account changed", None)
-        self.assertEqual(self.OLV.GetObjects(), [t2, t4])
-
+        self.assertEqual(set(self.OLV.GetObjects()), set([t2, t4]))
+        
 
 if __name__ == "__main__":
     unittest.main()
 
=== modified file 'wxbanker/transactionolv.py'
--- wxbanker/transactionolv.py	2010-10-02 18:08:31 +0000
+++ wxbanker/transactionolv.py	2010-12-25 13:52:00 +0000
@@ -58,12 +58,13 @@
 
         # Define some constants to use throughout.
         self.COL_DATE = 0
+        self.COL_DESCRIPTION = 1
         self.COL_AMOUNT = 2
         self.COL_TOTAL = 3
 
         # If you change these column names, update sizeAmounts()!
         self.SetColumns([
-            ColumnDefn(_("Date"), valueGetter=self.getDateOf, valueSetter=self.setDateOf, width=dateWidth),
+            ColumnDefn(_("Date"), valueGetter=self.getDateAndIDOf, valueSetter=self.setDateOf, stringConverter=self.renderDateIDTuple, editFormatter=self.renderEditDate, width=dateWidth),
             ColumnDefn(_("Description"), valueGetter="Description", isSpaceFilling=True, editFormatter=self.renderEditDescription),
             ColumnDefn(_("Amount"), "right", valueGetter="Amount", stringConverter=self.renderFloat, editFormatter=self.renderEditFloat),
             ColumnDefn(_("Balance"), "right", valueGetter=self.getTotal, stringConverter=self.renderFloat, isEditable=False),
@@ -116,8 +117,10 @@
         self.SortBy(self.SORT_COL)
         self.updateTotals()
 
-    def getDateOf(self, transaction):
-        return str(transaction.Date)
+    def getDateAndIDOf(self, transaction):
+        # A date and ID two-tuple is used to allow for correct sorting
+        # by date (bug #653697)
+        return (transaction.Date, transaction.ID)
 
     def setDateOf(self, transaction, date):
         transaction.Date = date
@@ -142,7 +145,10 @@
         for i in range(1, len(self.GetObjects())):
             a, b = b, self.GetObjectAt(i)
             b._Total = a._Total + b.Amount
-
+    
+    def renderDateIDTuple(self, pair):
+        return str(pair[0])
+    
     def renderFloat(self, floatVal):
         if self.CurrentAccount:
             return self.CurrentAccount.float2str(floatVal)
@@ -151,6 +157,9 @@
             # so that for multiple currencies they can be displayed differently when viewing all.
             return self.BankController.Model.float2str(floatVal)
     
+    def renderEditDate(self, transaction):
+        return str(transaction.Date)
+    
     def renderEditFloat(self, modelObj):
         return "%.2f" % modelObj.Amount