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

1 files changed, 50 insertions, 55 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
index 4fba0cc0b..1057f7c84 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/JobView.xaml
@@ -20,6 +20,7 @@
              xmlns:vm="clr-namespace:Tango.MachineStudio.Developer.ViewModels"
              xmlns:localConverters="clr-namespace:Tango.MachineStudio.Developer.Converters"
              xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI"
+             xmlns:commonConverters="clr-namespace:Tango.MachineStudio.Common.Converters;assembly=Tango.MachineStudio.Common"
              xmlns:observables="clr-namespace:Tango.BL.Entities;assembly=Tango.BL"
              xmlns:editors="clr-namespace:Tango.SharedUI.Editors;assembly=Tango.SharedUI"
              xmlns:video="clr-namespace:Tango.Video.DirectCapture;assembly=Tango.Video"
@@ -73,6 +74,8 @@
         <converters:ObjectToObjectTypeConverter x:Key="ObjectToObjectTypeConverter" />
         <converters:MathOperatorConverter x:Key="MathOperatorConverter" />
         <localConverters:LiquidVolumesToLubricantLiquidVolume x:Key="LiquidVolumesToLubricantLiquidVolume" />
+        <commonConverters:UserRoleToVisibilityConverter x:Key="UserRoleToVisibilityConverter" />
+        <commonConverters:UserRoleToBooleanConverter x:Key="UserRoleToBooleanConverter" />
 
 
         <ObjectDataProvider x:Key="dispenserDivisions" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
@@ -321,7 +324,7 @@
                 </Border>
             </StackPanel>
         </DataTemplate>
-        
+
         <DataTemplate x:Key="RGB_Template">
             <StackPanel>
                 <StackPanel Orientation="Horizontal">
@@ -426,7 +429,7 @@
                 <ContentControl Style="{StaticResource colorPicker}"></ContentControl>
             </StackPanel>
         </DataTemplate>
-        
+
     </UserControl.Resources>
 
     <Grid>
@@ -496,7 +499,7 @@
                                 </StackPanel>
                             </Border>
 
-                            <controls:MultiSelectListBox FocusVisualStyle="{x:Null}" x:Name="listBoxSegments" MouseEnter="listBoxSegments_MouseEnter" PreviewMouseDown="listBoxSegments_PreviewMouseDown" AutomationProperties.AutomationId="{x:Static automation:Developer.SegmentsListBox}" Style="{StaticResource {x:Type ListBox}}" SelectionMode="Extended" SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SegmentsCollectionView}" SelectedItem="{Binding SelectedSegment}" SelectedItemsList="{Binding SelectedSegments,Mode=TwoWay}" HorizontalContentAlignment="Stretch">
+                            <controls:MultiSelectListBox FocusVisualStyle="{x:Null}" x:Name="listBoxSegments" MouseEnter="listBoxSegments_MouseEnter" PreviewMouseDown="listBoxSegments_PreviewMouseDown" AutomationProperties.AutomationId="{x:Static automation:Developer.SegmentsListBox}" Style="{StaticResource {x:Type ListBox}}" SelectionMode="Extended" SelectionChanged="ListBox_SelectionChanged" ItemsSource="{Binding SegmentsCollectionView}" SelectedItem="{Binding SelectedSegment}" SelectedItemsList="{Binding SelectedSegments,Mode=TwoWay}" HorizontalContentAlignment="Stretch" Padding="0 0 0 0">
                                 <ListBox.ItemContainerStyle>
                                     <Style TargetType="ListBoxItem" BasedOn="{StaticResource basicListBoxItem}">
                                         <EventSetter Event="PreviewMouseDown" Handler="ListBoxItem_PreviewMouseDown"></EventSetter>
@@ -505,7 +508,7 @@
                                 <ListBox.ItemTemplate>
                                     <DataTemplate>
                                         <Grid Margin="5 10" Style="{StaticResource draggableDroppableGrid}" dragAndDrop:DragAndDropService.Drop="OnSegmentDrop">
-                                            <Polygon Points="40,0 290,0 290,100 0,100 0,30" StrokeThickness="0.2" IsHitTestVisible="False">
+                                            <Polygon Points="40,0 290,0 290,100 0,100 0,30" StrokeThickness="0.2" IsHitTestVisible="False" Stretch="Fill">
                                                 <Polygon.Effect>
                                                     <DropShadowEffect Opacity="0.5" />
                                                 </Polygon.Effect>
@@ -539,7 +542,7 @@
                                             <Border Height="100" Padding="5" IsHitTestVisible="False">
                                                 <Grid>
                                                     <Rectangle VerticalAlignment="Bottom" Height="8" Fill="{Binding SegmentBrush}">
- 
+
                                                     </Rectangle>
                                                 </Grid>
                                             </Border>
