Fixed and improved bug reporting in machine studio.

2 files changed, 39 insertions, 11 deletions

diff --git a/Software/Visual_Studio/Tango.TFS/Area.cs b/Software/Visual_Studio/Tango.TFS/Area.cs
index a79f9c0f1..956cbe8cf 100644
--- a/Software/Visual_Studio/Tango.TFS/Area.cs
+++ b/Software/Visual_Studio/Tango.TFS/Area.cs
@@ -10,5 +10,16 @@ namespace Tango.TFS
     {
         public String Name { get; set; }
         public String Path { get; set; }
+        public List<Area> SubAreas { get; set; }
+
+        public Area()
+        {
+            SubAreas = new List<Area>();
+        }
+
+        public override string ToString()
+        {
+            return Name;
+        }
     }
 }
diff --git a/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs b/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs
index 5665caf3c..5c4746567 100644
--- a/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs
+++ b/Software/Visual_Studio/Tango.TFS/TeamFoundationServiceClient.cs
@@ -162,15 +162,14 @@ namespace Tango.TFS
                     p.UserStories.Add(story);
                 }
 
-                p.Areas.Add(new Area() { Name = project.Name, Path = project.Name });
+                var mainArea = new Area() { Name = project.Name, Path = project.Name };
+                p.Areas.Add(mainArea);
 
                 foreach (var area in store.Projects[project.Name].AreaRootNodes.OfType<Node>())
                 {
-                    p.Areas.Add(new Area()
-                    {
-                        Name = area.Name,
-                        Path = area.Path,
-                    });
+                    Area a = new Area();
+                    FillArea(a, area);
+                    mainArea.SubAreas.Add(a);
                 }
 
                 foreach (var iteration in store.Projects[project.Name].IterationRootNodes.OfType<Node>())
@@ -186,6 +185,21 @@ namespace Tango.TFS
             });
         }
 
+        private Area FillArea(Area area, Node node)
+        {
+            area.Name = node.Name;
+            area.Path = node.Path;
+
+            foreach (var child in node.ChildNodes.OfType<Node>())
+            {
+                var subArea = new Area();
+                FillArea(subArea, child);
+                area.SubAreas.Add(subArea);
+            }
+
+            return area;
+        }
+
         /// <summary>
         /// Uploads a work item to the specified team project.
         /// </summary>
@@ -230,12 +244,15 @@ namespace Tango.TFS
                     });
                 }
 
-                patchDocument.Add(new JsonPatchOperation
+                if (workItem.Iteration != null)
                 {
-                    Operation = Operation.Add,
-                    Path = GetFieldNameForWrite(CoreField.IterationPath),
-                    Value = workItem.Iteration.Path,
-                });
+                    patchDocument.Add(new JsonPatchOperation
+                    {
+                        Operation = Operation.Add,
+                        Path = GetFieldNameForWrite(CoreField.IterationPath),
+                        Value = workItem.Iteration.Path,
+                    });
+                }
 
                 patchDocument.Add(new JsonPatchOperation
                 {