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 @@
+
+ LeftPanelV.xaml
+
+
+
+ PartInRawPartListV.xaml
+
+
+ RawPartListV.xaml
+
@@ -185,6 +195,18 @@
ViewPanelV.xaml
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+
+
+ MSBuild:Compile
+ Designer
+ MSBuild:CompileDesigner
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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"
+
+ '''
+ ''' Returns a command that do Exec.
+ '''
+ 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
+
+ '''
+ ''' Execute the Exec. This method is invoked by the ExecCommand.
+ '''
+ 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"
+
+ '''
+ ''' Returns a command that do Exec.
+ '''
+ 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
+
+ '''
+ ''' Execute the Exec. This method is invoked by the ExecCommand.
+ '''
+ 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"
+
+ '''
+ ''' Returns a command that do Exec.
+ '''
+ 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
+
+ '''
+ ''' Execute the Exec. This method is invoked by the ExecCommand.
+ '''
+ 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"
+
+ '''
+ ''' Returns a command that do Exec.
+ '''
+ 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
+
+ '''
+ ''' Execute the Exec. This method is invoked by the ExecCommand.
+ '''
+ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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">
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+ -->
+ -->
+ -->
+ -->
+ -->
+ -->
+ -->
+ -->
+ -->
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"
-
- '''
- ''' Returns a command that do Exec.
- '''
- 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
-
- '''
- ''' Execute the Exec. This method is invoked by the ExecCommand.
- '''
- 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"
-
- '''
- ''' Returns a command that do Exec.
- '''
- 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
-
- '''
- ''' Execute the Exec. This method is invoked by the ExecCommand.
- '''
- 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"
-
- '''
- ''' Returns a command that do Exec.
- '''
- 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
-
- '''
- ''' Execute the Exec. This method is invoked by the ExecCommand.
- '''
- 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"
-
- '''
- ''' Returns a command that do Exec.
- '''
- 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
-
- '''
- ''' Execute the Exec. This method is invoked by the ExecCommand.
- '''
- 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"/>
-
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 @@
-
+
+