1 files changed, 22 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
index d3fdedde5..ec080ebed 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Views/JobsView.xaml
@@ -35,6 +35,8 @@
             <sharedConverters:EnumToItemsSourceConverter x:Key="EnumToItemsSourceConverter" />
             <converters:JobsCategoryToVisibilityConverter x:Key="JobsCategoryToVisibilityConverter" />
             <converters:JobsCategoryToOpacityConverter x:Key="JobsCategoryToOpacityConverter" />
+
+            <BitmapImage x:Key="SelectAll" UriSource="../Images/JobView/select_all.png" />
         </ResourceDictionary>
     </UserControl.Resources>
 
@@ -94,6 +96,22 @@
                     <touch:TouchIconButton Command="{Binding ClearSelectionCommand}" Visibility="{Binding IsMultiSelecting,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 0 30 0" Padding="20" Icon="Close" Width="50" Height="50" Style="{StaticResource TangoRoundTouchIconButton}">
                        
                     </touch:TouchIconButton>
+                    <!--<touch:TouchIconButton Command="{Binding SelectAllJobsCommand}" Margin="0 0 30 0" Padding="20" Icon="CheckboxMultipleMarkedOutline" Style="{StaticResource TangoRoundTouchIconButton}">>-->
+                    <touch:TouchButton x:Name="SelectAllButton"  Command="{Binding SelectAllJobsCommand}" Margin="0 0 30 0" EnableDropShadow="False">
+                        <touch:TouchButton.Style>
+                            <Style TargetType="touch:TouchButton" >
+                                <Setter Property="Background" Value="{StaticResource TangoMidAccentBrush}"></Setter>
+                                <Setter Property="RenderOptions.EdgeMode" Value="Unspecified"></Setter>
+                                <Setter Property="RenderOptions.BitmapScalingMode" Value="Fant"></Setter>
+                                <Setter Property="CornerRadius" Value="50"></Setter>
+                                <Setter Property="RippleCentered" Value="True"></Setter>
+                                <Setter Property="RippleFactor" Value="2"></Setter>
+                                <Setter Property="Width" Value="{Binding RelativeSource={RelativeSource Self},Path=ActualHeight}"></Setter>
+                            </Style>
+                        </touch:TouchButton.Style>
+                        <Image Source="{StaticResource SelectAll}" Width="24" Height="24"></Image>
+                    </touch:TouchButton>
+                    <!--</touch:TouchIconButton>-->
                     <touch:TouchIconButton Command="{Binding MoveToListJobsCommand}" Margin="0 0 30 0" Padding="20"  >
                         <touch:TouchIconButton.Style>
                             <Style TargetType="touch:TouchIconButton" BasedOn="{StaticResource TangoRoundTouchIconButton}">
@@ -205,7 +223,7 @@
 
             <Grid Grid.Row="1" x:Name="moveGrid">
                 <touch:TouchLoadingPanel IsLoading="{Binding IsLoadingJobs}" Visibility="{Binding SelectedCategory,Converter={StaticResource JobsCategoryToVisibilityConverter},ConverterParameter='Draft'}">
-                    <touch:LightTouchDataGrid CollectionFilter="{Binding CollectionFilter}" AnimateSorting="False" RenderOptions.EdgeMode="Unspecified" Style="{StaticResource TangoJobsGrid}" x:Name="dataGridJobs" SelectedItems="{Binding SelectedJobs}" IsMultiSelecting="{Binding IsMultiSelecting,Mode=TwoWay}" OnDragAndDropCommand="{Binding JobDragedDroppedCommand}" ItemsSource="{Binding DraftJobsCollectionView}" ItemSelectedCommand="{Binding JobSelectedCommand}" Margin="10">
+                    <touch:LightTouchDataGrid CollectionFilter="{Binding CollectionFilter}" AnimateSorting="False" RenderOptions.EdgeMode="Unspecified" Style="{StaticResource TangoJobsGrid}" x:Name="dataGridJobs" SelectedItems="{Binding SelectedJobs}" IsMultiSelecting="{Binding IsMultiSelecting,Mode=TwoWay}" OnDragAndDropCommand="{Binding JobDragedDroppedCommand}" ItemsSource="{Binding DraftJobsCollectionView}" ItemSelectedCommand="{Binding JobSelectedCommand}" Margin="10" SelectAll="{Binding SelectAll,Mode=TwoWay}">
                         <touch:LightTouchDataGrid.Columns>
                             <!--<touch:LightTouchDataGridColumn Width="90">
                                 <touch:LightTouchDataGridColumn.Header>
@@ -267,7 +285,7 @@
                                                 <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="#,0.0" TargetNullValue='0' FallbackValue='0' Mode="OneWay">
                                                     <Binding Path="LengthIncludingNumberOfUnits" Mode="OneWay"/>
                                                     <Binding Path="DataContext.BuildProvider.IsEureka" Mode="OneWay" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
-                                                    <Binding Path="Spools" Mode="OneWay"/>
+                                                    <Binding Path="NumberOfSpools" Mode="OneWay"/>
                                                 </MultiBinding>
                                             </TextBlock.Text>
                                         </TextBlock>
@@ -336,7 +354,7 @@
                 </touch:TouchLoadingPanel>
 
                 <touch:TouchLoadingPanel IsLoading="{Binding IsLoadingJobs}" Visibility="{Binding SelectedCategory,Converter={StaticResource JobsCategoryToVisibilityConverter},ConverterParameter='History'}">
-                    <touch:LightTouchDataGrid CollectionFilter="{Binding CollectionFilter}" AnimateSorting="False" EnableDragAndDrop="False" RenderOptions.EdgeMode="Unspecified" x:Name="dataGridJobsHistory" Style="{StaticResource TangoJobsGrid}" SelectedItems="{Binding SelectedJobs}" IsMultiSelecting="{Binding IsMultiSelecting,Mode=TwoWay}" ItemsSource="{Binding HistoryJobsCollectionView}" ItemSelectedCommand="{Binding JobSelectedCommand}" Margin="10">
+                    <touch:LightTouchDataGrid CollectionFilter="{Binding CollectionFilter}" AnimateSorting="False" EnableDragAndDrop="False" RenderOptions.EdgeMode="Unspecified" x:Name="dataGridJobsHistory" Style="{StaticResource TangoJobsGrid}" SelectedItems="{Binding SelectedJobs}" IsMultiSelecting="{Binding IsMultiSelecting,Mode=TwoWay}" ItemsSource="{Binding HistoryJobsCollectionView}" ItemSelectedCommand="{Binding JobSelectedCommand}" Margin="10" SelectAll="{Binding SelectAll,Mode=TwoWay}">
                         <touch:LightTouchDataGrid.Columns>
                             <touch:LightTouchDataGridColumn Width="50">
                                 <touch:LightTouchDataGridColumn.Header>
@@ -390,7 +408,7 @@
                                                 <MultiBinding Converter="{StaticResource LengthWithSpoolsConverter}" StringFormat="0.0" TargetNullValue='0' FallbackValue='0'>
                                                     <Binding Path="LengthIncludingNumberOfUnits" Mode="OneWay"/>
                                                     <Binding Path="DataContext.BuildProvider.IsEureka" Mode="OneWay" RelativeSource="{RelativeSource AncestorType=UserControl}"/>
-                                                    <Binding Path="Spools" Mode="OneWay"/>
+                                                    <Binding Path="NumberOfSpools" Mode="OneWay"/>
                                                 </MultiBinding>
                                             </TextBlock.Text>
                                         </TextBlock>