-aggiunto DG_OnlyProdPartList in Datagridckolumns.ini

- gestione lista feature da rivedere -aggiunto in OnlyProdRawPartListV lista PartVMList -aggiunto pulsanti start, save con gestione popup
2025-04-08 17:23:19 +02:00
parent 13b2dd29d1
commit 9546248819
17 changed files with 559 additions and 132 deletions
@@ -1,5 +1,4 @@
 Imports System.Collections.ObjectModel
-Imports System.Globalization
 Imports System.Windows
 Imports EgtUILib
 Imports EgtWPFLib5
@@ -17,6 +17,7 @@
   Public Const S_PARTINRAWPARTLIST_SUPERVISOR As String = "DG_PartInRawPartList_SUPERVISOR"
   Public Const S_FEATUREINPARTINRAWPARTLIST_SUPERVISOR As String = "DG_FeatureInPartInRawPartList_SUPERVISOR"
   Public Const S_PARTLIST As String = "DG_PartList"
+   Public Const S_ONLYPRODPARTLIST As String = "DG_OnlyProdPartList"
   Public Const S_FEATUREINPARTINRAWPARTLIST As String = "DG_FeatureInPartInRawPartList"
   Public Const S_STATISTICS As String = "DG_Statistics"
   Public Const S_STATISTICS_PART As String = "DG_Statistics_PART"
@@ -46,7 +46,7 @@
           Style="{StaticResource OnlyProdLeftPanel_Button}">
      <Image Source="/Resources/LeftPanel/RemovePart.png" Stretch="Uniform"/>
   </Button>
-   <Button Command="{Binding Invert_Command}"
+   <!--<Button Command="{Binding Invert_Command}"
           Visibility="{Binding ViewPage_Visibility}"
           ToolTip="{Binding InvertSx_ToolTip}"
           IsEnabled="{Binding RotatePart_IsEnabled}"
@@ -73,6 +73,6 @@
           IsEnabled="{Binding RotatePart_IsEnabled}"
           Style="{StaticResource OnlyProdLeftPanel_Button}">
      <Image Source="/Resources/PartManager/RightRotate.png" Stretch="Uniform"/>
-   </Button>
+   </Button>-->

 </StackPanel>
@@ -79,7 +79,12 @@ Public Class BTLStructureVM
         End If
      End If
      m_PrevSelectionType = m_SelectionType
-      If value = m_SelectionType And (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Or Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST) Then Return
+      If value = m_SelectionType And (Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PART Or Map.refProjectVM.LastSelGridType = ProjectVM.GridSelTypes.PARTLIST) Then
+         For Each BTLPart In m_BTLPartVMList
+            BTLPart.SetOpenFeatureList(False)
+         Next
+         Return
+      End If
      m_SelectionType = value
      Select Case m_SelectionType
         Case SelectionTypes.SELECT_
@@ -184,7 +189,7 @@ Public Class BTLStructureVM
      Configuration.UpdateGraphics()
   End Sub

-   Private Sub SelectBTLPart(BtlPart As BTLPartVM)
+   Public Sub SelectBTLPart(BtlPart As BTLPartVM)
      m_SelBTLPart = BtlPart
      If Map.refMainMenuVM.SelPage = Pages.VIEW Then
         Configuration.SelectedPieces(BtlPart.nPartId, Me)
@@ -34,6 +34,33 @@ Public Class BTLPartListVM
      End Set
   End Property

+   Public Property bDOALLFeature As Boolean?
+      Get
+         If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count = 0 Then Return False
+         Dim bTemp As Boolean = Map.refProjectVM.BTLStructureVM.SelBTLParts(0).BTLFeatureVMList(0).bDO
+         For FeatureIndex = 1 To Map.refProjectVM.BTLStructureVM.SelBTLParts(0).BTLFeatureVMList.Count - 1
+            If Map.refProjectVM.BTLStructureVM.SelBTLParts(0).BTLFeatureVMList(FeatureIndex).bDO <> bTemp Then Return Nothing
+         Next
+         Return bTemp
+      End Get
+      Set(value As Boolean?)
+         If Map.refProjectVM.BTLStructureVM.SelBTLParts.Count = 0 Then
+            NotifyPropertyChanged(NameOf(bDOALLFeature))
+            Return
+         End If
+         ' imposto modalita' update multiplo
+         BTLFeatureVM.bDO_MultipleUpdate = True
+         For FeatureIndex = 0 To Map.refProjectVM.BTLStructureVM.SelBTLParts(0).BTLFeatureVMList.Count - 1
+            If FeatureIndex = Map.refProjectVM.BTLStructureVM.SelBTLParts(0).BTLFeatureVMList.Count - 1 Then
+               ' reset modalita' update multiplo
+               BTLFeatureVM.bDO_MultipleUpdate = False
+            End If
+            Dim Feature As BTLFeatureVM = Map.refProjectVM.BTLStructureVM.SelBTLParts(0).BTLFeatureVMList(FeatureIndex)
+            Feature.bDO = value
+         Next
+      End Set
+   End Property
+
 #Region "Messages"

   Public ReadOnly Property PDN_Msg As String
@@ -132,13 +159,31 @@ Public Class BTLPartListVM
      End Get
   End Property

