Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

2 files changed, 57 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
index 7387c4ae5..5f5e1042b 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -35,7 +35,7 @@
                 </StackPanel>
             </Grid>
 
-            <Grid Grid.Row="1">
+            <Grid Grid.Row="1" Focusable="True">
                 <DockPanel>
                     <StackPanel DockPanel.Dock="Top">
                         <DockPanel>
@@ -50,7 +50,28 @@
 
                         <DockPanel Margin="0 10 0 0">
                             <materialDesign:PackIcon Kind="Star" Width="24" Height="24" VerticalAlignment="Center" Margin="0 0 10 0" />
-                            <ComboBox materialDesign:HintAssist.Hint="Area" materialDesign:HintAssist.IsFloating="True" ItemsSource="{Binding Project.Areas}" SelectedItem="{Binding WorkItem.Area}" DisplayMemberPath="Name"></ComboBox>
+                            <Grid>
+                                <TextBox IsReadOnly="True" materialDesign:HintAssist.Hint="Area" materialDesign:HintAssist.IsFloating="True"  Text="{Binding WorkItem.Area.Name}" VerticalAlignment="Bottom" Margin="0 0 0 3"></TextBox>
+                                <ToggleButton x:Name="toggleArea">
+                                    <ToggleButton.Template>
+                                        <ControlTemplate TargetType="ToggleButton">
+                                            <Grid Background="Transparent">
+                                                <Popup Height="200" AllowsTransparency="True" Width="{TemplateBinding ActualWidth}" PopupAnimation="Slide" IsOpen="{Binding IsChecked, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+                                                    <Border Background="White" Margin="0 2 0 0" BorderBrush="Silver" BorderThickness="1" CornerRadius="3">
+                                                        <TreeView Loaded="TreeView_Loaded" ItemsSource="{Binding Project.Areas}" SelectedItemChanged="TreeView_SelectedItemChanged">
+                                                            <TreeView.ItemTemplate>
+                                                                <HierarchicalDataTemplate ItemsSource="{Binding SubAreas}">
+                                                                    <TextBlock Text="{Binding Name}" />
+                                                                </HierarchicalDataTemplate>
+                                                            </TreeView.ItemTemplate>
+                                                        </TreeView>
+                                                    </Border>
+                                                </Popup>
+                                            </Grid>
+                                        </ControlTemplate>
+                                    </ToggleButton.Template>
+                                </ToggleButton>
+                            </Grid>
                         </DockPanel>
 
                         <DockPanel Margin="0 10 0 0">
@@ -101,7 +122,7 @@
                             <TextBox IsReadOnly="True" Text="{Binding ImageFile}"></TextBox>
                         </DockPanel>
                     </StackPanel>
-                    
+
 
                     <Grid>
                         <DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs
index 72bef1205..e17ed7d93 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml.cs
@@ -12,6 +12,8 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Tango.MachineStudio.UI.ViewModels;
+using Tango.TFS;
 
 namespace Tango.MachineStudio.UI.Views
 {
@@ -20,16 +22,47 @@ namespace Tango.MachineStudio.UI.Views
     /// </summary>
     public partial class ReportIssueView : UserControl
     {
+        private ReportIssueViewVM _vm;
+
         public ReportIssueView()
         {
             InitializeComponent();
 
             this.Loaded += ReportIssueView_Loaded;
+            this.DataContextChanged += ReportIssueView_DataContextChanged;
+        }
+
+        private void ReportIssueView_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            _vm = this.DataContext as ReportIssueViewVM;
         }
 
         private void ReportIssueView_Loaded(object sender, RoutedEventArgs e)
         {
             txt_title.Focus();
         }
+
+        private void TreeView_SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
+        {
+            _vm.WorkItem.Area = e.NewValue as Area;
+            toggleArea.IsChecked = false;
+        }
+
+        private TreeView tree;
+
+        private void TreeView_Loaded(object sender, RoutedEventArgs e)
+        {
+            tree = sender as TreeView;
+            tree.ItemContainerGenerator.StatusChanged += ItemContainerGenerator_StatusChanged;
+        }
+
+        private void ItemContainerGenerator_StatusChanged(object sender, EventArgs e)
+        {
+            if (tree.ItemContainerGenerator.Status == System.Windows.Controls.Primitives.GeneratorStatus.ContainersGenerated)
+            {
+                TreeViewItem i = tree.ItemContainerGenerator.ContainerFromIndex(0) as TreeViewItem;
+                i.IsExpanded = true;
+            }
+        }
     }
 }