Merge pull request #45 from BinderDyn/develop

2.1.0

Author: BinderDyn

.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache

@@ -1,10 +1,13 @@
 # TakeMyTime.NETCore
 
-Managing your productive time was never that easy! Display statistics, measure your progress and get things done!
+"Managing your productive time was never that easy! Display statistics, measure your progress and get things done!"
 
+This project was originally created to experiment with .NET Core 3.1 and WPF. It does NOT follow best practices or common knowledge about MVVM-Patterns. It barely implements them but was intended as a playground. If you plan to use this software for your own work and you are eager to improve it, contact me or issue a pull request. I'll be happy for each found bug or new feature I haven't thought of. I do not earn money with this piece of software and do not intend to do so. If you like it and want to honor my effort just let me know. I won't be receiving donations but would be happy if you would donate to charity instead!
+
+Starting guide: https://github.com/BinderDyn/TakeMyTime.NETCore/wiki/Getting-started
 
-## THIRD PARTY LICENSES
 
+## THIRD PARTY LICENSES
 
 This app uses MATERIAL ICONS - Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

.vs/TakeMyTime.NETCore/v16/.suo

@@ -105,6 +105,11 @@ private void CreateProjectWithEntries()
                 }),
             };
 
+            foreach (var entry in entries)
+            {
+                entry.CalculateDuration();
+            }
+
             this.uow.Entries.AddRange(entries);
             this.uow.Complete();
         }

README.md

@@ -27,12 +27,12 @@ public StatisticsLogic(UnitOfWork uow = null)
             }
         }
 
-        public Dictionary<string, double> GetAssignmentSharesOfProject(int project_id)
+        public IEnumerable<Tuple<int, string, double>> GetAssignmentSharesOfProject(int project_id)
         {
             return this.unitOfWork.Statistics.GetAssignmentSharesOfProject(project_id);
         }
 
-        public Dictionary<string, double> GetProjectShares()
+        public IEnumerable<Tuple<int, string, double>> GetProjectShares()
         {
             return this.unitOfWork.Statistics.GetProjectTotalShares();
         }

TakeMyTime.BLL.Tests/ProjectLogicTests.cs

@@ -1,4 +1,5 @@
-using System;
+using Common.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -41,13 +42,25 @@ public void Update(int id, Subtask.IUpdateParam param)
             unitOfWork.Complete();
         }
 
-        public void AddEntry(int subtask_id, Entry.ICreateParam param)
+        public Entry AddEntry(int subtask_id, Entry.ICreateParam param, bool finishesSubtask = false)
         {
             var entry = Entry.Create(param);
             entry.Subtask_Id = subtask_id;
             var subtask = unitOfWork.Subtasks.GetSubtaskFullyLoaded(subtask_id);
-            subtask.Entries.Add(entry);
+            if (subtask != null)
+            {
+                subtask.Entries.Add(entry);
+                if (finishesSubtask)
+                {
+                    subtask.SetStatus(EnumDefinition.SubtaskStatus.Done);
+                }
+            }
+            else
+            {
+                unitOfWork.Entries.Add(entry);
+            }
             unitOfWork.Complete();
+            return entry;
         }
 
         public void Delete(int subtask_id)
@@ -57,6 +70,20 @@ public void Delete(int subtask_id)
             unitOfWork.Complete();
         }
 
+        public void SetSubtaskTickedOff(int subtask_id)
+        {
+            var subtask = unitOfWork.Subtasks.Get(subtask_id);
+            subtask.SetStatus(EnumDefinition.SubtaskStatus.Done);
+            unitOfWork.Complete();
+        }
+
+        public void SetSubtaskAborted(int subtask_id)
+        {
+            var subtask = unitOfWork.Subtasks.Get(subtask_id);
+            subtask.SetStatus(EnumDefinition.SubtaskStatus.Aborted);
+            unitOfWork.Complete();
+        }
+
         public void Dispose()
         {
             unitOfWork.Dispose();

TakeMyTime.BLL/Logic/StatisticsLogic.cs

@@ -15,20 +15,23 @@ public class EnumDefinition
         /// <summary>
         /// Status of assignments
         /// </summary>
+        [Flags]
         public enum AssignmentStatus
         {
-            [Description("All")]
-            Default = ~0,
-            [Description("Active")]
-            InProgress = 0,
+            [Description("None")]
+            None = 0,
             [Description("Future")]
             Future = 1,
+            [Description("Active")]
+            InProgress = 2,
             [Description("Done")]
-            Done = 2,
+            Done = 4,
             [Description("Aborted")]
-            Aborted = 3,
+            Aborted = 8,
             [Description("Postponed")]
-            Postponed = 4,
+            Postponed = 16,
+            [Description("All")]
+            All = ~0
         }
 
         public enum TimekeeperStatus

TakeMyTime.BLL/Logic/SubtaskLogic.cs

@@ -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>

TakeMyTime.Common/Enums/EnumDefinition.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);
+        }
+    }
+}

TakeMyTime.DAL.Tests/TakeMyTime.DAL.Tests.csproj

@@ -9,8 +9,8 @@ public interface IStatisticsRepository
     {
         long? GetTotalWorktimeOfAllActiveProjects();
         long? GetTotalWorktimeOfSpecificProject(int project_id);
-        Dictionary<string, double> GetAssignmentSharesOfProject(int project_id);
-        Dictionary<string, double> GetProjectTotalShares();
+        IEnumerable<Tuple<int, string, double>> GetAssignmentSharesOfProject(int project_id);
+        IEnumerable<Tuple<int, string, double>> GetProjectTotalShares();
         IEnumerable<ProductivityViewModel> GetProjectProductiveDays(int project_id);
         IEnumerable<MostProductiveWeekDaysViewModel> GetMostProductiveDays();
     }