+   Public ReadOnly Property Description_Msg As String
+      Get
+         Return EgtMsg(61603)
+      End Get
+   End Property
+
+   Public ReadOnly Property ROTATION_Msg As String
+      Get
+         Return EgtMsg(61737)
+      End Get
+   End Property
+
+   Public ReadOnly Property INVERSION_Msg As String
+      Get
+         Return EgtMsg(61738)
+      End Get
+   End Property
+
 #End Region    ' Messages

   Sub New()
      ' creo riferimento in Map
      Map.SetRefPartListVM(Me)
      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_PARTLIST, PartColumns)
+      GetPrivateProfileColumns(S_ONLYPRODPARTLIST, PartColumns)
      ' recupero riferimento a colonna Do
      m_colPart_Do = PartColumns.FirstOrDefault(Function(x) x.Name = COL_DO)
   End Sub
@@ -13,7 +13,6 @@
                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
                                SelectionMode="Extended"
                                PreviewMouseDown="DataGrid_PreviewMouseDown"
-                                PreviewMouseUp="DataGrid_PreviewMouseUp"
                                PreviewMouseMove="DataGrid_PreviewMouseMove"
                                Margin="0,0,0,5"
                                EgtBEAMWALL:MultiSelectorBehaviours.SynchronizedSelectedItems="{Binding Tag.SelBTLParts,
@@ -247,29 +246,92 @@
               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
            </DataGridTextColumn.Header>
         </DataGridTextColumn>
+         <!--ROT - Rotazione-->
+         <DataGridTemplateColumn x:Key="colROT" SortMemberPath="dROT">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.ROTATION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Button Command="{Binding ForwardRotation_Command}"
+                          ToolTip="{Binding ForwardRotation_ToolTip}"
+                          IsEnabled="{Binding RotatePart_IsEnabled}"
+                          Height="15" Width="15" Margin="0">
+                     <Image Source="/Resources/PartManager/RightRotate.png" Stretch="Uniform"/>
+                  </Button>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--INV - Inversione-->
+         <DataGridTemplateColumn x:Key="colFLIP">
+            <DataGridTemplateColumn.HeaderTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{Binding Path=DataContext.INVERSION_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.HeaderTemplate>
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Button Command="{Binding Invert_Command}"
+                          ToolTip="{Binding InvertDx_ToolTip}"
+                          IsEnabled="{Binding RotatePart_IsEnabled}"
+                          Height="15" Width="15" Margin="0">
+                     <Image Source="/Resources/PartManager/RightInvert.png" Stretch="Uniform"/>
+                  </Button>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
      </DataGrid.Resources>
      <DataGrid.RowDetailsTemplate>
         <DataTemplate>
            <ListBox ItemsSource="{Binding BTLFeatureVMList}"
-                     PreviewMouseWheel="ListBox_PreviewMouseWheel">
+                     SelectedItem="{Binding SelBTLFeatureVM, UpdateSourceTrigger=PropertyChanged}"
+                     PreviewMouseWheel="ListBox_PreviewMouseWheel"
+                     PreviewMouseDown="ListBox_PreviewMouseDown">
+               <ListBox.Template>
+                  <ControlTemplate TargetType="{x:Type ListBox}">
+                        <!-- Intestazione -->
+                     <Grid Background="White">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="1*"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto"/>
+                           <RowDefinition Height="1*"/>
+                        </Grid.RowDefinitions>
+                        <Border BorderBrush="Black" BorderThickness="2,2,0,2" CornerRadius="3,0,0,3" Margin="2">
+                           <CheckBox IsChecked="{Binding Path=DataContext.bDOALLFeature, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                                     VerticalAlignment="Center" Margin="16,2.5,0,2.5"/>
+                        </Border>
+                        <Border Grid.Column="1" BorderBrush="Black" BorderThickness="0,2,2,2" CornerRadius="0,3,3,0" Margin="-2,2,2,2">
+                           <TextBlock Text="{Binding Path=DataContext.Description_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdBTLPartListV}}}"
+                                      HorizontalAlignment="Left" Margin="5,2.5,0,2.5"/>
+                        </Border>
+                        <!-- Area della ListBox -->
+                        <ItemsPresenter Grid.Row="1" Grid.ColumnSpan="2"/>
+                     </Grid>
+                  </ControlTemplate>
+               </ListBox.Template>
               <ListBox.ItemTemplate>
                  <DataTemplate>
                     <StackPanel Orientation="Horizontal">
                        <CheckBox IsChecked="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
-                                    VerticalAlignment="Center"
-                                    HorizontalAlignment="Center"
-                                    Margin="15,0,2.5,0"/>
+                                  VerticalAlignment="Center"
+                                  HorizontalAlignment="Center"
+                                  Margin="15,0,2.5,0"/>

                        <TextBlock Text="{Binding sDescGRP}" 
-                                    Margin="2.5,0,2.5,0"
-                                    Style="{StaticResource OnlyProd_TextBlock}"/>
+                                   Margin="2.5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
                        <Grid Margin="2.5,0,2.5,0">
                           <Grid.ColumnDefinitions>
                              <ColumnDefinition Width="1*"/>
                              <ColumnDefinition Width="10"/>
                           </Grid.ColumnDefinitions>
                           <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
-                                    Background="{Binding Calc_Background}"/>
+                                   Background="{Binding Calc_Background}"/>
                           <Grid Grid.Column="1">
                              <Grid.RowDefinitions>
                                 <RowDefinition Height="1*"/>
@@ -278,13 +340,13 @@
                              <Ellipse Visibility="{Binding CALC_ROT_Visibility}"
                                       Style="{StaticResource OnlyProdFeatureInPartInRawPartList_Ellipse}"/>
                              <TextBlock Grid.Row="1"
-                                          Text="{Binding CALC_ERR_Letter}"
-                                          Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
+                                         Text="{Binding CALC_ERR_Letter}"
+                                         Style="{StaticResource OnlyProdFeatureInPartInRawPartList_TextBlock}"/>
                           </Grid>
                        </Grid>
                        <TextBlock Text="{Binding sName}" 
-                                    Margin="2.5,0,0,0"
-                                    Style="{StaticResource OnlyProd_TextBlock}"/>
+                                   Margin="2.5,0,0,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
                     </StackPanel>
                  </DataTemplate>
               </ListBox.ItemTemplate>
@@ -20,7 +20,7 @@ Public Class OnlyProdBTLPartListV
      m_NameDataGridType = BTLPart_DataGrid.GetType()
      s_isDraggingSelectionField = m_NameDataGridType.GetField("_isDraggingSelection", BindingFlags.Instance Or BindingFlags.NonPublic)
      s_endDraggingMethod = m_NameDataGridType.GetMethod("EndDragging", BindingFlags.Instance Or BindingFlags.NonPublic)
-      SetSelButton(MouseButton.Right)
+      'SetSelButton(MouseButton.Right)
   End Sub

   Public Sub SetSelButton(SelButton As MouseButton)
@@ -49,24 +49,24 @@ Public Class OnlyProdBTLPartListV
            Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
         End If
         ' imposto tipo di grid selezionata
-         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PARTLIST)
+         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PART)
      End If
   End Sub

   Public Sub DataGrid_PreviewMouseUp(sender As Object, e As MouseButtonEventArgs)
