From 57a2806b7d5fe6f5656136258714201d60d9bfe4 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Tue, 4 Aug 2020 16:23:28 +0300
Subject: Fixed issue with PPC exit job view before job loading completes
 causing an error message. Fixed job view "job length" field not scrolling
 when focused because of virtualization.

---
 .../Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs |  9 ++-
 .../PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml  | 76 +++++++++++-----------
 2 files changed, 41 insertions(+), 44 deletions(-)

(limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs')

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
index 665847081..80fd4b0fd 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/JobViewVM.cs
@@ -546,6 +546,7 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             catch (Exception ex)
             {
+                IsFree = true;
                 LogManager.Log(ex, $"Error loading job '{(_job_to_load != null ? _job_to_load.Name : "null")}'");
                 await NotificationProvider.ShowError("An error occurred while trying to load the selected job.");
                 _can_navigate_back = true;
@@ -553,11 +554,7 @@ namespace Tango.PPC.Jobs.ViewModels
             }
             finally
             {
-                InvokeUI(() =>
-                {
-                    IsFree = true;
-                    //NotificationProvider.ReleaseGlobalBusyMessage();
-                });
+                IsFree = true;
             }
         }
 
@@ -1427,6 +1424,8 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             bool result = true;
 
+            if (!IsFree) return false;
+
             if (!_can_navigate_back)
             {
                 bool jobChainged = false;
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
index 6aac6e692..85e8a5539 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobView.xaml
@@ -718,57 +718,55 @@
                                         </touch:TouchDropShadowBorder>
                                     </touch:TouchVirtualizedContentControl>
 
-                                    <touch:TouchVirtualizedContentControl Margin="0 20 0 0" >
-                                        <touch:TouchDropShadowBorder Padding="0 0 0 50">
-                                            <StackPanel>
-                                                <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
-                                                    <Image Source="../Images/JobView/job-summary.png" Width="39" />
-                                                    <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Summary</TextBlock>
-                                                </StackPanel>
+                                    <touch:TouchDropShadowBorder Padding="0 20 0 50">
+                                        <StackPanel>
+                                            <StackPanel Orientation="Horizontal" VerticalAlignment="Center"  Style="{StaticResource Level1Container}">
+                                                <Image Source="../Images/JobView/job-summary.png" Width="39" />
+                                                <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoExpanderHeaderFontSize}">Job Summary</TextBlock>
+                                            </StackPanel>
 
-                                                <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
-                                                    <Grid>
-                                                        <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="40"/>
-                                                    </Grid>
+                                            <StackPanel Style="{StaticResource Level2ContainerExtraMargin}">
+                                                <Grid>
+                                                    <localControls:JobSummeryViewer DataContext="{Binding Job,IsAsync=True}" Height="40"/>
+                                                </Grid>
 
-                                                    <DockPanel Margin="0 30 0 0" LastChildFill="False">
+                                                <DockPanel Margin="0 30 0 0" LastChildFill="False">
 
-                                                        <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" VerticalAlignment="Center">
-                                                            <TextBlock>
+                                                    <StackPanel Orientation="Horizontal" DockPanel.Dock="Left" VerticalAlignment="Center">
+                                                        <TextBlock>
                                                     <Run Text="Job length (m):"></Run>
                                                     <Run Text="{Binding Job.Length,Mode=OneWay}"></Run>
