From 672d7fb651d111ea2475e5d5da5ec91f11c49a1f Mon Sep 17 00:00:00 2001
From: sckaushal <sckaushal@gmail.com>
Date: Mon, 1 Aug 2016 16:59:43 +0800
Subject: [PATCH] Issue 279

Implementation completed except for option to turn on/off
---
 Client/Client.csproj                          |   3 +
 Client/Controls/MainWindow.xaml               |  24 +-
 .../ActiveFilterToStatusConvertor.cs          |  23 ++
 .../SortTypeToDescriptionConvertor.cs         |  23 ++
 Client/MainWindowViewModel.cs                 | 164 +++++++-
 Client/SortType.cs                            |  11 +-
 Client/Utilities/EnumExtensions.cs            |  40 ++
 ToDoLib/TaskList.cs                           |  18 +-
 ToDoTests/MainWindowViewModelTests.cs         | 360 +++++++++++-------
 ToDoTests/ToDoTests.csproj                    |   4 +
 10 files changed, 513 insertions(+), 157 deletions(-)
 create mode 100644 Client/Converters/ActiveFilterToStatusConvertor.cs
 create mode 100644 Client/Converters/SortTypeToDescriptionConvertor.cs
 create mode 100644 Client/Utilities/EnumExtensions.cs

diff --git a/Client/Client.csproj b/Client/Client.csproj
index ab4ec48d..d541807f 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -92,6 +92,8 @@
     <Compile Include="Controls\SetDueDateDialog.xaml.cs">
       <DependentUpon>SetDueDateDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Converters\ActiveFilterToStatusConvertor.cs" />
+    <Compile Include="Converters\SortTypeToDescriptionConvertor.cs" />
     <Compile Include="ExceptionExtensions.cs" />
     <Compile Include="GroupConverter.cs" />
     <Compile Include="PortableSettingsProvider.cs" />
@@ -127,6 +129,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
       <DependentUpon>User.settings</DependentUpon>
     </Compile>
+    <Compile Include="Utilities\EnumExtensions.cs" />
     <Compile Include="WindowLocation.cs" />
     <Page Include="Controls\DeleteConfirmationDialog.xaml">
       <SubType>Designer</SubType>
diff --git a/Client/Controls/MainWindow.xaml b/Client/Controls/MainWindow.xaml
index c836bb3e..f45adfa6 100644
--- a/Client/Controls/MainWindow.xaml
+++ b/Client/Controls/MainWindow.xaml
@@ -3,6 +3,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:Client"
+        xmlns:convertors="clr-namespace:Client.Converters"
 		Loaded="Window_Loaded"
         Title="todotxt.net" 
         mc:Ignorable="d" 
@@ -100,6 +101,8 @@
                 </DataTrigger>
             </Style.Triggers>
         </Style>
+        <convertors:ActiveFilterToStatusConvertor x:Key="filterToStatusConv"></convertors:ActiveFilterToStatusConvertor>
+        <convertors:SortTypeToDescriptionConvertor x:Key="sortTypeToDescConv"></convertors:SortTypeToDescriptionConvertor>
     </Window.Resources>
     <Window.CommandBindings>
         <!-- File menu commands -->
@@ -378,11 +381,26 @@
         <WebBrowser Grid.Row="2" Height="Auto" HorizontalAlignment="Stretch" Margin="0,0,0,0" Name="webBrowser1" VerticalAlignment="Stretch" Width="Auto" Visibility="Hidden" Grid.ColumnSpan="2" />
         <Button Grid.Row="0" Grid.RowSpan="2" Content="Print" Height="23" HorizontalAlignment="Left" Margin="0,23,207,0" Name="btnPrint" VerticalAlignment="Top" Width="92" Visibility="Hidden" Click="btnPrint_Click" />
         <Button Grid.Row="0" Grid.RowSpan="2"  Content="Cancel" Height="23" HorizontalAlignment="Left" Margin="97,23,0,0" Name="btnCancelPrint" VerticalAlignment="Top" Width="92" Visibility="Hidden" Click="btnCancelPrint_Click" />
-        <StatusBar Grid.Row="3">
-            <TextBlock Name="lblFilterStatus" Text="{Binding FilterDescription, Mode=OneWay}" VerticalAlignment="Bottom"  ></TextBlock>
+        <StatusBar Grid.Row="3" Name="sbTaskSummary">
+            <TextBlock Name="lblFilterStatus" Text="{Binding ActiveFilterNumber, Mode=OneWay, Converter= {StaticResource filterToStatusConv}}" VerticalAlignment="Bottom"></TextBlock>
             <Separator></Separator>
             <TextBlock Text="Sort:"/>