-      If e.ChangedButton = MouseButton.Right Then
-         If e.ChangedButton = m_SelectBtn Then
-            If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
-               e.Handled = True
-            Else
-               Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.SELECT_)
-            End If
-         ElseIf e.ChangedButton = m_HighlightBtn Then
-            Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
-         End If
-         ' imposto tipo di grid selezionata
-         If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PART)
-      End If
+      'If e.ChangedButton = MouseButton.Right Then
+      '   If e.ChangedButton = m_SelectBtn Then
+      '      If (Keyboard.Modifiers And ModifierKeys.Shift) = ModifierKeys.Shift OrElse (Keyboard.Modifiers And ModifierKeys.Control) = ModifierKeys.Control Then
+      '         e.Handled = True
+      '      Else
+      '         Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.SELECT_)
+      '      End If
+      '   ElseIf e.ChangedButton = m_HighlightBtn Then
+      '      Map.refProjectVM.BTLStructureVM.SetSelectionType(BTLStructureVM.SelectionTypes.HIGHLIGHT)
+      '   End If
+      '   ' imposto tipo di grid selezionata
+      '   If Map.refMainMenuVM.SelPage = Pages.ONLYPRODPAGE Then Map.refProjectVM.SetLastSelGridType(ProjectVM.GridSelTypes.PART)
+      'End If
   End Sub

   Public Shared Function FindVisualParent(Of T As DependencyObject)(ByVal child As DependencyObject) As T
@@ -88,17 +88,19 @@ Public Class OnlyProdBTLPartListV
   End Sub

   Private Sub PartList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
-      'If TypeOf sender Is DataGridRow Then
-      '   Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
-      '   If TypeOf Row.DataContext IsNot BTLPartVM Then Return
-      '   Dim VM As BTLPartVM = DirectCast(Row.DataContext, BTLPartVM)
-      '   VM.SetOpenFeatureList(Not VM.bOpenFeatureList)
-      '   'If Row.IsSelected Then
-      '   '   VM.bOpenFeatureList = Not VM.bOpenFeatureList
-      '   'Else
-      '   '   VM.bOpenFeatureList = False
-      '   'End If
-      'End If
+      If e.ChangedButton = MouseButton.Left Then
+         If TypeOf sender Is DataGridRow Then
+            Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+            If TypeOf Row.DataContext IsNot BTLPartVM Then Return
+            Dim VM As BTLPartVM = DirectCast(Row.DataContext, BTLPartVM)
+            VM.SetOpenFeatureList(Not VM.bOpenFeatureList)
+            If Row.IsSelected Then
+               VM.bOpenFeatureList = Not VM.bOpenFeatureList
+            Else
+               VM.bOpenFeatureList = False
+            End If
+         End If
+      End If
      'If TypeOf sender Is DataGridRow Then
      '   Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
      '   If Not Row.IsSelected Then Return
@@ -122,14 +124,11 @@ Public Class OnlyProdBTLPartListV
      '         End If

      '      Case MouseButton.Right
-
-
      '   End Select
      'End If
   End Sub

   Private Sub PartList_PreviewMouseUp(sender As Object, e As MouseButtonEventArgs)
-
      'If TypeOf sender Is DataGridRow Then
      '   Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
      '   If Not Row.IsSelected Then Return
@@ -176,4 +175,13 @@ Public Class OnlyProdBTLPartListV
    })
   End Sub

+   Private Sub ListBox_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If TypeOf sender Is ListBox Then
+         Dim FeatureList As ListBox = DirectCast(sender, ListBox)
+         If Not IsNothing(FeatureList) AndAlso Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then
+            Map.refProjectVM.BTLStructureVM.SelBTLPart.SelBTLFeatureVM = FeatureList.SelectedItem
+         End If
+      End If
+   End Sub
+
 End Class
@@ -3,7 +3,7 @@
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Optimizer" 
             xmlns:EgtBEAMWALLCORE="clr-namespace:EgtBEAMWALL.Core;assembly=EgtBEAMWALL.Core">
