From fa63d82dc557d2a568f28801908a0c2facb3c2cc Mon Sep 17 00:00:00 2001
From: Emmanuele Sassi <emmanuele.sassi@egaltech.com>
Date: Fri, 16 Apr 2021 00:04:28 +0200
Subject: [PATCH] Liste funzionanti in Supervisor

---
 .../Controllers/MachGroupController.cs        |   2 +-
 .../EgtBEAMWALL.Supervisor.vbproj             |  22 +++
 .../LeftPanel/LeftPanelV.xaml                 |  98 +++++++++++
 .../LeftPanel/LeftPanelV.xaml.vb              |   3 +
 .../LeftPanel/LeftPanelVM.vb                  | 155 ++++++++++++++++++
 .../LeftPanel/PartInRawPartListV.xaml         | 116 +++++++++++++
 .../LeftPanel/PartInRawPartListV.xaml.vb      |  15 ++
 .../LeftPanel/RawPartListV.xaml               |  95 +++++++++++
 .../LeftPanel/RawPartListV.xaml.vb            |   3 +
 .../MainWindow/MainWindowV.xaml               |  47 ++----
 .../MainWindow/MainWindowVM.vb                | 125 --------------
 EgtBEAMWALL.Supervisor/Project/ProjectV.xaml  |   5 +-
 .../SupervisorManager/SupervisorManagerVM.vb  |   3 +-
 .../Utility/Dictionary.xaml                   |   4 +-
 EgtBEAMWALL.Supervisor/Utility/Map.vb         |  20 +--
 15 files changed, 539 insertions(+), 174 deletions(-)
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml.vb
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml.vb
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml
 create mode 100644 EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml.vb

diff --git a/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs b/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs
index 91191e2d..95745d43 100644
--- a/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs
+++ b/EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs
@@ -384,7 +384,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 // aggiorno
                 var currRecord = dbCtx
                 .PartList
-                .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId && x.PartId == PartId)
+                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                 .FirstOrDefault();
 
                 currRecord.DtStart = DtStart;
diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
index 8ad77044..6436e5d4 100644
--- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
+++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj
@@ -141,6 +141,16 @@
     <Compile Include="Constants\ConstMachIni.vb" />
     <Compile Include="Constants\ConstMsg.vb" />
     <Compile Include="Constants\ConstWarehouseIni.vb" />
+    <Compile Include="LeftPanel\LeftPanelV.xaml.vb">
+      <DependentUpon>LeftPanelV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LeftPanel\LeftPanelVM.vb" />
+    <Compile Include="LeftPanel\PartInRawPartListV.xaml.vb">
+      <DependentUpon>PartInRawPartListV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LeftPanel\RawPartListV.xaml.vb">
+      <DependentUpon>RawPartListV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MachGroupPanel\BeamMachGroupVM.vb" />
     <Compile Include="MachGroupPanel\BeamVM.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
@@ -185,6 +195,18 @@
     <Compile Include="ViewPanel\ViewPanelV.xaml.vb">
       <DependentUpon>ViewPanelV.xaml</DependentUpon>
     </Compile>
