GUI Back button. Return "Add new segment" in advance option view.

1 files changed, 34 insertions, 32 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
index 369544e9f..efa080561 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobEurekaView.xaml
@@ -210,15 +210,16 @@
         </DataTemplate>
 
         <DataTemplate x:Key="Segment_Template" DataType="{x:Type model:SegmentModel}">
-            <!--<Grid Height="410" Margin="57 15 57 0">-->
-            <Grid Height="310" Margin="57 10 57 0">
+            <Grid Height="410" Margin="57 15 57 0">
+            <!--<Grid Height="310" Margin="57 10 57 0">-->
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
-                    <RowDefinition Height="10" />
+                    <!--<RowDefinition Height="10" />-->
+                    <RowDefinition Height="1*" />
                 </Grid.RowDefinitions>
 
                 <DockPanel x:Name="header">
@@ -433,9 +434,9 @@
                     </ContentControl>
                    
                 </Grid>
-                <Rectangle Grid.Row="5" Fill="{StaticResource TangoDividerBrush}" Height="2" VerticalAlignment="Bottom"  Margin="0 0 0 0"/>
+                <!--<Rectangle Grid.Row="5" Fill="{StaticResource TangoDividerBrush}" Height="2" VerticalAlignment="Bottom"  Margin="0 0 0 0"/>-->
 
-                <!--<Grid Grid.Row="5" x:Name="add_new_segment_gap"  HorizontalAlignment="Stretch"  Margin="0 30 0 0" >
+                <Grid Grid.Row="5" x:Name="add_new_segment_gap"  HorizontalAlignment="Stretch"  Margin="0 30 0 0" >
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
@@ -464,19 +465,19 @@
                     </Border>
 
                     <DockPanel Margin="0 10 0 0" Grid.Row="1">
-                        --><!--<Grid DockPanel.Dock="Right" Visibility="{Binding IsLast, Converter={StaticResource BooleanToVisibilityInverseConverter}}">--><!--
-                            <Grid DockPanel.Dock="Right" Visibility="Collapsed">
-                        <touch:TouchButton x:Name="deletegap"  DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Command="{Binding DeleteGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityConverter}}">
-                            <TextBlock Margin="10 2 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Center">Delete Gap</TextBlock>
-                        </touch:TouchButton>
-                        <touch:TouchButton x:Name="addGap"  DockPanel.Dock="Right" HorizontalAlignment="Left" VerticalAlignment="Center"  Command="{Binding AddGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
-                            <StackPanel Orientation="Horizontal">
-                                <Border Height="35" Width="35"  BorderThickness="0" Background="Transparent" HorizontalAlignment="Left">
-                                    <Image Stretch="Fill"  RenderOptions.BitmapScalingMode="Fant" Source="../Images/JobView/add_gap.png"/>
-                                </Border>
-                                <TextBlock Margin="10 2 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Center">Add Gap</TextBlock>
-                            </StackPanel>
-                        </touch:TouchButton>
+                        <!--<Grid DockPanel.Dock="Right" Visibility="{Binding IsLast, Converter={StaticResource BooleanToVisibilityInverseConverter}}">-->
+                        <Grid DockPanel.Dock="Right" Visibility="Collapsed">
+                            <touch:TouchButton x:Name="deletegap"  DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Command="{Binding DeleteGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock Margin="10 2 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Center">Delete Gap</TextBlock>
+                            </touch:TouchButton>
+                            <touch:TouchButton x:Name="addGap"  DockPanel.Dock="Right" HorizontalAlignment="Left" VerticalAlignment="Center"  Command="{Binding AddGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                                <StackPanel Orientation="Horizontal">
+                                    <Border Height="35" Width="35"  BorderThickness="0" Background="Transparent" HorizontalAlignment="Left">
+                                        <Image Stretch="Fill"  RenderOptions.BitmapScalingMode="Fant" Source="../Images/JobView/add_gap.png"/>
+                                    </Border>
+                                    <TextBlock Margin="10 2 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Center">Add Gap</TextBlock>
+                                </StackPanel>
+                            </touch:TouchButton>
                         </Grid>
                         <touch:TouchButton DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Center"  Command="{Binding DataContext.AddNewSegmentCommand, ElementName=listSegments}" CommandParameter="{Binding }" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0">
                             <StackPanel Orientation="Horizontal">
@@ -489,17 +490,18 @@
                     </DockPanel>
 
                     <Rectangle Margin="0 10 0 0" Grid.Row="2" Stroke="{StaticResource TangoDividerBrush}"  StrokeThickness="1"  VerticalAlignment="Bottom"/>
-                </Grid>-->
+                </Grid>
             </Grid>
         </DataTemplate>
 
         <DataTemplate x:Key="GroupSegment_Template" DataType="{x:Type model:SegmentsGroupModel}">
