Merge branch 'DataLayer' into Test_CICD

- Correzione uscita da pagina Configurazione che bloccava il programma
- Creazione path DataDir per funzionamento in rete

.gitignore

@@ -327,3 +327,4 @@ _UpgradeReport_Files/
 Backup*/
 UpgradeLog*.XML
 
+.ionide/symbolCache.db

.gitlab-ci.yml

@@ -0,0 +1,113 @@
+variables:
+ NUGET_PATH: 'C:\Tools\nuget.exe'
+ MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
+ ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
+ EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\GPW\Release'
+ DEPLOY_FOLDER: 'c:\Projects\Deploy\GPW\Builds'
+ APP_NAME: 'EgtBEAMWALL'
+ APP_NAMEG: 'EgtBEAMWALL'
+ NEW_REL: ''
+ VERS_RD: 'Release'
+ ARCH: 'x86'
+ ARCH64: 'x64'
+ OUTPUT_DIR: ''
+ NET_SHARE: '\\10.74.82.201\Artifacts\EgtProg\EgtBEAMWALL'
+ NET_USER: 'steamw\steamware'
+ 
+# helper x mount cartella Artifacts su truenas
+.ReplicaCompiled: &ReplicaCompiled
+  - |
+    rm -Recurse Z:\$CI_COMMIT_BRANCH\$env:ARCH\*.*
+    rm -Recurse Z:\$CI_COMMIT_BRANCH\$env:ARCH\*.*
+    ROBOCOPY /E $env:APP_NAME\bin\$env:ARCH\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH /XF *.xml /XF *.pdb
+    ROBOCOPY /E $env:APP_NAME2\bin\$env:ARCH\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH /XF *.xml /XF *.pdb
+    SLEEP 2
+    net use Z: /delete
+
+.ReplicaCompileds2: &ReplicaCompileds2
+  - |
+    ROBOCOPY /E $env:APP_NAME\bin\$env:ARCH64\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH64 /XF *.xml /XF *.pdb
+    ROBOCOPY /E $env:APP_NAME2\bin\$env:ARCH64\$env:VERS_RD Z:\$CI_COMMIT_BRANCH\$env:ARCH64 /XF *.xml /XF *.pdb
+    SLEEP 2
+    net use Z: /delete
+
+.MakeFolderM: &MakeFolderM
+  - |
+    net use Z: /delete
+    new-item c:\EgtProg\EgtBEAMWALL -itemtype directory
+    net use Z: $env:NET_SHARE 
+    
+.nuget-fix: &nuget-fix
+  - |
+    $hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
+    if ($hasSource -eq 0) {
+        C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
+    } else {
+        C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"$NEXUS_PASSWD`""
+    }
+    echo $hasSource
+
+
+# helper creazione hash files
+.hashBuild: &hashBuild
+   - |
+      $Target = "Releases\" + $CI_COMMIT_BRANCH + "\" + $env:APP_NAME + ".zip"
+      $MD5 = Get-FileHash $Target -Algorithm MD5
+      $SHA1 = Get-FileHash $Target -Algorithm SHA1
+      New-Item $Target".md5"
+      New-Item $Target".sha1"
+      $MD5.Hash | Set-Content -Path $Target".md5"
+      $SHA1.Hash | Set-Content -Path $Target".sha1"
+
+      echo "Created HASH files for $Target"      
+
+.cleanup-dir: &cleanup-dir
+   - |
+      rm $env:APP_NAME\bin\$env:ARCH\$env:VERS_RD\*.xml
+      rm $env:APP_NAME\bin\$env:ARCH\$env:VERS_RD\*.pdb
+      rm $env:APP_NAME\bin\$env:ARCH64\$env:VERS_RD\*.xml
+      rm $env:APP_NAME\bin\$env:ARCH64\$env:VERS_RD\*.pdb
+
+stages:
+ - build
+ - deploy
+ 
+X86:build:
+ stage: build
+ tags:
+   - win
+ variables:
+   APP_NAME: EgtBEAMWALL.Supervisor
+   APP_NAME2: EgtBEAMWALL.ViewerOptimizer
+   VERS_RD: 'Release'
+   ARCH: 'x86'
+   ARCH64: 'x64'
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore EgtBEAMWALL.sln -verbosity quiet'
+   - *MakeFolderM
+ script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH" /p:OutputPath=bin/$env:ARCH/$env:VERS_RD/ /verbosity:minimal /m'
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME2\$env:APP_NAME2.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH" /p:OutputPath=bin/$env:ARCH/$env:VERS_RD/ /verbosity:minimal /m'
+    - *ReplicaCompiled
+   
+
+X64:build:
+ stage: build
+ tags:
+   - win
+ variables:
+   APP_NAME: EgtBEAMWALL.Supervisor
+   APP_NAME2: EgtBEAMWALL.ViewerOptimizer
+   VERS_RD: 'Release'
+   ARCH: 'x86'
+   ARCH64: 'x64'
+ before_script:
+   - *nuget-fix
+   - '& "$env:NUGET_PATH" restore EgtBEAMWALL.sln -verbosity quiet'
+   - *MakeFolderM
+ script:  
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH64" /p:OutputPath=bin/$env:ARCH64/$env:VERS_RD/ /verbosity:minimal /m'
+    - '& "$env:MSBUILD_PATH" "$env:APP_NAME2\$env:APP_NAME2.vbproj" -target:Build /p:Configuration=$env:VERS_RD /p:Platform="$env:ARCH64" /p:OutputPath=bin/$env:ARCH64/$env:VERS_RD/ /verbosity:minimal /m'
+    - *ReplicaCompileds2
+

EgtBEAMWALL.Core/BTLModel/BTLFeatureM.vb

@@ -174,7 +174,7 @@ Public Class BTLFeatureM
    Protected m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return m_sCALC_MSG
+         Return MessageFromLuaMsg(m_sCALC_MSG)
       End Get
       Set(value As String)
          m_sCALC_MSG = value

EgtBEAMWALL.Core/BTLModel/BTLPartM.vb

@@ -666,7 +666,7 @@ Public Class BTLPartM
    Private m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return m_sCALC_MSG
+         Return MessageFromLuaMsg(m_sCALC_MSG)
       End Get
       Set(value As String)
          m_sCALC_MSG = value

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -126,6 +126,8 @@
 
    ' layer per assemblato
    Public Const ASSEBASE As String = "AsseBase"
+   ' info parametri assemblato
+   Public Const BTL_ASSEBASE_N As String = "N"
 
    ' info parametri BTL
    Public Const BTL_PRT_PROJ As String = "PROJ"
@@ -284,6 +286,7 @@
    Public Const WRH_CURRENT As String = "Current"
    Public Const WRH_STARTOFFSET As String = "StartOffset"
    Public Const WRH_OFFSET As String = "Offset"
+   Public Const WRH_RANGE As String = "Range"
    Public Const WRH_QUANTITY As String = "Quantity"
    Public Const WRH_L As String = "L"
    Public Const WRH_KERF As String = "Kerf"

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -27,6 +27,7 @@
    Public Const S_SECTXMATLIST_WALL As String = "DG_SectXMatList_WALL"
    Public Const S_VARIABLESLIST As String = "DG_VariablesList"
    Public Const S_MDICOMMANDS As String = "DG_MDICommands"
+   Public Const S_UPDATEBTLPARTLIST As String = "DG_UpdateBTLPartList"
 
    Public Const K_LOCKTABLE As String = "LockTable"
 

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -75,8 +75,6 @@ Public Module ConstGen
    Public Const SETUP_LUA As String = "SetUp.lua"
    ' Nome eseguibile per stampa
    Public Const ZEBRAPRINTER_EXE As String = "ZebraPrinterUtilitiesD32.exe"
-   ' Nome eseguibile per applicativo di invio feedback
-   Public Const LIMANTRANSFER_EXE As String = "LiMan.Transfer.exe"
    ' Sottodirettorio di default per macro
    Public Const MACRO_DFL_DIR As String = "Macro"
 

EgtBEAMWALL.Core/Constants/ConstIni.vb

@@ -37,7 +37,9 @@ Public Module ConstIni
    'Public Const K_SUPPORT As String = "Support"
    Public Const K_WAREHOUSE As String = "Warehouse"
    Public Const K_DBADDRESS As String = "DbAddress"
-   Public Const K_LIMANUTILITIES As String = "LiManUtilities"
+   Public Const K_DBMASTERKEY As String = "DbMasterKey"
+   Public Const K_UPDATEBTL As String = "UpdateBtl"
+   Public Const K_DATADIR As String = "DataDir"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"
@@ -134,11 +136,6 @@ Public Module ConstIni
    Public Const K_ZEBRAUTILITIES As String = "ZebraUtilities"
    Public Const K_TEMPLATE As String = "Template"
 
-   Public Const S_CUSTOMERCONTACT As String = "CustomerContact"
-   Public Const K_CONTACTEMAIL As String = "ContactEmail"
-   Public Const K_CONTACTNAME As String = "ContactName"
-   Public Const K_CONTACTPHONE As String = "ContactPhone"
-
    Public Const S_BEAM_LIST As String = "Beam_List"
    Public Const S_WALL_LIST As String = "Wall_List"
 

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -47,18 +47,17 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib, Version=2.3.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
+    <Reference Include="EgtUILib">
+      <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib5, Version=2.3.4.3, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
+    <Reference Include="EgtWPFLib5">
+      <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />
@@ -108,12 +107,18 @@
     <Compile Include="BTLModel\BTLPartM.vb" />
     <Compile Include="BTLModel\BTLStructureM.vb" />
     <Compile Include="Constants\ConstBeam.vb" />
+    <Compile Include="LoadingWnd\LoadingWndHelper.vb" />
+    <Compile Include="LoadingWnd\LoadingWndV.xaml.vb">
+      <DependentUpon>LoadingWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="LoadingWnd\LoadingWndVM.vb" />
     <Compile Include="Utility\DimensionsIniFile.vb" />
     <Compile Include="Utility\Enum.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupPanelVM.vb" />
     <Compile Include="MachGroupPanel\MyMachGroupVM.vb" />
     <Compile Include="MachGroupPanel\PartVM.vb" />
     <Compile Include="Utility\GridDimension.vb" />
+    <Compile Include="Utility\LuaMsgManager.vb" />
     <Compile Include="Utility\MachLog.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
     <Compile Include="My Project\Application.Designer.vb">
@@ -135,6 +140,7 @@
     <Compile Include="Lib\MachGroupM.vb" />
     <Compile Include="Lib\MachGroupPanelM.vb" />
     <Compile Include="MachGroupModel\MyMachGroupPanelM.vb" />
+    <Compile Include="Utility\ManageWindow.vb" />
     <Compile Include="Utility\MyMachine.vb" />
     <Compile Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml.vb">
       <DependentUpon>OpenProjectFileDialogV.xaml</DependentUpon>
@@ -180,6 +186,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="LoadingWnd\LoadingWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>XamlIntelliSenseFileGenerator</Generator>
+    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml

@@ -2,13 +2,16 @@
           x:Name="CurrDataGrid"
           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <DataGrid.ColumnHeaderStyle>
-        <Style TargetType="DataGridColumnHeader">
-            <EventSetter Event="SizeChanged" Handler="Cell_SizedChanged" />
-            <EventSetter Event="MouseRightButtonDown" Handler="Cell_MouseRightButtonDown" />
-            <EventSetter Event="FrameworkElement.Loaded" Handler="DataGridColumnHeader_Loaded"/>
-        </Style>
-    </DataGrid.ColumnHeaderStyle>
+   <DataGrid.ColumnHeaderStyle>
+      <Style TargetType="DataGridColumnHeader">
+         <Setter Property="HorizontalContentAlignment"
+                 Value="Stretch" />
+         <EventSetter Event="SizeChanged" 
+                      Handler="Cell_SizedChanged" />
+         <EventSetter Event="MouseRightButtonDown" 
+                      Handler="Cell_MouseRightButtonDown" />
+      </Style>
+   </DataGrid.ColumnHeaderStyle>
 
 </DataGrid>
 

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -14,20 +14,13 @@ Public Class EgtDataGrid
 
    ' vecchio indice da salvare per il Reorder delle colonne
    Public OldIndex As Integer = 0
-
-   ' variabili e costanti per il Resize delle colonne adiacenti
-   Private Const LEFT As String = "PART_LeftHeaderGripper"
-   Private Const RIGHT As String = "PART_RightHeaderGripper"
-   Private startPoint As Point
-   Private startWidth As Double
-   Private adjacentStartWidth As Double
-   'Private startUnitType As DataGridLengthUnitType
-   'Private adjacentUnitType As DataGridLengthUnitType
-   Private targetColumn As DataGridColumn
-   Private adjacentColumn As DataGridColumn
-
    ' indice header su cui è aperto il ContextMenu per gestione check/uncheck LockTable
    Private HeaderDispIndex As Integer = 0
+   ' somma delle larghezze delle colonne di EgtDataGrid
+   Private columnsWidth As Double = 0
+
+   ' larghezza minima dell'ultima colonna per attivare/disattivare ScrollBar orizzontale
+   Private Const LASTCOLUMN_MINWIDTH As Double = 40
 
    Sub New()
       InitializeComponent()
@@ -138,6 +131,44 @@ Public Class EgtDataGrid
       End If
    End Sub
 
+   Private Sub DataGrid_SizedChanged(sender As Object, e As SizeChangedEventArgs) Handles CurrDataGrid.SizeChanged
+      ' confronto la larghezza effettiva della EgtDataGrid con la somma delle larghezze delle colonne
+      UpdateColumnsWidth()
+      If BindingColumns.Count > 0 Then
+         If CurrDataGrid.ActualWidth - LASTCOLUMN_MINWIDTH > columnsWidth Then
+            ' nascondo la ScrollBar orizzontale e setto lo UnitType dell'ultima colonna visibile a Star
+            ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Hidden)
+            BindingColumns.Last(Function(x) x.Visible = True).Width = New DataGridLength(1, DataGridLengthUnitType.Star)
+         Else
+            ' mostro la ScrollBar orizzontale e se UnitType delle colonne è Star lo setto a Pixel
+            ScrollViewer.SetHorizontalScrollBarVisibility(CurrDataGrid, ScrollBarVisibility.Visible)
+            For Each bc In BindingColumns
+               If bc.Width.IsStar Then
+                  bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel)
+               End If
+            Next
+         End If
+         ' scrivo nell'INI la Width dell'ultima colonna visibile
+         BindingColumns.Last(Function(x) x.Visible = True).SaveDataGridColumn()
+      End If
+   End Sub
+
+   Public Sub UpdateColumnsWidth()
+      ' ricalcolo la somma delle larghezze delle colonne visibili
+      columnsWidth = 0
+      For Each col In BindingColumns
+         If col.ColumnVisibility = Visibility.Visible Then
+            columnsWidth += col.ActualWidth
+         End If
+      Next
+      ' alla somma calcolata tolgo la larghezza dell'ultima colonna visibile e aggiungo LASTCOLUMN_MINWIDTH
+      ' (in questo modo si attiva/disattiva la ScrollBar orizzontale non appena l'ultima colonna viene ristretta/estesa a LASTCOLUMN_MINWIDTH px)
+      If BindingColumns.Count > 0 AndAlso
+         BindingColumns.Any(Function(x) x.Visible = True) Then
+         columnsWidth = columnsWidth - BindingColumns.Last(Function(x) x.Visible = True).ActualWidth + LASTCOLUMN_MINWIDTH
+      End If
+   End Sub
+
    Private Sub Cell_MouseRightButtonDown(sender As Object, e As RoutedEventArgs)
       Dim nDispIndex As Integer = sender.DisplayIndex
       ' creo il ContextMenu con gli item checkabili
@@ -240,86 +271,6 @@ Public Class EgtDataGrid
       Next
    End Sub
 
-   Private Sub DataGridColumnHeader_Loaded(sender As Object, e As RoutedEventArgs)
-      Dim header = DirectCast(sender, DataGridColumnHeader)
-
-      Dim thumbLeft As Thumb = header.Template.FindName(LEFT, header)
-      thumbLeft.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True)
-      thumbLeft.AddHandler(Thumb.DragCompletedEvent, CType(AddressOf Thumb_DragCompleted, DragCompletedEventHandler), True)
-
-      Dim thumbRight As Thumb = header.Template.FindName(RIGHT, header)
-      thumbRight.AddHandler(Thumb.DragStartedEvent, CType(AddressOf Thumb_DragStarted, DragStartedEventHandler), True)
-      thumbRight.AddHandler(Thumb.DragCompletedEvent, CType(AddressOf Thumb_DragCompleted, DragCompletedEventHandler), True)
-   End Sub
-
-   Private Sub Thumb_DragStarted(sender As Object, e As DragStartedEventArgs)
-      Dim thumb = CType(sender, Thumb)
-      Dim dg As DataGrid = GetParent(Of DataGrid)(thumb)
-      startPoint = Mouse.GetPosition(dg)
-
-      Dim header As DataGridColumnHeader = GetParent(Of DataGridColumnHeader)(thumb)
-
-      If thumb.Name = RIGHT Then
-         targetColumn = header.Column
-         Dim Index As Integer = header.Column.DisplayIndex + 1
-         If (Index < BindingColumns.Count) Then
-            adjacentColumn = dg.Columns.FirstOrDefault(Function(x) x.DisplayIndex = Index)
-         End If
-      Else
-         Dim Index As Integer = header.Column.DisplayIndex - 1
-         If (Index >= 0) Then
-            adjacentColumn = dg.Columns.FirstOrDefault(Function(x) x.DisplayIndex = Index + 1)
-         End If
-         targetColumn = dg.Columns.FirstOrDefault(Function(x) x.DisplayIndex = Index)
-      End If
-      startWidth = targetColumn.ActualWidth
-      'startUnitType = targetColumn.Width.UnitType
-      If Not IsNothing(adjacentColumn) Then
-         adjacentStartWidth = adjacentColumn.ActualWidth
-         'adjacentUnitType = adjacentColumn.Width.UnitType
-      End If
-      AddHandler thumb.PreviewMouseMove, AddressOf Thumb_PreviewMouseMove
-   End Sub
-
-   Private Sub Thumb_PreviewMouseMove(sender As Object, e As MouseEventArgs)
-      Dim thumb = CType(sender, Thumb)
-      If (Not thumb.IsDragging Or IsNothing(targetColumn)) Then Return
-
-      e.Handled = True
-
-      Dim dg As DataGrid = GetParent(Of DataGrid)(thumb)
-      Dim currentPoint As Point = Mouse.GetPosition(dg)
-      Dim diffX As Double = (currentPoint - startPoint).X
-      Dim newWidth As Double = Math.Max(targetColumn.MinWidth, Math.Min(startWidth + diffX, targetColumn.MaxWidth))
-      Dim length = New DataGridLength(newWidth)
-
-      targetColumn.SetValue(DataGridColumn.WidthProperty, length)
-
-      If Not IsNothing(adjacentColumn) Then
-         newWidth = Math.Max(adjacentColumn.MinWidth, Math.Min(adjacentStartWidth - diffX, adjacentColumn.MaxWidth))
-         length = New DataGridLength(newWidth)
-         adjacentColumn.SetValue(DataGridColumn.WidthProperty, length)
-      End If
-
-   End Sub
-
-   Private Sub Thumb_DragCompleted(sender As Object, e As DragCompletedEventArgs)
-      RemoveHandler CType(sender, Thumb).PreviewMouseMove, AddressOf Thumb_PreviewMouseMove
-      targetColumn = Nothing
-      adjacentColumn = Nothing
-   End Sub
-
-   Private Function GetParent(Of T As DependencyObject)(d As DependencyObject) As T
-      Dim tObj As T = Nothing
-
-      While IsNothing(tObj)
-         tObj = TryCast(d, T)
-         d = VisualTreeHelper.GetParent(d)
-      End While
-
-      Return tObj
-   End Function
-
    Private Sub miLock_Checked(sender As Object, e As RoutedEventArgs)
       Dim miLock = DirectCast(sender, MenuItem)
       '  disabilito Reorder e Resize di tutte le colonne salvandone prima il valore
@@ -359,12 +310,8 @@ Public Class EgtDataGrid
    End Sub
 
    Private Sub miResetSort_Click(sender As Object, e As RoutedEventArgs)
-      CurrDataGrid.Items.SortDescriptions.Clear()
-      For Each column In BindingColumns 'Grid.Columns
-         column.SortDirection = 0
-         ' resettiamo graficamente anche l'header della colonna
-         CurrDataGrid.Columns(column.DisplayIndex).SortDirection = Nothing
-      Next
+      ' resetto le SortDirection di tutte le colonne della datagrid
+      ResetSortDirections()
    End Sub
 
    Private Sub CurrDataGrid_Loaded(sender As Object, e As RoutedEventArgs) Handles CurrDataGrid.Loaded
@@ -377,19 +324,46 @@ Public Class EgtDataGrid
          End If
          colIndex += 1
       Next
+      ' calcolo la somma delle larghezze delle colonne visibili
+      For Each col In BindingColumns
+         If col.ColumnVisibility = Visibility.Visible Then
+            columnsWidth += col.ActualWidth
+         End If
+      Next
    End Sub
 
    Private Sub CurrDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs) Handles CurrDataGrid.Sorting
-      Select Case e.Column.SortDirection
+      ' salvo la SortDirection corrente della colonna prima di resettarla per tutte le colonne
+      Dim CurrSortDirection As ListSortDirection? = e.Column.SortDirection
+      ResetSortDirections(True)
+      ' ora applico la SortDirection corretta
+      Select Case CurrSortDirection
          Case ListSortDirection.Ascending
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 2 ' la settiamo a Descending
+            BindingColumns(e.Column.DisplayIndex).SortDirection = 2 ' la setto a Descending
          Case ListSortDirection.Descending
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la settiamo a Ascending
+            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la setto a Ascending
          Case Else
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la settiamo a Ascending
+            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la setto a Ascending
       End Select
    End Sub
 
+   Private Sub ResetSortDirections(Optional bUserClick As Boolean = False)
+      If bUserClick Then
+         ' nel caso di click dell'utente sulla colonna da sortare occorre solamente settare a 0 la SortDirection di tutte le colonne
+         For Each column In BindingColumns
+            column.SortDirection = 0
+         Next
+      Else
+         ' altrimenti (caso ResetSort da ContextMenu) è necessatio un Clear più ampio e anche grafico
+         CurrDataGrid.Items.SortDescriptions.Clear()
+         For Each column In BindingColumns
+            column.SortDirection = 0
+            ' resetto graficamente anche l'header della colonna
+            CurrDataGrid.Columns(column.DisplayIndex).SortDirection = Nothing
+         Next
+      End If
+   End Sub
+
 End Class
 
 Public Class EgtDataGridColumn
@@ -430,6 +404,12 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
+   Public ReadOnly Property ActualWidth As Double
+      Get
+         Return m_dgColumn.ActualWidth
+      End Get
+   End Property
+
    Private Property m_DisplayIndex As Integer
    Public Property DisplayIndex As Integer
       Get
@@ -526,6 +506,17 @@ Public Class EgtDataGridColumn
          m_ColumnVisibility = value
          If Not IsNothing(m_dgColumn) Then
             m_dgColumn.Visibility = value
+            ' ricavo la EgtDataGrid a cui appartiene la DataGridColumn
+            Dim propertyInfo As Reflection.PropertyInfo = m_dgColumn.GetType().GetProperty("DataGridOwner",
+                                                                               Reflection.BindingFlags.Instance Or
+                                                                               Reflection.BindingFlags.NonPublic)
+            Dim dg As EgtDataGrid = propertyInfo.GetValue(m_dgColumn, Nothing)
+            ' ogni colonna visibile con UnitType a Star tranne l'ultima verrà settata a Pixel
+            For Each bc In dg.BindingColumns
+               If bc.Width.IsStar And Not bc.Name = dg.BindingColumns.Last(Function(x) x.Visible = True).Name Then
+                  bc.Width = New DataGridLength(bc.ActualWidth, DataGridLengthUnitType.Pixel)
+               End If
+            Next
          End If
       End Set
    End Property

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -0,0 +1,99 @@
+Imports System.Threading
+Imports System.Windows.Threading
+
+Public Module LoadingWndHelper
+
+   Public Enum ActiveIds As Integer
+      OPENPROJ = 1
+      SAVEPROJ = 2
+      IMPORTBTL = 3
+      GOTOPROD = 4
+      OPENPROD = 5
+      SAVEPROD = 6
+      GOTOPROJ = 7
+      EXPORTPROJECT = 8
+      IMPORTPROJECT = 9
+      CHANGEPARAM = 10
+      CREATINGPDF = 11
+      CHANGEMATERIAL = 12
+   End Enum
+
+   Dim m_MainWindow As Windows.Window
+   Public Function SetMainWindow(MainWindow As Windows.Window)
+      m_MainWindow = MainWindow
+   End Function
+
+   Private m_bMainWindow_IsActive As Boolean = True
+   Public Function SetMainWindowIsActive(IsActive As Boolean)
+      m_bMainWindow_IsActive = IsActive
+   End Function
+
+   Delegate Sub CallbackLoadingDlg(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean)
+
+   Private m_thread As Thread
+   Private m_LoadingWndVM As Core.LoadingWndVM
+   Private m_CurrStep As Integer
+   Private m_StepText As String
+   Private m_nProgress As Integer
+   Private m_nNextProgress As Integer
+   Private m_bClose As Boolean
+   Private m_bActiveId As Integer = -1
+
+   Public Function OpenLoadingWnd(Id As Integer, nSteps As Integer, TotText As String, FirstStepText As String, nNextProgress As Integer) As Boolean
+      If m_bActiveId > 0 Then Return False
+      m_bActiveId = Id
+      m_LoadingWndVM = Nothing
+      m_CurrStep = 1
+      m_StepText = FirstStepText
+      m_nProgress = 1
+      m_nNextProgress = nNextProgress
+      m_bClose = False
+      Dim Top As Double = m_MainWindow.Top + (m_MainWindow.Height / 2) - 100
+      Dim Left As Double = m_MainWindow.Left + (m_MainWindow.Width / 2) - 150
+      Dim WindowStartupLocation As Windows.WindowStartupLocation = Windows.WindowStartupLocation.Manual
+      If m_MainWindow.WindowState = Windows.WindowState.Maximized Then
+         WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen
+      End If
+      m_thread = New Thread(Sub()
+                               m_LoadingWndVM = New Core.LoadingWndVM(nSteps, TotText, AddressOf LoadingCallback)
+                               m_LoadingWndVM.UpdateProgress(m_CurrStep, m_StepText, m_nProgress, m_nNextProgress)
+                               Dim LoadingWnd As New LoadingWndV(Nothing, m_LoadingWndVM)
+                               ' posiziono la finestra
+                               If WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen Then
+                                  LoadingWnd.WindowStartupLocation = Windows.WindowStartupLocation.CenterScreen
+                               Else
+                                  LoadingWnd.Top = Top
+                                  LoadingWnd.Left = Left
+                               End If
+                               LoadingWnd.Show()
+                               Dispatcher.Run()
+                            End Sub)
+      m_thread.SetApartmentState(ApartmentState.STA)
+      m_thread.Start()
+      Return True
+   End Function
+
+   Private Sub LoadingCallback(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean)
+      CurrStep = m_CurrStep
+      StepText = m_StepText
+      nProgress = m_nProgress
+      nNextProgress = m_nNextProgress
+      m_bMainWindow_IsActive = MainWindow_IsActive
+      bClose = m_bClose
+   End Sub
+
+   Public Sub UpdateLoadingWnd(Id As Integer, CurrStep As Integer, StepText As String, nProgress As Integer, nNextProgress As Integer)
+      If Id <> m_bActiveId Then Return
+      m_CurrStep = CurrStep
+      m_StepText = StepText
+      m_nProgress = nProgress
+      m_nNextProgress = nNextProgress
+   End Sub
+
+   Public Sub CloseLoadingWnd(Id As Integer)
+      If Id <> m_bActiveId Then Return
+      m_bClose = True
+      m_bActiveId = -1
+   End Sub
+
+End Module

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml

@@ -0,0 +1,56 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="LoadingWndV"
+                            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"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            Height="200" Width="300" 
+                            TitleBarHeight="0"
+                            ResizeMode="NoResize" WindowStyle="None"
+                            IsClosable="False" IsMinimizable="False"
+                            WindowStartupLocation="Manual" ShowInTaskbar="False">
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="1*"/>
+      </Grid.RowDefinitions>
+      <TextBlock Grid.Row="1"
+                 Text="{Binding TotText_Msg}"
+                 TextAlignment="Center"/>
+      <TextBlock Grid.Row="2"
+                 Text="{Binding StepText_Msg}"
+                 TextAlignment="Center"
+                 Visibility="{Binding StepText_Visibility}"/>
+      <Grid Grid.Row="3"
+            Visibility="{Binding StepProgress_Visibility}">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="1*"/>
+            <RowDefinition Height="1*"/>
+         </Grid.RowDefinitions>
+         <Grid Height="20"/>
+         <ProgressBar Grid.Row="1"
+                   Minimum="0"
+                   Maximum="100"
+                   Value="{Binding StepProgress_Value}"
+                   Height="20"
+                   Margin="40,0,40,0"/>
+      </Grid>
+      <ProgressBar Grid.Row="5"
+                   Minimum="0"
+                   Maximum="100"
+                   Value="{Binding TotProgress_Value}"
+                   Height="20"
+                   Margin="40,0,40,0"/>
+      <TextBlock Grid.Row="7"
+                 Text="{Binding TotProgress_Msg}"
+                 TextAlignment="Center"/>
+   </Grid>
+
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/LoadingWnd/LoadingWndV.xaml.vb

