From 5ee4696c9a82fa23ec477c28b725af104abe90ef Mon Sep 17 00:00:00 2001
From: Roy Ben-Shabat <Roy@Twine-s.com>
Date: Wed, 2 May 2018 14:23:40 +0300
Subject: Worked on DeveloperConsole. Added some fields to VSTS work item.
 (resolved...) Resolved issue with application crash when trying to show
 notification before main window initialized. Added DeveloperConsole
 permission to DB. Added SetWorkItemAssignment to TFS client.

---
 .../Tango.MachineStudio.UI/Views/MainView.xaml      | 21 +++++++++++++--------
 .../Views/ReportIssueView.xaml                      |  4 ++--
 .../Views/ResolvedIssuesView.xaml                   | 19 +++++++++++++------
 3 files changed, 28 insertions(+), 16 deletions(-)

(limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views')

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
index 29bd70451..8417c70c8 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/MainView.xaml
@@ -10,9 +10,11 @@
              xmlns:controls="clr-namespace:Tango.SharedUI.Controls;assembly=Tango.SharedUI"
              xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
              xmlns:entities="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
+             xmlns:enumerations="clr-namespace:Tango.BL.Enumerations;assembly=Tango.BL"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:db="clr-namespace:Tango.MachineStudio.DB.Views;assembly=Tango.MachineStudio.DB"
              xmlns:local="clr-namespace:Tango.MachineStudio.UI.Views"
+             xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common"
              mc:Ignorable="d" 
              d:DesignHeight="720" d:DesignWidth="1270" Background="Transparent" DataContext="{Binding MainViewVM, Source={StaticResource Locator}}">
 
@@ -22,6 +24,7 @@
         <converters:NullObjectToBooleanConverter x:Key="NullObjectToBooleanConverter" />
         <converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
         <converters:StringToWordsConverter x:Key="StringToWordsConverter" />
+        <commonConverters:PermissionToVisibilityConverter x:Key="PermissionToVisibilityConverter" />
     </UserControl.Resources>
 
     <Grid>
@@ -189,14 +192,16 @@
                                         <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Speech</TextBlock>
                                     </StackPanel>
                                 </Button>
-                                <Separator/>
-                                <Button Command="{Binding OpenDeveloperConsoleCommand}">
-                                    <StackPanel Orientation="Horizontal">
-                                        <materialDesign:PackIcon Kind="Console" Width="24" Height="24" />
-                                        <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Developer Console</TextBlock>
-                                    </StackPanel>
-                                </Button>
-                                <Separator/>
+                                <StackPanel Visibility="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource PermissionToVisibilityConverter},ConverterParameter={x:Static enumerations:Permissions.RunDeveloperConsole}}">
+                                    <Separator/>
+                                    <Button Command="{Binding OpenDeveloperConsoleCommand}">
+                                        <StackPanel Orientation="Horizontal">
+                                            <materialDesign:PackIcon Kind="Console" Width="24" Height="24" />
+                                            <TextBlock Margin="5 0 0 0" VerticalAlignment="Center">Developer Console</TextBlock>
+                                        </StackPanel>
+                                    </Button>
+                                    <Separator/>
+                                </StackPanel>
                                 <Button Command="{Binding ExitCommand}">
                                     <StackPanel Orientation="Horizontal">
                                         <materialDesign:PackIcon Kind="CloseCircleOutline" Width="24" Height="24" />
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 25d2f2996..37cd0b793 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ReportIssueView.xaml
@@ -62,7 +62,7 @@
                             <materialDesign:PackIcon Kind="Tag" Width="24" Height="24" VerticalAlignment="Center" Margin="0 0 10 0" />
                             <TextBlock VerticalAlignment="Center"><Run>Tags</Run> <Run FontSize="10" Foreground="Gray">(highlight selected tags)</Run></TextBlock>
                         </DockPanel>
-                        <ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Height="120">
+                        <ScrollViewer Margin="30 0 0 0" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Height="120">
                             <ItemsControl ItemsSource="{Binding SelectedTags}">
                                 <ItemsControl.ItemsPanel>
                                     <ItemsPanelTemplate>
@@ -100,7 +100,7 @@
                                 <TextBlock VerticalAlignment="Center">Steps To Reproduce</TextBlock>
                             </DockPanel>
 
-                            <Grid>
+                            <Grid Margin="30 0 0 0">
                                 <TextBox Margin="0 5 0 0" Style="{x:Null}" BorderBrush="Silver" AcceptsReturn="True" TextWrapping="Wrap" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto" Text="{Binding WorkItem.StepsToReproduce}"></TextBox>
                             </Grid>
                         </DockPanel>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
index d70e57786..4fb457f87 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/ResolvedIssuesView.xaml
@@ -16,15 +16,22 @@
     <Grid>
         <Grid IsEnabled="{Binding IsAvailable}">
             <Grid.RowDefinitions>
-                <RowDefinition Height="90"/>
+                <RowDefinition Height="130"/>
                 <RowDefinition Height="1*"/>
                 <RowDefinition Height="200"/>
             </Grid.RowDefinitions>
 
             <Grid>
-                <StackPanel Orientation="Horizontal">
-                    <Image Source="/Images/bug-resolved.png" Width="48" RenderOptions.BitmapScalingMode="Fant"></Image>
-                    <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="20">Resolved Issues</TextBlock>
+                <StackPanel Margin="10">
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="/Images/bug-resolved.png" Width="48" RenderOptions.BitmapScalingMode="Fant"></Image>
+                        <TextBlock VerticalAlignment="Center" Margin="10 0 0 0" FontSize="20">Resolved Issues</TextBlock>
+                    </StackPanel>
+
+                    <TextBlock HorizontalAlignment="Left" Margin="10" TextWrapping="Wrap">
+                        Below you can find issues reported by you that have been flagged as resolved by the development team.
+                        Please verify each one and report back by pressing 'FIXED' or 'NOT FIXED'.
+                    </TextBlock>
                 </StackPanel>
             </Grid>
 
@@ -46,13 +53,13 @@
                                         <Button Background="#FF8282" BorderBrush="#FF8282" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.DeclineCommand}" CommandParameter="{Binding}">
                                             <StackPanel Orientation="Horizontal">
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Close" />
-                                                <TextBlock Margin="10 0 0 0" FontSize="11" VerticalAlignment="Center">DECLINE</TextBlock>
+                                                <TextBlock Margin="10 0 0 0" FontSize="11" VerticalAlignment="Center">NOT FIXED</TextBlock>
                                             </StackPanel>
                                         </Button>
                                         <Button Background="#91D66D" BorderBrush="#91D66D" Padding="0" Width="90" Command="{Binding RelativeSource={RelativeSource AncestorType=UserControl},Path=DataContext.ApproveCommand}" CommandParameter="{Binding}">
                                             <StackPanel Orientation="Horizontal">
                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Check" />
-                                                <TextBlock Margin="10 0 0 0" FontSize="11" VerticalAlignment="Center">APPROVE</TextBlock>
+                                                <TextBlock Margin="10 0 0 0" FontSize="11" VerticalAlignment="Center">FIXED</TextBlock>
                                             </StackPanel>
                                         </Button>
                                     </StackPanel>
-- 
cgit v1.3.1