-   
+
   <EgtBEAMWALLCORE:EgtDataGrid ItemsSource="{Binding Tag.MachGroupVMList,
                                                      RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"
                                SelectedItem="{Binding Tag.SelectedMachGroup,
@@ -48,7 +48,7 @@
         <DataGridTemplateColumn x:Key="colCALC">
            <DataGridTemplateColumn.CellTemplate>
               <DataTemplate>
-                  <Grid>
+                  <Grid Margin="5,0,-4,0">
                     <Grid.ColumnDefinitions>
                        <ColumnDefinition Width="Auto"/>
                        <ColumnDefinition Width="1*"/>
@@ -167,6 +167,155 @@
         <KeyBinding Key="Delete" Command="{Binding Tag.SelectedMachGroup.DeleteMachGroup_Command,
                                                    RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdRawPartListV}}}"/>
      </DataGrid.InputBindings>
+      <DataGrid.RowDetailsTemplate>
+         <DataTemplate>
+            <ListBox ItemsSource="{Binding PartVMList}"
+                     SelectedItem="{Binding SelPart, UpdateSourceTrigger=PropertyChanged}">
+               <ListBox.ItemTemplate>
+                  <DataTemplate>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="{Binding nPDN}" 
+                                   Margin="2.5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <Grid Grid.Column="1"
+                              Margin="15,0,2.5,0">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="10"/>
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="↓"
+                                Foreground="Aqua"
+                                TextAlignment="Center"
+                                FontWeight="Bold"
+                                FontSize="12"
+                                Margin="0,-6,0,-2"
+                                Visibility="{Binding CALC_FALL_Visibility}"/>
+                           <Border Width="{Binding ActualHeight, RelativeSource={RelativeSource self}}"
+                                   Grid.Column="1"                          
+                                   Background="{Binding Calc_Background}"/>
+                           <Grid Grid.Column="2"
+                                 HorizontalAlignment="Center">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="1*"/>
+                                 <RowDefinition Height="Auto"/>
+                              </Grid.RowDefinitions>
+                              <Ellipse Width="5"
+                                       Height="5"
+                                       Fill="Red"
+                                       Visibility="{Binding CALC_ROT_Visibility}"
+                                       HorizontalAlignment="Center"/>
+                              <TextBlock Grid.Row="1"
+                                         Text="{Binding CALC_ERR_Letter}"
+                                         Foreground="{Binding CALC_ERR_Foreground}"
+                                         TextAlignment="Center"
+                                         FontWeight="Bold"
+                                         FontSize="12"
+                                         Margin="0,-6,0,-2"/>
+                           </Grid>
+                        </Grid>
+                        <TextBlock Grid.Column="2"
+                                   Text="{Binding sNAM}" 
+                                   Margin="2.5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="3"
+                                   Text="{Binding sW}" 
+                                   Margin="50,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="4"
+                                   Text="{Binding sH}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="5"
+                                   Text="{Binding sL}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <Grid Grid.Column="6"
+                              Margin="15,0,2.5,0">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto"/>
+                              <ColumnDefinition Width="1*"/>
+                              <ColumnDefinition Width="Auto"/>
+                           </Grid.ColumnDefinitions>
+                           <Button Command="{Binding BackRotation_Command}"
+                                   Height="15"
+                                   Width="15"
+                                   VerticalAlignment="Center"
+                                   Background="Transparent"
+                                   BorderBrush="Transparent"
+                                   Foreground="{StaticResource BeamWall_Kashmir}">
+                              <TextBlock Text="&lt;"
+                                         FontWeight="Bold"
+                                         Margin="0,-5,0,-2"/>
+                           </Button>
+                           <TextBlock Text="{Binding sROT}" 
+                                      Grid.Column="1"
+                                      TextAlignment="Center"/>
+                           <Button Command="{Binding ForwardRotation_Command}"
+                                   Grid.Column="2"
+                                   Height="15"
+                                   Width="15"
+                                   VerticalAlignment="Center"
+                                   Background="Transparent"
+                                   BorderBrush="Transparent"
+                                   Foreground="{StaticResource BeamWall_Kashmir}">
+                              <TextBlock Text=">"
+                                         FontWeight="Bold"
+                                         Margin="0,-5,0,-2"/>
+                           </Button>
+                        </Grid>
+                        <CheckBox Grid.Column="7"
+                                  IsChecked="{Binding bFLIP, UpdateSourceTrigger=PropertyChanged}"
+                                  HorizontalAlignment="Center"
+                                  VerticalAlignment="Center"
+                                  Margin="15,0,2.5,0"/>
+                        <TextBlock Grid.Column="8"
+                                   Text="{Binding sPOSX}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="9"
+                                   Text="{Binding sPOSY}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="10"
+                                   Text="{Binding sOffset}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="11"
+                                   Text="{Binding sMATERIAL}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="12"
+                                   Text="{Binding sGROUP}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+                        <TextBlock Grid.Column="13"
+                                   Text="{Binding sSTOREY}" 
+                                   Margin="5,0,2.5,0"
+                                   Style="{StaticResource OnlyProd_TextBlock}"/>
+
+                     </Grid>
+                  </DataTemplate>
+               </ListBox.ItemTemplate>
+            </ListBox>
+         </DataTemplate>
+      </DataGrid.RowDetailsTemplate>

   </EgtBEAMWALLCORE:EgtDataGrid>