-            <TextBlock Text="{Binding SortType, Mode=OneWay}"/>
+            <TextBlock Text="{Binding SortType, Mode=OneWay, Converter={StaticResource sortTypeToDescConv}}"/>
+            <Separator></Separator>
+            <TextBlock Text="Tasks:"/>
+            <TextBlock Text="{Binding FilteredTasks, Mode=OneWay}"/>
+            <TextBlock Text="of"/>
+            <TextBlock Text="{Binding TotalTasks, Mode=OneWay}"/>
+            <Separator></Separator>
+            <TextBlock Text="Incomplete:"/>
+            <TextBlock Text="{Binding IncompleteTasks, Mode=OneWay}"/>
+            <Separator></Separator>
+            <TextBlock Text="Due Today:"/>
+            <TextBlock Text="{Binding TasksDueToday, Mode=OneWay}"/>
+            <Separator></Separator>
+            <TextBlock Text="Overdue:"/>
+            <TextBlock Text="{Binding TasksOverdue, Mode=OneWay}"/>
+
         </StatusBar>
 
     </Grid>
diff --git a/Client/Converters/ActiveFilterToStatusConvertor.cs b/Client/Converters/ActiveFilterToStatusConvertor.cs
new file mode 100644
index 00000000..b3c1a4c6
--- /dev/null
+++ b/Client/Converters/ActiveFilterToStatusConvertor.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+
+namespace Client.Converters
+{
+    public class ActiveFilterToStatusConvertor : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ((int)value > 0) ? String.Format("Filter #:{0}", value) : "Filter: None";
+
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Client/Converters/SortTypeToDescriptionConvertor.cs b/Client/Converters/SortTypeToDescriptionConvertor.cs
new file mode 100644
index 00000000..b6a8756c
--- /dev/null
+++ b/Client/Converters/SortTypeToDescriptionConvertor.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using static Client.Utilities.EnumExtensions;
+
+namespace Client.Converters
+{
+    class SortTypeToDescriptionConvertor : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return ((SortType)value).GetDescription();
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Client/MainWindowViewModel.cs b/Client/MainWindowViewModel.cs
index c623de63..7e5eb783 100644
--- a/Client/MainWindowViewModel.cs
+++ b/Client/MainWindowViewModel.cs
@@ -32,7 +32,7 @@ public class MainWindowViewModel : INotifyPropertyChanged
         private List<CollectionViewGroup> _viewGroups;
         private int _nextGroupAtTaskNumber;
         private List<Task> _selectedTasks;
-        
+
         public TaskList TaskList { get; set; }
         public Help HelpPage { get; private set; }
         public SortType SortType
@@ -57,23 +57,118 @@ public SortType SortType
             }
         }
 
-        private String _filterDescription = String.Empty;
-        public String FilterDescription
+        private int _activeFilterNumber = -1;
+        public int ActiveFilterNumber
         {
             get
             {
-                return _filterDescription;
+                return _activeFilterNumber;
             }
             private set
             {
-                if (!_filterDescription.Equals(value))
+                if (_activeFilterNumber != value)
+                {
+                    _activeFilterNumber = value;
+                    RaiseProperyChanged(nameof(ActiveFilterNumber));
+                }
+            }
+        }
+
+        private int totalTasks = 0;
+        public int TotalTasks
+        {
+            get
+            {
+                return totalTasks;
+            }
+
+            set
+            {
+                if (totalTasks != value)
+                {
+                    totalTasks = value;
+                    RaiseProperyChanged(nameof(TotalTasks));
+                }
+            }
+        }
+
+        private int filteredTasks = 0;
+        public int FilteredTasks
+        {
+            get
+            {
+                return filteredTasks;
+            }
+
+            set
+            {
+                if (filteredTasks != value)
+                {
+                    filteredTasks = value;
+                    RaiseProperyChanged(nameof(FilteredTasks));
+                }
+            }
+        }
+
+        private int incompleteTasks = 0;
+        public int IncompleteTasks
+        {
+            get
+            {
+                return incompleteTasks;
+            }
+
+            set
+            {
+                if (incompleteTasks != value)
+                {
+                    incompleteTasks = value;
+                    RaiseProperyChanged(nameof(IncompleteTasks));
+                }
+            }
+        }
+
+        private int tasksDueToday = 0;
+
+        public int TasksDueToday
+        {
+            get
+            {
+                return tasksDueToday;
+            }
+
+            set
+            {
+                if (tasksDueToday != value)
+                {
+                    tasksDueToday = value;
+                    RaiseProperyChanged(nameof(TasksDueToday));
+                }
+            }
+        }
+
+        public int TasksOverdue
+        {
+            get
+            {
+                return tasksOverdue;
+            }
+
+            set
+            {
+                if (tasksOverdue != value)
                 {
-                    _filterDescription = value;
-                    RaiseProperyChanged(nameof(FilterDescription));
+                    tasksOverdue = value;
+                    RaiseProperyChanged(nameof(TasksOverdue));
                 }
             }
         }
 
