Merge pull request #56 from BinderDyn/Change-status-to-InProgress-if-entry-for-any-subtask-was-created

ChangeStatus to InProgress

Author: BinderDyn

.vs/TakeMyTime.NETCore/v16/.suo

@@ -5,6 +5,7 @@
 using TakeMyTime.DAL.uow;
 
 using TakeMyTime.Models.Models;
+using static Common.Enums.EnumDefinition;
 
 namespace TakeMyTime.BLL.Logic
 {
@@ -59,6 +60,16 @@ public void UpdateAssignment(int id, Assignment.IUpdateParam param)
             unitOfWork.Complete();
         }
 
+        public void UpdateAssignmentStatus(int id, AssignmentStatus status)
+        {
+            var edit = unitOfWork.Assignments.Get(id);
+            if (edit != null)
+            {
+                edit.UpdateStatus(status);
+                unitOfWork.Complete();
+            }
+        }
+
         public void DeleteAssignment(int id)
         {
             var toBeDeleted = GetAssignmentById(id);

TakeMyTime.BLL/Logic/AssignmentLogic.cs

@@ -46,19 +46,21 @@ public AddAssignment(int assignment_id, int project_id)
 
         private void Load()
         {
-            if (EditMode)
-            {
-                var assignmentLogic = new AssignmentLogic();
-                this.Assignment = assignmentLogic.GetAssignmentById(this.Assignment.Id);
-                assignmentLogic.Dispose();
-
-                this.tb_AssignmentDescription.Text = this.Assignment.Description;
-                this.tb_AssignmentName.Text = this.Assignment.Name;
-                this.tb_AssignmentPlannedDurationHours.Text = Assignment.DurationPlannedAsTicks.HasValue ? new TimeSpan(this.Assignment.DurationPlannedAsTicks.Value).Hours.ToString() : null;
-                this.tb_AssignmentPlannedDurationMinutes.Text = Assignment.DurationPlannedAsTicks.HasValue ? new TimeSpan(this.Assignment.DurationPlannedAsTicks.Value).Minutes.ToString() : null;
-                this.dp_AssignmentDue.SelectedDate = this.Assignment.DateDue;
-                this.dp_Planned.SelectedDate = this.Assignment.DatePlanned;
-            }
+            if (!EditMode) return;
+            var assignmentLogic = new AssignmentLogic();
+            this.Assignment = assignmentLogic.GetAssignmentById(this.Assignment.Id);
+            assignmentLogic.Dispose();
+
+            this.tb_AssignmentDescription.Text = this.Assignment.Description;
+            this.tb_AssignmentName.Text = this.Assignment.Name;
+            this.tb_AssignmentPlannedDurationHours.Text = Assignment.DurationPlannedAsTicks.HasValue
+                ? new TimeSpan(this.Assignment.DurationPlannedAsTicks.Value).Hours.ToString()
+                : null;
+            this.tb_AssignmentPlannedDurationMinutes.Text = Assignment.DurationPlannedAsTicks.HasValue
+                ? new TimeSpan(this.Assignment.DurationPlannedAsTicks.Value).Minutes.ToString()
+                : null;
+            this.dp_AssignmentDue.SelectedDate = this.Assignment.DateDue;
+            this.dp_Planned.SelectedDate = this.Assignment.DatePlanned;
         }
 
         #region GUI Events

TakeMyTime.WPF/Assignments/AddAssignment.xaml.cs

@@ -42,7 +42,7 @@ public AssignmentOverview()
         private void SetDefaultFilters()
         {
             this.cb_ProjectSelection.SelectedItem = this.ProjectViewModels.Single(pvm => pvm.Id == 0);
-            this.cb_StatusFilter.SelectedItem = cbi_Future;
+            this.cb_StatusFilter.SelectedItem = cbi_Active;
         }
 
         private void LoadProjectViewModels()

TakeMyTime.WPF/Assignments/AssignmentOverview.xaml.cs

@@ -1,20 +1,11 @@
 using Common.Enums;
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Timers;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
 using System.Windows.Threading;
 using TakeMyTime.BLL.Logic;
 using TakeMyTime.Models.Models;
@@ -44,7 +35,7 @@ public AddEntry(int projectId, int assignmentId)
             this.btn_StartStop.Content = ResourceStringManager.GetResourceByKey("ButtonTextStart");
             this.Load();
             this.cb_Subtask.SelectedItem = this.SubtaskViewModels.FirstOrDefault(s => s.Id > 0);
-            if (this.SubtaskViewModels.Count() == 0) this.chebo_FinishesSubtask.IsEnabled = false;
+            if (!this.SubtaskViewModels.Any()) this.chebo_FinishesSubtask.IsEnabled = false;
         }
 
         public AddEntry(int entry_id)
@@ -77,17 +68,15 @@ private void btn_Close_Click(object sender, RoutedEventArgs e)
 
         private void btn_Save_Click(object sender, RoutedEventArgs e)
         {
-            if (!string.IsNullOrWhiteSpace(this.tb_Name.Text))
+            if (string.IsNullOrWhiteSpace(this.tb_Name.Text)) return;
+            if (this.entry_id.HasValue)
+            {
+                this.EditAndSaveEntry();
+            }
+            else
             {
-                if (!this.entry_id.HasValue)
-                {
-                    this.stopped = DateTime.Now;
-                    this.CreateEntry();
-                }
-                else
-                {
-                    this.EditAndSaveEntry();
-                }
+                this.stopped = DateTime.Now;
+                this.CreateEntry();
             }
         }
 
@@ -144,6 +133,7 @@ public void CreateEntry()
             projectLogic.Dispose();
             var subtaskLogic = new SubtaskLogic();
             var subtask = subtaskLogic.GetById(this.SelectedSubtask.Id);
+            ChangeParentAssignmentToInProgress(subtask);
 
             var entryCreateViewModel = new EntryCreateViewModel
             {
@@ -163,6 +153,15 @@ public void CreateEntry()
             this.Close();
         }
 
+        private static void ChangeParentAssignmentToInProgress(Subtask subtask)
+        {
+            // Update AssignmentStatus to InProgress
+            if (subtask == null) return;
+            var assignmentLogic = new AssignmentLogic();
+            assignmentLogic.UpdateAssignmentStatus(subtask.Assignment_Id.GetValueOrDefault(0), EnumDefinition.AssignmentStatus.InProgress);
+            assignmentLogic.Dispose();
+        }
+
         public void StartStopTimer()
         {
             if (!timer.IsEnabled)