@@ -0,0 +1,28 @@
+Imports System.Windows
+
+Public Class LoadingWndV
+
+   Private WithEvents m_LoadingWndVM As LoadingWndVM
+
+   Sub New(Owner As Window, LoadingWndVM As LoadingWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = LoadingWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_LoadingWndVM = LoadingWndVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_LoadingWndVM.m_CloseWindow
+      Me.Close()
+   End Sub
+
+   Private Sub ActivateWindow() Handles m_LoadingWndVM.m_ActivateWindow
+      Me.Activate()
+   End Sub
+
+   Private Sub Me_ContentRendered() Handles Me.ContentRendered
+      m_LoadingWndVM.StartFunction()
+   End Sub
+
+End Class

EgtBEAMWALL.Core/LoadingWnd/LoadingWndVM.vb

@@ -0,0 +1,233 @@
+Imports System.Timers
+Imports System.Windows
+Imports System.Windows.Input
+Imports System.Windows.Threading
+Imports EgtBEAMWALL.Core
+Imports EgtUILib
+Imports EgtWPFLib5
+
+Public Class LoadingWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Enum LoadingTypes As Integer
+      NULL = 0
+      OPEN = 1
+      IMPORT = 2
+   End Enum
+
+   Delegate Sub CallbackLoadingDlg(ByRef CurrStep As Integer, ByRef StepText As String, ByRef nProgress As Integer, ByRef nNextProgress As Integer, ByRef MainWindow_IsActive As Boolean, ByRef bClose As Boolean)
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+   Friend Event m_ActivateWindow()
+
+   Private m_CallbackLoading As CallbackLoadingDlg
+   Private m_Waiting_Timer As New DispatcherTimer
+
+   ' numero di passaggi di caricamento
+   Private m_nSteps As Integer
+   ' titolo testo di caricamento
+   Private m_TotText As String
+   ' numero passaggio corrente
+   Private m_CurrStep As Integer
+   ' testo del passaggio corrente
+   Private m_StepText As String
+   ' indice d'inizio di questo passaggio
+   Private m_nStartProgress As Integer
+   ' indice d'inizio del prossimo passaggio
+   Private m_nNextProgress As Integer
+   ' variabile che indica richiesta chiusura della finestra
+   Private m_bClosing As Boolean = False
+   Private m_bMainWindow_IsActive As Boolean = True
+
+   Private m_StepProgress_Value As Double = 0
+   Public Property StepProgress_Value As Double
+      Get
+         Return m_StepProgress_Value
+      End Get
+      Set(value As Double)
+         m_StepProgress_Value = value
+      End Set
+   End Property
+
+   Private m_TotProgress_Value As Double = 0
+   Public Property TotProgress_Value As Double
+      Get
+         Return Math.Floor(m_TotProgress_Value)
+      End Get
+      Set(value As Double)
+         m_TotProgress_Value = value
+      End Set
+   End Property
+
+   Private m_StepText_Visibility As Visibility
+   Public ReadOnly Property StepText_Visibility As Visibility
+      Get
+         Return m_StepText_Visibility
+      End Get
+   End Property
+
+   Private m_StepProgress_Visibility As Visibility
+   Public ReadOnly Property StepProgress_Visibility As Visibility
+      Get
+         Return m_StepProgress_Visibility
+      End Get
+   End Property
+
+#Region "Messages"
+
+   Public ReadOnly Property TotText_Msg As String
+      Get
+         Return If(m_nSteps > 0, m_TotText & " (" & m_CurrStep & "/" & m_nSteps & ")", m_TotText)
+      End Get
+   End Property
+
+   Public ReadOnly Property StepText_Msg As String
+      Get
+         Return m_StepText
+      End Get
+   End Property
+
+   Public ReadOnly Property TotProgress_Msg As String
+      Get
+         Return m_TotProgress_Value.ToString("0.#") & "%"
+      End Get
+   End Property
+
+#End Region    ' Messages
+
+   ' Definizione comandi
+   Private m_cmdCancel As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+   Sub New(Steps As Integer, TotText As String, callback As CallbackLoadingDlg)
+      m_nSteps = Steps
+      m_TotText = TotText
+      m_CallbackLoading = callback
+      m_bClosing = False
+      If Steps = 1 Then
+         m_StepText_Visibility = Visibility.Collapsed
+         m_StepProgress_Visibility = Visibility.Collapsed
+      Else
+         m_StepText_Visibility = Visibility.Visible
+         m_StepProgress_Visibility = Visibility.Visible
+      End If
+      ' imposto contatore
+      m_Waiting_Timer.Interval = TimeSpan.FromMilliseconds(200)
+      AddHandler m_Waiting_Timer.Tick, AddressOf WaitingTimer_Tick
+   End Sub
+
+   Public Sub UpdateProgress(CurrStep As Integer, StepText As String, nStartProgress As Integer, nNextProgress As Integer)
+      m_CurrStep = CurrStep
+      m_StepText = StepText
+      m_StepProgress_Value = nStartProgress
+      m_nNextProgress = nNextProgress
+      NotifyPropertyChanged(NameOf(StepText_Msg))
+      NotifyPropertyChanged(NameOf(TotText_Msg))
+   End Sub
+
+   Public Overridable Sub StartFunction()
+      m_Waiting_Timer.Start()
+   End Sub
+
+   Protected Overridable Sub WaitingTimer_Tick()
+      ' leggo eventuali nuovi valori
+      Dim CurrStep As Integer = 0
+      Dim StepText As String = ""
+      Dim nStartProgress As Integer = 0
+      Dim nNextProgress As Integer = 0
+      Dim bMainWindow_IsActive As Boolean = True
+      Dim bClose As Boolean = False
+      m_CallbackLoading(CurrStep, StepText, nStartProgress, nNextProgress, bMainWindow_IsActive, bClose)
+      If bMainWindow_IsActive <> m_bMainWindow_IsActive Then
+         RaiseEvent m_ActivateWindow()
+      End If
+      If m_bClosing Then
+         Close()
+         Dispatcher.CurrentDispatcher.InvokeShutdown()
+         Return
+      ElseIf bClose Then
+         m_bClosing = True
+         ' mostro completamento caricamento
+         m_CurrStep = m_nSteps
+         m_StepProgress_Value = 100
+         m_TotProgress_Value = 100
+         m_Waiting_Timer.Interval = TimeSpan.FromMilliseconds(1000)
+      Else
+         If m_CurrStep <> CurrStep Then
+            If m_StepProgress_Value < 100 Then
+               m_StepProgress_Value = 100
+            ElseIf m_StepProgress_Value = 100 Then
+               m_StepProgress_Value = 0
+               m_CurrStep = CurrStep
+               m_StepText = StepText
+               m_nStartProgress = nStartProgress
+               m_nNextProgress = nNextProgress
+            End If
+         Else
+            ' incremento Step corrente
+            If m_StepProgress_Value < 80 Then
+               m_StepProgress_Value += 1
+            ElseIf m_StepProgress_Value < 90 Then
+               m_StepProgress_Value += 0.4
+            ElseIf m_StepProgress_Value < 98 Then
+               m_StepProgress_Value += 0.1
+            Else
+               m_StepProgress_Value += 0.01
+            End If
+         End If
+         ' calcolo totale
+         Dim dStepStart As Double = If(m_CurrStep > 1, m_nStartProgress, 0)
+         Dim dStepEnd As Double = m_nNextProgress
+         m_TotProgress_Value = dStepStart + ((dStepEnd - dStepStart) / 100 * m_StepProgress_Value)
+      End If
+      ' aggiorno grafica
+      NotifyPropertyChanged(NameOf(StepText_Msg))
+      NotifyPropertyChanged(NameOf(TotText_Msg))
+      NotifyPropertyChanged(NameOf(StepProgress_Value))
+      NotifyPropertyChanged(NameOf(TotProgress_Value))
+      NotifyPropertyChanged(NameOf(TotProgress_Msg))
+   End Sub
+
+   Public Sub Close()
+      ' fermo timer 
+      m_Waiting_Timer.Stop()
+      ' chiudo finestra
+      RaiseEvent m_CloseWindow(True)
+   End Sub
+
+#Region "COMMANDS"
+
+#Region "Cancel"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property Cancel_Command As ICommand
+      Get
+         If m_cmdCancel Is Nothing Then
+            m_cmdCancel = New Command(AddressOf Cancel)
+         End If
+         Return m_cmdCancel
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Friend Sub Cancel()
+      '' chiedo conferma
+      'If MessageBox.Show("Are you sure you want to stop the nesting?", "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) = MessageBoxResult.No Then Return
+      '' fermo il nesting
+      'Map.refOptimizePanelVM.m_StopNesting = True
+      '' fermo timer e chiudo finestra
+      'CloseNesting()
+   End Sub
+
+#End Region ' Cancel
+
+#End Region    ' COMMANDS
+
+End Class

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupM.vb

@@ -176,7 +176,7 @@ Public Class MyMachGroupM
    Private m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return m_sCALC_MSG
+         Return MessageFromLuaMsg(m_sCALC_MSG)
       End Get
       Set(value As String)
          m_sCALC_MSG = value

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -139,21 +139,28 @@ Public Class PartM
    Public Property dPOSX As Double
       Get
          If nType = BWType.WALL Then
-            ' recupero box pezzo
-            Dim b3Part As New BBox3d
-            EgtGetBBoxGlob(nPartId, GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Part)
-            ' recupero layer del box
-            Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
-            ' recupero box del layer box
-            Dim b3Box As New BBox3d
-            EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-            ' recupero origine grezzo
-            Dim nrawPartId As Integer = EgtGetRawPartFromPart(nPartId)
-            Dim b3Raw As New BBox3d
-            EgtGetRawPartBBox(nrawPartId, b3Raw)
-            ' calcolo distanza tra origine pezzo e tavolo
-            Dim vtPartRef As New Vector3d(b3Box.Min() - b3Raw.Min())
-            Return vtPartRef.x
+            ' verifico che sia attivo MachGroup di questo pezzo
+            If EgtGetCurrMachGroup() = ParentMachGroup.Id Then
+               ' recupero box pezzo
+               Dim b3Part As New BBox3d
+               EgtGetBBoxGlob(nPartId, GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Part)
+               ' recupero layer del box
+               Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
+               ' recupero box del layer box
+               Dim b3Box As New BBox3d
+               EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
+               ' recupero origine grezzo
+               Dim nrawPartId As Integer = EgtGetRawPartFromPart(nPartId)
+               Dim b3Raw As New BBox3d
+               EgtGetRawPartBBox(nrawPartId, b3Raw)
+               ' calcolo distanza tra origine pezzo e tavolo
+               Dim vtPartRef As New Vector3d(b3Box.Min() - b3Raw.Min())
+               m_dPOSX = vtPartRef.x
+               Return vtPartRef.x
+               ' altrimenti restituisco valore salvato (per quando viene clickato un BTLPart)
+            Else
+               Return m_dPOSX
+            End If
          Else     ' nType = BWType.BEAM
             Return m_dPOSX
          End If
@@ -203,6 +210,16 @@ Public Class PartM
       End Set
    End Property
 
+   Public m_sSTOREY As String
+   Public Property sSTOREY As String
+      Get
+         Return m_sSTOREY
+      End Get
+      Set(value As String)
+         m_sSTOREY = value
+      End Set
+   End Property
+
    Public m_sGROUP As String
    Public Property sGROUP As String
       Get
@@ -260,21 +277,28 @@ Public Class PartM
    Protected m_dPOSY As Double
    Public Property dPOSY As Double
       Get
-         ' recupero box pezzo
-         Dim b3Part As New BBox3d
-         EgtGetBBoxGlob(nPartId, GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Part)
-         ' recupero layer del box
-         Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
-         ' recupero box del layer box
-         Dim b3Box As New BBox3d
-         EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
-         ' recupero origine grezzo
-         Dim nrawPartId As Integer = EgtGetRawPartFromPart(nPartId)
-         Dim b3Raw As New BBox3d
-         EgtGetRawPartBBox(nrawPartId, b3Raw)
-         ' calcolo distanza tra origine pezzo e tavolo
-         Dim vtPartRef As New Vector3d(b3Box.Min() - b3Raw.Min())
-         Return vtPartRef.y
+         ' verifico che sia attivo MachGroup di questo pezzo
+         If EgtGetCurrMachGroup() = ParentMachGroup.Id Then
+            ' recupero box pezzo
+            Dim b3Part As New BBox3d
+            EgtGetBBoxGlob(nPartId, GDB_BB.ONLY_VISIBLE + GDB_BB.IGNORE_TEXT + GDB_BB.IGNORE_DIM, b3Part)
+            ' recupero layer del box
+            Dim nBoxLayerId As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
+            ' recupero box del layer box
+            Dim b3Box As New BBox3d
+            EgtGetBBoxGlob(nBoxLayerId, GDB_BB.STANDARD, b3Box)
+            ' recupero origine grezzo
+            Dim nrawPartId As Integer = EgtGetRawPartFromPart(nPartId)
+            Dim b3Raw As New BBox3d
+            EgtGetRawPartBBox(nrawPartId, b3Raw)
+            ' calcolo distanza tra origine pezzo e tavolo
+            Dim vtPartRef As New Vector3d(b3Box.Min() - b3Raw.Min())
+            m_dPOSY = vtPartRef.y
+            Return vtPartRef.y
+            ' altrimenti restituisco valore salvato (per quando viene clickato un BTLPart)
+         Else
+            Return m_dPOSY
+         End If
          'Return m_dPOSY
       End Get
       Set(value As Double)
@@ -359,7 +383,7 @@ Public Class PartM
    Protected m_sCALC_MSG As String = String.Empty
    Public Property sCALC_MSG As String
       Get
-         Return m_sCALC_MSG
+         Return MessageFromLuaMsg(m_sCALC_MSG)
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -456,6 +480,7 @@ Public Class PartM
       EgtGetInfo(nPartId, BTL_PRT_H, NewPartM.m_dBtlH)
       EgtGetInfo(nPartId, BTL_PRT_CNT, NewPartM.m_nCNT)
       EgtGetInfo(nPartId, BTL_PRT_GROUP, NewPartM.m_sGROUP)
+      EgtGetInfo(nPartId, BTL_PRT_STOREY, NewPartM.m_sSTOREY)
       EgtGetInfo(nPartId, BTL_PRT_MATERIAL, NewPartM.m_sMATERIAL)
       Dim nTemp As Integer = 0
       If Not EgtGetInfo(nPartId, BTL_PRT_ROTATED, nTemp) Then

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -162,6 +162,18 @@ Public MustInherit Class PartVM
       End Set
    End Property
 
+   Public ReadOnly Property sSTOREY As String
+      Get
+         Return m_PartM.sSTOREY
+      End Get
+   End Property
+
+   Public ReadOnly Property sGROUP As String
+      Get
+         Return m_PartM.sGROUP
+      End Get
+   End Property
+
    Public ReadOnly Property dVolume As Double
       Get
          Return m_PartM.dVolume

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.4.2.1")>
-<Assembly: AssemblyFileVersion("2.4.2.1")>
+<Assembly: AssemblyVersion("2.4.3.2")>
+<Assembly: AssemblyFileVersion("2.4.3.2")>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -108,7 +108,7 @@ Public MustInherit Class OpenProjectFileDialogVM
          ' ora setto il valore scelto come Tipo Filtro
          m_SelSearchColumn = value
          Select Case m_SelSearchColumn.Id
-            Case OpenProjFileColumn.ID, OpenProjFileColumn.BTLFILENAME, OpenProjFileColumn.LISTNAME
+            Case OpenProjFileColumn.ID, OpenProjFileColumn.BTLFILENAME, OpenProjFileColumn.LISTNAME, OpenProjFileColumn.MACHINE
                SearchText_Visibility = Visibility.Visible
                SearchDate_Visibility = Visibility.Collapsed
             Case OpenProjFileColumn.EXPORTDATE, OpenProjFileColumn.CREATEDATE
@@ -168,6 +168,7 @@ Public MustInherit Class OpenProjectFileDialogVM
       LISTNAME = 3
       EXPORTDATE = 4
       CREATEDATE = 5
+      MACHINE = 6
    End Enum
 
 #Region "Messages"
@@ -257,7 +258,8 @@ Public MustInherit Class OpenProjectFileDialogVM
                                                                         New IdNameStruct(OpenProjFileColumn.BTLFILENAME, BTLFileName_Msg),
                                                                         New IdNameStruct(OpenProjFileColumn.LISTNAME, ListName_Msg),
                                                                         New IdNameStruct(OpenProjFileColumn.EXPORTDATE, ExportDate_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg)})
+                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg),
+                                                                        New IdNameStruct(OpenProjFileColumn.MACHINE, Machine_Msg)})
       ElseIf ProjectType = ProjectType.PROD Then
          ' carico le colonne della datagrid
          GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROD, ProjectColumns)
@@ -265,7 +267,8 @@ Public MustInherit Class OpenProjectFileDialogVM
          m_SearchColumnList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(OpenProjFileColumn.NULL, ""),
                                                                         New IdNameStruct(OpenProjFileColumn.ID, Id_Msg),
                                                                         New IdNameStruct(OpenProjFileColumn.BTLFILENAME, BTLFileName_Msg),
-                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg)})
+                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg),
+                                                                        New IdNameStruct(OpenProjFileColumn.MACHINE, Machine_Msg)})
       End If
       ' setto la visibilità delle colonne delle EgtDataGrid
       For Each col In ProjectColumns