@@ -748,11 +751,11 @@
                                                                 </StackPanel>
                                                             </Border>
 
-                                                            <Grid Margin="0 0 0 0">
+                                                            <Grid Margin="20 10 0 0">
                                                                 <StackPanel>
                                                                     <TextBlock>MEDIA</TextBlock>
                                                                     <StackPanel Orientation="Horizontal" DockPanel.Dock="Left">
-                                                                        <ComboBox Width="200" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
+                                                                        <ComboBox Width="250" ItemsSource="{Binding Rmls}" SelectedItem="{Binding SelectedRML}">
                                                                             <ComboBox.ItemTemplate>
                                                                                 <DataTemplate>
                                                                                     <StackPanel>
@@ -763,12 +766,12 @@
                                                                             </ComboBox.ItemTemplate>
                                                                         </ComboBox>
 
-                                                                        <Button  Margin="20 30 0 0" Command="{Binding EditRMLCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}">
+                                                                        <!--<Button  Margin="20 30 0 0" Command="{Binding EditRMLCommand}" HorizontalAlignment="Right" Style="{StaticResource MaterialDesignFlatButton}">
                                                                             <StackPanel Orientation="Horizontal">
                                                                                 <materialDesign:PackIcon VerticalAlignment="Center" Kind="Pencil"></materialDesign:PackIcon>
                                                                                 <TextBlock Margin="10 0 0 0">EDIT MEDIA</TextBlock>
                                                                             </StackPanel>
-                                                                        </Button>
+                                                                        </Button>-->
 
 
 
@@ -784,56 +787,48 @@
 
                                                         <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal" Margin="0 40 40 0">
                                                             <materialDesign:PackIcon Kind="ChevronLeft" Width="24" Height="24" />
-                                                            <TextBlock  Margin="10 -2 10 0" VerticalAlignment="Center"><Run>RML LIQUID FACTORS</Run> <Run FontSize="10"  Foreground="DimGray">( Max Nanolitter/CM )</Run></TextBlock>
+                                                            <TextBlock  Margin="10 -2 10 0" VerticalAlignment="Center"><Run>SUPPORTED MEDIA LIQUID</Run> <Run FontSize="10"  Foreground="DimGray">( Max Nanolitter/CM )</Run></TextBlock>
                                                             <materialDesign:PackIcon Kind="ChevronRight" Width="24" Height="24" />
                                                         </StackPanel>
 
-                                                        <Grid HorizontalAlignment="Right" Margin="0 0 0 0">
-                                                            <Grid>
-                                                                <DockPanel>
-                                                                    <Grid>
-                                                                        <StackPanel HorizontalAlignment="Right" Margin="0 0 0 0">
-                                                                            <StackPanel Margin="0 10 0 0"  Orientation="Horizontal" VerticalAlignment="Center">
-                                                                                <ItemsControl ItemsSource="{Binding LiquidTypesRmls}">
-                                                                                    <ItemsControl.ItemsPanel>
-                                                                                        <ItemsPanelTemplate>
-                                                                                            <WrapPanel IsItemsHost="True"></WrapPanel>
-                                                                                        </ItemsPanelTemplate>
-                                                                                    </ItemsControl.ItemsPanel>
-                                                                                    <ItemsControl.ItemTemplate>
-                                                                                        <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
-                                                                                            <StackPanel Margin="0 0 10 0">
-                                                                                                <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="DimGray" Text="{Binding LiquidType.Name}"></TextBlock>
-                                                                                                <Grid Width="58" Height="48" Margin="0 5 0 0">
-                                                                                                    <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
-                                                                                                        <shapes:Hexagon.Fill>
-                                                                                                            <LinearGradientBrush Opacity="0.7" >
-                                                                                                                <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
-                                                                                                                <GradientStop Color="White" Offset="1"/>
-                                                                                                            </LinearGradientBrush>
-                                                                                                        </shapes:Hexagon.Fill>
-                                                                                                    </shapes:Hexagon>
+                                                        <Grid HorizontalAlignment="Right" Margin="0 0 0 0" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
+                                                            <StackPanel HorizontalAlignment="Right" Margin="0 0 0 0">
+                                                                <StackPanel Margin="0 10 0 0"  Orientation="Horizontal" VerticalAlignment="Center">
+                                                                    <ItemsControl ItemsSource="{Binding LiquidTypesRmls}">
+                                                                        <ItemsControl.ItemsPanel>
+                                                                            <ItemsPanelTemplate>
+                                                                                <WrapPanel IsItemsHost="True"></WrapPanel>
+                                                                            </ItemsPanelTemplate>
+                                                                        </ItemsControl.ItemsPanel>
+                                                                        <ItemsControl.ItemTemplate>
+                                                                            <DataTemplate DataType="{x:Type observables:LiquidTypesRml}">
+                                                                                <StackPanel Margin="0 0 10 0">
+                                                                                    <TextBlock HorizontalAlignment="Center" FontSize="10" Foreground="DimGray" Text="{Binding LiquidType.Name}"></TextBlock>
+                                                                                    <Grid Width="58" Height="48" Margin="0 5 0 0">
+                                                                                        <shapes:Hexagon StrokeThickness="1" Stroke="Gray">
+                                                                                            <shapes:Hexagon.Fill>
+                                                                                                <LinearGradientBrush Opacity="0.7" >
+                                                                                                    <GradientStop Color="{Binding LiquidType.Color,Converter={StaticResource ColorToIntegerConverter}}"/>
+                                                                                                    <GradientStop Color="White" Offset="1"/>
+                                                                                                </LinearGradientBrush>
+                                                                                            </shapes:Hexagon.Fill>
+                                                                                        </shapes:Hexagon>
 