-                                                            </TextBlock>
-                                                            <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
-                                                                <TextBlock.Style>
-                                                                    <Style TargetType="TextBlock">
-                                                                        <Setter Property="Visibility" Value="Collapsed"></Setter>
-                                                                        <Style.Triggers>
-                                                                            <DataTrigger Binding="{Binding Job.LengthPercentageFactor,Converter={StaticResource GreaterThanToBooleanConverter},ConverterParameter=0}" Value="True">
-                                                                                <Setter Property="Visibility" Value="Visible"></Setter>
-                                                                            </DataTrigger>
-                                                                        </Style.Triggers>
-                                                                    </Style>
-                                                                </TextBlock.Style>
+                                                        </TextBlock>
+                                                        <TextBlock Foreground="{StaticResource TangoGrayTextBrush}">
+                                                            <TextBlock.Style>
+                                                                <Style TargetType="TextBlock">
+                                                                    <Setter Property="Visibility" Value="Collapsed"></Setter>
+                                                                    <Style.Triggers>
+                                                                        <DataTrigger Binding="{Binding Job.LengthPercentageFactor,Converter={StaticResource GreaterThanToBooleanConverter},ConverterParameter=0}" Value="True">
+                                                                            <Setter Property="Visibility" Value="Visible"></Setter>
+                                                                        </DataTrigger>
+                                                                    </Style.Triggers>
+                                                                </Style>
+                                                            </TextBlock.Style>
                                                     <Run>(</Run><Run Text="{Binding Job.Length,Mode=OneWay}"></Run><Run>+</Run><Run Text="{Binding Job.LengthPercentageFactor,Mode=OneWay}"></Run><Run>%</Run><Run>)</Run>
-                                                            </TextBlock>
-                                                        </StackPanel>
+                                                        </TextBlock>
+                                                    </StackPanel>
 
-                                                        <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 -20 5 0">
-                                                            <TextBlock Margin="0 3 0 0" Foreground="{StaticResource TangoGrayTextBrush}" VerticalAlignment="Bottom">
+                                                    <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0 -20 5 0">
+                                                        <TextBlock Margin="0 3 0 0" Foreground="{StaticResource TangoGrayTextBrush}" VerticalAlignment="Bottom">
                                                     <Run Text="Factor: +"></Run>
-                                                            </TextBlock>
+                                                        </TextBlock>
 
-                                                            <touch:TouchNumericTextBox Foreground="{StaticResource TangoGrayTextBrush}" Margin="5 0 0 0" Width="50" HorizontalContentAlignment="Center" Maximum="100" Minimum="0" Value="{Binding Job.LengthPercentageFactor}" KeyboardContainer="{Binding ElementName=Container}" StringFormat="0" FocusSelectionMode="SelectAll" />
+                                                        <touch:TouchNumericTextBox Foreground="{StaticResource TangoGrayTextBrush}" Margin="5 0 0 0" Width="50" HorizontalContentAlignment="Center" Maximum="100" Minimum="0" Value="{Binding Job.LengthPercentageFactor}" KeyboardContainer="{Binding ElementName=Container}" StringFormat="0" FocusSelectionMode="SelectAll" />
 
-                                                            <TextBlock VerticalAlignment="Bottom" Foreground="{StaticResource TangoGrayTextBrush}">%</TextBlock>
+                                                        <TextBlock VerticalAlignment="Bottom" Foreground="{StaticResource TangoGrayTextBrush}">%</TextBlock>
 
-                                                            <Image Margin="10 0 0 0" Source="../Images/JobView/settings.png" VerticalAlignment="Bottom" />
-                                                        </StackPanel>
-                                                    </DockPanel>
-                                                </StackPanel>
+                                                        <Image Margin="10 0 0 0" Source="../Images/JobView/settings.png" VerticalAlignment="Bottom" />
+                                                    </StackPanel>
+                                                </DockPanel>
                                             </StackPanel>
-                                        </touch:TouchDropShadowBorder>
-                                    </touch:TouchVirtualizedContentControl>
+                                        </StackPanel>
+                                    </touch:TouchDropShadowBorder>
 
                                     <StackPanel HorizontalAlignment="Center" Margin="20 40 0 40" Orientation="Horizontal" VerticalAlignment="Center" Style="{StaticResource Level1Container}">
                                         <TextBlock FontWeight="Medium" Margin="20 0 0 0" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Additional Tools</TextBlock>
-- 
cgit v1.3.1