@@ -300,14 +303,16 @@ Public MustInherit Class OpenProjectFileDialogVM
          If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso m_SearchText <> String.Empty AndAlso (
             (m_SelSearchColumn.Id = OpenProjFileColumn.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
             (m_SelSearchColumn.Id = OpenProjFileColumn.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+            (m_SelSearchColumn.Id = OpenProjFileColumn.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelSearchColumn.Id = OpenProjFileColumn.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       ElseIf m_ProjectType = ProjectType.PROD Then
          Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
          If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso (
             (m_SelSearchColumn.Id = OpenProjFileColumn.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
          If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso m_SearchText <> String.Empty AndAlso (
             (m_SelSearchColumn.Id = OpenProjFileColumn.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelSearchColumn.Id = OpenProjFileColumn.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+            (m_SelSearchColumn.Id = OpenProjFileColumn.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
+            (m_SelSearchColumn.Id = OpenProjFileColumn.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
       End If
       Return bProjectOk
    End Function

EgtBEAMWALL.Core/Utility/Enum.vb

@@ -58,6 +58,9 @@ Public Enum StatusMapOpType
    SupervisorReleaseStop = 11
    ResetPartStart = 12
    ResetPartEnd = 13
+   ChangeProdInSupervisorRequest = 14
+   ChangeProdInProdRequest = 15
+   OpenPageInViewOptimRequest = 16
 End Enum
 
 Public Enum DimensionType

EgtBEAMWALL.Core/Utility/GridDimension.vb

@@ -6,6 +6,8 @@ Imports EgtWPFLib5
 Public Class GridDimension
    Inherits VMBase
 
+   Private Shared m_SoftwareModActive As Boolean = False
+
    Private Property m_GridName As String
    Public Property GridName As String
       Get
@@ -43,7 +45,7 @@ Public Class GridDimension
       End Get
       Set(value As GridLength)
          m_GridLen = value
-         DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
+         If Not m_SoftwareModActive Then DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
       End Set
    End Property
 
@@ -64,4 +66,8 @@ Public Class GridDimension
       m_GridLen = GridLen
    End Sub
 
+   Public Shared Sub SetSoftwareMod(bActive As Boolean)
+      m_SoftwareModActive = bActive
+   End Sub
+
 End Class

EgtBEAMWALL.Core/Utility/LuaMsgManager.vb

@@ -0,0 +1,30 @@
+Imports EgtUILib
+
+Public Module LuaMsgManager
+
+   Public Function MessageFromLuaMsg(LuaMsg As String) As String
+      ' verifico se inizia con $$
+      If Not String.IsNullOrWhiteSpace(LuaMsg) AndAlso LuaMsg.Length >= 2 AndAlso LuaMsg.Substring(0, 2) = "$$" Then
+         Dim sMsgArgs() As String = LuaMsg.Substring(2).Split(",")
+         Dim nMsg As Integer = -1
+         If sMsgArgs.Count > 1 AndAlso Integer.TryParse(sMsgArgs(0), nMsg) AndAlso nMsg > 0 Then
+            If sMsgArgs.Count > 1 Then
+               Dim sArgs() As String = sMsgArgs.Skip(1).ToArray()
+               Dim sMsg As String = String.Format(EgtMsg(65000 + nMsg), sArgs)
+               If Not String.IsNullOrWhiteSpace(sMsg) Then
+                  Return sMsg
+               Else
+                  EgtMsg(65000 + nMsg)
+               End If
+            Else
+               Return EgtMsg(65000 + nMsg)
+            End If
+         Else
+            Return LuaMsg
+         End If
+      Else
+         Return LuaMsg
+      End If
+   End Function
+
+End Module

EgtBEAMWALL.Core/Utility/ManageWindow.vb

@@ -1,6 +1,6 @@
 Imports System.Runtime.InteropServices
 
-Module ManageWindow
+Public Module ManageWindow
 
 
    <DllImport("user32.dll")>
@@ -41,7 +41,7 @@ Module ManageWindow
       Public rcNormalPosition As System.Drawing.Rectangle
    End Structure
 
-   Friend Sub BringWindowToFront(wdwIntPtr As IntPtr)
+   Public Sub BringWindowToFront(wdwIntPtr As IntPtr)
       'Dim wdwIntPtr As IntPtr = FindWindow(Nothing, "0016 - EgtBEAMWALL")
       Dim placement As Windowplacement = New Windowplacement()
       GetWindowPlacement(wdwIntPtr, placement)

EgtBEAMWALL.DataLayer/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
@@ -8,7 +8,7 @@
         <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
         <providers>
             <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-            <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
+            
         </providers>
     </entityFramework>
     <connectionStrings>

EgtBEAMWALL.DataLayer/Controllers/BTLPartController.cs

@@ -1,25 +1,16 @@
-using System;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class BTLPartController : IDisposable
     {
-        #region Private Fields
-
-        private DatabaseContext dbCtx;
-
-        #endregion Private Fields
-
         #region Public Constructors
 
         public BTLPartController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -105,11 +96,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 try
                 {
-                    // Add to database
-                    dbCtx.BTLPartList.AddRange(partData);
-                    // Commit changes
-                    dbCtx.SaveChanges();
-                    ResetController();
+                    using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                    {
+                        // Add to database
+                        localDbCtx.BTLPartList.AddRange(partData);
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                    }
                 }
                 catch (Exception exc)
                 {
@@ -147,11 +140,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
             try
             {
-                // Add to database
-                dbCtx.BTLPartList.AddRange(partData);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
+                using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                {
+                    // Add to database
+                    localDbCtx.BTLPartList.AddRange(partData);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                }
             }
             catch (Exception exc)
             {
@@ -169,22 +164,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int PartDbId)
         {
             bool done = false;
-            var item2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2del = localDbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == PartDbId)
                 .SingleOrDefault();
-            try
-            {
-                // Add to database
-                dbCtx.BTLPartList.Remove(item2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Delete: {exc}");
+                try
+                {
+                    // Add to database
+                    localDbCtx.BTLPartList.Remove(item2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Delete: {exc}");
+                }
             }
             return done;
         }
@@ -197,29 +194,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByProject(int ProjDbId)
         {
             bool done = false;
-            var items2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var items2del = localDbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId);
-            try
-            {
-                // Add to database
-                dbCtx.BTLPartList.RemoveRange(items2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteByProject: {exc}");
+                try
+                {
+                    // Add to database
+                    localDbCtx.BTLPartList.RemoveRange(items2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteByProject: {exc}");
+                }
             }
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -229,10 +226,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByDbId(int PartDbId)
         {
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == PartDbId)
                 .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -242,10 +242,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByPartId(int PartId)
         {
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .BTLPartList
                 .Where(x => x.PartId == PartId)
                 .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -256,10 +259,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByPartIdProjDbId(int PartId, int ProjDbId)
         {
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .BTLPartList
                 .Where(x => x.PartId == PartId && x.ProjDbId == ProjDbId)
                 .FirstOrDefault();
+            }
         }
 
         /// <summary>
@@ -269,12 +275,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetByProjectAsc(int ProjDbId)
         {
-            // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                return localDbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId)
                 .OrderBy(x => x.BTLPartDbId)
                 .ToList();
+            }
         }
 
         /// <summary>
@@ -284,12 +293,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetByProjectDesc(int ProjDbId)
         {
-            // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                return localDbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId)
                 .OrderByDescending(x => x.BTLPartDbId)
                 .ToList();
+            }
         }
 
         /// <summary>
@@ -300,17 +312,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetPaginatedAsc(int PartDbIdStart, int numRecord)
         {
+            List<BTLPartModel> answ = new List<BTLPartModel>();
             int numEnd = PartDbIdStart - numRecord;
             // check numEnd
             if (numEnd < 0)
                 numEnd = 0;
-            // retrieve
-            return dbCtx
-                .BTLPartList
-                .Where(x => x.BTLPartDbId <= PartDbIdStart)
-                .OrderBy(x => x.BTLPartDbId)
-                .Take(numRecord)
-                .ToList();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                answ = localDbCtx
+                        .BTLPartList
+                        .Where(x => x.BTLPartDbId <= PartDbIdStart)
+                        .OrderBy(x => x.BTLPartDbId)
+                        .Take(numRecord)
+                        .ToList();
+            }
+            return answ;
         }
 
         /// <summary>
@@ -321,26 +338,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetPaginatedDesc(int PartDbIdStart, int numRecord)
         {
+            List<BTLPartModel> answ = new List<BTLPartModel>();
             int numEnd = PartDbIdStart - numRecord;
             // check numEnd
             if (numEnd < 0)
                 numEnd = 0;
-            // retrieve
-            return dbCtx
-                .BTLPartList
-                .Where(x => x.BTLPartDbId <= PartDbIdStart)
-                .OrderByDescending(x => x.BTLPartDbId)
-                .Take(numRecord)
-                .ToList();
-        }
-
-        /// <summary>
-        /// Reinizializzaizone del controller
-        /// </summary>
-        public void ResetController()
-        {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                answ = localDbCtx
+                        .BTLPartList
+                        .Where(x => x.BTLPartDbId <= PartDbIdStart)
+                        .OrderByDescending(x => x.BTLPartDbId)
+                        .Take(numRecord)
+                        .ToList();
+            }
+            return answ;
         }
 
         /// <summary>
@@ -351,29 +364,30 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(BTLPartModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2update = localDbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == updItem.BTLPartDbId)
                 .SingleOrDefault();
-            try
-            {
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                try
+                {
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                //// update, vers 2
-                //dbCtx.BTLPartList.Remove(item2del);
-                //dbCtx.BTLPartList.Add(updItem);
+                    //// update, vers 2
+                    //localDbCtx.BTLPartList.Remove(item2del);
+                    //localDbCtx.BTLPartList.Add(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                done = true;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Update: {exc}");
+                }
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Update: {exc}");
-            }
-            // reset...
-            ResetController();
             return done;
         }
 

EgtBEAMWALL.DataLayer/Controllers/DbController.cs

@@ -6,92 +6,100 @@ using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
-   public class DbController : IDisposable
-   {
-      #region Private Fields
+    public class DbController : IDisposable
+    {
+        #region Private Fields
 
-      private AdminContext adbCtx;
+        private AdminContext adbCtx;
 
-      #endregion Private Fields
+        #endregion Private Fields
 
-      #region Public Fields
+        #region Public Fields
 
-      /// <summary>
-      /// Singleton gestione
-      /// </summary>
-      public static DbController man = new DbController();
+        /// <summary>
+        /// Singleton gestione
+        /// </summary>
+        public static DbController man = new DbController();
 
-      #endregion Public Fields
+        #endregion Public Fields
 
-      #region Public Constructors
+        #region Public Constructors
 
-      public DbController()
-      {
-         // Initialize database context for ADMIN
-         adbCtx = new AdminContext(DbConfig.ADMIN_CONNECTION_STRING);
-      }
+        public DbController()
+        {
+            // Initialize database context for ADMIN
+            adbCtx = new AdminContext(DbConfig.ADMIN_CONNECTION_STRING);
+        }
 
-      #endregion Public Constructors
+        #endregion Public Constructors
 
-      #region Public Methods
+        #region Public Methods
 
-      public bool checkCreateUser(string username, string pwd)
-      {
-         bool answ = false;
-         // ricerca utente...
-         var numUser = adbCtx
-             .UserList
-             .Where(x => x.User == username)
-             .ToList()
-             .Count;
-         if (numUser > 0)
-         {
-            answ = true;
-         }
-         if (!answ)
-         {
-            // creo utente
-            string sqlCommand = "FLUSH PRIVILEGES;";
-            //string sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}'; GRANT ALL ON *.* TO '{username}'@'localhost'; FLUSH PRIVILEGES;";
-            //string sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}'; GRANT ALL ON *.* TO '{username}'@'localhost'; FLUSH PRIVILEGES;";
-            adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}';";
-            adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            sqlCommand = $"GRANT ALL ON *.* TO '{username}'@'localhost';";
-            adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            sqlCommand = "FLUSH PRIVILEGES;";
-            adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-         }
-         return answ;
-      }
+        /// <summary>
+        /// Verifica necessità creazione utente (locale o in rete)
+        /// </summary>
+        /// <param name="username"></param>
+        /// <param name="pwd"></param>
+        /// <param name="isNetwork"></param>
+        /// <returns></returns>
+        public bool checkCreateUser(string username, string pwd, bool isNetwork)
+        {
+            bool answ = false;
+            string domain = isNetwork ? "%" : "localhost";
+            // ricerca utente...
+            var numUser = adbCtx
+                .UserList
+                .Where(x => x.User == username)
+                .ToList()
+                .Count;
+            if (numUser > 0)
+            {
+                answ = true;
+            }
+            if (!answ)
+            {
+                // creo utente
+                string sqlCommand = "FLUSH PRIVILEGES;";
+                //string sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}'; GRANT ALL ON *.* TO '{username}'@'localhost'; FLUSH PRIVILEGES;";
+                //string sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}'; GRANT ALL ON *.* TO '{username}'@'localhost'; FLUSH PRIVILEGES;";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}';";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                sqlCommand = $"GRANT ALL ON *.* TO '{username}'@'{domain}';";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+                sqlCommand = "FLUSH PRIVILEGES;";
+                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
+            }
+            return answ;
+        }
 
-      public void Dispose()
-      {
-         // Clear database context
-         adbCtx.Dispose();
-      }
+        public void Dispose()
+        {
+            // Clear database context
+            adbCtx.Dispose();
+        }
 
-      public bool ResetDb()
-      {
-         bool answ = false;
+        public bool ResetDb()
+        {
+            bool answ = false;
 
-         try
-         {
-            adbCtx
-                .Database
-                .SqlQuery<int>("CALL stp_ResetDb()");
-            answ = true;
+            try
+            {
+                adbCtx
+                    .Database
+                    .SqlQuery<int>("CALL stp_ResetDb()");
+                answ = true;
 
-            adbCtx.SaveChanges();
-         }
-         catch (Exception exc)
-         {
-            Console.WriteLine($"EXCEPTION on ResetDb: {exc}");
-         }
+                adbCtx.SaveChanges();
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on ResetDb: {exc}");
+            }
 
-         return answ;
-      }
+            return answ;
+        }
 
-      #endregion Public Methods
-   }
+        #endregion Public Methods
+    }
 }

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -1,25 +1,16 @@
-using System;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class LogMachineController : IDisposable
     {
-        #region Private Fields
-
-        private DatabaseContext dbCtx;
-
-        #endregion Private Fields
-
         #region Public Constructors
 
         public LogMachineController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -79,13 +70,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 try
                 {
-                    using (var currDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                    using (var locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
                     {
                         // Add to database
-                        currDbCtx.LogMachineList.Add(newLogMac);
+                        locallocalDbCtx.LogMachineList.Add(newLogMac);
                         // Commit changes
-                        currDbCtx.SaveChanges();
-                        ResetController();
+                        locallocalDbCtx.SaveChanges();
                     }
                 }
                 catch (Exception exc)
@@ -117,29 +107,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByKey(int LogDbId)
         {
             bool done = false;
-            var items2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var items2del = localDbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == LogDbId);
-            try
-            {
-                // Add to database
-                dbCtx.LogMachineList.RemoveRange(items2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
+                try
+                {
+                    // Add to database
+                    localDbCtx.LogMachineList.RemoveRange(items2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
+                }
             }
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -149,10 +139,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogMachineModel FindByDbId(int LogDbId)
         {
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == LogDbId)
                 .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -163,12 +156,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<LogMachineModel> GetAsc(DateTime dtStart, DateTime dtEnd)
         {
-            // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                return localDbCtx
                 .LogMachineList
                 .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
                 .OrderBy(x => x.AlarmDatetime)
                 .ToList();
+            }
         }
 
         /// <summary>
@@ -179,21 +175,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<LogMachineModel> GetDesc(DateTime dtStart, DateTime dtEnd)
         {
-            // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                return localDbCtx
                 .LogMachineList
                 .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
                 .OrderByDescending(x => x.AlarmDatetime)
                 .ToList();
-        }
-
-        /// <summary>
-        /// Reinizializzaizone del controller
-        /// </summary>
-        public void ResetController()
-        {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
+            }
         }
 
         /// <summary>
@@ -204,23 +194,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(LogMachineModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2update = localDbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == updItem.LogDbId)
                 .SingleOrDefault();
-            try
-            {
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                try
+                {
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Update: {exc}");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Update: {exc}");
+                }
             }
             return done;
         }

EgtBEAMWALL.DataLayer/Controllers/LogSupportController.cs

@@ -10,7 +10,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
     {
         #region Private Fields
 
-        private DatabaseContext dbCtx;
 
         #endregion Private Fields
 
@@ -18,8 +17,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public LogSupportController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -41,24 +38,26 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Create(DateTime dtCreated, Core.LogSupportLevel level, Core.LogSupportTarget target, string message)
         {
             bool fatto = false;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 try
                 {
-                    LogSupportModel newItem = new LogSupportModel() { DtEvent = dtCreated, Level = level, Target = target, Message = message };
-                    // Add to database
-                    dbCtx.LogSupportList.Add(newItem);
-                    // Commit changes
-                    dbCtx.SaveChanges();
-                    ResetController();
-                }
-                catch (Exception exc)
-                {
-                    Console.WriteLine($"EXCEPTION on Create LogSupport: {exc}");
+                    try
+                    {
+                        LogSupportModel newItem = new LogSupportModel() { DtEvent = dtCreated, Level = level, Target = target, Message = message };
+                        // Add to database
+                        localDbCtx.LogSupportList.Add(newItem);
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                    }
+                    catch (Exception exc)
+                    {
+                        Console.WriteLine($"EXCEPTION on Create LogSupport: {exc}");
+                    }
                 }
+                catch
+                { }
             }
-            catch
-            { }
             return fatto;
         }
 
@@ -70,29 +69,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByKey(int LogDbId)
         {
             bool done = false;
-            var items2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var items2del = localDbCtx
                 .LogSupportList
                 .Where(x => x.LogDbId == LogDbId);
-            try
-            {
-                // Add to database
-                dbCtx.LogSupportList.RemoveRange(items2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
+                try
+                {
+                    // Add to database
+                    localDbCtx.LogSupportList.RemoveRange(items2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
+                }
             }
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -102,10 +101,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogSupportModel FindByDbId(int LogDbId)
         {
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .LogSupportList
                 .Where(x => x.LogDbId == LogDbId)
                 .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -117,11 +119,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public List<LogSupportModel> GetPaginatedAsc(DateTime dtStart, DateTime dtEnd)
         {
             // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .LogSupportList
                 .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
                 .OrderBy(x => x.DtEvent)
                 .ToList();
+            }
         }
 
         /// <summary>
@@ -133,20 +138,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public List<LogSupportModel> GetPaginatedDesc(DateTime dtStart, DateTime dtEnd)
         {
             // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .LogSupportList
                 .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
                 .OrderByDescending(x => x.DtEvent)
                 .ToList();
-        }
-
-        /// <summary>
-        /// Reinizializzaizone del controller
-        /// </summary>
-        public void ResetController()
-        {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
+            }
         }
 
         /// <summary>
@@ -157,23 +156,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(LogSupportModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2update = localDbCtx
                 .LogSupportList
                 .Where(x => x.LogDbId == updItem.LogDbId)
                 .SingleOrDefault();
-            try
-            {
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                try
+                {
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Update: {exc}");
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Update: {exc}");
+                }
             }
             return done;
         }

EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs

@@ -7,12 +7,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class MachGroupController : IDisposable
     {
-        #region Private Fields
-
-        private DatabaseContext dbCtx;
-
-        #endregion Private Fields
-
         #region Public Fields
 
         public static MachGroupController man = new MachGroupController();
@@ -23,8 +17,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public MachGroupController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -215,8 +207,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -226,10 +216,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public MachGroupModel FindByMachGroupDbId(int MachGroupDbId)
         {
-            return dbCtx
-                .MachGroupList
-                .Where(x => x.MachGroupDbId == MachGroupDbId)
-                .SingleOrDefault();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
+                    .MachGroupList
+                    .Where(x => x.MachGroupDbId == MachGroupDbId)
+                    .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -239,7 +232,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public MachGroupModel FindByMachGroupId(int ProdId, int MachGroupId)
         {
-
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 return localDbCtx
@@ -258,27 +250,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             // verificare fattibilità in 1 solo passo
             int ProdDbId = 0;
-            try
+            List<MachGroupModel> answ = new List<MachGroupModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var currProd = dbCtx
-                    .ProdList
-                    .Where(x => x.ProdId == ProdId)
-                    .FirstOrDefault();
-                if (currProd != null)
+                try
                 {
-                    ProdDbId = currProd.ProdDbId;
+                    var currProd = localDbCtx
+                                    .ProdList
+                                    .Where(x => x.ProdId == ProdId)
+                                    .FirstOrDefault();
+                    if (currProd != null)
+                    {
+                        ProdDbId = currProd.ProdDbId;
+                    }
                 }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on GetByProdAsc: {exc}");
+                }
+                answ = localDbCtx
+                        .MachGroupList
+                        .Where(x => x.ProdDbId == ProdDbId)
+                        .OrderBy(x => x.ProdIndex)
+                        .ThenBy(x => x.MachGroupId)
+                        .ToList();
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on GetByProdAsc: {exc}");
-            }
-            return dbCtx
-                .MachGroupList
-                .Where(x => x.ProdDbId == ProdDbId)
-                .OrderBy(x => x.ProdIndex)
-                .ThenBy(x => x.MachGroupId)
-                .ToList();
+            return answ;
         }
 
         /// <summary>
@@ -290,29 +287,33 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             // recupero
             int ProdDbId = 0;
-
-            // verificare fattibilità in 1 solo passo
-            try
+            List<MachGroupModel> answ = new List<MachGroupModel>();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var currProd = dbCtx
-                    .ProdList
-                    .Where(x => x.ProdId == ProdId)
-                    .FirstOrDefault();
-                if (currProd != null)
+                // verificare fattibilità in 1 solo passo
+                try
                 {
-                    ProdDbId = currProd.ProdDbId;
+                    var currProd = localDbCtx
+                                    .ProdList
+                                    .Where(x => x.ProdId == ProdId)
+                                    .FirstOrDefault();
+                    if (currProd != null)
+                    {
+                        ProdDbId = currProd.ProdDbId;
+                    }
                 }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on GetByProdDesc: {exc}");
+                }
+                answ = localDbCtx
+                        .MachGroupList
+                        .Where(x => x.ProdDbId == ProdDbId)
+                        .OrderByDescending(x => x.ProdIndex)
+                        .ThenByDescending(x => x.MachGroupId)
+                        .ToList();
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on GetByProdDesc: {exc}");
-            }
-            return dbCtx
-                .MachGroupList
-                .Where(x => x.ProdDbId == ProdDbId)
-                .OrderByDescending(x => x.ProdIndex)
-                .ThenByDescending(x => x.MachGroupId)
-                .ToList();
+            return answ;
         }
 
         /// <summary>
@@ -323,12 +324,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<MachGroupModel> GetByProdSupervisor(int ProdId, string SupervisorId)
         {
-            return dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && x.SupervisorId == SupervisorId)
-                .OrderBy(x => x.ProdIndex)
-                .ThenBy(x => x.MachGroupId)
-                .ToList();
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
+                        .MachGroupList
+                        .Where(x => x.Prod.ProdId == ProdId && x.SupervisorId == SupervisorId)
+                        .OrderBy(x => x.ProdIndex)
+                        .ThenBy(x => x.MachGroupId)
+                        .ToList();
+            }
         }
 
         /// <summary>
@@ -402,15 +406,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return done;
         }
 
-        /// <summary>
-        /// Reinizializzaizone del controller
-        /// </summary>
-        public void ResetController()
-        {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
-        }
-
         /// <summary>
         /// Set MachGroup as NeedRedo (ripresa = da rigenerare)
         /// </summary>

EgtBEAMWALL.DataLayer/Controllers/PartController .cs

@@ -1,19 +1,11 @@
-using System;
-using System.Collections.Generic;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using System;
 using System.Linq;
-using System.Text;
-using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class PartController : IDisposable
     {
-        #region Private Fields
-
-        private DatabaseContext dbCtx;
-
-        #endregion Private Fields
-
         #region Public Fields
 
         public static PartController man = new PartController();
@@ -24,8 +16,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public PartController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -42,36 +32,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int BtlPartDbId = 0;
 
-#if false
-            var currProj = dbCtx
-                    .ProjList
-                    .Where(x => x.ProjId == ProjId)
-                    .FirstOrDefault();
-
-            if (currProj != null)
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var btlPart = dbCtx
-                    .BTLPartList
-                    .Where(x => x.ProjDbId == currProj.ProjDbId && x.PDN == PDN)
-                    .SingleOrDefault();
+                var btlPart = locallocalDbCtx
+                                .BTLPartList
+                                .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
+                                .SingleOrDefault();
 
                 if (btlPart != null)
                 {
                     BtlPartDbId = btlPart.BTLPartDbId;
                 }
             }
-#endif
-
-            var btlPart = dbCtx
-                .BTLPartList
-                .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
-                .SingleOrDefault();
-
-            if (btlPart != null)
-            {
-                BtlPartDbId = btlPart.BTLPartDbId;
-            }
-
             return BtlPartDbId;
         }
 
@@ -85,16 +57,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int BtlPartDbId = 0;
 
-            var btlPart = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var btlPart = localDbCtx
                 .BTLPartList
                 .Where(x => x.Project.ProjId == ProjId && x.PartId == BtlPartId)
                 .SingleOrDefault();
 
-            if (btlPart != null)
-            {
-                BtlPartDbId = btlPart.BTLPartDbId;
+                if (btlPart != null)
+                {
+                    BtlPartDbId = btlPart.BTLPartDbId;
+                }
             }
-
             return BtlPartDbId;
         }
 
@@ -151,24 +125,26 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int ProdId, int MachGroupId, int PartId)
         {
             bool done = false;
-            var item2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2del = localDbCtx
                 .PartList
                 .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                 .SingleOrDefault();
-            try
-            {
-                // Remove from database
-                dbCtx.PartList.Remove(item2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-                // aggiorno info sullo status
-                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId} | PartId: {PartId}{Environment.NewLine}{exc}");
+                try
+                {
+                    // Remove from database
+                    localDbCtx.PartList.Remove(item2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId} | PartId: {PartId}{Environment.NewLine}{exc}");
+                }
             }
             return done;
         }
@@ -181,22 +157,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int PartDbId)
         {
             bool done = false;
-            var item2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2del = localDbCtx
                 .PartList
                 .Where(x => x.PartDbId == PartDbId)
                 .SingleOrDefault();
-            try
-            {
-                // Add to database
-                dbCtx.PartList.Remove(item2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on Delete: {exc}");
+                try
+                {
+                    // Add to database
+                    localDbCtx.PartList.Remove(item2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on Delete: {exc}");
+                }
             }
             return done;
         }
@@ -209,29 +187,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByMachGroup(int MachGroupDbId)
         {
             bool done = false;
-            var items2del = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var items2del = localDbCtx
                 .PartList
                 .Where(x => x.MachGroupDbId == MachGroupDbId);
-            try
-            {
-                // Add to database
-                dbCtx.PartList.RemoveRange(items2del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteByMachGroup: {exc}");
+                try
+                {
+                    // Add to database
+                    localDbCtx.PartList.RemoveRange(items2del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteByMachGroup: {exc}");
+                }
             }
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -241,10 +219,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public PartModel FindByDbId(int PartDbId)
         {
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                return localDbCtx
                 .PartList
                 .Where(x => x.PartDbId == PartDbId)
                 .SingleOrDefault();
+            }
         }
 
         /// <summary>
@@ -255,9 +236,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public PartModel FindByPartId(int ProdId, int PartId)
         {
             PartModel answ = null;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                answ = localDbCtx
+                answ = locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.PartId == PartId)
                         .FirstOrDefault();
@@ -265,15 +246,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return answ;
         }
 
-        /// <summary>
-        /// Reinizializzaizone del controller
-        /// </summary>
-        public void ResetController()
-        {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
-        }
-
         /// <summary>
         /// Update single Part
         /// </summary>
@@ -282,23 +254,23 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(PartModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var item2update = localDbCtx
+                var item2update = locallocalDbCtx
                                     .PartList
                                     .Where(x => x.PartDbId == updItem.PartDbId)
                                     .SingleOrDefault();
                 try
                 {
                     // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                    locallocalDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
                     //// update, vers 2
-                    //dbCtx.PartList.Remove(item2del);
-                    //dbCtx.PartList.Add(updItem);
+                    //localDbCtx.PartList.Remove(item2del);
+                    //localDbCtx.PartList.Add(updItem);
 
                     // Commit changes
-                    localDbCtx.SaveChanges();
+                    locallocalDbCtx.SaveChanges();
                     done = true;
                     // aggiorno info sullo status
                     StatusMapController.man.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
@@ -318,18 +290,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateEnd(int ProdId, int MachGroupId, int PartId, DateTime DtEnd)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 try
                 {
                     // aggiorno
-                    localDbCtx
+                    locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                         .FirstOrDefault()
                         .DtEnd = DtEnd;
                     // Commit changes
-                    localDbCtx.SaveChanges();
+                    locallocalDbCtx.SaveChanges();
                     done = true;
                     // aggiorno info sullo status
                     StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
@@ -351,18 +323,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStart(int ProdId, int MachGroupId, int PartId, DateTime DtStart)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 try
                 {
                     // aggiorno
-                    localDbCtx
+                    locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                         .FirstOrDefault()
                         .DtStart = DtStart;
                     // Commit changes
-                    localDbCtx.SaveChanges();
+                    locallocalDbCtx.SaveChanges();
                     done = true;
                     // aggiorno info sullo status
                     StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
@@ -385,18 +357,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStatus(int ProdId, int MachGroupId, int PartId, Core.ItemState newState)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 try
                 {
                     // aggiorno
-                    localDbCtx
+                    locallocalDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
                         .FirstOrDefault()
                         .State = newState;
                     // Commit changes
-                    localDbCtx.SaveChanges();
+                    locallocalDbCtx.SaveChanges();
                     done = true;
                     // aggiorno info sullo status
                     StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -11,7 +11,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
     {
         #region Private Fields
 
-        private DatabaseContext dbCtx;
 
         #endregion Private Fields
 
@@ -25,8 +24,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public ProdController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -51,17 +48,20 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         protected List<ProdModel> GetLastDbModelDesc(int numRecord)
         {
-            // se numRecord = 0 --> passo tutti
-            if (numRecord == 0)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                numRecord = dbCtx.ProdList.Count();
+                // se numRecord = 0 --> passo tutti
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProdList.Count();
+                }
+                // retrieve
+                return localDbCtx
+                    .ProdList
+                    .OrderByDescending(x => x.ProdId)
+                    .Take(numRecord)
+                    .ToList();
             }
-            // retrieve
-            return dbCtx
-                .ProdList
-                .OrderByDescending(x => x.ProdId)
-                .Take(numRecord)
-                .ToList();
         }
 
         protected List<int> ProjIdByProd(int ProdId)
@@ -83,26 +83,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             bool done = false;
 
-            // cerco Prod
-            var currProd = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // cerco Prod
+                var currProd = localDbCtx
                 .ProdList
                 .Where(x => x.ProdId == ProdId)
                 .FirstOrDefault();
 
-            // cerco Proj
-            var currProj = dbCtx
-                .ProjList
-                .Where(x => x.ProjId == ProjId)
-                .FirstOrDefault();
+                // cerco Proj
+                var currProj = localDbCtx
+                    .ProjList
+                    .Where(x => x.ProjId == ProjId)
+                    .FirstOrDefault();
 
-            // lo aggiorno
-            currProj.ProdDbId = currProd.ProdDbId;
-            currProj.Locked = true;
-
-            // salvo
-            dbCtx.SaveChanges();
-            ResetController();
+                // lo aggiorno
+                currProj.ProdDbId = currProd.ProdDbId;
+                currProj.Locked = true;
 
+                // salvo
+                localDbCtx.SaveChanges();
+            }
             return done;
         }
 
@@ -110,59 +111,59 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             bool done = false;
 
-            var currProd = FindByProdId(ProdId);
-
-            // sel dei proj da aggiornare...
-            var proj2update = dbCtx
-                .ProjList
-                .Where(x => x.ProdDbId == currProd.ProdDbId)
-                .ToList();
-
-            // sel dei MachGroup da prod
-            var machGroup2del = dbCtx
-                .MachGroupList
-                .Where(x => x.ProdDbId == currProd.ProdDbId)
-                .ToList();
-
-            // selezione dei part da machgroup
-            var part2del = dbCtx
-                .PartList
-                .Where(x => x.MachGroup.ProdDbId == currProd.ProdDbId)
-                .ToList();
-
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // update proj...
-                foreach (var item in proj2update)
+                var currProd = FindByProdId(ProdId);
+
+                // sel dei proj da aggiornare...
+                var proj2update = localDbCtx
+                    .ProjList
+                    .Where(x => x.ProdDbId == currProd.ProdDbId)
+                    .ToList();
+
+                // sel dei MachGroup da prod
+                var machGroup2del = localDbCtx
+                    .MachGroupList
+                    .Where(x => x.ProdDbId == currProd.ProdDbId)
+                    .ToList();
+
+                // selezione dei part da machgroup
+                var part2del = localDbCtx
+                    .PartList
+                    .Where(x => x.MachGroup.ProdDbId == currProd.ProdDbId)
+                    .ToList();
+
+                try
                 {
-                    item.ProdDbId = null;
+                    // update proj...
+                    foreach (var item in proj2update)
+                    {
+                        item.ProdDbId = null;
+                    }
+                    //// salvo
+                    //localDbCtx.SaveChanges();
+                    // remove from database
+                    localDbCtx.PartList.RemoveRange(part2del);
+                    //// salvo
+                    //localDbCtx.SaveChanges();
+                    localDbCtx.MachGroupList.RemoveRange(machGroup2del);
+                    //// salvo
+                    //localDbCtx.SaveChanges();
+                    localDbCtx.ProdList.Remove(currProd);
+                    // salvo
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteProd: {exc}");
                 }
-                //// salvo
-                //dbCtx.SaveChanges();
-                // remove from database
-                dbCtx.PartList.RemoveRange(part2del);
-                //// salvo
-                //dbCtx.SaveChanges();
-                dbCtx.MachGroupList.RemoveRange(machGroup2del);
-                //// salvo
-                //dbCtx.SaveChanges();
-                dbCtx.ProdList.Remove(currProd);
-                // salvo
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteProd: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -172,14 +173,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProdModel FindByProdDbId(int ProdDbId)
         {
-            var answ = dbCtx
+            ProdModel answ;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                answ = localDbCtx
                 .ProdList
                 .Where(x => x.ProdDbId == ProdDbId)
                 .SingleOrDefault();
-            // forzo rilettura
-            if (answ != null)
-            {
-                dbCtx.Entry(answ).Reload();
             }
             return answ;
         }
@@ -191,14 +191,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProdModel FindByProdId(int ProdId)
         {
-            var answ = dbCtx
+            ProdModel answ;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                answ = localDbCtx
                 .ProdList
                 .Where(x => x.ProdId == ProdId)
                 .SingleOrDefault();
-            // forzo rilettura
-            if (answ != null)
-            {
-                dbCtx.Entry(answ).Reload();
             }
             return answ;
         }
@@ -241,42 +240,44 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int nextId = 0;
 
-            // cerco se ne ho ALMENO 1....
-            var numRec = dbCtx.ProdList.Count();
-            if (numRec == 0)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                nextId = 1;
-            }
-            else
-            {
-                // retrieve ultimo...
-                var maxRecord = dbCtx
+                // cerco se ne ho ALMENO 1....
+                var numRec = localDbCtx.ProdList.Count();
+                if (numRec == 0)
+                {
+                    nextId = 1;
+                }
+                else
+                {
+                    // retrieve ultimo...
+                    var maxRecord = localDbCtx
+                        .ProdList
+                        .OrderByDescending(x => x.ProdId)
+                        .Take(1)
+                        .FirstOrDefault();
+                    // incremento
+                    nextId = maxRecord.ProdId + 1;
+                }
+
+                // creo nuovo PROD...
+                var newProd = localDbCtx
                     .ProdList
-                    .OrderByDescending(x => x.ProdId)
-                    .Take(1)
+                    .Add(new ProdModel() { ProdId = nextId, Locked = true, DtCreated = DateTime.Now });
+
+                // cerco Proj
+                var currProj = localDbCtx
+                    .ProjList
+                    .Where(x => x.ProjId == ProjId)
                     .FirstOrDefault();
-                // incremento
-                nextId = maxRecord.ProdId + 1;
+
+                // aggiungo proj-prod
+                currProj.ProdDbId = newProd.ProdDbId;
+                currProj.Locked = true;
+
+                // Commit changes
+                localDbCtx.SaveChanges();
             }
-
-            // creo nuovo PROD...
-            var newProd = dbCtx
-                .ProdList
-                .Add(new ProdModel() { ProdId = nextId, Locked = true, DtCreated = DateTime.Now });
-
-            // cerco Proj
-            var currProj = dbCtx
-                .ProjList
-                .Where(x => x.ProjId == ProjId)
-                .FirstOrDefault();
-
-            // aggiungo proj-prod
-            currProj.ProdDbId = newProd.ProdDbId;
-            currProj.Locked = true;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-
             return nextId;
         }
 
@@ -288,12 +289,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public bool IsAnyInSupervisor(int ProdId)
         {
-            // cerco se ci siano assegnati a supervisor
-            var numAssigned = dbCtx
-                .MachGroupList
-                .Where(x => x.Prod.ProdId == ProdId && (!string.IsNullOrEmpty(x.SupervisorId) || x.State >= 0))
-                .Count();
-
+            int numAssigned = 0;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // cerco se ci siano assegnati a supervisor
+                numAssigned = localDbCtx
+                                .MachGroupList
+                                .Where(x => x.Prod.ProdId == ProdId && (!string.IsNullOrEmpty(x.SupervisorId) || x.State >= 0))
+                                .Count();
+            }
             return numAssigned > 0;
         }
 
@@ -305,33 +309,35 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProdModel LockByProdId(int ProdId, bool Locked)
         {
+            ProdModel currProd;
             // seleziono il prod...
-            var currProd = dbCtx
-                .ProdList
-                .Where(x => x.ProdId == ProdId)
-                .SingleOrDefault();
-
-            if (currProd != null)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                currProd.Locked = Locked;
-                dbCtx.Entry(currProd).State = System.Data.Entity.EntityState.Modified;
+                currProd = localDbCtx
+                            .ProdList
+                            .Where(x => x.ProdId == ProdId)
+                            .SingleOrDefault();
 
-                var currProj = dbCtx
-                    .ProjList
-                    .Where(x => x.ProdDbId == currProd.ProdDbId)
-                    .ToList();
-
-                //currProj.ForEach(x => x.Locked = Locked);
-                foreach (var item in currProj)
+                if (currProd != null)
                 {
-                    item.Locked = Locked;
-                    dbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
+                    currProd.Locked = Locked;
+                    localDbCtx.Entry(currProd).State = System.Data.Entity.EntityState.Modified;
+
+                    var currProj = localDbCtx
+                        .ProjList
+                        .Where(x => x.ProdDbId == currProd.ProdDbId)
+                        .ToList();
+
+                    //currProj.ForEach(x => x.Locked = Locked);
+                    foreach (var item in currProj)
+                    {
+                        item.Locked = Locked;
+                        localDbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
+                    }
                 }
+
+                localDbCtx.SaveChanges();
             }
-
-            dbCtx.SaveChanges();
-            ResetController();
-
             return currProd;
         }
 
@@ -342,28 +348,30 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public bool IsLockByProdId(int ProdId)
         {
-            // seleziono il prod...
-            var currProd = dbCtx
+            bool bIsLock = false;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // seleziono il prod...
+                var currProd = localDbCtx
                 .ProdList
                 .Where(x => x.ProdId == ProdId)
                 .FirstOrDefault();
 
-            var bIsLock = false;
-            if (currProd != null)
-            {
-                bIsLock = currProd.Locked;
-
-                var currProj = dbCtx
-                    .ProjList
-                    .Where(x => x.ProdDbId == currProd.ProdDbId)
-                    .ToList();
-
-                if (currProj != null && !bIsLock)
+                if (currProd != null)
                 {
-                    bIsLock = currProj.Any(x => x.Locked);
+                    bIsLock = currProd.Locked;
+
+                    var currProj = localDbCtx
+                        .ProjList
+                        .Where(x => x.ProdDbId == currProd.ProdDbId)
+                        .ToList();
+
+                    if (currProj != null && !bIsLock)
+                    {
+                        bIsLock = currProj.Any(x => x.Locked);
+                    }
                 }
             }
-
             return bIsLock;
         }
 
@@ -372,9 +380,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         public void ResetController()
         {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
-        }
+        } 
 
         /// <summary>
         /// Update single PROD
@@ -384,26 +390,28 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(ProdModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                var item2update = localDbCtx
                 .ProdList
                 .Where(x => x.ProdDbId == updItem.ProdDbId)
                 .SingleOrDefault();
-            try
-            {
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                try
+                {
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                //// update, vers 2
-                //dbCtx.PartList.Remove(item2del);
-                //dbCtx.PartList.Add(updItem);
+                    //// update, vers 2
+                    //localDbCtx.PartList.Remove(item2del);
+                    //localDbCtx.PartList.Add(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch
+                { }
             }
-            catch
-            { }
             return done;
         }
 
@@ -421,129 +429,124 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             // Recupero il PROD
             ProdModel currData = FindByProdId(ProdId);
 
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // preparo elenco
-                List<MachGroupModel> itemsMG2Add = new List<MachGroupModel>();
-
-                List<Core.MyMachGroupM> MachGroupList2Add = new List<Core.MyMachGroupM>();
-                List<PartModel> PartList2Add = new List<PartModel>();
-                // cerco le MG esistenti --> aggiorno
-                foreach (var item in MachGroupList)
+                try
                 {
-#if false
-                    var currMG = dbCtx
-                                    .MachGroupList
-                                    .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == item.Id)
-                                    .SingleOrDefault();
-#endif
-                    var currMG = MachGroupController.man.FindByMachGroupId(ProdId, item.Id);
-                    var convCurrMG = MachGroupController.ConvertFromCore(item, currData.ProdDbId);
-                    if (currMG != null)
-                    {
-                        // se non identico x equality limitata a ViewOptim...
-                        if (!currMG.ViewOptimEquals(convCurrMG))
-                        {
-                            // aggiorno con nuovi valori ricevuti
-                            currMG.H = convCurrMG.H;
-                            currMG.L = convCurrMG.L;
-                            currMG.W = convCurrMG.W;
-                            currMG.Material = convCurrMG.Material;
-                            currMG.Name = convCurrMG.Name;
-                            // salvo
-                            dbCtx.SaveChanges();
-                            // registro modifica StatusMap
-                            StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-                        }
-                    }
-                    else
-                    {
-                        itemsMG2Add.Add(convCurrMG);
-                        // registro modifica StatusMap
-                        StatusMapController.man.UpdateAction("", ProdId, item.Id, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, "");
-                    }
-                }
-                // aggiungo MachGroup
-                dbCtx.MachGroupList.AddRange(itemsMG2Add);
-                // Commit changes
-                dbCtx.SaveChanges();
+                    // preparo elenco
+                    List<MachGroupModel> itemsMG2Add = new List<MachGroupModel>();
 
-                // verifico di nuovo l'elenco delle MG x le relative PART...
-                foreach (var item in MachGroupList)
-                {
-                    var currMG = MachGroupController.man.FindByMachGroupId(ProdId, item.Id);
-                    int MachGroupDbId = currMG.MachGroupDbId;
-                    bool modMg = false;
-                    // verifico se uguali o meno...
-                    foreach (var currPartM in item.PartMList)
+                    List<Core.MyMachGroupM> MachGroupList2Add = new List<Core.MyMachGroupM>();
+                    List<PartModel> PartList2Add = new List<PartModel>();
+                    // cerco le MG esistenti --> aggiorno
+                    foreach (var item in MachGroupList)
                     {
-                        var currPart = dbCtx
-                          .PartList
-                          .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == item.Id && x.PartId == currPartM.nPartId)
-                          .SingleOrDefault();
-                        var convCurrPartM = PartController.ConvertFromCore(currPartM, MachGroupDbId);
-                        if (currPart != null)
+                        var currMG = MachGroupController.man.FindByMachGroupId(ProdId, item.Id);
+                        var convCurrMG = MachGroupController.ConvertFromCore(item, currData.ProdDbId);
+                        if (currMG != null)
                         {
                             // se non identico x equality limitata a ViewOptim...
-                            if (!currPart.ViewOptimEquals(convCurrPartM))
+                            if (!currMG.ViewOptimEquals(convCurrMG))
                             {
                                 // aggiorno con nuovi valori ricevuti
-                                currPart.H = convCurrPartM.H;
-                                currPart.L = convCurrPartM.L;
-                                currPart.W = convCurrPartM.W;
-                                currPart.Material = convCurrPartM.Material;
-                                currPart.CALC_State = convCurrPartM.CALC_State;
-                                currPart.ROT = convCurrPartM.ROT;
-                                currPart.PDN = convCurrPartM.PDN;
-                                currPart.NAM = convCurrPartM.NAM;
+                                currMG.H = convCurrMG.H;
+                                currMG.L = convCurrMG.L;
+                                currMG.W = convCurrMG.W;
+                                currMG.Material = convCurrMG.Material;
+                                currMG.Name = convCurrMG.Name;
                                 // salvo
-                                dbCtx.SaveChanges();
-                                modMg = true;
+                                localDbCtx.SaveChanges();
+                                // registro modifica StatusMap
+                                StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
                             }
                         }
                         else
                         {
-                            PartList2Add.Add(convCurrPartM);
-                            modMg = true;
+                            itemsMG2Add.Add(convCurrMG);
+                            // registro modifica StatusMap
+                            StatusMapController.man.UpdateAction("", ProdId, item.Id, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, "");
                         }
                     }
-                    // verifico se salvare...
-                    if (modMg)
+                    // aggiungo MachGroup
+                    localDbCtx.MachGroupList.AddRange(itemsMG2Add);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    // verifico di nuovo l'elenco delle MG x le relative PART...
+                    foreach (var item in MachGroupList)
                     {
-                        StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+                        var currMG = MachGroupController.man.FindByMachGroupId(ProdId, item.Id);
+                        int MachGroupDbId = currMG.MachGroupDbId;
+                        bool modMg = false;
+                        // verifico se uguali o meno...
+                        foreach (var currPartM in item.PartMList)
+                        {
+                            var currPart = localDbCtx
+                              .PartList
+                              .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == item.Id && x.PartId == currPartM.nPartId)
+                              .SingleOrDefault();
+                            var convCurrPartM = PartController.ConvertFromCore(currPartM, MachGroupDbId);
+                            if (currPart != null)
+                            {
+                                // se non identico x equality limitata a ViewOptim...
+                                if (!currPart.ViewOptimEquals(convCurrPartM))
+                                {
+                                    // aggiorno con nuovi valori ricevuti
+                                    currPart.H = convCurrPartM.H;
+                                    currPart.L = convCurrPartM.L;
+                                    currPart.W = convCurrPartM.W;
+                                    currPart.Material = convCurrPartM.Material;
+                                    currPart.CALC_State = convCurrPartM.CALC_State;
+                                    currPart.ROT = convCurrPartM.ROT;
+                                    currPart.PDN = convCurrPartM.PDN;
+                                    currPart.NAM = convCurrPartM.NAM;
+                                    // salvo
+                                    localDbCtx.SaveChanges();
+                                    modMg = true;
+                                }
+                            }
+                            else
+                            {
+                                PartList2Add.Add(convCurrPartM);
+                                modMg = true;
+                            }
+                        }
+                        // verifico se salvare...
+                        if (modMg)
+                        {
+                            StatusMapController.man.UpdateAction(currMG.SupervisorId, ProdId, currMG.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
+                        }
                     }
+
+                    // aggiungo PartList
+                    localDbCtx.PartList.AddRange(PartList2Add);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    // sel dei MachGroup da prod OLD
+                    List<MachGroupModel> itemsMGOld = localDbCtx
+                        .MachGroupList
+                        .Where(x => x.Prod.ProdId == ProdId)
+                        .ToList();
+                    // elenco degli ID del MachGroup NON trovati
+                    List<int> MgId2rem = itemsMGOld.Select(x => x.MachGroupId).Except(MachGroupList.Select(y => y.Id)).ToList();
+                    // processo i MachGroup eliminati
+                    foreach (var item in MgId2rem)
+                    {
+                        MachGroupController.man.Delete(ProdId, item);
+                    }
+
+                    // aggiorno valore isNew a false x PROD
+                    currData.IsNew = false;
+
+                    // Commit changes
+                    localDbCtx.SaveChanges();
                 }