-                                                                                                    <TextBox Style="{x:Null}" Background="Transparent" Foreground="Black" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic"></TextBox>
-                                                                                                </Grid>
-                                                                                            </StackPanel>
-                                                                                        </DataTemplate>
-                                                                                    </ItemsControl.ItemTemplate>
-                                                                                </ItemsControl>
+                                                                                        <TextBox Style="{x:Null}" Background="Transparent" Foreground="Black" BorderThickness="0" Text="{Binding MaxNlPerCm}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" FontWeight="Bold" FontStyle="Italic"></TextBox>
+                                                                                    </Grid>
+                                                                                </StackPanel>
+                                                                            </DataTemplate>
+                                                                        </ItemsControl.ItemTemplate>
+                                                                    </ItemsControl>
 
-                                                                                <Button Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Margin="0 20 0 0" Style="{StaticResource MaterialDesignFlatButton}">
-                                                                                    <StackPanel Orientation="Horizontal">
-                                                                                        <materialDesign:PackIcon VerticalAlignment="Center" Kind="Harddisk"></materialDesign:PackIcon>
-                                                                                        <TextBlock Margin="10 0 0 0">SAVE FACTORS</TextBlock>
-                                                                                    </StackPanel>
-                                                                                </Button>
-                                                                            </StackPanel>
+                                                                    <Button Command="{Binding SaveLiquidFactorsCommand}" HorizontalAlignment="Right" Margin="0 20 0 0" Style="{StaticResource MaterialDesignFlatButton}">
+                                                                        <StackPanel Orientation="Horizontal">
+                                                                            <materialDesign:PackIcon VerticalAlignment="Center" Kind="Harddisk"></materialDesign:PackIcon>
+                                                                            <TextBlock Margin="10 0 0 0">SAVE FACTORS</TextBlock>
                                                                         </StackPanel>
-
-
-                                                                    </Grid>
-                                                                </DockPanel>
-                                                            </Grid>
+                                                                    </Button>
+                                                                </StackPanel>
+                                                            </StackPanel>
                                                         </Grid>
                                                     </Grid>
                                                 </Grid>
@@ -965,7 +960,7 @@
                                                                                                 <TextBlock Width="180" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16">
                                                                                                                 <Run FontWeight="Bold" FontStyle="Italic" Text="OFFSET:" Foreground="#5E5E5E"></Run> 
                                                                                                                 <Run FontFamily="{StaticResource digital-7}" Text="{Binding OffsetPercent,StringFormat={}{0:F1}%}"></Run>
-                                                                                                                <Run Foreground="Gray" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
+                                                                                                                <Run FontSize="12" Foreground="Gray" Text="{Binding OffsetMeters,Mode=OneWay,StringFormat={}   ( {0:F1}m )}"></Run>
                                                                                                 </TextBlock>
                                                                                                 <Slider ValueChanged="Offset_Slider_ValueChanged" Style="{StaticResource GradientOffsetSlider}" SmallChange="0.1" IsSnapToTickEnabled="True" TickFrequency="0.1" Margin="0 20 0 0" HorizontalAlignment="Center" Width="300" Value="{Binding OffsetPercent}" IsEnabled="{Binding IsMiddle}">
                                                                                                     <Slider.Foreground>
@@ -1529,7 +1524,7 @@
                                                         TEMP OFF
                                                     </TextBlock>
                                                 </Button>
-                                                <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left">
+                                                <Button Height="40" Command="{Binding SaveProcessParametersCommand}" HorizontalAlignment="Left" IsEnabled="{Binding AuthenticationProvider.CurrentUser,Converter={StaticResource UserRoleToBooleanConverter},ConverterParameter='Researcher'}">
                                                     <StackPanel Orientation="Horizontal">
                                                         <materialDesign:PackIcon VerticalAlignment="Center" Kind="ContentSave"></materialDesign:PackIcon>
                                                         <TextBlock Margin="10 0 0 0">SAVE PARAMETERS</TextBlock>