@@ -4,6 +4,7 @@ Public Class OnlyProdRawPartListV

   ' funzione che permette di selezionare un RawPart anche quando gia' selezionato
   Private Sub RawPartRow_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+      If Not IsNothing(Map.refProjectVM.BTLStructureVM.SelBTLPart) Then Map.refProjectVM.BTLStructureVM.SelBTLPart.SetOpenFeatureList(False)
      If TypeOf sender Is DataGridRow Then
         Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
         Dim RowVM As MyMachGroupVM = DirectCast(Row.DataContext, MyMachGroupVM)
@@ -16,7 +16,11 @@
      <RowDefinition Height="1*"/>
      <RowDefinition Height="Auto"/>
   </Grid.RowDefinitions>
-   <UniformGrid Columns="5" 
+   <EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
+                                             DataContext="{StaticResource StatisticsTimePanelVM}"
+                                             Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+
+   <!--<UniformGrid Columns="5" 
                Margin="0,10,0,10">
      <Expander  Header="{Binding Section_Msg}">
         <ListBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
@@ -55,14 +59,14 @@
         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
                                Style="{StaticResource SearchText_TextBox}"/>
      </Expander>
-   </UniformGrid>
+   </UniformGrid>-->
   <Grid Grid.Row="1">
      <Grid.RowDefinitions>
         <RowDefinition Height="Auto"/>
         <RowDefinition Height="1*"/>
      </Grid.RowDefinitions>

-      <Border Grid.RowSpan="2"  Style="{StaticResource OnlyProdPage_Border}"/>
+      <Border Grid.RowSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>

      <StackPanel Style="{StaticResource OnlyProdLeftPanel_StackPanel}">
         <Button Command="{Binding Data_Command}"
@@ -87,9 +91,9 @@
                                        Margin="4,0,4,0"/>
   </Grid>

-   <EgtBEAMWALL:OnlyProdPartManagerV Grid.Row="2" 
+   <!--<EgtBEAMWALL:OnlyProdPartManagerV Grid.Row="2" 
                                     DataContext="{StaticResource PartManagerVM}"
                                     Tag="{Binding Tag.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"
-                                     Visibility="{Binding DataContext.OnlyProdPartManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"/>
+                                     Visibility="{Binding DataContext.OnlyProdPartManagerVisibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdLeftPanelV}}}"/>-->

 </Grid>
@@ -5,7 +5,6 @@ Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
 Imports EgtUILib
 Imports EgtWPFLib5
-Imports EgwProxy.LiMan

 Public Class MainMenuVM
   Inherits VMBase
@@ -259,6 +258,7 @@ Public Class MainMenuVM
      'Else
      '   Return 0
      'End If
+      Return 0
   End Function

   Friend Sub SetMainMenuIsEnabled(bIsEnabled As Boolean)
@@ -12,7 +12,6 @@
         <ColumnDefinition Width="1*"/>
         <ColumnDefinition Width="Auto"/>
         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="Auto"/>
      </Grid.ColumnDefinitions>
      <EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}"
                                    Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdMainMenuV}}}"/>
@@ -28,15 +27,14 @@
              Visibility="{Binding Supervisor_Visibility}"
              Style="{StaticResource OnlyProdMainMenu_Button}"/>

-      <EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
+      <!--<EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
                                                DataContext="{StaticResource StatisticsTimePanelVM}"
-                                                Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdMainMenuV}}}"/>
+                                                Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdMainMenuV}}}"/>-->

      <RadioButton Grid.Column="1"
                   Content="{Binding Configuration_Msg}"
                   IsChecked="{Binding Config_IsChecked}"
-                   Style="{StaticResource OnlyProdMainMenu_ToggleButton}"  
-                   Width="120"/>
+                   Style="{StaticResource OnlyProdMainMenu_ToggleButton}"/>

      <!--<Button Command="{Binding SendFeedbackCommand}"
              ToolTip="{Binding SendFeedbackToolTip}"
@@ -8,65 +8,100 @@
                              Style="{StaticResource ToolBar_EgtFloatingPanel_OnlyProdManager}">

   <!--Barra superiore dei comandi-->