+        private int tasksOverdue = 0;
+
+
+
+
         public event PropertyChangedEventHandler PropertyChanged;
 
         public MainWindowViewModel(MainWindow window)
@@ -87,7 +182,7 @@ public MainWindowViewModel(MainWindow window)
 
             SortType = (SortType)User.Default.CurrentSort;
 
-            FilterDescription = "Filter: None";
+            ActiveFilterNumber=0;
 
             if (!string.IsNullOrEmpty(User.Default.FilePath))
             {
@@ -215,6 +310,13 @@ public void LoadTasks(string filePath)
             try
             {
                 TaskList = new TaskList(filePath, User.Default.PreserveWhiteSpace);
+                if (TaskList != null)
+                {
+                    // The first time the task list has been modified before we got a chance to hook to the modified event
+                    // so call the method and then hook to the Modified event
+                    TaskList.Modified += TaskList_Modified;
+                    TaskList_Modified(TaskList, EventArgs.Empty);
+                }
                 User.Default.FilePath = filePath;
                 User.Default.Save();
                 EnableFileChangeObserver();
@@ -226,6 +328,11 @@ public void LoadTasks(string filePath)
             }
         }
 
+        private void TaskList_Modified(object sender, EventArgs e)
+        {
+            this.TotalTasks = TaskList.Tasks.Count;
+        }
+
         public void ReloadFile()
         {
             Log.Debug("Reloading file");
@@ -294,8 +401,12 @@ public void UpdateDisplayedTasks()
                 {
                     _myView.GroupDescriptions.Clear();
                 }
+
+                var selectedTasksList = sortedTaskList.ToList();
                 _window.lbTasks.ItemsSource = sortedTaskList;
                 _window.lbTasks.UpdateLayout();
+                //sortedTaskList.
+                UpdateSummary(selectedTasksList);
             }
             catch (Exception ex)
             {
@@ -306,6 +417,41 @@ public void UpdateDisplayedTasks()
             _window.filterMenu.FontWeight = User.Default.FilterText.Length == 0 ? FontWeights.Normal : FontWeights.Bold;
         }
 
+        protected void UpdateSummary(List<Task> selectedTasksList)
+        {
+            FilteredTasks = selectedTasksList.Count;
+
+            int fTask = 0, incompTask = 0, dueTodayTask = 0, overdueTask = 0;
+            foreach (Task t in selectedTasksList)
+            {
+                if (!t.Completed)
+                {
+                    incompTask++;
+
+
+                    if (!String.IsNullOrEmpty(t.DueDate))
+                    {
+                        DateTime dueDt;
+
+                        if (DateTime.TryParseExact(t.DueDate, "yyyy-MM-dd", CultureInfo.InvariantCulture, DateTimeStyles.None, out dueDt))
+                        {
+                            if (dueDt.Date == DateTime.Today.Date)
+                            {
+                                dueTodayTask++;
+                            }
+                            else if (dueDt.Date < DateTime.Today)
+                            {
+                                overdueTask++;
+                            }
+                        }
+                    }
+                }
+            }
+            IncompleteTasks = incompTask;
+            TasksOverdue = overdueTask;
+            TasksDueToday = dueTodayTask;
+        }
+
         /// <summary>
         /// Returns true if a single task is selected in the task list.
         /// </summary>
@@ -599,7 +745,7 @@ private void ApplyFilterPreset(int filterPresetNumber)
             
             User.Default.Save();
 