-
-                // aggiungo PartList
-                dbCtx.PartList.AddRange(PartList2Add);
-                // Commit changes
-                dbCtx.SaveChanges();
-
-                // sel dei MachGroup da prod OLD
-                List<MachGroupModel> itemsMGOld = dbCtx
-                    .MachGroupList
-                    .Where(x => x.Prod.ProdId == ProdId)
-                    .ToList();
-                // elenco degli ID del MachGroup NON trovati
-                List<int> MgId2rem = itemsMGOld.Select(x => x.MachGroupId).Except(MachGroupList.Select(y => y.Id)).ToList();
-                // processo i MachGroup eliminati
-                foreach (var item in MgId2rem)
+                catch (Exception exc)
                 {
-                    MachGroupController.man.Delete(ProdId, item);
+                    Console.WriteLine($"EXCEPTION on UpdateMachGroup: {exc}");
                 }
-
-                // aggiorno valore isNew a false x PROD
-                currData.IsNew = false;
-
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on UpdateMachGroup: {exc}");
-            }
-
             return currData;
         }
 
@@ -555,14 +558,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProdFileM UpdatePType(int ProdId, BWType PType)
         {
-            var currData = FindByProdId(ProdId);
-            // aggiorno valore BTL
-            currData.PType = PType;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-            ResetController();
+            ProdModel currData;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                            .ProdList
+                            .Where(x => x.ProdId == ProdId)
+                            .SingleOrDefault();
+                // aggiorno valore BTL
+                currData.PType = PType;
 
+                // Commit changes
+                localDbCtx.SaveChanges();
+            }
             return coreConv(currData);
         }
 
@@ -574,14 +582,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProdFileM UpdateMachine(int ProdId, String Machine)
         {
-            var currData = FindByProdId(ProdId);
-            // aggiorno valore BTL
-            currData.Machine = Machine;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-            ResetController();
+            ProdModel currData;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                            .ProdList
+                            .Where(x => x.ProdId == ProdId)
+                            .SingleOrDefault();
+                // aggiorno valore BTL
+                currData.Machine = Machine;
 
+                // Commit changes
+                localDbCtx.SaveChanges();
+            }
             return coreConv(currData);
         }
 

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -11,7 +11,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
     {
         #region Private Fields
 
-        private DatabaseContext dbCtx;
 
         #endregion Private Fields
 
@@ -19,8 +18,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public ProjController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -50,16 +47,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         protected List<ProjModel> GetLastDbModelDesc(int numRecord)
         {
             // se numRecord = 0 --> passo tutti
-            if (numRecord == 0)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                numRecord = dbCtx.ProjList.Count();
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProjList.Count();
+                }
+                // retrieve
+                return localDbCtx
+                        .ProjList
+                        .OrderByDescending(x => x.ProjId)
+                        .Take(numRecord)
+                        .ToList();
             }
-            // retrieve
-            return dbCtx
-                .ProjList
-                .OrderByDescending(x => x.ProjId)
-                .Take(numRecord)
-                .ToList();
         }
 
         /// <summary>
@@ -71,16 +71,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int answ = 0;
 
-            if (ProdDbId != null)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var prodRecord = dbCtx
-                    .ProdList
-                    .Where(x => x.ProdDbId == ProdDbId)
-                    .SingleOrDefault();
-
-                if (prodRecord != null)
+                if (ProdDbId != null)
                 {
-                    answ = prodRecord.ProdId;
+                    var prodRecord = localDbCtx
+                                        .ProdList
+                                        .Where(x => x.ProdDbId == ProdDbId)
+                                        .SingleOrDefault();
+
+                    if (prodRecord != null)
+                    {
+                        answ = prodRecord.ProdId;
+                    }
                 }
             }
             return answ;
@@ -122,32 +125,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
             var currProj = FindByProjId(ProjId);
 
-            // sel delle BTLParts da proj
-            var parts2del = dbCtx
-                .BTLPartList
-                .Where(x => x.ProjDbId == currProj.ProjDbId);
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // sel delle BTLParts da proj
+                var parts2del = localDbCtx
+                                    .BTLPartList
+                                    .Where(x => x.ProjDbId == currProj.ProjDbId);
 
-            try
-            {
-                // remove from database
-                dbCtx.BTLPartList.RemoveRange(parts2del);
-                dbCtx.ProjList.Remove(currProj);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteProj: {exc}");
+                try
+                {
+                    // remove from database
+                    localDbCtx.BTLPartList.RemoveRange(parts2del);
+                    localDbCtx.ProjList.Remove(currProj);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteProj: {exc}");
+                }
             }
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -172,7 +175,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     // cerco eventuali dati "child" puliti
                     var childRec = localDbCtx
                             .ProjList
-                            .Where(x => x.BTLFileName.StartsWith(BtlFileName+"_"))
+                            .Where(x => x.BTLFileName.StartsWith(BtlFileName + "_"))
                             .ToList();
                     // faccio filtro con ricerca regexp x scartare "falsi positivi" come BtlFileName_nonNumero...
                     if (childRec.Count > 0)
@@ -202,14 +205,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProjModel FindByProjDbId(int ProjDbId)
         {
-            ProjModel answ = dbCtx
-                .ProjList
-                .Where(x => x.ProjDbId == ProjDbId)
-                .SingleOrDefault();
-            // forzo rilettura
-            if (answ != null)
+            ProjModel answ;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                dbCtx.Entry(answ).Reload();
+                answ = localDbCtx
+                        .ProjList
+                        .Where(x => x.ProjDbId == ProjDbId)
+                        .SingleOrDefault();
             }
             return answ;
         }
@@ -221,14 +223,13 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public ProjModel FindByProjId(int ProjId)
         {
-            var answ = dbCtx
+            ProjModel answ;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                answ = localDbCtx
                .ProjList
                 .Where(x => x.ProjId == ProjId)
                 .SingleOrDefault();
-            // forzo rilettura
-            if (answ != null)
-            {
-                dbCtx.Entry(answ).Reload();
             }
             return answ;
         }
@@ -252,29 +253,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             List<Core.ProjFileM> answ = new List<Core.ProjFileM>();
             int ProdDbId = 0;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var currProd = dbCtx
-                    .ProdList
-                    .Where(x => x.ProdId == ProdId)
-                    .FirstOrDefault();
-                if (currProd != null)
+                try
                 {
-                    ProdDbId = currProd.ProdDbId;
+                    var currProd = localDbCtx
+                        .ProdList
+                        .Where(x => x.ProdId == ProdId)
+                        .FirstOrDefault();
+                    if (currProd != null)
+                    {
+                        ProdDbId = currProd.ProdDbId;
+                    }
                 }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on GetByProdAsc: {exc}");
+                }
+                // retrieve
+                var dbRes = localDbCtx
+                    .ProjList
+                    .Where(x => x.ProdDbId == ProdDbId)
+                    .OrderBy(x => x.ProdDbId)
+                    .ToList();
+                // conversione
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on GetByProdAsc: {exc}");
-            }
-            // retrieve
-            var dbRes = dbCtx
-                .ProjList
-                .Where(x => x.ProdDbId == ProdDbId)
-                .OrderBy(x => x.ProdDbId)
-                .ToList();
-            // conversione
-            answ = dbRes.Select(x => coreConv(x)).ToList();
             return answ;
         }
 
@@ -287,29 +291,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             List<Core.ProjFileM> answ = new List<Core.ProjFileM>();
             int ProdDbId = 0;
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var currProd = dbCtx
-                    .ProdList
-                    .Where(x => x.ProdId == ProdId)
-                    .FirstOrDefault();
-                if (currProd != null)
+                try
                 {
-                    ProdDbId = currProd.ProdDbId;
+                    var currProd = localDbCtx
+                                    .ProdList
+                                    .Where(x => x.ProdId == ProdId)
+                                    .FirstOrDefault();
+                    if (currProd != null)
+                    {
+                        ProdDbId = currProd.ProdDbId;
+                    }
                 }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on GetByProdAsc: {exc}");
+                }
+                // retrieve
+                var dbRes = localDbCtx
+                            .ProjList
+                            .Where(x => x.ProdDbId == ProdDbId)
+                            .OrderByDescending(x => x.ProdDbId)
+                            .ToList();
+                // conversione
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on GetByProdAsc: {exc}");
-            }
-            // retrieve
-            var dbRes = dbCtx
-                .ProjList
-                .Where(x => x.ProdDbId == ProdDbId)
-                .OrderByDescending(x => x.ProdDbId)
-                .ToList();
-            // conversione
-            answ = dbRes.Select(x => coreConv(x)).ToList();
             return answ;
         }
 
@@ -342,19 +349,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             List<Core.ProjFileM> answ = new List<Core.ProjFileM>();
 
-            // se numRecord = 0 --> passo tutti
-            if (numRecord == 0)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                numRecord = dbCtx.ProjList.Count();
+                // se numRecord = 0 --> passo tutti
+                if (numRecord == 0)
+                {
+                    numRecord = localDbCtx.ProjList.Count();
+                }
+                // retrieve
+                var dbRes = localDbCtx
+                                .ProjList
+                                .OrderByDescending(x => x.ProjId)
+                                .Take(numRecord)
+                                .ToList();
+                // conversione
+                answ = dbRes.Select(x => coreConv(x)).ToList();
             }
-            // retrieve
-            var dbRes = dbCtx
-                .ProjList
-                .OrderByDescending(x => x.ProjId)
-                .Take(numRecord)
-                .ToList();
-            // conversione
-            answ = dbRes.Select(x => coreConv(x)).ToList();
             return answ;
         }
 
@@ -366,32 +376,34 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             int nextId = 0;
 
-            // cerco se ne ho ALMENO 1....
-            var numRec = dbCtx.ProjList.Count();
-            if (numRec == 0)
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                nextId = 1;
-            }
-            else
-            {
-                // retrieve ultimo...
-                var maxRecord = dbCtx
+                // cerco se ne ho ALMENO 1....
+                var numRec = localDbCtx.ProjList.Count();
+                if (numRec == 0)
+                {
+                    nextId = 1;
+                }
+                else
+                {
+                    // retrieve ultimo...
+                    var maxRecord = localDbCtx
+                                    .ProjList
+                                    .OrderByDescending(x => x.ProjId)
+                                    .Take(1)
+                                    .FirstOrDefault();
+                    // incremento
+                    nextId = maxRecord.ProjId + 1;
+                }
+
+                // creo nuovo...
+                var newRec = localDbCtx
                     .ProjList
-                    .OrderByDescending(x => x.ProjId)
-                    .Take(1)
-                    .FirstOrDefault();
-                // incremento
-                nextId = maxRecord.ProjId + 1;
+                    .Add(new ProjModel() { ProjId = nextId, BTLFileName = "", IsNew = true, Locked = true, DtCreated = DateTime.Now });
+
+                // Commit changes
+                localDbCtx.SaveChanges();
             }
-
-            // creo nuovo...
-            var newRec = dbCtx
-                .ProjList
-                .Add(new ProjModel() { ProjId = nextId, BTLFileName = "", IsNew = true, Locked = true, DtCreated = DateTime.Now });
-
-            // Commit changes
-            dbCtx.SaveChanges();
-
             return nextId;
         }
 
@@ -403,44 +415,46 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM LockByProjId(int ProjId, bool Locked)
         {
-            var currProj = dbCtx
-                .ProjList
-                .Where(x => x.ProjId == ProjId)
-                .SingleOrDefault();
-            // aggiorno stato del proj
-            currProj.Locked = Locked;
-            dbCtx.Entry(currProj).State = System.Data.Entity.EntityState.Modified;
-
-            // seleziono il prod e lo blocco...
-            var currProd = dbCtx
-                .ProdList
-                .Where(x => x.ProdDbId == currProj.ProdDbId)
-                .SingleOrDefault();
-
-            if (currProd != null)
+            ProjModel currProj;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // blocco prod corrente
-                currProd.Locked = Locked;
-                dbCtx.Entry(currProd).State = System.Data.Entity.EntityState.Modified;
+                currProj = localDbCtx
+                            .ProjList
+                            .Where(x => x.ProjId == ProjId)
+                            .SingleOrDefault();
+                // aggiorno stato del proj
+                currProj.Locked = Locked;
+                localDbCtx.Entry(currProj).State = System.Data.Entity.EntityState.Modified;
 
-                // ora blocco altri proj del prod...
-                var currProjs = dbCtx
-                       .ProjList
-                       .Where(x => x.ProdDbId == currProd.ProdDbId && x.ProjId != ProjId)
-                       .ToList();
+                // seleziono il prod e lo blocco...
+                var currProd = localDbCtx
+                                .ProdList
+                                .Where(x => x.ProdDbId == currProj.ProdDbId)
+                                .SingleOrDefault();
 
-                //currProjs.ForEach(x => x.Locked = Locked);
-                foreach (var item in currProjs)
+                if (currProd != null)
                 {
-                    //item.ProdDbId = currProd.ProdDbId;
-                    item.Locked = Locked;
-                    dbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
-                }
-            }
-            // salvataggio
-            dbCtx.SaveChanges();
-            ResetController();
+                    // blocco prod corrente
+                    currProd.Locked = Locked;
+                    localDbCtx.Entry(currProd).State = System.Data.Entity.EntityState.Modified;
 
+                    // ora blocco altri proj del prod...
+                    var currProjs = localDbCtx
+                                       .ProjList
+                                       .Where(x => x.ProdDbId == currProd.ProdDbId && x.ProjId != ProjId)
+                                       .ToList();
+
+                    //currProjs.ForEach(x => x.Locked = Locked);
+                    foreach (var item in currProjs)
+                    {
+                        //item.ProdDbId = currProd.ProdDbId;
+                        item.Locked = Locked;
+                        localDbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
+                    }
+                }
+                // salvataggio
+                localDbCtx.SaveChanges();
+            }
             return coreConv(currProj);
         }
 
@@ -449,9 +463,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         public void ResetController()
         {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
-        }
+        } 
 
         /// <summary>
         /// Reimposta come NEW
@@ -461,16 +473,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM ResetNew(int ProjId)
         {
-            var currProj = dbCtx
-                .ProjList
-                .Where(x => x.ProjId == ProjId)
-                .SingleOrDefault();
-
-            // aggiorno stato
-            currProj.IsNew = false;
-            dbCtx.SaveChanges();
-            ResetController();
+            ProjModel currProj;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currProj = localDbCtx
+                            .ProjList
+                            .Where(x => x.ProjId == ProjId)
+                            .SingleOrDefault();
 
+                // aggiorno stato
+                currProj.IsNew = false;
+                localDbCtx.SaveChanges();
+            }
             return coreConv(currProj);
         }
 
@@ -482,27 +496,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(ProjModel updItem)
         {
             bool done = false;
-            var item2update = dbCtx
-                .ProjList
-                .Where(x => x.ProjId == updItem.ProjId)
-                .SingleOrDefault();
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                updItem.ProjDbId = item2update.ProjDbId;
-                // update, vers 1...
-                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                var item2update = localDbCtx
+                                    .ProjList
+                                    .Where(x => x.ProjId == updItem.ProjId)
+                                    .SingleOrDefault();
+                try
+                {
+                    updItem.ProjDbId = item2update.ProjDbId;
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                //// update, vers 2
-                //dbCtx.PartList.Remove(item2del);
-                //dbCtx.PartList.Add(updItem);
+                    //// update, vers 2
+                    //dbCtx.PartList.Remove(item2del);
+                    //dbCtx.PartList.Add(updItem);
 
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception ex)
+                { }
             }
-            catch (Exception ex)
-            { }
             return done;
         }
 
@@ -517,73 +533,74 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             // record del proj corrente
             var currData = FindByProjId(ProjId);
 
-            // 2021.05.03 modifica update: esistenti le MODIFICO, nuove aggiungo, inesistenti elimino in cascata con Part
-
-            // sel delle BTLParts del proj
-            List<BTLPartModel> oldBtlParts = dbCtx
-                .BTLPartList
-                .Where(x => x.ProjDbId == currData.ProjDbId)
-                .ToList();
-
-            // converto le BtlParts da core --> DB
-            List<BTLPartModel> newBtlParts = BtlPartList.Select(x => BTLPartController.ConvertFromCore(x, currData.ProjDbId)).ToList();
-
-            try
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // elementi BtlPartId NON + presenti da eliminare
-                List<int> bpi2rem = oldBtlParts.Select(x => x.PartId).Except(newBtlParts.Select(y => y.PartId)).ToList();
-                List<int> bpi2add = newBtlParts.Select(x => x.PartId).Except(oldBtlParts.Select(y => y.PartId)).ToList();
-                List<int> bpiExis = newBtlParts.Select(x => x.PartId).Intersect(oldBtlParts.Select(y => y.PartId)).ToList();
+                // 2021.05.03 modifica update: esistenti le MODIFICO, nuove aggiungo, inesistenti elimino in cascata con Part
 
-                // aggiorno existing...
-                foreach (var currPartId in bpiExis)
+                // sel delle BTLParts del proj
+                List<BTLPartModel> oldBtlParts = localDbCtx
+                                                    .BTLPartList
+                                                    .Where(x => x.ProjDbId == currData.ProjDbId)
+                                                    .ToList();
+
+                // converto le BtlParts da core --> DB
+                List<BTLPartModel> newBtlParts = BtlPartList.Select(x => BTLPartController.ConvertFromCore(x, currData.ProjDbId)).ToList();
+
+                try
                 {
-                    // recupero item da aggiornare...
-                    var oldItem = oldBtlParts.Where(x => x.PartId == currPartId).FirstOrDefault();
-                    // dati nuovo item
-                    var newItem = newBtlParts.Where(x => x.PartId == currPartId).FirstOrDefault();
-                    if (newItem != null && oldItem != null)
+                    // elementi BtlPartId NON + presenti da eliminare
+                    List<int> bpi2rem = oldBtlParts.Select(x => x.PartId).Except(newBtlParts.Select(y => y.PartId)).ToList();
+                    List<int> bpi2add = newBtlParts.Select(x => x.PartId).Except(oldBtlParts.Select(y => y.PartId)).ToList();
+                    List<int> bpiExis = newBtlParts.Select(x => x.PartId).Intersect(oldBtlParts.Select(y => y.PartId)).ToList();
+
+                    // aggiorno existing...
+                    foreach (var currPartId in bpiExis)
                     {
-                        oldItem.CALC_State = newItem.CALC_State;
-                        oldItem.CNT = newItem.CNT;
-                        oldItem.DO = newItem.DO;
-                        oldItem.H = newItem.H;
-                        oldItem.L = newItem.L;
-                        oldItem.W = newItem.W;
-                        oldItem.Material = newItem.Material;
-                        oldItem.NAM = newItem.NAM;
-                        oldItem.PDN = newItem.PDN;
+                        // recupero item da aggiornare...
+                        var oldItem = oldBtlParts.Where(x => x.PartId == currPartId).FirstOrDefault();
+                        // dati nuovo item
+                        var newItem = newBtlParts.Where(x => x.PartId == currPartId).FirstOrDefault();
+                        if (newItem != null && oldItem != null)
+                        {
+                            oldItem.CALC_State = newItem.CALC_State;
+                            oldItem.CNT = newItem.CNT;
+                            oldItem.DO = newItem.DO;
+                            oldItem.H = newItem.H;
+                            oldItem.L = newItem.L;
+                            oldItem.W = newItem.W;
+                            oldItem.Material = newItem.Material;
+                            oldItem.NAM = newItem.NAM;
+                            oldItem.PDN = newItem.PDN;
+                        }
+                    }
+
+                    // aggiungo le nuove part
+                    foreach (var newPartId in bpi2add)
+                    {
+                        var newItem = newBtlParts.Where(x => x.PartId == newPartId).FirstOrDefault();
+                        localDbCtx.BTLPartList.Add(newItem);
+                    }
+
+                    // elimino dal DB i non + esistenti
+                    foreach (var oldPartId in bpi2rem)
+                    {
+                        // elimino parts nei MachGroup
+                        var oldIstPartList = localDbCtx.PartList.Where(x => x.BTLPart.PartId == oldPartId).ToList();
+                        localDbCtx.PartList.RemoveRange(oldIstPartList);
+                        // elimino BtlParts
+                        var oldItem = oldBtlParts.Where(x => x.PartId == oldPartId).FirstOrDefault();
+                        localDbCtx.BTLPartList.Remove(oldItem);
                     }
                 }
+                catch
+                { }
 
-                // aggiungo le nuove part
-                foreach (var newPartId in bpi2add)
-                {
-                    var newItem = newBtlParts.Where(x => x.PartId == newPartId).FirstOrDefault();
-                    dbCtx.BTLPartList.Add(newItem);
-                }
+                // aggiorno valore isNew a false
+                currData.IsNew = false;
 
-                // elimino dal DB i non + esistenti
-                foreach (var oldPartId in bpi2rem)
-                {
-                    // elimino parts nei MachGroup
-                    var oldIstPartList = dbCtx.PartList.Where(x => x.BTLPart.PartId == oldPartId).ToList();
-                    dbCtx.PartList.RemoveRange(oldIstPartList);
-                    // elimino BtlParts
-                    var oldItem = oldBtlParts.Where(x => x.PartId == oldPartId).FirstOrDefault();
-                    dbCtx.BTLPartList.Remove(oldItem);
-                }
+                // Commit changes
+                localDbCtx.SaveChanges();
             }
-            catch
-            { }
-
-            // aggiorno valore isNew a false
-            currData.IsNew = false;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-            ResetController();
-
             return currData;
         }
 
@@ -598,51 +615,57 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public Core.ProjFileM UpdateInfo(int ProjId, string BTLFileName, string ListName, DateTime DtExported, BWType PType, string Machine)
         {
             // cerco specifico Proj
-            var currData = FindByProjId(ProjId);
-
-            // 2022.01.24: verifico UNIVOCITA' nel nome del file: SE fosse duplicato --> nuovo nome, nel formato nomeOriginale_idx, dove idx è il contatore libero successivo
-            var duplicateList = FindByBtlFileName(BTLFileName);
-            // devo verificare SOLO SE la lista non è vuota
-            if (duplicateList != null && duplicateList.Count > 0)
+            ProjModel currData;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // se ne ho esattamente 1 nel DB allora DEVE essere il record Parent
-                if (duplicateList.Count == 1)
+                currData = localDbCtx
+                               .ProjList
+                               .Where(x => x.ProjId == ProjId)
+                               .SingleOrDefault();
+
+                // 2022.01.24: verifico UNIVOCITA' nel nome del file: SE fosse duplicato --> nuovo nome, nel formato nomeOriginale_idx, dove idx è il contatore libero successivo
+                var duplicateList = FindByBtlFileName(BTLFileName);
+                // devo verificare SOLO SE la lista non è vuota
+                if (duplicateList != null && duplicateList.Count > 0)
                 {
-                    // verifico se ProjId variato
-                    if (!duplicateList[0].ProjId.Equals(currData.ProjId))
+                    // se ne ho esattamente 1 nel DB allora DEVE essere il record Parent
+                    if (duplicateList.Count == 1)
                     {
-                        // in questo caso ho il PRIMO duplicato
-                        BTLFileName = $"{BTLFileName}_1";
-                    }
-                }
-                // se ne ho + di 1 --> so che il maxId interno avrò il valore ULTIMO x prendere il successivo
-                else
-                {
-                    var lastRec = duplicateList.OrderByDescending(x => x.ProjDbId).FirstOrDefault();
-                    // cerco indice
-                    string maybeNumber = lastRec.BTLFileName.Replace($"{BTLFileName}_", "");
-                    int index = 0;
-                    bool isNumber = int.TryParse(maybeNumber, out index);
-                    // fasccio comunque verifica sia numerico
-                    if (isNumber)
-                    {
-                        // in questo caso ho il l'ULTIMO duplicato e faccio +1
-                        BTLFileName = $"{BTLFileName}_{index + 1}";
+                        // verifico se ProjId variato
+                        if (!duplicateList[0].ProjId.Equals(currData.ProjId))
+                        {
+                            // in questo caso ho il PRIMO duplicato
+                            BTLFileName = $"{BTLFileName}_1";
+                        }
+                    }
+                    // se ne ho + di 1 --> so che il maxId interno avrò il valore ULTIMO x prendere il successivo
+                    else
+                    {
+                        var lastRec = duplicateList.OrderByDescending(x => x.ProjDbId).FirstOrDefault();
+                        // cerco indice
+                        string maybeNumber = lastRec.BTLFileName.Replace($"{BTLFileName}_", "");
+                        int index = 0;
+                        bool isNumber = int.TryParse(maybeNumber, out index);
+                        // fasccio comunque verifica sia numerico
+                        if (isNumber)
+                        {
+                            // in questo caso ho il l'ULTIMO duplicato e faccio +1
+                            BTLFileName = $"{BTLFileName}_{index + 1}";
+                        }
                     }
                 }
+
+                // aggiorno valore BTL
+                currData.BTLFileName = BTLFileName;
+                currData.DtExported = DtExported;
+                currData.ListName = ListName;
+                currData.PType = PType;
+                currData.Machine = Machine;
+
+                // Commit changes
+                localDbCtx.SaveChanges();
             }
 
-            // aggiorno valore BTL
-            currData.BTLFileName = BTLFileName;
-            currData.DtExported = DtExported;
-            currData.ListName = ListName;
-            currData.PType = PType;
-            currData.Machine = Machine;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-            ResetController();
-
             return coreConv(currData);
         }
 
@@ -654,14 +677,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM UpdateListName(int ProjId, string ListName)
         {
-            var currData = FindByProjId(ProjId);
-            // aggiorno valore BTL
-            currData.ListName = ListName;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-            ResetController();
+            ProjModel currData;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                               .ProjList
+                               .Where(x => x.ProjId == ProjId)
+                               .SingleOrDefault();
+                // aggiorno valore BTL
+                currData.ListName = ListName;
 
+                // Commit changes
+                localDbCtx.SaveChanges();
+            }
             return coreConv(currData);
         }
 
@@ -673,14 +701,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public Core.ProjFileM UpdateMachine(int ProjId, String Machine)
         {
-            var currData = FindByProjId(ProjId);
-            // aggiorno valore BTL
-            currData.Machine = Machine;
-
-            // Commit changes
-            dbCtx.SaveChanges();
-            ResetController();
+            ProjModel currData;
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                currData = localDbCtx
+                               .ProjList
+                               .Where(x => x.ProjId == ProjId)
+                               .SingleOrDefault();
+                // aggiorno valore BTL
+                currData.Machine = Machine;
 
+                // Commit changes
+                localDbCtx.SaveChanges();
+            }
             return coreConv(currData);
         }
 

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -9,7 +9,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
     {
         #region Private Fields
 
-        private DatabaseContext dbCtx;
 
         #endregion Private Fields
 
@@ -26,8 +25,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
         public StatusMapController()
         {
-            // Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -45,41 +42,40 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             DateTime adesso = DateTime.Now;
             List<StatusMapModel> SM2Del = new List<StatusMapModel>();
 
-            // svuoto la tab mappa precedente (da rivalutare in futuro)
-            if (string.IsNullOrEmpty(Session))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                SM2Del = dbCtx
-                     .StatusMapList
-                     .ToList();
+                // svuoto la tab mappa precedente (da rivalutare in futuro)
+                if (string.IsNullOrEmpty(Session))
+                {
+                    SM2Del = localDbCtx
+                         .StatusMapList
+                         .ToList();
+                }
+                else
+                {
+                    SM2Del = localDbCtx
+                        .StatusMapList
+                        .Where(x => x.Session == Session)
+                        .ToList();
+                }
+                try
+                {
+                    // Remove to database
+                    localDbCtx.StatusMapList.RemoveRange(SM2Del);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on DeleteSession: {exc}");
+                }
             }
-            else
-            {
-                SM2Del = dbCtx
-                    .StatusMapList
-                    .Where(x => x.Session == Session)
-                    .ToList();
-            }
-            try
-            {
-                // Remove to database
-                dbCtx.StatusMapList.RemoveRange(SM2Del);
-                // Commit changes
-                dbCtx.SaveChanges();
-                ResetController();
-                done = true;
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine($"EXCEPTION on DeleteSession: {exc}");
-            }
-
             return done;
         }
 
         public void Dispose()
         {
-            // Clear database context
-            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -87,44 +83,51 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="Session"></param>
         /// <returns></returns>
-        public List<StatusMapModel> GetBySession(string Session = "")
+        public List<StatusMapModel> GetBySession(string Session)
         {
-            // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                return localDbCtx
                 .StatusMapList
                 .Where(x => x.Session == Session)
                 .OrderByDescending(x => x.Index)
                 .ToList();
+            }
         }
 
         /// <summary>
         /// Get data for session where Index > minIndex ordered by index DESC
         /// </summary>
+        /// <param name="Session"></param>
         /// <param name="minIndex"></param>
         /// <returns></returns>
-        public List<StatusMapModel> GetFrom(int minIndex = 0)
+        public List<StatusMapModel> GetFrom(string Session, int minIndex = 0)
         {
-            ResetController();
-            // retrieve
-            return dbCtx
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                return localDbCtx
                 .StatusMapList
-                .Where(x => x.Index >= minIndex)
+                .Where(x => x.Session == Session && x.Index >= minIndex)
                 .OrderBy(x => x.Index)
                 .ToList();
+            }
         }
 
         /// <summary>
-        /// Get PROD data for session
+        /// Get PROD (all)
         /// </summary>
+        /// <param name="Session"></param>
         /// <returns></returns>
         public List<StatusMapModel> GetProd()
         {
             List<StatusMapModel> answ = new List<StatusMapModel>();
             // Initialize database context
-            using (DatabaseContext myDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // retrieve
-                answ = myDbCtx
+                answ = localDbCtx
                     .StatusMapList
                     .Where(x => x.ItemType == Core.StatusMapItemType.Prod)
                     .OrderByDescending(x => x.Index)
@@ -134,12 +137,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Reinizializzaizone del controller
+        /// Get PROD for session
         /// </summary>
-        public void ResetController()
+        /// <param name="Session"></param>
+        /// <returns></returns>
+        public List<StatusMapModel> GetProd(string Session)
         {
-            // Re-Initialize database context
-            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
+            List<StatusMapModel> answ = new List<StatusMapModel>();
+            // Initialize database context
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            {
+                // retrieve
+                answ = localDbCtx
+                    .StatusMapList
+                    .Where(x => x.Session == Session && x.ItemType == Core.StatusMapItemType.Prod)
+                    .OrderByDescending(x => x.Index)
+                    .ToList();
+            }
+            return answ;
         }
 
         /// <summary>
@@ -163,22 +178,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 done = false;
                 // inserisco dato prod
                 StatusMapModel prodSMRecord = new StatusMapModel() { Session = SupervisorId, Index = 0, ItemId = ProdId, ItemType = Core.StatusMapItemType.Prod, Operation = Core.StatusMapOpType.Startup, DtEvent = adesso, Val = "" };
-                // aggiungo
-                dbCtx.StatusMapList.Add(prodSMRecord);
+                // Initialize database context
+                using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                {
+                    // aggiungo
+                    localDbCtx.StatusMapList.Add(prodSMRecord);
 
-                // recupero MachGroup da PROD
-                var MGList = dbCtx
-                    .MachGroupList
-                    .Where(x => x.Prod.ProdId == ProdId)
-                    .ToList();
+                    // recupero MachGroup da PROD
+                    var MGList = localDbCtx
+                                    .MachGroupList
+                                    .Where(x => x.Prod.ProdId == ProdId)
+                                    .ToList();
 
-                var mgSMRecords = MGList.Select(x => new StatusMapModel() { Session = SupervisorId, Index = 0, ItemId = x.MachGroupId, ItemType = Core.StatusMapItemType.MachGroup, Operation = Core.StatusMapOpType.Startup, DtEvent = adesso, Val = "" }).ToList();
-                // aggiungo
-                dbCtx.StatusMapList.AddRange(mgSMRecords);
+                    var mgSMRecords = MGList.Select(x => new StatusMapModel() { Session = SupervisorId, Index = 0, ItemId = x.MachGroupId, ItemType = Core.StatusMapItemType.MachGroup, Operation = Core.StatusMapOpType.Startup, DtEvent = adesso, Val = "" }).ToList();
+                    // aggiungo
+                    localDbCtx.StatusMapList.AddRange(mgSMRecords);
 
-                // salvo
-                dbCtx.SaveChanges();
-                ResetController();
+                    // salvo
+                    localDbCtx.SaveChanges();
+                }
                 done = true;
             }
             return done;
@@ -194,51 +212,54 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="Operation"></param>
         /// <param name="Value"></param>
         /// <returns></returns>
-        public bool UpdateAction(String Session, int ProdId, int ItemId, Core.StatusMapItemType ItemType, Core.StatusMapOpType Operation, string Value)
+        public bool UpdateAction(string Session, int ProdId, int ItemId, Core.StatusMapItemType ItemType, Core.StatusMapOpType Operation, string Value)
         {
             bool fatto = false;
             // Recupero il record PROD (che è ultimo indice)
             StatusMapModel prodData = new StatusMapModel();
-            // se è un prod --> vado x ID
-            if (Session == "")
+            // Initialize database context
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                prodData = dbCtx
-                    .StatusMapList
-                    .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.ItemId == ProdId)
-                    .FirstOrDefault();
-            }
-            else
-            {
-                prodData = dbCtx
-                    .StatusMapList
-                    .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.Session == Session)
-                    .FirstOrDefault();
-            }
-            // se ho trovato
-            if (prodData != null)
-            {
-                try
+                // se è un prod --> vado x ID
+                if (Session == "")
                 {
-                    // aggiorno indice PROD
-                    prodData.Index++;
-                    // se session è nulla ma ho un PROD --> calcolo da li la sessione
-                    if (string.IsNullOrEmpty(Session))
-                    {
-                        Session = prodData.Session;
-                    }
-                    // creo un nuovo record
-                    DateTime adesso = DateTime.Now;
-                    var newRec = new StatusMapModel() { Session = Session, Index = prodData.Index, ItemId = ItemId, ItemType = ItemType, Operation = Operation, DtEvent = adesso, Val = Value };
-                    dbCtx.StatusMapList.Add(newRec);
-
-                    // Commit changes
-                    dbCtx.SaveChanges();
-                    ResetController();
-                    fatto = true;
+                    prodData = localDbCtx
+                        .StatusMapList
+                        .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.ItemId == ProdId)
+                        .FirstOrDefault();
                 }
