Merge pull request #42 from BinderDyn/Create-entries-without-subtasks

Changed the way entries are calculated as well as creating entries wi…

Author: BinderDyn

.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache

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

.vs/TakeMyTime.NETCore/v16/.suo

@@ -14,6 +14,8 @@
     <Compile Remove="Migrations\20200115124254_subtasks.Designer.cs" />
     <Compile Remove="Migrations\20200318201416_assignment_id.cs" />
     <Compile Remove="Migrations\20200318201416_assignment_id.Designer.cs" />
+    <Compile Remove="Migrations\20200319194258_project_id_constraint.cs" />
+    <Compile Remove="Migrations\20200319194258_project_id_constraint.Designer.cs" />
   </ItemGroup>
 
   <ItemGroup>

TakeMyTime.BLL.Tests/ProjectLogicTests.cs

@@ -17,8 +17,14 @@ public TakeMyTimeDbContext() : base()
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
             // var connectionString = ConfigurationManager.ConnectionStrings["TakeMyTimeDebug"];
-            optionsBuilder.UseSqlite(ConfigurationManager.ConnectionStrings["TakeMyTimeDebug"].ConnectionString);
-            // optionsBuilder.UseSqlite("Data Source=TakeMyTimeDebug.db;");
+            if (ConfigurationManager.ConnectionStrings["TakeMyTimeDebug"] != null)
+            {
+                optionsBuilder.UseSqlite(ConfigurationManager.ConnectionStrings["TakeMyTimeDebug"].ConnectionString);
+            }
+            else
+            {
+                optionsBuilder.UseSqlite("Data Source=TakeMyTimeTestContext.db;");
+            }
 
             optionsBuilder.EnableSensitiveDataLogging(true);
         }

TakeMyTime.DAL/TakeMyTime.DAL.csproj

@@ -32,7 +32,7 @@ public void Create_Test()
             var assignment = Assignment.Create(createParam);
 
             // ASSERT
-            Assert.AreEqual(AssignmentStatus.InProgress, assignment.AssignmentStatus);
+            Assert.AreEqual(AssignmentStatus.Future, assignment.AssignmentStatus);
         }
 
         [TestMethod]

TakeMyTime.DAL/TakeMyTimeDbContext.cs

@@ -38,6 +38,7 @@ public void IsDurationCorrect()
         {
             // ARRANGE & ACT
             var entry = Entry.Create(createParam);
+            entry.CalculateDuration();
 
             // ASSERT
             Assert.AreEqual(new TimeSpan(0, 10, 0).Minutes, new TimeSpan(entry.DurationAsTicks.Value).Minutes);

TakeMyTime.Models.Tests/AssignmentTests.cs

@@ -61,15 +61,15 @@ public interface ICreateParam : IUpdateParam
             DateTime? Ended { get; set; }
         }
 
-        //private void CalculateDuration()
-        //{
-        //    bool canCalculateDuration = this.Started.HasValue && this.Ended.HasValue;
-        //    if (canCalculateDuration)
-        //    {
-        //        TimeSpan duration = this.Ended.Value - this.Started.Value;
-        //        this.DurationAsTicks = duration.Ticks;
-        //    }
-        //}
+        public void CalculateDuration()
+        {
+            bool canCalculateDuration = this.Started.HasValue && this.Ended.HasValue;
+            if (canCalculateDuration)
+            {
+                TimeSpan duration = this.Ended.Value - this.Started.Value;
+                this.DurationAsTicks = duration.Ticks;
+            }
+        }
 
         [ForeignKey("Project")]
         public int? Project_Id { get; set; }

TakeMyTime.Models.Tests/EntryTests.cs

@@ -138,13 +138,42 @@ private void btn_EditAssignment_Click(object sender, RoutedEventArgs e)
 
         private void lv_Assignments_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            if (this.SelectedAssignment != null && this.SelectedAssignment.HasSubtasks)
+            if (this.SelectedAssignment != null)
             {
+                CheckForSubtasksForAssignmentAndCreateIfNecessary(this.SelectedAssignment.Id);
                 var addEntryDialog = new AddEntry(this.SelectedAssignment.ProjectId, this.SelectedAssignment.Id);
                 addEntryDialog.ShowDialog();
             }
         }
 
+        private void CheckForSubtasksForAssignmentAndCreateIfNecessary(int assignment_id) 
+        {
+            try
+            {
+                var subtaskLogic = new SubtaskLogic();
+                var existingSubtasks = subtaskLogic.GetByAssignmentId(assignment_id);
+                if (existingSubtasks == null || existingSubtasks.Count() == 0)
+                {
+                    var assignmentLogic = new AssignmentLogic();
+                    var assignment = assignmentLogic.GetAssignmentById(assignment_id);
+                    var defaultSubtask = new SubtaskCreateViewModel
+                    {
+                        Name = assignment.Name,
+                        Description = assignment.Description,
+                        Priority = EnumDefinition.SubtaskPriority.Medium
+                    };
+                    assignmentLogic.AddSubtask(assignment_id, defaultSubtask);
+                    assignmentLogic.Dispose();
+                }
+                subtaskLogic.Dispose();
+            }
+            catch (Exception e)
+            {
+                Logger.LogException(e);
+                MessageBox.Show(e.Message);
+            }
+        }
+
         private void btn_SetDone_Click(object sender, RoutedEventArgs e)
         {
             Logger.Log(string.Format("{0}.btn_SetDone_Click", GetType().FullName));