-            FilterDescription = String.Format("Filter #{0}", filterPresetNumber);
+            ActiveFilterNumber = filterPresetNumber;
         }
         #endregion
 
diff --git a/Client/SortType.cs b/Client/SortType.cs
index 8004b271..26f3f687 100644
--- a/Client/SortType.cs
+++ b/Client/SortType.cs
@@ -1,14 +1,21 @@
-namespace Client
+using System.ComponentModel;
+
+namespace Client
 {
+    // @sckaushal: Issue 279: Added description attribute to display in status
     public enum SortType
     {
+        
         Alphabetical,
         Completed,
         Context,
+        [Description("Due Date")]
         DueDate,
         Priority,
         Project,
+        [Description("Order in file")]
         None,
-		Created
+        [Description("Creation Date")]
+        Created
     }
 }
diff --git a/Client/Utilities/EnumExtensions.cs b/Client/Utilities/EnumExtensions.cs
new file mode 100644
index 00000000..1adf9d39
--- /dev/null
+++ b/Client/Utilities/EnumExtensions.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Client.Utilities
+{
+    public static class EnumExtensions
+    {
+        /// <summary>
+        /// Method to get the description from a System.ComponentModel.Description attribute
+        /// attached to an Enum value. Slight variation of a StackOverflow response at
+        /// http://stackoverflow.com/a/479417
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="enumerationValue"></param>
+        /// <returns></returns>
+        public static string GetDescription(this Enum enumerationValue)
+        {
+            //Tries to find a DescriptionAttribute for a potential friendly name
+            //for the enum
+            MemberInfo[] memberInfo =  enumerationValue.GetType().GetMember(enumerationValue.ToString());
+            if (memberInfo != null && memberInfo.Length > 0)
+            {
+                object[] attrs = memberInfo[0].GetCustomAttributes(typeof(DescriptionAttribute), false);
+
+                if (attrs != null && attrs.Length > 0)
+                {
+                    //Pull out the description value
+                    return ((DescriptionAttribute)attrs[0]).Description;
+                }
+            }
+            //If we have no description attribute, just return the ToString of the enum
+            return enumerationValue.ToString();
+
+        }
+    }
+}
diff --git a/ToDoLib/TaskList.cs b/ToDoLib/TaskList.cs
index d46b4933..8e7facdb 100644
--- a/ToDoLib/TaskList.cs
+++ b/ToDoLib/TaskList.cs
@@ -43,7 +43,11 @@ public TaskList(string filePath, bool preserveWhitespace = false)
             ReloadTasks();
         }
 
-	    #endregion
+        #endregion
+
+        #region Events
+        public event EventHandler Modified;
+        #endregion
 
         #region Task List Metadata Methods
 
@@ -112,6 +116,7 @@ public void ReloadTasks()
             finally
             {
                 UpdateTaskListMetaData();
+                RaiseModifiedEvent();
             }
 		}
 
@@ -149,9 +154,18 @@ public void Add(Task task)
             finally
             {
                 UpdateTaskListMetaData();
+                RaiseModifiedEvent();
             }
 		}
 
+        private void RaiseModifiedEvent()
+        {
+            if(Modified != null)
+            {
+                Modified(this, new EventArgs());
+            }
+        }
+
         public void Delete(Task task)
 		{
 			try
@@ -179,6 +193,7 @@ public void Delete(Task task)
             finally
             {
                 UpdateTaskListMetaData();
+                RaiseModifiedEvent();
             }
 		}
 
@@ -227,6 +242,7 @@ public void Update(Task currentTask, Task newTask, bool writeTasks = true)
             finally
             {
                 UpdateTaskListMetaData();
+                RaiseModifiedEvent();
             }
 		}
 
diff --git a/ToDoTests/MainWindowViewModelTests.cs b/ToDoTests/MainWindowViewModelTests.cs
index acfc028e..b3f32411 100644
--- a/ToDoTests/MainWindowViewModelTests.cs
+++ b/ToDoTests/MainWindowViewModelTests.cs
@@ -4,154 +4,230 @@
 using System.Text;
 using NUnit.Framework;
 using ToDoLib;