-                catch (Exception exc)
+                else
                 {
-                    Console.WriteLine($"EXCEPTION on UpdateAction: {exc}");
+                    prodData = localDbCtx
+                        .StatusMapList
+                        .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.Session == Session)
+                        .FirstOrDefault();
+                }
+                // se ho trovato
+                if (prodData != null)
+                {
+                    try
+                    {
+                        // aggiorno indice PROD
+                        prodData.Index++;
+                        // se session è nulla ma ho un PROD --> calcolo da li la sessione
+                        if (string.IsNullOrEmpty(Session))
+                        {
+                            Session = prodData.Session;
+                        }
+                        // creo un nuovo record
+                        DateTime adesso = DateTime.Now;
+                        var newRec = new StatusMapModel() { Session = Session, Index = prodData.Index, ItemId = ItemId, ItemType = ItemType, Operation = Operation, DtEvent = adesso, Val = Value };
+                        localDbCtx.StatusMapList.Add(newRec);
+
+                        // Commit changes
+                        localDbCtx.SaveChanges();
+                        fatto = true;
+                    }
+                    catch (Exception exc)
+                    {
+                        Console.WriteLine($"EXCEPTION on UpdateAction: {exc}");
+                    }
                 }
             }
             return fatto;

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -37,6 +37,13 @@ namespace EgtBEAMWALL.DataLayer
 
         #region Public Methods
 
+#if false
+        /// <summary>
+        /// Metodo di init standard per DB locale
+        /// </summary>
+        /// <param name="server">Indirizzo del server (tipicamente localhost/127.0.0.1)</param>
+        /// <param name="nKey">Numero chiave</param>
+        /// <param name="sKey">Codice/pwd associato a chaive</param>
         public static void InitDb(string server, string nKey, string sKey)
         {
             DATABASE_SERV = server;
@@ -46,14 +53,35 @@ namespace EgtBEAMWALL.DataLayer
             CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None";
             // stringa admin con utente root egalware...
             ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;sslmode=None;CHARSET=utf8";
+        } 
+#endif
+
+        /// <summary>
+        /// Metodo di init standard per DB in rete con Master_Key
+        /// </summary>
+        /// <param name="server">Indirizzo del server (tipicamente indirizzo di rete)</param>
+        /// <param name="nKey">Numero chiave</param>
+        /// <param name="sKey">Codice/pwd associato a chaive</param>
+        /// <param name="masterKey">Numero di chiave master con cui è creato il DB</param>
+        public static void InitDb(string server, string nKey, string sKey, string masterKey = "")
+        {
+            // se nulla metto amster come nKey...
+            masterKey = string.IsNullOrEmpty(masterKey) ? nKey : masterKey;
+            DATABASE_SERV = server;
+            DATABASE_NAME = $"EgtBwDb_{masterKey}";
+            DATABASE_USER = $"user_{nKey}";
+            DATABASE_PWD = $"pwd_{sKey}";
+            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None";
+            // stringa admin con utente root egalware...
+            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;sslmode=None;CHARSET=utf8";
         }
 
-      public static bool CheckUser(string nKey, string sKey)
-      {
-         // esecuzione script di install locale
-         return Controllers.DbController.man.checkCreateUser(DATABASE_USER, DATABASE_PWD);
-      }
+        public static bool CheckUser(string nKey, string sKey, bool isNetwork)
+        {
+            // esecuzione script di install locale
+            return Controllers.DbController.man.checkCreateUser(DATABASE_USER, DATABASE_PWD, isNetwork);
+        }
 
-      #endregion Public Methods
-   }
+        #endregion Public Methods
+    }
 }

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="EgtWPFLib5">
-      <HintPath>..\..\..\EgtProg\DllD32\EgtWPFLib5.dll</HintPath>
+      <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
@@ -46,11 +46,11 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.10.9\lib\net452\MySql.Data.dll</HintPath>
+    <Reference Include="MySql.Data">
+      <HintPath>..\ExtLibs\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.Entity.6.10.9\lib\net452\MySql.Data.Entity.EF6.dll</HintPath>
+    <Reference Include="MySql.Data.Entity.EF6">
+      <HintPath>..\ExtLibs\MySql.Data.Entity.EF6.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.2.1")]
-[assembly: AssemblyFileVersion("2.4.2.1")]
+[assembly: AssemblyVersion("2.4.3.2")]
+[assembly: AssemblyFileVersion("2.4.3.2")]

EgtBEAMWALL.DataLayer/packages.config

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
-  <package id="MySql.Data" version="6.10.9" targetFramework="net452" />
-  <package id="MySql.Data.Entity" version="6.10.9" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
 </packages>

EgtBEAMWALL.Supervisor/AxesPanel/AxesPanelVM.vb

@@ -101,27 +101,35 @@ Public Class Axis
    Public ReadOnly Property sValue As String
       Get
          Dim nDec As Integer = 0
-         Select Case Type
-            Case AxisTypes.LINEAR
-               nDec = -3
-            Case AxisTypes.ROTATIONAL
-               nDec = -4
-            Case Else
-               nDec = 0
-         End Select
+         If CurrentMachine.NCType = NCTypes.TPA Then
+            nDec = -3
+         Else
+            Select Case Type
+               Case AxisTypes.LINEAR
+                  nDec = -3
+               Case AxisTypes.ROTATIONAL
+                  nDec = -4
+               Case Else
+                  nDec = 0
+            End Select
+         End If
          Return DoubleToString(m_dValue, nDec)
       End Get
    End Property
 
    Friend Sub SetValue(value As Double)
-      Select Case Type
-         Case AxisTypes.LINEAR
-            m_dValue = value / 1000
-         Case AxisTypes.ROTATIONAL
-            m_dValue = value / 10000
-         Case Else
-            m_dValue = value
-      End Select
+      If CurrentMachine.NCType = NCTypes.TPA Then
+         m_dValue = value
+      Else
+         Select Case Type
+            Case AxisTypes.LINEAR
+               m_dValue = value / 1000
+            Case AxisTypes.ROTATIONAL
+               m_dValue = value / 10000
+            Case Else
+               m_dValue = value
+         End Select
+      End If
       NotifyPropertyChanged(NameOf(sValue))
    End Sub
 

EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb

@@ -21,6 +21,8 @@ Public Class CALCPanelVM
    Private m_cmdVerifyAll As ICommand
    Private m_cmdSimulate As ICommand
 
+   Private m_ProcessResultList As New List(Of Integer)
+
 #Region "Messages"
 
    Public ReadOnly Property Verify_ToolTip As String
@@ -58,6 +60,7 @@ Public Class CALCPanelVM
    End Sub
 
    Private Sub Calc_ProcessResult(sender As Object, e As CalcResultEventArgs)
+      m_ProcessResultList.Add(e.m_Result.nBarId)
       ProcessResults(e.m_Result)
       Dim nRawid As Integer = e.m_Result.nBarId
       If nRawid <= 0 Then Return
@@ -71,13 +74,15 @@ Public Class CALCPanelVM
       End If
       ' ciclo sui pezzi
       Dim bNotOkFound As Boolean = False
-      For Each MachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList
+      Dim MachGroupList As List(Of MachGroupVM) = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Where(Function(x) m_ProcessResultList.Contains(x.Id)).ToList()
+      For Each MachGroup As MyMachGroupVM In MachGroupList
          ' se trovo pezzo errato, resetto tutti i successivi
          If Not bNotOkFound AndAlso MachGroup.MyMachGroupM.m_nCALC_GlobalState <> CalcStates.OK AndAlso MachGroup.MyMachGroupM.m_nCALC_GlobalState <> CalcStates.INFO Then
             bNotOkFound = True
          End If
          If bNotOkFound Then MachGroup.ResetProduce()
       Next
+      m_ProcessResultList = New List(Of Integer)
       Map.refProjectVM.ManageIsEnabled(True)
       Map.refMyStatusBarVM.ResetStopProgress()
    End Sub

EgtBEAMWALL.Supervisor/Comms/TPAComm.vb

@@ -68,7 +68,7 @@ Public Class TPAComm
    Private m_Proxy_ListInfoEventHandler As New ListInfoEventHandler(AddressOf RemoteObject_ListInfoResponse)
    Private m_Proxy_RPCUpdateEventHandler As New RPCUpdateEventHandler(AddressOf RemoteObject_RPCUpdate)
    Private m_Proxy_VariableCommandExecutedEventHandler As New VariableCommandExecutedEventHandler(AddressOf RemoteObject_VariableCommandExecuted)
-   Private m_Proxy_TickUpdateEventHandler As New TickUpdateEventHandler(AddressOf RemoteObject_TickUpdate)
+   'Private m_Proxy_TickUpdateEventHandler As New TickUpdateEventHandler(AddressOf RemoteObject_TickUpdate)
    Private m_Rem_CommandExecutedEventHandler As CommandExecutedEventHandler
    Private m_Rem_ServerErrorEventHandler As ServerErrorEventHandler
    Private m_Rem_AxesCoordinatesUpdateEventHandler As AxesCoordinatesUpdateEventHandler
@@ -77,7 +77,7 @@ Public Class TPAComm
    Private m_Rem_ListInfoEventHandler As ListInfoEventHandler
    Private m_Rem_RPCUpdateEventHandler As RPCUpdateEventHandler
    Private m_Rem_VariableCommandExecutedEventHandler As VariableCommandExecutedEventHandler
-
+   'Private m_Rem_TickUpdateEventHandler As TickUpdateEventHandler
 
    <SecurityPermission(SecurityAction.Demand)>
    Public Sub New(MachManaging As MachManaging)
@@ -110,7 +110,7 @@ Public Class TPAComm
       AddHandler m_eventProxy.ListInfoResponse, m_Proxy_ListInfoEventHandler
       AddHandler m_eventProxy.RPCUpdate, m_Proxy_RPCUpdateEventHandler
       AddHandler m_eventProxy.VariableCommandExecuted, m_Proxy_VariableCommandExecutedEventHandler
-      AddHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
+      'AddHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
 
       _remObject = CType(Activator.GetObject(GetType(ISOCNC.Remoting_Server), serverURI), ISOCNC.Remoting_Server)
       Try
@@ -122,6 +122,7 @@ Public Class TPAComm
          m_Rem_ListInfoEventHandler = New ListInfoEventHandler(AddressOf m_eventProxy.LocallyHandleListInfo)
          m_Rem_RPCUpdateEventHandler = New RPCUpdateEventHandler(AddressOf m_eventProxy.LocallyHandleRPCUpdate)
          m_Rem_VariableCommandExecutedEventHandler = New VariableCommandExecutedEventHandler(AddressOf m_eventProxy.LocallyHandleVariableCommandExecuted)
+         'm_Rem_TickUpdateEventHandler = New TickUpdateEventHandler(AddressOf m_eventProxy.LocallyHandleTickUpdate)
          AddHandler _remObject.CommandExecuted, m_Rem_CommandExecutedEventHandler
          AddHandler _remObject.ServerError, m_Rem_ServerErrorEventHandler
          AddHandler _remObject.AxisCoordinatesUpdate, m_Rem_AxesCoordinatesUpdateEventHandler
@@ -130,6 +131,7 @@ Public Class TPAComm
          AddHandler _remObject.ListInfoResponse, m_Rem_ListInfoEventHandler
          AddHandler _remObject.RPCUpdate, m_Rem_RPCUpdateEventHandler
          AddHandler _remObject.VariableCommandExecuted, m_Rem_VariableCommandExecutedEventHandler
+         'AddHandler _remObject.TickUpdate, m_Rem_TickUpdateEventHandler
       Catch ex As System.Runtime.Remoting.RemotingException
          Dim dR As MessageBoxResult = MessageBox.Show(ex.Message)
       End Try
@@ -154,9 +156,10 @@ Public Class TPAComm
       RemoveHandler m_eventProxy.ListInfoResponse, m_Proxy_ListInfoEventHandler
       RemoveHandler m_eventProxy.RPCUpdate, m_Proxy_RPCUpdateEventHandler
       RemoveHandler m_eventProxy.VariableCommandExecuted, m_Proxy_VariableCommandExecutedEventHandler
-      RemoveHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
+      'RemoveHandler m_eventProxy.TickUpdate, m_Proxy_TickUpdateEventHandler
    End Sub
 
+
    Private Sub RemoteObject_OpStateUpdate(ByVal newOpState As ISOCNC.Remoting.MachineOperatingState)
       ' resetto stato pending iniziale
       If Map.refMachManaging.StartPending AndAlso newOpState = MachineOperatingState.Pending Then
@@ -239,6 +242,7 @@ Public Class TPAComm
    End Sub
 
    Private Sub RemoteObject_TickUpdate(ByVal newTick As ULong)
+      'EgtUILib.EgtOutLog("Tick: " & newTick)
    End Sub
 
 End Class

EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj

@@ -106,13 +106,13 @@
     <Reference Include="Csv, Version=1.0.31.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Csv.1.0.31\lib\net40\Csv.dll</HintPath>
     </Reference>
-    <Reference Include="EgtUILib, Version=2.3.2.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="EgtUILib, Version=2.4.3.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
+      <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib5, Version=2.3.1.1, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="EgtWPFLib5, Version=2.4.2.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
+      <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
@@ -124,15 +124,18 @@
       <HintPath>..\packages\FluentFTP.19.2.2\lib\net45\FluentFTP.dll</HintPath>
     </Reference>
     <Reference Include="Interop.FXLog">
-      <HintPath>..\..\..\EgtProg\EgtBEAMWALL\Interop.FXLog.dll</HintPath>
+      <HintPath>..\ExtLibs\Interop.FXLog.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Interop.FXServer">
-      <HintPath>..\..\..\EgtProg\EgtBEAMWALL\Interop.FXServer.dll</HintPath>
+      <HintPath>..\ExtLibs\Interop.FXServer.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
+      <HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
+    </Reference>
     <Reference Include="ISOCNC.Remoting">
-      <HintPath>..\..\..\Albatros\Bin\ISOCNC.Remoting.dll</HintPath>
+      <HintPath>..\ExtLibs\ISOCNC.Remoting.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.DotNet.PlatformAbstractions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
@@ -141,11 +144,11 @@
     <Reference Include="Microsoft.Extensions.DependencyModel, Version=2.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.DependencyModel.2.1.0\lib\net451\Microsoft.Extensions.DependencyModel.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.10.9\lib\net452\MySql.Data.dll</HintPath>
+    <Reference Include="MySql.Data">
+      <HintPath>..\ExtLibs\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.Entity.6.10.9\lib\net452\MySql.Data.Entity.EF6.dll</HintPath>
+    <Reference Include="MySql.Data.Entity.EF6">
+      <HintPath>..\ExtLibs\MySql.Data.Entity.EF6.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -503,17 +506,6 @@
     <Resource Include="Resources\EgtBEAMWALL.ico" />
     <Resource Include="Resources\TreeView\Folder.png" />
   </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\ProjectManager\DxfOut.png" />
-    <Resource Include="Resources\ProjectManager\Export.png" />
-    <Resource Include="Resources\ProjectManager\Import.png" />
-    <Resource Include="Resources\ProjectManager\New.png" />
-    <Resource Include="Resources\ProjectManager\Open.png" />
-    <Resource Include="Resources\ProjectManager\Options.png" />
-    <Resource Include="Resources\ProjectManager\Save.png" />
-    <Resource Include="Resources\ProjectManager\SaveAs.png" />
-    <Resource Include="Resources\ProjectManager\Send.png" />
-  </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\ShowPanel\RenderingHL.png" />
     <Resource Include="Resources\ShowPanel\RenderingSH.png" />
@@ -558,6 +550,27 @@
   <ItemGroup>
     <Resource Include="Resources\MDIPage\Send.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\GoToProd.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\Open.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\ProjectManager\Save.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

EgtBEAMWALL.Supervisor/ItemParamList/FeatureInPartInRawPartListV.xaml

@@ -16,7 +16,6 @@
                                 CanUserAddRows="False"
                                 AutoGenerateColumns="False"
                                 CanUserSortColumns="False"
-                                CanUserResizeColumns="False"
                                 CanUserResizeRows="False"
                                 CanUserReorderColumns="False"
                                 SelectionMode="Single"

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListV.xaml

@@ -156,6 +156,18 @@
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
+         <!--GRP - Gruppo-->
+         <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
 
       </DataGrid.Resources>
       <DataGrid.RowStyle>

EgtBEAMWALL.Supervisor/ItemParamList/PartInRawPartListVM.vb

@@ -113,6 +113,18 @@ Public Class PartInRawPartListVM
       End Get
    End Property
 
+   Public ReadOnly Property GRP_Msg As String
+      Get
+         Return EgtMsg(61624)
+      End Get
+   End Property
+
+   Public ReadOnly Property STOREY_Msg As String
+      Get
+         Return EgtMsg(61623)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #Region "CONSTRUCTOR"
@@ -151,6 +163,9 @@ Public Class PartInRawPartListVM
          For Each col In PartInRawPartColumns
             col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
          Next
+         If Not IsNothing(colPartInRawPart_Redo) Then
+            colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
+         End If
          If Not IsNothing(m_colPartInRawPart_Rot) Then
             m_colPartInRawPart_Rot.ColumnVisibility = Visibility.Collapsed
          End If
@@ -182,6 +197,9 @@ Public Class PartInRawPartListVM
          For Each col In PartInRawPartColumns
             col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
          Next
+         If Not IsNothing(colPartInRawPart_Redo) Then
+            colPartInRawPart_Redo.ColumnVisibility = Visibility.Collapsed
+         End If
          If Not IsNothing(m_colPartInRawPart_Offset) Then
             m_colPartInRawPart_Offset.ColumnVisibility = Visibility.Collapsed
          End If

EgtBEAMWALL.Supervisor/ItemParamList/RawPartListV.xaml

@@ -82,7 +82,7 @@
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--MAT - Materiale-->
-         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding dL}">
+         <DataGridTextColumn x:Key="colMATERIAL" Binding="{Binding sMATERIAL}">
             <DataGridTextColumn.Header>
                <TextBlock Text="{Binding Path=DataContext.Material_Msg,
                                          RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:RawPartListV}}}"/>

EgtBEAMWALL.Supervisor/LeftPanel/LeftPanelVM.vb

@@ -410,9 +410,6 @@ Public Class LeftPanelVM
             m_OPModeList = New List(Of OPState) From {
                                                          New OPState("Manual", OPModes.Manual)
             }
-            ' imposto stato manuale
-            Dim ManualMode As OPState = m_OPModeList.FirstOrDefault(Function(x) x.Id = OPModes.Manual)
-            SetOPState(ManualMode)
          Case NCTypes.NUM_FLEXIUM
             m_OPModeList = New List(Of OPState) From {
                                                          New OPState("Auto", OPModes.Auto),
@@ -494,6 +491,8 @@ Public Class LeftPanelVM
          Dim Part As PartVM = SelMachGroup.PartVMList(PartIndex)
          SetDonePart(SelMachGroup, Part)
       Next
+      ' riseleziono il gruppo
+      Map.refSupervisorMachGroupPanelVM.SelectedMachGroup = SelMachGroup
       ' aggiorno bottoni
       NotifyPropertyChanged(NameOf(DeleteRawPart_IsEnabled))
       NotifyPropertyChanged(NameOf(DoneRawPart_IsEnabled))
@@ -586,32 +585,8 @@ Public Class LeftPanelVM
       DbControllers.m_MachGroupController.UpdateOrder(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, SelMachGroup.nProductionIndex)
       Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Move(OldIndex, NewIndex - 1)
 
-
-
-
-      '' scrivo tutti pezzi completati
-      'For PartIndex = 0 To SelMachGroup.PartVMList.Count - 1
-      '   Dim Part As PartVM = SelMachGroup.PartVMList(PartIndex)
-      '   ' reset start, end e stato pezzo
-      '   DbControllers.m_PartController.UpdateStart(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, DateTime.MinValue)
-      '   DbControllers.m_PartController.UpdateEnd(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, DateTime.MinValue)
-      '   DbControllers.m_PartController.UpdateStatus(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, ItemState.ND)
-      '   Part.dtStartTime = DateTime.MinValue
-      '   Part.dtEndTime = DateTime.MinValue
-      '   Part.nProduction_State = ItemState.ND
-
-      '   Part.NotifyPropertyChanged(NameOf(Part.Production_Background))
-      'Next
-      '' reset start, end e stato MachGroup
-      'DbControllers.m_MachGroupController.UpdateStart(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Time)
-      'DbControllers.m_MachGroupController.UpdateEnd(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Time)
-      'DbControllers.m_MachGroupController.UpdateStatus(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, ItemState.WIP)
-      'SelMachGroup.dtStartTime = DateTime.MinValue
-      'SelMachGroup.dtEndTime = DateTime.MinValue
-      'SelMachGroup.nProduction_State = ItemState.ND
-      'SelMachGroup.NotifyPropertyChanged(NameOf(SelMachGroup.Production_Background))
-      'SelMachGroup.NotifyPropertyChanged(NameOf(SelMachGroup.Produce_IsEnabled))
-
+      ' riseleziono il gruppo
+      Map.refSupervisorMachGroupPanelVM.SelectedMachGroup = SelMachGroup
       ' aggiorno bottoni
       NotifyPropertyChanged(NameOf(DeleteRawPart_IsEnabled))
       NotifyPropertyChanged(NameOf(DoneRawPart_IsEnabled))
@@ -709,10 +684,15 @@ Public Class LeftPanelVM
          For Each Part In SelMachGroup.PartVMList
             DbControllers.m_PartController.UpdateStatus(Map.refSupervisorManagerVM.CurrProd.nProdId, SelMachGroup.Id, Part.nPartId, ItemState.ND)
          Next
+         Dim nRemovedIndex As Integer = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.IndexOf(SelMachGroup)
          ' se rimozione da Db ok, lo rimuovo da lista
          Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Remove(SelMachGroup)
          If Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count = 0 Then
+            EgtResetCurrMachGroup()
             ManageBTLParts.HideAll()
+         Else
+            If nRemovedIndex >= Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count Then nRemovedIndex = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Count - 1
+            Map.refProjectVM.SupervisorMachGroupPanelVM.SelectedMachGroup = Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList(nRemovedIndex)
          End If
       End If
    End Sub

EgtBEAMWALL.Supervisor/MachCommandMessagePanel/MachCommandMessagePanelVM.vb

@@ -521,6 +521,9 @@ Public Class MachCommandMessagePanelVM
                _Connected = True
                NotifyPropertyChanged(NameOf(Connect_Background))
                If ResultType = ResultTypes.EXECUTED Then
+                  ' avvio tick di comunicazione con la macchina
+                  MachineCommThread.StartTick()
+                  ' inizializzo variabili
                   Init()
                End If
             End If
@@ -549,9 +552,9 @@ Public Class MachCommandMessagePanelVM
       Select Case AlarmType
          Case CInt(ISOCNC.Remoting.AlarmType.Cycle)
             If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
-               m_ErrCycle.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
+               m_Iso.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
             Else
-               m_ErrCycle.RemoveAll(Function(x) x.sCode = AlarmCode)
+               m_Iso.RemoveAll(Function(x) x.sCode = AlarmCode)
                'Dim ToRemove As Alarm = m_ErrCycle.FirstOrDefault(Function(x) x.sCode = AlarmCode)
                'If Not IsNothing(ToRemove) Then
                '   m_ErrCycle.Remove(ToRemove)
@@ -559,9 +562,9 @@ Public Class MachCommandMessagePanelVM
             End If
          Case CInt(ISOCNC.Remoting.AlarmType.ISO)
             If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
-               m_Iso.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
+               m_ErrSystem.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
             Else
-               m_Iso.RemoveAll(Function(x) x.sCode = AlarmCode)
+               m_ErrSystem.RemoveAll(Function(x) x.sCode = AlarmCode)
                'Dim ToRemove As Alarm = m_Iso.FirstOrDefault(Function(x) x.sCode = AlarmCode)
                'If Not IsNothing(ToRemove) Then
                '   m_Iso.Remove(ToRemove)
@@ -580,9 +583,9 @@ Public Class MachCommandMessagePanelVM
          Case CInt(ISOCNC.Remoting.AlarmType.None)
          Case CInt(ISOCNC.Remoting.AlarmType.System)
             If AlarmOperation = CInt(ISOCNC.Remoting.AlarmOperation.Addition) Then
-               m_ErrSystem.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
+               m_ErrCycle.Add(Alarm.CreateAlarm(AlarmCode, AlarmMessage))
             Else
-               m_ErrSystem.RemoveAll(Function(x) x.sCode = AlarmCode)
+               m_ErrCycle.RemoveAll(Function(x) x.sCode = AlarmCode)
                'Dim ToRemove As Alarm = m_ErrSystem.FirstOrDefault(Function(x) x.sCode = AlarmCode)
                'If Not IsNothing(ToRemove) Then
                '   m_ErrSystem.Remove(ToRemove)

EgtBEAMWALL.Supervisor/MachGroupPanel/MyMachGroupVM.vb

@@ -124,7 +124,19 @@ Public Class MyMachGroupVM
    End Sub
 
    Public Overrides Sub RefreshPartList()
-
+      If nType = BWType.BEAM Then
+         ' leggo StartCut da posizione primo pezzo
+         Dim sInfo As String = ""
+         Dim sSplitInfo() As String
+         Dim bFound As Boolean = False
+         EgtGetInfo(Id, MGR_RPT_PART & 1, sInfo)
+         If Not String.IsNullOrWhiteSpace(sInfo) Then
+            sSplitInfo = sInfo.Split(","c)
+            StringToDouble(sSplitInfo(1), MyMachGroupM.dStartCut)
+         Else
+            MyMachGroupM.dStartCut = 0
+         End If
+      End If
    End Sub
 
 #End Region    ' Parts
@@ -356,7 +368,7 @@ Public Class MyMachGroupVM
                   EgtBeamEnableProcess(Feature.nFeatureId, bOk)
                Next
                ' scrivo dati costruzione grezzo in gruppo di lavorazione
-               EgtSetInfo(nCurrMachGroup, MGR_RPT_PART & nDone, nPartDuploId & "," & CurrPart.sPOSX - dInitialCutOut)
+               EgtSetInfo(nCurrMachGroup, MGR_RPT_PART & nDone, nPartDuploId & "," & DoubleToString(CurrPart.dPOSX - dInitialCutOut, 3))
             Else
                dInitialCutOut += CurrPart.dOffset + CurrPart.dL
             End If

EgtBEAMWALL.Supervisor/MachGroupPanel/PartVM.vb

@@ -32,6 +32,15 @@ Public Class PartVM
       NotifyPropertyChanged(NameOf(bDO))
    End Sub
 
+   Public Property bFLIP As Boolean
+      Get
+         Return m_PartM.nFLIP <> 0
+      End Get
+      Set(value As Boolean)
+         Return
+      End Set
+   End Property
+
 #End Region    ' Supervisor
 
 #End Region    ' FIELDS & PROPERTIES

EgtBEAMWALL.Supervisor/MachGroupPanel/SupervisorMachGroupPanelVM.vb

@@ -12,6 +12,9 @@ Public Class SupervisorMachGroupPanelVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Private m_ReloadProj_Timer As New DispatcherTimer
+   Private m_bReloadProj As Boolean = False
+
    ' lock per aggiunta elemento a lista MachGroup
    Private m_Lock_AddMachGroup As New Object
 
@@ -37,8 +40,8 @@ Public Class SupervisorMachGroupPanelVM
       Map.SetRefSupervisorMachGroupPanelVM(Me)
       BindingOperations.EnableCollectionSynchronization(m_MachGroupVMList, m_Lock_AddMachGroup)
       m_ReloadProj_Timer.Interval = TimeSpan.FromMilliseconds(500)
-      m_ReloadProj_Timer.Start()
       AddHandler m_ReloadProj_Timer.Tick, AddressOf ReloadProject_Tick
+      m_ReloadProj_Timer.Start()
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -56,9 +59,6 @@ Public Class SupervisorMachGroupPanelVM
       MachGroup.NotifyPropertyChanged(NameOf(MachGroup.Produce_IsEnabled))
    End Sub
 
-   Private m_bReloadProj As Boolean = False
-   Private m_ReloadProj_Timer As New DispatcherTimer
-
    Public Sub ReloadProjectFile()
       m_bReloadProj = True
    End Sub

EgtBEAMWALL.Supervisor/MachManagingThread/MachManaging.vb

@@ -403,6 +403,14 @@ Public Class MachManaging
                         Part.NotifyPropertyChanged(NameOf(Part.nProduction_State))
                         ' resetto stato redo
                         Part.bRedo = False
+                        ' se non impostata data start
+                        If Part.dtStartTime = DateTime.MinValue Then
+                           ' scrivo data start su Db pezzo
+                           Dim dtStart As DateTime = Part.dtEndTime - TimeSpan.FromSeconds(60)
+                           DbControllers.m_PartController.UpdateStart(nP_Prod, nP_Machgroup, Part.nPartId, dtStart)
+                           Part.dtStartTime = dtStart
+                        End If
+
                      Next
                   Else
                      ' scrivo data end su Db pezzo
@@ -417,12 +425,6 @@ Public Class MachManaging
                      ' resetto stato redo
                      Part.bRedo = False
                   End If
-                  'Select Case CurrentMachine.NCType
-                  '   Case NCTypes.TPA
-                  '      Tpa.RWVariableManager.WriteVar(P_STATE, 0)
-                  '   Case NCTypes.NUM_FLEXIUM
-                  '      StateVariable.sValue = "0"
-                  'End Select
 
                   ' se tutti i pezzi della barra sono in end
                   If MachGroup.PartVMList.All(Function(x) x.nProduction_State >= 2) Then
@@ -438,15 +440,24 @@ Public Class MachManaging
                      MachGroupVariable.sValue = "0"
                      PartVariable.sValue = "0"
                      StateVariable.sValue = "0"
-                     ' azzero variabile per far ripartire macchina
-                     'Select Case CurrentMachine.NCType
-                     '   'Case NCTypes.TPA
-                     '   '   Tpa.RWVariableManager.WriteVar(P_PROD, 0)
-                     '   '   Tpa.RWVariableManager.WriteVar(P_MACHGROUP, 0)
-                     '   '   Tpa.RWVariableManager.WriteVar(P_PART, 0)
-                     '   '   Tpa.RWVariableManager.WriteVar(P_STATE, 0)
-                     'End Select
 
+                     ' se non impostata data start
+                     If MachGroup.dtStartTime = DateTime.MinValue Then
+                        EgtOutLog("Start date not set on Prod " & nP_Prod & " Machgroup " & nP_Machgroup)
+                        Dim dtStart As DateTime = MachGroup.dtEndTime - TimeSpan.FromSeconds(60)
+                        ' provo a recuperare tempo stimato
+                        If MachGroup.nCALC_TIME > 0 Then
+                           Dim MinPartStart As DateTime = MachGroup.PartVMList.Min(Function(x) x.dtStartTime)
+                           If MinPartStart > DateTime.MinValue Then
+                              dtStart = New DateTime(Math.Min((MachGroup.dtEndTime - TimeSpan.FromSeconds(MachGroup.nCALC_TIME)).Ticks, MinPartStart.Ticks))
+                           Else
+                              dtStart = MachGroup.dtEndTime - TimeSpan.FromSeconds(MachGroup.nCALC_TIME)
+                           End If
+                        End If
+                        ' scrivo data start su Db barra
+                        DbControllers.m_MachGroupController.UpdateStart(nP_Prod, nP_Machgroup, dtStart)
+                        MachGroup.dtStartTime = dtStart
+                     End If
                      ' resetto stati di produzione
                      MachGroup.ResetProduce()
                      ' se partenza pezzi uno a uno
@@ -605,6 +616,9 @@ Public Class MachManaging
                m_CN = New TPAComm(Me)
                m_bConnected = Tpa.remObject.OnConnect()
                m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.OK, ResultTypes.EXECUTED, "")