-   <Button Command="{Binding New_Command}"
-           ToolTip="{Binding NewToolTip}"
-           Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
-      <Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding OpenCommand}"
-           ToolTip="{Binding OpenToolTip}"
-           ContextMenuService.Placement="Bottom"
-           Tag="{Binding}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Button.ContextMenu>
-         <ContextMenu ItemsSource="{Binding MruFileNames}">
-            <ContextMenu.Resources>
-               <Style TargetType="{x:Type MenuItem}">
-                  <Setter Property="Command"
-                          Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
-                  <Setter Property="CommandParameter" Value="{Binding}" />
-               </Style>
-            </ContextMenu.Resources>
-         </ContextMenu>
-      </Button.ContextMenu>
-      <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding SaveCommand}"
-           ToolTip="{Binding SaveToolTip}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding AddProj_Command}"
-           ToolTip="{Binding AddProj_ToolTip}"
-           Visibility="{Binding AddProj_Visibility}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding ImportBTL_Command}"
-           ToolTip="{Binding ImportBTL_ToolTip}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding UpdateBTL_Command}"
-           ToolTip="{Binding UpdateBTL_ToolTip}"
-           Visibility="{Binding UpdateBTL_Visibility}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Image Source="/Resources/ProjectManager/UpdateBTL.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding ExportProject_Command}"
-           ToolTip="{Binding ExportProject_ToolTip}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding ImportProject_Command}"
-           ToolTip="{Binding ImportProject_ToolTip}"
-           Style="{StaticResource ToolBarOnlyProdManager_Button}">
-      <Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
-   </Button>
-   <Button Command="{Binding GoToSupervisor_Command}"
+   <Button Content="START"
+           Command="{Binding ShowPopUpStartBtnCommand}"
+           Name="StartBtn"/>
+   <Popup IsOpen="{Binding IsStartBtnOpen}"
+          AllowsTransparency="True" 
+          PopupAnimation="Scroll" 
+          StaysOpen="False"
+          PlacementTarget="{Binding ElementName=StartBtn}">
+      <StackPanel Orientation="Vertical">
+         <Button Command="{Binding New_Command}"
+                 ToolTip="{Binding NewToolTip}"
+                 Style="{StaticResource ToolBarOnlyProdManagerNew_Button}">
+            <Image Source="/Resources/ProjectManager/New.png" Stretch="Uniform"/>
+         </Button>
+         <Button Command="{Binding OpenCommand}"
+                 ToolTip="{Binding OpenToolTip}"
+                 ContextMenuService.Placement="Bottom"
+                 Tag="{Binding}"
+                 Style="{StaticResource ToolBarOnlyProdManager_Button}">
+            <Button.ContextMenu>
+               <ContextMenu ItemsSource="{Binding MruFileNames}">
+                  <ContextMenu.Resources>
+                     <Style TargetType="{x:Type MenuItem}">
+                        <Setter Property="Command"
+                                Value="{Binding PlacementTarget.Tag.OpenMruFileCommand, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ContextMenu}}" />
+                        <Setter Property="CommandParameter" Value="{Binding}" />
+                     </Style>
+                  </ContextMenu.Resources>
+               </ContextMenu>
+            </Button.ContextMenu>
+            <Image Source="/Resources/ProjectManager/Open.png" Stretch="Uniform"/>
+         </Button>
+         <Button Command="{Binding ImportBTL_Command}"
+                 ToolTip="{Binding ImportBTL_ToolTip}"
+                 Style="{StaticResource ToolBarOnlyProdManager_Button}">
+            <Image Source="/Resources/ProjectManager/ImportBTL.png" Stretch="Uniform"/>
+         </Button>
+         <Button Command="{Binding ImportProject_Command}"
+                 ToolTip="{Binding ImportProject_ToolTip}"
+                 Style="{StaticResource ToolBarOnlyProdManager_Button}">
+            <Image Source="/Resources/ProjectManager/ImportProject.png" Stretch="Uniform"/>
+         </Button>
+      </StackPanel>
+   </Popup>
+
+   <Button Content="SAVE"
+           Command="{Binding ShowPopUpSaveBtnCommand}"
+           Name="SaveBtn"/>
+   <Popup IsOpen="{Binding IsSaveBtnOpen}"
+          AllowsTransparency="True" 
+          PopupAnimation="Scroll" 
+          StaysOpen="False"
+          PlacementTarget="{Binding ElementName=SaveBtn}">
+      <StackPanel Orientation="Vertical">
+      <Button Command="{Binding SaveCommand}"
+              ToolTip="{Binding SaveToolTip}"
+              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+         <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding ExportProject_Command}"
+              ToolTip="{Binding ExportProject_ToolTip}"
+              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+         <Image Source="/Resources/ProjectManager/ExportProject.png" Stretch="Uniform"/>
+      </Button>
+      </StackPanel>
+   </Popup>
+
+   <Button Content="BTL"
+           Command="{Binding ShowPopUpBtlBtnCommand}"
+           Name="BtlBtn"/>
+   <Popup IsOpen="{Binding IsBtlBtnOpen}"
+          AllowsTransparency="True" 
+          PopupAnimation="Scroll" 
+          StaysOpen="False"
+          PlacementTarget="{Binding ElementName=BtlBtn}">
+      <StackPanel Orientation="Vertical">
+      <Button Command="{Binding AddProj_Command}"
+              ToolTip="{Binding AddProj_ToolTip}"
+              Visibility="{Binding AddProj_Visibility}"
+              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+         <Image Source="/Resources/ProjectManager/AddProj.png" Stretch="Uniform"/>
+      </Button>
+      <Button Command="{Binding UpdateBTL_Command}"
+              ToolTip="{Binding UpdateBTL_ToolTip}"
+              Visibility="{Binding UpdateBTL_Visibility}"
+              Style="{StaticResource ToolBarOnlyProdManager_Button}">
+         <Image Source="/Resources/ProjectManager/UpdateBTL.png" Stretch="Uniform"/>
+      </Button>
+      </StackPanel>
+   </Popup>
+   <!--<Button Command="{Binding GoToSupervisor_Command}"
           ToolTip="{Binding GoToSupervisor_ToolTip}"
           Visibility="{Binding GoToSupervisor_Visibility}"
           Style="{StaticResource ToolBarOnlyProdManagerGoToSupervisor_Button}">
      <Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
-   </Button>
+   </Button>-->
 </EgtFloating:EgtFloatingPanel>
@@ -121,6 +121,48 @@ Public Class OnlyProdManagerVM
      End Get
   End Property

