Merge lp:~kolmis/wxbanker/movetransactions into lp:wxbanker/0.5

[Karel Kolman]

[Michael Rooney (mrooney)]

Awesome, thanks! I've pushed this up with a minor follow up commit to remove the MoveTransaction method which didn't seem to be used, and was just going to recursively call itself anyway (a typo I imagine). I also got the list of transactions in a sightly cleaner way.

Thanks a ton for implementing this. Can I add you to the developers list yet? :) If so let me know which email address to use.

review: Approve

=== modified file 'bankobjects.py'
--- bankobjects.py	2009-03-13 18:58:29 +0000
+++ bankobjects.py	2009-03-21 22:57:09 +0000
@@ -230,29 +230,49 @@
         
         # Ideally we don't load all the transactions here (this is silly on a transfer/move on an
         # account that hasn't been viewed yet), but there's more important things for now.
+        self._AddTransaction(transaction)
+        
+        if source:
+            return transaction, otherTrans
+        else:
+            return transaction
+            
+    def _AddTransaction(self, transaction):
+        """
+        Add a transaction, send the message, update internal data
+        """
+        
         self.Transactions.append(transaction)
-        
         Publisher.sendMessage("transaction.created", (self, transaction))
-        
-        # Update the balance.
         self.Balance += transaction.Amount
         
-        if source:
-            return transaction, otherTrans
-        else:
-            return transaction
-
-    def RemoveTransaction(self, transaction):
+    def CheckTransactionAccount(self, transaction):
         if transaction not in self.Transactions:
             raise bankexceptions.InvalidTransactionException("Transaction does not exist in account '%s'" % self.Name)
-        
+
+    def RemoveTransaction(self, transaction):
+        self.CheckTransactionAccount(transaction)
         self.Store.RemoveTransaction(transaction)
+        self._RemoveTransaction(transaction)
+        
+    def _RemoveTransaction(self, transaction):
+        """
+        Remove a transaction, send the message, update internal data
+        """
+
         Publisher.sendMessage("transaction.removed", (self, transaction))
         self.Transactions.remove(transaction)
-        
-        # Update the balance.
         self.Balance -= transaction.Amount
         
+    def MoveTransactions(self, transactions, targetAccount):
+        for t in transactions:
+            self.CheckTransactionAccount(t)
+        
+        self.Store.MoveTransactions(transactions, targetAccount)
+        for t in transactions:
+            self._RemoveTransaction(t)
+            targetAccount._AddTransaction(t)
+        
     def onTransactionAmountChanged(self, message):
         transaction, difference = message.data
         if self._Transactions is not None:

=== modified file 'persistentstore.py'
--- persistentstore.py	2009-03-07 02:23:22 +0000
+++ persistentstore.py	2009-03-21 22:57:09 +0000
@@ -125,7 +125,16 @@
         # the controller already checks for existence of the ID though, so if this doesn't raise an exception, theoretically
         # everything is fine. So just return True, as there we no errors that we are aware of.
         return True
-    
+        
+    def MoveTransaction(self, transaction, targetAccount):
+        self.MoveTransaction([transaction], targetAccount)
+
+    def MoveTransactions(self, transactions, targetAccount):
+        cursor = self.dbconn.cursor()
+        self.dbconn.cursor().execute('UPDATE transactions SET accountId=? WHERE id IN (?)',
+            (targetAccount.ID, ','.join([str(t.ID) for t in transactions])))
+        self.commitIfAppropriate()
+
     def Save(self):
         debug.debug("Committing db!")
         self.dbconn.commit()

=== modified file 'transactionolv.py'
--- transactionolv.py	2009-03-10 20:36:19 +0000
+++ transactionolv.py	2009-03-21 22:57:09 +0000
@@ -195,13 +195,26 @@
         # Always show the Remove context entry.
         if len(transactions) == 1:
             removeStr = _("Remove this transaction")
+            moveStr = _("Move this transaction to account")
         else:
             removeStr = _("Remove these %i transactions") % len(transactions)
+            moveStr = _("Move these %i transactions to account") % len(transactions)
             
         removeItem = wx.MenuItem(menu, -1, removeStr)
         menu.Bind(wx.EVT_MENU, lambda e: self.onRemoveTransactions(transactions), source=removeItem)
         removeItem.SetBitmap(wx.ArtProvider.GetBitmap('wxART_delete'))
         menu.AppendItem(removeItem)
+        
+        moveToAccountItem = wx.MenuItem(menu, -1, moveStr)
+        accountsMenu = wx.Menu()
+        for account in self.BankController.Model.Accounts:
+            accountItem = wx.MenuItem(menu, -1, account.GetName())
+            accountsMenu.AppendItem(accountItem)
+            accountsMenu.Bind(wx.EVT_MENU, lambda e, account=account: self.onMoveTransactions(transactions, account), source=accountItem)
+            if account == self.CurrentAccount:
+                accountItem.Enable(False)
+        moveToAccountItem.SetSubMenu(accountsMenu)
+        menu.AppendItem(moveToAccountItem)
 
         # Show the menu and then destroy it afterwards.
         self.PopupMenu(menu)
@@ -233,6 +246,10 @@
         #TODO: each call in the loop is going to force a freeze, resize, and thaw. Ideally batch this.
         for transaction in transactions:
             self.CurrentAccount.RemoveTransaction(transaction)
+            
+    def onMoveTransactions(self, transactions, targetAccount):
+        """Move the transactions to the target account."""
+        self.CurrentAccount.MoveTransactions(transactions, targetAccount)
         
     def frozenResize(self):
         self.Parent.Layout()