+               ' imposto stato manuale
+               Dim ManualMode As OPState = Map.refLeftPanelVM.OPModeList.FirstOrDefault(Function(x) x.Id = OPModes.Manual)
+               Map.refLeftPanelVM.SetOPMode(ManualMode)
                ' creo classe di gestione variabili
             Catch ex As Exception
                m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.EXECUTED, "Errore: impossibile connettersi!")

EgtBEAMWALL.Supervisor/MachManagingThread/MachManagingThread.vb

@@ -4,10 +4,14 @@ Class MachineCommThread
 
    ' variabile che ferma il ciclo
    Private Shared m_Stop As Boolean = False
+   Private Shared m_StartTick As Boolean = False
 
    Friend Shared Sub StopThread()
       m_Stop = True
    End Sub
+   Friend Shared Sub StartTick()
+      m_StartTick = True
+   End Sub
 
    ' variabile in cui ci sono stati inizio e fine pezzo
    Private Shared sP1VarName As String = "0.FUNM.E81295"
@@ -37,7 +41,9 @@ Class MachineCommThread
 
       While Not m_Stop
          ' eseguo ciclo principale che tiene vivo il thread
-         m_MachManaging.Timer_Tick()
+         If m_StartTick Then
+            m_MachManaging.Timer_Tick()
+         End If
          Threading.Thread.Sleep(TimeSpan.FromMilliseconds(1000))
       End While
 

EgtBEAMWALL.Supervisor/MainMenu/MainMenuV.xaml

@@ -6,14 +6,22 @@
    
    <!--Barra superiore dei comandi-->
    <UniformGrid Rows="1">
+      <Button Content="{Binding Viewer_Msg}"
+                   Command="{Binding Viewer_Command}"
+                   Style="{StaticResource MainMenu_Button}"/>
+      <Button Content="{Binding Optimizer_Msg}"
+                   Command="{Binding Optimizer_Command}"
+                   Style="{StaticResource MainMenu_Button}"/>
       <RadioButton Content="{Binding Supervisor_Msg}"
                    IsChecked="{Binding Supervisor_IsChecked}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>
       <RadioButton Content="{Binding Inputs_Msg}"
                    IsChecked="{Binding Inputs_IsChecked}"
+                   Visibility="{Binding Inputs_Visibility}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>
       <RadioButton Content="{Binding Outputs_Msg}"
                    IsChecked="{Binding Outputs_IsChecked}"
+                   Visibility="{Binding Outputs_Visibility}"
                    Style="{StaticResource MainMenu_ToggleButton}"/>
       <RadioButton Content="{Binding Configuration_Msg}"
                    IsChecked="{Binding Config_IsChecked}"

EgtBEAMWALL.Supervisor/MainMenu/MainMenuVM.vb

@@ -53,6 +53,20 @@ Public Class MainMenuVM
       End Set
    End Property
 
+   Private m_Inputs_Visibility As Visibility
+   Public ReadOnly Property Inputs_Visibility As Visibility
+      Get
+         Return m_Inputs_Visibility
+      End Get
+   End Property
+
+   Private m_Outputs_Visibility As Visibility
+   Public ReadOnly Property Outputs_Visibility As Visibility
+      Get
+         Return m_Outputs_Visibility
+      End Get
+   End Property
+
    Private m_SelPage As Integer = -1
    Public Property SelPage As Integer
       Get
@@ -106,9 +120,9 @@ Public Class MainMenuVM
 
 #Region "Messages"
 
-   Public ReadOnly Property Supervisor_Msg As String
+   Public ReadOnly Property Viewer_Msg As String
       Get
-         Return EgtMsg(62500)
+         Return EgtMsg(61830)
       End Get
    End Property
 
@@ -118,6 +132,12 @@ Public Class MainMenuVM
       End Get
    End Property
 
+   Public ReadOnly Property Supervisor_Msg As String
+      Get
+         Return EgtMsg(62500)
+      End Get
+   End Property
+
    Public ReadOnly Property Configuration_Msg As String
       Get
          Return EgtMsg(61832)
@@ -138,6 +158,10 @@ Public Class MainMenuVM
 
 #End Region    ' Messages
 
+   ' Definizione comandi
+   Private m_cmdViewer As ICommand
+   Private m_cmdOptimizer As ICommand
+
 #End Region    ' Fields & Properties
 
 #Region "CONSTRUCTOR"
@@ -151,6 +175,13 @@ Public Class MainMenuVM
 
 #Region "METHODS"
 
+   Friend Sub SetInputOutputVisibility()
+      If CurrentMachine.NCType = NCTypes.TPA Then
+         m_Inputs_Visibility = Visibility.Collapsed
+         m_Outputs_Visibility = Visibility.Collapsed
+      End If
+   End Sub
+
    Friend Sub SetMainMenuIsEnabled(bIsEnabled As Boolean)
       m_MainMenu_IsEnabled = bIsEnabled
       NotifyPropertyChanged(NameOf(MainMenu_IsEnabled))
@@ -276,4 +307,76 @@ Public Class MainMenuVM
 
 #End Region    ' METHODS
 
+#Region "COMMANDS"
+
+#Region "Viewer"
+
+   Public ReadOnly Property Viewer_Command As ICommand
+      Get
+         If m_cmdViewer Is Nothing Then
+            m_cmdViewer = New Command(AddressOf Viewer)
+         End If
+         Return m_cmdViewer
+      End Get
+   End Property
+
+   Public Sub Viewer()
+      Dim sViewerOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sViewerOptimizerName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il ViewerOptimizer
+            BringWindowToFront(p.MainWindowHandle)
+            DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, -Pages.VIEW, StatusMapItemType.Comm, StatusMapOpType.OpenPageInViewOptimRequest, "")
+            Exit For
+         Next
+      Else
+         Dim sViewerOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sViewerOptimizerName & ".exe"
+         Try
+            Process.Start(sViewerOptimizerPath, "2 " & Pages.VIEW)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting vieweroptimizer from path " & sViewerOptimizerPath)
+         End Try
+      End If
+   End Sub
+
+#End Region ' Viewer
+
+#Region "Optimizer"
+
+   Public ReadOnly Property Optimizer_Command As ICommand
+      Get
+         If m_cmdOptimizer Is Nothing Then
+            m_cmdOptimizer = New Command(AddressOf Optimizer)
+         End If
+         Return m_cmdOptimizer
+      End Get
+   End Property
+
+   Public Sub Optimizer()
+      Dim sViewerOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sViewerOptimizerName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il ViewerOptimizer
+            BringWindowToFront(p.MainWindowHandle)
+            DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, -Pages.MACHINING, StatusMapItemType.Comm, StatusMapOpType.OpenPageInViewOptimRequest, "")
+            Exit For
+         Next
+      Else
+         Dim sViewerOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sViewerOptimizerName & ".exe"
+         Try
+            Process.Start(sViewerOptimizerPath, "2 " & Pages.MACHINING)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting vieweroptimizer from path " & sViewerOptimizerPath)
+         End Try
+      End If
+   End Sub
+
+#End Region ' Optimizer
+
+#End Region    ' COMMANDS
+
 End Class

EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb

@@ -229,8 +229,8 @@ Public Class MainWindowM
       ' Verifico abilitazione nesting automatico
       m_bAutoNestOption = Not String.IsNullOrWhiteSpace(sNestKey)
       ' Recupero livello e opzioni della chiave
-      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2402, 1, m_nKeyLevel) And
-                            EgtGetKeyOptions(5327, 2402, 1, m_nKeyOptions)
+      Dim bKey As Boolean = EgtGetKeyLevel(5327, 2403, 1, m_nKeyLevel) And
+                            EgtGetKeyOptions(5327, 2403, 1, m_nKeyOptions)
       ' Inizializzazione generale di EgtInterface
       m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0)
       m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString())

EgtBEAMWALL.Supervisor/MainWindow/MainWindowVM.vb

@@ -101,25 +101,35 @@ Public Class MainWindowVM
       '   apro in modalita' VIEW
       '   Map.refMainMenuVM.SelPage = Pages.VIEW
 
-      ' setto il primo file dalla lista degli MRU come prod corrente da aprire
-      Dim sLastProdPath As String = String.Empty
-      GetMainPrivateProfileString(S_MRUSUPERVISORPRODFILES, K_FILE & "1", String.Empty, sLastProdPath)
-      If Not String.IsNullOrWhiteSpace(sLastProdPath) AndAlso File.Exists(sLastProdPath) Then
-         ' ricavo l'Id e il prod associato per l'apertura di quest'ultimo
-         Dim PdId As Integer = 0
-         Dim sPdId As String = Path.GetFileNameWithoutExtension(sLastProdPath)
-         Integer.TryParse(sPdId, PdId)
-         Map.refSupervisorManagerVM.SetCurrProd(PdId)
-         ' apro prod
-         If Not IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Map.refSupervisorManagerVM.OpenProject(Map.refSupervisorManagerVM.CurrProd)
-      End If
+      ' imposto MainWindow per finestra di Loading
+      LoadingWndHelper.SetMainWindow(Application.Current.MainWindow)
 
+
+      ' leggo riga di comando
+      Dim nCommandType As Integer = 0
+      Dim nPage As Pages = Pages.VIEW
+      Dim nProdId As Integer = 0
+      If ProcessCommandLine(nCommandType, nProdId) AndAlso nCommandType = 1 Then
+         Map.refSupervisorManagerVM.SetCurrProd(nProdId)
+      Else
+         ' setto il primo file dalla lista degli MRU come progetto corrente da aprire
+         Dim sLastProdPath As String = String.Empty
+         GetMainPrivateProfileString(S_MRUSUPERVISORPRODFILES, K_FILE & "1", String.Empty, sLastProdPath)
+         If Not String.IsNullOrWhiteSpace(sLastProdPath) AndAlso File.Exists(sLastProdPath) Then
+            ' ricavo l'Id e il prod associato per l'apertura di quest'ultimo
+            Dim PdId As Integer = 0
+            Dim sPdId As String = Path.GetFileNameWithoutExtension(sLastProdPath)
+            Integer.TryParse(sPdId, PdId)
+            Map.refSupervisorManagerVM.SetCurrProd(PdId)
+         End If
+      End If
+      ' apro prod
+      If Not IsNothing(Map.refSupervisorManagerVM.CurrProd) Then Map.refSupervisorManagerVM.OpenProject(Map.refSupervisorManagerVM.CurrProd)
       ' apro in modalita' SUPERVISOR
       Map.refMainMenuVM.SelPage = Pages.SUPERVISOR
 
       Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.FeatureList_Visibility))
 
-
       ' inizializzo thread di aggiornamento e comunicazione con DB
       ' creo thread gestione macchina
       m_ViewerOptimizerCommThread = New Thread(Sub()
@@ -128,10 +138,23 @@ Public Class MainWindowVM
       m_ViewerOptimizerCommThread.SetApartmentState(ApartmentState.STA)
       ' avvio thread di gestione della macchina che avvia la connessione
       m_ViewerOptimizerCommThread.Start()
-
-
    End Sub
 
+   Friend Function ProcessCommandLine(ByRef nCommandType As Integer, ByRef nProdId As Integer) As Boolean
+      ' Se non ci sono veri parametri su linea di comando, esco (il primo è sempre il nome del programma)
+      If Environment.GetCommandLineArgs.Count() <= 1 Then Return False
+      ' Recupero primo parametro che dovrebbe essere il tipo di modalita' riga di comando
+      Dim sFile As String = Environment.GetCommandLineArgs(1)
+      If String.IsNullOrWhiteSpace(sFile) OrElse Not Integer.TryParse(sFile, nCommandType) OrElse nCommandType <= 0 Then Return False
+      Select Case nCommandType
+         Case 1         ' apri progetto in supervisore
+            ' recupero secondo parametro
+            Dim sProdId As String = Environment.GetCommandLineArgs(2)
+            If Not Integer.TryParse(sProdId, nProdId) OrElse nProdId <= 0 Then Return False
+            Return True
+      End Select
+   End Function
+
    Friend Sub KeyDown(PressedKey As Key)
       ' Con ESC esco dall'azione corrente
       If PressedKey = Key.Escape Then

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

@@ -55,5 +55,5 @@ Imports System.Windows
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.4.2.1")>
-<Assembly: AssemblyFileVersion("2.4.2.1")>
+<Assembly: AssemblyVersion("2.4.3.2")>
+<Assembly: AssemblyFileVersion("2.4.3.2")>

EgtBEAMWALL.Supervisor/OutputsPage/OutputsPageVM.vb

@@ -25,7 +25,7 @@ Public Class OutputsPageVM
    Sub New()
       '' imposto riferimento in Map
       'Map.SetRefOutputsPageVM(Me)
-      m_OutputVariableListVM = New VariablesListVM(S_outPUTVARIABLES)
+      m_OutputVariableListVM = New VariablesListVM(S_OUTPUTVARIABLES)
    End Sub
 
 #End Region ' Constructor

EgtBEAMWALL.Supervisor/SceneHost/MySceneHostVM.vb

@@ -235,6 +235,7 @@ Public Class MySceneHostVM
    Private Sub OnOpenProject(sender As Object, sFile As String, bOk As Boolean)
       ' Procedo a seconda del risultato
       If bOk Then
+         LoadingWndHelper.UpdateLoadingWnd(ActiveIds.OPENPROD, 2, EgtMsg(63003), 50, 70)           ' Loading machining groups
          ' leggo MachGroup
          Map.refProjectVM.ProdMachGroupPanelVM = New MyMachGroupPanelVM(MyMachGroupPanelM.CreateMyMachGroupPanel(Map.refMachinePanelVM.MachineList.ToList()))
          WriteMainPrivateProfileString(S_GENERAL, K_LASTPROJ, sFile)

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerV.xaml

@@ -6,7 +6,7 @@
                               IsRightDockable="False"
                               IsEnabled="{Binding SupervisorManager_IsEnabled}"
                               Style="{StaticResource ToolBar_EgtFloatingPanel}">
-         
+
    <!--Barra superiore dei comandi-->
    <Button Command="{Binding OpenCommand}"
            ToolTip="{Binding OpenToolTip}"
@@ -14,49 +14,23 @@
            Tag="{Binding}"
            Style="{StaticResource ToolBar_Button}">
       <Button.ContextMenu>
-          <ContextMenu ItemsSource="{Binding MruFileNames}">
-              <ContextMenu.Resources>
-                  <Style TargetType="{x:Type MenuItem}">
-                      <Setter Property="Command"
+         <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>
+                  <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}"
+   <Button Command="{Binding GoToProd_Command}"
+           ToolTip="{Binding GoToProd_ToolTip}"
            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Save.png" Stretch="Uniform"/>
+      <Image Source="/Resources/ProjectManager/GoToProd.png" Stretch="Uniform"/>
    </Button>
-   --><!--<Button Command="{Binding SaveAsCommand}"
-            ToolTip="{Binding SaveAsToolTip}"
-            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/SaveAs.png" Stretch="Uniform"/>
-   </Button>--><!--
-   <Button Command="{Binding AddProj_Command}" ToolTip="{Binding AddProjToolTip}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-   </Button>
-   <Button Content="&lt;"
-           Command="{Binding GoToProj_Command}" ToolTip="{Binding AddProjToolTip}"
-           Style="{StaticResource ToolBar_Button}"/>-->
 
-   <!--<Button Command="{Binding OptionsCommand}"
-            ToolTip="{Binding OptionsToolTip}"
-            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Options.png" Height="22"/>
-   </Button>-->
-   <!--<Button Command="{Binding SendFeedbackCommand}"
-            ToolTip="{Binding SendFeedbackToolTip}"
-            Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Send.png" Height="22" Margin="3,0,3,0" />
-   </Button>-->
-   <!--<Button Command="{Binding UpdateBTL_Command}" ToolTip="{Binding UpdateBTLToolTip}"
-           Style="{StaticResource ToolBar_Button}">
-      <Image Source="/Resources/ProjectManager/Import.png" Stretch="Uniform"/>
-   </Button>-->
 
 </EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -1,5 +1,6 @@
 Imports System.Collections.ObjectModel
 Imports System.IO
+Imports System.Windows.Threading
 Imports EgtBEAMWALL.Core
 Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtBEAMWALL.DataLayer.DatabaseModels
@@ -11,6 +12,10 @@ Public Class SupervisorManagerVM
 
 #Region "FIELDS & PROPERTIES"
 
+   Private m_OpenProj_Timer As New DispatcherTimer
+   Private m_bOpenProj As Boolean = False
+   Private m_nProjIdToOpen As Integer = GDB_ID.NULL
+
    Private m_SupervisorManager_IsEnabled As Boolean = True
    Public ReadOnly Property SupervisorManager_IsEnabled As Boolean
       Get
@@ -70,7 +75,7 @@ Public Class SupervisorManagerVM
    Private m_cmdOpen As ICommand
    Private m_cmdOpenMruFile As ICommand
    'Private m_cmdSave As ICommand
-   'Private m_cmdGoToProj As ICommand
+   Private m_cmdGoToProd As ICommand
 
    '#Region "ToolTip"
 
@@ -97,6 +102,10 @@ Public Class SupervisorManagerVM
       Map.SetRefSupervisorManagerVM(Me)
       ' Impostazioni MruLists
       m_MruFiles.Init(S_MRUSUPERVISORPRODFILES, 8)
+      ' imposto timer di apertura da ottimizzatore
+      m_OpenProj_Timer.Interval = TimeSpan.FromMilliseconds(500)
+      AddHandler m_OpenProj_Timer.Tick, AddressOf OpenProject_Tick
+      m_OpenProj_Timer.Start()
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -129,6 +138,24 @@ Public Class SupervisorManagerVM
       DbControllers.m_ProdController.UpdateMachGroup(CurrProd.nProdId, MyMachGroupList)
    End Sub
 
+   Public Sub OpenProjectFromOptimizer(ProjIdToOpen As Integer)
+      If ProjIdToOpen <> Map.refSupervisorManagerVM.m_CurrProd.nProdId Then
+         m_nProjIdToOpen = ProjIdToOpen
+         m_bOpenProj = True
+      End If
+   End Sub
+
+   Public Sub OpenProject_Tick()
+      If Not m_bOpenProj Then Return
+      m_bOpenProj = False
+      ' recupero progetto da Id 
+      Dim DbProject As ProdFileM
+      DbProject = DbControllers.m_ProdController.FindCoreByProdId(m_nProjIdToOpen)
+      Dim ProjectVM As New ProdFileVM(DbProject)
+      OpenProject(ProjectVM)
+      m_nProjIdToOpen = GDB_ID.NULL
+   End Sub
+
 #End Region    ' METHODS
 
 #Region "COMMANDS"
@@ -194,9 +221,12 @@ Public Class SupervisorManagerVM
             m_bLoadingProd = False
             Return
          End If
+         LoadingWndHelper.OpenLoadingWnd(ActiveIds.OPENPROD, 3, EgtMsg(63000), EgtMsg(63001), 50)        'Project opening        'Loading project geometries
          If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
             m_CurrProd = TempCurrProd
             Map.refMainWindowVM.UpdateTitle()
+            ' inizializzo visibilita' bottone done per i Part
+            Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.DonePart_Visibility))
             'If Map.refMachGroupPanelVM.InitMachGroupList() Then
             '   m_CurrProd = TempCurrProd
             '   Map.refMainWindowVM.SetTitle(CurrProd.nProdId.ToString("0000") & " - EgtBEAMWALL")
@@ -215,6 +245,7 @@ Public Class SupervisorManagerVM
          Map.refSceneHostVM.MainController.NewProject()
          Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
       End If
+      LoadingWndHelper.UpdateLoadingWnd(ActiveIds.OPENPROD, 3, EgtMsg(63004), 70, 100)          ' Loading production data
       Map.refProjectVM.SupervisorMachGroupPanelVM = New SupervisorMachGroupPanelVM(MachGroupPanelM.CreateNewMachGroupPanel())
       ' apro sessione di comunicazione e fisso indice a 0
       DbControllers.m_StatusMapController.StartProd(Map.refSupervisorManagerVM.CurrProd.nProdId, m_SupervisorId)
@@ -257,6 +288,7 @@ Public Class SupervisorManagerVM
       Map.refProjectVM.SupervisorMachGroupPanelVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList))
       m_bLoadingProd = False
       NotifyPropertyChanged(NameOf(MruFileNames))
+      LoadingWndHelper.CloseLoadingWnd(ActiveIds.OPENPROD)
    End Sub
 
 #End Region ' OpenCommand
@@ -292,6 +324,49 @@ Public Class SupervisorManagerVM
 
 #End Region ' OpenMruFileCommand
 
+#Region "GoToProd"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property GoToProd_Command As ICommand
+      Get
+         If m_cmdGoToProd Is Nothing Then
+            m_cmdGoToProd = New Command(AddressOf GoToProd)
+         End If
+         Return m_cmdGoToProd
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Friend Sub GoToProd()
+      If IsNothing(m_CurrProd) Then Return
+      ' apro ottimizzatore
+      Dim sOptimizerName As String = "EgtBEAMWALL.ViewerOptimizerR32"
+      ' recupero processo del supervisore
+      Dim localProc As Process() = Process.GetProcessesByName(sOptimizerName)
+      If localProc.Length > 0 Then
+         For Each p As Process In localProc
+            ' porto in primo piano il Supervisor
+            BringWindowToFront(p.MainWindowHandle)
+            Exit For
+         Next
+      Else
+         Dim sOptimizerPath As String = Path.GetDirectoryName(System.AppDomain.CurrentDomain.BaseDirectory) & "\" & sOptimizerName & ".exe"
+         Try
+            Process.Start(sOptimizerPath, "1 " & CurrProd.nProdId)
+         Catch ex As Exception
+            EgtOutLog("Error: impossible starting optimizer from path " & sOptimizerPath)
+         End Try
+      End If
+      ' mando richiesta di apertura progetto in ottimizzatore
+      DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, Map.refSupervisorManagerVM.CurrProd.nProdId, StatusMapItemType.Comm, StatusMapOpType.ChangeProdInProdRequest, "")
+   End Sub
+
+#End Region ' GoToProd
+
 #End Region    ' Commands
 
 End Class

EgtBEAMWALL.Supervisor/Utility/CurrentMachine.vb

@@ -160,6 +160,8 @@ Public Module CurrentMachine
       ' inizializzo assi
       Map.refAxesPanelVM.LoadAxes()
 
+      ' imposto visibilita' input output
+      Map.refMainMenuVM.SetInputOutputVisibility()
       ' leggo parametri macchina da WallData
       If nType = MachineType.WALL Then
          ' Assegno i dati
@@ -201,8 +203,6 @@ Public Module CurrentMachine
       Map.refLeftPanelVM.LoadChannels()
       Map.refLeftPanelVM.LoadOPStates()
       Map.refLeftPanelVM.LoadOPModes()
-      ' inizializzo visibilita' bottone done per i Part
-      Map.refLeftPanelVM.NotifyPropertyChanged(NameOf(Map.refLeftPanelVM.DonePart_Visibility))
    End Sub
 
 #End Region 'Init

EgtBEAMWALL.Supervisor/Utility/DbControllers.vb

@@ -27,18 +27,32 @@ Module DbControllers
       End If
       Try
          Dim DbAddress As String = "127.0.0.1"
+         Dim DbMasterKey As Integer = 0
+         Dim sDbMasterKey As String = ""
          If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
             GetMainPrivateProfileString(S_GENERAL, K_DBADDRESS, "127.0.0.1", DbAddress)
+            DbMasterKey = GetMainPrivateProfileInt(S_GENERAL, K_DBMASTERKEY, 0)
+            If DbMasterKey > 0 Then
+               sDbMasterKey = DbMasterKey.ToString("000000")
+            End If
+            If String.IsNullOrWhiteSpace(DbAddress) OrElse DbMasterKey <= 0 Then
+               DbAddress = "127.0.0.1"
+               DbMasterKey = 0
+            End If
          End If
-         DataLayer.DbConfig.InitDb(DbAddress, sUser, sPwd)
-         DataLayer.DbConfig.CheckUser(sUser, sPwd)
+         DataLayer.DbConfig.InitDb(DbAddress, sUser, sPwd, sDbMasterKey)
+         DataLayer.DbConfig.CheckUser(sUser, sPwd, Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK))
       Catch ex As Exception
          EgtOutLog("InitDb error: " & ex.ToString())
          MessageBox.Show(Application.Current.MainWindow, "Db connection error!!", "Error")
          End
       End Try
-      DataLayer.DbConfig.InitDb("127.0.0.1", sUser, sPwd)
-      DataLayer.DbConfig.CheckUser(sUser, sPwd)
+
+      If Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then
+         Dim sSupervisorMachName As String = ""
+         GetMainPrivateProfileString(S_MACH, K_SUPERVISORMACH, "", sSupervisorMachName)
+         If Not String.IsNullOrWhiteSpace(sSupervisorMachName) Then m_SupervisorId = sSupervisorMachName
+      End If
 
       m_ProjController = New DataLayer.Controllers.ProjController
       m_ProdController = New DataLayer.Controllers.ProdController

EgtBEAMWALL.Supervisor/Utility/Dictionary.xaml

@@ -276,6 +276,14 @@
       </Style.Triggers>
    </Style>
 
+   <Style x:Key="MainMenu_Button" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
+      <Setter Property="Background" Value="{StaticResource Omag_White}"/>
+      <Setter Property="Foreground" Value="{StaticResource Omag_DarkGray}"/>
+      <Setter Property="TextBlock.FontWeight" Value="Normal"/>
+      <Setter Property="Height" Value="30"/>
+      <Setter Property="Width" Value="90"/>
+   </Style>
+
    <Style x:Key="Option_ColorButton" TargetType="{x:Type Button}" BasedOn="{StaticResource {x:Type Button}}">
       <Setter Property="Padding" Value="5"/>
       <Setter Property="HorizontalContentAlignment" Value="Center"/>

EgtBEAMWALL.Supervisor/ViewerOptimizerCommThread/ViewerOptimizerComm.vb

@@ -1,15 +1,26 @@
-Imports EgtBEAMWALL.DataLayer.DatabaseModels
+Imports EgtBEAMWALL.Core
+Imports EgtBEAMWALL.DataLayer.DatabaseModels
 
 Public Class ViewerOptimizerComm
 
+   Private m_bTickInExecution As Boolean = False
+
    Sub New()
       ' imposto in Map
       'Map.SetRefMachManaging(Me)
    End Sub
 
    Friend Sub Timer_Tick()
+      If m_bTickInExecution Then
+         EgtUILib.EgtOutLog("Tick gia' in esecuzione!!")
+         Return
+      End If
+      m_bTickInExecution = True
       ' se c'e' un progetto aperto o in caricamento
-      If IsNothing(Map.refSupervisorManagerVM.CurrProd) OrElse Map.refSupervisorManagerVM.bLoadingProd Then Return
+      If IsNothing(Map.refSupervisorManagerVM.CurrProd) OrElse Map.refSupervisorManagerVM.bLoadingProd Then
+         m_bTickInExecution = False
+         Return
+      End If
       ' recupero indice modifica del prod
       Dim nModificationIndex As Integer = 0
       Dim ActiveSessionList As List(Of StatusMapModel) = DbControllers.m_StatusMapController.GetProd()
@@ -64,8 +75,13 @@ Public Class ViewerOptimizerComm
                         End If
                      End If
                End Select
-            ElseIf MachGroupModification.ItemType = Core.StatusMapItemType.Comm AndAlso MachGroupModification.Operation = Core.StatusMapOpType.ViewOptimStoped Then
-               ViewerOptimizerCommThread.SetViewerOptimizerBlocked(True)
+            ElseIf MachGroupModification.ItemType = Core.StatusMapItemType.Comm Then
+               If MachGroupModification.Operation = Core.StatusMapOpType.ViewOptimStoped Then
+                  ViewerOptimizerCommThread.SetViewerOptimizerBlocked(True)
+               ElseIf MachGroupModification.Operation = Core.StatusMapOpType.ChangeProdInSupervisorRequest Then
+                  ' lo apro
+                  Map.refSupervisorManagerVM.OpenProjectFromOptimizer(MachGroupModification.ItemId)
+               End If
             End If
          Next
          ' se devo ricaricare il file
@@ -74,39 +90,11 @@ Public Class ViewerOptimizerComm
             For Each MachGroupModification In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupFullList.Where(Function(x) x.Value(0) <> x.Value(1))
                MachGroupModification.Value(1) = MachGroupModification.Value(0)
             Next
-
-
-            ' ricarico il progetto
-            'Map.refProjectVM.SupervisorMachGroupPanelVM.ReloadProjectFile()
          End If
-
-
-
          ' aggiorno indice del prod
          Map.refSupervisorManagerVM.CurrProd.SetModificationIndex(nModificationIndex)
       End If
-
-
-
-
-      ' verifico se e' aperto in qualche ottimizzatore
-      'DbControllers.m_ProdController.
-      'Map.refSupervisorManagerVM.CurrProd.bIsLocked
-      ' verifico se la mappa messaggi ha indice maggiore del mio
-
-      ' ricarico il progetto
-
-      ' aggiorno eventuali nuovi machgroup
-
-
-
-
-
-      ' se devo ripartire a meta' di una barra
-
-      ' mando messaggio di blocco dell'ottimizzatore
-
-
+      m_bTickInExecution = False
    End Sub
 
 End Class

EgtBEAMWALL.Supervisor/app.config

@@ -7,7 +7,7 @@
   <entityFramework>
     <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
     <providers>
-      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
+      
       <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>

EgtBEAMWALL.Supervisor/packages.config

@@ -3,11 +3,10 @@
   <package id="Csv" version="1.0.31" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="FluentFTP" version="19.2.2" targetFramework="net472" />
+  <package id="Ionic.Zip" version="1.9.1.8" targetFramework="net472" />
   <package id="Lextm.SharpSnmpLib" version="10.0.9" targetFramework="net472" />
   <package id="Microsoft.DotNet.PlatformAbstractions" version="2.1.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.DependencyModel" version="2.1.0" targetFramework="net472" />