+   Private m_IsStartBtnOpen As Boolean = False
+   Public Property IsStartBtnOpen As Boolean
+      Get
+         Return m_IsStartBtnOpen
+      End Get
+      Set(value As Boolean)
+         m_IsStartBtnOpen = value
+      End Set
+   End Property
+   Friend Sub SetIsStartBtnOpen(bIsStartBtnOpen As Boolean)
+      m_IsStartBtnOpen = bIsStartBtnOpen
+      NotifyPropertyChanged(NameOf(IsStartBtnOpen))
+   End Sub
+
+   Private m_IsSaveBtnOpen As Boolean = False
+   Public Property IsSaveBtnOpen As Boolean
+      Get
+         Return m_IsSaveBtnOpen
+      End Get
+      Set(value As Boolean)
+         m_IsSaveBtnOpen = value
+      End Set
+   End Property
+   Friend Sub SetIsSaveBtnOpen(bIsSaveBtnOpen As Boolean)
+      m_IsSaveBtnOpen = bIsSaveBtnOpen
+      NotifyPropertyChanged(NameOf(IsSaveBtnOpen))
+   End Sub
+
+   Private m_IsBtlBtnOpen As Boolean = False
+   Public Property IsBtlBtnOpen As Boolean
+      Get
+         Return m_IsBtlBtnOpen
+      End Get
+      Set(value As Boolean)
+         m_IsBtlBtnOpen = value
+      End Set
+   End Property
+   Friend Sub SetIsBtlBtnOpen(bIsBtlBtnOpen As Boolean)
+      m_IsBtlBtnOpen = bIsBtlBtnOpen
+      NotifyPropertyChanged(NameOf(IsBtlBtnOpen))
+   End Sub
+
   ' Definizione comandi
   Private m_cmdNew As ICommand
   Private m_cmdOpen As ICommand
@@ -132,6 +174,9 @@ Public Class OnlyProdManagerVM
   Private m_cmdImportProject As ICommand
   Private m_cmdAddProj As ICommand
   Private m_cmdGoToSupervisor As ICommand
+   Private m_cmdShowPopUpStartBtnCmd As ICommand
+   Private m_cmdShowPopUpSaveBtnCmd As ICommand
+   Private m_cmdShowPopUpBtlBtnCmd As ICommand

 #Region "ToolTip"

@@ -1867,6 +1912,69 @@ Public Class OnlyProdManagerVM

 #End Region ' GoToSupervisor

+#Region "ShowPopUpStartBtnCommand"
+
+   Public ReadOnly Property ShowPopUpStartBtnCommand As ICommand
+      Get
+         If m_cmdShowPopUpStartBtnCmd Is Nothing Then
+            m_cmdShowPopUpStartBtnCmd = New Command(AddressOf ShowPopUpStartBtn)
+         End If
+         Return m_cmdShowPopUpStartBtnCmd
+      End Get
+   End Property
+
+   Public Sub ShowPopUpStartBtn(ByVal param As Object)
+      If m_IsStartBtnOpen Then
+         SetIsStartBtnOpen(False)
+      Else
+         SetIsStartBtnOpen(True)
+      End If
+   End Sub
+
+#End Region    ' ShowPopUpStartBtnCommand
+
+#Region "ShowPopUpSaveBtnCommand"
+
+   Public ReadOnly Property ShowPopUpSaveBtnCommand As ICommand
+      Get
+         If m_cmdShowPopUpSaveBtnCmd Is Nothing Then
+            m_cmdShowPopUpSaveBtnCmd = New Command(AddressOf ShowPopUpSaveBtn)
+         End If
+         Return m_cmdShowPopUpSaveBtnCmd
+      End Get
+   End Property
+
+   Public Sub ShowPopUpSaveBtn(ByVal param As Object)
+      If m_IsSaveBtnOpen Then
+         SetIsSaveBtnOpen(False)
+      Else
+         SetIsSaveBtnOpen(True)
+      End If
+   End Sub
+
+#End Region    ' ShowPopUpSaveBtnCommand
+
+#Region "ShowPopUpBtlBtnCommand"
+
+   Public ReadOnly Property ShowPopUpBtlBtnCommand As ICommand
+      Get
+         If m_cmdShowPopUpBtlBtnCmd Is Nothing Then
+            m_cmdShowPopUpBtlBtnCmd = New Command(AddressOf ShowPopUpBtlBtn)
+         End If
+         Return m_cmdShowPopUpBtlBtnCmd
+      End Get
+   End Property
+
+   Public Sub ShowPopUpBtlBtn(ByVal param As Object)
+      If m_IsBtlBtnOpen Then
+         SetIsBtlBtnOpen(False)
+      Else
+         SetIsBtlBtnOpen(True)
+      End If
+   End Sub
+
+#End Region    ' ShowPopUpBtlBtnCommand
+
 #End Region ' Commands

 End Class
@@ -12,17 +12,18 @@
            <ColumnDefinition Width="Auto"/>
            <ColumnDefinition Width="1*"/>
         </Grid.ColumnDefinitions>
-         <EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}" HorizontalAlignment="Center"
+         <!--<EgtBEAMWALL:OnlyProdManagerV DataContext="{StaticResource OnlyProdManagerVM}" HorizontalAlignment="Center"
                                       Visibility="{Binding DataContext.OnlyProdManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                       Margin="0,10,0,10" />
+                                       Margin="0,10,0,10" />-->
         <EgtBEAMWALL:OnlyProdOptimizePanelV Grid.Column="1"
                                             DataContext="{StaticResource OptimizePanelVM}"
-                                             Visibility="{Binding DataContext.OnlyProdOptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
+                                             Visibility="Collapsed"
                                             Margin="40,10,0,10"/>
-         <EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
+         <!--Visibility="{Binding DataContext.OnlyProdOptimizePanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"-->
+         <!--<EgtBEAMWALL:OnlyProdStatisticsTimePanelV Grid.Column="2"
                                                   DataContext="{StaticResource StatisticsTimePanelVM}"
                                                   Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"
