Merge pull request #30 from BinderDyn/bugfix-assignments

Fix

Author: BinderDyn

.vs/TakeMyTime.NETCore/DesignTimeBuild/.dtbcache

@@ -146,19 +146,18 @@
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
                     </GridViewColumn>
-                    <GridViewColumn 
+                    <!--<GridViewColumn 
                             Header="{x:Static resources:AssignmentOverview.ColumnHasDueDate}"
                             Width="90">
                         <GridViewColumn.CellTemplate>
                             <DataTemplate>
                                 <CheckBox
                                     IsEnabled="False"
-                                    Content="{Binding Path=HasDueDate}"
-                                    >
+                                    Content="{Binding Path=HasDueDate}">
                                 </CheckBox>
                             </DataTemplate>
                         </GridViewColumn.CellTemplate>
-                    </GridViewColumn>
+                    </GridViewColumn>-->
                     <GridViewColumn
                         Header="{x:Static resources:AssignmentOverview.ColumnDueDate}"
                         Width="90"

.vs/TakeMyTime.NETCore/v16/.suo

@@ -32,27 +32,43 @@ public AssignmentOverview()
         {
             InitializeComponent();
             this.PagingManager = new PagingManager<AssignmentViewModel>(15);
+            this.LoadProjectViewModels();
             this.Load();
             this.RefreshBindings(1);
         }
 
-        private void Load()
+        private void LoadProjectViewModels()
         {
-            var assignmentLogic = new AssignmentLogic();
             var projectLogic = new ProjectLogic();
-            this.AssignmentViewModels = assignmentLogic.GetAllAssignments().Select(a => new AssignmentViewModel(a));
-            this.FilteredAssignmentViewModels = this.AssignmentViewModels.ToList();
-            this.PagingManager.Data = this.FilteredAssignmentViewModels.ToList();
             this.ProjectViewModels = projectLogic.GetAllProjects()
                 .Where(p => p.ProjectStatus == EnumDefinition.ProjectStatus.Active)
                 .Select(p => new Projects.ProjectViewModel(p)).ToList();
             string projectAllSelectItemName = ResourceStringManager.GetResourceByKey("ProjectsAll");
             this.ProjectViewModels.Insert(0, new Projects.ProjectViewModel { Name = projectAllSelectItemName, Id = 0 });
+            this.cb_ProjectSelection.ItemsSource = this.ProjectViewModels;
+            this.cb_ProjectSelection.SelectedItem = this.ProjectViewModels.Where(p => p.Id == 0);
+        }
+
+        private void Load()
+        {
+            var assignmentLogic = new AssignmentLogic();
+            this.AssignmentViewModels = assignmentLogic.GetAllAssignments().Select(a => new AssignmentViewModel(a));
+            assignmentLogic.Dispose();
+            if (this.SelectedProject != null)
+            {
+                this.FilteredAssignmentViewModels = this.AssignmentViewModels
+                .Where(av => av.ProjectId == this.SelectedProject?.Id && av.StatusAsEnum == this.SelectedFilter)
+                .ToList();
+            }
+            else
+            {
+                this.FilteredAssignmentViewModels = this.AssignmentViewModels;
+            }
+            this.PagingManager.Data = this.FilteredAssignmentViewModels.ToList();
             this.LoadFromAllProjects = true;
             this.lv_Assignments.ItemsSource = this.PagingManager.Page(this.PagingManager.CurrentPage);
-            this.cb_ProjectSelection.ItemsSource = this.ProjectViewModels;
-            this.cb_ProjectSelection.SelectedItem = this.ProjectViewModels.FirstOrDefault(p => p.Id == 0);
-            this.cb_StatusFilter.SelectedItem = this.cbi_All;
+            if (this.cb_ProjectSelection.SelectedItem != null) this.cb_ProjectSelection.SelectedItem = this.SelectedProject;
+            if (this.cb_StatusFilter.SelectedItem != null) this.cb_StatusFilter.SelectedItem = this.SelectedFilter;
         }
 
         #region GUI Events