-  <package id="MySql.Data" version="6.10.9" targetFramework="net452" />
-  <package id="MySql.Data.Entity" version="6.10.9" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="Portable.BouncyCastle" version="1.8.2" targetFramework="net472" />
   <package id="System.Collections.Specialized" version="4.3.0" targetFramework="net472" />

EgtBEAMWALL.SupportRequest/EgtBEAMWALL.SupportRequest.csproj

@@ -1,11 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
-
-</Project>

EgtBEAMWALL.SupportRequest/SupportRequest.cs

@@ -1,89 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace EgtBEAMWALL.SupportRequest
-{
-   public class SupportRequest
-   {
-      #region Public Properties
-
-      public string CodApp { get; set; } = "";
-      public string CodImp { get; set; } = "";
-      public string CodInst { get; set; } = "";
-      public string ContactEmail { get; set; } = "";
-      public string ContactName { get; set; } = "";
-      public string ContactPhone { get; set; } = "";
-      public int idxSubLic { get; set; } = 0;
-
-      public TipologiaTicket Tipo { get; set; } = TipologiaTicket.ND;
-
-      public bool IsValid
-      {
-         get => !string.IsNullOrEmpty(MasterKey) && !string.IsNullOrEmpty(ContactEmail) && !string.IsNullOrEmpty(CodInst) && !string.IsNullOrEmpty(CodApp);
-      }
-
-      public string MasterKey { get; set; } = "";
-      public string ReqBody { get; set; } = "";
-
-      /// <summary>
-      /// Istanzia un nuovo ogetto richeista supporto
-      /// </summary>
-      /// <param name="codApp">Codice Applicazione (es EBW-UP)</param>
-      /// <param name="codImp">Codice Impegno (es codice chiave HW)</param>
-      /// <param name="codInst">Codice Cliente/Installazione</param>
-      /// <param name="contactEmail">Email x contatto</param>
-      /// <param name="contactName">Nome del richiedente/clietne</param>
-      /// <param name="contactPhone">Tel richeidente/cliente</param>
-      /// <param name="masterKey">Chiave master di comunicazione da LiMan</param>
-      /// <param name="ReqBody">Testo delal richiesta</param>
-      /// <param name="idxSubLic">Idx univoco di sublic (es x gestione utenti)</param>
-      /// <param name="tipo">tipo ticket da gestire (default fileUpload)</param>
-      public SupportRequest(string codApp, string codImp, string codInst, string contactEmail, string contactName, string contactPhone, string masterKey, string ReqBody, int idxSubLic = 0, TipologiaTicket tipo = TipologiaTicket.FileUpload)
-      {
-         this.CodApp = CodApp;
-         this.CodImp = CodImp;
-         this.CodInst = CodInst;
-         this.ContactEmail = contactEmail;
-         this.ContactName = contactName;
-         this.ContactPhone = contactPhone;
-         this.MasterKey = masterKey;
-         this.ReqBody = ReqBody;
-         this.idxSubLic = idxSubLic;
-         this.Tipo = tipo;
-      }
-
-      /// <summary>
-      /// Effettua salvataggio su file di un oggetto richiesta file upload
-      /// </summary>
-      /// <param name="currReq">Oggetto richiesta (già istanziato)</param>
-      /// <param name="filePath">Path dove salvare il file</param>
-      public static bool SaveRequest(SupportRequest currReq, string filePath)
-      {
-         bool fatto = false;
-         try
-         {
-            string rawData = JsonConvert.SerializeObject(currReq, Formatting.Indented);
-            File.WriteAllText(filePath, rawData);
-            fatto = true;
-         }
-         catch (Exception ex)
-         {
-            Console.Write(ex.ToString());
-         }
-         return fatto;
-      }
-
-      #endregion Public Properties
-   }
-
-   public enum TipologiaTicket : int {
-      ND = 0,
-      FileUpload = 2
-   }
-
-}

EgtBEAMWALL.ViewerOptimizer/AddRawPartWnd/AddRawPartWndVM.vb

@@ -91,7 +91,7 @@ Public Class AddRawPartWndVM
       m_nProjectType = ProjectType
       Select Case ProjectType
          Case BWType.BEAM
-            m_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableType.LENGTH, EgtMsg(61935), dL),                ' lunghezza
+            m_VariableList = New ObservableCollection(Of Variable)({New Variable(Variable.VariableType.LENGTH, EgtMsg(61935), dL + dPosx),        ' lunghezza + ritaglio iniziale
                                                                     New Variable(Variable.VariableType.LENGTH, EgtMsg(61816), dPosx),             ' ritaglio iniziale
                                                                     New Variable(Variable.VariableType.LENGTH, EgtMsg(61937), dOffset)})          ' offset
          Case BWType.WALL

EgtBEAMWALL.ViewerOptimizer/App.config

@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
   <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+  <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
   </configSections>
   <entityFramework>
-    <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6"/>
+    <defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.Entity.EF6" />
     <providers>
-      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer"/>
+      
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
     </providers>
   </entityFramework>
   <connectionStrings>
-    <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient"/>
+    <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=EgtUser;password=viacremasca;Persist Security Info=True;database=EgtBwDb;SslMode=none" providerName="MySql.Data.MySqlClient" />
   </connectionStrings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.10.9.0" newVersion="6.10.9.0"/>
+        <assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.10.9.0" newVersion="6.10.9.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.data>
     <DbProviderFactories>
-      <remove invariant="MySql.Data.MySqlClient"/>
-      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"/>
+      <remove invariant="MySql.Data.MySqlClient" />
+      <add name="MySQL Data Provider" invariant="MySql.Data.MySqlClient" description=".Net Framework Data Provider for MySQL" type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d" />
     </DbProviderFactories>
   </system.data>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLFeatureVM.vb

@@ -82,6 +82,7 @@ Public Class BTLFeatureVM
    End Property
 
    ' proprieta' che indica se e' attivo l'update del parametro bDO su piu' feature (attiva/disattiva tutti su pezzo, o per tipo con tasto destro)
+   ' necessario per evitare ricalcolo della grafica sulla modifica del parametro per ogni feature
    Private Shared m_bDO_MultipleUpdate As Boolean = False
    Public Shared Property bDO_MultipleUpdate As Boolean
       Get
@@ -174,7 +175,7 @@ Public Class BTLFeatureVM
 
    Public ReadOnly Property Edit_Visibility As Visibility
       Get
-         Return If(BTLFeatureM.IsFreeContour AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
+         Return If(Map.refMainWindowVM.MainWindowM.nUserLevel > 5 AndAlso BTLFeatureM.IsFreeContour AndAlso Not Map.refFreeContourManagerVM.bIsActive, Visibility.Visible, Visibility.Collapsed)
       End Get
    End Property
    Public ReadOnly Property SaveCancel_Visibility As Visibility
@@ -281,6 +282,7 @@ Public Class BTLFeatureVM
       End Select
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
    End Sub
@@ -295,6 +297,7 @@ Public Class BTLFeatureVM
       m_BTLFeatureM.sCALC_MSG = ""
       NotifyPropertyChanged(NameOf(Calc_Background))
       NotifyPropertyChanged(NameOf(CALC_ROT_Visibility))
+      NotifyPropertyChanged(NameOf(sCALC_MSG))
       NotifyPropertyChanged(NameOf(CALC_ERR_Letter))
       NotifyPropertyChanged(NameOf(CALC_ERR_Foreground))
    End Sub

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLParamVM.vb

@@ -314,13 +314,13 @@ Public Class BTLParamVM
                                                          m_BTLFeatureM.nPRID, m_BTLFeatureM.frFRAME, vPar, sPar, vParQ)
 
          If bOK Then
+            m_BTLParamM.bCustom = True
             ' se sono in ottimizzazione 
             If Map.refMainMenuVM.SelPage = Pages.VIEW Then
                ' setto nel progetto il fatto che il parametro attuale è custom o meno
                EgtSetInfo(m_BTLFeatureM.nFeatureId, m_BTLParamM.sName & "A", If(bCustom, "1", ""))
                NotifyPropertyChanged(NameOf(bCustom))
             End If
-            m_BTLParamM.bCustom = True
             m_BTLParamM.dValue = dNewValue
             ' modifica provvisoria per mancanza aggiornamento su freecontour
             If m_BTLFeatureM.IsFreeContour Then

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLPartVM.vb

@@ -41,7 +41,7 @@ Public Class BTLPartVM
       Set(value As Boolean)
          m_BTLPartM.bDO = value
          EgtSetInfo(m_BTLPartM.nPartId, BTL_PRT_DO, If(value, 1, 0))
-         NotifyPropertyChanged("Calc_BorderBrush")
+         NotifyPropertyChanged(NameOf(Calc_BorderBrush))
       End Set
    End Property
 
@@ -1362,8 +1362,12 @@ Public Class BTLPartVM
 
    Public ReadOnly Property Section As SectionXMaterial
       Get
+         Dim nOrigGroupId As Integer = nPartId
+         If Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso Map.refShowBeamPanelVM.ShowBuilding_IsChecked AndAlso Map.refShowBeamPanelVM.bShowAll Then
+            nOrigGroupId = GetOrigFrameGroup(nPartId)
+         End If
          Dim frBeam As New Frame3d
-         EgtGetGroupGlobFrame(nPartId, frBeam)
+         EgtGetGroupGlobFrame(nOrigGroupId, frBeam)
          Dim dL As Double
          If IsX(frBeam.VersX(), EPS_SMALL) Then
             dL = m_BTLPartM.dBtlL
@@ -1440,7 +1444,7 @@ Public Class BTLPartVM
       End Get
       Set(value As Boolean?)
          If BTLFeatureVMList.Count = 0 Then
-            NotifyPropertyChanged("bDOALL")
+            NotifyPropertyChanged(NameOf(bDOALL))
             Return
          End If
          ' imposto modalita' update multiplo
@@ -1823,8 +1827,13 @@ Public Class BTLPartVM
       Dim b3Part As New BBox3d
       EgtGetBBoxGlob(nNewPartId, GDB_BB.STANDARD, b3Part)
       ' ripristino le rotazioni di ROT e FLIP
-      EgtRotate(nNewPartId, b3Part.Center, -Vector3d.Z_AX, nROTATED)
-      EgtRotate(nNewPartId, b3Part.Center, Vector3d.X_AX, nINVERTED)
+      If Map.refProjectVM.BTLStructureVM.nPROJTYPE = BWType.BEAM Then
+         EgtRotate(nNewPartId, b3Part.Center, Vector3d.X_AX, nROTATED)
+         EgtRotate(nNewPartId, b3Part.Center, Vector3d.Z_AX, nINVERTED)
+      Else
+         EgtRotate(nNewPartId, b3Part.Center, -Vector3d.Z_AX, nROTATED)
+         EgtRotate(nNewPartId, b3Part.Center, Vector3d.X_AX, nINVERTED)
+      End If
       ' aggiungo pezzo alla lista
       m_BTLStructureM.AddBTLPart(NewPart)
       Return NewPart

EgtBEAMWALL.ViewerOptimizer/BTLViewModel/BTLStructureVM.vb

@@ -72,6 +72,26 @@ Public Class BTLStructureVM
             ElseIf Map.refMainMenuVM.SelPage = Pages.MACHINING Then
                ' resetto gruppo di lavorazione corrente
                EgtResetCurrMachGroup()
+               ' trovo ed evidenzio MachGroup e Duplo di questo pezzo
+               If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then
+                  Dim MachGroupList As New List(Of MyMachGroupVM)
+                  For Each Machgroup As MyMachGroupVM In Map.refProjectVM.MachGroupPanelVM.MachGroupVMList
+                     Dim bFound As Boolean = False
+                     For Each Part As PartVM In Machgroup.PartVMList
+                        If EgtDuploGetOriginal(Part.nPartId) = m_SelBTLPart.nPartId Then
+                           Part.SetSearchFound()
+                           bFound = True
+                        Else
+                           Part.ResetSearchFound()
+                        End If
+                     Next
+                     If bFound Then
+                        Machgroup.SetSearchFound()
+                     Else
+                        Machgroup.ResetSearchFound()
+                     End If
+                  Next
+               End If
                ' seleziono pezzo nella scena
                SceneSelPartSelection()
                Core.ViewPanelVM.BWSetView(If(Core.ViewPanelVM.Type = BWType.BEAM, VT.ISO_SW, VT.TOP), False)
@@ -89,9 +109,8 @@ Public Class BTLStructureVM
 
    ' lista parametri per ricerca testuale
    Private m_SearchParamList As New ObservableCollection(Of IdNameStruct)({New IdNameStruct(BTLPartParam.NULL, ""),
-                                                                           New IdNameStruct(BTLPartParam.PDN, "PDN"),
-                                                                           New IdNameStruct(BTLPartParam.NAM, "Descrizione"),
-                                                                           New IdNameStruct(BTLPartParam.GRP, "Gruppo")})
+                                                                           New IdNameStruct(BTLPartParam.PDN, EgtMsg(61809)),
+                                                                           New IdNameStruct(BTLPartParam.NAM, EgtMsg(61603))})
    Public ReadOnly Property SearchParamList As ObservableCollection(Of IdNameStruct)
       Get
          Return m_SearchParamList
@@ -112,27 +131,53 @@ Public Class BTLStructureVM
       End Set
    End Property
 
-   ' lista dei materiali utilizzati
-   Private m_MaterialList_View As CollectionView = Nothing
-   Private m_MaterialList As New ObservableCollection(Of String)({""})
-   Public Property MaterialList As ObservableCollection(Of String)
+   ' lista dei gruppi
+   Private m_GroupList_View As CollectionView = Nothing
+   Private m_GroupList As New ObservableCollection(Of String)({""})
+   Public Property GroupList As ObservableCollection(Of String)
       Get
-         Return m_MaterialList
+         Return m_GroupList
       End Get
       Set(value As ObservableCollection(Of String))
-         m_MaterialList = value
+         m_GroupList = value
       End Set
    End Property
 
-   Private m_SelMaterial As String = ""
-   Public Property SelMaterial As String
+   Private m_SelGroup As String = ""
+   Public Property SelGroup As String
       Get
-         Return m_SelMaterial
+         Return m_SelGroup
       End Get
       Set(value As String)
-         m_SelMaterial = value
+         m_SelGroup = value
          m_BTLPartVMList_View.Refresh()
          m_SectionList_View.Refresh()
+         m_SubGroupList_View.Refresh()
+      End Set
+   End Property
+
+   ' lista dei SubGroup
+   Private m_SubGroupList_View As CollectionView = Nothing
+   Private m_SubGroupList As New ObservableCollection(Of String)({""})
+   Public Property SubGroupList As ObservableCollection(Of String)
+      Get
+         Return m_SubGroupList
+      End Get
+      Set(value As ObservableCollection(Of String))
+         m_SubGroupList = value
+      End Set
+   End Property
+
+   Private m_SelSubGroup As String = ""
+   Public Property SelSubGroup As String
+      Get
+         Return m_SelSubGroup
+      End Get
+      Set(value As String)
+         m_SelSubGroup = value
+         m_BTLPartVMList_View.Refresh()
+         m_SectionList_View.Refresh()
+         m_GroupList_View.Refresh()
       End Set
    End Property
 
@@ -157,7 +202,8 @@ Public Class BTLStructureVM
          If Not IsNothing(value) Then
             m_SelSection = value
             m_BTLPartVMList_View.Refresh()
-            m_MaterialList_View.Refresh()
+            m_GroupList_View.Refresh()
+            m_SubGroupList_View.Refresh()
          End If
       End Set
    End Property
@@ -170,11 +216,40 @@ Public Class BTLStructureVM
       Set(value As String)
          m_SearchText = value
          m_BTLPartVMList_View.Refresh()
-         m_MaterialList_View.Refresh()
+         m_GroupList_View.Refresh()
          m_SectionList_View.Refresh()
       End Set
    End Property
 
+   Public Property bDOALL As Boolean?
+      Get
+         If BTLPartVMList.Count = 0 Then Return False
+         Dim bTemp As Boolean = BTLPartVMList(0).bDO
+         For FeatureIndex = 1 To BTLPartVMList.Count - 1
+            If BTLPartVMList(FeatureIndex).bDO <> bTemp Then Return Nothing
+         Next
+         Return bTemp
+      End Get
+      Set(value As Boolean?)
+         If BTLPartVMList.Count = 0 Then
+            NotifyPropertyChanged(NameOf(bDOALL))
+            Return
+         End If
+         For PartIndex = 0 To BTLPartVMList.Count - 1
+            Dim Part As BTLPartVM = BTLPartVMList(PartIndex)
+            If (IsNothing(m_SelSection) OrElse m_SelSection.dH = -1 OrElse Part.Section = m_SelSection) AndAlso
+               (SelGroup = "" OrElse Part.sGROUP = SelGroup) AndAlso
+               (SelSubGroup = "" OrElse Part.sSTOREY = SelSubGroup) AndAlso
+               (SelSearchParam.Id = BTLPartParam.NULL OrElse SearchText = String.Empty OrElse (
+               (SelSearchParam.Id = BTLPartParam.PDN AndAlso Part.nPDN.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0) OrElse
+               (SelSearchParam.Id = BTLPartParam.NAM AndAlso Part.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))) Then
+               Part.bDO = value
+               Part.NotifyPropertyChanged(NameOf(Part.bDO))
+            End If
+         Next
+      End Set
+   End Property
+
 #Region "Parametri generici"
 
    Public Property sPROJNUM As String
@@ -569,14 +644,17 @@ Public Class BTLStructureVM
       ' creo lista di BTLPartVM
       CreateBTLPartVMList()
       m_BTLPartVMList_View = CollectionViewSource.GetDefaultView(m_BTLPartVMList)
-      m_MaterialList_View = CollectionViewSource.GetDefaultView(m_MaterialList)
+      m_GroupList_View = CollectionViewSource.GetDefaultView(m_GroupList)
+      m_SubGroupList_View = CollectionViewSource.GetDefaultView(m_SubGroupList)
       m_SectionList_View = CollectionViewSource.GetDefaultView(m_SectionList)
       m_BTLPartVMList_View.Filter = AddressOf PartFilter
-      m_MaterialList_View.Filter = AddressOf MaterialFilter
+      m_GroupList_View.Filter = AddressOf GroupFilter
       m_SectionList_View.Filter = AddressOf SectionFilter
       m_Calc_PartEnd.Interval = TimeSpan.FromMilliseconds(500)
       AddHandler m_Calc_PartEnd.Tick, AddressOf Calc_PartEnd_Tick
       m_Calc_PartEnd.Start()
+      ' Aggiorno check DOALL
+      NotifyPropertyChanged(NameOf(bDOALL))
       If BTLStructureM.nAsseBaseId = GDB_ID.NULL Then
          Map.refShowBeamPanelVM.SetShowBuilding(False)
       End If
@@ -592,19 +670,27 @@ Public Class BTLStructureVM
 
       For Each BTLPartVM As BTLPartVM In all
          AddHandler BTLPartVM.PropertyChanged, AddressOf OnBTLPartVMPropertyChanged
-         ' verifico sezione e materiale per inserirli nei filtri
-         If Not MaterialList.Contains(BTLPartVM.sMATERIAL) Then
-            MaterialList.Add(BTLPartVM.sMATERIAL)
-         End If
-         If Not SectionList.Contains(BTLPartVM.Section) Then
-            SectionList.Add(BTLPartVM.Section)
-         End If
       Next
 
       m_BTLPartVMList = New ObservableCollection(Of BTLPartVM)(all)
       AddHandler m_BTLPartVMList.CollectionChanged, AddressOf OnBTLPartVMListChanged
    End Sub
 
+   Friend Sub LoadFilters()
+      For Each BTLPartVM As BTLPartVM In m_BTLPartVMList
+         ' verifico sezione, gruppo e sottogruppo per inserirli nei filtri
+         If Not SectionList.Contains(BTLPartVM.Section) Then
+            SectionList.Add(BTLPartVM.Section)
+         End If
+         If Not GroupList.Contains(BTLPartVM.sGROUP) Then
+            GroupList.Add(BTLPartVM.sGROUP)
+         End If
+         If Not SubGroupList.Contains(BTLPartVM.sSTOREY) Then
+            SubGroupList.Add(BTLPartVM.sSTOREY)
+         End If
+      Next
+   End Sub
+
    Private Sub Calc_PartEnd_Tick()
       ' se calcolo non in corso (mainmenu e' attivo), esco
       If Map.refMainMenuVM.MainMenu_IsEnabled Then Return
@@ -877,24 +963,41 @@ Public Class BTLStructureVM
 
    Private Function PartFilter(Part As Object) As Boolean
       Dim CurrBTLPart As BTLPartVM = DirectCast(Part, BTLPartVM)
-      Dim bMaterialOk As Boolean = True
+      Dim bGroupOk As Boolean = True
+      Dim bSubGroupOk As Boolean = True
       Dim bSectionOk As Boolean = True
       Dim bSearchTextOk As Boolean = True
-      If SelMaterial <> "" AndAlso CurrBTLPart.sMATERIAL <> SelMaterial Then bMaterialOk = False
       If SelSection <> SectionXMaterial.Empty AndAlso CurrBTLPart.Section <> SelSection Then bSectionOk = False
-      'If SearchText <> "" AndAlso CurrBTLPart.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0 Then bSectionOk = False
+      If SelGroup <> "" AndAlso CurrBTLPart.sGROUP <> SelGroup Then bGroupOk = False
+      If SelSubGroup <> "" AndAlso CurrBTLPart.sSTOREY <> SelSubGroup Then bSubGroupOk = False
       If m_SelSearchParam.Id <> BTLPartParam.NULL AndAlso m_SearchText <> String.Empty AndAlso (
          (m_SelSearchParam.Id = BTLPartParam.PDN AndAlso CurrBTLPart.nPDN.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-         (m_SelSearchParam.Id = BTLPartParam.NAM AndAlso CurrBTLPart.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-         (m_SelSearchParam.Id = BTLPartParam.GRP AndAlso (IsNothing(CurrBTLPart.sGROUP) OrElse CurrBTLPart.sGROUP.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase)) < 0)) Then bSectionOk = False
-      Return (bMaterialOk AndAlso bSectionOk)
+         (m_SelSearchParam.Id = BTLPartParam.NAM AndAlso CurrBTLPart.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then
+         bSearchTextOk = False
+      End If
+      Return bSectionOk AndAlso bGroupOk AndAlso bSubGroupOk AndAlso bSearchTextOk
    End Function
 
-   Private Function MaterialFilter(Material As Object) As Boolean
-      Dim CurrMaterial As String = DirectCast(Material, String)
+   Private Function GroupFilter(Group As Object) As Boolean
+      Dim CurrGroup As String = DirectCast(Group, String)
       Dim bOk As Boolean = True
-      If SelSection <> SectionXMaterial.Empty AndAlso SearchText <> "" AndAlso CurrMaterial <> "" Then
-         bOk = m_BTLPartVMList.Any(Function(x) x.sMATERIAL = CurrMaterial AndAlso x.Section = SelSection AndAlso Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0)
+      If CurrGroup <> "" AndAlso (SelSection <> SectionXMaterial.Empty OrElse SelSubGroup <> "" OrElse SearchText <> "") Then
+         bOk = m_BTLPartVMList.Any(Function(x) x.sGROUP = CurrGroup AndAlso
+                                               (SelSection = SectionXMaterial.Empty OrElse x.Section = SelSection) AndAlso
+                                               (SelSubGroup = "" OrElse x.sSTOREY = SelSubGroup) AndAlso
+                                               (SearchText = "" OrElse Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))
+      End If
+      Return bOk
+   End Function
+
+   Private Function SubGroupFilter(SubGroup As Object) As Boolean
+      Dim CurrSubGroup As String = DirectCast(SubGroup, String)
+      Dim bOk As Boolean = True
+      If CurrSubGroup <> "" AndAlso (SelSection <> SectionXMaterial.Empty OrElse SearchText <> "" OrElse SelGroup <> "") Then
+         bOk = m_BTLPartVMList.Any(Function(x) x.sGROUP = CurrSubGroup AndAlso
+                                               (SelSection = SectionXMaterial.Empty OrElse x.Section = SelSection) AndAlso
+                                               (SelGroup = "" OrElse x.sGROUP = SelGroup) AndAlso
+                                               (SearchText = "" OrElse Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))
       End If
       Return bOk
    End Function
@@ -902,8 +1005,11 @@ Public Class BTLStructureVM
    Private Function SectionFilter(Section As Object) As Boolean
       Dim CurrSection As SectionXMaterial = DirectCast(Section, SectionXMaterial)
       Dim bOk As Boolean = True
-      If SelMaterial <> "" AndAlso SearchText <> "" AndAlso CurrSection <> Section.Empty Then
-         bOk = m_BTLPartVMList.Any(Function(x) x.sMATERIAL = SelMaterial AndAlso x.Section = CurrSection AndAlso Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0)
+      If CurrSection <> Section.Empty AndAlso (SelGroup <> "" OrElse SelSubGroup <> "" OrElse SearchText <> "") Then
+         bOk = m_BTLPartVMList.Any(Function(x) x.Section = CurrSection AndAlso
+                                               (SelGroup = "" OrElse x.sGROUP = SelGroup) AndAlso
+                                               (SelSubGroup = "" OrElse x.sSTOREY = SelSubGroup) AndAlso
+                                               (SearchText = "" OrElse Not x.sNAM.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) >= 0))
       End If
       Return bOk
    End Function
@@ -913,16 +1019,16 @@ Public Class BTLStructureVM
       'If Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.BEAM Then
       ' verifico se era unico con vecchia sezione
       If Not m_BTLPartVMList.Any(Function(x) x.Section = OldPartSection) Then
-            ' nel caso seleziono filtro generico 
-            SelSection = m_SectionList(0)
-            ' e poi lo cerco ed elimino
-            m_SectionList.FirstOrDefault(Function(x) x = OldPartSection)
-            m_SectionList.Remove(m_SectionList.FirstOrDefault(Function(x) x = OldPartSection))
-         End If
-         ' verifico se esiste già nuova sezione
-         If Not m_SectionList.Any(Function(x) x = NewPartSection) Then
-            m_SectionList.Add(NewPartSection)
-         End If
+         ' nel caso seleziono filtro generico 
+         SelSection = m_SectionList(0)
+         ' e poi lo cerco ed elimino
+         m_SectionList.FirstOrDefault(Function(x) x = OldPartSection)
+         m_SectionList.Remove(m_SectionList.FirstOrDefault(Function(x) x = OldPartSection))
+      End If
+      ' verifico se esiste già nuova sezione
+      If Not m_SectionList.Any(Function(x) x = NewPartSection) Then
+         m_SectionList.Add(NewPartSection)
+      End If
       'ElseIf Map.refProjectVM.BTLStructureVM.nPROJTYPE = MachineType.WALL Then
       '   ' se ruoto o inverto parete, la sezione non cambia
       'End If
@@ -983,8 +1089,8 @@ Public Class BTLStructureVM
    Private Sub OnBTLPartVMPropertyChanged(sender As Object, e As PropertyChangedEventArgs)
       Select Case e.PropertyName
          Case NameOf(sender.sMATERIAL)
-            If Not MaterialList.Contains(sender.sMATERIAL) Then
-               MaterialList.Add(sender.sMATERIAL)
+            If Not GroupList.Contains(sender.sMATERIAL) Then
+               GroupList.Add(sender.sMATERIAL)
             End If
          Case NameOf(sender.sW), NameOf(sender.sH), NameOf(sender.sL)
             'If Not SectionList.Contains(sender.Section) Then
@@ -994,6 +1100,8 @@ Public Class BTLStructureVM
             '   UpdateSection(CType(sender, BTLPartVM).BTLPartM)
          Case NameOf(sender.nDONE)
             NotifyPropertyChanged(NameOf(sBTLRemainingTime))
+         Case NameOf(sender.bDOALL)
+            NotifyPropertyChanged(NameOf(bDOALL))
       End Select
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CALCPanelVM.vb

@@ -148,7 +148,7 @@ Public Class CALCPanelVM
       End Get
    End Property
 
-   Public ReadOnly Property ResetCalc_ToopTip As String
+   Public ReadOnly Property ResetCalc_ToolTip As String
       Get
          Return EgtMsg(61940)
       End Get
@@ -304,11 +304,23 @@ Public Class CALCPanelVM
                ' Inizializzo il pezzo in verifica
                Dim BTLPart As BTLPartVM = GetBTLPartVMFromBTLPartId(Bar.nBarId)
                BTLPart.CalcPartUpdate(0, 0, "")
+               ' Resetto feature in collisione
+               For Each Feature In BTLPart.m_BTLFeatureVMList
+                  If Feature.nState = CalcStates.COLLISION Then
+                     Feature.CalcFeatureUpdate(0, 0, "")
+                  End If
+               Next
             Else
                ' Inizializzo i pezzi del gruppo di lavoro in verifica
                Dim Machgroup As MyMachGroupVM = GetMachgroupVMFromMachgroupId(Bar.nBarId)
-               For Each Part In Machgroup.PartVMList
+               For Each Part As PartVM In Machgroup.PartVMList
                   Part.CalcPartUpdate(0, 0, "")
+                  ' Resetto feature in collisione
+                  For Each Feature As BTLFeatureVM In Part.FeatureVMList
+                     If Feature.nState = CalcStates.COLLISION Then
+                        Feature.CalcFeatureUpdate(0, 0, "")
+                     End If
+                  Next
                Next
                Machgroup.CalcMachGroupUpdate(0, 0, "")
             End If
@@ -728,7 +740,7 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  If CurrPart.nGlobalState = CalcStates.NOTCALCULATED Then
+                  If CurrPart.nGlobalState = CalcStates.NOTCALCULATED OrElse CurrPart.nFeaturesGlobalState > CalcStates.INFO Then
                      Dim sBTLPartFilePath As String = Map.refProjManagerVM.CurrProj.sProjDirPath & "\" & CurrPart.nPDN.ToString() & ".ori.bwe"
                      If File.Exists(sBTLPartFilePath) Then File.Delete(sBTLPartFilePath)
                   End If
@@ -759,7 +771,7 @@ Public Class CALCPanelVM
                Case Core.CalcStates.OK, CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
                Case Else
-                  If CurrMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
+                  If CurrMachGroup.nGlobalState = CalcStates.NOTCALCULATED OrElse (CurrMachGroup.nPartsGlobalState > CalcStates.INFO) Then
                      Dim sMachGroupFilePath As String = Map.refProdManagerVM.CurrProd.sProdDirPath & "\" & CurrMachGroup.Name.ToString() & ".ori.bwe"
                      If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
                   End If
@@ -767,6 +779,7 @@ Public Class CALCPanelVM
             End Select
             TempBarList.Add(Bar)
          Next
+         If TempBarList.Count = 0 Then Return
          BarList = TempBarList.ToArray()
          ' disabilito interfaccia
          Map.refProjectVM.SetCalcRunning(True)

EgtBEAMWALL.ViewerOptimizer/CALCPanel/CalcPanelV.xaml

@@ -22,7 +22,7 @@
       <Image Source="/Resources/CALCPanel/VerifyAll.png" Stretch="Uniform"/>
    </Button>
    <Button Command="{Binding ResetCalc_Command}"
-           ToolTip="{Binding ResetCalc_ToopTip}"
+           ToolTip="{Binding ResetCalc_ToolTip}"
            IsEnabled="{Binding CALCPanel_IsEnabled}"
            Style="{StaticResource ToolBar_Button}">
       <Image Source="/Resources/CALCPanel/ResetCalc.png" Stretch="Uniform"/>

EgtBEAMWALL.ViewerOptimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml

@@ -0,0 +1,77 @@
+<EgtWPFLib5:EgtCustomWindow x:Class="ChangeMaterialWndV"
+             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.ViewerOptimizer"
+             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+             WindowStyle="None" ResizeMode="NoResize"
+             SizeToContent="WidthAndHeight"
+             WindowStartupLocation="CenterOwner"
+             IsClosable="False"
+             IsMinimizable="False"
+             IsResizable="False"
+             Title="ChangeMaterialWnd">
+   
+   <Grid Margin="5,5,5,0">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+         <RowDefinition Height="Auto"/>
+      </Grid.RowDefinitions>
+
+      <Grid HorizontalAlignment="Center"
+            Grid.Row="0"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+         </Grid.RowDefinitions>
+         <TextBlock Text="{Binding ProjMaterial_Msg}"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <ComboBox ItemsSource="{Binding ProjMaterialList}"
+                   SelectedItem="{Binding SelProjMaterial}"
+                   Grid.Column="1"
+                   Width="150"
+                   Style="{StaticResource FeatureComboBox}"/>
+      </Grid>
+      <Grid HorizontalAlignment="Center"
+            Grid.Row="1"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+         </Grid.ColumnDefinitions>
+         <TextBlock Text="{Binding WjMaterial_Msg}"
+                    Style="{StaticResource OptionTextBlock}"/>
+         <ComboBox ItemsSource="{Binding WhMaterialList}"
+                   SelectedItem="{Binding SelWhMaterial}"
+                   Grid.Column="1"
+                   Width="150"
+                   Style="{StaticResource FeatureComboBox}"/>
+      </Grid>
+
+      <Grid Grid.Row="2"
+            Margin="0,0,0,5">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="1*"/>
+         </Grid.ColumnDefinitions>
+         <Button Content="{Binding Ok_Msg}"
+                 Command="{Binding Ok_Command}"
+                 IsDefault="True"
+                 Grid.Column="1"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+         <Button Content="{Binding Cancel_Msg}"
+                 IsCancel="True"
+                 Grid.Column="3"
+                 Style="{StaticResource EgtWPFLib5_InputButton}"/>
+      </Grid>
+   </Grid>
+</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.ViewerOptimizer/ChangeMaterialWnd/ChangeMaterialWndV.xaml.vb

@@ -0,0 +1,18 @@
+Public Class ChangeMaterialWndV
+
+   Private WithEvents m_ChangeMaterialWndVM As ChangeMaterialWndVM
+
+   Sub New(Owner As Window, ChangeMaterialWndVM As ChangeMaterialWndVM)
+      MyBase.New(Owner)
+      ' This call is required by the designer.
+      InitializeComponent()
+      Me.DataContext = ChangeMaterialWndVM
+      ' Assegno al riferimento locale al VM il VM preso dal DataContext
+      m_ChangeMaterialWndVM = ChangeMaterialWndVM
+   End Sub
+
+   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_ChangeMaterialWndVM.m_CloseWindow
+      Me.DialogResult = bDialogResult
+   End Sub
+
+End Class

EgtBEAMWALL.ViewerOptimizer/ChangeMaterialWnd/ChangeMaterialWndVM.vb

@@ -0,0 +1,140 @@
+Imports System.Collections.ObjectModel
+Imports EgtUILib
+Imports EgtWPFLib5
+Imports EgtBEAMWALL.Core
+
+Public Class ChangeMaterialWndVM
+   Inherits VMBase
+
+#Region "FIELDS & PROPERTIES"
+
+   Friend Event m_CloseWindow(bDialogResult As Boolean)
+
+   Private m_ProjMaterialList As New ObservableCollection(Of String)
+   Public Property ProjMaterialList As ObservableCollection(Of String)
+      Get
+         Return m_ProjMaterialList
+      End Get
+      Set(value As ObservableCollection(Of String))
+         m_ProjMaterialList = value
+      End Set
+   End Property
+
+   Private m_SelProjMaterial As String
+   Public Property SelProjMaterial As String
+      Get
+         Return m_SelProjMaterial
+      End Get
+      Set(value As String)
+         m_SelProjMaterial = value
+         NotifyPropertyChanged(NameOf(SelProjMaterial))
+      End Set
+   End Property
+
+   Private m_WhMaterialList As New ObservableCollection(Of String)
+   Public Property WhMaterialList As ObservableCollection(Of String)
+      Get
+         Return m_WhMaterialList
+      End Get
+      Set(value As ObservableCollection(Of String))
+         m_WhMaterialList = value
+      End Set
+   End Property
+
+   Private m_SelWhMaterial As String
+   Public Property SelWhMaterial As String
+      Get
+         Return m_SelWhMaterial
+      End Get
+      Set(value As String)
+         m_SelWhMaterial = value
+         NotifyPropertyChanged(NameOf(SelWhMaterial))
+      End Set
+   End Property
+
+   ' Definizione comandi
+   Private m_cmdOk As ICommand
+
+#End Region    ' FIELDS & PROPERTIES
+
+#Region "MESSAGES"
+
+   Public ReadOnly Property ProjMaterial_Msg As String
+      Get
+         Return EgtMsg(61962)
+      End Get
+   End Property
+
+   Public ReadOnly Property WjMaterial_Msg As String
+      Get
+         Return EgtMsg(61963)
+      End Get
+   End Property
+
+   Public ReadOnly Property Ok_Msg As String
+      Get
+         Return EgtMsg(61761)
+      End Get
+   End Property
+
+   Public ReadOnly Property Cancel_Msg As String
+      Get
+         Return EgtMsg(61763)
+      End Get
+   End Property
+
+#End Region    ' MESSAGES
+
+#Region "CONSTRUCTOR"
+
+   Sub New()
+      ' recupero i materiali del progetto
+      m_ProjMaterialList.Clear()
+      For Each BTLPart In Map.refProjectVM.BTLStructureVM.BTLPartVMList
+         If Not m_ProjMaterialList.Contains(BTLPart.sMATERIAL) Then
+            m_ProjMaterialList.Add(BTLPart.sMATERIAL)
+         End If
+      Next
+      ' recupero la lista dei SectionXMaterial presenti in Warehouse
+      Dim WhSectXMatList As List(Of SectionXMaterial) = WarehouseWndVM.GetSectionXMaterialsFromWarehouse()
+      ' ricavo la lista dei materiali presenti in Warehouse
+      m_WhMaterialList.Clear()
+      For Each WhSectXMat In WhSectXMatList
+         For Each sMatItem In WhSectXMat.sMaterial
+            If Not m_WhMaterialList.Contains(sMatItem) Then
+               m_WhMaterialList.Add(sMatItem)
+            End If
+         Next
+      Next
+   End Sub
+
+#End Region    ' CONSTRUCTOR
+
+#Region "COMMANDS"
+
+#Region "Ok"
+
+   Public ReadOnly Property Ok_Command As ICommand
+      Get
+         If m_cmdOk Is Nothing Then
+            m_cmdOk = New Command(AddressOf Ok)
+         End If
+         Return m_cmdOk
+      End Get
+   End Property
+
+   Public Sub Ok()
+      'verifico che tutti i campi contengano un valore valido
+      If Not IsNothing(m_SelProjMaterial) AndAlso m_SelProjMaterial <> "" AndAlso
+         Not IsNothing(m_SelWhMaterial) AndAlso m_SelWhMaterial <> "" Then
+         RaiseEvent m_CloseWindow(True)
+      Else
+         MessageBox.Show(EgtMsg(61858), EgtMsg(30007))
+      End If
+   End Sub
+
+#End Region ' Ok
+
+#End Region    ' COMMANDS
+
+End Class

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndV.xaml

@@ -1,105 +1,78 @@
 <EgtWPFLib5:EgtCustomWindow x:Class="ChangeParameterWndV"
-             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.ViewerOptimizer"
-             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-             WindowStyle="None" ResizeMode="NoResize"
-             SizeToContent="WidthAndHeight"
-             WindowStartupLocation="CenterOwner"
-             IsClosable="False"
-             IsMinimizable="False"
-             IsResizable="False"
-             Title="ChangeParameterWnd">
-   
+                            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.ViewerOptimizer"
+                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
+                            WindowStyle="None" ResizeMode="NoResize"
+                            SizeToContent="Height"
+                            Width="300"
+                            WindowStartupLocation="CenterOwner"
+                            IsClosable="False"
+                            IsMinimizable="False"
+                            IsResizable="False"
+                            Title="ChangeParameterWnd">
+
    <Grid Margin="5,5,5,0">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="1*"/>
+         <ColumnDefinition Width="2*"/>
+      </Grid.ColumnDefinitions>
       <Grid.RowDefinitions>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5"/>
          <RowDefinition Height="Auto"/>
+         <RowDefinition Height="5"/>
          <RowDefinition Height="Auto"/>
       </Grid.RowDefinitions>
 
-      <Grid HorizontalAlignment="Center"
-            Grid.Row="0"
-            Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-         </Grid.RowDefinitions>
-         <TextBlock Text="Process"
-                          Style="{StaticResource OptionTextBlock}"/>
-         <ComboBox ItemsSource="{Binding PRCList}"
-                   SelectedItem="{Binding SelPRC}"
-                   DisplayMemberPath="ghDesc"
-                   Width="150"
-                   Grid.Column="1"
-                   Style="{StaticResource FeatureComboBox}"/>
-      </Grid>
-      <Grid HorizontalAlignment="Center"
-            Grid.Row="1"
-            Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Text="Parameter"
-                    Style="{StaticResource OptionTextBlock}"/>
-         <ComboBox ItemsSource="{Binding ParamList}"
-                   SelectedItem="{Binding SelParam}"
-                   DisplayMemberPath="sNameAndDescription"
-                   Grid.Column="1"
-                   Width="100"
-                   Style="{StaticResource FeatureComboBox}"/>
-      </Grid>
-      <Grid HorizontalAlignment="Center"
-            Grid.Row="2"
-            Height="22"
-            Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Text="Actual value"
-                    Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding SelParam.sActualValue}"
-                                Grid.Column="1"
-                                Width="45"
-                                Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
-         <CheckBox IsChecked="{Binding SelParam.bActualValue}"
-                   Grid.Column="1"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
-      </Grid>
+      <TextBlock Text="Process"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <ComboBox Grid.Column="1"
+                ItemsSource="{Binding PRCList}"
+                SelectedItem="{Binding SelPRC}"
+                DisplayMemberPath="ghDesc"
+                HorizontalAlignment="Stretch"
+                Style="{StaticResource FeatureComboBox}"/>
 