+    <Page Include="LeftPanel\LeftPanelV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="LeftPanel\PartInRawPartListV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="LeftPanel\RawPartListV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MachinePanel\MachinePanelV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
new file mode 100644
index 00000000..8a778ea4
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml
@@ -0,0 +1,98 @@
+<Grid x:Class="LeftPanelV"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:EgtWPFLib5="clr-namespace:EgtWPFLib5;assembly=EgtWPFLib5"
+      xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor"
+      Width="550">
+   
+   <Grid.RowDefinitions>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="Auto"/>
+      <RowDefinition Height="1*"/>
+      <RowDefinition Height="1*"/>
+   </Grid.RowDefinitions>
+   <GroupBox Header="Search &amp; Filter"
+             Margin="3,1,3,3">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <TextBlock Text="Parameter Type"/>
+         <!--<ComboBox ItemsSource="{Binding Tag.SearchParamList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+                   SelectedItem="{Binding Tag.SelSearchParam, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+                   Grid.Column="1"/>
+         <TextBlock Text="Text"
+                    Grid.Row="1"/>
+         <EgtWPFLib5:EgtTextBox Text="{Binding Tag.SearchText, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+                                Grid.Column="1"
+                                Grid.Row="1"/>
+         <TextBlock Text="Section"
+                    Grid.Row="2"/>
+         <ComboBox ItemsSource="{Binding Tag.SectionList, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+                   SelectedItem="{Binding Tag.SelSection, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+                   DisplayMemberPath="sSectionXMaterial"
+                   Grid.Column="1"
+                   Grid.Row="2"/>-->
+      </Grid>
+   </GroupBox>
+   <!--<Grid Grid.Row="1">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <StackPanel Orientation="Horizontal"
+                  HorizontalAlignment="Right">
+         <Button Content="N"
+                 Command="{Binding NewRawPart_Command}"
+                 Visibility="{Binding MachiningPage_Visibility}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+         <Button Content="A"
+                 Command="{Binding AddToRawPart_Command}"
+                 Visibility="{Binding MachiningPage_Visibility}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+         <Button Content="C"
+                 Command="{Binding CopyPart_Command}"
+                 Visibility="{Binding ViewPage_Visibility}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+         <Button Content="+"
+                 Command="{Binding AddPart_Command}"
+                 Visibility="{Binding ViewPage_Visibility}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+         <Button Content="-"
+                 Command="{Binding RemovePart_Command}"
+                 Visibility="{Binding ViewPage_Visibility}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+      </StackPanel>
+      <EgtBEAMWALL:PartListV DataContext="{Binding Tag, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"
+                             Grid.Row="1"/>
+   </Grid>-->
+   <StackPanel Grid.Row="1"
+               Orientation="Horizontal"
+               HorizontalAlignment="Right">
+      <Button Content="˄"
+                 Command="{Binding MoveUpRawPart_Command}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+      <Button Content="˅"
+                 Command="{Binding MoveDownRawPart_Command}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+      <Button Content="C"
+                 Command="{Binding DeleteRawPart_Command}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+      <Button Content="E"
+                 Command="{Binding CompletedRawPart_Command}"
+                 Style="{StaticResource LeftPanel_SmallButton}"/>
+   </StackPanel>
+
+   <EgtBEAMWALL:RawPartListV Grid.Row="2"
+                             DataContext="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"/>
+
+   <EgtBEAMWALL:PartInRawPartListV Grid.Row="3"
+                             DataContext="{Binding DataContext, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:LeftPanelV}}}"/>
+
+</Grid>
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml.vb b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml.vb
new file mode 100644
index 00000000..919aa0c7
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class LeftPanelV
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
new file mode 100644
index 00000000..67f2af9c
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb
@@ -0,0 +1,155 @@
+Imports System.Collections.ObjectModel
+Imports System.IO
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class LeftPanelVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Private m_MachGroupList As New ObservableCollection(Of MyMachGroupVM)
+   Public Property MachGroupList As ObservableCollection(Of MyMachGroupVM)
+      Get
+         Return m_MachGroupList
+      End Get
+      Set(value As ObservableCollection(Of MyMachGroupVM))
+         m_MachGroupList = value
+      End Set
+   End Property
+
+   Private m_SelMachGroup As MyMachGroupVM
+   Public Property SelMachGroup As MyMachGroupVM
+      Get
+         Return m_SelMachGroup
+      End Get
+      Set(value As MyMachGroupVM)
+         m_SelMachGroup = value
+         NotifyPropertyChanged(NameOf(SelMachGroup))
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdDeleteRawPart As ICommand
+   Private m_cmdMoveUpRawPart As ICommand
+   Private m_cmdMoveDownRawPart As ICommand
+   Private m_cmdCompletedRawPart As ICommand
+
+#End Region    'FIELDS & PROPERTIES
+
+   Sub New()
+      ' imposto riferimento su mappa
+      Map.SetRefLeftPanelVM(Me)
+   End Sub
+
+#Region "METHODS"
+
+   Friend Sub UpdateView()
+      NotifyPropertyChanged("ViewPage_Visibility")
+      NotifyPropertyChanged("MachiningPage_Visibility")
+   End Sub
+
+#End Region    ' METHODS
+
+#Region "COMMANDS"
+
+#Region "CompletedRawPart"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property CompletedRawPart_Command As ICommand
+      Get
+         If m_cmdCompletedRawPart Is Nothing Then
+            m_cmdCompletedRawPart = New Command(AddressOf CompletedRawPart)
+         End If
+         Return m_cmdCompletedRawPart
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub CompletedRawPart()
+      If IsNothing(m_SelMachGroup) Then Return
+      DbControllers.m_MachGroupController.UpdateStatus(m_SelMachGroup.Id, ItemState.Produced)
+   End Sub
+
+#End Region    ' CompletedRawPart
+
+#Region "DeleteRawPart"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property DeleteRawPart_Command As ICommand
+      Get
+         If m_cmdDeleteRawPart Is Nothing Then
+            m_cmdDeleteRawPart = New Command(AddressOf DeleteRawPart)
+         End If
+         Return m_cmdDeleteRawPart
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub DeleteRawPart()
+      If IsNothing(m_SelMachGroup) Then Return
+      DbControllers.m_MachGroupController.UpdateSupervisor(1, m_SelMachGroup.Id, DbControllers.m_SupervisorId)
+   End Sub
+
+#End Region    ' DeleteRawPart
+
+#Region "MoveUpRawPart"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property MoveUpRawPart_Command As ICommand
+      Get
+         If m_cmdMoveUpRawPart Is Nothing Then
+            m_cmdMoveUpRawPart = New Command(AddressOf MoveUpRawPart)
+         End If
+         Return m_cmdMoveUpRawPart
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub MoveUpRawPart()
+      If IsNothing(m_SelMachGroup) Then Return
+      DbControllers.m_MachGroupController.UpdateStatus(m_SelMachGroup.Id, ItemState.Produced)
+   End Sub
+
+#End Region    ' MoveUpRawPart
+
+#Region "MoveDownRawPart"
+
+   ''' <summary>
+   ''' Returns a command that do Exec.
+   ''' </summary>
+   Public ReadOnly Property MoveDownRawPart_Command As ICommand
+      Get
+         If m_cmdMoveDownRawPart Is Nothing Then
+            m_cmdMoveDownRawPart = New Command(AddressOf MoveDownRawPart)
+         End If
+         Return m_cmdMoveDownRawPart
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Exec.  This method is invoked by the ExecCommand.
+   ''' </summary>
+   Public Sub MoveDownRawPart()
+      If IsNothing(m_SelMachGroup) Then Return
+      DbControllers.m_MachGroupController.UpdateStatus(m_SelMachGroup.Id, ItemState.Produced)
+   End Sub
+
+#End Region    ' MoveDownRawPart
+
+#End Region    ' COMMANDS
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml b/EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml
new file mode 100644
index 00000000..20c69de4
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml
@@ -0,0 +1,116 @@
+<UserControl x:Class="PartInRawPartListV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <DataGrid ItemsSource="{Binding SelMachGroup.PartVMList}"
+             SelectedItem="{Binding SelPart}"
+             AutoGenerateColumns="False"
+             CanUserAddRows="False"
+             CanUserDeleteRows="False"
+             CanUserSortColumns="False"
+             CanUserResizeColumns="False"
+             CanUserResizeRows="False"
+             CanUserReorderColumns="False"
+             SelectionMode="Single"
+             ScrollViewer.CanContentScroll="True" 
+             ScrollViewer.VerticalScrollBarVisibility="Auto"
+             ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+             Margin="0,0,0,5">
+      <!--<DataGrid.RowStyle>
+         <Style TargetType="DataGridRow">
+            <EventSetter Event="PreviewMouseDown" Handler="PartInRawPartList_PreviewMouseDown"/>
+         </Style>
+      </DataGrid.RowStyle>-->
+      <DataGrid.Columns>
+         <!--PDN - Nome-->
+         <DataGridTextColumn Binding="{Binding nPDN}"
+                              IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="SN"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--Validità pezzo-->
+         <DataGridTemplateColumn Width="Auto">
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Border Background="{Binding Calc_Background}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--NAM - Descrizione-->
+         <DataGridTextColumn Binding="{Binding sNAM}"
+                             Width="1*"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Descrizione"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--W - Larghezza-->
+         <DataGridTextColumn Binding="{Binding dW}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="W"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--H - Altezza-->
+         <DataGridTextColumn Binding="{Binding dH}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="H"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--L - Lunghezza-->
+         <DataGridTextColumn Binding="{Binding dL}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="L"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--ROT - Rotazione-->
+         <DataGridTextColumn Binding="{Binding sROTATED}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Rotazione"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--INV - Inversione-->
+         <DataGridTextColumn Binding="{Binding sINVERTED}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Inversione"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--Pos - Posizione-->
+         <DataGridTextColumn Binding="{Binding sPOSX}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Posizione"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--Off - Offset-->
+         <DataGridTextColumn Binding="{Binding sOffset}"
+                             Width="65">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Offset"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--MAT - Materiale-->
+         <DataGridTextColumn Binding="{Binding sMATERIAL}"
+                             Width="1*"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Materiale"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+
+      </DataGrid.Columns>
+
+   </DataGrid>
+
+</UserControl>
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml.vb b/EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml.vb
new file mode 100644
index 00000000..d95da92c
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/PartInRawPartListV.xaml.vb
@@ -0,0 +1,15 @@
+Imports EgtBEAMWALL.Core
+
+Public Class PartInRawPartListV
+
+   'Private Sub PartInRawPartList_PreviewMouseDown(sender As Object, e As MouseButtonEventArgs)
+   '   If TypeOf sender Is DataGridRow Then
+   '      Dim Row As DataGridRow = DirectCast(sender, DataGridRow)
+   '      If Not IsNothing(Row) AndAlso Row.IsSelected Then
+   '         Dim MyMachGroup As MyMachGroupVM = Map.refMachGroupPanelVM.SelectedMachGroup
+   '         MyMachGroup.SelPart = MyMachGroup.SelPart
+   '      End If
+   '   End If
+   'End Sub
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml b/EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml
new file mode 100644
index 00000000..a7f5d2c0
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml
@@ -0,0 +1,95 @@
+<UserControl x:Class="RawPartListV"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Supervisor">
+   <!--<ToggleButton IsChecked="{Binding DataContext.bL_IsReadOnly, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>-->
+   <DataGrid ItemsSource="{Binding MachGroupList}"
+             SelectedItem="{Binding SelMachGroup}"
+             AutoGenerateColumns="False"
+             CanUserDeleteRows="False"
+             CanUserSortColumns="False"
+             CanUserResizeColumns="False"
+             CanUserResizeRows="False"
+             CanUserReorderColumns="False"
+             SelectionMode="Single"
+             ScrollViewer.CanContentScroll="True" 
+             ScrollViewer.VerticalScrollBarVisibility="Auto"
+             ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+             Margin="0,0,0,5">
+      <DataGrid.Columns>
+         <!--ID - Id gruppo-->
+         <DataGridTextColumn Binding="{Binding Name}"
+                             Width="Auto"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="ID"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--Validità pezzo-->
+         <DataGridTemplateColumn Width="Auto">
+            <DataGridTemplateColumn.CellTemplate>
+               <DataTemplate>
+                  <Border Background="{Binding Calc_Background}"/>
+               </DataTemplate>
+            </DataGridTemplateColumn.CellTemplate>
+         </DataGridTemplateColumn>
+         <!--STARTCUT - Ritaglio iniziale-->
+         <DataGridTextColumn Binding="{Binding sStartCut}"
+                             Width="65">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Ritaglio iniziale"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--W - Larghezza-->
+         <DataGridTextColumn Binding="{Binding dW}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="W"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--H - Altezza-->
+         <DataGridTextColumn Binding="{Binding dH}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="H"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--L - Lunghezza-->
+         <DataGridTextColumn Binding="{Binding dL}"
+                             Width="65"
+                             IsReadOnly="{Binding Path=DataContext.bL_IsReadOnly, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="L"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--MAT - Materiale-->
+         <DataGridTextColumn Binding="{Binding dL}"
+                             Width="1*"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Materiale"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--% - % utilizzo-->
+         <DataGridTextColumn Binding="{Binding dUsage}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="% utilizzo"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--S - Scarti-->
+         <DataGridTextColumn Binding="{Binding dWaste}"
+                             Width="65"
+                             IsReadOnly="True">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="Scarti"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+      </DataGrid.Columns>
+
+   </DataGrid>
+
+</UserControl>
diff --git a/EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml.vb b/EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml.vb
new file mode 100644
index 00000000..372afa72
--- /dev/null
+++ b/EgtBEAMWALL.Supervisor/LeftPanel/RawPartListV.xaml.vb
@@ -0,0 +1,3 @@
+Public Class RawPartListV
+
+End Class
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
index 38abbc7d..a649a343 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowV.xaml
@@ -9,30 +9,16 @@
                             MinHeight="600" MinWidth="800">
    <Grid>
       <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="1*"/>
-         <RowDefinition Height="Auto"/>
+         <!--<RowDefinition Height="Auto"/>-->
          <RowDefinition Height="1*"/>
+         <!--<RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>-->
       </Grid.RowDefinitions>
+      
       <EgtBEAMWALL:ProjectV DataContext="{StaticResource ProjectVM}"/>
 
-      <StackPanel Orientation="Horizontal"
-                  HorizontalAlignment="Right">
-         <Button Content="˄"
-                 Command="{Binding MoveUpRawPart_Command}"
-                 Style="{StaticResource LeftPanel_SmallButton}"/>
-         <Button Content="˅"
-                 Command="{Binding MoveDownRawPart_Command}"
-                 Style="{StaticResource LeftPanel_SmallButton}"/>
-         <Button Content="C"
-                 Command="{Binding DeleteRawPart_Command}"
-                 Style="{StaticResource LeftPanel_SmallButton}"/>
-         <Button Content="E"
-                 Command="{Binding CompletedRawPart_Command}"
-                 Style="{StaticResource LeftPanel_SmallButton}"/>
-      </StackPanel>
       
-      <DataGrid Grid.Row="1"
+      <!--<DataGrid Grid.Row="1"
                 ItemsSource="{Binding MachGroupList}"
                 SelectedItem="{Binding SelMachGroup}"
                 AutoGenerateColumns="False"
@@ -46,11 +32,8 @@
                 ScrollViewer.VerticalScrollBarVisibility="Auto"
                 ScrollViewer.HorizontalScrollBarVisibility="Hidden"
                 Margin="0,0,0,5">
-         <DataGrid.InputBindings>
-            <KeyBinding Key="Delete" Command="{Binding DeleteMachGroup_Command}"/>
-         </DataGrid.InputBindings>
          <DataGrid.Columns>
-            <!--ID - Id gruppo-->
+            --><!--ID - Id gruppo--><!--
             <DataGridTextColumn Binding="{Binding Name}"
                                 Width="Auto"
                                 IsReadOnly="True">
@@ -58,7 +41,7 @@
                   <TextBlock Text="ID"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--Validità pezzo-->
+            --><!--Validità pezzo--><!--
             <DataGridTemplateColumn Width="Auto">
                <DataGridTemplateColumn.CellTemplate>
                   <DataTemplate>
@@ -66,14 +49,14 @@
                   </DataTemplate>
                </DataGridTemplateColumn.CellTemplate>
             </DataGridTemplateColumn>
-            <!--STARTCUT - Ritaglio iniziale-->
+            --><!--STARTCUT - Ritaglio iniziale--><!--
             <DataGridTextColumn Binding="{Binding sStartCut}"
                                 Width="65">
                <DataGridTextColumn.Header>
                   <TextBlock Text="Ritaglio iniziale"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--W - Larghezza-->
+            --><!--W - Larghezza--><!--
             <DataGridTextColumn Binding="{Binding dW}"
                                 Width="65"
                                 IsReadOnly="True">
@@ -81,7 +64,7 @@
                   <TextBlock Text="W"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--H - Altezza-->
+            --><!--H - Altezza--><!--
             <DataGridTextColumn Binding="{Binding dH}"
                                 Width="65"
                                 IsReadOnly="True">
@@ -89,7 +72,7 @@
                   <TextBlock Text="H"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--L - Lunghezza-->
+            --><!--L - Lunghezza--><!--
             <DataGridTextColumn Binding="{Binding dL}"
                                 Width="65"
                                 IsReadOnly="True">
@@ -97,7 +80,7 @@
                   <TextBlock Text="L"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--MAT - Materiale-->
+            --><!--MAT - Materiale--><!--
             <DataGridTextColumn Binding="{Binding dL}"
                                 Width="1*"
                                 IsReadOnly="True">
@@ -105,7 +88,7 @@
                   <TextBlock Text="Materiale"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--% - % utilizzo-->
+            --><!--% - % utilizzo--><!--
             <DataGridTextColumn Binding="{Binding dUsage}"
                                 Width="65"
                                 IsReadOnly="True">
@@ -113,7 +96,7 @@
                   <TextBlock Text="% utilizzo"/>
                </DataGridTextColumn.Header>
             </DataGridTextColumn>
-            <!--S - Scarti-->
+            --><!--S - Scarti--><!--
             <DataGridTextColumn Binding="{Binding dWaste}"
                                 Width="65"
                                 IsReadOnly="True">
@@ -123,7 +106,7 @@
             </DataGridTextColumn>
          </DataGrid.Columns>
 
-      </DataGrid>
+      </DataGrid>-->
 
    </Grid>
 
diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
index 47fd5001..90c548af 100644
--- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
+++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb
@@ -19,31 +19,6 @@ Public Class MainWindowVM
       End Get
    End Property
 
-   Private m_MachGroupList As New List(Of MyMachGroupM)
-   Public Property MachGroupList As List(Of MyMachGroupM)
-      Get
-         Return m_MachGroupList
-      End Get
-      Set(value As List(Of MyMachGroupM))
-         m_MachGroupList = value
-      End Set
-   End Property
-
-   Private m_SelMachGroup As MyMachGroupM
-   Public Property SelMachGroup As MyMachGroupM
-      Get
-         Return m_SelMachGroup
-      End Get
-      Set(value As MyMachGroupM)
-         m_SelMachGroup = value
-      End Set
-   End Property
-
-   ' Definizione comandi
-   Private m_cmdDeleteRawPart As ICommand
-   Private m_cmdMoveUpRawPart As ICommand
-   Private m_cmdMoveDownRawPart As ICommand
-   Private m_cmdCompletedRawPart As ICommand
 
 #Region "CONSTRUCTOR"
 
@@ -100,104 +75,4 @@ Public Class MainWindowVM
 
 #End Region    ' METHODS
 
-#Region "COMMANDS"
-
-#Region "CompletedRawPart"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property CompletedRawPart_Command As ICommand
-      Get
-         If m_cmdCompletedRawPart Is Nothing Then
-            m_cmdCompletedRawPart = New Command(AddressOf CompletedRawPart)
-         End If
-         Return m_cmdCompletedRawPart
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub CompletedRawPart()
-      If IsNothing(m_SelMachGroup) Then Return
-      DbControllers.m_MachGroupController.UpdateStatus(m_SelMachGroup.Id, ItemState.Produced)
-   End Sub
-
-#End Region    ' CompletedRawPart
-
-#Region "DeleteRawPart"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property DeleteRawPart_Command As ICommand
-      Get
-         If m_cmdDeleteRawPart Is Nothing Then
-            m_cmdDeleteRawPart = New Command(AddressOf DeleteRawPart)
-         End If
-         Return m_cmdDeleteRawPart
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub DeleteRawPart()
-      If IsNothing(m_SelMachGroup) Then Return
-      DbControllers.m_MachGroupController.UpdateSupervisor(1, m_SelMachGroup.Id, DbControllers.m_SupervisorId)
-   End Sub
-
-#End Region    ' DeleteRawPart
-
-#Region "MoveUpRawPart"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property MoveUpRawPart_Command As ICommand
-      Get
-         If m_cmdMoveUpRawPart Is Nothing Then
-            m_cmdMoveUpRawPart = New Command(AddressOf MoveUpRawPart)
-         End If
-         Return m_cmdMoveUpRawPart
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub MoveUpRawPart()
-      If IsNothing(m_SelMachGroup) Then Return
-      DbControllers.m_MachGroupController.UpdateStatus(m_SelMachGroup.Id, ItemState.Produced)
-   End Sub
-
-#End Region    ' MoveUpRawPart
-
-#Region "MoveDownRawPart"
-
-   ''' <summary>
-   ''' Returns a command that do Exec.
-   ''' </summary>
-   Public ReadOnly Property MoveDownRawPart_Command As ICommand
-      Get
-         If m_cmdMoveDownRawPart Is Nothing Then
-            m_cmdMoveDownRawPart = New Command(AddressOf MoveDownRawPart)
-         End If
-         Return m_cmdMoveDownRawPart
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the Exec.  This method is invoked by the ExecCommand.
-   ''' </summary>
-   Public Sub MoveDownRawPart()
-      If IsNothing(m_SelMachGroup) Then Return
-      DbControllers.m_MachGroupController.UpdateStatus(m_SelMachGroup.Id, ItemState.Produced)
-   End Sub
-
-#End Region    ' MoveDownRawPart
-
-#End Region    ' COMMANDS
-
 End Class
diff --git a/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml b/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml
index 1d85cef6..a1453ce6 100644
--- a/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml
+++ b/EgtBEAMWALL.Supervisor/Project/ProjectV.xaml
@@ -10,11 +10,10 @@
                                  Visibility="Collapsed"/>
    </EgtFloating:EgtFloatingTray>
 
-   <!--<EgtBEAMWALL:LeftPanelV DockPanel.Dock="Left"
+   <EgtBEAMWALL:LeftPanelV DockPanel.Dock="Right"
                            DataContext="{StaticResource LeftPanelVM}"
-                           Tag="{Binding DataContext.BTLStructureVM, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
                            Visibility="{Binding DataContext.LeftPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>
-   <EgtBEAMWALL:BottomPanelV DockPanel.Dock="Bottom"
+   <!--<EgtBEAMWALL:BottomPanelV DockPanel.Dock="Bottom"
                              DataContext="{StaticResource BottomPanelVM}"
                              Tag="{Binding DataContext.BTLStructureVM.SelBTLPart, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"
                              Visibility="{Binding DataContext.BottomPanel_Visibility, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:ProjectV}}}"/>-->
diff --git a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
index c64d5bd4..71709718 100644
--- a/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
+++ b/EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb
@@ -125,8 +125,9 @@ Public Class SupervisorManagerVM
       End If
       Dim TempList As List(Of DataLayer.DatabaseModels.MachGroupModel) = DbControllers.m_MachGroupController.GetByProdSupervisor(Map.refSupervisorManagerVM.CurrProd.nProdId, m_SupervisorId)
       For Each MachGroup In TempList
-         '''m_MachGroupList.Add(New BeamMachGroupM(MachGroup.MachGroupDbId, MachGroup.Name, m_SupervisorMachineName))
+         Map.refLeftPanelVM.MachGroupList.Add(Map.refProjectVM.MachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = MachGroup.MachGroupId))
       Next
+      Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.MachGroupList))
    End Sub
 
 #End Region ' OpenCommand
diff --git a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
index 8a0d4de5..8beb9a9f 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
+++ b/EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml
@@ -22,8 +22,8 @@
    <!--<EgtBEAMWALL:MyInstrumentPanelVM x:Key="InstrumentPanelVM"/>-->
    <EgtBEAMWALL:MachinePanelVM x:Key="MachinePanelVM"/>
    <!--<EgtBEAMWALL:PartParametersVM x:Key="PartParametersVM"/>-->
-   <!--<EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
-   <EgtBEAMWALL:BottomPanelVM x:Key="BottomPanelVM"/>-->
+   <EgtBEAMWALL:LeftPanelVM x:Key="LeftPanelVM"/>
+   <!--<EgtBEAMWALL:BottomPanelVM x:Key="BottomPanelVM"/>-->
    <!--<EgtBEAMWALL:ConfigurationPageVM x:Key="ConfigurationPageVM"/>
    <EgtBEAMWALL:TopPanelVM x:Key="TopPanelVM"/>
    <EgtBEAMWALL:RawPartListVM x:Key="RawPartListVM"/>
diff --git a/EgtBEAMWALL.Supervisor/Utility/Map.vb b/EgtBEAMWALL.Supervisor/Utility/Map.vb
index 63bbb5b7..cb5219d5 100644
--- a/EgtBEAMWALL.Supervisor/Utility/Map.vb
+++ b/EgtBEAMWALL.Supervisor/Utility/Map.vb
@@ -10,7 +10,7 @@ Module Map
    'Private m_refMainMenuVM As MainMenuVM
    Private m_refMachinePanelVM As MachinePanelVM
    Private m_refMyMachGroupPanelVM As MyMachGroupPanelVM
-   'Private m_refLeftPanelVM As LeftPanelVM
+   Private m_refLeftPanelVM As LeftPanelVM
    'Private m_refBottomPanelVM As BottomPanelVM
    'Private m_refShowBeamPanelVM As ShowBeamPanelVM
    'Private m_refConfigurationPageVM As ConfigurationPageVM
@@ -78,11 +78,11 @@ Module Map
       End Get
    End Property
 
-   'Public ReadOnly Property refLeftPanelVM As LeftPanelVM
-   '   Get
-   '      Return m_refLeftPanelVM
-   '   End Get
-   'End Property
+   Public ReadOnly Property refLeftPanelVM As LeftPanelVM
+      Get
+         Return m_refLeftPanelVM
+      End Get
+   End Property
 
    Public ReadOnly Property refMachGroupPanelVM As MyMachGroupPanelVM
       Get
@@ -206,10 +206,10 @@ Module Map
       Return Not IsNothing(m_refMachinePanelVM)
    End Function
 
-   'Friend Function SetRefLeftPanelVM(LeftPanelVM As LeftPanelVM) As Boolean
-   '   m_refLeftPanelVM = LeftPanelVM
-   '   Return Not IsNothing(m_refLeftPanelVM)
-   'End Function
+   Friend Function SetRefLeftPanelVM(LeftPanelVM As LeftPanelVM) As Boolean
+      m_refLeftPanelVM = LeftPanelVM
+      Return Not IsNothing(m_refLeftPanelVM)
+   End Function
 
    Friend Function SetRefMachGroupPanelVM(MachGroupPanelVM As MyMachGroupPanelVM) As Boolean
       m_refMyMachGroupPanelVM = MachGroupPanelVM