merge

12 files changed, 52 insertions, 22 deletions

diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml
index 51388a93f..db526419f 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml
@@ -22,6 +22,6 @@
             </touch:TouchNavigationLinks>
         </Grid>
 
-        <controls:CoatsCatalogControl x:Name="catalogControl" Grid.Row="1" DataContext="{Binding RelativeSource={RelativeSource AncestorType=local:CoatsCatalogViewer},Path=Catalog}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=local:CoatsCatalogViewer},Path=SelectedItem,Mode=TwoWay}" />
+        <controls:CoatsCatalogControl x:Name="catalogControl" Grid.Row="1" DataContext="{Binding RelativeSource={RelativeSource AncestorType=local:CoatsCatalogViewer},Path=Catalog,Mode=TwoWay}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=local:CoatsCatalogViewer},Path=SelectedItem,Mode=TwoWay}" />
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml.cs
index d69066e4e..573d90d45 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/CoatsCatalogViewer.xaml.cs
@@ -75,6 +75,7 @@ namespace Tango.PPC.Jobs.Controls
             if (Filter == "CATALOG" && _originalCatalog != null)
             {
                 Catalog = _originalCatalog;
+                _originalCatalog = null;
             }
             else if (Filter == "RECENT")
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml
index de1bbea0b..dff1202d8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml
@@ -22,6 +22,6 @@
             </touch:TouchNavigationLinks>
         </Grid>
 
-        <controls:TwineCatalogControl x:Name="catalogControl" Grid.Row="1" DataContext="{Binding RelativeSource={RelativeSource AncestorType=local:TwineCatalogViewer},Path=Catalog}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=local:TwineCatalogViewer},Path=SelectedItem,Mode=TwoWay}" />
+        <controls:TwineCatalogControl x:Name="catalogControl" Grid.Row="1" DataContext="{Binding RelativeSource={RelativeSource AncestorType=local:TwineCatalogViewer},Path=Catalog,Mode=TwoWay}" SelectedItem="{Binding RelativeSource={RelativeSource AncestorType=local:TwineCatalogViewer},Path=SelectedItem,Mode=TwoWay}" />
     </Grid>
 </UserControl>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml.cs
index 7d504428f..a84e29bd2 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Controls/TwineCatalogViewer.xaml.cs
@@ -77,6 +77,7 @@ namespace Tango.PPC.Jobs.Controls
             if (Filter == "CATALOG" && _originalCatalog != null)
             {
                 Catalog = _originalCatalog;
+                _originalCatalog = null;
             }
             else if (Filter == "RECENT")
             {
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/CoatsCatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/CoatsCatalogViewVM.cs
index 23945e84b..ebeb5b704 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/CoatsCatalogViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/CoatsCatalogViewVM.cs
@@ -44,6 +44,19 @@ namespace Tango.PPC.Jobs.ViewModels
             set { _recent = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _filter;
+        /// <summary>
+        /// Gets or sets the filter.
+        /// </summary>
+        /// <value>
+        /// The filter.
+        /// </value>
+        public String Filter
+        {
+            get { return _filter; }
+            set { _filter = value; RaisePropertyChangedAuto(); }
+        }
+
         private CatalogItem _selectedItem;
         /// <summary>
         /// Gets or sets the selected item.
@@ -85,6 +98,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             base.OnNavigatedTo();
             _confirmed = false;
+            Filter = "CATALOG";
         }
 
         /// <summary>
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 f0950af09..3a777e142 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
@@ -1271,7 +1271,7 @@ namespace Tango.PPC.Jobs.ViewModels
         /// </summary>
         public override void OnNavigatedTo()
         {
-            if (MachineProvider.MachineOperator.Status != Integration.Operation.MachineStatuses.Printing)
+            if (!MachineProvider.MachineOperator.IsPrinting)
             {
                 _start_printing_btn.Push();
             }
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs
index 7c6ed0c81..a72013d26 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/ViewModels/TwineCatalogViewVM.cs
@@ -44,6 +44,19 @@ namespace Tango.PPC.Jobs.ViewModels
             set { _recent = value; RaisePropertyChangedAuto(); }
         }
 
+        private String _filter;
+        /// <summary>
+        /// Gets or sets the filter.
+        /// </summary>
+        /// <value>
+        /// The filter.
+        /// </value>
+        public String Filter
+        {
+            get { return _filter; }
+            set { _filter = value; RaisePropertyChangedAuto(); }
+        }
+
         private CatalogItem _selectedItem;
         /// <summary>
         /// Gets or sets the selected item.
@@ -85,6 +98,7 @@ namespace Tango.PPC.Jobs.ViewModels
         {
             base.OnNavigatedTo();
             _confirmed = false;
+            Filter = "CATALOG";
         }
 
         /// <summary>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/CoatsCatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/CoatsCatalogView.xaml
index 434048ce6..60f747ab9 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/CoatsCatalogView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/CoatsCatalogView.xaml
@@ -46,7 +46,7 @@
                                 </DockPanel>
                             </Grid>
                             <Border Style="{StaticResource TangoTouchBorder}" Padding="20 20 20 100">
-                                <controls:CoatsCatalogViewer Catalog="{Binding Catalog}" Recent="{Binding Recent}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" />
+                                <controls:CoatsCatalogViewer Catalog="{Binding Catalog,Mode=TwoWay}" Recent="{Binding Recent}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" Filter="{Binding Filter,Mode=TwoWay}" />
                             </Border>
                         </DockPanel>
                     </DockPanel>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs
index 23785881d..2653179e1 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/JobsView.xaml.cs
@@ -28,23 +28,23 @@ namespace Tango.PPC.Jobs.Views
             TangoIOC.Default.Register<IJobsView>(this);
         }
 
-        private async void TouchNavigationLinks_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void TouchNavigationLinks_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            if (dataGridJobs != null)
-            {
-                await Task.Delay(200);
+            //if (dataGridJobs != null)
+            //{
+            //    await Task.Delay(200);
 
-                if (navigationLinks.SelectedIndex == 0)
-                {
-                    dataGridJobs.LayoutRows(false);
-                    dataGridJobs.ScrollViewer.ScrollToTop();
-                }
-                else
-                {
-                    dataGridJobsHistory.LayoutRows(false);
-                    dataGridJobsHistory.ScrollViewer.ScrollToTop();
-                }
-            }
+            //    if (navigationLinks.SelectedIndex == 0)
+            //    {
+            //        dataGridJobs.LayoutRows(false);
+            //        dataGridJobs.ScrollViewer.ScrollToTop();
+            //    }
+            //    else
+            //    {
+            //        dataGridJobsHistory.LayoutRows(false);
+            //        dataGridJobsHistory.ScrollViewer.ScrollToTop();
+            //    }
+            //}
         }
 
         public void ScrollToTop()
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml
index 284666733..d4522d288 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Views/TwineCatalogView.xaml
@@ -29,7 +29,7 @@
                         </Border>
 
                         <Border Style="{StaticResource TangoTouchBorder}" Padding="20 20 20 100" Margin="0 10 0 0">
-                            <controls:TwineCatalogViewer Catalog="{Binding Catalog}" Recent="{Binding Recent}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" />
+                            <controls:TwineCatalogViewer Catalog="{Binding Catalog,Mode=TwoWay}" Recent="{Binding Recent}" SelectedItem="{Binding SelectedItem,Mode=TwoWay}" Filter="{Binding Filter,Mode=TwoWay}" />
                         </Border>
                     </DockPanel>
                 </touch:TouchLoadingPanel>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index 672b13a12..2aca24bfc 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.0.32.0")]
+[assembly: AssemblyVersion("1.0.34.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>