BinderDyn · BinderDyn · Mar 21, 2020 · Mar 19, 2020 · Mar 21, 2020
diff --git a/.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache b/.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache
diff --git a/.vs/TakeMyTime.NETCore/v16/.suo b/.vs/TakeMyTime.NETCore/v16/.suo
diff --git a/TakeMyTime.DAL.Tests/TakeMyTime.DAL.Tests.csproj b/TakeMyTime.DAL.Tests/TakeMyTime.DAL.Tests.csproj
@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
+    <PackageReference Include="coverlet.collector" Version="1.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TakeMyTime.DAL\TakeMyTime.DAL.csproj" />
+    <ProjectReference Include="..\TakeMyTime.Models\TakeMyTime.Models.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/TakeMyTime.DAL.Tests/WeekdayProductivityManagerTests.cs b/TakeMyTime.DAL.Tests/WeekdayProductivityManagerTests.cs
@@ -0,0 +1,106 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using System.Linq;
+using TakeMyTime.Models.Models;
+
+namespace TakeMyTime.DAL.Tests
+{
+    [TestClass]
+    public class WeekdayProductivityManagerTests
+    {
+        private WeekdayProductivityManager manager;
+
+        [TestInitialize]
+        public void Initialize()
+        {
+            this.manager = new WeekdayProductivityManager();
+        }
+
+        private Entry[] GenerateEntries()
+        {
+            return new Entry[]
+            {
+                new Entry
+                {
+                    DurationAsTicks = TimeSpan.FromHours(1).Ticks,
+                    Started = new DateTime(2020, 3, 16)
+                },
+                new Entry
+                {
+                    DurationAsTicks = TimeSpan.FromHours(1).Ticks,
+                    Started = new DateTime(2020, 3, 17)
+                },
+                new Entry
+                {
+                    DurationAsTicks = TimeSpan.FromHours(1).Ticks,
+                    Started = new DateTime(2020, 3, 10)
+                },
+                new Entry
+                {
+                    DurationAsTicks = TimeSpan.FromHours(1).Ticks,
+                    Started = new DateTime(2020, 3, 18)
+                },
+                new Entry
+                {
+                    DurationAsTicks = TimeSpan.FromHours(1).Ticks,
+                    Started = new DateTime(2020, 3, 19)
+                },
+                new Entry
+                {
+                    DurationAsTicks = TimeSpan.FromHours(1).Ticks,
+                    Started = new DateTime(2020, 3, 20)
+                }
+            };
+        }
+
+        [TestMethod]
+        public void TestDayWithoutEntries()
+        {
+            // ARRANGE
+            var entries = this.GenerateEntries();
+
+            // ACT
+            foreach (var entry in entries)
+            {
+                this.manager.ProcessEntry(entry);
+            }
+            var result = this.manager.GetResults();
+
+            // ASSERT
+            double expectedTotalResultMonday = 0;
+            double expectedAverageHoursMonday = 0;
+            double expectedShareMonday = 0;
+
+            Assert.AreNotEqual(expectedTotalResultMonday, result.Single(r => r.Day == DayOfWeek.Monday).TotalHours);
+            Assert.AreNotEqual(expectedAverageHoursMonday, result.Single(r => r.Day == DayOfWeek.Monday).AverageHours);
+            Assert.AreNotEqual(expectedShareMonday, result.Single(r => r.Day == DayOfWeek.Monday).Value);
+        }
+
+        [TestMethod]
+        public void TestDayWithEntries()
+        {
+            // ARRANGE
+            var entries = this.GenerateEntries();
+
+            // ACT
+            foreach (var entry in entries)
+            {
+                this.manager.ProcessEntry(entry);
+            }
+            var result = this.manager.GetResults();
+
+            // ASSERT
+            double expectedTotalResultTuesday = 2;
+            double expectedAverageHoursTuesday = 1;
+            double expectedShareTuesday = 33; // 100 / 6 = 16,7 => 16,7 x 2 ~ 33
+            double expectedShareWednesday = 17;
+
+            Assert.AreEqual(expectedTotalResultTuesday, result.Single(r => r.Day == DayOfWeek.Tuesday).TotalHours);
+            Assert.AreEqual(expectedAverageHoursTuesday, result.Single(r => r.Day == DayOfWeek.Tuesday).AverageHours);
+            double roundedResultOfTuesdayShares = result.Where(r => r.Day == DayOfWeek.Tuesday).Sum(d => Math.Round(d.Value * 100));
+            Assert.AreEqual(expectedShareTuesday, roundedResultOfTuesdayShares);
+            double roundedResultOfWednesdayShares = Math.Round(result.Single(r => r.Day == DayOfWeek.Wednesday).Value * 100, 1);
+            Assert.AreEqual(expectedShareWednesday, roundedResultOfWednesdayShares);
+        }
+    }
+}
diff --git a/TakeMyTime.DAL/Repositories/StatisticsRepository.cs b/TakeMyTime.DAL/Repositories/StatisticsRepository.cs
@@ -92,7 +92,7 @@ public IEnumerable<ProductivityViewModel> GetProjectProductiveDays(int project_i
             var entries = this.context.Entries
                 .Where(e => e.Project_Id == project_id);
 
-            foreach (var entry in entries)
+            foreach (var entry in entries.Where(e => e.DurationAsTicks.HasValue))
             {
                 results.Add(new ProductivityViewModel { X = entry.Date, Y = new TimeSpan(entry.DurationAsTicks.Value) });
             }
@@ -106,7 +106,7 @@ public IEnumerable<MostProductiveWeekDaysViewModel> GetMostProductiveDays()
                 .Include(e => e.Project)
                 .Where(e => e.Project.ProjectStatus == EnumDefinition.ProjectStatus.Active)
                 .ToList();
-            var weekdayManager = new WeekdayProductivityManager(entries.Count());
+            var weekdayManager = new WeekdayProductivityManager();
 
             foreach (var entry in entries)
             {

diff --git a/TakeMyTime.DAL/WeekdayProductivityManager.cs b/TakeMyTime.DAL/WeekdayProductivityManager.cs
@@ -8,107 +8,161 @@ namespace TakeMyTime.DAL
 {
     public class WeekdayProductivityManager
     {
-        public WeekdayProductivityManager(int totalEntryCount)
+        public WeekdayProductivityManager()
         {
-            this.TotalEntryCount = totalEntryCount;
         }
 
         public void ProcessEntry(Entry entry)
         {
-            if(CanProcessEntries)
+            var durationAsHours = entry.DurationAsTicks.HasValue ? TimeSpan.FromTicks(entry.DurationAsTicks.Value).TotalHours : 0;
+            if(durationAsHours > 0)
             {
+                TotalWorkingHours += durationAsHours;
                 var date = entry.Started.HasValue ? entry.Started.Value.DayOfWeek : entry.Date.DayOfWeek;
                 switch (date)
                 {
                     case DayOfWeek.Monday:
+                        MondayTotalWorkingHours += durationAsHours;
                         MondayEntryCount++;
-                        this.MondayValueShare = Math.Round((double)MondayEntryCount / (double)TotalEntryCount, 2);
+                        this.MondayAverageWorkingHours = Math.Round(MondayTotalWorkingHours / MondayEntryCount, 2);
+
                         break;
                     case DayOfWeek.Tuesday:
+                        TuesdayTotalWorkingHours += durationAsHours;
                         TuesdayEntryCount++;
-                        this.TuesdayValueShare = Math.Round((double)TuesdayEntryCount / (double)TotalEntryCount, 2);
+                        this.TuesdayAverageWorkingHours = Math.Round(TuesdayTotalWorkingHours / TuesdayEntryCount, 2);
+
                         break;
                     case DayOfWeek.Wednesday:
+                        WednesdayTotalWorkingHours += durationAsHours;
                         WednesdayEntryCount++;
-                        this.WednesdayValueShare = Math.Round((double)WednesdayEntryCount / (double)TotalEntryCount, 2);
+                        this.WednesdayAverageWorkingHours = Math.Round(WednesdayTotalWorkingHours / WednesdayEntryCount, 2);
+
                         break;
                     case DayOfWeek.Thursday:
+                        ThursdayTotalWorkingHours += durationAsHours;
                         ThursdayEntryCount++;
-                        this.ThursdayValueShare = Math.Round((double)ThursdayEntryCount / (double)TotalEntryCount, 2);
+                        this.ThursdayAverageWorkingHours = Math.Round(ThursdayTotalWorkingHours / ThursdayEntryCount, 2);
+
                         break;
                     case DayOfWeek.Friday:
+                        FridayTotalWorkingHours += durationAsHours;
                         FridayEntryCount++;
-                        this.FridayValueShare = Math.Round((double)FridayEntryCount / (double)TotalEntryCount, 2);
+                        this.FridayAverageWorkingHours = Math.Round(FridayTotalWorkingHours / FridayEntryCount, 2);
+
                         break;
                     case DayOfWeek.Saturday:
+                        SaturdayTotalWorkingHours += durationAsHours;
                         SaturdayEntryCount++;
-                        this.SaturdayValueShare = Math.Round((double)SaturdayEntryCount / (double)TotalEntryCount, 2);
+                        this.SaturdayAverageWorkingHours = Math.Round(SaturdayTotalWorkingHours / SaturdayEntryCount, 2);
+
                         break;
                     case DayOfWeek.Sunday:
+                        SundayTotalWorkingHours += durationAsHours;
                         SundayEntryCount++;
-                        this.SundayValueShare = Math.Round((double)SundayEntryCount / (double)TotalEntryCount, 2);
+                        this.SundayAverageWorkingHours = Math.Round(SundayTotalWorkingHours / SundayEntryCount, 2);
                         break;
                 };
+
+                CalculateShares();
             }
         }
 
+        private void CalculateShares()
+        {
+            this.MondayValueShare = Math.Round(MondayTotalWorkingHours / TotalWorkingHours, 2);
+            this.TuesdayValueShare = Math.Round(TuesdayTotalWorkingHours / TotalWorkingHours, 2);
+            this.WednesdayValueShare = Math.Round(WednesdayTotalWorkingHours / TotalWorkingHours, 2);
+            this.ThursdayValueShare = Math.Round(ThursdayTotalWorkingHours / TotalWorkingHours, 2);
+            this.FridayValueShare = Math.Round(FridayTotalWorkingHours / TotalWorkingHours, 2);
+            this.SaturdayValueShare = Math.Round(SaturdayTotalWorkingHours / TotalWorkingHours, 2);
+            this.SundayValueShare = Math.Round(SundayTotalWorkingHours / TotalWorkingHours, 2);
+        }
+
         public IEnumerable<MostProductiveWeekDaysViewModel> GetResults()
         {
             return new List<MostProductiveWeekDaysViewModel>
             {
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Monday,
-                    Value = MondayValueShare
+                    Value = MondayValueShare,
+                    AverageHours = MondayAverageWorkingHours,
+                    TotalHours = MondayTotalWorkingHours
                 },
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Tuesday,
-                    Value = TuesdayValueShare
+                    Value = TuesdayValueShare,
+                    AverageHours = TuesdayAverageWorkingHours,
+                    TotalHours = TuesdayTotalWorkingHours
                 },
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Wednesday,
-                    Value = WednesdayValueShare
+                    Value = WednesdayValueShare,
+                    AverageHours = WednesdayAverageWorkingHours,
+                    TotalHours = WednesdayTotalWorkingHours
                 },
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Thursday,
-                    Value = ThursdayValueShare
+                    Value = ThursdayValueShare,
+                    AverageHours = ThursdayAverageWorkingHours,
+                    TotalHours = ThursdayTotalWorkingHours
                 },
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Friday,
-                    Value = FridayValueShare
+                    Value = FridayValueShare,
+                    AverageHours = FridayAverageWorkingHours,
+                    TotalHours = FridayTotalWorkingHours
                 },
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Saturday,
-                    Value = SaturdayValueShare
+                    Value = SaturdayValueShare,
+                    AverageHours = SaturdayAverageWorkingHours,
+                    TotalHours = SaturdayTotalWorkingHours
                 },
                 new MostProductiveWeekDaysViewModel
                 {
                     Day = DayOfWeek.Sunday,
-                    Value = SundayValueShare
+                    Value = SundayValueShare,
+                    AverageHours = SundayAverageWorkingHours,
+                    TotalHours = SundayTotalWorkingHours
                 },
             };
         }
 