-                                                   Margin="150,10,0,10"/>
+                                                   Margin="150,10,0,10"/>-->
      </Grid>
   </EgtFloating:EgtFloatingTray>

@@ -69,21 +70,22 @@
                                                     DataContext="{StaticResource FreeContourManagerVM}"
                                                     Visibility="{Binding DataContext.FreeContourManager_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
         </WrapPanel>
-         <Grid Grid.Column="1">
+         
+         <EgtBEAMWALL:RawPartManagerWndV Grid.Column="1" Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+         
+         <Grid Grid.Column="1" Visibility="Collapsed">
            <Grid.RowDefinitions>
               <RowDefinition Height="{Binding GridDims[4].GridLen, Mode=TwoWay}"/>
               <RowDefinition Height="Auto"/>
               <RowDefinition Height="{Binding GridDims[5].GridLen, Mode=TwoWay}"/>
            </Grid.RowDefinitions>

-            <EgtBEAMWALL:RawPartManagerWndV Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
-
            <GridSplitter Grid.Row="1"
-                       Grid.ColumnSpan="2"
-                       Style="{StaticResource Height_GridSplitter}"/>
+                          Grid.ColumnSpan="2" 
+                          Style="{StaticResource Height_GridSplitter}"/>

            <EgtBEAMWALL:PartInRawPartManagerWndV Grid.Row="2" 
-                                               Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>
+                                                  Tag="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OnlyProdProjectV}}}"/>

         </Grid>
      </Grid>
@@ -17,7 +17,12 @@

   <Border Grid.RowSpan="2" Style="{StaticResource OnlyProdPage_Border}"/>

-   <EgtBEAMWALL:OnlyProdRawPartManagerV />
+   <StackPanel Orientation="Horizontal" 
+               HorizontalAlignment="Right"
+               Margin="0,0,18,0">
+      <EgtBEAMWALL:OnlyProdRawPartManagerV />
+      <EgtBEAMWALL:OnlyProdPartInRawPartManagerV />
+   </StackPanel>

   <EgtBEAMWALL:OnlyProdRawPartListV Grid.Row="1"
                                     DataContext="{StaticResource RawPartListVM}"
@@ -478,7 +478,7 @@

   <Style x:Key="OnlyProdStatisticTimePanel_TextBlock" TargetType="{x:Type TextBlock}">
      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
-      <Setter Property="FontSize" Value="30"/>
+      <Setter Property="FontSize" Value="20"/>
      <Setter Property="VerticalAlignment" Value="Center"/>
      <Setter Property="TextWrapping" Value="Wrap"/>
   </Style>
@@ -1742,12 +1742,14 @@
   <!--#region GridSplitter-->

   <Style x:Key="Width_GridSplitter" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="Transparent"/>
      <Setter Property="Width" Value="3"/>
      <Setter Property="HorizontalAlignment" Value="Center"/>
      <Setter Property="VerticalAlignment" Value="Stretch"/>
   </Style>

   <Style x:Key="Height_GridSplitter" TargetType="{x:Type GridSplitter}">
+      <Setter Property="Background" Value="Transparent"/>
      <Setter Property="Height" Value="3"/>
      <Setter Property="HorizontalAlignment" Value="Stretch"/>
      <Setter Property="VerticalAlignment" Value="Center"/>
@@ -2518,13 +2520,11 @@
   <Style x:Key="ToolBarOnlyProdManager_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
      <Setter Property="Height" Value="30"/>
      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="10,2.5,2.5,2.5"/>
   </Style>

   <Style x:Key="ToolBarOnlyProdManagerNew_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
      <Setter Property="Height" Value="30"/>
      <Setter Property="Width" Value="30"/>
-      <Setter Property="Margin" Value="2,2.5,2.5,2.5"/>
   </Style>

   <Style x:Key="ToolBarOnlyProdManagerGoToSupervisor_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource OnlyProd_Button}">
@@ -2710,6 +2710,8 @@
      <Setter Property="Foreground" Value="{StaticResource BeamWall_White}"/>
      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
      <Setter Property="FontSize" Value="15"/>
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="120"/>
      <Setter Property="Background">
         <Setter.Value>
            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
@@ -2800,6 +2802,7 @@
      <Setter Property="BorderThickness" Value="2"/>
      <Setter Property="Padding" Value="20,2,20,2"/>
      <Setter Property="Margin" Value="2,2,20,2"/>
+      <Setter Property="CornerRadius" Value="2"/>
   </Style>

   <Style x:Key="OnlyProdDoneTime_Border" TargetType="{x:Type Border}">
@@ -2809,6 +2812,7 @@
      <Setter Property="BorderThickness" Value="2"/>
      <Setter Property="Padding" Value="20,2,20,2"/>
      <Setter Property="Margin" Value="2,2,20,2"/>
+      <Setter Property="CornerRadius" Value="2"/>
   </Style>

   <Style x:Key="OnlyProdRemainingTime_Border" TargetType="{x:Type Border}">
@@ -2818,6 +2822,7 @@
      <Setter Property="BorderThickness" Value="2"/>
      <Setter Property="Padding" Value="20,2,20,2"/>
      <Setter Property="Margin" Value="2"/>
+      <Setter Property="CornerRadius" Value="2"/>
   </Style>

   <Style x:Key="OnlyProdQty_Border" TargetType="{x:Type Border}">