-            <Grid Height="310" Margin="57 10 57 0">
+            <!--<Grid Height="310" Margin="57 10 57 0">-->
+            <Grid Height="400" Margin="57 15 57 0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
                     <RowDefinition Height="1*" />
-                    <!--<RowDefinition Height="1*" />-->
-                    <RowDefinition Height="10" />
+                    <!--<RowDefinition Height="10" />-->
                 </Grid.RowDefinitions>
 
                 <DockPanel>
@@ -578,9 +580,9 @@
                         </Border>
                     </Grid>
                 </Border>
-                <Rectangle Grid.Row="2" Fill="{StaticResource TangoDividerBrush}" Height="2" VerticalAlignment="Bottom"  Margin="0 0 0 0"/>
+                <!--<Rectangle Grid.Row="2" Fill="{StaticResource TangoDividerBrush}" Height="2" VerticalAlignment="Bottom"  Margin="0 0 0 0"/>-->
 
-                <!--<Grid Grid.Row="2" x:Name="add_new_segment_gap"  HorizontalAlignment="Stretch"  Margin="0 30 0 0" >
+                <Grid Grid.Row="2" x:Name="add_new_segment_gap"  HorizontalAlignment="Stretch"  Margin="0 30 0 0" >
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="1*"/>
@@ -609,20 +611,20 @@
                     </Border>
 
                     <DockPanel Margin="0 10 0 0" Grid.Row="1">
-                        --><!--<Grid DockPanel.Dock="Right" Visibility="{Binding IsLast, Converter={StaticResource BooleanToVisibilityInverseConverter}}">-->
-                        <!--<Grid DockPanel.Dock="Right" Visibility="Collapsed">-->
-                            <!--<touch:TouchButton x:Name="deletegap"  DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Command="{Binding DeleteGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <!--<Grid DockPanel.Dock="Right" Visibility="{Binding IsLast, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                        <Grid DockPanel.Dock="Right" Visibility="Collapsed">
+                            <touch:TouchButton x:Name="deletegap"  DockPanel.Dock="Right" HorizontalAlignment="Right" VerticalAlignment="Center" Command="{Binding DeleteGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityConverter}}">
                                 <TextBlock Margin="10 2 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Center">Delete Gap</TextBlock>
-                            </touch:TouchButton>-->
-                            <!--<touch:TouchButton x:Name="addGap"  DockPanel.Dock="Right" HorizontalAlignment="Left" VerticalAlignment="Center"  Command="{Binding AddGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
+                            </touch:TouchButton>
+                            <touch:TouchButton x:Name="addGap"  DockPanel.Dock="Right" HorizontalAlignment="Left" VerticalAlignment="Center"  Command="{Binding AddGapCommand}" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0" Visibility="{Binding EnableInterSegment, Converter={StaticResource BooleanToVisibilityInverseConverter}}">
                                 <StackPanel Orientation="Horizontal">
                                     <Border Height="35" Width="35"  BorderThickness="0" Background="Transparent" HorizontalAlignment="Left">
                                         <Image Stretch="Fill"  RenderOptions.BitmapScalingMode="Fant" Source="../Images/JobView/add_gap.png"/>
                                     </Border>
                                     <TextBlock Margin="10 2 0 0" FontSize="{StaticResource TangoButtonFontSize}" VerticalAlignment="Center">Add Gap</TextBlock>
                                 </StackPanel>
-                            </touch:TouchButton>-->
-                        <!--</Grid>--><!--
+                            </touch:TouchButton>
+                        </Grid>-->
                         <touch:TouchButton DockPanel.Dock="Left" HorizontalAlignment="Left" VerticalAlignment="Center"  Command="{Binding DataContext.AddNewSegmentCommand, ElementName=listSegments}" CommandParameter="{Binding }" EnableDropShadow="False" Foreground="{StaticResource TangoKeyboardKeyDarkTextBrush}"   Background="Transparent" BorderThickness="0">
                             <StackPanel Orientation="Horizontal">
                                 <Border Height="35" Width="35"  BorderThickness="0" Background="Transparent" HorizontalAlignment="Left">
@@ -634,7 +636,7 @@
                     </DockPanel>
 
                     <Rectangle Margin="0 10 0 0" Grid.Row="2" Stroke="{StaticResource TangoDividerBrush}"  StrokeThickness="1"  VerticalAlignment="Bottom"/>
-                </Grid>-->
+                </Grid>
 
                 <Rectangle Margin="0 10 0 0" Grid.Row="2" Stroke="{StaticResource TangoDividerBrush}"  StrokeThickness="1"  VerticalAlignment="Bottom"/>
             </Grid>