-        public int TotalEntryCount { get; private set; }
-        public int MondayEntryCount { get; private set; }
+        public double TotalWorkingHours { get; private set; }
+        public double MondayTotalWorkingHours { get; private set; }
         public double MondayValueShare { get; private set; }
-        public int TuesdayEntryCount { get; private set; }
+        public double MondayAverageWorkingHours { get; private set; }
+        public double MondayEntryCount { get; set; }
+        public double TuesdayTotalWorkingHours { get; private set; }
         public double TuesdayValueShare { get; private set; }
-        public int WednesdayEntryCount { get; private set; }
+        public double TuesdayAverageWorkingHours { get; private set; }
+        public double TuesdayEntryCount { get; set; }
+        public double WednesdayTotalWorkingHours { get; private set; }
         public double WednesdayValueShare { get; private set; }
-        public int ThursdayEntryCount { get; private set; }
+        public double WednesdayAverageWorkingHours { get; private set; }
+        public double WednesdayEntryCount { get; set; }
+        public double ThursdayTotalWorkingHours { get; private set; }
         public double ThursdayValueShare { get; private set; }
-        public int FridayEntryCount { get; private set; }
+        public double ThursdayAverageWorkingHours { get; private set; }
+        public double ThursdayEntryCount { get; set; }
+        public double FridayTotalWorkingHours { get; private set; }
         public double FridayValueShare { get; private set; }
