1 files changed, 67 insertions, 1 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index 0882267e8..4c41c7860 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -148,6 +148,11 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// </summary>
         public RelayCommand ReportIssueCommand { get; set; }
 
+        /// <summary>
+        /// Gets or sets the open resolved bugs.
+        /// </summary>
+        public RelayCommand OpenResolvedBugsCommand { get; set; }
+
         private IAuthenticationProvider _authenticationProvider;
         /// <summary>
         /// Gets or sets the authentication provider.
@@ -302,6 +307,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             ResolveMachineEventCommand = new RelayCommand<MachinesEvent>(ResolveMachineEvent);
 
             ReportIssueCommand = new RelayCommand(ReportIssue);
+            OpenResolvedBugsCommand = new RelayCommand(OpenResolvedBugs);
         }
 
         private void MachineEventsStateProvider_EventsResolved(object sender, IEnumerable<MachinesEvent> e)
@@ -649,10 +655,70 @@ namespace Tango.MachineStudio.UI.ViewModels
              {
                  using (_notificationProvider.PushTaskItem("Uploading bug report..."))
                  {
-                     await TFSClient.UploadWorkItem(vm.WorkItem);
+                     try
+                     {
+                         TFSClient.FinalizeBug(vm.WorkItem);
+                         await TFSClient.UploadWorkItem(vm.WorkItem);
+                     }
+                     catch (Exception ex)
+                     {
+                         _notificationProvider.ShowError("An error occurred while trying to create the issue." + Environment.NewLine + ex.Message);
+                     }
                  }
 
              }, null);
         }
+
+        private void OpenResolvedBugs()
+        {
+            ResolvedIssuesViewVM vm = null;
+
+            vm = new ResolvedIssuesViewVM(TFSClient, async (item) =>
+            {
+                //Approve
+                using (_notificationProvider.PushTaskItem("Approving issue..."))
+                {
+                    vm.IsAvailable = false;
+                    try
+                    {
+                        await TFSClient.CloseWorkItem(item);
+                    }
+                    catch (Exception ex)
+                    {
+                        _notificationProvider.ShowError("An error occurred while trying to update the issue." + Environment.NewLine + ex.Message);
+                    }
+                    vm.IsAvailable = true;
+
+                    if (TFSClient.ResolvedWorkItems.Count == 0)
+                    {
+                        vm.Close();
+                    }
+                }
+            }, async (item) =>
+            {
+                //Decline
+                using (_notificationProvider.PushTaskItem("Reactivating issue..."))
+                {
+                    vm.IsAvailable = false;
+                    try
+                    {
+                        await TFSClient.ReactivateWorkItem(item);
+                    }
+                    catch (Exception ex)
+                    {
+                        _notificationProvider.ShowError("An error occurred while trying to update the issue." + Environment.NewLine + ex.Message);
+                    }
+
+                    vm.IsAvailable = true;
+
+                    if (TFSClient.ResolvedWorkItems.Count == 0)
+                    {
+                        vm.Close();
+                    }
+                }
+            });
+
+            _notificationProvider.ShowModalDialog<ResolvedIssuesViewVM, ResolvedIssuesView>(vm, (_) => { }, null);
+        }
     }
 }