TakeMyTime.WPF/Assignments/AssignmentOverview.xaml

@@ -27,6 +27,9 @@ public AssignmentViewModel(Assignment assignment)
             this.ProjectId = assignment.Project_Id.Value;
             this.Planned = assignment.DatePlanned;
             this.HasSubtasks = assignment.Subtasks.Count() > 0;
+
+            this.StatusImage = GetImageByStatus(assignment.AssignmentStatus);
+            this.StatusTooltip = GetStatusString(assignment.AssignmentStatus);
         }
 
         public int Id { get; set; }
@@ -43,7 +46,11 @@ public AssignmentViewModel(Assignment assignment)
         public string PlannedAsString { get => DateTimeCultureConverter.GetCalendarWeek(this.Planned); }
         public int ProjectId { get; set; }
         public EnumDefinition.AssignmentStatus StatusAsEnum { get; set; }
-        public Uri StatusImage { get => GetImageByStatus(this.StatusAsEnum); }
+        public Uri StatusImage { get; private set; }
+        public string StatusTooltip { get; private set; }
+
+        
+
         public bool HasSubtasks { get; private set; }
 
         private Uri GetImageByStatus(EnumDefinition.AssignmentStatus status)
@@ -55,6 +62,20 @@ private Uri GetImageByStatus(EnumDefinition.AssignmentStatus status)
                 EnumDefinition.AssignmentStatus.Default => new Uri("pack://application:,,,/Images/assignmentActiveIconSmall.png"),
                 EnumDefinition.AssignmentStatus.Aborted => new Uri("pack://application:,,,/Images/assignmentAbortedIconSmall.png"),
                 EnumDefinition.AssignmentStatus.Postponed => new Uri("pack://application:,,,/Images/assignmentPostponedIconSmall.png"),
+                EnumDefinition.AssignmentStatus.Done => new Uri("pack://application:,,,/Images/assignmentDoneIconSmall.png"),
+                _ => new Uri("pack://application:,,,/Images/assignmentActiveIconSmall.png")
+            };
+        }
+
+        private string GetStatusString(EnumDefinition.AssignmentStatus statusAsEnum)
+        {
+            return statusAsEnum switch
+            {
+                EnumDefinition.AssignmentStatus.InProgress => Resources.Shared.AssignmentActive,
+                EnumDefinition.AssignmentStatus.Future => Resources.Shared.AssignmentFuture,
+                EnumDefinition.AssignmentStatus.Default => Resources.Shared.AssignmentFuture,
+                EnumDefinition.AssignmentStatus.Aborted => Resources.Shared.AssignmentAborted,
+                EnumDefinition.AssignmentStatus.Postponed => Resources.Shared.AssignmentPostponed,
                 _ => null
             };
         }

TakeMyTime.WPF/Assignments/AssignmentOverview.xaml.cs

@@ -11,6 +11,11 @@
   <ItemGroup>
     <None Remove="Images\activeIconSmall.png" />
     <None Remove="Images\archiveIconSmall.png" />
+    <None Remove="Images\assignmentAbortedIconSmall.png" />
+    <None Remove="Images\assignmentActiveIconSmall.png" />
+    <None Remove="Images\assignmentDoneIconSmall.png" />
+    <None Remove="Images\assignmentFutureIconSmall.png" />
+    <None Remove="Images\assignmentPostponedIconSmall.png" />
   </ItemGroup>
 
   <ItemGroup>
@@ -216,6 +221,11 @@
   <ItemGroup>
     <Resource Include="Images\activeIconSmall.png" />
     <Resource Include="Images\archiveIconSmall.png" />
+    <Resource Include="Images\assignmentAbortedIconSmall.png" />
+    <Resource Include="Images\assignmentActiveIconSmall.png" />
+    <Resource Include="Images\assignmentDoneIconSmall.png" />
+    <Resource Include="Images\assignmentFutureIconSmall.png" />
+    <Resource Include="Images\assignmentPostponedIconSmall.png" />
   </ItemGroup>
 
 </Project>