#12 Moved internal transactions to their own list

Still to do: Mark as seen marks all as seen, should just be the visible ones. Don't show a live tile update for internal transfers (maybe make it an option).
cpmcgrath · Nov 20, 2012 · 520a348 · 520a348
1 parent a339be8
commit 520a348
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/CommonwealthBank/ViewModels/TransactionViewModel.cs b/CommonwealthBank/ViewModels/TransactionViewModel.cs
@@ -3,6 +3,7 @@
 using CMcG.CommonwealthBank.Agent;
 using CMcG.CommonwealthBank.Data;
 using CMcG.CommonwealthBank.Logic;
+using System.Text.RegularExpressions;
 
 namespace CMcG.CommonwealthBank.ViewModels
 {
@@ -30,13 +31,13 @@ void Load()
                 Account          = store.CurrentOptions.GetSelectedAccount(store);
                 AutoRefresh      = store.CurrentOptions.AutoRefresh;
 
-                Transactions     = store.Transactions.OrderByDescending(x => x.Id).ToArray();
-                var replacements = store.Replacements.ToArray();
+                m_allTransactions = store.Transactions.OrderByDescending(x => x.Id).ToArray();
+                var replacements  = store.Replacements.ToArray();
 
-                foreach (var transaction in Transactions)
+                foreach (var transaction in m_allTransactions)
                     transaction.Replacements = replacements;
             }
-            NotifyPropertyChanged("Transactions", "ReceivedTransactions", "SentTransactions", "AccountAmount");
+            NotifyPropertyChanged("Transactions", "ReceivedTransactions", "SentTransactions", "InternalTransactions", "AccountAmount");
             new Updater().UpdateLiveTile();
         }
 
@@ -51,7 +52,13 @@ public void Refresh()
 
         public bool          AutoRefresh  { get; set; }
         public Account       Account      { get; set; }
-        public Transaction[] Transactions { get; set; }
+
+        Transaction[] m_allTransactions;
+
+        public Transaction[] Transactions
+        {
+            get { return m_allTransactions.Except(InternalTransactions).ToArray(); }
+        }
 
         public Transaction[] ReceivedTransactions
         {
@@ -63,6 +70,17 @@ public Transaction[] SentTransactions
             get { return Transactions.Where(x => x.Amount < 0).ToArray(); }
         }
 
+        public Transaction[] InternalTransactions
+        {
+            get { return m_allTransactions.Where(IsInternal).ToArray(); }
+        }
+
+        bool IsInternal(Transaction trans)
+        {
+            var match = Regex.Match(trans.Description, @"Transfer (from|to) xx(?<digits>\d+) NetBank");
+            return match.Success;
+        }
+
         public string AccountAmount
         {
             get { return Account != null ? Account.AccountAmount.ToString("$0.00") : ""; }

diff --git a/CommonwealthBank/Views/ScreenTransactions.xaml b/CommonwealthBank/Views/ScreenTransactions.xaml
@@ -69,6 +69,12 @@
                          HorizontalContentAlignment = "Stretch"
                          ItemsSource                = "{Binding SentTransactions}" />
             </controls:PivotItem>
+
+            <controls:PivotItem Header="internal">
+                <ListBox ItemTemplate               = "{StaticResource TransactionTemplate}"
+                         HorizontalContentAlignment = "Stretch"
+                         ItemsSource                = "{Binding InternalTransactions}" />
+            </controls:PivotItem>
         </controls:Pivot>
     </Grid>