-        public int SaturdayEntryCount { get; private set; }
+        public double FridayAverageWorkingHours { get; private set; }
+        public double FridayEntryCount { get; set; }
+        public double SaturdayTotalWorkingHours { get; private set; }
         public double SaturdayValueShare { get; private set; }
-        public int SundayEntryCount { get; private set; }
+        public double SaturdayAverageWorkingHours { get; private set; }
+        public double SaturdayEntryCount { get; set; }
+        public double SundayTotalWorkingHours { get; private set; }
         public double SundayValueShare { get; private set; }
-        public bool CanProcessEntries { get => this.TotalEntryCount > 0; }
+        public double SundayAverageWorkingHours { get; private set; }
+        public double SundayEntryCount { get; set; }
     }
 }
diff --git a/TakeMyTime.Models/Models/MostProductiveWeekDaysViewModel.cs b/TakeMyTime.Models/Models/MostProductiveWeekDaysViewModel.cs
@@ -8,5 +8,7 @@ public class MostProductiveWeekDaysViewModel
     {
         public DayOfWeek Day { get; set; }
         public double Value { get; set; }
+        public double AverageHours { get; set; }
+        public double TotalHours { get; set; }
     }
 }
diff --git a/TakeMyTime.NETCore.sln b/TakeMyTime.NETCore.sln
@@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TakeMyTime.BLL.Tests", "Tak
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TakeMyTime.Tests.Common", "TakeMyTime.Tests.Common\TakeMyTime.Tests.Common.csproj", "{D7D6ABCF-39A8-4C17-BF63-F29F11F496BC}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TakeMyTime.DAL.Tests", "TakeMyTime.DAL.Tests\TakeMyTime.DAL.Tests.csproj", "{E778405A-42E7-4F78-BE0F-EB025BDDD2CB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -57,6 +59,10 @@ Global
 		{D7D6ABCF-39A8-4C17-BF63-F29F11F496BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7D6ABCF-39A8-4C17-BF63-F29F11F496BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7D6ABCF-39A8-4C17-BF63-F29F11F496BC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E778405A-42E7-4F78-BE0F-EB025BDDD2CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E778405A-42E7-4F78-BE0F-EB025BDDD2CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E778405A-42E7-4F78-BE0F-EB025BDDD2CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E778405A-42E7-4F78-BE0F-EB025BDDD2CB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/TakeMyTime.WPF/Statistics/Dashboard.xaml.cs b/TakeMyTime.WPF/Statistics/Dashboard.xaml.cs
@@ -140,7 +140,9 @@ private string[] ResolveWeekdayNames(IEnumerable<MostProductiveWeekDaysViewModel
             var labels = new List<string>();
             foreach (var vm in viewModels)
             {
-                labels.Add(ResourceStringManager.GetResourceByKey(vm.Day.ToString()));
+                string formattedAvgHours = string.Format("{0}(Ø {1:0.00}h){2}(Total: {3:0.00}h)", System.Environment.NewLine,
+                    vm.AverageHours, System.Environment.NewLine, vm.TotalHours);
+                labels.Add(ResourceStringManager.GetResourceByKey(vm.Day.ToString()) + formattedAvgHours);
             }
 
             return labels.ToArray();