+using Client;
 
 namespace ToDoTests
 {
+
+    public class MainWindowViewModelTester : MainWindowViewModel
+    {
+        public MainWindowViewModelTester() : base(null)
+        {
+                
+        }
+        public void UpdateSummaryTester(List<Task> selectedTasks)
+        {
+            base.UpdateSummary(selectedTasks);
+        }
+    }
+
 	// these tests currently point to TaskList functionality for sorting and 
 	// filtering, which has been moved to the viewmodel. They need to 
 	// be fixed up
+    [TestFixture]
 	class MainWindowViewModelTests
 	{
-	//    [Test]
-	//    public void TestEmptyFilter()
-	//    {
-	//        TaskList tl = new TaskList(Data.TestDataPath);
-	//        Assert.AreEqual(TaskList.FilterList(tl.Tasks, true, "").Count, tl.Tasks.Count);
-	//    }
-
-	//    [Test]
-	//    public void TestFilterCountantCaseSensitive()
-	//    {
-	//        var tl = getTestList();
-	//        Assert.AreEqual(TaskList.FilterList(tl, true, "XXXXXX").Count, 2);
-	//        Assert.AreEqual(TaskList.FilterList(tl, true, "xxxxxx").Count, 1);
-	//    }
-
-	//    [Test]
-	//    public void TestFilterCountantNoCaseSensitive()
-	//    {
-	//        var tl = getTestList();
-
-	//        Assert.AreEqual(TaskList.FilterList(tl, false, "XXXXXX").Count, 3);
-	//        Assert.AreEqual(TaskList.FilterList(tl, false, "XXXXXX").Count, 3);
-	//    }
-
-	//    [Test]
-	//    public void TestFilterTextSplite()
-	//    {
-	//        var tl = getTestList();
-	//        Assert.AreEqual(TaskList.FilterList(tl, false, "XXXXXX yyyyyy").Count, 1);
-	//    }
-
-	//    [Test]
-	//    public void TestFilterExclude()
-	//    {
-	//        var tl = getTestList();
-
-	//        Assert.AreEqual(TaskList.FilterList(tl, true, "-XXXXXX").Count, 5);
-	//        Assert.AreEqual(TaskList.FilterList(tl, false, "-XXXXXX").Count, 4);
-	//    }
-
-	//    [Test]
-	//    public void Filter_due_today()
-	//    {
-	//        var t = getTestList();
-	//        t.Add(new Task("Oh my due:today"));
-
-	//        Assert.AreEqual(TaskList.FilterList(t, false, "due:today").Count, 1);
-	//    }
-
-	//    [Test]
-	//    public void Filter_due_future()
-	//    {
-	//        var t = getTestList();
-	//        t.Add(new Task("Oh my due:tomorrow"));
-
-	//        Assert.AreEqual(TaskList.FilterList(t, false, "due:future").Count, 1);
-	//    }
-
-	//    [Test]
-	//    public void Filter_due_past()
-	//    {
-	//        var t = getTestList();
-
-	//        Assert.AreEqual(TaskList.FilterList(t, false, "due:past").Count, 3);
-	//    }
-
-	//    [Test]
-	//    public void TestSortAlphabetical()
-	//    {
-	//        var tasks = getTestList();
-	//        var newOrder = TaskList.SortList(SortType.Alphabetical, tasks);
-
-	//        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[6].ToString());
-	//        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[4].ToString());
-	//    }
-
-	//    [Test]
-	//    public void TestSortCompleted()
-	//    {
-	//        var tasks = getTestList();
-	//        var newOrder = TaskList.SortList(SortType.Completed, tasks);
-
-	//        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[0].ToString());
-	//        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
-	//    }
-
-	//    [Test]
-	//    public void TestSortContext()
-	//    {
-	//        var tasks = getTestList();
-	//        var newOrder = TaskList.SortList(SortType.Context, tasks);
-
-	//        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[1].ToString());
-	//        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
-	//    }
-
-	//    [Test]
-	//    public void TestSortDueDate()
-	//    {
-	//        var tasks = getTestList();
-	//        var newOrder = TaskList.SortList(SortType.DueDate, tasks);
-
-	//        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[1].ToString());
-	//        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
-	//    }
-
-	//    [Test]
-	//    public void TestSortPriority()
-	//    {
-	//        var tasks = getTestList();
-	//        var newOrder = TaskList.SortList(SortType.Priority, tasks);
-
-	//        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[6].ToString());
-	//        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[4].ToString());
-	//    }
-
-	//    [Test]
-	//    public void TestSortProject()
-	//    {
-	//        var tasks = getTestList();
-	//        var newOrder = TaskList.SortList(SortType.Project, tasks);
-
-	//        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[1].ToString());
-	//        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
-	//    }
-
-	//    [Test]
-	//    public void TestSortNone()
-	//    {
-	//        var tasks = getTestList();
-
-	//        var newOrder = TaskList.SortList(SortType.None, tasks);
-	//        var lastOrder = tasks.GetEnumerator();
-	//        lastOrder.MoveNext();
-
-	//        foreach (var task in newOrder)
-	//        {
-	//            Assert.AreEqual(task.ToString(), lastOrder.Current.ToString());
-	//            lastOrder.MoveNext();
-	//        }
-	//    }
-	}
+        //    [Test]
+        //    public void TestEmptyFilter()
+        //    {
+        //        TaskList tl = new TaskList(Data.TestDataPath);
+        //        Assert.AreEqual(TaskList.FilterList(tl.Tasks, true, "").Count, tl.Tasks.Count);
+        //    }
+
+        //    [Test]
+        //    public void TestFilterCountantCaseSensitive()
+        //    {
+        //        var tl = getTestList();
+        //        Assert.AreEqual(TaskList.FilterList(tl, true, "XXXXXX").Count, 2);
+        //        Assert.AreEqual(TaskList.FilterList(tl, true, "xxxxxx").Count, 1);
+        //    }
+
+        //    [Test]
+        //    public void TestFilterCountantNoCaseSensitive()
+        //    {
+        //        var tl = getTestList();
+
+        //        Assert.AreEqual(TaskList.FilterList(tl, false, "XXXXXX").Count, 3);
+        //        Assert.AreEqual(TaskList.FilterList(tl, false, "XXXXXX").Count, 3);
+        //    }
+
+        //    [Test]
+        //    public void TestFilterTextSplite()
+        //    {
+        //        var tl = getTestList();
+        //        Assert.AreEqual(TaskList.FilterList(tl, false, "XXXXXX yyyyyy").Count, 1);
+        //    }
+
+        //    [Test]
+        //    public void TestFilterExclude()
+        //    {
+        //        var tl = getTestList();
+
+        //        Assert.AreEqual(TaskList.FilterList(tl, true, "-XXXXXX").Count, 5);
+        //        Assert.AreEqual(TaskList.FilterList(tl, false, "-XXXXXX").Count, 4);
+        //    }
+
+        //    [Test]
+        //    public void Filter_due_today()
+        //    {
+        //        var t = getTestList();
+        //        t.Add(new Task("Oh my due:today"));
+
+        //        Assert.AreEqual(TaskList.FilterList(t, false, "due:today").Count, 1);
+        //    }
+
+        //    [Test]
+        //    public void Filter_due_future()
+        //    {
+        //        var t = getTestList();
+        //        t.Add(new Task("Oh my due:tomorrow"));
+
+        //        Assert.AreEqual(TaskList.FilterList(t, false, "due:future").Count, 1);
+        //    }
+
+        //    [Test]
+        //    public void Filter_due_past()
+        //    {
+        //        var t = getTestList();
+
+        //        Assert.AreEqual(TaskList.FilterList(t, false, "due:past").Count, 3);
+        //    }
+
+        //    [Test]
+        //    public void TestSortAlphabetical()
+        //    {
+        //        var tasks = getTestList();
+        //        var newOrder = TaskList.SortList(SortType.Alphabetical, tasks);
+
+        //        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[6].ToString());
+        //        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[4].ToString());
+        //    }
+
+        //    [Test]
+        //    public void TestSortCompleted()
+        //    {
+        //        var tasks = getTestList();
+        //        var newOrder = TaskList.SortList(SortType.Completed, tasks);
+
+        //        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[0].ToString());
+        //        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
+        //    }
+
+        //    [Test]
+        //    public void TestSortContext()
+        //    {
+        //        var tasks = getTestList();
+        //        var newOrder = TaskList.SortList(SortType.Context, tasks);
+
+        //        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[1].ToString());
+        //        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
+        //    }
+
+        //    [Test]
+        //    public void TestSortDueDate()
+        //    {
+        //        var tasks = getTestList();
+        //        var newOrder = TaskList.SortList(SortType.DueDate, tasks);
+
+        //        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[1].ToString());
+        //        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
+        //    }
+
+        //    [Test]
+        //    public void TestSortPriority()
+        //    {
+        //        var tasks = getTestList();
+        //        var newOrder = TaskList.SortList(SortType.Priority, tasks);
+
+        //        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[6].ToString());
+        //        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[4].ToString());
+        //    }
+
+        //    [Test]
+        //    public void TestSortProject()
+        //    {
+        //        var tasks = getTestList();
+        //        var newOrder = TaskList.SortList(SortType.Project, tasks);
+
+        //        Assert.AreEqual(newOrder.First<Task>().ToString(), tasks[1].ToString());
+        //        Assert.AreEqual(newOrder.Last<Task>().ToString(), tasks[5].ToString());
+        //    }
+
+        //    [Test]
+        //    public void TestSortNone()
+        //    {
+        //        var tasks = getTestList();
+
+        //        var newOrder = TaskList.SortList(SortType.None, tasks);
+        //        var lastOrder = tasks.GetEnumerator();
+        //        lastOrder.MoveNext();
+
+        //        foreach (var task in newOrder)
+        //        {
+        //            Assert.AreEqual(task.ToString(), lastOrder.Current.ToString());
+        //            lastOrder.MoveNext();
+        //        }
+        //    }
+
+        [Test]
+        public void UpdateSummary_All_Counts_Zero_By_Default()
+        {
+            var viewModel = new MainWindowViewModelTester();
+            Assert.AreEqual(0, viewModel.IncompleteTasks);
+            Assert.AreEqual(0, viewModel.TasksDueToday);
+            Assert.AreEqual(0, viewModel.TasksOverdue);
+        }
+
+
+        [Test]
+        public void UpdateSummary_IncompleteTasks_Are_Counted()
+        {
+            var viewModel = new MainWindowViewModelTester();
+            var taskList = GenerateTaskList();
+            viewModel.UpdateSummaryTester(taskList);
+            Assert.AreEqual(2, viewModel.IncompleteTasks);
+        }
+
+        [Test]
+        public void UpdateSummary_DueToday_Counts_Incompletes_Only()
+        {
+            var viewModel = new MainWindowViewModelTester();
+            var taskList = GenerateTaskList(); // 1 incomplete task due today, 1 task due today, but completed.
+            viewModel.UpdateSummaryTester(taskList);
+            Assert.AreEqual(1, viewModel.TasksDueToday);
+        }
+
+        [Test]
+        public void UpdateSummary_Overdue_Counts_Incompletes_With_Past_Due_Dates()
+        {
+            var viewModel = new MainWindowViewModelTester();
+            var taskList = GenerateTaskList(); 
+            //Add an incomplete task due yesterday
+            taskList.Add(new Task("C", new List<String>(), new List<string>(), "Overdue incomplete task", CreateDueDate(-2), false));
+            //Add a complete task due yesterday
+            taskList.Add(new Task("C", new List<String>(), new List<string>(), "Overdue incomplete task", CreateDueDate(-2), true));
+
+            viewModel.UpdateSummaryTester(taskList);
+            Assert.AreEqual(1, viewModel.TasksOverdue);
+        }
+
+        private string CreateDueDate(int offsetDays)
+        {
+            return DateTime.Today.AddDays(offsetDays).ToString("yyyy-MM-dd");
+
+        }
+
+        private static List<Task> GenerateTaskList()
+        {
+            String today = DateTime.Today.ToString("yyyy-MM-dd");
+            Console.WriteLine(today);
+            return new List<Task>
+            {
+                new Task("A", new List<String>(), new List<string>(), "Incomplete Task", today), // Incomplete task, due today
+                new Task("A", new List<String>(), new List<string>(), "Incomplete Task2"), // Incomplete task2
+                new Task("A", new List<String>(), new List<string>(), "Complete Task", today, true), // Complete task that was due today
+
+            };
+        }
+    }
 }
diff --git a/ToDoTests/ToDoTests.csproj b/ToDoTests/ToDoTests.csproj
index 84c0af7e..2ee517f4 100644
--- a/ToDoTests/ToDoTests.csproj
+++ b/ToDoTests/ToDoTests.csproj
@@ -54,6 +54,10 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Client\Client.csproj">
+      <Project>{fc3f905a-dee1-454e-8746-936492d66cf2}</Project>
+      <Name>Client</Name>
+    </ProjectReference>
     <ProjectReference Include="..\ToDoLib\ToDoLib.csproj">
       <Project>{07AA9CEA-4EF0-4B47-AFBD-6F74AD9C4653}</Project>
       <Name>ToDoLib</Name>