-      <Grid HorizontalAlignment="Center"
-            Grid.Row="3"
-            Height="22"
-            Margin="0,0,0,5">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
-         </Grid.ColumnDefinitions>
-         <TextBlock Text="New Value"
-                    Style="{StaticResource OptionTextBlock}"/>
-         <EgtWPFLib5:EgtTextBox Text="{Binding SelParam.sNewValue}"
-                                Grid.Column="1"
-                                Width="45"
-                                Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
-         <CheckBox IsChecked="{Binding SelParam.bNewValue}"
-                   Grid.Column="1"
-                   HorizontalAlignment="Center"
-                   VerticalAlignment="Center"
-                   Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
-      </Grid>
+      <TextBlock Grid.Row="2"
+                 Text="Parameter"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <ComboBox Grid.Row="2" Grid.Column="1"
+                ItemsSource="{Binding ParamList}"
+                SelectedItem="{Binding SelParam}"
+                DisplayMemberPath="sNameAndDescription"
+                HorizontalAlignment="Stretch"
+                Style="{StaticResource FeatureComboBox}"/>
 
-      <Grid Grid.Row="4"
+      <TextBlock Grid.Row="4" 
+                 Text="Actual value"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <EgtWPFLib5:EgtTextBox Grid.Row="4" Grid.Column="1"
+                             Text="{Binding SelParam.sActualValue}"
+                             Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
+      <CheckBox Grid.Row="4" Grid.Column="1"
+                IsChecked="{Binding SelParam.bActualValue}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
+
+      <TextBlock Grid.Row="6" Text="New Value"
+                 Style="{StaticResource OptionTextBlock}"/>
+      <EgtWPFLib5:EgtTextBox Grid.Row="6" Grid.Column="1"
+                             Text="{Binding SelParam.sNewValue}"
+                             Visibility="{Binding SelParam.IsTextBox_Visibility}"/>
+      <CheckBox Grid.Row="6" Grid.Column="1"
+                IsChecked="{Binding SelParam.bNewValue}"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Visibility="{Binding SelParam.IsCheckBox_Visibility}"/>
+
+      <Grid Grid.Row="8" Grid.ColumnSpan="2"
             Margin="0,0,0,5">
          <Grid.ColumnDefinitions>
             <ColumnDefinition Width="1*"/>

EgtBEAMWALL.ViewerOptimizer/ChangeParameterWnd/ChangeParameterWndVM.vb

@@ -42,6 +42,9 @@ Public Class ChangeParameterWndVM
             'End While
             ' aggiungo bDO come parametro
             m_ParamList.Add(New Parameters(NewBTLParam, True))
+            ' seleziono parametro vuoto per dargli un valore iniziale ed evitare che visualizzi sia text che check
+            m_SelParam = New Parameters(BTLParamM.CreateNewBTLParam())
+            NotifyPropertyChanged(NameOf(SelParam))
          End If
       End Set
    End Property
@@ -78,11 +81,15 @@ Public Class ChangeParameterWndVM
       GetBeamPrivateProfileProcessList(GRPType.T, TempPRCList)
       m_PRCList.Clear()
       For Each PRC In TempPRCList
-         m_PRCList.Add(New PRC(GRPType.T, PRC, GetBeamPrivateProfileName(GRPType.T, PRC)))
+         If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x.BTLFeatureVMList.Any(Function(y) y.nPRC = PRC AndAlso CalcBeamPrivateProfileGRP(y.nSelGRP) = 1)) Then
+            m_PRCList.Add(New PRC(GRPType.T, PRC, GetBeamPrivateProfileName(GRPType.T, PRC)))
+         End If
       Next
       GetBeamPrivateProfileProcessList(GRPType.L, TempPRCList)
       For Each PRC In TempPRCList
-         m_PRCList.Add(New PRC(GRPType.L, PRC, GetBeamPrivateProfileName(GRPType.L, PRC)))
+         If Not IsNothing(Map.refProjectVM.BTLStructureVM) AndAlso Map.refProjectVM.BTLStructureVM.BTLPartVMList.Any(Function(x) x.BTLFeatureVMList.Any(Function(y) y.nPRC = PRC AndAlso CalcBeamPrivateProfileGRP(y.nSelGRP) = 0)) Then
+            m_PRCList.Add(New PRC(GRPType.L, PRC, GetBeamPrivateProfileName(GRPType.L, PRC)))
+         End If
       Next
    End Sub
 

EgtBEAMWALL.ViewerOptimizer/Constants/ConstWarehouseIni.vb

@@ -13,5 +13,6 @@
    Public Const K_QUANTITY As String = "Quantity"
    Public Const K_L As String = "L"
    Public Const K_S As String = "S"
+   Public Const K_RANGE As String = "Range"
 
 End Module

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -103,11 +103,13 @@
     <ApplicationIcon>Resources\EgtBEAMWALL.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib">
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
+    <Reference Include="EgtUILib, Version=2.4.3.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib5">
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
+    <Reference Include="EgtWPFLib5, Version=2.4.2.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
     </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
@@ -116,8 +118,7 @@
       <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
     <Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\EgtProg\EgtBEAMWALL\Ionic.Zip.dll</HintPath>
+      <HintPath>..\packages\Ionic.Zip.1.9.1.8\lib\Ionic.Zip.dll</HintPath>
     </Reference>
     <Reference Include="MigraDoc.DocumentObjectModel-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
       <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.DocumentObjectModel-wpf.dll</HintPath>
@@ -128,11 +129,11 @@
     <Reference Include="MigraDoc.RtfRendering-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
       <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\MigraDoc.RtfRendering-wpf.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.6.10.9\lib\net40\MySql.Data.dll</HintPath>
+    <Reference Include="MySql.Data">
+      <HintPath>..\ExtLibs\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.Entity.6.10.9\lib\net40\MySql.Data.Entity.EF6.dll</HintPath>
+    <Reference Include="MySql.Data.Entity.EF6">
+      <HintPath>..\ExtLibs\MySql.Data.Entity.EF6.dll</HintPath>
     </Reference>
     <Reference Include="PdfSharp-wpf, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
       <HintPath>..\packages\PDFsharp-MigraDoc-wpf.1.50.5147\lib\net30\PdfSharp-wpf.dll</HintPath>
@@ -165,6 +166,10 @@
     <Compile Include="AboutBoxWindow\AboutBoxV.xaml.vb">
       <DependentUpon>AboutBoxV.xaml</DependentUpon>
     </Compile>
+    <Compile Include="ChangeMaterialWnd\ChangeMaterialWndV.xaml.vb">
+      <DependentUpon>ChangeMaterialWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="ChangeMaterialWnd\ChangeMaterialWndVM.vb" />
     <Compile Include="MovePartInRawPartWnd\MovePartInRawPartWndV.xaml.vb">
       <DependentUpon>MovePartInRawPartWndV.xaml</DependentUpon>
     </Compile>
@@ -252,10 +257,17 @@
     <Compile Include="SupervisorCommThread\SupervisorCommThread.vb" />
     <Compile Include="ToolsDbWindow\MyToolDbWindowVM.vb" />
     <Compile Include="ToolsDbWindow\ToolsUpdate.vb" />
+    <Compile Include="UpdateBTLWnd\UpdateOrAppendWndVM.vb" />
+    <Compile Include="UpdateBTLWnd\UpdateBTLWndV.xaml.vb">
+      <DependentUpon>UpdateBTLWndV.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="UpdateBTLWnd\UpdateBTLWndVM.vb" />
+    <Compile Include="UpdateBTLWnd\UpdateOrAppendWndV.xaml.vb">
+      <DependentUpon>UpdateOrAppendWndV.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Utility\DbControllers.vb" />
     <Compile Include="Utility\DisableModifiedMgr.vb" />
     <Compile Include="Utility\LuaExec.vb" />
-    <Compile Include="Utility\ManageWindow.vb" />
     <Compile Include="Utility\SectionXMaterialToBeAdded.vb" />
     <Compile Include="Utility\TextBlockUtils.vb" />
     <Compile Include="Utility\TreeViewItemBase.vb" />
@@ -357,6 +369,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ChangeMaterialWnd\ChangeMaterialWndV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MovePartInRawPartWnd\MovePartInRawPartWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -437,6 +453,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UpdateBTLWnd\UpdateBTLWndV.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="UpdateBTLWnd\UpdateOrAppendWndV.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="WarehouseWnd\WarehouseWndV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -697,10 +721,6 @@
       <Project>{24d7760e-662a-47e4-b729-b70126c24a31}</Project>
       <Name>EgtBEAMWALL.DataLayer</Name>
     </ProjectReference>
-    <ProjectReference Include="..\LiMan.Core\LiMan.Core.csproj">
-      <Project>{b61508b2-20cb-45d9-8c00-209a22c44de5}</Project>
-      <Name>LiMan.Core</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\TreeView\Folder.png" />

EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/InstrumentPanelV.xaml

@@ -28,6 +28,15 @@
       <Image Source="/Resources/InstrumentPanel/ChangeParam.png" Stretch="Uniform"/>
    </Button>
 
+   <Button ToolTip="{Binding ChangeMaterial_ToolTip}"
+           Style="{StaticResource ToolBar_Button}"
+           Command="{Binding ChangeMaterial_Command}"
+           Visibility="{Binding ChangeMaterial_Visibility}"
+           IsEnabled="{Binding InstrumentPanel_IsEnabled}"
+           Content="MAT">
+      <!--<Image Source="/Resources/CALCPanel/ChooseMachine.png" Stretch="Uniform"/>-->
+   </Button>
+
    <ToggleButton ToolTip="{Binding Statistics_Msg}"
                  Style="{StaticResource ToolBar_ToggleButton}"
                  IsChecked="{Binding Statistics_IsChecked}">

EgtBEAMWALL.ViewerOptimizer/InstrumentPanel/MyInstrumentPanelVM.vb

@@ -13,6 +13,12 @@ Public Class MyInstrumentPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property ChangeMaterial_Visibility As Visibility
+      Get
+         Return If(Map.refMainWindowVM.MainWindowM.nUserLevel > 5 AndAlso Map.refMainMenuVM.SelPage = Pages.VIEW, Visibility.Visible, Visibility.Collapsed)
+      End Get
+   End Property
+
    Private m_InstrumentPanel_IsEnabled As Boolean = True
    Public Property InstrumentPanel_IsEnabled As Boolean
       Get
@@ -48,7 +54,7 @@ Public Class MyInstrumentPanelVM
                ' aggiorno valori totali
                If Not IsNothing(Map.refProjectVM.MachGroupPanelVM) Then Map.refProjectVM.MachGroupPanelVM.CalcGlobalUpdate()
                ' aggiorno conto materiali usati
-               Map.refStatisticsVM.LoadRawPart()
+               If Not IsNothing(Map.refProdManagerVM.CurrProd) Then Map.refStatisticsVM.LoadRawPart()
                ' seleziono pagina Statistics
                Map.refTopPanelVM.SetSelTab(TopPanelVM.Tabs.STATISTICS)
             Else
@@ -66,6 +72,7 @@ Public Class MyInstrumentPanelVM
    ' Definizione comandi
    Private m_cmdData As ICommand
    Private m_cmdChangeParameter As ICommand
+   Private m_cmdChangeMaterial As ICommand
    Private m_cmdStatistics As ICommand
 
 #Region "Messages"
@@ -76,6 +83,12 @@ Public Class MyInstrumentPanelVM
       End Get
    End Property
 
+   Public ReadOnly Property ChangeMaterial_ToolTip As String
+      Get
+         Return EgtMsg(61961)
+      End Get
+   End Property
+
    Public ReadOnly Property Statistics_Msg As String
       Get
          Return EgtMsg(61923)
@@ -167,6 +180,7 @@ Public Class MyInstrumentPanelVM
       Dim ChangeParameterWndVM As New ChangeParameterWndVM
       Dim ChangeParameterWnd As New ChangeParameterWndV(Application.Current.MainWindow, ChangeParameterWndVM)
       If ChangeParameterWnd.ShowDialog() Then
+         LoadingWndHelper.OpenLoadingWnd(ActiveIds.CHANGEPARAM, 1, EgtMsg(63014), "", 100)       ' Modifying parameters
          ' faccio passare pezzi
          If Not IsNothing(ChangeParameterWndVM.SelParam) Then
             For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList
@@ -228,11 +242,48 @@ Public Class MyInstrumentPanelVM
                'Next
             Next
          End If
+         LoadingWndHelper.CloseLoadingWnd(ActiveIds.CHANGEPARAM)
       End If
    End Sub
 
 #End Region ' ChangeParameter
 
+#Region "ChangeMaterial"
+
+   ''' <summary>
+   ''' Returns a command that do Open.
+   ''' </summary>
+   Public ReadOnly Property ChangeMaterial_Command As ICommand
+      Get
+         If m_cmdChangeMaterial Is Nothing Then
+            m_cmdChangeMaterial = New Command(AddressOf ChangeMaterial)
+         End If
+         Return m_cmdChangeMaterial
+      End Get
+   End Property
+
+   ''' <summary>
+   ''' Execute the Open.  This method is invoked by the OpenCommand.
+   ''' </summary>
+   Friend Sub ChangeMaterial()
+      If (Map.refMainMenuVM.SelPage = Pages.VIEW AndAlso (IsNothing(Map.refProjManagerVM.CurrProj) OrElse IsNothing(Map.refProjectVM.BTLStructureVM)) OrElse
+         (Map.refMainMenuVM.SelPage = Pages.MACHINING AndAlso (IsNothing(Map.refProdManagerVM.CurrProd) OrElse IsNothing(Map.refProjectVM.MachGroupPanelVM)))) Then Return
+      Dim ChangeMaterialWndVM As New ChangeMaterialWndVM
+      Dim ChangeMaterialWnd As New ChangeMaterialWndV(Application.Current.MainWindow, ChangeMaterialWndVM)
+      If ChangeMaterialWnd.ShowDialog() Then
+         LoadingWndHelper.OpenLoadingWnd(ActiveIds.CHANGEMATERIAL, 1, EgtMsg(63021), "", 100)       ' Modifying materials
+         ' faccio passare pezzi
+         If Not IsNothing(ChangeMaterialWndVM.SelProjMaterial) AndAlso Not IsNothing(ChangeMaterialWndVM.SelWhMaterial) Then
+            For Each Part In Map.refProjectVM.BTLStructureVM.BTLPartVMList.Where(Function(x) x.sMATERIAL = ChangeMaterialWndVM.SelProjMaterial)
+               Part.sMATERIAL = ChangeMaterialWndVM.SelWhMaterial
+            Next
+         End If
+         LoadingWndHelper.CloseLoadingWnd(ActiveIds.CHANGEMATERIAL)
+      End If
+   End Sub
+
+#End Region ' ChangeMaterial
+
 #End Region    ' COMMANDS
 
 End Class

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListV.xaml

@@ -95,9 +95,11 @@
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}">
+         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                                 MinWidth="28">
             <DataGridCheckBoxColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.DO_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                         HorizontalAlignment="Center"/>
             </DataGridCheckBoxColumn.Header>
          </DataGridCheckBoxColumn>
          <!--W - Larghezza-->
@@ -133,13 +135,15 @@
          <!--CNT - Richiesti da BTL-->
          <DataGridTextColumn x:Key="colCNT" Binding="{Binding sCNT}" SortMemberPath="nCNT">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortCNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.CNT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--ADDED - Aggiunti-->
          <DataGridTextColumn x:Key="colADDED" Binding="{Binding sADDED}" SortMemberPath="nADDED">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.ADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.ADDED_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
             <DataGridTextColumn.EditingElementStyle>
                <Style TargetType="{x:Type TextBox}">
@@ -150,13 +154,15 @@
          <!--INPROD - IN OTTIMIZZAZIONE-->
          <DataGridTextColumn x:Key="colINPROD" Binding="{Binding nINPROD}">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.INPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortINPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.INPROD_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--DONE - PRODOTTI-->
          <DataGridTextColumn x:Key="colDONE" Binding="{Binding nDONE}">
             <DataGridTextColumn.Header>
-               <TextBlock Text="{Binding Path=DataContext.DONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+               <TextBlock Text="{Binding Path=DataContext.ShortDONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"
+                          ToolTip="{Binding Path=DataContext.DONE_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
          <!--TBP - In produzione-->
@@ -186,6 +192,12 @@
                <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:BTLPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
          <!--UNT - Unit Time-->
          <!--<DataGridTextColumn Binding="{Binding nUNT}"
                                IsReadOnly="True">

EgtBEAMWALL.ViewerOptimizer/ItemParamList/BTLPartListVM.vb

@@ -70,26 +70,52 @@ Public Class BTLPartListVM
          Return EgtMsg(61608)
       End Get
    End Property
+   Public ReadOnly Property ShortCNT_Msg As String
+      Get
+         Return EgtMsg(61952)
+      End Get
+   End Property
 
    Public ReadOnly Property ADDED_Msg As String
       Get
          Return EgtMsg(61813)
       End Get
    End Property
+   Public ReadOnly Property ShortADDED_Msg As String
+      Get
+         Return EgtMsg(61953)
+      End Get
+   End Property
    Public ReadOnly Property INPROD_Msg As String
       Get
          Return EgtMsg(61609)
       End Get
    End Property
+   Public ReadOnly Property ShortINPROD_Msg As String
+      Get
+         Return EgtMsg(61954)
+      End Get
+   End Property
    Public ReadOnly Property DONE_Msg As String
       Get
          Return EgtMsg(61814)
       End Get
    End Property
+   Public ReadOnly Property ShortDONE_Msg As String
+      Get
+         Return EgtMsg(61955)
+      End Get
+   End Property
 
    Public ReadOnly Property GRP_Msg As String
       Get
-         Return EgtMsg(61612)
+         Return EgtMsg(61624)
+      End Get
+   End Property
+
+   Public ReadOnly Property STOREY_Msg As String
+      Get
+         Return EgtMsg(61623)
       End Get
    End Property
 

EgtBEAMWALL.ViewerOptimizer/ItemParamList/FeatureListV.xaml

@@ -20,7 +20,8 @@
                                 Style="{StaticResource DataGrid_CustomHighLight}">
       <DataGrid.Resources>
          <!--DO - Abilitazione-->
-         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}">
+         <DataGridCheckBoxColumn x:Key="colDO" Binding="{Binding bDO, UpdateSourceTrigger=PropertyChanged}"
+                                 MinWidth="28">
             <DataGridCheckBoxColumn.Header>
                <CheckBox IsChecked="{Binding Path=Tag.bDOALL, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:FeatureListV}}}"/>
             </DataGridCheckBoxColumn.Header>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListV.xaml

@@ -26,6 +26,17 @@
             <DataGridTextColumn.Header>
                <TextBlock Text="{Binding Path=DataContext.PDN_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
             </DataGridTextColumn.Header>
+            <DataGridTextColumn.CellStyle>
+               <Style TargetType="{x:Type DataGridCell}">
+                  <Setter Property="BorderBrush" Value="{Binding Search_Background}"/>
+                  <Setter Property="BorderThickness" Value="2"/>
+                  <Style.Triggers>
+                     <Trigger Property="IsSelected" Value="True">
+                        <Setter Property="Foreground" Value="Blue" />
+                     </Trigger>
+                  </Style.Triggers>
+               </Style>
+            </DataGridTextColumn.CellStyle>
          </DataGridTextColumn>
          <!--Validità pezzo-->
          <DataGridTemplateColumn x:Key="colCALC">
@@ -143,7 +154,7 @@
             </DataGridTemplateColumn.CellTemplate>
          </DataGridTemplateColumn>
          <!--PosX - Posizione-->
-         <DataGridTextColumn x:Key="colPOSX" Binding="{Binding sPOSX, UpdateSourceTrigger=PropertyChanged}" SortMemberPath="dPOSX">
+         <DataGridTextColumn x:Key="colPOSX" Binding="{Binding sPOSX}" SortMemberPath="dPOSX">
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding Path=DataContext.PosX_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
@@ -156,7 +167,7 @@
             </DataGridTextColumn.EditingElementStyle>
          </DataGridTextColumn>
          <!--PosY - Posizione-->
-         <DataGridTextColumn x:Key="colPOSY" Binding="{Binding sPOSY, UpdateSourceTrigger=PropertyChanged}" SortMemberPath="dPOSY">
+         <DataGridTextColumn x:Key="colPOSY" Binding="{Binding sPOSY}" SortMemberPath="dPOSY">
             <DataGridTextColumn.HeaderTemplate>
                <DataTemplate>
                   <TextBlock Text="{Binding Path=DataContext.PosY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
@@ -187,6 +198,18 @@
                <TextBlock Text="{Binding Path=DataContext.MAT_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
             </DataGridTextColumn.Header>
          </DataGridTextColumn>
+         <!--GRP - Gruppo-->
+         <DataGridTextColumn x:Key="colGROUP" Binding="{Binding sGROUP}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.GRP_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
+         <!--STOREY - Sottogruppo-->
+         <DataGridTextColumn x:Key="colSTOREY" Binding="{Binding sSTOREY}">
+            <DataGridTextColumn.Header>
+               <TextBlock Text="{Binding Path=DataContext.STOREY_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:PartInRawPartListV}}}"/>
+            </DataGridTextColumn.Header>
+         </DataGridTextColumn>
 
       </DataGrid.Resources>
       <DataGrid.InputBindings>

EgtBEAMWALL.ViewerOptimizer/ItemParamList/PartInRawPartListVM.vb

@@ -102,6 +102,18 @@ Public Class PartInRawPartListVM
       End Get
    End Property
 
+   Public ReadOnly Property GRP_Msg As String
+      Get
+         Return EgtMsg(61624)
+      End Get
+   End Property
+
+   Public ReadOnly Property STOREY_Msg As String
+      Get
+         Return EgtMsg(61623)
+      End Get
+   End Property
+
 #End Region    ' Messages
 
 #Region "CONSTRUCTOR"
@@ -110,7 +122,7 @@ Public Class PartInRawPartListVM
       ' aggiungo riferimento a map
       Map.SetRefPartInRawPartListVM(Me)
       ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
+      'GetPrivateProfileColumns(S_PARTINRAWPARTLIST_BEAM, PartInRawPartColumns)
    End Sub
 
 #End Region    ' CONSTRUCTOR