- Recupero dati contatto da file INI e recupero info chiave per request.json

.gitignore

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

.gitlab-ci.yml

@@ -1,121 +0,0 @@
-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
- only:
-   - main
-   - master
-   - develop
- 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
- only:
-   - main
-   - master
-   - develop
- 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

@@ -90,16 +90,6 @@ Public Class BTLFeatureM
       End Set
    End Property
 
-   Protected m_nPriority As Integer = 0
-   Public Overridable Property nPriority As Integer
-      Get
-         Return m_nPriority
-      End Get
-      Set(value As Integer)
-         m_nPriority = value
-      End Set
-   End Property
-
    ' Nome
    Protected m_sName As String
    Public ReadOnly Property sName As String
@@ -184,7 +174,7 @@ Public Class BTLFeatureM
    Protected m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
+         Return m_sCALC_MSG
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -254,11 +244,10 @@ Public Class BTLFeatureM
       Dim NewBTLFeature As New BTLFeatureM
       NewBTLFeature.m_ParentPart = ParentPart
       NewBTLFeature.m_nFeatureId = nFeatureId
-      ' leggo gruppo, numero feature, lato e priorità
+      ' leggo gruppo, numero feature e lato
       EgtGetInfo(nFeatureId, BTL_FTR_GRP, NewBTLFeature.m_nSelGRP)
       EgtGetInfo(nFeatureId, BTL_FTR_PRC, NewBTLFeature.m_nPRC)
       EgtGetInfo(nFeatureId, BTL_FTR_SIDE, NewBTLFeature.m_nSelSIDE)
-      EgtGetInfo(nFeatureId, BTL_FTR_PRIORITY, NewBTLFeature.m_nPRIORITY)
       Dim nDO As Integer = 1
       If EgtGetInfo(nFeatureId, BTL_FTR_DO, nDO) Then
          NewBTLFeature.m_bDO = (nDO <> 0)
@@ -320,7 +309,6 @@ Public Class BTLFeatureM
       NewBTLFeature.m_nPRC = nPRC
       NewBTLFeature.m_nSelGRP = nGRP
       NewBTLFeature.m_nSelSIDE = nSIDE
-      NewBTLFeature.m_nPriority = 0
       NewBTLFeature.m_bDO = True
       ' crea parametri per questa feature da file ini
       NewBTLFeature.CreateFeatureParams(NewBTLFeature)
@@ -479,7 +467,7 @@ Public Class BTLFeatureM
          If Param.nType = BTLParamType.DOUBLE_ Or Param.nType = BTLParamType.LENGTH Then
             Param.SetValue(Param.dDefault)
          ElseIf Param.nType = BTLParamType.STRING_ Then
-            Param.SetValue(Param.sDefault)
+            Param.SetValue("")
          ElseIf Param.nType = BTLParamType.COMBO Then
             Param.nSelValue = Param.dDefault
          End If
@@ -545,7 +533,6 @@ Public Class BTLFeatureM
          For Each QPar In QBTLParamMList
             If QPar.bCustom Then EgtSetInfo(nFeatureId, QPar.sName & "A", 1)
          Next
-         EgtSetInfo( nFeatureId, BTL_FTR_PRIORITY, nPriority)
          SetFeatureId(nFeatureId)
          ' imposto modificato per copie
          EgtDuploSetModified(ParentPart.nPartId)
@@ -554,7 +541,7 @@ Public Class BTLFeatureM
          ' Impossibile creare una feature con questi valori - ERRORE
          MessageBox.Show(EgtMsg(61852), EgtMsg(30007))
          nFeatureId = EgtBeamModifyProcess(Me.nFeatureId, Me.nSelGRP, Me.nPRC, Me.nSelSIDE, "", Me.nPRID,
-                                           Me.frFRAME, vPar, sPar, vParQ, nCrvId, nCrv2Id)
+                                           New Frame3d(), vPar, sPar, vParQ, nCrvId, nCrv2Id)
          SetFeatureId(nFeatureId)
          bOk = False
       End If

EgtBEAMWALL.Core/BTLModel/BTLParamM.vb

@@ -129,16 +129,6 @@ Public Class BTLParamM
       End Set
    End Property
 
-   Protected m_sDefault As String
-   Public Property sDefault As String
-      Get
-         Return m_sDefault
-      End Get
-      Set(value As String)
-         m_sDefault = value
-      End Set
-   End Property
-
    ' tipo della variabile
    Protected m_nType As BTLParamType
    Public ReadOnly Property nType As BTLParamType
@@ -146,9 +136,6 @@ Public Class BTLParamM
          Return m_nType
       End Get
    End Property
-   Public Sub SetType(value As BTLParamType)
-      m_nType = value
-   End Sub
 
    ' Feature a cui appartiene il parametro
    Protected m_ParentFeature As BTLFeatureM
@@ -258,18 +245,16 @@ Public Class BTLParamM
    End Function
 
    ' new per stringhe
-   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDefault As String, sDescription As String)
+   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDescription As String)
       Dim NewBTLParam As New BTLParamM
       NewBTLParam.StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
-      NewBTLParam.m_sDefault = sDefault
       Return NewBTLParam
    End Function
 
    ' new per stringhe (con tipo Beam o Wall)
-   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDefault As String, sDescription As String, sBWType As String)
+   Public Shared Function CreateBTLParam(ParentFeature As BTLFeatureM, IsP As Boolean, nType As BTLParamType, sParamName As String, sDescription As String, sBWType As String)
       Dim NewBTLParam As New BTLParamM
       NewBTLParam.StdInit(ParentFeature, IsP, nType, sParamName, sDescription)
-      NewBTLParam.m_sDefault = sDefault
       NewBTLParam.m_sBWType = sBWType
       Return NewBTLParam
    End Function

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 MessageFromLuaMsg(m_sCALC_MSG)
+         Return m_sCALC_MSG
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -797,15 +797,15 @@ Public Class BTLPartM
          Dim vtVersY As New Vector3d
          sValArray = sValue.Split({","}, StringSplitOptions.RemoveEmptyEntries)
          If sValArray.Count() >= 9 Then
-            StringToLenAdv(sValArray(0), ptOri.x)
-            StringToLenAdv(sValArray(1), ptOri.y)
-            StringToLenAdv(sValArray(2), ptOri.z)
-            StringToDoubleAdv(sValArray(3), vtVersX.x)
-            StringToDoubleAdv(sValArray(4), vtVersX.y)
-            StringToDoubleAdv(sValArray(5), vtVersX.z)
-            StringToDoubleAdv(sValArray(6), vtVersY.x)
-            StringToDoubleAdv(sValArray(7), vtVersY.y)
-            StringToDoubleAdv(sValArray(8), vtVersY.z)
+            StringToLen(sValArray(0), ptOri.x)
+            StringToLen(sValArray(1), ptOri.y)
+            StringToLen(sValArray(2), ptOri.z)
+            StringToDouble(sValArray(3), vtVersX.x)
+            StringToDouble(sValArray(4), vtVersX.y)
+            StringToDouble(sValArray(5), vtVersX.z)
+            StringToDouble(sValArray(6), vtVersY.x)
+            StringToDouble(sValArray(7), vtVersY.y)
+            StringToDouble(sValArray(8), vtVersY.z)
             NewBTLPart.m_refTransf.ChangeOrigin(ptOri)
             NewBTLPart.m_refTransf.Setup(ptOri, ptOri + vtVersX, ptOri + vtVersY)
          End If
@@ -813,12 +813,12 @@ Public Class BTLPartM
          ind = ind + 1
       End While
       EgtGetInfo(nPartId, BTL_PRT_CAMBER, sValue)
-      sValArray = sValue.Split(New String() {":", "P"}, StringSplitOptions.RemoveEmptyEntries)
-      If sValArray.Count() >= 10 Then
-         StringToLenAdv(sValArray(3), NewBTLPart.m_dCamberLen1)
-         StringToLenAdv(sValArray(5), NewBTLPart.m_dCamberLen2)
-         StringToLenAdv(sValArray(7), NewBTLPart.m_dCamberLen3)
-         StringToLenAdv(sValArray(9), NewBTLPart.m_dCamberCross3)
+      sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
+      If sValArray.Count() >= 5 Then
+         StringToLen(sValArray(3), NewBTLPart.m_dCamberLen1)
+         StringToLen(sValArray(5), NewBTLPart.m_dCamberLen2)
+         StringToLen(sValArray(7), NewBTLPart.m_dCamberLen3)
+         StringToLen(sValArray(9), NewBTLPart.m_dCamberCross3)
       End If
       Dim pFrom As Integer = sValue.IndexOf("SIDE: ") + "SIDE: ".Length
       Dim pTo As Integer = sValue.LastIndexOf(" P01")
@@ -828,12 +828,12 @@ Public Class BTLPartM
       End If
 
       EgtGetInfo(nPartId, BTL_PRT_PARTOFFSET, sValue)
-      sValArray = sValue.Split(New String() {":", "P"}, StringSplitOptions.RemoveEmptyEntries)
-      If sValArray.Count() >= 10 Then
-         StringToLenAdv(sValArray(3), NewBTLPart.m_dPartOffsetSide1)
-         StringToLenAdv(sValArray(5), NewBTLPart.m_dPartOffsetSide2)
-         StringToLenAdv(sValArray(7), NewBTLPart.m_dPartOffsetSide3)
-         StringToLenAdv(sValArray(9), NewBTLPart.m_dPartOffsetSide4)
+      sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
+      If sValArray.Count() >= 5 Then
+         StringToLen(sValArray(3), NewBTLPart.m_dPartOffsetSide1)
+         StringToLen(sValArray(5), NewBTLPart.m_dPartOffsetSide2)
+         StringToLen(sValArray(7), NewBTLPart.m_dPartOffsetSide3)
+         StringToLen(sValArray(9), NewBTLPart.m_dPartOffsetSide4)
       End If
       pFrom = sValue.IndexOf("P04: ") + "P04: ".Length
       pTo = sValue.LastIndexOf(" P11")
@@ -883,9 +883,9 @@ Public Class BTLPartM
       NewBTLPart.m_refGrainDir = New Vector3d
       sValArray = sValue.Split(New String() {",", ";"}, StringSplitOptions.RemoveEmptyEntries)
       If sValArray.Count() >= 4 Then
-         StringToDoubleAdv(sValArray(0), NewBTLPart.m_refGrainDir.x)
-         StringToDoubleAdv(sValArray(1), NewBTLPart.m_refGrainDir.y)
-         StringToDoubleAdv(sValArray(2), NewBTLPart.m_refGrainDir.z)
+         StringToDouble(sValArray(0), NewBTLPart.m_refGrainDir.x)
+         StringToDouble(sValArray(1), NewBTLPart.m_refGrainDir.y)
+         StringToDouble(sValArray(2), NewBTLPart.m_refGrainDir.z)
          NewBTLPart.m_bGRAINDIRALIGN = (CInt(sValArray(3)) = 1)
       End If
 
@@ -1044,15 +1044,15 @@ Public Class BTLPartM
    '      Dim vtVersY As New Vector3d
    '      sValArray = sValue.Split({","}, StringSplitOptions.RemoveEmptyEntries)
    '      If sValArray.Count() >= 9 Then
-   '         StringToLenAdv(sValArray(0), ptOri.x)
-   '         StringToLenAdv(sValArray(1), ptOri.y)
-   '         StringToLenAdv(sValArray(2), ptOri.z)
-   '         StringToDoubleAdv(sValArray(3), vtVersX.x)
-   '         StringToDoubleAdv(sValArray(4), vtVersX.y)
-   '         StringToDoubleAdv(sValArray(5), vtVersX.z)
-   '         StringToDoubleAdv(sValArray(6), vtVersY.x)
-   '         StringToDoubleAdv(sValArray(7), vtVersY.y)
-   '         StringToDoubleAdv(sValArray(8), vtVersY.z)
+   '         StringToLen(sValArray(0), ptOri.x)
+   '         StringToLen(sValArray(1), ptOri.y)
+   '         StringToLen(sValArray(2), ptOri.z)
+   '         StringToDouble(sValArray(3), vtVersX.x)
+   '         StringToDouble(sValArray(4), vtVersX.y)
+   '         StringToDouble(sValArray(5), vtVersX.z)
+   '         StringToDouble(sValArray(6), vtVersY.x)
+   '         StringToDouble(sValArray(7), vtVersY.y)
+   '         StringToDouble(sValArray(8), vtVersY.z)
    '         m_refTransf.ChangeOrigin(ptOri)
    '         m_refTransf.Setup(ptOri, ptOri + vtVersX, ptOri + vtVersY)
    '      End If
@@ -1063,10 +1063,10 @@ Public Class BTLPartM
    '   EgtGetInfo(nPartId, BTL_PRT_CAMBER, sValue)
    '   sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
    '   If sValArray.Count() >= 5 Then
-   '      StringToLenAdv(sValArray(3), m_dCamberLen1)
-   '      StringToLenAdv(sValArray(5), m_dCamberLen2)
-   '      StringToLenAdv(sValArray(7), m_dCamberLen3)
-   '      StringToLenAdv(sValArray(9), m_dCamberCross3)
+   '      StringToLen(sValArray(3), m_dCamberLen1)
+   '      StringToLen(sValArray(5), m_dCamberLen2)
+   '      StringToLen(sValArray(7), m_dCamberLen3)
+   '      StringToLen(sValArray(9), m_dCamberCross3)
    '   End If
    '   Dim pFrom As Integer = sValue.IndexOf("SIDE: ") + "SIDE: ".Length
    '   Dim pTo As Integer = sValue.LastIndexOf(" P01")
@@ -1078,10 +1078,10 @@ Public Class BTLPartM
    '   EgtGetInfo(nPartId, BTL_PRT_PARTOFFSET, sValue)
    '   sValArray = sValue.Split(New String() {": ", " P"}, StringSplitOptions.RemoveEmptyEntries)
    '   If sValArray.Count() >= 5 Then
-   '      StringToLenAdv(sValArray(3), m_dPartOffsetSide1)
-   '      StringToLenAdv(sValArray(5), m_dPartOffsetSide2)
-   '      StringToLenAdv(sValArray(7), m_dPartOffsetSide3)
-   '      StringToLenAdv(sValArray(9), m_dPartOffsetSide4)
+   '      StringToLen(sValArray(3), m_dPartOffsetSide1)
+   '      StringToLen(sValArray(5), m_dPartOffsetSide2)
+   '      StringToLen(sValArray(7), m_dPartOffsetSide3)
+   '      StringToLen(sValArray(9), m_dPartOffsetSide4)
    '   End If
    '   pFrom = sValue.IndexOf("P04: ") + "P04: ".Length
    '   pTo = sValue.LastIndexOf(" P11")
@@ -1105,9 +1105,9 @@ Public Class BTLPartM
    '   m_refGrainDir = New Vector3d
    '   sValArray = sValue.Split(New String() {",", ";"}, StringSplitOptions.RemoveEmptyEntries)
    '   If sValArray.Count() >= 4 Then
-   '      StringToDoubleAdv(sValArray(0), m_refGrainDir.x)
-   '      StringToDoubleAdv(sValArray(1), m_refGrainDir.y)
-   '      StringToDoubleAdv(sValArray(2), m_refGrainDir.z)
+   '      StringToDouble(sValArray(0), m_refGrainDir.x)
+   '      StringToDouble(sValArray(1), m_refGrainDir.y)
+   '      StringToDouble(sValArray(2), m_refGrainDir.z)
    '      m_bGRAINDIRALIGN = (CInt(sValArray(3)) = 1)
    '   End If
 
@@ -1210,7 +1210,7 @@ Public Class BTLPartM
       Return New List(Of BTLFeatureM)(m_BTLFeatureMList)
    End Function
 
-   Public Function Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional bRedraw As Boolean = True, Optional dAng As Double = 90) As Boolean
+   Public Function Rotation(IsPositive As Boolean, SelectedMachineType As MachineType, Optional dAng As Double = 90) As Boolean
       ' recupero il box del pezzo
       Dim nLs As Integer = EgtGetFirstNameInGroup(nPartId, "Box")
       Dim b3Solid As New BBox3d
@@ -1249,7 +1249,7 @@ Public Class BTLPartM
          ' ripristino inversione
          Inversion(SelectedMachineType)
       End If
-      If bRedraw Then EgtDraw()
+      EgtDraw()
       Return bOk
    End Function
 

EgtBEAMWALL.Core/CALCPanel/CalcIntegration.vb

@@ -14,8 +14,6 @@ Public Module CalcIntegration
    Public Event Calc_ProcessResult As EventHandler(Of CalcResultEventArgs)
    Public Event Calc_ProcessEnd As EventHandler(Of CalcProcessEndEventArgs)
 
-   Private m_bIsSupervisor As Boolean = False
-
    Public Enum CmdTypes As Integer
       GENERATE = 0
       MODIFY = 1
@@ -40,9 +38,8 @@ Public Module CalcIntegration
 
    Delegate Sub CallbackDlg(dProgress As Double, sProgress As String, ByRef bCancel As Boolean)
 
-   Public Sub Run(vBar As Bar(), sProjDirPath As String, callback As CallbackDlg, Optional bIsSupervisor As Boolean = False)
+   Public Sub Run(vBar As Bar(), sProjDirPath As String, callback As CallbackDlg)
       _thread = New Thread(Sub()
-                              m_bIsSupervisor = bIsSupervisor
                               DoJob(vBar, sProjDirPath, callback)
                            End Sub)
       _thread.Start()
@@ -65,7 +62,7 @@ Public Module CalcIntegration
             End If
          ElseIf Bar.nProgramPage = ProjectType.PROD Then
             If Bar.nGlobState = CalcStates.NOTCALCULATED Then
-               Bar.sBarPath = CreateNewProjectFromMachGroup(Bar.nBarId, sProjDirPath, Bar.nGlobState)
+               Bar.sBarPath = CreateNewProjectFromMachGroup(Bar.nBarId, sProjDirPath)
             Else
                Dim sMachGroupName As String = ""
                EgtGetMachGroupName(Bar.nBarId, sMachGroupName)
@@ -78,7 +75,7 @@ Public Module CalcIntegration
             If Bar.nProgramPage = ProjectType.PROJ Then
                Bar.sBarPath = CreateNewProjectFromPart(Bar.nBarId, sProjDirPath)
             ElseIf Bar.nProgramPage = ProjectType.PROD Then
-               Bar.sBarPath = CreateNewProjectFromMachGroup(Bar.nBarId, sProjDirPath, Bar.nGlobState)
+               Bar.sBarPath = CreateNewProjectFromMachGroup(Bar.nBarId, sProjDirPath)
             End If
          Next
       End If
@@ -355,38 +352,27 @@ Public Module CalcIntegration
       Return If(bOk, sPartFilePath, String.Empty)
    End Function
 
-   Private Function CreateNewProjectFromMachGroup(nMachGroupId As Integer, sProjDirPath As String, nGlobState As Integer) As String
-      ' aggiorno cutid e taskid solo fuori dal supervisore o se pezzo ricalcolato
-      If Not m_bIsSupervisor OrElse nGlobState = CalcStates.NOTCALCULATED Then
-         Dim DisableMgr As DisableModifiedMgr = Nothing
-         If m_bIsSupervisor Then
-            ' Disabilito segnalazione modificato
-            DisableMgr = New DisableModifiedMgr
+   Private Function CreateNewProjectFromMachGroup(nMachGroupId As Integer, sProjDirPath As String) As String
+
+      ' Aggiorno identificativi per segnalazione errori
+      Dim nOldMachGroup As Integer = EgtGetCurrMachGroup()
+      If nMachGroupId <> nOldMachGroup Then EgtSetCurrMachGroup(nMachGroupId)
+      Dim nRawId As Integer = EgtGetFirstRawPart()
+      While nRawId <> GDB_ID.NULL
+         If EgtVerifyRawPartPhase(nRawId, 1) Then
+            Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawId)
+            While nPartId <> GDB_ID.NULL
+               UpdateCutIdAndTaskId(nPartId)
+               nPartId = EgtGetNextPartInRawPart(nPartId)
+            End While
          End If
-         ' Aggiorno identificativi per segnalazione errori
-         Dim nOldMachGroup As Integer = EgtGetCurrMachGroup()
-         If nMachGroupId <> nOldMachGroup Then EgtSetCurrMachGroup(nMachGroupId)
-         Dim nRawId As Integer = EgtGetFirstRawPart()
-         While nRawId <> GDB_ID.NULL
-            If EgtVerifyRawPartPhase(nRawId, 1) Then
-               Dim nPartId As Integer = EgtGetFirstPartInRawPart(nRawId)
-               While nPartId <> GDB_ID.NULL
-                  UpdateCutIdAndTaskId(nPartId)
-                  nPartId = EgtGetNextPartInRawPart(nPartId)
-               End While
-            End If
-            nRawId = EgtGetNextRawPart(nRawId)
-         End While
-         If nMachGroupId <> nOldMachGroup Then
-            If nOldMachGroup <> GDB_ID.NULL Then
-               EgtSetCurrMachGroup(nOldMachGroup)
-            Else
-               EgtResetCurrMachGroup()
-            End If
-         End If
-         If m_bIsSupervisor Then
-            ' Ripristino stato segnalazione modifica
-            DisableMgr.ReEnable()
+         nRawId = EgtGetNextRawPart(nRawId)
+      End While
+      If nMachGroupId <> nOldMachGroup Then
+         If nOldMachGroup <> GDB_ID.NULL Then
+            EgtSetCurrMachGroup(nOldMachGroup)
+         Else
+            EgtResetCurrMachGroup()
          End If
       End If
 

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -126,8 +126,6 @@
 
    ' 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"
@@ -175,10 +173,8 @@
    Public Const BTL_PRT_REFSIDE = "REFERENCESIDE"
    Public Const BTL_PRT_ALIGNMENT = "ALIGNMENT"
    Public Const BTL_PRT_MATERIALTYPE = "MATERIALTYPE"
-   Public Const BTL_PRT_DESCRIPTION = "NAM"
 
    ' parametri generici
-   Public Const BTL_GEN_BTLPATH = "BTL"
    Public Const BTL_GEN_PROJNUM = "PROJECTNUMBER"
    Public Const BTL_GEN_PROJNAME = "PROJECTNAME"
    Public Const BTL_GEN_PROJPART = "PROJECTPART"
@@ -206,7 +202,6 @@
    Public Const BTL_FTR_PRC As String = "PRC"
    Public Const BTL_FTR_DO As String = "DO"
    Public Const BTL_FTR_SIDE As String = "SIDE"
-   Public Const BTL_FTR_PRIORITY As String = "PRIORITY"
    Public Const BTL_FTR_NAME As String = "NAME"
    Public Const BTL_FTR_DES As String = "DES"
    Public Const BTL_FTR_PRID As String = "PRID"
@@ -254,7 +249,6 @@
    Public Const MGR_RPT_PANELLEN As String = "PANELLEN"
    Public Const MGR_RPT_PANELWIDTH As String = "PANELWIDTH"
    Public Const MGR_RPT_PANELHEIGHT As String = "PANELHEIGHT"
-   Public Const MGR_RPT_PANELPOSZ As String = "PANELPOSZ"
    Public Const MGR_RPT_PART As String = "PART"
 
    ' parametri P per comunicazione con la macchina
@@ -290,7 +284,6 @@
    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"
@@ -302,10 +295,5 @@
    Public Const BTLFILENAME As String = "BTLFILENAME"
    Public Const EXP_PART As String = "ImportExport"
    Public Const EXP_MACHINE As String = "Machine"
-   ' parametro che indica se il progetto e' stato appena importato e quindi bisogna riverificare i MachGroup
-   Public Const IMP_VERIFYMACHGROUP As String = "VerifyMachGroup"
-
-   ' parametri modifica percorsi free contour
-   Public Const PATH_SIDEANGLAYER As String = "SideAngLayer"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstColumns.vb

@@ -6,25 +6,11 @@
    Public Const COL_STARTCUT As String = "colSTARTCUT"
    Public Const COL_W As String = "colW"
    Public Const COL_L As String = "colL"
-   Public Const COL_POSZ As String = "colPOSZ"
    Public Const COL_ROT As String = "colROT"
    Public Const COL_FLIP As String = "colFLIP"
    Public Const COL_POSX As String = "colPOSX"
    Public Const COL_POSY As String = "colPOSY"
    Public Const COL_OFFSET As String = "colOFFSET"
    Public Const COL_REDO As String = "colREDO"
-   Public Const COL_TYPE As String = "colTYPE"
-   Public Const COL_DESCRIPTION As String = "colDESCRIPTION"
-   Public Const COL_SUPERVISORID As String = "colSUPERVISORID"
-   Public Const COL_PRIORITY As String = "colPRIORITY"
-   Public Const COL_NAME As String = "colNAME"
-   Public Const COL_H As String = "colH"
-   Public Const COL_MATERIAL As String = "colMATERIAL"
-   Public Const COL_USAGE As String = "colUSAGE"
-   Public Const COL_WASTE As String = "colWASTE"
-   Public Const COL_ARCHIVED As String = "colARCHIVED"
-   Public Const COL_PROJID As String = "colPROJID"
-   Public Const COL_PRODID As String = "colPRODID"
-   Public Const COL_CREATEDATE As String = "colCRTDATE"
 
 End Module

EgtBEAMWALL.Core/Constants/ConstDataGridColumnsIni.vb

@@ -5,7 +5,6 @@
    Public Const S_FEATURELIST As String = "DG_FeatureList"
    Public Const S_OPENPROJFILEDLG_PROJ As String = "DG_OpenProjectFileDialog_PROJ"
    Public Const S_OPENPROJFILEDLG_PROD As String = "DG_OpenProjectFileDialog_PROD"
-   Public Const S_NEWOPENPROJFILEDLG_PROD As String = "DG_NewOpenProjectFileDialog_PROD"
    Public Const S_RAWPARTLIST_BEAM As String = "DG_RawPartList_BEAM"
    Public Const S_RAWPARTLIST_WALL As String = "DG_RawPartList_WALL"
    Public Const S_PARTINRAWPARTLIST_BEAM As String = "DG_PartInRawPartList_BEAM"
@@ -28,8 +27,6 @@
    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_MACHINELOG As String = "DG_MachineLog"
-   Public Const S_UPDATEBTLPARTLIST As String = "DG_UpdateBTLPartList"
 
    Public Const K_LOCKTABLE As String = "LockTable"
 

EgtBEAMWALL.Core/Constants/ConstGen.vb

@@ -21,7 +21,6 @@ Public Module ConstGen
    ' File con dati di licenza
    Public Const LIC_FILE_NAME As String = "EgtBEAMWALL.lic"
    Public Const S_LICENCE As String = "Licence"
-   Public Const K_LOCKID As String = "LockId"
    Public Const K_KEY As String = "Key"
    Public Const K_NESTKEY As String = "NestKey"
 
@@ -42,7 +41,6 @@ Public Module ConstGen
       NESTING_AUTO = 4
       SUPERVISOR = 8
       NETWORK = 16
-      ANY_DB = 32
    End Enum
 
    ' File di log generale
@@ -77,6 +75,8 @@ 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

@@ -20,7 +20,6 @@ Public Module ConstIni
    'Public Const K_LICENCE As String = "Licence"
    'Public Const K_USERLEVEL As String = "UserLevel"
    'Public Const K_MAXINST As String = "MaxInstances"
-   Public Const K_NETKEY As String = "NetKey"
    Public Const K_MAXCAMINST As String = "MaxCamInstances"
    Public Const K_VIEWOPTIM_INSTANCES As String = "ViewOptimInstances"
    Public Const K_SUPERVISOR_INSTANCES As String = "SupervisorInstances"
@@ -28,8 +27,6 @@ Public Module ConstIni
    'Public Const K_MESSAGESDIR As String = "MessagesDir"
    'Public Const K_MESSAGES As String = "Messages"
    'Public Const K_WINPLACE As String = "WinPlace"
-   Public Const K_VIEWOPTIMWINPLACE As String = "ViewOptimWinPlace"
-   Public Const K_SUPERVISORWINPLACE As String = "SupervisorWinPlace"
    'Public Const K_LASTPROJ As String = "LastProj"
    'Public Const K_AUTOLOADLASTPROJ As String = "AutoLoadLastProj"
    Public Const K_LASTIMPDIR As String = "LastImpDir"
@@ -38,15 +35,9 @@ Public Module ConstIni
    Public Const K_PROJSINDEX As String = "ProjsIndex"
    Public Const K_PRODSINDEX As String = "ProdsIndex"
    'Public Const K_SUPPORT As String = "Support"
+   Public Const K_WAREHOUSE As String = "Warehouse"
    Public Const K_DBADDRESS As String = "DbAddress"
-   Public Const K_DBMASTERKEY As String = "DbMasterKey"
-   Public Const K_SHAREDFOLDER As String = "SharedFolder"
-   Public Const K_UPDATEBTL As String = "UpdateBtl"
-   Public Const K_DATADIR As String = "DataDir"
-   Public Const K_ENABLEEDIT As String = "EnableEdit"
-   Public Const K_FASTPRODUCE As String = "FastProduce"
-   Public Const K_ADDPROJ As String = "AddProj"
-   Public Const K_PROJECTMODE As String = "ProjectMode"
+   Public Const K_LIMANUTILITIES As String = "LiManUtilities"
 
    'Public Const S_LANGUAGES As String = "Languages"
    'Public Const K_LANGUAGE As String = "Language"
@@ -97,7 +88,6 @@ Public Module ConstIni
    Public Const S_IMPORT As String = "Import"
    Public Const K_BTLFLAG As String = "BtlFlag"
    Public Const K_WALLBTLFLAG As String = "WallBtlFlag"
-   Public Const K_WALLOPPOSITESIDENESTING As String = "WallOppositeSideNesting"
 
    'Public Const S_MACH As String = "Mach"
    'Public Const K_MACHINESDIR As String = "MachinesDir"
@@ -105,8 +95,6 @@ Public Module ConstIni
    'Public Const K_CURRMACH As String = "CurrMach"
    Public Const K_SUPERVISORMACH As String = "SupervisorMach"
    Public Const K_PASSWORD As String = "Password"
-   Public Const K_CHANGEMACH As String = "ChangeMach"
-   Public Const K_EXPORTBWE As String = "ExpBwe"
 
    'Public Const S_SIMUL As String = "Simul"
    'Public Const K_SLIDERX As String = "SliderX"
@@ -121,16 +109,6 @@ Public Module ConstIni
    Public Const K_WALLBASEDIR As String = "BaseDir"
    Public Const K_WALLBWEEXEC As String = "BweExec"
 
-   Public Const S_MACHINELOGFILTER As String = "MachineLogFilters"
-   Public Const K_PARTEVENTTYPE As String = "PartEventType"
-   Public Const K_ENTITYTYPE As String = "EntityType"
-   Public Const K_DAYTYPE As String = "DayType"
-   Public Const K_STARTDATE As String = "StartDate"
-   Public Const K_ENDDATE As String = "EndDate"
-
-   Public Const S_OPENFILEDIALOG As String = "OpenFileDialog"
-   Public Const K_VIEWARCHIVED As String = "ViewArchived"
-
    'Public Const S_NEST As String = "Nest"
    Public Const K_NESTEXEC As String = "NestExec"
    Public Const K_FLIPROT As String = "FlipRot"
@@ -156,16 +134,12 @@ 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"
 
-   Public Const S_WAREHOUSE As String = "Warehouse"
-   Public Const K_TYPE As String = "Type"
-   Public Const K_DEFAULTQUANTITY As String = "DefaultQuantity"
-
-   Public Const S_BACKUPANDRESTORE As String = "Backup&Restore"
-   Public Const K_EXTERNALBACKUPACTIVE As String = "ExternalBackupActive"
-   Public Const K_EXTERNALFILEPATH As String = "ExternalFilePath"
-   Public Const K_REMINDERFREQUENCY As String = "ReminderFrequency"
-
 End Module

EgtBEAMWALL.Core/Constants/ConstMachIni.vb

@@ -1,12 +1,9 @@
 Public Module ConstMachIni
 
    Public Const MACH_INI_FILE_NAME As String = "MachData.ini"
-   Public Const GETBEAMDATA_FILE_NAME As String = "GetBeamData.lua"
    Public Const GETWALLDATA_FILE_NAME As String = "GetWallData.lua"
-   Public Const GETTS3DATA_FILE_NAME As String = "GetTs3Data.lua"
 
    Public Const K_NCTYPE As String = "NCType"
-   Public Const K_CONNECTIONSTRING As String = "ConnectionString"
 
    Public Const S_CHANNELS As String = "Channels"
 

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -47,17 +47,18 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib">
-      <HintPath>..\ExtLibs\EgtUILib.dll</HintPath>
+    <Reference Include="EgtUILib, Version=2.3.7.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib5">
-      <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
+    <Reference Include="EgtWPFLib5, Version=2.3.4.3, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\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" />
@@ -107,23 +108,12 @@
     <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="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml.vb">
-      <DependentUpon>NewOpenProjectFileDialogV.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogVM.vb" />
-    <Compile Include="ProjectFileVM\ProdItem.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">
@@ -145,7 +135,6 @@
     <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>
@@ -191,14 +180,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="LoadingWnd\LoadingWndV.xaml">
-      <SubType>Designer</SubType>
-      <Generator>XamlIntelliSenseFileGenerator</Generator>
-    </Page>
-    <Page Include="NewOpenProjectFileDialog\NewOpenProjectFileDialogV.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="OpenProjectFileDialog\OpenProjectFileDialogV.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

EgtBEAMWALL.Core/EgtDataGrid/DataGridColumnsIniFile.vb

@@ -28,7 +28,7 @@ Public Module DataGridColumnsIniFile
             Dim bIsReadOnly As Boolean = sColumnParams(4).Equals("1")
             Dim Width As Double
             Dim WidthType As DataGridLengthUnitType
-            StringToDoubleAdv(sColumnParams(5), Width)
+            StringToDouble(sColumnParams(5), Width)
             Integer.TryParse(sColumnParams(6), WidthType)
             Dim bVisible As Boolean = sColumnParams(7).Equals("1")
             Dim bCanUserEditVisible As Boolean = sColumnParams(8).Equals("1")
@@ -65,7 +65,7 @@ Public Module DataGridColumnsIniFile
                Dim bIsReadOnly As Boolean = sColumnParams(4).Equals("1")
                Dim Width As Double
                Dim WidthType As DataGridLengthUnitType
-               StringToDoubleAdv(sColumnParams(5), Width)
+               StringToDouble(sColumnParams(5), Width)
                Integer.TryParse(sColumnParams(6), WidthType)
                Dim bVisible As Boolean = sColumnParams(7).Equals("1")
                Dim bCanUserEditVisible As Boolean = sColumnParams(8).Equals("1")

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml

@@ -2,16 +2,13 @@
           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">
-         <Setter Property="HorizontalContentAlignment"
-                 Value="Stretch" />
-         <EventSetter Event="SizeChanged" 
-                      Handler="Cell_SizedChanged" />
-         <EventSetter Event="MouseRightButtonDown" 
-                      Handler="Cell_MouseRightButtonDown" />
-      </Style>
-   </DataGrid.ColumnHeaderStyle>
+    <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>
 

EgtBEAMWALL.Core/EgtDataGrid/EgtDataGrid.xaml.vb

@@ -12,17 +12,22 @@ Imports EgtWPFLib5
 
 Public Class EgtDataGrid
 
-   Public Event ResetSort()
-
    ' 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()
@@ -133,44 +138,6 @@ 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
@@ -273,6 +240,86 @@ 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
@@ -312,8 +359,12 @@ Public Class EgtDataGrid
    End Sub
 
    Private Sub miResetSort_Click(sender As Object, e As RoutedEventArgs)
-      ' resetto le SortDirection di tutte le colonne della datagrid
-      ResetSortDirections()
+      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
    End Sub
 
    Private Sub CurrDataGrid_Loaded(sender As Object, e As RoutedEventArgs) Handles CurrDataGrid.Loaded
@@ -326,47 +377,19 @@ 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
-      ' 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
+      Select Case e.Column.SortDirection
          Case ListSortDirection.Ascending
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 2 ' la setto a Descending
+            BindingColumns(e.Column.DisplayIndex).SortDirection = 2 ' la settiamo a Descending
          Case ListSortDirection.Descending
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la setto a Ascending
+            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la settiamo a Ascending
          Case Else
-            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la setto a Ascending
+            BindingColumns(e.Column.DisplayIndex).SortDirection = 1 ' la settiamo 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
-         RaiseEvent ResetSort()
-      End If
-   End Sub
-
 End Class
 
 Public Class EgtDataGridColumn
@@ -407,12 +430,6 @@ 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
@@ -427,7 +444,6 @@ Public Class EgtDataGridColumn
       End Set
    End Property
 
-   Private Property m_OrigIsReadOnly As Boolean = True
    Private Property m_IsReadOnly As Boolean = True
    Public Property IsReadOnly As Boolean
       Get
@@ -441,9 +457,6 @@ Public Class EgtDataGridColumn
          End If
       End Set
    End Property
-   Public Sub ResetToOrigIsReadOnly()
-      IsReadOnly = m_OrigIsReadOnly
-   End Sub
 
    Friend OldCanUserReorder As Boolean?
    Private m_CanUserReorder As Boolean
@@ -513,17 +526,6 @@ 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
@@ -568,7 +570,6 @@ Public Class EgtDataGridColumn
       m_CanUserReorder = bCanUserReorder
       m_CanUserResize = bCanUserResize
       m_CanUserSort = bCanUserSort
-      m_OrigIsReadOnly = bIsReadOnly
       m_IsReadOnly = bIsReadOnly
       m_Width = Width
       m_Visible = bVisible
@@ -596,7 +597,7 @@ Public Class EgtDataGridColumn
    Public Function SaveDataGridColumn() As Boolean
       Dim bOk As Boolean
       Dim sColumnParams = String.Empty
-      sColumnParams = Name & "," & If(CanUserReorder, 1, 0) & "," & If(CanUserResize, 1, 0) & "," & If(CanUserSort, 1, 0) & "," & If(m_OrigIsReadOnly, 1, 0) & "," & DoubleToString(Width.Value, 6) & "," & Width.UnitType & "," & If(Visible, 1, 0) & "," & If(CanUserEditVisible, 1, 0) & "," & CInt(SortDirection)
+      sColumnParams = Name & "," & If(CanUserReorder, 1, 0) & "," & If(CanUserResize, 1, 0) & "," & If(CanUserSort, 1, 0) & "," & If(IsReadOnly, 1, 0) & "," & DoubleToString(Width.Value, 6) & "," & Width.UnitType & "," & If(Visible, 1, 0) & "," & If(CanUserEditVisible, 1, 0) & "," & CInt(SortDirection)
       bOk = WriteColumnPrivateProfileParam(ParentDataGridName, DisplayIndex, sColumnParams)
       Return bOk
    End Function

EgtBEAMWALL.Core/Lib/NewMachGroupPanelVM.vb

@@ -94,6 +94,8 @@ Public Class NewMachGroupPanelVM
       AddHandler m_MachGroupPanelM.MachGroupAdded, AddressOf OnMachGroupAdded
       If Not MachGroupPanelM.IsMultiMachGroup Then SetMachGroupPanelVisibility(False)
       CreateMachGroupVMList()
+      ' Creo riferimento a questa classe in LibMap
+      '''LibMap.SetRefMachGroupPanelVM(Me)
    End Sub
 
 #End Region    ' CONSTRUCTOR

EgtBEAMWALL.Core/LoadingWnd/LoadingWndHelper.vb

@@ -1,101 +0,0 @@
-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
-      BACKUP = 13
-      RESTORE = 14
-   End Enum
-
-   Dim m_MainWindow As Windows.Window
-   Public Sub SetMainWindow(MainWindow As Windows.Window)
-      m_MainWindow = MainWindow
-   End Sub
-
-   Private m_bMainWindow_IsActive As Boolean = True
-   Public Sub SetMainWindowIsActive(IsActive As Boolean)
-      m_bMainWindow_IsActive = IsActive
-   End Sub
-
-   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.CenterOwner
-      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

@@ -1,56 +0,0 @@
-<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

@@ -1,36 +0,0 @@
-Imports System.Windows
-Imports System.Windows.Input
-
-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
-
-   Private Sub ToolsDbView_Closing(sender As Object, e As ComponentModel.CancelEventArgs) Handles Me.Closing
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-   End Sub
-
-End Class

EgtBEAMWALL.Core/LoadingWnd/LoadingWndVM.vb

@@ -1,233 +0,0 @@
-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

@@ -149,16 +149,6 @@ Public Class MyMachGroupM
       End Get
    End Property
 
-   Protected m_dPosZ As Double = 0
-   Public Property dPosZ As Double
-      Get
-         Return m_dPosZ
-      End Get
-      Set(value As Double)
-         m_dPosZ = value
-      End Set
-   End Property
-
 #End Region    ' Wall
 
 #Region "Calc"
@@ -186,7 +176,7 @@ Public Class MyMachGroupM
    Private m_sCALC_MSG As String
    Public Property sCALC_MSG As String
       Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
+         Return m_sCALC_MSG
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -310,18 +300,17 @@ Public Class MyMachGroupM
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARLEN, NewMachGroupM.m_dL)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARHEIGHT, NewMachGroupM.m_dH)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_BARWIDTH, NewMachGroupM.m_dW)
+         NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW * NewMachGroupM.m_dH
          NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
          For Each Part In NewMachGroupM.m_PartMList
             Part.UpdateOffset()
-            NewMachGroupM.m_dTotMat += Part.dL + Part.dOffset
-            NewMachGroupM.m_dMatForPart += Part.dL
+            NewMachGroupM.m_dMatForPart += Part.dVolume
          Next
       Else
          NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELHEIGHT, NewMachGroupM.m_dH)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELPOSZ, NewMachGroupM.m_dPosZ)
          NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW * NewMachGroupM.m_dH
          NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
          For Each Part In NewMachGroupM.m_PartMList
@@ -347,14 +336,13 @@ Public Class MyMachGroupM
          NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
          For Each Part In NewMachGroupM.m_PartMList
             Part.UpdateOffset()
-            NewMachGroupM.m_dMatForPart += Part.dL + Part.dOffset
+            NewMachGroupM.m_dMatForPart += Part.dVolume
          Next
       Else
          NewMachGroupM.m_nRawPartId = EgtGetFirstRawPart()
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELLEN, NewMachGroupM.m_dL)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELWIDTH, NewMachGroupM.m_dW)
          EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELHEIGHT, NewMachGroupM.m_dH)
-         EgtGetInfo(NewMachGroupM.m_Id, MGR_RPT_PANELPOSZ, NewMachGroupM.m_dPosZ)
          NewMachGroupM.m_dTotMat = NewMachGroupM.m_dL * NewMachGroupM.m_dW
          NewMachGroupM.m_PartMList = LoadParts(NewMachGroupM)
          For Each Part In NewMachGroupM.m_PartMList
@@ -420,7 +408,7 @@ Public Class MyMachGroupM
          EgtGetInfo(Id, MGR_RPT_PART & 1, sInfo)
          If Not String.IsNullOrWhiteSpace(sInfo) Then
             sSplitInfo = sInfo.Split(","c)
-            StringToDoubleAdv(sSplitInfo(1), m_dStartCut)
+            StringToDouble(sSplitInfo(1), m_dStartCut)
          Else
             m_dStartCut = 0
          End If

EgtBEAMWALL.Core/MachGroupModel/MyMachGroupPanelM.vb

@@ -338,8 +338,7 @@ Public Class MyMachGroupPanelM
    End Class
 
    ' funzione che cancella tutti i pezzi segnati da eliminare
-   Public Shared Function DeleteDuplo() As List(Of Integer)
-      Dim ToRedrawMachGroupList As New List(Of Integer)
+   Public Shared Sub DeleteDuplo()
       ' reset necessario per poter accedere direttamente al grezzo dalle info pezzo e al MachGroup tramite la gerarchia Db geometrico
       EgtResetCurrMachGroup()
       Dim nPartId As Integer = EgtGetFirstPart()
@@ -357,37 +356,16 @@ Public Class MyMachGroupPanelM
                   Dim nRawPartId As Integer = DuploGetRawPart(nDuploId)
                   ' recupero gruppo di lavorazione 
                   Dim nMachGroupId As Integer = EgtGetParent(EgtGetParent(EgtGetParent(nRawPartId)))
-
-                  ' elimino eventuali successive info pezzi di troppo
-                  Dim nIndex As Integer = 0
-                  Dim sTemp As String = ""
-                  While EgtGetInfo(nMachGroupId, MGR_RPT_PART & nIndex, sTemp)
-                     Dim PartData() As String = sTemp.Split(","c)
-                     If PartData(0) <> nDuploId Then
-                        EgtSetInfo(nMachGroupId, MGR_RPT_PART & nIndex, sTemp)
-                        nIndex += 1
-                     End If
-                  End While
-                  ToRedrawMachGroupList.Add(nMachGroupId)
-
-
-
-                  '' elimino vecchio grezzo ed eseguo script creazione nuovo
-                  'Dim nRawId As Integer = EgtGetFirstRawPart()
-                  'While nRawId <> GDB_ID.NULL
-                  '   EgtRemovePartFromRawPart(EgtGetFirstPartInRawPart(nRawId))
-                  '   EgtRemoveRawPart(nRawId)
-                  '   nRawId = EgtGetFirstRawPart()
-                  'End While
-                  'If Not ExecBeam(Map.refMainWindowVM.MainWindowM.sTempDir, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then Return False
-
-
-
                   ' lo setto come corrente
                   EgtSetCurrMachGroup(nMachGroupId)
                   ' elimino pezzo copia
                   EgtRemovePartFromRawPart(nDuploId)
                   EgtErase(nDuploId)
+                  '' recupero gruppo di lavorazione e trave dell'interfaccia
+                  'Dim BeamMachGroup As BeamMachGroupM = MachGroupMList.FirstOrDefault(Function(x) x.Id = nMachGroupId)
+                  'Dim Beam As BeamM = BeamMachGroup.PartMList.FirstOrDefault(Function(x) x.nPartId = nDuploId)
+                  'EgtSetCurrMachGroup(BeamMachGroup.Id)
+                  '''Beam.DeletePart()
                Next
             End If
             DuploResetToDelete(nPartId)
@@ -395,8 +373,7 @@ Public Class MyMachGroupPanelM
          nPartId = EgtGetNextPart(nPartId)
       End While
       EgtResetCurrMachGroup()
-      Return ToRedrawMachGroupList
-   End Function
+   End Sub
 
    Friend Shared Function DuploGetToDelete(nSouId As Integer, ByRef bToDelete As Boolean) As Boolean
       If IsNothing(nSouId) Then Return False
@@ -425,23 +402,12 @@ Public Class MyMachGroupPanelM
    End Function
 
    Public Shared Function DuploGetRawPart(nDuploId As Integer) As Integer
-      Dim nSwapItem As Integer = GDB_ID.NULL
-      Dim sSwapItem As String = String.Empty
-      EgtGetInfo(nDuploId, "!LST", sSwapItem)
-      Dim LSTValues() As String = sSwapItem.Split(","c)
-      If Not IsNothing(LSTValues(LSTValues.Count - 1)) AndAlso Integer.TryParse(LSTValues(LSTValues.Count - 1), nSwapItem) AndAlso nSwapItem > 0 Then
-         Return EgtGetParent(nSwapItem)
+      Dim nRawId As Integer = GDB_ID.NULL
+      If EgtGetInfo(nDuploId, GDB_SI_LIST, nRawId) AndAlso nRawId > 0 Then
+         Return nRawId
+      Else
+         Return GDB_ID.NULL
       End If
-      Return GDB_ID.NULL
-
-
-
-      'Dim nRawId As Integer = GDB_ID.NULL
-      'If EgtGetInfo(nDuploId, GDB_SI_LIST, nRawId) AndAlso nRawId > 0 Then
-      '   Return nRawId
-      'Else
-      '   Return GDB_ID.NULL
-      'End If
    End Function
 
 #End Region    ' METHODS

EgtBEAMWALL.Core/MachGroupModel/PartM.vb

@@ -139,28 +139,21 @@ Public Class PartM
    Public Property dPOSX As Double
       Get
          If nType = BWType.WALL Then
-            ' 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
+            ' 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
          Else     ' nType = BWType.BEAM
             Return m_dPOSX
          End If
@@ -210,16 +203,6 @@ 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
@@ -277,28 +260,21 @@ Public Class PartM
    Protected m_dPOSY As Double
    Public Property dPOSY As Double
       Get
-         ' 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
+         ' 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
          'Return m_dPOSY
       End Get
       Set(value As Double)
@@ -383,7 +359,7 @@ Public Class PartM
    Protected m_sCALC_MSG As String = String.Empty
    Public Property sCALC_MSG As String
       Get
-         Return MessageFromLuaMsg(m_sCALC_MSG)
+         Return m_sCALC_MSG
       End Get
       Set(value As String)
          m_sCALC_MSG = value
@@ -480,7 +456,6 @@ 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
@@ -508,7 +483,7 @@ Public Class PartM
             Index += 1
          End While
          If bFound Then
-            StringToDoubleAdv(sSplitInfo(1), NewPartM.m_dPOSX)
+            StringToDouble(sSplitInfo(1), NewPartM.m_dPOSX)
          End If
       Else
          ' leggo PosX, PosY, Rot e Flip

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupPanelVM.vb

@@ -47,18 +47,6 @@ Public MustInherit Class MyMachGroupPanelVM
       End Get
    End Property
 
-   Public ReadOnly Property dDoneTime As String
-      Get
-         Return m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) If(x.nProduction_State >= ItemState.Produced AndAlso Not IsNothing(x.dtEndTime) AndAlso x.dtEndTime <> DateTime.MinValue, (x.dtEndTime - x.dtStartTime).TotalSeconds(), 0), Func(Of MachGroupVM, Double)))
-      End Get
-   End Property
-
-   Public ReadOnly Property sDoneTime As String
-      Get
-         Return TimeSpan.FromSeconds(dDoneTime).ToString()
-      End Get
-   End Property
-
    Public ReadOnly Property dRemainingTime As String
       Get
          Return m_MachGroupVMList.Sum(CType(Function(x As MyMachGroupVM) If(x.nProduction_State < ItemState.Produced, x.nCALC_TIME, 0), Func(Of MachGroupVM, Double)))
@@ -108,21 +96,6 @@ Public MustInherit Class MyMachGroupPanelVM
       Return True
    End Function
 
-   Private Sub RedrawModifiedMachGroup(RedrawList As List(Of Integer))
-      For Each nMachGroupId In RedrawList
-         EgtSetCurrMachGroup(nMachGroupId)
-         ' elimino vecchio grezzo ed eseguo script creazione nuovo
-         Dim nRawId As Integer = EgtGetFirstRawPart()
-         While nRawId <> GDB_ID.NULL
-            EgtRemovePartFromRawPart(EgtGetFirstPartInRawPart(nRawId))
-            EgtRemoveRawPart(nRawId)
-            nRawId = EgtGetFirstRawPart()
-         End While
-         'If Not ExecBeam(Map.refMainWindowVM.MainWindowM.sTempDir, Map.refMachinePanelVM.SelectedMachine.Name, CalcIntegration.CmdTypes.RAWPART, False) Then Return False
-
-      Next
-   End Sub
-
    'Public Overrides Sub AddMachGroup()
    '   Dim MyMachGroupM As MyMachGroupM = m_MyMachGroupPanelM.NewMyMachGroup(CurrentMachine.sMachineName, Map.refProjectVM.BTLStructureVM.nPROJTYPE)
    '   ' e lo seleziono

EgtBEAMWALL.Core/MachGroupPanel/MyMachGroupVM.vb

@@ -85,13 +85,13 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property dUsage As Double
       Get
-         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, If(nType = BWType.WALL, MyMachGroupM.dMatForPart / MyMachGroupM.dTotMat * 100, MyMachGroupM.dMatForPart / MyMachGroupM.dL * 100), 0)
+         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, MyMachGroupM.dMatForPart / MyMachGroupM.dTotMat * 100, 0)
       End Get
    End Property
 
    Public ReadOnly Property dWaste As Double
       Get
-         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, If(nType = BWType.WALL, (MyMachGroupM.dTotMat - MyMachGroupM.dMatForPart) / 1000000000, MyMachGroupM.dL - MyMachGroupM.dTotMat), 0)
+         Return If(MyMachGroupM.dMatForPart > 0 AndAlso MyMachGroupM.dTotMat > 0, (MyMachGroupM.dTotMat - MyMachGroupM.dMatForPart) / MyMachGroupM.dTotMat * 100, 0)
       End Get
    End Property
 
@@ -103,7 +103,7 @@ Public MustInherit Class MyMachGroupVM
 
    Public ReadOnly Property sWaste As String
       Get
-         Return LenToString(dWaste, 3)
+         Return DoubleToString(dWaste, 3)
       End Get
    End Property
 
@@ -169,7 +169,7 @@ Public MustInherit Class MyMachGroupVM
          Return LenToString(MyMachGroupM.dStartCut, 3)
       End Get
       Set(value As String)
-         StringToLenAdv(value, MyMachGroupM.dStartCut, True)
+         StringToLen(value, MyMachGroupM.dStartCut)
       End Set
    End Property
    Public Property dStartCut As Double
@@ -481,25 +481,13 @@ Public MustInherit Class MyMachGroupVM
    End Function
 
    Public Sub UpdateUsage()
-      If nType = BWType.BEAM Then
-         MyMachGroupM.SetMatForPart(0)
-         Dim dPartLength As Double
-         Dim dPartOffsetLength As Double
-         For Each Part In PartVMList
-            dPartOffsetLength += Part.dL + Part.dOffset
-            dPartLength += Part.dL
-         Next
-         MyMachGroupM.SetTotMat(dPartOffsetLength)
-         MyMachGroupM.SetMatForPart(dPartLength)
-      Else
-         MyMachGroupM.SetTotMat(dL * dH * dW)
-         MyMachGroupM.SetMatForPart(0)
-         Dim dPartVolume As Double
-         For Each Part In PartVMList
-            dPartVolume += Part.dVolume
-         Next
-         MyMachGroupM.SetMatForPart(dPartVolume)
-      End If
+      MyMachGroupM.SetTotMat(dL * dH * dW)
+      MyMachGroupM.SetMatForPart(0)
+      Dim dPartVolume As Double
+      For Each Part In PartVMList
+         dPartVolume += Part.dVolume
+      Next
+      MyMachGroupM.SetMatForPart(dPartVolume)
       NotifyPropertyChanged(NameOf(sUsage))
       NotifyPropertyChanged(NameOf(sWaste))
    End Sub
@@ -632,17 +620,13 @@ Public MustInherit Class MyMachGroupVM
    Public ReadOnly Property DeleteMachGroup_Command As ICommand
       Get
          If m_cmdDeleteMachGroup Is Nothing Then
-            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroupCmd)
+            m_cmdDeleteMachGroup = New Command(AddressOf DeleteMachGroup)
          End If
          Return m_cmdDeleteMachGroup
       End Get
    End Property
 
-   Public Sub DeleteMachGroupCmd()
-      DeleteMachGroup()
-   End Sub
-
-   Public Overridable Sub DeleteMachGroup(Optional bMultipleCommand As Boolean = False)
+   Public Overridable Sub DeleteMachGroup()
       ' elimino tutte le copie
       Dim nRawPartId As Integer = EgtGetFirstRawPart()
       Dim nBeamId As Integer = EgtGetFirstPartInRawPart(nRawPartId)

EgtBEAMWALL.Core/MachGroupPanel/PartVM.vb

@@ -107,7 +107,7 @@ Public MustInherit Class PartVM
          Return LenToString(m_PartM.dPOSX, 3)
       End Get
       Set(value As String)
-         StringToLenAdv(value, m_PartM.dPOSX, True)
+         StringToLen(value, m_PartM.dPOSX)
       End Set
    End Property
    Public Property dPOSX As Double
@@ -162,18 +162,6 @@ 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
@@ -217,7 +205,7 @@ Public MustInherit Class PartVM
          Return LenToString(m_PartM.dOffset, 3)
       End Get
       Set(value As String)
-         StringToLenAdv(value, m_PartM.dOffset, True)
+         StringToLen(value, m_PartM.dOffset)
       End Set
    End Property
    Public ReadOnly Property dOffset As Double
@@ -235,7 +223,7 @@ Public MustInherit Class PartVM
          Return LenToString(m_PartM.dPOSY, 3)
       End Get
       Set(value As String)
-         StringToLenAdv(value, m_PartM.dPOSY, True)
+         StringToLen(value, m_PartM.dPOSY)
       End Set
    End Property
 
@@ -250,7 +238,7 @@ Public MustInherit Class PartVM
          Return LenToString(m_PartM.dROT, 3) & "°"
       End Get
       Set(value As String)
-         StringToLenAdv(value, m_PartM.dROT, True)
+         StringToLen(value, m_PartM.dROT)
       End Set
    End Property
 
@@ -562,9 +550,8 @@ Public MustInherit Class PartVM
 
    Public Sub CalcFallUpdate(FALL As Integer)
       EgtSetInfo(nPartId, ITG_PROD_FALL, FALL, True)
-      m_PartM.nCALC_FALL = FALL
+      m_PartM.nCALC_FALL = 0
       NotifyPropertyChanged(NameOf(nCALC_FALL))
-      NotifyPropertyChanged(NameOf(CALC_FALL_Visibility))
    End Sub
 
    ' funzione che aggiorna lo stato e gli errori dopo calcolo

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

@@ -16,7 +16,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Egalware s.r.l.")>
 <Assembly: AssemblyProduct("EgtBEAMWALL.Core")>
-<Assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")>
+<Assembly: AssemblyCopyright("Copyright ©  2020-2022 by Egalware s.r.l.")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices
 ' by using the '*' as shown below:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.5.8.1")>
-<Assembly: AssemblyFileVersion("2.5.8.1")>
+<Assembly: AssemblyVersion("2.4.2.1")>
+<Assembly: AssemblyFileVersion("2.4.2.1")>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml

@@ -1,268 +0,0 @@
-<EgtWPFLib5:EgtCustomWindow x:Class="NewOpenProjectFileDialogV"
-                            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.Core"
-                            Title="{Binding Title}"
-                            Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
-                            IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            IsClosable="False"
-                            MinHeight="500" MinWidth="500"
-                            DataContext="{Binding RelativeSource={RelativeSource Self}}">
-
-   <EgtWPFLib5:EgtCustomWindow.Resources>
-      <EgtWPFLib5:FileNameConverter x:Key="FileNameConverter"/>
-   </EgtWPFLib5:EgtCustomWindow.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto"/>
-         <RowDefinition Height="5*"/>
-         <RowDefinition Height="1*"/>
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="{Binding Filters_Msg}"
-                Margin="5"
-                Visibility="{Binding Filters_Visibility}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
-                         SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            Width="105"
-                            Margin="0,0,2.5,0"
-                            Style="{StaticResource PartParam_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
-                     <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                  </StackPanel>
-               </StackPanel>
-               <CheckBox Grid.Column="2"
-                         IsChecked="{Binding bViewArchived}"
-                         Content="{Binding ViewArchived_Msg}"
-                         VerticalAlignment="Center"/>
-            </Grid>
-            <Grid Grid.Row="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding FilterTypeList}"
-                         SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="Page index"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Content="&lt;"
-                          Command="{Binding PrevPage_Command}" />
-                  <TextBlock Text="{Binding nPageIndex}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <Button Content="&gt;"
-                          Command="{Binding NextPage_Command}" />
-               </StackPanel>
-               <StackPanel Grid.Column="3" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="{Binding Rows_Msg}"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
-
-      <EgtBEAMWALL:EgtDataGrid x:Name="MainDataGrid"
-                               Grid.Row="1"
-                               ItemsSource="{Binding PageList}" 
-                               SelectedItem="{Binding SelProject}"
-                               CanUserAddRows="False"
-                               AutoGenerateColumns="False"
-                               CanUserResizeRows="False"
-                               SelectionMode="Single"
-                               ScrollViewer.CanContentScroll="True" 
-                               ScrollViewer.VerticalScrollBarVisibility="Auto"
-                               ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                               Margin="5"
-                               RowDetailsVisibilityMode="Visible"
-                               CellEditEnding="MainDataGrid_CellEditEnding"
-                               BindingColumns="{Binding ProdColumns}"
-                               Sorting="MainDataGrid_Sorting">
-         <DataGrid.Resources>
-            <!-- ProdId -->
-            <DataGridTextColumn x:Key="colPRODID"
-                                Binding="{Binding sProdId}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.Id_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
-            <!--Name-->
-            <DataGridTextColumn x:Key="colNAME" 
-                                Binding="{Binding sName}">
-               <DataGridTextColumn.Header>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="1*"/>
-                        <ColumnDefinition Width="Auto"/>
-                     </Grid.ColumnDefinitions>
-                     <TextBlock Text="{Binding Path=DataContext.Name_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                     <ToggleButton Grid.Column="1"
-                                   Margin="5,0,0,0"
-                                   IsChecked="{Binding Path=DataContext.bIsEditNameActive,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                   Style="{StaticResource ToolBar_SmallToggleButton}">
-                        <Image Source="\Resources\CalcPanel\Edit.png"
-                               Style="{StaticResource LockImage}"/>
-                     </ToggleButton>
-                  </Grid>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Creation date -->
-            <DataGridTextColumn x:Key="colCRTDATE" 
-                                Binding="{Binding dtCreateDate}">
-               <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.CreateDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Machine -->
-            <DataGridTextColumn x:Key="colMACHINE" 
-                                Binding="{Binding sMachine}" 
-                                CanUserSort="False">
-               <DataGridTextColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Machine_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-               </DataGridTextColumn.Header>
-            </DataGridTextColumn>
-            <!-- Archived -->
-            <DataGridTemplateColumn x:Key="colARCHIVED"
-                                    CanUserSort="False">
-               <DataGridTemplateColumn.CellTemplate>
-                  <DataTemplate>
-                     <Image Source="\Resources\OpenProjectFileDialog\Archived.png"
-                            Visibility="{Binding Archived_Visibility}"
-                            Height="15"
-                            Width="15"
-                            Stretch="UniformToFill"/>
-                  </DataTemplate>
-               </DataGridTemplateColumn.CellTemplate>
-               <DataGridTemplateColumn.Header>
-                  <TextBlock Text="{Binding Path=DataContext.Archived_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-               </DataGridTemplateColumn.Header>
-            </DataGridTemplateColumn>
-         </DataGrid.Resources>
-         <DataGrid.RowStyle>
-            <Style TargetType="DataGridRow">
-               <Setter Property="FontWeight" Value="DemiBold"/>
-               <Setter Property="VerticalContentAlignment" Value="Center"/>
-               <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
-            </Style>
-         </DataGrid.RowStyle>
-         <DataGrid.RowDetailsTemplate>
-            <DataTemplate>
-               <ItemsControl ItemsSource="{Binding ProjFileList}"
-                             BorderThickness="0"
-                             Margin="0,-1,0,0"
-                             Padding="0">
-                  <ItemsControl.ItemTemplate>
-                     <DataTemplate>
-                        <Grid TextBlock.FontSize="12"
-                              TextBlock.FontWeight="Normal">
-                           <Grid.ColumnDefinitions>
-                              <ColumnDefinition Width="{Binding Path=DataContext.ProdColumns[0].ActualWidth, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"/>
-                              <ColumnDefinition Width="1*"/>
-                           </Grid.ColumnDefinitions>
-                           <Grid.RowDefinitions>
-                              <RowDefinition Height="1"/>
-                              <RowDefinition Height="1*"/>
-                           </Grid.RowDefinitions>
-                           <Grid Grid.Row="0"
-                                 Grid.ColumnSpan="2"
-                                 Background="Gray"
-                                 Margin="40,0,40,0"/>
-                           <Grid Grid.Column="1"
-                                 Grid.Row="1"
-                                 Margin="2">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                                 <ColumnDefinition Width="Auto"/>
-                                 <ColumnDefinition Width="1*"/>
-                              </Grid.ColumnDefinitions>
-                              <Grid.RowDefinitions>
-                                 <RowDefinition Height="1*"/>
-                                 <RowDefinition Height="1*"/>
-                              </Grid.RowDefinitions>
-                              <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="1"
-                                         Text="{Binding sBTLFileName}"/>
-                              <TextBlock Grid.Row="1"
-                                         Text="{Binding Path=DataContext.ListName_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="1"
-                                         Grid.Row="1"
-                                         Text="{Binding sListName}"/>
-                              <TextBlock Grid.Column="2"
-                                         Text="{Binding Path=DataContext.ExportDate_Msg, RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:NewOpenProjectFileDialogV}}}"
-                                         Style="{StaticResource OpenWnd_TextBlock}"/>
-                              <TextBlock Grid.Column="3"
-                                         Text="{Binding dtExportDate}"/>
-                           </Grid>
-                        </Grid>
-                     </DataTemplate>
-                  </ItemsControl.ItemTemplate>
-               </ItemsControl>
-            </DataTemplate>
-         </DataGrid.RowDetailsTemplate>
-      </EgtBEAMWALL:EgtDataGrid>
-
-      <UniformGrid Columns="4" Grid.Row="2" Margin="0,0,0,5">
-         <Button IsDefault="True" Name="OpenBtn"
-                 Content="{Binding Open_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Archive_Msg}"
-                 Command="{Binding Archive_Command}"
-                 IsEnabled="{Binding bArchived_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button Content="{Binding Delete_Msg}"
-                 Command="{Binding Delete_Command}"
-                 IsEnabled="{Binding bDelete_IsEnabled}"
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-         <Button Command="{Binding Cancel_Command}"
-                 Content="{Binding Cancel_Msg}" 
-                 Style="{DynamicResource EgtWPFLib5_InputButton}"/>
-      </UniformGrid>
-
-   </Grid>
-
-</EgtWPFLib5:EgtCustomWindow>

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogV.xaml.vb

@@ -1,264 +0,0 @@
-Imports System.ComponentModel
-Imports System.IO
-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Input
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtUILib
-Imports EgtWPFLib5
-Imports EgtBEAMWALL
-Imports System.Windows.Media
-
-Public Class NewOpenProjectFileDialogV
-
-   Private WithEvents m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
-
-#Region "CONSTRUCTOR"
-
-   Sub New(Owner As Window, OpenProjFileDialogVM As NewOpenProjectFileDialogVM)
-      ' Funzione che interpreta l'xaml
-      InitializeComponent()
-      Me.Owner = Owner
-      Me.DataContext = OpenProjFileDialogVM
-      ' Assegno al riferimento locale al VM il VM preso dal DataContext
-      m_OpenProjFileDialogVM = OpenProjFileDialogVM
-      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
-      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
-   End Sub
-
-#End Region    ' CONSTRUCTOR
-
-#Region "METHODS"
-
-   Public Function EgtShowDialog(ProjectType As ProjectType) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-   Public Function EgtShowDialog(ProjectType As ProjectType, ProjectList As List(Of ProjectFileVM)) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType, ProjectList)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-
-   Public Function EgtShowDialog(ProjectType As ProjectType, GoToProd As Boolean) As Boolean?
-      m_OpenProjFileDialogVM.Init(ProjectType, Nothing, GoToProd)
-      ' mostro la finestra di dialogo
-      Return Me.ShowDialog()
-   End Function
-
-   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
-      ' Carico e imposto posizione finestra
-      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
-   End Sub
-
-   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-      ' Salvo posizione finestra (se non minimizzata)
-      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub ProjectList_MouseDoubleClick(sender As Object, e As MouseButtonEventArgs)
-      m_OpenProjFileDialogVM.ProjDoubleClick()
-   End Sub
-
-#End Region    ' EVENTS
-
-   Private Sub OpenBtn_Click(sender As Object, e As RoutedEventArgs) Handles OpenBtn.Click
-      DialogResult = m_OpenProjFileDialogVM.VerifySelected()
-   End Sub
-
-   Private Sub CloseWindow(bDialogResult As Boolean) Handles m_OpenProjFileDialogVM.m_CloseWindow
-      Me.DialogResult = bDialogResult
-   End Sub
-
-   Private Sub MainDataGrid_CellEditEnding(sender As Object, e As DataGridCellEditEndingEventArgs)
-      'm_OpenProjFileDialogVM.SetIsEditNameActive(False)
-   End Sub
-
-   Private Sub MainDataGrid_Sorting(sender As Object, e As DataGridSortingEventArgs)
-      ' aggiorno direziona colonna
-      Dim column As DataGridColumn = e.Column
-      column.SortDirection = If((column.SortDirection <> ListSortDirection.Ascending), ListSortDirection.Ascending, ListSortDirection.Descending)
-      '' ricalcolo colonne sort
-      'Dim datagrid As DataGrid = sender
-      'ProdItemComparer.RefreshColumns()
-      '' lancio sort custom
-      'm_OpenProjFileDialogVM.RefreshProdItemSort()
-      m_OpenProjFileDialogVM.SortPageList()
-      m_OpenProjFileDialogVM.UpdatePageList()
-      e.Handled = True
-
-
-   End Sub
-
-End Class
-
-Friend Class ProdItemComparer
-   Implements IComparer
-
-   Private Shared DataGrid As DataGrid
-   Friend Shared Sub SetDataGrid(value As DataGrid)
-      DataGrid = value
-   End Sub
-
-   Private Shared m_OpenProjFileDialogVM As NewOpenProjectFileDialogVM
-   Friend Shared Sub SetOpenProjFileDialogVM(value As NewOpenProjectFileDialogVM)
-      m_OpenProjFileDialogVM = value
-   End Sub
-
-   Private Shared m_ColumnList As New List(Of DataGridColumn)
-   Private Shared m_EgtColumnList As New List(Of EgtDataGridColumn)
-
-   Friend Shared Sub RefreshColumns()
-      m_ColumnList.Clear()
-      m_EgtColumnList.Clear()
-      For Each col In DataGrid.Columns
-         If Not IsNothing(col.SortDirection) Then
-            m_ColumnList.Add(col)
-            m_EgtColumnList.Add(m_OpenProjFileDialogVM.ProdColumns(col.DisplayIndex))
-         End If
-      Next
-      '   Map.refRawPartListVM.SetRawPartListSorted(m_ColumnList.Count > 0)
-   End Sub
-
-
-   Public Function Compare(x As Object, y As Object) As Integer Implements IComparer.Compare
-      '   Dim First As MyMachGroupVM = DirectCast(x, MyMachGroupVM)
-      '   Dim Second As MyMachGroupVM = DirectCast(y, MyMachGroupVM)
-      '   Dim bFirstProduced As Boolean = First.nProduction_State = Core.ItemState.WIP OrElse First.nProduction_State = Core.ItemState.Produced
-      '   Dim bSecondProduced As Boolean = Second.nProduction_State = Core.ItemState.WIP OrElse Second.nProduction_State = Core.ItemState.Produced
-      '   Dim bFirstInQueue As Boolean = First.bToBeProduced
-      '   Dim bSecondInQueue As Boolean = Second.bToBeProduced
-      '   ' verifico se gia' prodotti
-      '   If bFirstProduced AndAlso bSecondProduced Then
-      '      If First.nProductionIndex > Second.nProductionIndex Then
-      '         Return 1
-      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
-      '         Return -1
-      '      Else
-      '         Return 0
-      '      End If
-      '   ElseIf bFirstProduced Then
-      '      Return -1
-      '   ElseIf bSecondProduced Then
-      '      Return 1
-      '   ElseIf bFirstInQueue AndAlso bSecondInQueue Then
-      '      If First.nProductionIndex > Second.nProductionIndex Then
-      '         Return 1
-      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
-      '         Return -1
-      '      Else
-      '         Return 0
-      '      End If
-      '   ElseIf bFirstInQueue Then
-      '      Return -1
-      '   ElseIf bSecondInQueue Then
-      '      Return 1
-      '   Else
-      '      ' verifico ordine per colonne
-      '      Dim ColumnIndex = 0
-      '      While ColumnIndex <= m_EgtColumnList.Count - 1
-      '         Dim nDir As ListSortDirection = If(m_ColumnList(ColumnIndex).SortDirection, 1, -1)
-      '         Dim nCheck As Integer = Check(First, Second, nDir, m_EgtColumnList(ColumnIndex))
-      '         If nCheck <> 0 Then
-      '            Return nCheck
-      '         End If
-      '         ColumnIndex += 1
-      '      End While
-      '      ' se non trovo colonne, metto in ordine indice di produzione
-      '      If First.nProductionIndex > Second.nProductionIndex Then
-      '         Return 1
-      '      ElseIf First.nProductionIndex < Second.nProductionIndex Then
-      '         Return -1
-      '      Else
-      '         Return 0
-      '      End If
-      '   End If
-   End Function
-
-   Private Function Check(First As MyMachGroupVM, Second As MyMachGroupVM, nDirection As Integer, Column As EgtDataGridColumn) As Integer
-      Select Case Column.Name
-         Case COL_NAME
-            If First.nName > Second.nName Then
-               Return 1 * nDirection
-            ElseIf First.nName < Second.nName Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_STARTCUT
-            If First.Id > Second.Id Then
-               Return 1 * nDirection
-            ElseIf First.Id < Second.Id Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_W
-            If First.dW > Second.dW Then
-               Return 1 * nDirection
-            ElseIf First.dW < Second.dW Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_H
-            If First.dH > Second.dH Then
-               Return 1 * nDirection
-            ElseIf First.dH < Second.dH Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_L
-            If First.dL > Second.dL Then
-               Return 1 * nDirection
-            ElseIf First.dL < Second.dL Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_POSZ
-               'If First.posz > Second.dL Then
-               '   Return 1 * nDirection
-               'ElseIf First.dL < Second.dL Then
-               '   Return -1 * nDirection
-               'Else
-               '   Return 0
-               'End If
-         Case COL_MATERIAL
-            If First.sMATERIAL > Second.sMATERIAL Then
-               Return 1 * nDirection
-            ElseIf First.sMATERIAL < Second.sMATERIAL Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_USAGE
-            If First.dUsage > Second.dUsage Then
-               Return 1 * nDirection
-            ElseIf First.dUsage < Second.dUsage Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-         Case COL_WASTE
-            If First.dWaste > Second.dWaste Then
-               Return 1 * nDirection
-            ElseIf First.dWaste < Second.dWaste Then
-               Return -1 * nDirection
-            Else
-               Return 0
-            End If
-      End Select
-   End Function
-
-End Class

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -1,982 +0,0 @@
-Imports System.Collections.ObjectModel
-Imports System.IO
-Imports System.Windows
-Imports System.Windows.Controls
-Imports System.Windows.Data
-Imports System.Windows.Input
-Imports EgtBEAMWALL.Core
-Imports EgtBEAMWALL.Core.ConstBeam
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public MustInherit Class NewOpenProjectFileDialogVM
-   Inherits VMBase
-
-#Region "FIELDS & PROPERTIES"
-
-   Public Enum BTLDateTypes As Integer
-      CREATEDATE = 0
-      EXPORTDATE = 1
-   End Enum
-
-   Protected Enum FilterTypes As Integer
-      NULL = 0
-      ID = 1
-      BTLFILENAME = 2
-      LISTNAME = 3
-      MACHINE = 4
-   End Enum
-
-   Public Enum DayTypes As Integer
-      LASTMONTH = 0
-      LAST3MONTHS = 1
-      LAST6MONTHS = 2
-      PERIOD = 3
-      ALWAYS = 4
-   End Enum
-
-   Public Enum RowQuantities As Integer
-      TEN = 0
-      TWENTY = 1
-      THIRTY = 2
-   End Enum
-
-   Friend Event m_CloseWindow(bDialogResult As Boolean)
-
-   Protected m_ProdColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProdColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_ProdColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_ProdColumns = value
-      End Set
-   End Property
-
-   Private m_colProdFile_Name As EgtDataGridColumn
-   Public ReadOnly Property colProdFile_Name As EgtDataGridColumn
-      Get
-         Return m_colProdFile_Name
-      End Get
-   End Property
-
-   Private m_colArchived_Name As EgtDataGridColumn
-   Public ReadOnly Property colArchived_Name As EgtDataGridColumn
-      Get
-         Return m_colArchived_Name
-      End Get
-   End Property
-
-   Private m_colProjId_Name As EgtDataGridColumn
-   Public ReadOnly Property colProjId_Name As EgtDataGridColumn
-      Get
-         Return m_colProjId_Name
-      End Get
-   End Property
-
-   Private m_colProdId_Name As EgtDataGridColumn
-   Public ReadOnly Property colProdId_Name As EgtDataGridColumn
-      Get
-         Return m_colProdId_Name
-      End Get
-   End Property
-
-   Private m_colCreateDate_Name As EgtDataGridColumn
-   Public ReadOnly Property colCreateDate_Name As EgtDataGridColumn
-      Get
-         Return m_colCreateDate_Name
-      End Get
-   End Property
-
-   Protected m_ProjColumns As New ObservableCollection(Of EgtDataGridColumn)
-   Public Property ProjColumns As ObservableCollection(Of EgtDataGridColumn)
-      Get
-         Return m_ProjColumns
-      End Get
-      Set(value As ObservableCollection(Of EgtDataGridColumn))
-         m_ProjColumns = value
-      End Set
-   End Property
-
-   Protected m_ProjectType As ProjectType
-
-   Protected m_sFilter As String
-   Public Property Filter As String
-      Get
-         Return m_sFilter
-      End Get
-      Set(value As String)
-         m_sFilter = value
-      End Set
-   End Property
-
-   Protected m_sFileNameFilter As Predicate(Of String)
-   Public Property FileNameFilter As Predicate(Of String)
-      Get
-         Return m_sFileNameFilter
-      End Get
-      Set(value As Predicate(Of String))
-         m_sFileNameFilter = value
-      End Set
-   End Property
-
-   Protected m_sExtensions As New List(Of String)
-   Public ReadOnly Property Extensions As List(Of String)
-      Get
-         Return m_sExtensions
-      End Get
-   End Property
-
-   Private m_ProjectList_View As CollectionView = Nothing
-   Public ReadOnly Property ProjectList_View As CollectionView
-      Get
-         Return m_ProjectList_View
-      End Get
-   End Property
-
-   Protected m_ProjectList As New ObservableCollection(Of ProdItem)
-   Public ReadOnly Property ProjectList As ObservableCollection(Of ProdItem)
-      Get
-         Return m_ProjectList
-      End Get
-   End Property
-
-   Private m_nSelProjIndex As Integer
-   Public ReadOnly Property nSelProjIndex As Integer
-      Get
-         Return m_nSelProjIndex
-      End Get
-   End Property
-
-   Protected m_SelProject As ProdItem
-   Public Property SelProject As ProdItem
-      Get
-         Return m_SelProject
-      End Get
-      Set(value As ProdItem)
-         m_SelProject = value
-         ' verifico se abilitare il bottone Delete
-         If IsNothing(m_SelProject) Then
-            SetDeleteIsEnabled(False)
-            SetArchivedIsEnabled(False)
-         ElseIf IsNothing(m_SelProject.ProdFileVM) Then
-            SetDeleteIsEnabled(True)
-            SetArchivedIsEnabled(False)
-         Else
-            SetDeleteIsEnabled(Not SelProject.ProdFileVM.bIsProduced)
-            SetArchivedIsEnabled(True)
-         End If
-         NotifyPropertyChanged(NameOf(Archive_Msg))
-      End Set
-   End Property
-
-   Protected m_FileName As String
-   Public Property FileName As String
-      Get
-         Return m_FileName
-      End Get
-      Set(value As String)
-         m_FileName = value
-      End Set
-   End Property
-
-   Private m_bFixedProjectList As Boolean
-   Public ReadOnly Property bFixedProjectList As Boolean
-      Get
-         Return m_bFixedProjectList
-      End Get
-   End Property
-   Public Sub SetFixedProjectList(bValue As Boolean)
-      m_bFixedProjectList = bValue
-      NotifyPropertyChanged(NameOf(Filters_Visibility))
-   End Sub
-
-   Public ReadOnly Property Filters_Visibility As Visibility
-      Get
-         Return If(m_bFixedProjectList, Visibility.Collapsed, Visibility.Visible)
-      End Get
-   End Property
-
-   Protected m_BTLDateTypeList As New List(Of String)
-   Public ReadOnly Property BTLDateTypeList As List(Of String)
-      Get
-         Return m_BTLDateTypeList
-      End Get
-   End Property
-
-   Protected m_SelBTLDateType As BTLDateTypes = Nothing
-   Public Property SelBTLDateType As Integer
-      Get
-         Return m_SelBTLDateType
-      End Get
-      Set(value As Integer)
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         'm_ProjectList_View.Refresh()
-         UpdatePageList()
-      End Set
-   End Property
-
-   Private m_DayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
-   Public Overridable ReadOnly Property DayTypeList As List(Of String)
-      Get
-         Return m_DayTypeList
-      End Get
-   End Property
-
-   Protected m_SelDayType As DayTypes = DayTypes.LASTMONTH
-   Public Property SelDayType As Integer
-      Get
-         Return m_SelDayType
-      End Get
-      Set(value As Integer)
-         Dim PrevSelDayType As DayTypes = m_SelDayType
-         m_SelDayType = value
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
-         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
-         If m_SelDayType = DayTypes.PERIOD Then
-            Select Case PrevSelDayType
-               Case DayTypes.LASTMONTH
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
-               Case DayTypes.LAST3MONTHS
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
-               Case DayTypes.LAST6MONTHS
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-               Case DayTypes.ALWAYS
-                  m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = New DateTime(2020, 1, 1)
-            End Select
-            NotifyPropertyChanged(NameOf(dtStartDate))
-            NotifyPropertyChanged(NameOf(dtEndDate))
-         End If
-         NotifyPropertyChanged(NameOf(Date_Visibility))
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         ' m_ProjectList_View.Refresh()
-         UpdatePageList()
-      End Set
-   End Property
-
-   Private m_dtStartDate As DateTime = DateTime.Today
-   Public Property dtStartDate As DateTime
-      Get
-         Return m_dtStartDate
-      End Get
-      Set(value As DateTime)
-         m_dtStartDate = value
-         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         ' m_ProjectList_View.Refresh()
-         UpdatePageList()
-      End Set
-   End Property
-
-   Private m_dtEndDate As DateTime = DateTime.Today
-   Public Property dtEndDate As DateTime
-      Get
-         Return m_dtEndDate
-      End Get
-      Set(value As DateTime)
-         m_dtEndDate = value
-         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         ' m_ProjectList_View.Refresh()
-         UpdatePageList()
-      End Set
-   End Property
-
-   Private m_Date_Visibility As Visibility = Visibility.Collapsed
-   Public ReadOnly Property Date_Visibility As Visibility
-      Get
-         Return m_Date_Visibility
-      End Get
-   End Property
-
-   Private m_RowQuantityList As New List(Of String)({50, 100, 150})
-   Public ReadOnly Property RowQuantityList As List(Of String)
-      Get
-         Return m_RowQuantityList
-      End Get
-   End Property
-
-   Protected m_SelRowQuantity As RowQuantities
-   Public Property SelRowQuantity As Integer
-      Get
-         Return m_SelRowQuantity
-      End Get
-      Set(value As Integer)
-         m_SelRowQuantity = value
-         RefreshProjectList()
-         ' m_ProjectList_View.Refresh()
-         UpdatePageList()
-      End Set
-   End Property
-
-   ' lista campi per ricerca testuale e con datepicker
-   Protected m_FilterTypeList As New ObservableCollection(Of IdNameStruct)
-   Public ReadOnly Property FilterTypeList As ObservableCollection(Of IdNameStruct)
-      Get
-         Return m_FilterTypeList
-      End Get
-   End Property
-
-   Protected m_SelFilterType As IdNameStruct = Nothing
-   Public Property SelFilterType As IdNameStruct
-      Get
-         Return m_SelFilterType
-      End Get
-      Set(value As IdNameStruct)
-         ' resetto il contenuto della barra di ricerca testuale
-         m_SearchText = ""
-         NotifyPropertyChanged(NameOf(SearchText))
-         ' resetto le selezioni sul calendario
-         If Not IsNothing(SearchDate) Then SearchDate.Clear()
-         ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
-         m_SelFilterType = m_FilterTypeList(0)
-         'm_ProjectList_View.Refresh()
-         UpdatePageList()
-         ' ora setto il valore scelto come Tipo Filtro
-         m_SelFilterType = value
-         Select Case m_SelFilterType.Id
-            Case FilterTypes.ID, FilterTypes.BTLFILENAME, FilterTypes.LISTNAME, FilterTypes.MACHINE
-               SearchText_Visibility = Visibility.Visible
-               SearchDate_Visibility = Visibility.Collapsed
-            Case BTLDateTypes.EXPORTDATE, BTLDateTypes.CREATEDATE
-               SearchText_Visibility = Visibility.Collapsed
-               SearchDate_Visibility = Visibility.Visible
-            Case Else
-               SearchText_Visibility = Visibility.Collapsed
-               SearchDate_Visibility = Visibility.Collapsed
-         End Select
-      End Set
-   End Property
-
-   Protected m_SearchText As String = ""
-   Public Property SearchText As String
-      Get
-         Return m_SearchText
-      End Get
-      Set(value As String)
-         m_SearchText = value
-         'm_ProjectList_View.Refresh()
-         UpdatePageList()
-      End Set
-   End Property
-
-   Friend m_SearchDate As SelectedDatesCollection = Nothing
-   Public ReadOnly Property SearchDate As SelectedDatesCollection
-      Get
-         Return m_SearchDate
-      End Get
-   End Property
-
-   Protected m_SearchText_Visibility As Visibility = Visibility.Collapsed
-   Public Property SearchText_Visibility As Visibility
-      Get
-         Return m_SearchText_Visibility
-      End Get
-      Set(value As Visibility)
-         m_SearchText_Visibility = value
-         NotifyPropertyChanged(NameOf(SearchText_Visibility))
-      End Set
-   End Property
-
-   Protected m_SearchDate_Visibility As Visibility = Visibility.Collapsed
-   Public Property SearchDate_Visibility As Visibility
-      Get
-         Return m_SearchDate_Visibility
-      End Get
-      Set(value As Visibility)
-         m_SearchDate_Visibility = value
-         NotifyPropertyChanged(NameOf(SearchDate_Visibility))
-      End Set
-   End Property
-
-   Public Property bIsEditNameActive As Boolean
-      Get
-         Return Not m_colProdFile_Name.IsReadOnly
-      End Get
-      Set(value As Boolean)
-         If Not IsNothing(m_colProdFile_Name) Then
-            m_colProdFile_Name.IsReadOnly = Not value
-         End If
-      End Set
-   End Property
-   Public Sub SetIsEditNameActive(value As Boolean)
-      If Not IsNothing(m_colProdFile_Name) Then
-         m_colProdFile_Name.IsReadOnly = Not value
-      End If
-      NotifyPropertyChanged(NameOf(bIsEditNameActive))
-   End Sub
-
-   Private m_bViewArchived As Boolean
-   Public Property bViewArchived As Boolean
-      Get
-         Return m_bViewArchived
-      End Get
-      Set(value As Boolean)
-         m_bViewArchived = value
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0))
-         If Not IsNothing(m_colArchived_Name) Then
-            m_colArchived_Name.Visible = value
-            RefreshProjectList()
-         End If
-      End Set
-   End Property
-
-   Private m_bArchived_IsEnabled As Boolean
-   Public ReadOnly Property bArchived_IsEnabled As Boolean
-      Get
-         Return m_bArchived_IsEnabled
-      End Get
-   End Property
-   Public Sub SetArchivedIsEnabled(bValue As Boolean)
-      m_bArchived_IsEnabled = bValue
-      NotifyPropertyChanged(NameOf(bArchived_IsEnabled))
-   End Sub
-
-   Private m_bDelete_IsEnabled As Boolean
-   Public ReadOnly Property bDelete_IsEnabled As Boolean
-      Get
-         Return m_bDelete_IsEnabled
-      End Get
-   End Property
-   Public Sub SetDeleteIsEnabled(bValue As Boolean)
-      m_bDelete_IsEnabled = bValue
-      NotifyPropertyChanged(NameOf(bDelete_IsEnabled))
-   End Sub
-
-   Private m_PageList_View As ListCollectionView = Nothing
-   Public ReadOnly Property PageList_View As ListCollectionView
-      Get
-         Return m_PageList_View
-      End Get
-   End Property
-   Protected m_PageList As New ObservableCollection(Of ProdItem)
-   Public Property PageList As ObservableCollection(Of ProdItem)
-      Get
-         Return m_PageList
-      End Get
-      Set(value As ObservableCollection(Of ProdItem))
-         m_PageList = value
-      End Set
-   End Property
-
-   Private m_nPageIndex As Integer = 1
-   Public ReadOnly Property nPageIndex As Integer
-      Get
-         Return m_nPageIndex
-      End Get
-   End Property
-
-
-   Protected m_ChangeOpenedProjectOnCancel As Boolean = False
-
-#Region "Messages"
-
-   Public ReadOnly Property Title As String
-      Get
-         Return EgtMsg(61986)
-      End Get
-   End Property
-
-   Public ReadOnly Property Filters_Msg As String
-      Get
-         Return EgtMsg(61985)
-      End Get
-   End Property
-
-   Public ReadOnly Property FilterType_Msg As String
-      Get
-         Return EgtMsg(61836)
-      End Get
-   End Property
-   Public ReadOnly Property Search_Msg As String
-      Get
-         Return EgtMsg(61837)
-      End Get
-   End Property
-
-   Public ReadOnly Property Id_Msg As String
-      Get
-         Return EgtMsg(61815)
-      End Get
-   End Property
-   Public ReadOnly Property BTLFileName_Msg As String
-      Get
-         Return EgtMsg(61819)
-      End Get
-   End Property
-   Public ReadOnly Property ListName_Msg As String
-      Get
-         Return EgtMsg(61820)
-      End Get
-   End Property
-   Public ReadOnly Property ExportDate_Msg As String
-      Get
-         Return EgtMsg(61821)
-      End Get
-   End Property
-   Public ReadOnly Property CreateDate_Msg As String
-      Get
-         Return EgtMsg(61822)
-      End Get
-   End Property
-   Public ReadOnly Property Machine_Msg As String
-      Get
-         Return EgtMsg(61886)
-      End Get
-   End Property
-   Public ReadOnly Property Name_Msg As String
-      Get
-         Return EgtMsg(61808)
-      End Get
-   End Property
-
-   Public ReadOnly Property Open_Msg As String
-      Get
-         Return EgtMsg(30006)
-      End Get
-   End Property
-
-   Public ReadOnly Property Archived_Msg As String
-      Get
-         Return EgtMsg(61983)
-      End Get
-   End Property
-
-   Public ReadOnly Property Archive_Msg As String
-      Get
-         If Not IsNothing(m_SelProject) AndAlso m_SelProject.bIsArchived Then
-            Return EgtMsg(61984)
-         Else
-            Return EgtMsg(61981)
-         End If
-      End Get
-   End Property
-   Public ReadOnly Property Delete_Msg As String
-      Get
-         Return EgtMsg(61823)
-      End Get
-   End Property
-   Public ReadOnly Property Cancel_Msg As String
-      Get
-         Return EgtMsg(30002)
-      End Get
-   End Property
-
-   Public ReadOnly Property From_Msg As String
-      Get
-         Return EgtMsg(62523)
-      End Get
-   End Property
-
-   Public ReadOnly Property To_Msg As String
-      Get
-         Return EgtMsg(62524)
-      End Get
-   End Property
-
-   Public ReadOnly Property ViewArchived_Msg As String
-      Get
-         Return EgtMsg(61982)
-      End Get
-   End Property
-
-   Public ReadOnly Property Rows_Msg As String
-      Get
-         Return EgtMsg(61995)
-      End Get
-   End Property
-
-#End Region
-
-   ' Definizione comandi
-   Private m_cmdProjectDoubleClick As ICommand
-   Private m_cmdDelete As ICommand
-   Private m_cmdArchive As ICommand
-   Private m_cmdCancel As ICommand
-   Private m_cmdPrevPage As ICommand
-   Private m_cmdNextPage As ICommand
-
-#End Region    ' FIELDS & PROPERTIES
-
-   Sub New()
-      ' assegno delegato a elementi lista
-      ProdItem.m_delIsModifiedSetUp = AddressOf SetIsEditNameActive
-      ' carico colonne
-      LoadColumns()
-      m_colProdFile_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_NAME)
-      m_colArchived_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_ARCHIVED)
-      m_colProjId_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_PROJID)
-      m_colProdId_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_PRODID)
-      m_colCreateDate_Name = m_ProdColumns.FirstOrDefault(Function(x) x.Name = COL_CREATEDATE)
-      ' leggo valori per filtri
-      m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
-      Select Case m_SelDayType
-         Case DayTypes.LASTMONTH
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
-         Case DayTypes.LAST3MONTHS
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
-         Case DayTypes.LAST6MONTHS
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-         Case DayTypes.PERIOD
-            Dim sStartDate As String = "0"
-            Dim lStartDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
-            Long.TryParse(sStartDate, lStartDate)
-            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
-            Dim sEndDate As String = "0"
-            Dim lEndDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
-            Long.TryParse(sEndDate, lEndDate)
-            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
-            m_Date_Visibility = Visibility.Visible
-      End Select
-      m_bViewArchived = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_VIEWARCHIVED, 0) <> 0
-   End Sub
-
-#Region "METHODS"
-
-   Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
-   Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False)
-   End Sub
-
-
-   Private m_ProdItemComparer As ProdItemComparer
-   Friend ReadOnly Property ProdItemComparer As ProdItemComparer
-      Get
-         Return m_ProdItemComparer
-      End Get
-   End Property
-
-   Friend Sub SetPageListView()
-      m_PageList_View = CollectionViewSource.GetDefaultView(m_PageList)
-      m_ProdItemComparer = New ProdItemComparer
-      m_PageList_View.CustomSort = m_ProdItemComparer
-      NotifyPropertyChanged(NameOf(PageList_View))
-   End Sub
-
-   Friend Sub RefreshProdItemSort()
-      m_PageList_View.CustomSort = m_ProdItemComparer
-   End Sub
-
-   Friend Sub SortPageList()
-      ' m_ProjectList = New ObservableCollection(Of ProdItem)(m_ProjectList.OrderBy(Of Integer)(Function(x) If(String.IsNullOrWhiteSpace(x.sProdId), 0, CInt(x.sProdId))))
-   End Sub
-
-   Protected Sub LoadColumns()
-      'If ProjectType = ProjectType.PROJ Then
-      ' carico le colonne della datagrid
-      ' GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjColumns)
-      '   ' carico campi su cui eseguire il filtro di ricerca
-      '   m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
-      '   m_SelBTLDateType = BTLDateTypes.CREATEDATE
-      '   NotifyPropertyChanged(NameOf(BTLDateTypeList))
-      '   NotifyPropertyChanged(NameOf(SelBTLDateType))
-      '   m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-      '                                                                 New IdNameStruct(FilterTypes.ID, Id_Msg),
-      '                                                                 New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-      '                                                                 New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
-      '                                                                 New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-      '   m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-      '   NotifyPropertyChanged(NameOf(SelFilterType))
-      'ElseIf ProjectType = ProjectType.PROD Then
-      ' carico le colonne della datagrid
-      GetPrivateProfileColumns(S_NEWOPENPROJFILEDLG_PROD, ProdColumns)
-      ' carico campi su cui eseguire il filtro di ricerca
-      m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
-      m_SelBTLDateType = BTLDateTypes.CREATEDATE
-      NotifyPropertyChanged(NameOf(BTLDateTypeList))
-      NotifyPropertyChanged(NameOf(SelBTLDateType))
-      m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                    New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                    New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
-                                                                    New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-      m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-      NotifyPropertyChanged(NameOf(SelFilterType))
-      'End If
-      ' setto la visibilità delle colonne delle EgtDataGrid
-      For Each col In ProjColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
-      For Each col In ProdColumns
-         col.ColumnVisibility = If(col.Visible, Visibility.Visible, Visibility.Collapsed)
-      Next
-   End Sub
-
-   Friend Function VerifySelected() As Boolean
-      If IsNothing(SelProject) Then Return False
-      Dim AllFilesInDir As IEnumerable(Of String) = Nothing
-      If m_ProjectType = Core.ConstBeam.ProjectType.PROJ Then
-         If Not IsNothing(SelProject.ProdFileVM) Then
-            If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
-            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
-         ElseIf SelProject.ProjFileList.Count > 0 Then
-            If String.IsNullOrWhiteSpace(SelProject.ProjFileList(0).sProjDirPath) OrElse Not Directory.Exists(SelProject.ProjFileList(0).sProjDirPath) Then Return False
-            AllFilesInDir = Directory.EnumerateFiles(SelProject.ProjFileList(0).sProjDirPath)
-         Else Return False
-         End If
-      ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
-         If String.IsNullOrWhiteSpace(SelProject.ProdFileVM.sProdDirPath) OrElse Not Directory.Exists(SelProject.ProdFileVM.sProdDirPath) Then Return False
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.ProdFileVM.sProdDirPath)
-      Else
-         Return False
-      End If
-      Return AllFilesInDir.Any(Function(x) Path.GetExtension(x).ToLower() = ".nge")
-   End Function
-
-   'Protected Function ProjectFilter(Proj As Object) As Boolean
-   '   Dim bProjectOk As Boolean = True
-   '   'If TypeOf Proj Is ProjFileVM Then
-   '   Dim CurrProj As ProdItem = DirectCast(Proj, ProdItem)
-   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-   '      (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
-   '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-   '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-   '      (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-   '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-   '   'ElseIf TypeOf Proj Is ProdFileVM Then
-   '   '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
-   '   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-   '   '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-   '   '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-   '   '      (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-   '   '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-   '   '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-   '   'End If
-   '   Return bProjectOk
-   'End Function
-
-   Public Overridable Function UpdatePageList() As Boolean
-      Dim FilteredList As IEnumerable(Of ProdItem) = m_ProjectList.Where(Function(x)
-                                                                            If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso
-                                                                               ((m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-                                                                               (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso x.ProjFileList.Any(Function(y) DirectCast(y, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-                                                                               (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso x.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then Return False
-                                                                            Return True
-                                                                         End Function)
-      Dim nPageRowQty As Integer = 0
-      Select Case m_SelRowQuantity
-         Case RowQuantities.TEN
-            nPageRowQty = 10
-         Case RowQuantities.TWENTY
-            nPageRowQty = 20
-         Case RowQuantities.THIRTY
-            nPageRowQty = 30
-      End Select
-      Dim nStart = nPageIndex * nPageRowQty
-      If (nPageIndex - 1) * nPageRowQty + 1 > FilteredList.Count() Then
-         Return False
-      End If
-      '   FilteredList = FilteredList.OrderBy(Of ProdItem)()
-      ' m_PageList = New ObservableCollection(Of ProdItem)(FilteredList.Skip((nPageIndex - 1) * nPageRowQty + 1).Take(nPageIndex * nPageRowQty).Select(Function(x) x))
-      m_PageList.Clear()
-      For Index = (nPageIndex - 1) * nPageRowQty + 1 To nPageIndex * nPageRowQty
-         m_PageList.Add(FilteredList(Index))
-      Next
-      NotifyPropertyChanged(NameOf(PageList))
-      Return True
-
-      'Dim bProjectOk As Boolean = True
-      ''If TypeOf Proj Is ProjFileVM Then
-      'Dim CurrProj As ProdItem = DirectCast(PROJ, ProdItem)
-      'If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-      '   (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not CurrProj.ProjFileList.Any(Function(x) SearchDate.Contains(DirectCast(x, ProjFileVM).dtExportDate.Date))) OrElse
-      '   (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-      'If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-      '   (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-      '   (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-      '   (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      'ElseIf TypeOf Proj Is ProdFileVM Then
-      '   Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
-      '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-      '      (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-      '   If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-      '      (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-      '      (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-      '      (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      'End If
-      ' Return bProjectOk
-   End Function
-
-   Protected Function ProjectFilter(CurrProj As ProdItem) As Boolean
-      Dim bProjectOk As Boolean = True
-      If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-         (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-         (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.ProjFileList.Any(Function(x) DirectCast(x, ProjFileVM).sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) OrElse
-         (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
-      Return bProjectOk
-   End Function
-
-   Protected Sub CloseWindow(bDialogResult As Boolean)
-      RaiseEvent m_CloseWindow(bDialogResult)
-   End Sub
-
-#End Region    ' METHODS
-
-#Region "COMMANDS"
-
-#Region "ProjectDoubleClick"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property ProjectDoubleClick_Command As ICommand
-      Get
-         If m_cmdProjectDoubleClick Is Nothing Then
-            m_cmdProjectDoubleClick = New Command(AddressOf ProjDoubleClick)
-         End If
-         Return m_cmdProjectDoubleClick
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Friend Sub ProjDoubleClick()
-      ' verifico se non e' attivo edit del nome
-      If bIsEditNameActive Then Return
-      ' verifico validita' selezionato
-      If VerifySelected() Then
-         RaiseEvent m_CloseWindow(True)
-      End If
-   End Sub
-
-#End Region ' ProjectDoubleClick
-
-#Region "Archive"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property Archive_Command As ICommand
-      Get
-         If m_cmdArchive Is Nothing Then
-            m_cmdArchive = New Command(AddressOf Archive)
-         End If
-         Return m_cmdArchive
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub Archive()
-   End Sub
-
-#End Region ' Archive
-
-#Region "Delete"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property Delete_Command As ICommand
-      Get
-         If m_cmdDelete Is Nothing Then
-            m_cmdDelete = New Command(AddressOf Delete)
-         End If
-         Return m_cmdDelete
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub Delete()
-   End Sub
-
-#End Region ' Delete
-
-#Region "Cancel"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </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 New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub Cancel()
-   End Sub
-
-#End Region ' Cancel
-
-#Region "PrevPage"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property PrevPage_Command As ICommand
-      Get
-         If m_cmdPrevPage Is Nothing Then
-            m_cmdPrevPage = New Command(AddressOf PrevPage)
-         End If
-         Return m_cmdPrevPage
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub PrevPage()
-      If m_nPageIndex > 1 Then
-         m_nPageIndex -= 1
-      End If
-      UpdatePageList()
-      NotifyPropertyChanged(NameOf(nPageIndex))
-   End Sub
-
-#End Region ' PrevPage
-
-#Region "NextPage"
-
-   ''' <summary>
-   ''' Returns a command that do New.
-   ''' </summary>
-   Public ReadOnly Property NextPage_Command As ICommand
-      Get
-         If m_cmdNextPage Is Nothing Then
-            m_cmdNextPage = New Command(AddressOf NextPage)
-         End If
-         Return m_cmdNextPage
-      End Get
-   End Property
-
-   ''' <summary>
-   ''' Execute the New.  This method is invoked by the NewCommand.
-   ''' </summary>
-   Public Overridable Sub NextPage()
-      m_nPageIndex += 1
-      If Not UpdatePageList() Then
-         m_nPageIndex -= 1
-      End If
-      NotifyPropertyChanged(NameOf(nPageIndex))
-   End Sub
-
-#End Region ' NextPage
-
-#End Region    ' Commands
-
-End Class
-

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml

@@ -5,9 +5,9 @@
                             xmlns:EgtBEAMWALL="clr-namespace:EgtBEAMWALL.Core"
                             Title="{Binding Title}"
                             Style="{DynamicResource {x:Type EgtWPFLib5:EgtCustomWindow}}"
-                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="True"
+                            WindowStyle="None" ResizeMode="NoResize" TitleBarHeight="30" IsResizable="False"
                             IsMinimizable="False" WindowStartupLocation="CenterScreen" ShowInTaskbar="False"
-                            MinHeight="500" MinWidth="500"
+                            Height="500" Width="500" Topmost="True"
                             DataContext="{Binding RelativeSource={RelativeSource Self}}">
 
    <EgtWPFLib5:EgtCustomWindow.Resources>
@@ -21,106 +21,42 @@
          <RowDefinition Height="1*"/>
       </Grid.RowDefinitions>
 
-      <GroupBox Header="Filters"
-                Margin="5"
-                Visibility="{Binding Filters_Visibility}">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto"/>
-               <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding BTLDateTypeList}"
-                         SelectedIndex="{Binding SelBTLDateType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <StackPanel Grid.Column="1" Orientation="Horizontal">
-                  <ComboBox ItemsSource="{Binding DayTypeList}"
-                            SelectedIndex="{Binding SelDayType}"
-                            Width="105"
-                            Margin="0,0,2.5,0"
-                            Style="{StaticResource PartParam_ComboBox}"/>
-                  <StackPanel Orientation="Horizontal" Visibility="{Binding Date_Visibility}">
-                     <TextBlock Text="{Binding From_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtStartDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                     <TextBlock Text="{Binding To_Msg}"
-                                Style="{StaticResource Filter_TextBlock}"/>
-                     <DatePicker SelectedDate="{Binding dtEndDate}"
-                                 Style="{StaticResource Filter_DatePicker}"/>
-                  </StackPanel>
-               </StackPanel>
-            </Grid>
-            <Grid Grid.Row="1">
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="1*"/>
-                  <ColumnDefinition Width="Auto"/>
-               </Grid.ColumnDefinitions>
-               <ComboBox ItemsSource="{Binding FilterTypeList}"
-                         SelectedItem="{Binding SelFilterType}"
-                         Width="105"
-                         Margin="5"
-                         Style="{StaticResource FeatureComboBox}"/>
-               <EgtWPFLib5:EgtTextBox Grid.Column="1"
-                                      Text="{Binding SearchText}"
-                                      Margin="5"
-                                      Visibility="{Binding SearchText_Visibility}"/>
-               <StackPanel Grid.Column="2" 
-                           Orientation="Horizontal">
-                  <TextBlock Text="Rows"
-                             Style="{StaticResource OptionTextBlock}"/>
-                  <ComboBox ItemsSource="{Binding RowQuantityList}"
-                            SelectedIndex="{Binding SelRowQuantity}"
-                            Style="{StaticResource FeatureComboBox}"/>
-               </StackPanel>
-            </Grid>
-         </Grid>
-      </GroupBox>
+        <StackPanel>
+            <Grid Grid.Row="0" Margin="5">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="1*" />
+                    <RowDefinition Height="1*" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="1*" />
+                    <ColumnDefinition Width="1*" />
+                </Grid.ColumnDefinitions>
 
-
-      <!--<StackPanel>
-         <Grid Grid.Row="0" Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="1*" />
-               <RowDefinition Height="1*" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="1*" />
-               <ColumnDefinition Width="1*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="{Binding FilterType_Msg}"
+                <TextBlock Text="{Binding FilterType_Msg}"
                            Grid.Row="0" Grid.Column="0"
                            Style="{StaticResource OptionTextBlock}"/>
-            <ComboBox ItemsSource="{Binding SearchColumnList}"
+                <ComboBox ItemsSource="{Binding SearchColumnList}"
                           SelectedItem="{Binding SelSearchColumn}"
                           Width="Auto"
                           Margin="5"
                           Grid.Row="0" Grid.Column="1"
                           Style="{StaticResource FeatureComboBox}"/>
-            <TextBlock Text="{Binding Search_Msg}"
+                <TextBlock Text="{Binding Search_Msg}"
                            Margin="0,5,0,0"
                            Grid.Row="1" Grid.Column="0"
                            Style="{StaticResource OptionTextBlock}"/>
-            <EgtWPFLib5:EgtTextBox Text="{Binding SearchText}"
+                <EgtWPFLib5:EgtTextBox Text="{Binding SearchText}"
                                        Margin="5"
                                        Grid.Row="1" Grid.Column="1"
                                        Visibility="{Binding SearchText_Visibility}"/>
-            <Calendar SelectedDatesChanged="Calendar_SelectedDatesChanged"
+                <Calendar SelectedDatesChanged="Calendar_SelectedDatesChanged"
                           SelectionMode="MultipleRange" 
                           Grid.Row="1" Grid.Column="1"
                           Visibility="{Binding SearchDate_Visibility}"/>
-         </Grid>
-      </StackPanel>-->
+            </Grid>
+        </StackPanel>
 
-      <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
+        <EgtBEAMWALL:EgtDataGrid Grid.Row="1"
                ItemsSource="{Binding ProjectList}" 
                SelectedItem="{Binding SelProject}"
                CanUserAddRows="False"
@@ -149,14 +85,6 @@
                   </DataTemplate>
                </DataGridTextColumn.HeaderTemplate>
             </DataGridTextColumn>
-            <!-- Project Name -->
-            <DataGridTextColumn x:Key="colPROJNAME" Binding="{Binding sDescription}">
-               <DataGridTextColumn.HeaderTemplate>
-                  <DataTemplate>
-                     <TextBlock Text="{Binding Path=DataContext.BTLFileName_Msg,RelativeSource={RelativeSource AncestorType={x:Type EgtBEAMWALL:OpenProjectFileDialogV}}}"/>
-                  </DataTemplate>
-               </DataGridTextColumn.HeaderTemplate>
-            </DataGridTextColumn>
             <!-- BTL FileName -->
             <DataGridTextColumn x:Key="colBTLNAME" Binding="{Binding sBTLFileName}">
                <DataGridTextColumn.HeaderTemplate>
@@ -226,7 +154,6 @@
          </ListBox.ItemTemplate>-->
          <DataGrid.RowStyle>
             <Style TargetType="DataGridRow">
-               <Setter Property="IsEnabled" Value="{Binding bIsEnabled}"/>
                <EventSetter Event="MouseDoubleClick" Handler="ProjectList_MouseDoubleClick"/>
             </Style>
          </DataGrid.RowStyle>

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogV.xaml.vb

@@ -5,8 +5,6 @@ Imports System.Windows.Controls
 Imports System.Windows.Input
 Imports EgtBEAMWALL.Core.ConstBeam
 Imports EgtUILib
-Imports EgtWPFLib5
-Imports EgtBEAMWALL
 
 Public Class OpenProjectFileDialogV
 
@@ -21,8 +19,6 @@ Public Class OpenProjectFileDialogV
       Me.DataContext = OpenProjFileDialogVM
       ' Assegno al riferimento locale al VM il VM preso dal DataContext
       m_OpenProjFileDialogVM = OpenProjFileDialogVM
-      AddHandler Me.Loaded, AddressOf OpenProjectFileDialog_Loaded
-      AddHandler Me.Closing, AddressOf OpenProjectFileDialog_Closing
    End Sub
 
 #End Region    ' CONSTRUCTOR
@@ -46,20 +42,6 @@ Public Class OpenProjectFileDialogV
       Return Me.ShowDialog()
    End Function
 
-   Private Sub OpenProjectFileDialog_Loaded(sender As Object, e As RoutedEventArgs)
-      ' Carico e imposto posizione finestra
-      WinPosFromIniToWindow(S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE, Me)
-   End Sub
-
-   Private Sub OpenProjectFileDialog_Closing(sender As Object, e As System.ComponentModel.CancelEventArgs)
-      If (Keyboard.Modifiers And ModifierKeys.Alt) = ModifierKeys.Alt OrElse Keyboard.IsKeyDown(Key.F4) Then
-         e.Cancel = True
-         Return
-      End If
-      ' Salvo posizione finestra (se non minimizzata)
-      WinPosFromWindowToIni(Me, S_OPENFILEDIALOG, K_VIEWOPTIMWINPLACE)
-   End Sub
-
 #End Region    ' METHODS
 
 #Region "EVENTS"
@@ -78,4 +60,10 @@ Public Class OpenProjectFileDialogV
       Me.DialogResult = bDialogResult
    End Sub
 
+   Private Sub Calendar_SelectedDatesChanged(sender As Object, e As SelectionChangedEventArgs)
+      Dim cal As System.Windows.Controls.Calendar = sender
+      m_OpenProjFileDialogVM.m_SearchDate = cal.SelectedDates
+      m_OpenProjFileDialogVM.m_ProjectList_View.Refresh()
+   End Sub
+
 End Class

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -14,36 +14,8 @@ Public MustInherit Class OpenProjectFileDialogVM
 
 #Region "FIELDS & PROPERTIES"
 
-   Public Enum BTLDateTypes As Integer
-      CREATEDATE = 0
-      EXPORTDATE = 1
-   End Enum
-
-   Private Enum FilterTypes As Integer
-      NULL = 0
-      ID = 1
-      BTLFILENAME = 2
-      LISTNAME = 3
-      MACHINE = 4
-   End Enum
-
-   Public Enum DayTypes As Integer
-      LASTMONTH = 0
-      LAST3MONTHS = 1
-      LAST6MONTHS = 2
-      PERIOD = 3
-   End Enum
-
-   Public Enum RowQuantities As Integer
-      FIFTY = 0
-      HUNDRED = 1
-      HUNDREDANDFIFTY = 2
-   End Enum
-
    Friend Event m_CloseWindow(bDialogResult As Boolean)
 
-   Protected m_GoToProd As Boolean = False
-
    Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn)
    Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn)
       Get
@@ -111,148 +83,18 @@ Public MustInherit Class OpenProjectFileDialogVM
       End Set
    End Property
 
-   Private m_bFixedProjectList As Boolean
-   Public ReadOnly Property bFixedProjectList As Boolean
-      Get
-         Return m_bFixedProjectList
-      End Get
-   End Property
-   Public Sub SetFixedProjectList(bValue As Boolean)
-      m_bFixedProjectList = bValue
-      NotifyPropertyChanged(NameOf(Filters_Visibility))
-   End Sub
-
-   Public ReadOnly Property Filters_Visibility As Visibility
-      Get
-         Return If(m_bFixedProjectList, Visibility.Collapsed, Visibility.Visible)
-      End Get
-   End Property
-
-   Protected m_BTLDateTypeList As New List(Of String)
-   Public ReadOnly Property BTLDateTypeList As List(Of String)
-      Get
-         Return m_BTLDateTypeList
-      End Get
-   End Property
-
-   Protected m_SelBTLDateType As BTLDateTypes = Nothing
-   Public Property SelBTLDateType As Integer
-      Get
-         Return m_SelBTLDateType
-      End Get
-      Set(value As Integer)
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-
-   Private m_DayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
-   Public ReadOnly Property DayTypeList As List(Of String)
-      Get
-         Return m_DayTypeList
-      End Get
-   End Property
-
-   Protected m_SelDayType As DayTypes = DayTypes.LASTMONTH
-   Public Property SelDayType As Integer
-      Get
-         Return m_SelDayType
-      End Get
-      Set(value As Integer)
-         Dim PrevSelDayType As DayTypes = m_SelDayType
-         m_SelDayType = value
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_DAYTYPE, Convert.ToInt32(m_SelDayType))
-         m_Date_Visibility = If(m_SelDayType = DayTypes.PERIOD, Visibility.Visible, Visibility.Collapsed)
-         If m_SelDayType = DayTypes.PERIOD Then
-            Select Case PrevSelDayType
-               Case DayTypes.LASTMONTH
-                  m_dtStartDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(30.5)
-               Case DayTypes.LAST3MONTHS
-
-               Case DayTypes.LAST6MONTHS
-
-            End Select
-            NotifyPropertyChanged(NameOf(dtStartDate))
-            NotifyPropertyChanged(NameOf(dtEndDate))
-         End If
-         NotifyPropertyChanged(NameOf(Date_Visibility))
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_dtStartDate As DateTime = DateTime.Today
-   Public Property dtStartDate As DateTime
-      Get
-         Return m_dtStartDate
-      End Get
-      Set(value As DateTime)
-         m_dtStartDate = value
-         Dim lStartDate As Long = m_dtStartDate.ToFileTimeUtc()
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, lStartDate.ToString())
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_dtEndDate As DateTime = DateTime.Today
-   Public Property dtEndDate As DateTime
-      Get
-         Return m_dtEndDate
-      End Get
-      Set(value As DateTime)
-         m_dtEndDate = value
-         Dim lEndDate As Long = m_dtEndDate.ToFileTimeUtc()
-         WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, lEndDate.ToString())
-         ' aggiorno lista da Db
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
-   Private m_Date_Visibility As Visibility = Visibility.Collapsed
-   Public ReadOnly Property Date_Visibility As Visibility
-      Get
-         Return m_Date_Visibility
-      End Get
-   End Property
-
-   Private m_RowQuantityList As New List(Of String)({50, 100, 150})
-   Public ReadOnly Property RowQuantityList As List(Of String)
-      Get
-         Return m_RowQuantityList
-      End Get
-   End Property
-
-   Private m_SelRowQuantity As RowQuantities
-   Public Property SelRowQuantity As Integer
-      Get
-         Return m_SelRowQuantity
-      End Get
-      Set(value As Integer)
-         m_SelRowQuantity = value
-         RefreshProjectList()
-         m_ProjectList_View.Refresh()
-      End Set
-   End Property
-
    ' lista campi per ricerca testuale e con datepicker
-   Protected m_FilterTypeList As New ObservableCollection(Of IdNameStruct)
-   Public ReadOnly Property FilterTypeList As ObservableCollection(Of IdNameStruct)
+   Protected m_SearchColumnList As New ObservableCollection(Of IdNameStruct)
+   Public ReadOnly Property SearchColumnList As ObservableCollection(Of IdNameStruct)
       Get
-         Return m_FilterTypeList
+         Return m_SearchColumnList
       End Get
    End Property
 
-   Protected m_SelFilterType As IdNameStruct = Nothing
-   Public Property SelFilterType As IdNameStruct
+   Protected m_SelSearchColumn As IdNameStruct = Nothing
+   Public Property SelSearchColumn As IdNameStruct
       Get
-         Return m_SelFilterType
+         Return m_SelSearchColumn
       End Get
       Set(value As IdNameStruct)
          ' resetto il contenuto della barra di ricerca testuale
@@ -261,15 +103,15 @@ Public MustInherit Class OpenProjectFileDialogVM
          ' resetto le selezioni sul calendario
          If Not IsNothing(SearchDate) Then SearchDate.Clear()
          ' setto il Tipo Filtro a NULL e refresho la lista dei progetti (in modo da averli visibili tutti)
-         m_SelFilterType = m_FilterTypeList(0)
+         m_SelSearchColumn = m_SearchColumnList(0)
          m_ProjectList_View.Refresh()
          ' ora setto il valore scelto come Tipo Filtro
-         m_SelFilterType = value
-         Select Case m_SelFilterType.Id
-            Case FilterTypes.ID, FilterTypes.BTLFILENAME, FilterTypes.LISTNAME, FilterTypes.MACHINE
+         m_SelSearchColumn = value
+         Select Case m_SelSearchColumn.Id
+            Case OpenProjFileColumn.ID, OpenProjFileColumn.BTLFILENAME, OpenProjFileColumn.LISTNAME
                SearchText_Visibility = Visibility.Visible
                SearchDate_Visibility = Visibility.Collapsed
-            Case BTLDateTypes.EXPORTDATE, BTLDateTypes.CREATEDATE
+            Case OpenProjFileColumn.EXPORTDATE, OpenProjFileColumn.CREATEDATE
                SearchText_Visibility = Visibility.Collapsed
                SearchDate_Visibility = Visibility.Visible
             Case Else
@@ -319,13 +161,17 @@ Public MustInherit Class OpenProjectFileDialogVM
       End Set
    End Property
 
+   Public Enum OpenProjFileColumn As Integer
+      NULL = 0
+      ID = 1
+      BTLFILENAME = 2
+      LISTNAME = 3
+      EXPORTDATE = 4
+      CREATEDATE = 5
+   End Enum
+
 #Region "Messages"
 
-   Public ReadOnly Property Title As String
-      Get
-         Return "Open Project"
-      End Get
-   End Property
    Public ReadOnly Property FilterType_Msg As String
       Get
          Return EgtMsg(61836)
@@ -389,18 +235,6 @@ Public MustInherit Class OpenProjectFileDialogVM
       End Get
    End Property
 
-   Public ReadOnly Property From_Msg As String
-      Get
-         Return EgtMsg(62523)
-      End Get
-   End Property
-
-   Public ReadOnly Property To_Msg As String
-      Get
-         Return EgtMsg(62524)
-      End Get
-   End Property
-
 #End Region
 
    ' Definizione comandi
@@ -409,70 +243,29 @@ Public MustInherit Class OpenProjectFileDialogVM
 
 #End Region    ' FIELDS & PROPERTIES
 
-   Sub New()
-      ' leggo valori per filtri
-      m_SelDayType = GetMainPrivateProfileInt(S_OPENFILEDIALOG, K_DAYTYPE, 0)
-      Select Case m_SelDayType
-         Case DayTypes.LASTMONTH
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
-         Case DayTypes.LAST3MONTHS
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 3)
-         Case DayTypes.LAST6MONTHS
-            m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
-         Case DayTypes.PERIOD
-            Dim sStartDate As String = "0"
-            Dim lStartDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_STARTDATE, 0, sStartDate)
-            Long.TryParse(sStartDate, lStartDate)
-            m_dtStartDate = If(lStartDate > 0, DateTime.FromFileTimeUtc(lStartDate), DateTime.Today)
-            Dim sEndDate As String = "0"
-            Dim lEndDate As Long = 0
-            GetMainPrivateProfileString(S_OPENFILEDIALOG, K_ENDDATE, 0, sEndDate)
-            Long.TryParse(sEndDate, lEndDate)
-            m_dtEndDate = If(lEndDate > 0, DateTime.FromFileTimeUtc(lEndDate), DateTime.Today)
-            m_Date_Visibility = Visibility.Visible
-      End Select
-   End Sub
-
 #Region "METHODS"
 
    Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
-   Public Overridable Sub RefreshProjectList()
-   End Sub
 
    Protected Sub LoadColumns(ProjectType As ProjectType)
       If ProjectType = ProjectType.PROJ Then
          ' carico le colonne della datagrid
          GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROJ, ProjectColumns)
          ' carico campi su cui eseguire il filtro di ricerca
-         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg, ExportDate_Msg})
-         m_SelBTLDateType = BTLDateTypes.CREATEDATE
-         NotifyPropertyChanged(NameOf(BTLDateTypeList))
-         NotifyPropertyChanged(NameOf(SelBTLDateType))
-         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                       New IdNameStruct(FilterTypes.ID, Id_Msg),
-                                                                       New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                       New IdNameStruct(FilterTypes.LISTNAME, ListName_Msg),
-                                                                       New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-         NotifyPropertyChanged(NameOf(SelFilterType))
+         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.LISTNAME, ListName_Msg),
+                                                                        New IdNameStruct(OpenProjFileColumn.EXPORTDATE, ExportDate_Msg),
+                                                                        New IdNameStruct(OpenProjFileColumn.CREATEDATE, CreateDate_Msg)})
       ElseIf ProjectType = ProjectType.PROD Then
          ' carico le colonne della datagrid
          GetPrivateProfileColumns(S_OPENPROJFILEDLG_PROD, ProjectColumns)
          ' carico campi su cui eseguire il filtro di ricerca
-         m_BTLDateTypeList = New List(Of String)({CreateDate_Msg})
-         m_SelBTLDateType = BTLDateTypes.CREATEDATE
-         NotifyPropertyChanged(NameOf(BTLDateTypeList))
-         NotifyPropertyChanged(NameOf(SelBTLDateType))
-         m_FilterTypeList = New ObservableCollection(Of IdNameStruct)({New IdNameStruct(FilterTypes.NULL, ""),
-                                                                         New IdNameStruct(FilterTypes.ID, Id_Msg),
-                                                                         New IdNameStruct(FilterTypes.BTLFILENAME, BTLFileName_Msg),
-                                                                         New IdNameStruct(FilterTypes.MACHINE, Machine_Msg)})
-         m_SelFilterType = m_FilterTypeList.FirstOrDefault(Function(x) x.Id = FilterTypes.NULL)
-         NotifyPropertyChanged(NameOf(SelFilterType))
+         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)})
       End If
       ' setto la visibilità delle colonne delle EgtDataGrid
       For Each col In ProjectColumns
@@ -482,16 +275,12 @@ Public MustInherit Class OpenProjectFileDialogVM
 
    Friend Function VerifySelected() As Boolean
       If IsNothing(SelProject) Then Return False
-      Dim AllFilesInDir As IEnumerable(Of String) = Nothing
+      Dim AllFilesInDir As IEnumerable(Of String)
       If m_ProjectType = Core.ConstBeam.ProjectType.PROJ Then
-         If String.IsNullOrWhiteSpace(SelProject.sProjDirPath) OrElse Not Directory.Exists(SelProject.sProjDirPath) Then Return False
          ' verifico se esiste ProdId
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.sProjDirPath)
+         AllFilesInDir = IO.Directory.EnumerateFiles(SelProject.sProjDirPath)
       ElseIf m_ProjectType = Core.ConstBeam.ProjectType.PROD Then
-         If String.IsNullOrWhiteSpace(SelProject.sProdDirPath) OrElse Not Directory.Exists(SelProject.sProdDirPath) Then Return False
-         AllFilesInDir = Directory.EnumerateFiles(SelProject.sProdDirPath)
-      Else
-         Return False
+         AllFilesInDir = IO.Directory.EnumerateFiles(SelProject.sProdDirPath)
       End If
       For Each File In AllFilesInDir
          If Path.GetExtension(File).ToLower() = ".nge" Then
@@ -505,22 +294,20 @@ Public MustInherit Class OpenProjectFileDialogVM
       Dim bProjectOk As Boolean = True
       If m_ProjectType = ProjectType.PROJ Then
          Dim CurrProj As ProjFileVM = DirectCast(Proj, ProjFileVM)
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-            (m_SelFilterType.Id = BTLDateTypes.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.dtExportDate.Date)) OrElse
-            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProjId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.LISTNAME AndAlso CurrProj.sListName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+         If m_SelSearchColumn.Id <> OpenProjFileColumn.NULL AndAlso (
+            (m_SelSearchColumn.Id = OpenProjFileColumn.EXPORTDATE AndAlso Not SearchDate.Contains(CurrProj.dtExportDate.Date)) OrElse
+            (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.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
       ElseIf m_ProjectType = ProjectType.PROD Then
          Dim CurrProj As ProdFileVM = DirectCast(Proj, ProdFileVM)
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso (
-            (m_SelFilterType.Id = BTLDateTypes.CREATEDATE AndAlso Not SearchDate.Contains(CurrProj.dtCreateDate.Date))) Then bProjectOk = False
-         If m_SelFilterType.Id <> FilterTypes.NULL AndAlso m_SearchText <> String.Empty AndAlso (
-            (m_SelFilterType.Id = FilterTypes.ID AndAlso CurrProj.sProdId.ToString.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.BTLFILENAME AndAlso CurrProj.sBTLFileName.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0) OrElse
-            (m_SelFilterType.Id = FilterTypes.MACHINE AndAlso CurrProj.sMachine.IndexOf(SearchText, StringComparison.InvariantCultureIgnoreCase) < 0)) Then bProjectOk = False
+         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
       End If
       Return bProjectOk
    End Function

EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb

@@ -10,35 +10,12 @@ Public Class ProdFileM
          Return m_nProjIdList
       End Get
    End Property
-   Public Sub SetProjIdList(value As List(Of Integer))
-      m_nProjIdList = value
-   End Sub
-
-   Protected m_ProjMList As List(Of ProjFileM)
-   Public ReadOnly Property ProjMList As List(Of ProjFileM)
-      Get
-         Return m_ProjMList
-      End Get
-   End Property
 
    Protected m_sName As String
-   Public Property sName As String
+   Public ReadOnly Property sName As String
       Get
          Return m_sName
       End Get
-      Set(value As String)
-         m_sName = value
-      End Set
-   End Property
-
-   Protected m_bIsProduced As Boolean
-   Public Property bIsProduced As Boolean
-      Get
-         Return m_bIsProduced
-      End Get
-      Set(value As Boolean)
-         m_bIsProduced = value
-      End Set
    End Property
 
 #Region "CONSTRUCTORS"
@@ -50,8 +27,7 @@ Public Class ProdFileM
       Return New ProdFileM
    End Function
 
-   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean) As ProdFileM
+   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType, sMachine As String) As ProdFileM
       Dim NewProjectFileM As New ProdFileM
       NewProjectFileM.m_nProdId = nProdId
       NewProjectFileM.m_nProjIdList = nProjIdList
@@ -59,29 +35,6 @@ Public Class ProdFileM
       NewProjectFileM.m_sName = sName
       NewProjectFileM.m_nType = nType
       NewProjectFileM.m_sMachine = sMachine
-      NewProjectFileM.m_sLockedBy = sLockedBy
-      NewProjectFileM.m_dtLock = dtLock
-      NewProjectFileM.m_bIsActive = bIsActive
-      NewProjectFileM.m_bIsProduced = bIsProduced
-      NewProjectFileM.m_bIsArchived = bIsArchived
-      Return NewProjectFileM
-   End Function
-
-   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                          sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdFileM
-      Dim NewProjectFileM As New ProdFileM
-      NewProjectFileM.m_nProdId = nProdId
-      NewProjectFileM.m_nProjIdList = nProjIdList
-      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
-      NewProjectFileM.m_sName = sName
-      NewProjectFileM.m_nType = nType
-      NewProjectFileM.m_sMachine = sMachine
-      NewProjectFileM.m_sLockedBy = sLockedBy
-      NewProjectFileM.m_dtLock = dtLock
-      NewProjectFileM.m_bIsActive = bIsActive
-      NewProjectFileM.m_bIsProduced = bIsProduced
-      NewProjectFileM.m_bIsArchived = bIsArchived
-      NewProjectFileM.m_ProjMList = ProjMList
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb

@@ -1,119 +0,0 @@
-
-Imports EgtWPFLib5
-Imports System.Windows
-
-Public Class ProdItem
-    Inherits VMBase
-
-   Public Shared m_delUpdateNameInDb As Action(Of Integer, String)
-   Public Shared m_delIsModifiedSetUp As Action(Of Boolean)
-
-   Protected m_ProdFileVM As ProdFileVM
-    Public ReadOnly Property ProdFileVM As ProdFileVM
-        Get
-            Return m_ProdFileVM
-        End Get
-    End Property
-
-    Private m_ProjFileList As New List(Of ProjectFileVM)
-    Public ReadOnly Property ProjFileList As List(Of ProjectFileVM)
-        Get
-            Return m_ProjFileList
-        End Get
-    End Property
-
-    Public ReadOnly Property sProdId As String
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sProdId, "")
-        End Get
-    End Property
-
-    Public Overridable Property sName As String
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "")
-        End Get
-        Set(value As String)
-         If Not IsNothing(m_ProdFileVM) Then
-            m_delUpdateNameInDb(m_ProdFileVM.nProdId, value)
-            m_ProdFileVM.sName = value
-            m_delIsModifiedSetUp(False)
-         End If
-      End Set
-    End Property
-
-    Public ReadOnly Property dtCreateDate As Date
-        Get
-            Return If(Not IsNothing(m_ProdFileVM), {m_ProdFileVM.dtCreateDate, m_ProjFileList.Min(Function(x) x.dtCreateDate)}.Min(), m_ProjFileList.Min(Function(x) x.dtCreateDate))
-        End Get
-    End Property
-    Public ReadOnly Property sCreateDate As String
-        Get
-            Return dtCreateDate.ToString()
-        End Get
-    End Property
-
-    Public ReadOnly Property sMachine As String
-        Get
-            If Not IsNothing(m_ProdFileVM) Then
-                Return m_ProdFileVM.sMachine
-            ElseIf Not IsNothing(m_ProjFileList(0)) Then
-                Return m_ProjFileList(0).sMachine
-            Else Return ""
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property bIsArchived As Boolean
-        Get
-            If Not IsNothing(m_ProdFileVM) Then
-                Return m_ProdFileVM.bIsArchived
-            ElseIf Not IsNothing(m_ProjFileList(0)) Then
-                Return m_ProjFileList(0).bIsArchived
-            Else
-                Return True
-            End If
-        End Get
-    End Property
-
-    Public ReadOnly Property Archived_Visibility As Visibility
-        Get
-            Return If(bIsArchived, Visibility.Visible, Visibility.Collapsed)
-        End Get
-    End Property
-
-    Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM)
-        m_ProdFileVM = ProdFileVM
-        m_ProjFileList.Add(ProjFileVM)
-    End Sub
-
-    Sub New(ProjFileVM As ProjFileVM)
-        m_ProjFileList = New List(Of ProjectFileVM)({ProjFileVM})
-    End Sub
-
-    Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM))
-        m_ProdFileVM = ProdFileVM
-        m_ProjFileList = ProjFileVMList
-    End Sub
-
-
-   Public Shared Function CreateProdItem(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType,
-                                           sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) As ProdItem
-
-
-      Dim NewProdFileM = ProdFileM.CreateProdFileM(nProdId, nProjIdList, dtCreateProjDate, sName, nType, sMachine, sLockedBy, dtLock, bIsActive, bIsProduced, bIsArchived)
-      Dim NewProdFileVM = New ProdFileVM(NewProdFileM)
-      Dim NewProjFileVM As IEnumerable(Of ProjectFileVM)
-      NewProjFileVM = ProjMList.Select(Of ProjFileVM)(Function(j) New ProjFileVM(j)).ToList
-      Dim NewProdItem = New ProdItem(NewProdFileVM, NewProjFileVM.ToList)
-
-      Return NewProdItem
-   End Function
-
-   Public Shared Function CreateProdItem(ProjFileM As ProjFileM) As ProdItem
-
-      Dim NewProdItem = New ProdItem(New ProjFileVM(ProjFileM))
-
-      Return NewProdItem
-   End Function
-
-End Class

EgtBEAMWALL.Core/ProjectFileVM/ProjFileM.vb

@@ -19,35 +19,26 @@ Public Class ProjFileM
    End Property
 
    Protected m_sBTLFileName As String = String.Empty
-    Public Property sBTLFileName As String
-        Get
-            Return m_sBTLFileName
-        End Get
-        Set(value As String)
-            m_sBTLFileName = value
-        End Set
-    End Property
-
-    Protected m_sDescription As String = String.Empty
-    Public Property sDescription As String
-        Get
-            Return m_sDescription
-        End Get
-        Set(value As String)
-            m_sDescription = value
-        End Set
-    End Property
+   Public Property sBTLFileName As String
+      Get
+         Return m_sBTLFileName
+      End Get
+      Set(value As String)
+         m_sBTLFileName = value
+      End Set
+   End Property
 
 #Region "CONSTRUCTORS"
 
-    Protected Sub New()
+   Protected Sub New()
    End Sub
 
    Public Shared Function CreateNewProjFileM() As ProjFileM
       Return New ProjFileM
    End Function
 
-   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String, sBTLFileName As String, sDescription As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String, bIsActive As Boolean, bIsArchived As Boolean) As ProjFileM
+   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, sListName As String,
+                                          sBTLFileName As String, IsNew As Boolean, IsLocked As Boolean, nType As BWType, sMachine As String) As ProjFileM
       Dim NewProjectFileM As New ProjFileM
       NewProjectFileM.m_nProjId = nProjId
       NewProjectFileM.m_nProdId = nProdId
@@ -55,13 +46,10 @@ Public Class ProjFileM
       NewProjectFileM.m_dtExportDate = dtExportDate
       NewProjectFileM.m_sListName = sListName
       NewProjectFileM.m_sBTLFileName = sBTLFileName
-      NewProjectFileM.m_sDescription = sDescription
       NewProjectFileM.m_bIsNew = IsNew
       NewProjectFileM.m_bIsLocked = IsLocked
       NewProjectFileM.m_nType = nType
       NewProjectFileM.m_sMachine = sMachine
-      NewProjectFileM.m_bIsActive = bIsActive
-      NewProjectFileM.m_bIsArchived = bIsArchived
       Return NewProjectFileM
    End Function
 

EgtBEAMWALL.Core/ProjectFileVM/ProjectFileM.vb

@@ -74,46 +74,6 @@ Public Class ProjectFileM
       End Set
    End Property
 
-   Protected m_sLockedBy As String
-   Public Property sLockedBy As String
-      Get
-         Return m_sLockedBy
-      End Get
-      Set(value As String)
-         m_sLockedBy = value
-      End Set
-   End Property
-
-   Protected m_dtLock As DateTime
-   Public Property dtLock As DateTime
-      Get
-         Return m_dtLock
-      End Get
-      Set(value As DateTime)
-         m_dtLock = value
-      End Set
-   End Property
-
-   Protected m_bIsActive As Boolean
-   Public Property bIsActive As Boolean
-      Get
-         Return m_bIsActive
-      End Get
-      Set(value As Boolean)
-         m_bIsActive = value
-      End Set
-   End Property
-
-   Protected m_bIsArchived As Boolean
-   Public Property bIsArchived As Boolean
-      Get
-         Return m_bIsArchived
-      End Get
-      Set(value As Boolean)
-         m_bIsArchived = value
-      End Set
-   End Property
-
 #Region "CONSTRUCTORS"
 
 #End Region    ' CONSTRUCTORS

EgtBEAMWALL.Core/ProjectManager/ProdFileVM.vb

@@ -47,13 +47,10 @@ Public Class ProdFileVM
       End Set
    End Property
 
-   Public Property sName As String
+   Public ReadOnly Property sName As String
       Get
          Return ProdFileM.sName
       End Get
-      Set(value As String)
-         ProdFileM.sName = value
-      End Set
    End Property
 
    Private m_sBTLFileName As String
@@ -66,12 +63,6 @@ Public Class ProdFileVM
       m_sBTLFileName = value
    End Sub
 
-   Public ReadOnly Property bIsProduced As Boolean
-      Get
-         Return ProdFileM.bIsProduced
-      End Get
-   End Property
-
 #Region "CONSTRUCTORS"
 
    Sub New(ProdFileM As ProdFileM)

EgtBEAMWALL.Core/ProjectManager/ProjFileVM.vb

@@ -68,12 +68,6 @@ Public Class ProjFileVM
       End Get
    End Property
 
-   Public ReadOnly Property sDescription As String
-      Get
-         Return ProjFileM.sDescription
-      End Get
-   End Property
-
    Public ReadOnly Property sListName As String
       Get
          Return ProjFileM.sListName

EgtBEAMWALL.Core/ProjectManager/ProjectFileVM.vb

@@ -117,18 +117,6 @@ Public Class ProjectFileVM
       End Get
    End Property
 
-   Public ReadOnly Property bIsActive As Boolean
-      Get
-         Return m_ProjectFileM.bIsActive
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsArchived As Boolean
-      Get
-         Return m_ProjectFileM.bIsArchived
-      End Get
-   End Property
-
 #Region "Messages"
 
    Public ReadOnly Property Id_Msg As String

EgtBEAMWALL.Core/Utility/BTLIniFile.vb

@@ -147,9 +147,9 @@ Public Module BTLIniFile
                Dim dMin As Double
                Dim dMax As Double
                Dim dDefault As Double
-               StringToDoubleAdv(sBTLParamParams(2), dMin)
-               StringToDoubleAdv(sBTLParamParams(3), dMax)
-               StringToDoubleAdv(sBTLParamParams(4), dDefault)
+               StringToDouble(sBTLParamParams(2), dMin)
+               StringToDouble(sBTLParamParams(3), dMax)
+               StringToDouble(sBTLParamParams(4), dDefault)
                Dim ParamType As BTLParamType
                If sBTLParamParams(0) = "d" Then
                   ParamType = BTLParamType.DOUBLE_
@@ -159,7 +159,7 @@ Public Module BTLIniFile
                IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, ParamType, sBTLParamParams(1), dMin, dMax, dDefault, sBTLParamParams(5))
                Return Not IsNothing(IpBTLParam)
             ElseIf sBTLParamParams(0) = "s" Then
-               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(4), sBTLParamParams(5))
+               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(5))
                Return Not IsNothing(IpBTLParam)
             ElseIf sBTLParamParams(0) = "c" Then
                Dim nMin As Integer
@@ -200,9 +200,9 @@ Public Module BTLIniFile
                Dim dMin As Double
                Dim dMax As Double
                Dim dDefault As Double
-               StringToDoubleAdv(sBTLParamParams(2), dMin)
-               StringToDoubleAdv(sBTLParamParams(3), dMax)
-               StringToDoubleAdv(sBTLParamParams(4), dDefault)
+               StringToDouble(sBTLParamParams(2), dMin)
+               StringToDouble(sBTLParamParams(3), dMax)
+               StringToDouble(sBTLParamParams(4), dDefault)
                Dim ParamType As BTLParamType
                If sBTLParamParams(0) = "d" Then
                   ParamType = BTLParamType.DOUBLE_
@@ -212,7 +212,7 @@ Public Module BTLIniFile
                IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, ParamType, sBTLParamParams(1), dMin, dMax, dDefault, sBTLParamParams(5), sBWQParam)
                Return Not IsNothing(IpBTLParam)
             ElseIf sBTLParamParams(0) = "s" Then
-               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(4), sBTLParamParams(5), sBWQParam)
+               IpBTLParam = BTLParamM.CreateBTLParam(IpParentFeature, IsP, BTLParamType.STRING_, sBTLParamParams(1), sBTLParamParams(5), sBWQParam)
                Return Not IsNothing(IpBTLParam)
             ElseIf sBTLParamParams(0) = "c" Then
                Dim nMin As Integer

EgtBEAMWALL.Core/Utility/DimensionsIniFile.vb

@@ -27,7 +27,7 @@ Public Module DimensionsIniFile
             Dim GridLenType As GridUnitType
             Integer.TryParse(sValueParams(0), nDimIndex)
             Integer.TryParse(sValueParams(1), nDimType)
-            StringToDoubleAdv(sValueParams(2), GridLenValue)
+            StringToDouble(sValueParams(2), GridLenValue)
             Integer.TryParse(sValueParams(3), GridLenType)
             GridDimsList.Add(New GridDimension(GridName, nDimIndex, nDimType, New GridLength(GridLenValue, GridLenType)))
          End If

EgtBEAMWALL.Core/Utility/Enum.vb

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

EgtBEAMWALL.Core/Utility/GridDimension.vb

@@ -6,8 +6,6 @@ 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
@@ -45,7 +43,7 @@ Public Class GridDimension
       End Get
       Set(value As GridLength)
          m_GridLen = value
-         If Not m_SoftwareModActive Then DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
+         DimensionsIniFile.SaveGridDimensions(GridName, GridDimensions)
       End Set
    End Property
 
@@ -66,8 +64,4 @@ 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

@@ -1,31 +0,0 @@
-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
-                  Return EgtMsg(65000 + nMsg)
-               End If
-            Else
-               Return EgtMsg(65000 + nMsg)
-            End If
-         Else
-            Return LuaMsg
-         End If
-      Else
-         Return LuaMsg
-      End If
-      Return ""
-   End Function
-
-End Module

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -2,19 +2,6 @@
 
 #Region "Private Fields"
 
-   Public Enum MachLogTypes
-      PART_STATUS = 1
-      MACHGROUP_STATUS = 2
-      MACHINE_MODE = 3
-      MACHINE_STATUS = 4
-      MACHINE_COMMAND = 5
-      READ_VAR = 6
-      WRITE_VAR = 7
-      ALARM = 8
-      OPERATOR_MSG = 9
-      PROGRAM_SEND = 10
-   End Enum
-
    Private m_AlarmCode As String
    Private m_AlarmDateTime As DateTime
    Private m_AlarmMessage As String
@@ -24,73 +11,15 @@
    Private m_CommandState As CommandStates
    Private m_CommandType As LogCommandTypes
    Private m_Description As String
+
    Private m_newOpState As Integer
+
    Private m_ResultType As ResultTypes
+
    Private m_VarAddress As String
+
    Private m_VarValue As String
 
-   ' variabili del log macchina
-   Public ReadOnly Property EventType As MachLogTypes
-      Get
-         Return m_ResultType
-      End Get
-   End Property
-   Public ReadOnly Property EventDateTime As DateTime
-      Get
-         Return m_AlarmDateTime
-      End Get
-   End Property
-   Public ReadOnly Property EventValue As String
-      Get
-         Return m_VarValue
-      End Get
-   End Property
-
-   Public ReadOnly Property sEventType As String
-      Get
-         Select Case m_ResultType
-            Case MachLogTypes.PART_STATUS
-               Return String.Format("({0}) Stato pezzo", 1)
-            Case MachLogTypes.MACHGROUP_STATUS
-               Return String.Format("({0}) Stato barra", 2)
-            Case MachLogTypes.MACHINE_MODE = 3
-               Return String.Format("({0}) Modalità macchina", 3)
-            Case MachLogTypes.MACHINE_STATUS = 4
-               Return String.Format("({0}) Stato macchina", 4)
-            Case MachLogTypes.MACHINE_COMMAND = 5
-               Return String.Format("({0}) Comando macchina", 5)
-            Case MachLogTypes.READ_VAR = 6
-               Return String.Format("({0}) Lettura variabile", 6)
-            Case MachLogTypes.WRITE_VAR = 7
-               Return String.Format("({0}) Scrittura variabile", 7)
-            Case MachLogTypes.ALARM = 8
-               Return String.Format("({0}) Allarme", 8)
-            Case MachLogTypes.OPERATOR_MSG = 9
-               Return String.Format("({0}) Messaggio opertore", 9)
-            Case MachLogTypes.PROGRAM_SEND = 10
-               Return String.Format("({0}) Invio programma", 10)
-            Case Else
-               Return "Altro"
-         End Select
-      End Get
-   End Property
-   Public ReadOnly Property sEventDateTime As String
-      Get
-         Return m_AlarmDateTime
-      End Get
-   End Property
-   Public ReadOnly Property sEventValue As String
-      Get
-         Return m_VarValue
-      End Get
-   End Property
-
-   Public ReadOnly Property sPROD As String
-      Get
-         Return m_VarValue
-      End Get
-   End Property
-
 #End Region
 
 #Region "Protected Constructors"
@@ -236,20 +165,11 @@
       Return NewMachLog
    End Function
 
-   Public Shared Function CreateMachLog(EventType As MachLogTypes, EventDateTime As DateTime, Value As String, SupervisorID As String)
-      Dim NewMachEvent As New MachLog
-      NewMachEvent.m_ResultType = EventType
-      NewMachEvent.m_AlarmDateTime = EventDateTime
-      NewMachEvent.m_VarValue = Value
-      NewMachEvent.m_VarAddress = SupervisorID
-      Return NewMachEvent
-   End Function
-
 #End Region
 
 #Region "Public Methods"
 
-   Public Shared Function CreateMachLog(AlarmCode As String, AlarmDateTime As Date, AlarmMessage As String, AlarmOperation As Integer, AlarmType As Integer, CommandExecutedCorrectly As Boolean, CommandState As CommandStates, CommandType As LogCommandTypes, Description As String, newOpState As Integer, ResultType As ResultTypes, VarAddress As String, VarValue As String) As MachLog
+   Public Shared Function CreateMacLog(AlarmCode As String, AlarmDateTime As Date, AlarmMessage As String, AlarmOperation As Integer, AlarmType As Integer, CommandExecutedCorrectly As Boolean, CommandState As CommandStates, CommandType As LogCommandTypes, Description As String, newOpState As Integer, ResultType As ResultTypes, VarAddress As String, VarValue As String) As MachLog
 
       Dim NewMachLog As New MachLog
       NewMachLog.m_AlarmCode = AlarmCode

EgtBEAMWALL.Core/ViewPanel/ViewPanelVM.vb

@@ -15,80 +15,80 @@ Public Class ViewPanelVM
    ' Posizione vista
    Private Shared m_nViewDir As VT = VT.ISO_SW
 
-   Public Shared Sub BWSetView(nView As VT, Optional bRedraw As Boolean = True)
+   Public Shared Function BWSetView(nView As VT, Optional bRedraw As Boolean = True)
       ' condizioni che cambiano la vista del progetto
-      'Select Case m_Type
-      '   Case BWType.BEAM
-      '      Select Case nView
-      '         Case VT.TOP
-      '            EgtSetView(VT.TOP, bRedraw)
-      '         Case VT.FRONT
-      '            EgtSetView(VT.FRONT, bRedraw)
-      '         Case VT.BACK
-      '            EgtSetView(VT.BACK, bRedraw)
-      '         Case VT.RIGHT
-      '            EgtSetView(VT.RIGHT, bRedraw)
-      '         Case VT.LEFT
-      '            EgtSetView(VT.LEFT, bRedraw)
-      '         Case VT.ISO_SW
-      '            EgtSetView(VT.ISO_SW, bRedraw)
-      '         Case Else                                                ' VT.ISO_SW
-      '            EgtSetView(VT.ISO_SW, bRedraw)
-      '      End Select
-      '   Case BWType.WALL
-      Select Case nView
-         Case VT.TOP
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(0, -90, bRedraw)              ' equivalente a vista TOP
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(0, 90, bRedraw)               ' equivalente a vista TOP ruotata di 180 su Z
+      Select Case m_Type
+         Case BWType.BEAM
+            Select Case nView
+               Case VT.TOP
+                  EgtSetView(VT.TOP, bRedraw)
+               Case VT.FRONT
+                  EgtSetView(VT.FRONT, bRedraw)
+               Case VT.BACK
+                  EgtSetView(VT.BACK, bRedraw)
+               Case VT.RIGHT
+                  EgtSetView(VT.RIGHT, bRedraw)
+               Case VT.LEFT
+                  EgtSetView(VT.LEFT, bRedraw)
+               Case VT.ISO_SW
+                  EgtSetView(VT.ISO_SW, bRedraw)
+               Case Else                                                ' VT.ISO_SW
+                  EgtSetView(VT.ISO_SW, bRedraw)
             End Select
-         Case VT.FRONT
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(90, -90, bRedraw)              ' equivalente a vista FRONT
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(90, 90, bRedraw)               ' equivalente a vista FRONT ruotata di 180 su Z
-            End Select
-         Case VT.BACK
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(-90, -90, bRedraw)              ' equivalente a vista BACK
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(-90, 90, bRedraw)               ' equivalente a vista BACK ruotata di 180 su Z
-            End Select
-         Case VT.RIGHT
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(90, 0, bRedraw)                ' equivalente a vista RIGHT
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(-90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
-            End Select
-         Case VT.LEFT
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(-90, 0, bRedraw)              ' equivalente a vista LEFT
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(90, 0, bRedraw)               ' equivalente a vista LEFT ruotata di 180 su Z
-            End Select
-         Case VT.ISO_SW
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
-            End Select
-         Case Else                                                 ' VT.ISO_SW
-            Select Case m_nViewDir
-               Case VT.ISO_SW, VT.ISO_SE
-                  EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
-               Case VT.ISO_NW, VT.ISO_NE
-                  EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
+         Case BWType.WALL
+            Select Case nView
+               Case VT.TOP
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(0, -90, bRedraw)              ' equivalente a vista TOP
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(0, 90, bRedraw)               ' equivalente a vista TOP ruotata di 180 su Z
+                  End Select
+               Case VT.FRONT
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(90, -90, bRedraw)              ' equivalente a vista FRONT
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(90, 90, bRedraw)               ' equivalente a vista FRONT ruotata di 180 su Z
+                  End Select
+               Case VT.BACK
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(-90, -90, bRedraw)              ' equivalente a vista BACK
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(-90, 90, bRedraw)               ' equivalente a vista BACK ruotata di 180 su Z
+                  End Select
+               Case VT.RIGHT
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(90, 0, bRedraw)                ' equivalente a vista RIGHT
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(-90, 0, bRedraw)               ' equivalente a vista RIGHT ruotata di 180 su Z
+                  End Select
+               Case VT.LEFT
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(-90, 0, bRedraw)              ' equivalente a vista LEFT
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(90, 0, bRedraw)               ' equivalente a vista LEFT ruotata di 180 su Z
+                  End Select
+               Case VT.ISO_SW
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
+                  End Select
+               Case Else                                                ' VT.ISO_SW
+                  Select Case m_nViewDir
+                     Case VT.ISO_SW, VT.ISO_SE
+                        EgtSetGenericView(60, 225, bRedraw)              ' equivalente a vista ISO_SW
+                     Case VT.ISO_NW, VT.ISO_NE
+                        EgtSetGenericView(60, 45, bRedraw)               ' equivalente a vista ISO_SW ruotata di 180 su Z
+                  End Select
             End Select
       End Select
-      'End Select
-   End Sub
+   End Function
 
    Public Shared Sub UpdateMachParam(ViewDir As VT)
       m_nViewDir = ViewDir

EgtBEAMWALL.DataLayer/AdminContext.cs

@@ -1,21 +1,26 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using EgtBEAMWALL.DataLayer.Migrations;
-using MySql.Data.EntityFramework;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Data.Entity;
 using System.Data.Entity.Migrations;
+using MySql.Data.Entity;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using EgtBEAMWALL.DataLayer.Migrations;
 using System.ServiceProcess;
+using System.IO;
+using System.Data.Entity.Infrastructure;
 
 namespace EgtBEAMWALL.DataLayer
 {
     [DbConfigurationType(typeof(MySqlEFConfiguration))]
+    //[DbConfigurationType(typeof(aMySqlConfiguration))]
     public class AdminContext : DbContext
     {
         #region Public Constructors
 
         [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")]
-        public AdminContext() : base(DbConfig.ADMIN_CONNECTION_STRING)
+        public AdminContext() : base("DefaultConnection")
         {
         }
 
@@ -33,67 +38,5 @@ namespace EgtBEAMWALL.DataLayer
         public DbSet<UserPriv> UserList { get; set; }
 
         #endregion Public Properties
-
-        #region Public Methods
-
-        public bool SetUpDbConnectionAndDbConfig()
-        {
-            try
-            {
-                String serviceName = getDbServiceName();
-                if (serviceName.Equals(""))
-                {
-                    return false;
-                }
-
-                ServiceController service = new ServiceController(serviceName);
-                try
-                {
-                    TimeSpan timeout = TimeSpan.FromSeconds(DbConfig.DATABASE_PROCESS_TIMEOUT);
-                    service.WaitForStatus(ServiceControllerStatus.Running, timeout);
-                }
-                catch (Exception)
-                {
-                    return false;
-                }
-
-                //Database.SetInitializer<DatabaseContext>(null);
-                Database.SetInitializer(new MigrateDatabaseToLatestVersion<DatabaseContext, Configuration>());
-                var migrator = new DbMigrator(new Configuration());
-
-                if (migrator.GetPendingMigrations().Any())
-                {
-                    // Run migrations and seed.
-                    migrator.Update();
-                }
-            }
-            catch (Exception exc)
-            {
-                Console.WriteLine(exc.ToString());
-                return false;
-            }
-
-            return true;
-        }
-
-        #endregion Public Methods
-
-        #region Private Methods
-
-        private static string getDbServiceName()
-        {
-            ServiceController[] services = ServiceController.GetServices();
-            var service = services.FirstOrDefault(s => s.ServiceName == "MariaDB");
-            if (service != null)
-                return service.DisplayName;
-
-            service = services.FirstOrDefault(s => s.ServiceName == "MySQL");
-            if (service != null)
-                return service.DisplayName;
-
-            return "";
-        }
-
-        #endregion Private Methods
     }
 }

EgtBEAMWALL.DataLayer/App.config

@@ -1,49 +1,29 @@
-<?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" />
-   </configSections>
-   <entityFramework>
-      <!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
-      <defaultConnectionFactory type="System.Data.Entity.Infrastructure.SqlConnectionFactory, EntityFramework" />
-      <providers>
-         <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
-         </provider>
-      </providers>
-   </entityFramework>
-   <connectionStrings>
-      <add name="DefaultConnection" connectionString="server=localhost;port=3306;User Id=steamware;password=Egalware_24068!;Persist Security Info=True;database=EgtBwDb_000470;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-8.0.21.0" newVersion="8.0.21.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-3.21.9.0" newVersion="3.21.9.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.0" />
-         </dependentAssembly>
-         <dependentAssembly>
-            <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
-         </dependentAssembly>
-      </assemblyBinding>
-   </runtime>
-   <startup>
-      <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
-   </startup>
+    <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" />
+    </configSections>
+    <entityFramework>
+        <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>
+        <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" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
+
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
 </configuration>

EgtBEAMWALL.DataLayer/Controllers/BTLPartController.cs

@@ -1,17 +1,25 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+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
@@ -24,7 +32,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="corePart"></param>
         /// <param name="currProjDbId"></param>
         /// <returns></returns>
-        public BTLPartModel ConvertFromCore(Core.BTLPartM corePart, int currProjDbId)
+        public static BTLPartModel ConvertFromCore(Core.BTLPartM corePart, int currProjDbId)
         {
             BTLPartModel answ = new BTLPartModel();
             if (corePart != null)
@@ -97,19 +105,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 try
                 {
-                    using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                    {
-                        // Add to database
-                        localDbCtx.BTLPartList.AddRange(partData);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                    }
+                    // Add to database
+                    dbCtx.BTLPartList.AddRange(partData);
+                    // Commit changes
+                    dbCtx.SaveChanges();
+                    ResetController();
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on BTLPart.Create: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Create: {exc}");
                 }
                 return partData;
             }
@@ -143,19 +147,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 
             try
             {
-                using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                {
-                    // Add to database
-                    localDbCtx.BTLPartList.AddRange(partData);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                }
+                // Add to database
+                dbCtx.BTLPartList.AddRange(partData);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
             }
             catch (Exception exc)
             {
-                string errMessage = $"EXCEPTION on BTLPart.CreateBaseObj: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
+                Console.WriteLine($"EXCEPTION on CreateBaseObj: {exc}");
             }
 
             return partData;
@@ -169,26 +169,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int PartDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2del = localDbCtx
+            var item2del = dbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == PartDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // Add to database
-                    localDbCtx.BTLPartList.Remove(item2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on BTLPart.Delete: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+            try
+            {
+                // Add to database
+                dbCtx.BTLPartList.Remove(item2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Delete: {exc}");
             }
             return done;
         }
@@ -201,31 +197,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByProject(int ProjDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
+            var items2del = dbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.BTLPartList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on BTLPart.DeleteByProject: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+            try
+            {
+                // Add to database
+                dbCtx.BTLPartList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByProject: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -235,13 +229,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByDbId(int PartDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == PartDbId)
                 .SingleOrDefault();
-            }
         }
 
         /// <summary>
@@ -251,13 +242,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByPartId(int PartId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.PartId == PartId)
                 .SingleOrDefault();
-            }
         }
 
         /// <summary>
@@ -268,13 +256,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public BTLPartModel FindByPartIdProjDbId(int PartId, int ProjDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.PartId == PartId && x.ProjDbId == ProjDbId)
                 .FirstOrDefault();
-            }
         }
 
         /// <summary>
@@ -284,15 +269,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetByProjectAsc(int ProjDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId)
                 .OrderBy(x => x.BTLPartDbId)
                 .ToList();
-            }
         }
 
         /// <summary>
@@ -302,15 +284,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<BTLPartModel> GetByProjectDesc(int ProjDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .BTLPartList
                 .Where(x => x.ProjDbId == ProjDbId)
                 .OrderByDescending(x => x.BTLPartDbId)
                 .ToList();
-            }
         }
 
         /// <summary>
@@ -321,22 +300,17 @@ 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;
-            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;
+            // retrieve
+            return dbCtx
+                .BTLPartList
+                .Where(x => x.BTLPartDbId <= PartDbIdStart)
+                .OrderBy(x => x.BTLPartDbId)
+                .Take(numRecord)
+                .ToList();
         }
 
         /// <summary>
@@ -347,22 +321,26 @@ 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;
-            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;
+            // 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);
         }
 
         /// <summary>
@@ -373,44 +351,32 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(BTLPartModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2update = localDbCtx
+            var item2update = dbCtx
                 .BTLPartList
                 .Where(x => x.BTLPartDbId == updItem.BTLPartDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+            try
+            {
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                    //// update, vers 2
-                    //localDbCtx.BTLPartList.Remove(item2del);
-                    //localDbCtx.BTLPartList.Add(updItem);
+                //// update, vers 2
+                //dbCtx.BTLPartList.Remove(item2del);
+                //dbCtx.BTLPartList.Add(updItem);
 
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on BTLPart.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                done = true;
             }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Update: {exc}");
+            }
+            // reset...
+            ResetController();
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/DbController.cs

@@ -1,227 +1,97 @@
-using NLog;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
-    public class DbController : IDisposable
-    {
-        #region Public Fields
+   public class DbController : IDisposable
+   {
+      #region Private Fields
 
-        /// <summary>
-        /// Singleton gestione
-        /// </summary>
-        public static DbController man = new DbController();
+      private AdminContext adbCtx;
 
-        #endregion Public Fields
+      #endregion Private Fields
 
-        #region Public Constructors
+      #region Public Fields
 
-        public DbController()
-        {
-            // Initialize database context for ADMIN
-            adbCtx = new AdminContext(DbConfig.ADMIN_CONNECTION_STRING);
-            // DB standard utente
-            dbCtx = new AdminContext(DbConfig.CONNECTION_STRING);
-        }
+      /// <summary>
+      /// Singleton gestione
+      /// </summary>
+      public static DbController man = new DbController();
 
-        #endregion Public Constructors
+      #endregion Public Fields
 
-        #region Public Methods
+      #region Public Constructors
 
-        /// <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";
-            answ = doCheckCreate(username, pwd, answ, domain, false);
-            if (answ)
-            {
-                doGrantPriv(username, domain, "ALL ON *.*");
-            }
-            return answ;
-        }
+      public DbController()
+      {
+         // Initialize database context for ADMIN
+         adbCtx = new AdminContext(DbConfig.ADMIN_CONNECTION_STRING);
+      }
 
-        /// <summary>
-        /// Migrazione esplicita del DB da parte dell'admin controller
-        /// </summary>
-        /// <returns></returns>
-        public bool checkMigrateDb()
-        {
-            return adbCtx.SetUpDbConnectionAndDbConfig();
-        }
+      #endregion Public Constructors
 
-        public void Dispose()
-        {
-            // Clear database context
-            adbCtx.Dispose();
-        }
-
-        /// <summary>
-        /// Verifica esistenza views + utente relativo eventualmente ricreandole + fornendo accesso
-        /// all'utente ReadOnly Essetre
-        /// </summary>
-        /// <param name="dbName"></param>
-        /// <param name="username"></param>
-        /// <param name="pwd"></param>
-        /// <returns></returns>
-        public bool refreshViews(string dbName, string username = "S3_User", string pwd = "S3_P4ssw0rd")
-        {
-            bool answ = false;
-
-            // in primis refresh delle view
-            string sqlCommand = @"CREATE OR REPLACE VIEW v_expProdRaw AS
-                                    SELECT DbId, AlarmDtEvent AS DtEvent, VarValue,
-                                    SUBSTRING_INDEX(VarValue, ';', 1) AS Prod,
-                                    SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', 2), ';', -1) AS MachGroupId,
-                                    SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';', -2), ';', 1) AS PartId,
-                                    SUBSTRING_INDEX(VarValue, ';', -1) AS Status
-                                    FROM logmachine
-                                    WHERE ResultType = 1
-                                    AND VarAddress = 1;
-
-                                    CREATE OR REPLACE VIEW v_expProd AS
-                                    SELECT vp.DtEvent, vp.Prod, mgl.Name AS mgName, pl.PDN, vp.`Status`
-                                    FROM v_expProdRaw AS vp
-                                    INNER JOIN MachGroupList mgl ON vp.MachGroupId = mgl.Id
-                                    INNER JOIN partlist pl ON vp.PartId = pl.Id;";
-            dbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            Thread.Sleep(100);
-
-            // ora setup parametri x utente
-            string domain = "%";
-
-            // ora controllo utente con diritti
-            answ = doCheckCreate(username, pwd, answ, domain, true);
-            if (answ)
-            {
-                doGrantPriv(username, domain, "USAGE ON *.*");
-                doGrantPriv(username, domain, $"SELECT ON {dbName}.v_expProd");
-            }
-
-            return answ;
-        }
-
-        /// <summary>
-        /// ATTENZIONE!!!! Procedura di Reset del DB
-        /// </summary>
-        /// <returns></returns>
-        public bool ResetDb()
-        {
-            bool answ = false;
-
-            try
-            {
-                adbCtx
-                    .Database
-                    .SqlQuery<int>("CALL stp_ResetDb()");
-                answ = true;
-
-                adbCtx.SaveChanges();
-            }
-            catch (Exception exc)
-            {
-                string errMessage = $"EXCEPTION on DbController.ResetDb: {Environment.NewLine}{exc}";
-                Console.WriteLine(errMessage);
-                Log.Error(errMessage);
-            }
-
-            return answ;
-        }
-
-        #endregion Public Methods
-
-        #region Private Fields
-
-        private AdminContext adbCtx;
-        private AdminContext dbCtx;
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
-
-        #region Private Methods
-
-        /// <summary>
-        /// Procedura interna effettiva di check utente ed eventuale creazione + grant level
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="pwd"></param>
-        /// <param name="answ"></param>
-        /// <param name="domain"></param>
-        /// <param name="force">Force = esegue un drop prima...</param>
-        /// <returns></returns>
-        private bool doCheckCreate(string username, string pwd, bool answ, string domain, bool force)
-        {
-            // ricerca utente...
-            var numUser = adbCtx
-                .UserList
-                .Where(x => x.User == username)
-                .ToList()
-                .Count;
-            if (numUser > 0)
-            {
-                answ = true;
-            }
-            if (!answ)
-            {
-                // creo utente
-                string sqlCommand = $"DROP USER  IF EXISTS {username};";
-                if (force)
-                {
-                    adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                    Thread.Sleep(100);
-                }
-                sqlCommand = "FLUSH PRIVILEGES;";
-                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                Thread.Sleep(100);
-                sqlCommand = $"CREATE USER '{username}'@'{domain}' IDENTIFIED BY '{pwd}';";
-                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                Thread.Sleep(100);
-                sqlCommand = "FLUSH PRIVILEGES;";
-                adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-                Thread.Sleep(100);
-                answ = true;
-            }
-
-            return answ;
-        }
-
-        /// <summary>
-        /// Procedura interna effettiva di grant level x utente
-        /// </summary>
-        /// <param name="username"></param>
-        /// <param name="domain"></param>
-        /// <param name="grantLevel"></param>
-        /// <returns></returns>
-        private bool doGrantPriv(string username, string domain, string grantLevel)
-        {
-            bool answ = false;
+      #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);
-            Thread.Sleep(100);
-            sqlCommand = $"GRANT {grantLevel} TO '{username}'@'{domain}';";
+            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);
-            Thread.Sleep(100);
             sqlCommand = "FLUSH PRIVILEGES;";
             adbCtx.Database.ExecuteSqlCommand(System.Data.Entity.TransactionalBehavior.DoNotEnsureTransaction, sqlCommand);
-            Thread.Sleep(100);
+         }
+         return answ;
+      }
+
+      public void Dispose()
+      {
+         // Clear database context
+         adbCtx.Dispose();
+      }
+
+      public bool ResetDb()
+      {
+         bool answ = false;
+
+         try
+         {
+            adbCtx
+                .Database
+                .SqlQuery<int>("CALL stp_ResetDb()");
             answ = true;
 
-            return answ;
-        }
+            adbCtx.SaveChanges();
+         }
+         catch (Exception exc)
+         {
+            Console.WriteLine($"EXCEPTION on ResetDb: {exc}");
+         }
 
-        #endregion Private Methods
-    }
+         return answ;
+      }
+
+      #endregion Public Methods
+   }
 }

EgtBEAMWALL.DataLayer/Controllers/LogMachineController.cs

@@ -1,17 +1,25 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+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
@@ -23,7 +31,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="coreMacLog"></param>
         /// <returns></returns>
-        public LogMachineModel ConvertFromCore(Core.MachLog coreMacLog)
+        public static LogMachineModel ConvertFromCore(Core.MachLog coreMacLog)
         {
             LogMachineModel answ = new LogMachineModel();
             if (coreMacLog != null)
@@ -53,9 +61,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="dbLog"></param>
         /// <returns></returns>
-        public Core.MachLog ConvertToCore(LogMachineModel dbLog)
+        public static Core.MachLog ConvertToCore(LogMachineModel dbLog)
         {
-            var newRecord = Core.MachLog.CreateMachLog(dbLog.AlarmCode, dbLog.AlarmDatetime, dbLog.AlarmMessage, dbLog.AlarmOperation, dbLog.AlarmType, dbLog.CommandExecutedCorrectly, dbLog.CommandState, dbLog.CommandType, dbLog.Description, dbLog.NewOpState, dbLog.ResultType, dbLog.VarAddress, dbLog.VarValue);
+            var newRecord = Core.MachLog.CreateMacLog(dbLog.AlarmCode, dbLog.AlarmDatetime, dbLog.AlarmMessage, dbLog.AlarmOperation, dbLog.AlarmType, dbLog.CommandExecutedCorrectly, dbLog.CommandState, dbLog.CommandType, dbLog.Description, dbLog.NewOpState, dbLog.ResultType, dbLog.VarAddress, dbLog.VarValue);
             return newRecord;
         }
 
@@ -71,19 +79,18 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             {
                 try
                 {
-                    using (var locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+                    using (var currDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
                     {
                         // Add to database
-                        locallocalDbCtx.LogMachineList.Add(newLogMac);
+                        currDbCtx.LogMachineList.Add(newLogMac);
                         // Commit changes
-                        locallocalDbCtx.SaveChanges();
+                        currDbCtx.SaveChanges();
+                        ResetController();
                     }
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on LogMachine.Create: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Create LogMachine: {exc}");
                 }
             }
             catch
@@ -110,31 +117,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByKey(int LogDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var items2del = localDbCtx
+            var items2del = dbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == LogDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.LogMachineList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogMachine.DeleteByKey: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+            try
+            {
+                // Add to database
+                dbCtx.LogMachineList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -144,13 +149,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogMachineModel FindByDbId(int LogDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == LogDbId)
                 .SingleOrDefault();
-            }
         }
 
         /// <summary>
@@ -161,41 +163,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<LogMachineModel> GetAsc(DateTime dtStart, DateTime dtEnd)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .LogMachineList
                 .Where(x => x.AlarmDatetime >= dtStart && x.AlarmDatetime <= dtEnd)
                 .OrderBy(x => x.AlarmDatetime)
                 .ToList();
-            }
-        }
-
-        /// <summary>
-        /// Get paginated data from DB (ASC ordered) in "core format"
-        /// </summary>
-        /// <param name="dtStart"></param>
-        /// <param name="dtEnd"></param>
-        /// <returns></returns>
-        public List<Core.MachLog> GetCoreAsc(DateTime dtStart, DateTime dtEnd)
-        {
-            var rawData = GetAsc(dtStart, dtEnd);
-            var coreData = rawData.Select(x => ConvertToCore(x)).ToList();
-            return coreData;
-        }
-
-        /// <summary>
-        /// Get paginated data from DB (DESC ordered) in "core format"
-        /// </summary>
-        /// <param name="dtStart"></param>
-        /// <param name="dtEnd"></param>
-        /// <returns></returns>
-        public List<Core.MachLog> GetCoreDesc(DateTime dtStart, DateTime dtEnd)
-        {
-            var rawData = GetDesc(dtStart, dtEnd);
-            var coreData = rawData.Select(x => ConvertToCore(x)).ToList();
-            return coreData;
         }
 
         /// <summary>
@@ -206,15 +179,21 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<LogMachineModel> GetDesc(DateTime dtStart, DateTime dtEnd)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .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>
@@ -225,40 +204,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(LogMachineModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2update = localDbCtx
+            var item2update = dbCtx
                 .LogMachineList
                 .Where(x => x.LogDbId == updItem.LogDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+            try
+            {
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogMachine.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Update: {exc}");
             }
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/LogSupportController.cs

@@ -1,17 +1,25 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class LogSupportController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
         #region Public Constructors
 
         public LogSupportController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -33,28 +41,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Create(DateTime dtCreated, Core.LogSupportLevel level, Core.LogSupportTarget target, string message)
         {
             bool fatto = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            try
             {
                 try
                 {
-                    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)
-                    {
-                        string errMessage = $"EXCEPTION on LogSupport.Create: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    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}");
                 }
-                catch
-                { }
             }
+            catch
+            { }
             return fatto;
         }
 
@@ -66,31 +70,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByKey(int LogDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var items2del = dbCtx
+                .LogSupportList
+                .Where(x => x.LogDbId == LogDbId);
+            try
             {
-                var items2del = localDbCtx
-                                    .LogSupportList
-                                    .Where(x => x.LogDbId == LogDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.LogSupportList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogSupport.DeleteByKey: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Add to database
+                dbCtx.LogSupportList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByKey: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -100,13 +102,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public LogSupportModel FindByDbId(int LogDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .LogSupportList
-                        .Where(x => x.LogDbId == LogDbId)
-                        .SingleOrDefault();
-            }
+            return dbCtx
+                .LogSupportList
+                .Where(x => x.LogDbId == LogDbId)
+                .SingleOrDefault();
         }
 
         /// <summary>
@@ -118,14 +117,11 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public List<LogSupportModel> GetPaginatedAsc(DateTime dtStart, DateTime dtEnd)
         {
             // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .LogSupportList
                 .Where(x => x.DtEvent >= dtStart && x.DtEvent <= dtEnd)
                 .OrderBy(x => x.DtEvent)
                 .ToList();
-            }
         }
 
         /// <summary>
@@ -137,14 +133,20 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public List<LogSupportModel> GetPaginatedDesc(DateTime dtStart, DateTime dtEnd)
         {
             // retrieve
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
+            return dbCtx
                 .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>
@@ -155,40 +157,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(LogSupportModel updItem)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var item2update = localDbCtx
+            var item2update = dbCtx
                 .LogSupportList
                 .Where(x => x.LogDbId == updItem.LogDbId)
                 .SingleOrDefault();
-                try
-                {
-                    // update, vers 1...
-                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+            try
+            {
+                // update, vers 1...
+                dbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on LogSupport.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Update: {exc}");
             }
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/MachGroupController.cs

@@ -1,5 +1,4 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,10 +7,24 @@ 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();
+
+        #endregion Public Fields
+
         #region Public Constructors
 
         public MachGroupController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -24,7 +37,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="coreMachGroup"></param>
         /// <param name="currProdDbId"></param>
         /// <returns></returns>
-        public MachGroupModel ConvertFromCore(Core.MyMachGroupM coreMachGroup, int currProdDbId)
+        public static MachGroupModel ConvertFromCore(Core.MyMachGroupM coreMachGroup, int currProdDbId)
         {
             MachGroupModel answ = new MachGroupModel();
             if (coreMachGroup != null)
@@ -50,26 +63,21 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             return answ;
         }
 
-        /// <summary> Add MachGroup as rebuilt from NeedRedo (on top of order priority) <param
-        /// name="ProdId">Id del Prod</param> <param name="newMachGroup">Nuovo MachGroup da
-        /// associare</param> <returns></returns>
+        /// <summary>
+        /// Add MachGroup as rebuilt from NeedRedo (on top of order priority)
+        /// <param name="ProdId">Id del Prod</param>
+        /// <param name="newMachGroup">Nuovo MachGroup da associare</param>
+        /// <returns></returns>
         public ProdModel AddMachGroupRedo(int ProdId, Core.MyMachGroupM newMachGroup)
         {
-            ProdModel currData = new ProdModel();
+            // Recupero il PROD
+            ProdModel currData = ProdController.man.FindByProdId(ProdId);
             List<PartModel> PartList2Add = new List<PartModel>();
-            var myPartCtrl = new PartController();
-            var myStatusMapCtrl = new StatusMapController();
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                // Recupero il PROD nel contesto
-                currData = localDbCtx
-                                        .ProdList
-                                        .Where(x => x.ProdId == ProdId)
-                                        .SingleOrDefault();
                 try
                 {
-                    var locMGCtrl = new MachGroupController();
-                    var convCurrMG = locMGCtrl.ConvertFromCore(newMachGroup, currData.ProdDbId);
+                    var convCurrMG = MachGroupController.ConvertFromCore(newMachGroup, currData.ProdDbId);
 
                     convCurrMG.ProdIndex = 1;
 
@@ -78,25 +86,15 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     // Commit changes
                     localDbCtx.SaveChanges();
 
-                    int MachGroupDbId = FindByMachGroupId(ProdId, newMachGroup.Id).MachGroupDbId;
-                    // 2023.05.10 leggo elenco part in una sola volta
-
-                    var currMgPartList = localDbCtx
-                                      .PartList
-                                      .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == newMachGroup.Id)
-                                      .ToList();
+                    int MachGroupDbId = MachGroupController.man.FindByMachGroupId(ProdId, newMachGroup.Id).MachGroupDbId;
                     // verifico se uguali o meno...
                     foreach (var currPartM in newMachGroup.PartMList)
                     {
-                        //var currPart = localDbCtx
-                        //                  .PartList
-                        //                  .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == newMachGroup.Id && x.PartId == currPartM.nPartId)
-                        //                  .SingleOrDefault();
-                        var currPart = currMgPartList
-                                          .Where(x => x.PartId == currPartM.nPartId)
+                        var currPart = localDbCtx
+                                          .PartList
+                                          .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == newMachGroup.Id && x.PartId == currPartM.nPartId)
                                           .SingleOrDefault();
-
-                        var convCurrPartM = myPartCtrl.ConvertFromCore(currPartM, MachGroupDbId);
+                        var convCurrPartM = PartController.ConvertFromCore(currPartM, MachGroupDbId);
                         if (currPart != null)
                         {
                             // se non identico x equality limitata a ViewOptim...
@@ -132,13 +130,11 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     // Commit changes
                     localDbCtx.SaveChanges();
                     // aggiorno info sullo status
-                    myStatusMapCtrl.UpdateAction("", ProdId, newMachGroup.Id, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, "");
+                    StatusMapController.man.UpdateAction("", ProdId, newMachGroup.Id, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAdd, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateMachGroup: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateMachGroup: {exc}");
                 }
             }
             return currData;
@@ -165,9 +161,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.Create: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Create: {exc}");
                 }
             }
             return newMachGroup;
@@ -184,7 +178,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 // inizio eliminando le part
                 var parts2del = localDbCtx
                                 .PartList
@@ -205,25 +198,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                     localDbCtx.SaveChanges();
 
                     // registro modifica StatusMap
-                    myStatusMapCtrl.UpdateAction(MG2Del.SupervisorId, ProdId, MG2Del.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
+                    StatusMapController.man.UpdateAction(MG2Del.SupervisorId, ProdId, MG2Del.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
 
                     done = true;
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId}{Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId}{Environment.NewLine}{exc}");
                 }
 
                 // se fatto aggiorno info sullo status
-                myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
+                StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRem, "");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -233,13 +226,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public MachGroupModel FindByMachGroupDbId(int MachGroupDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                    .MachGroupList
-                    .Where(x => x.MachGroupDbId == MachGroupDbId)
-                    .SingleOrDefault();
-            }
+            return dbCtx
+                .MachGroupList
+                .Where(x => x.MachGroupDbId == MachGroupDbId)
+                .SingleOrDefault();
         }
 
         /// <summary>
@@ -249,6 +239,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public MachGroupModel FindByMachGroupId(int ProdId, int MachGroupId)
         {
+
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 return localDbCtx
@@ -267,34 +258,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             // verificare fattibilità in 1 solo passo
             int ProdDbId = 0;
-            List<MachGroupModel> answ = new List<MachGroupModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            try
             {
-                try
+                var currProd = dbCtx
+                    .ProdList
+                    .Where(x => x.ProdId == ProdId)
+                    .FirstOrDefault();
+                if (currProd != null)
                 {
-                    var currProd = localDbCtx
-                                    .ProdList
-                                    .Where(x => x.ProdId == ProdId)
-                                    .FirstOrDefault();
-                    if (currProd != null)
-                    {
-                        ProdDbId = currProd.ProdDbId;
-                    }
+                    ProdDbId = currProd.ProdDbId;
                 }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on MachGroup.GetByProdAsc: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
-                answ = localDbCtx
-                        .MachGroupList
-                        .Where(x => x.ProdDbId == ProdDbId)
-                        .OrderBy(x => x.ProdIndex)
-                        .ThenBy(x => x.MachGroupId)
-                        .ToList();
             }
-            return answ;
+            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();
         }
 
         /// <summary>
@@ -306,35 +290,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             // recupero
             int ProdDbId = 0;
-            List<MachGroupModel> answ = new List<MachGroupModel>();
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+
+            // verificare fattibilità in 1 solo passo
+            try
             {
-                // verificare fattibilità in 1 solo passo
-                try
+                var currProd = dbCtx
+                    .ProdList
+                    .Where(x => x.ProdId == ProdId)
+                    .FirstOrDefault();
+                if (currProd != null)
                 {
-                    var currProd = localDbCtx
-                                    .ProdList
-                                    .Where(x => x.ProdId == ProdId)
-                                    .FirstOrDefault();
-                    if (currProd != null)
-                    {
-                        ProdDbId = currProd.ProdDbId;
-                    }
+                    ProdDbId = currProd.ProdDbId;
                 }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on MachGroup.GetByProdDesc: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
-                answ = localDbCtx
-                        .MachGroupList
-                        .Where(x => x.ProdDbId == ProdDbId)
-                        .OrderByDescending(x => x.ProdIndex)
-                        .ThenByDescending(x => x.MachGroupId)
-                        .ToList();
             }
-            return answ;
+            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();
         }
 
         /// <summary>
@@ -345,15 +323,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public List<MachGroupModel> GetByProdSupervisor(int ProdId, string SupervisorId)
         {
-            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();
-            }
+            return dbCtx
+                .MachGroupList
+                .Where(x => x.Prod.ProdId == ProdId && x.SupervisorId == SupervisorId)
+                .OrderBy(x => x.ProdIndex)
+                .ThenBy(x => x.MachGroupId)
+                .ToList();
         }
 
         /// <summary>
@@ -381,9 +356,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateOrder: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateOrder: {exc}");
                 }
             }
 
@@ -401,7 +374,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
@@ -414,30 +386,31 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                         currRecord.State = Core.ItemState.ND;
                         currRecord.SupervisorId = "";
                         currRecord.ProdIndex = 0;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRemovedFromSupervisor, "");
+                    }
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupRemovedFromSupervisor, "");
 
-                        done = true;
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.RemoveFromSupervisor: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    done = true;
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.RemoveFromSupervisor: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on RemoveFromSupervisor: {exc}");
                 }
             }
             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>
@@ -450,35 +423,23 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = localDbCtx
+                    localDbCtx
                         .MachGroupList
                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.State = newState;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupNeedRedo, Value);
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.SetNeedRedo: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | newState {newState} | Value {Value}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                        .FirstOrDefault()
+                        .State = newState;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupNeedRedo, Value);
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.SetNeedRedo: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
                 }
             }
             return done;
@@ -494,36 +455,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
+                var item2update = localDbCtx
+                                    .MachGroupList
+                                    .Where(x => x.MachGroupDbId == updItem.MachGroupDbId)
+                                    .SingleOrDefault();
                 try
                 {
-                    var item2update = localDbCtx
-                                        .MachGroupList
-                                        .Where(x => x.MachGroupDbId == updItem.MachGroupDbId)
-                                        .SingleOrDefault();
-                    if (item2update != null)
-                    {
-                        // update, vers 1...
-                        localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", updItem.Prod.ProdId, updItem.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.Update: req item was not found | ProdDbId {updItem.ProdDbId} | MachGroupId {updItem.MachGroupId} | ProdIndex {updItem.ProdIndex}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", updItem.Prod.ProdId, updItem.MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.Update: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on Update: {exc}");
                 }
             }
             return done;
@@ -541,7 +490,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
@@ -549,27 +497,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                         .MachGroupList
                                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
                                         .FirstOrDefault();
-                    if (currRecord != null)
-                    {
-                        currRecord.DtEnd = DtEnd;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.UpdateEnd: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | DtEnd {DtEnd}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+
+                    currRecord.DtEnd = DtEnd;
+
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateEnd: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
                 }
             }
             return done;
@@ -590,29 +530,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 try
                 {
                     // aggiorno
-                    var item2upd = localDbCtx
+                    localDbCtx
                         .MachGroupList
                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.ProdIndex = newProdIndex;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.UpdateOrder: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | newProdIndex {newProdIndex}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                        .FirstOrDefault()
+                        .ProdIndex = newProdIndex;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateOrder: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateOrder: {exc}");
                 }
             }
             return done;
@@ -631,7 +561,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
@@ -639,27 +568,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                         .MachGroupList
                                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
                                         .FirstOrDefault();
-                    if (currRecord != null)
-                    {
-                        currRecord.DtStart = DtStart;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.UpdateStart: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | DtStart {DtStart}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+
+                    currRecord.DtStart = DtStart;
+
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateStart: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
                 }
             }
             return done;
@@ -678,7 +599,6 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
@@ -686,28 +606,19 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                                         .MachGroupList
                                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
                                         .FirstOrDefault();
-                    if (currRecord != null)
-                    {
-                        currRecord.DtStart = DtStart;
-                        currRecord.DtEnd = DtEnd;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.UpdateStartEnd: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | DtStart {DtStart} | DtEnd {DtEnd}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+
+                    currRecord.DtStart = DtStart;
+                    currRecord.DtEnd = DtEnd;
+
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateStartEnd: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStartEnd: {exc}");
                 }
             }
             return done;
@@ -724,93 +635,67 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = localDbCtx
+                    localDbCtx
                         .MachGroupList
                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.State = newState;
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.UpdateStatus: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | newState {newState}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                        .FirstOrDefault()
+                        .State = newState;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateStatus: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
                 }
             }
             return done;
         }
 
-        /// <summary> Set Supervisor & state for MachGroup </summary> <param name="ProdId"></param>
-        /// <param name="MachGroupId"></param> <param name="SupervisorId"></param> <returns></returns>
+        /// <summary>
+        /// Set Supervisor & state for MachGroup
+        /// </summary>
+        /// <param name="ProdId"></param>
+        /// <param name="MachGroupId"></param>
+        /// <param name="SupervisorId"></param>
+        /// <returns></returns>
         public bool UpdateSupervisor(int ProdId, int MachGroupId, string SupervisorId)
         {
             bool done = false;
             using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = localDbCtx
+                    var currRecord = localDbCtx
                                         .MachGroupList
                                         .Where(x => x.Prod.ProdId == ProdId && x.MachGroupId == MachGroupId)
                                         .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.SupervisorId = SupervisorId;
-                        item2upd.State = Core.ItemState.Assigned;
 
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
+                    currRecord.SupervisorId = SupervisorId;
+                    currRecord.State = Core.ItemState.Assigned;
 
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAssignedToSupervisor, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on MachGroup.UpdateSupervisor: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | SupervisorId {SupervisorId}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupAssignedToSupervisor, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on MachGroup.UpdateSupervisor: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateSupervisor: {exc}");
                 }
             }
             return done;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/PartController .cs

@@ -1,19 +1,105 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
-using System;
+using System;
+using System.Collections.Generic;
 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();
+
+        #endregion Public Fields
+
         #region Public Constructors
 
         public PartController()
-        { }
+        {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
+        }
 
         #endregion Public Constructors
 
+        #region Protected Methods
+
+        /// <summary>
+        /// Get BtlPartDBId by ProjId + PDN
+        /// </summary>
+        /// <param name="ProjId"></param>
+        /// <param name="PDN"></param>
+        /// <returns></returns>
+        protected int FindBtlPart(int ProjId, int PDN)
+        {
+            int BtlPartDbId = 0;
+
+#if false
+            var currProj = dbCtx
+                    .ProjList
+                    .Where(x => x.ProjId == ProjId)
+                    .FirstOrDefault();
+
+            if (currProj != null)
+            {
+                var btlPart = dbCtx
+                    .BTLPartList
+                    .Where(x => x.ProjDbId == currProj.ProjDbId && 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;
+        }
+
+        /// <summary>
+        /// Get BtlPartDBId by ProjId + BtlPartId
+        /// </summary>
+        /// <param name="ProjId"></param>
+        /// <param name="BtlPartId"></param>
+        /// <returns></returns>
+        protected int FindBtlPartByBPI(int ProjId, int BtlPartId)
+        {
+            int BtlPartDbId = 0;
+
+            var btlPart = dbCtx
+                .BTLPartList
+                .Where(x => x.Project.ProjId == ProjId && x.PartId == BtlPartId)
+                .SingleOrDefault();
+
+            if (btlPart != null)
+            {
+                BtlPartDbId = btlPart.BTLPartDbId;
+            }
+
+            return BtlPartDbId;
+        }
+
+        #endregion Protected Methods
+
         #region Public Methods
 
         /// <summary>
@@ -22,12 +108,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="corePart"></param>
         /// <param name="currMachGroupDbId"></param>
         /// <returns></returns>
-        public PartModel ConvertFromCore(Core.PartM corePart, int currMachGroupDbId)
+        public static PartModel ConvertFromCore(Core.PartM corePart, int currMachGroupDbId)
         {
             PartModel answ = new PartModel();
             if (corePart != null)
             {
-                int BTLPartId = FindBtlPartByBPI(corePart.nProjId, corePart.nBTLPartId);
+                int BTLPartId = man.FindBtlPartByBPI(corePart.nProjId, corePart.nBTLPartId);
                 answ = new PartModel()
                 {
                     PartId = corePart.nPartId,
@@ -65,39 +151,24 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int ProdId, int MachGroupId, int PartId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var item2del = dbCtx
+                .PartList
+                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
+                .SingleOrDefault();
+            try
             {
-                var myStatusMapCtrl = new StatusMapController();
-                var item2del = localDbCtx
-                                .PartList
-                                .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                                .SingleOrDefault();
-
-                if (item2del != null)
-                {
-                    try
-                    {
-                        // Remove from database
-                        localDbCtx.PartList.Remove(item2del);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, MachGroupId, Core.StatusMapItemType.MachGroup, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Part.Delete: ProdId: {ProdId} | MachGroupId: {MachGroupId} | PartId: {PartId}{Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Part.Delete (01): req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // 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}");
             }
             return done;
         }
@@ -110,36 +181,22 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Delete(int PartDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var item2del = dbCtx
+                .PartList
+                .Where(x => x.PartDbId == PartDbId)
+                .SingleOrDefault();
+            try
             {
-                var item2del = localDbCtx
-                                .PartList
-                                .Where(x => x.PartDbId == PartDbId)
-                                .SingleOrDefault();
-
-                if (item2del != null)
-                {
-                    try
-                    {
-                        // Add to database
-                        localDbCtx.PartList.Remove(item2del);
-                        // Commit changes
-                        localDbCtx.SaveChanges();
-                        done = true;
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Part.Delete: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Part.Delete (02): req item was not found | PartDbId {PartDbId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Add to database
+                dbCtx.PartList.Remove(item2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on Delete: {exc}");
             }
             return done;
         }
@@ -152,31 +209,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool DeleteByMachGroup(int MachGroupDbId)
         {
             bool done = false;
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            var items2del = dbCtx
+                .PartList
+                .Where(x => x.MachGroupDbId == MachGroupDbId);
+            try
             {
-                var items2del = localDbCtx
-                                .PartList
-                                .Where(x => x.MachGroupDbId == MachGroupDbId);
-                try
-                {
-                    // Add to database
-                    localDbCtx.PartList.RemoveRange(items2del);
-                    // Commit changes
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
-                catch (Exception exc)
-                {
-                    string errMessage = $"EXCEPTION on Part.DeleteByMachGroup: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                // Add to database
+                dbCtx.PartList.RemoveRange(items2del);
+                // Commit changes
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
+            }
+            catch (Exception exc)
+            {
+                Console.WriteLine($"EXCEPTION on DeleteByMachGroup: {exc}");
             }
             return done;
         }
 
         public void Dispose()
         {
+            // Clear database context
+            dbCtx.Dispose();
         }
 
         /// <summary>
@@ -186,13 +241,10 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         public PartModel FindByDbId(int PartDbId)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                return localDbCtx
-                        .PartList
-                        .Where(x => x.PartDbId == PartDbId)
-                        .SingleOrDefault();
-            }
+            return dbCtx
+                .PartList
+                .Where(x => x.PartDbId == PartDbId)
+                .SingleOrDefault();
         }
 
         /// <summary>
@@ -203,9 +255,9 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public PartModel FindByPartId(int ProdId, int PartId)
         {
             PartModel answ = null;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                answ = locallocalDbCtx
+                answ = localDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.PartId == PartId)
                         .FirstOrDefault();
@@ -213,6 +265,15 @@ 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>
@@ -221,43 +282,29 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool Update(PartModel updItem)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
-                var item2upd = locallocalDbCtx
+                var item2update = localDbCtx
                                     .PartList
                                     .Where(x => x.PartDbId == updItem.PartDbId)
                                     .SingleOrDefault();
-                if (item2upd != null)
+                try
                 {
-                    try
-                    {
-                        // update, vers 1...
-                        locallocalDbCtx.Entry(item2upd).CurrentValues.SetValues(updItem);
+                    // update, vers 1...
+                    localDbCtx.Entry(item2update).CurrentValues.SetValues(updItem);
 
-                        //// update, vers 2
-                        //localDbCtx.PartList.Remove(item2del);
-                        //localDbCtx.PartList.Add(updItem);
+                    //// update, vers 2
+                    //dbCtx.PartList.Remove(item2del);
+                    //dbCtx.PartList.Add(updItem);
 
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on Part.Update: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                }
-                else
-                {
-                    string errMessage = $"ERROR on Part.Update (01): req item was not found | PartId {updItem.PartId} | PartDbId {updItem.PartDbId} | BTLPartDbId {updItem.BTLPartDbId}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", updItem.MachGroup.Prod.ProdId, updItem.PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
                 }
+                catch
+                { }
             }
             return done;
         }
@@ -271,38 +318,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateEnd(int ProdId, int MachGroupId, int PartId, DateTime DtEnd)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locallocalDbCtx
+                    localDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                        .FirstOrDefault();
-
-                    if (item2upd != null)
-                    {
-                        item2upd.DtEnd = DtEnd;
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Part.UpdateEnd: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId} | DtEnd {DtEnd}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                        .FirstOrDefault()
+                        .DtEnd = DtEnd;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtEnd == DateTime.MinValue ? Core.StatusMapOpType.ResetPartEnd : Core.StatusMapOpType.PartEnd, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on Part.UpdateEnd: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
                 }
             }
             return done;
@@ -317,37 +351,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStart(int ProdId, int MachGroupId, int PartId, DateTime DtStart)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locallocalDbCtx
+                    localDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.DtStart = DtStart;
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Part.UpdateStart: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId} | DtStart {DtStart}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                        .FirstOrDefault()
+                        .DtStart = DtStart;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, DtStart == DateTime.MinValue ? Core.StatusMapOpType.ResetPartStart : Core.StatusMapOpType.PartStart, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on Part.UpdateStart: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
                 }
             }
 
@@ -363,37 +385,25 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         public bool UpdateStatus(int ProdId, int MachGroupId, int PartId, Core.ItemState newState)
         {
             bool done = false;
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
-                var myStatusMapCtrl = new StatusMapController();
                 try
                 {
                     // aggiorno
-                    var item2upd = locallocalDbCtx
+                    localDbCtx
                         .PartList
                         .Where(x => x.MachGroup.Prod.ProdId == ProdId && x.MachGroup.MachGroupId == MachGroupId && x.PartId == PartId)
-                        .FirstOrDefault();
-                    if (item2upd != null)
-                    {
-                        item2upd.State = newState;
-                        // Commit changes
-                        locallocalDbCtx.SaveChanges();
-                        done = true;
-                        // aggiorno info sullo status
-                        myStatusMapCtrl.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, newState == Core.ItemState.Scrapped ? Core.StatusMapOpType.SetPartScrapped : Core.StatusMapOpType.MachGroupMod, "");
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Part.UpdateStart: req item was not found | ProdId {ProdId} | MachGroupId {MachGroupId} | PartId {PartId} | newState {newState}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                        .FirstOrDefault()
+                        .State = newState;
+                    // Commit changes
+                    localDbCtx.SaveChanges();
+                    done = true;
+                    // aggiorno info sullo status
+                    StatusMapController.man.UpdateAction("", ProdId, PartId, Core.StatusMapItemType.Part, Core.StatusMapOpType.MachGroupMod, "");
                 }
                 catch (Exception exc)
                 {
-                    string errMessage = $"EXCEPTION on Part.UpdateStatus: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
+                    Console.WriteLine($"EXCEPTION on UpdateStatus: {exc}");
                 }
             }
 
@@ -401,68 +411,5 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         #endregion Public Methods
-
-        #region Protected Methods
-
-        /// <summary>
-        /// Get BtlPartDBId by ProjId + PDN
-        /// </summary>
-        /// <param name="ProjId"></param>
-        /// <param name="PDN"></param>
-        /// <returns></returns>
-        protected int FindBtlPart(int ProjId, int PDN)
-        {
-            int BtlPartDbId = 0;
-
-            using (DatabaseContext locallocalDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                var btlPart = locallocalDbCtx
-                                .BTLPartList
-                                .Where(x => x.Project.ProjId == ProjId && x.PDN == PDN)
-                                .SingleOrDefault();
-
-                if (btlPart != null)
-                {
-                    BtlPartDbId = btlPart.BTLPartDbId;
-                }
-            }
-            return BtlPartDbId;
-        }
-
-        /// <summary>
-        /// Get BtlPartDBId by ProjId + BtlPartId
-        /// </summary>
-        /// <param name="ProjId"></param>
-        /// <param name="BtlPartId"></param>
-        /// <returns></returns>
-        protected int FindBtlPartByBPI(int ProjId, int BtlPartId)
-        {
-            int BtlPartDbId = 0;
-
-            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;
-                }
-            }
-            return BtlPartDbId;
-        }
-
-        #endregion Protected Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/Controllers/StatusMapController.cs

@@ -1,5 +1,4 @@
 using EgtBEAMWALL.DataLayer.DatabaseModels;
-using NLog;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -8,10 +7,27 @@ namespace EgtBEAMWALL.DataLayer.Controllers
 {
     public class StatusMapController : IDisposable
     {
+        #region Private Fields
+
+        private DatabaseContext dbCtx;
+
+        #endregion Private Fields
+
+        #region Public Fields
+
+        /// <summary>
+        /// Oggetto statico per gestione chiamate da altre classi
+        /// </summary>
+        public static StatusMapController man = new StatusMapController();
+
+        #endregion Public Fields
+
         #region Public Constructors
 
         public StatusMapController()
         {
+            // Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         #endregion Public Constructors
@@ -21,7 +37,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <summary>
         /// Elimina i dati di una sessione (SupervisorId) precedente
         /// </summary>
-        /// <param name="Session">Se vuoto --&gt; tutti</param>
+        /// <param name="Session">Se vuoto --> tutti</param>
         /// <returns></returns>
         public bool DeleteSession(string Session)
         {
@@ -29,42 +45,41 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             DateTime adesso = DateTime.Now;
             List<StatusMapModel> SM2Del = new List<StatusMapModel>();
 
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            // svuoto la tab mappa precedente (da rivalutare in futuro)
+            if (string.IsNullOrEmpty(Session))
             {
-                // 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)
-                {
-                    string errMessage = $"EXCEPTION on StatusMap.DeleteSession: {Environment.NewLine}{exc}";
-                    Console.WriteLine(errMessage);
-                    Log.Error(errMessage);
-                }
+                SM2Del = dbCtx
+                     .StatusMapList
+                     .ToList();
             }
+            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>
@@ -72,51 +87,44 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// </summary>
         /// <param name="Session"></param>
         /// <returns></returns>
-        public List<StatusMapModel> GetBySession(string Session)
+        public List<StatusMapModel> GetBySession(string Session = "")
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            // retrieve
+            return dbCtx
                 .StatusMapList
                 .Where(x => x.Session == Session)
                 .OrderByDescending(x => x.Index)
                 .ToList();
-            }
         }
 
         /// <summary>
-        /// Get data for session where Index &gt; minIndex ordered by index DESC
+        /// 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(string Session, int minIndex = 0)
+        public List<StatusMapModel> GetFrom(int minIndex = 0)
         {
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-            {
-                // retrieve
-                return localDbCtx
+            ResetController();
+            // retrieve
+            return dbCtx
                 .StatusMapList
-                .Where(x => x.Session == Session && x.Index >= minIndex)
+                .Where(x => x.Index >= minIndex)
                 .OrderBy(x => x.Index)
                 .ToList();
-            }
         }
 
         /// <summary>
-        /// Get PROD (all)
+        /// Get PROD data for session
         /// </summary>
-        /// <param name="Session"></param>
         /// <returns></returns>
         public List<StatusMapModel> GetProd()
         {
             List<StatusMapModel> answ = new List<StatusMapModel>();
             // Initialize database context
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            using (DatabaseContext myDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
             {
                 // retrieve
-                answ = localDbCtx
+                answ = myDbCtx
                     .StatusMapList
                     .Where(x => x.ItemType == Core.StatusMapItemType.Prod)
                     .OrderByDescending(x => x.Index)
@@ -126,24 +134,12 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         }
 
         /// <summary>
-        /// Get PROD for session
+        /// Reinizializzaizone del controller
         /// </summary>
-        /// <param name="Session"></param>
-        /// <returns></returns>
-        public List<StatusMapModel> GetProd(string Session)
+        public void ResetController()
         {
-            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;
+            // Re-Initialize database context
+            dbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
         /// <summary>
@@ -167,56 +163,23 @@ 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 = "" };
-                // Initialize database context
-                using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
-                {
-                    // per prima cosa indico come prodotto il PROD...
-                    var currProdData = localDbCtx
-                              .ProdList
-                              .Where(x => x.ProdId == ProdId)
-                              .SingleOrDefault();
-                    if (currProdData != null)
-                    {
-                        try
-                        {
-                            // aggiorno valore descrizione
-                            currProdData.IsProduced = true;
-                            // Commit changes
-                            localDbCtx.SaveChanges();
-                            done = true;
-                        }
-                        catch (Exception exc)
-                        {
-                            string errMessage = $"EXCEPTION on Prod.UpdateProduced:{Environment.NewLine}{exc}";
-                            Console.WriteLine(errMessage);
-                            Log.Error(errMessage);
-                        }
-                    }
-                    else
-                    {
-                        string errMessage = $"ERROR on Prod.UpdateProduced: req item was not found | ProdId {ProdId} | IsProduced: true";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
-                    // resetto done
-                    done = false;
-                    // aggiungo in StatusMap
-                    localDbCtx.StatusMapList.Add(prodSMRecord);
+                // aggiungo
+                dbCtx.StatusMapList.Add(prodSMRecord);
 
-                    // recupero MachGroup da PROD
-                    var MGList = localDbCtx
-                                    .MachGroupList
-                                    .Where(x => x.Prod.ProdId == ProdId)
-                                    .ToList();
+                // recupero MachGroup da PROD
+                var MGList = dbCtx
+                    .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
-                    localDbCtx.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
+                dbCtx.StatusMapList.AddRange(mgSMRecords);
 
-                    // salvo
-                    localDbCtx.SaveChanges();
-                    done = true;
-                }
+                // salvo
+                dbCtx.SaveChanges();
+                ResetController();
+                done = true;
             }
             return done;
         }
@@ -231,70 +194,56 @@ 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();
-            // Initialize database context
-            using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
+            // se è un prod --> vado x ID
+            if (Session == "")
             {
-                // se è un prod --> vado x ID
-                if (Session == "")
+                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
                 {
-                    prodData = localDbCtx
-                        .StatusMapList
-                        .Where(x => x.ItemType == Core.StatusMapItemType.Prod && x.ItemId == ProdId)
-                        .FirstOrDefault();
-                }
-                else
-                {
-                    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))
                     {
-                        // 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);
+                        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
-                        localDbCtx.SaveChanges();
-                        fatto = true;
-                    }
-                    catch (Exception exc)
-                    {
-                        string errMessage = $"EXCEPTION on StatusMap.UpdateAction: {Environment.NewLine}{exc}";
-                        Console.WriteLine(errMessage);
-                        Log.Error(errMessage);
-                    }
+                    // Commit changes
+                    dbCtx.SaveChanges();
+                    ResetController();
+                    fatto = true;
+                }
+                catch (Exception exc)
+                {
+                    Console.WriteLine($"EXCEPTION on UpdateAction: {exc}");
                 }
             }
             return fatto;
         }
 
         #endregion Public Methods
-
-        #region Private Fields
-
-        /// <summary>
-        /// Istanza logger
-        /// </summary>
-        private NLog.Logger Log = LogManager.GetCurrentClassLogger();
-
-        #endregion Private Fields
     }
 }

EgtBEAMWALL.DataLayer/DatabaseContext.cs

@@ -1,9 +1,15 @@
-using EgtBEAMWALL.DataLayer.DatabaseModels;
-using MySql.Data.EntityFramework;
-using System;
+using System;
+using System.Collections.Generic;
 using System.Data.Entity;
-using System.Data.Entity.Infrastructure;
+using System.Data.Entity.Migrations;
+using MySql.Data.Entity;
+using System.Linq;
+using System.Text;
+using EgtBEAMWALL.DataLayer.DatabaseModels;
+using EgtBEAMWALL.DataLayer.Migrations;
+using System.ServiceProcess;
 using System.IO;
+using System.Data.Entity.Infrastructure;
 
 namespace EgtBEAMWALL.DataLayer
 {
@@ -27,13 +33,15 @@ namespace EgtBEAMWALL.DataLayer
         #region Public Constructors
 
         [Obsolete("This constructor should never be used directly, and is only needed to generate entityframework stuff. Connection string can be adapted as pleased.")]
-        public DatabaseContext() : base(DbConfig.CONNECTION_STRING)
+        public DatabaseContext() : base("DefaultConnection")
         {
         }
 
         public DatabaseContext(string connectionString) : base(connectionString)
         {
-            Database.CreateIfNotExists();
+            //Database.CreateIfNotExists();
+            ////Database.SetInitializer(new MigrateDatabaseToLatestVersion<StratonLocalizerDatabase, Migrations.Configuration>());
+            //Database.Initialize(false);
         }
 
         #endregion Public Constructors
@@ -82,6 +90,24 @@ namespace EgtBEAMWALL.DataLayer
 
         #endregion Public Properties
 
+        #region Private Methods
+
+        private static string getDbServiceName()
+        {
+            ServiceController[] services = ServiceController.GetServices();
+            var service = services.FirstOrDefault(s => s.ServiceName == "MariaDB");
+            if (service != null)
+                return service.DisplayName;
+
+            service = services.FirstOrDefault(s => s.ServiceName == "MySQL");
+            if (service != null)
+                return service.DisplayName;
+
+            return "";
+        }
+
+        #endregion Private Methods
+
         #region Public Methods
 
         public static DatabaseContext Create()
@@ -89,6 +115,44 @@ namespace EgtBEAMWALL.DataLayer
             return new DatabaseContext(DbConfig.CONNECTION_STRING);
         }
 
+        public static bool SetUpDbConnectionAndDbConfig()
+        {
+            try
+            {
+                String serviceName = getDbServiceName();
+                if (serviceName.Equals(""))
+                {
+                    return false;
+                }
+
+                ServiceController service = new ServiceController(serviceName);
+                try
+                {
+                    TimeSpan timeout = TimeSpan.FromSeconds(DbConfig.DATABASE_PROCESS_TIMEOUT);
+                    service.WaitForStatus(ServiceControllerStatus.Running, timeout);
+                }
+                catch (Exception ex)
+                {
+                    return false;
+                }
+
+                System.Data.Entity.Database.SetInitializer<DatabaseContext>(null);
+                var migrator = new DbMigrator(new Configuration());
+
+                if (migrator.GetPendingMigrations().Any())
+                {
+                    // Run migrations and seed.
+                    migrator.Update();
+                }
+            }
+            catch (Exception ex)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         #endregion Public Methods
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/LogMachineModel.cs

@@ -98,5 +98,12 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
 
         #endregion Public Properties
 
+#if false
+        /// <summary>
+        /// MachineId del BTL
+        /// </summary>
+        [Column("MachineId")]
+        public string MachineId { get; set; } = "";
+#endif
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/PartModel.cs

@@ -97,8 +97,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
             if (!(obj is PartModel item))
                 return false;
 
-            if (BTLPartDbId != item.BTLPartDbId)
-                return false;
             if (H != item.H)
                 return false;
             if (L != item.L)

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -8,9 +8,6 @@ using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
     /// <summary>
     /// Tabella deiu raggruppamenti PROJ in forma di PROD
     /// </summary>
@@ -19,24 +16,12 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        public ProdModel()
-        {
-            ProjListNav = new HashSet<ProjModel>();
-        }
-
-        /// <summary>
-        /// Chiave univoca DB
-        /// </summary>
-        [Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ProdDbId { get; set; }
-
         [Column("Description")]
         public string Description { get; set; } = "";
 
         /// <summary>
         /// Data Creazione
         /// </summary>
-        [Index]
         [Column("DtCreated")]
         public DateTime DtCreated { get; set; }
 
@@ -47,23 +32,11 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         public bool IsNew { get; set; } = true;
 
         /// <summary>
-        /// Stato locked, quando aperto da un dispositivo in rete
+        /// Stato locked (quando aperto da un dispositivo in rete)
         /// </summary>
         [Column("Lock")]
         public bool Locked { get; set; } = false;
 
-        /// <summary>
-        ///  Chiave univoca per EgtBM
-        /// </summary>
-        [Column("Id")]
-        [Index]
-        public int ProdId { get; set; }
-
-        /// <summary>
-        /// Tipologia del progetto (Travi, Pareti, ...)
-        /// </summary>
-        public BWType PType { get; set; } = BWType.NULL;
-
         /// <summary>
         /// Macchina
         /// </summary>
@@ -71,42 +44,21 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         public string Machine { get; set; } = "";
 
         /// <summary>
-        /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
+        /// Chiave univoca DB
         /// </summary>
-        [Column("LockedBy")]
-        public string LockedBy { get; set; } = "";
+        [Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int ProdDbId { get; set; }
 
         /// <summary>
-        /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un dispositivo in rete
+        ///  chiave univoca per EgtBM
         /// </summary>
-        [Column("LockDate")]
-        public DateTime LockDate { get; set; } = DateTime.MinValue;
+        [Column("Id")]
+        public int ProdId { get; set; }
 
         /// <summary>
-        /// Record attivo (se false == cancellazione logica)
+        /// Tipologia del progetto (Travi, Pareti, ...)
         /// </summary>
-        [Index]
-        [Column("IsActive")]
-        public bool IsActive { get; set; } = true;
-
-        /// <summary>
-        /// Stato Prodotto = inviato ALMENO UNA VOLTA al supervisore --> NON eliminabile se non in modo logico
-        /// </summary>
-        [Index]
-        [Column("IsProduced")]
-        public bool IsProduced { get; set; } = false;
-
-        /// <summary>
-        /// Stato Archiviato = NON visualizzabile normalmente, già prodotto
-        /// </summary>
-        [Index]
-        [Column("IsArchived")]
-        public bool IsArchived { get; set; } = false;
-
-        /// <summary>
-        /// Collezione oggetti Proj associati (almeno 1 by design)
-        /// </summary>
-        public virtual ICollection<ProjModel> ProjListNav { get; set; }
+        public BWType PType { get; set; } = BWType.NULL;
 
         #endregion Public Properties
     }

EgtBEAMWALL.DataLayer/DatabaseModels/ProjModel.cs

@@ -1,13 +1,13 @@
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
-    // <Auto-Generated>
-    // This is here so CodeMaid doesn't reorganize this document
-    // </Auto-Generated>
     /// <summary>
     /// Tabella dei PROJ caricati dal BTL
     /// </summary>
@@ -16,9 +16,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
     {
         #region Public Properties
 
-        [Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-        public int ProjDbId { get; set; }
-
         [Column("BTLFileName")]
         public string BTLFileName { get; set; } = "";
 
@@ -26,20 +23,17 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// Data Creazione
         /// </summary>
         [Column("DtCreated")]
-        [Index]
         public DateTime DtCreated { get; set; }
 
         /// <summary>
         /// Data Esportazione
         /// </summary>
         [Column("DtExported")]
-        [Index]
         public DateTime DtExported { get; set; }
 
         /// <summary>
         /// Stato NEW = creato ma NON salvato
         /// </summary>
-        [Index]
         [Column("IsNew")]
         public bool IsNew { get; set; } = true;
 
@@ -55,14 +49,22 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("Lock")]
         public bool Locked { get; set; } = false;
 
+        /// <summary>
+        /// Macchina
+        /// </summary>
+        [Column("Machine")]
+        public string Machine { get; set; } = "";
+
+        [ForeignKey("ProdDbId")]
+        public virtual ProdModel Prod { get; set; }
+
         [Column("ProdDbId")]
         public int? ProdDbId { get; set; }
 
-        /// <summary>
-        /// ID da modello ext
-        /// </summary>
+        [Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        public int ProjDbId { get; set; }
+
         [Column("Id")]
-        [Index]
         public int ProjId { get; set; }
 
         /// <summary>
@@ -70,47 +72,6 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         /// </summary>
         public BWType PType { get; set; } = BWType.NULL;
 
-        /// <summary>
-        /// Macchina
-        /// </summary>
-        [Column("Machine")]
-        public string Machine { get; set; } = "";
-
-        /// <summary>
-        /// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
-        /// </summary>
-        [Column("LockedBy")]
-        public string LockedBy { get; set; } = "";
-
-        /// <summary>
-        /// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un
-        /// dispositivo in rete
-        /// </summary>
-        [Column("LockDate")]
-        public DateTime LockDate { get; set; } = DateTime.MinValue;
-
-        /// <summary>
-        /// Record attivo (se false == cancellazione logica)
-        /// </summary>
-        [Index]
-        [Column("IsActive")]
-        public bool IsActive { get; set; } = true;
-        /// <summary>
-        /// Descrizione progetto (copiata da BTLFileName inizialmente)
-        /// </summary>
-        [Column("ProjDescription")]
-        public string ProjDescription { get; set; } = "";
-
-        /// <summary>
-        /// Stato Archiviato = NON visualizzabile normalmente, già prodotto
-        /// </summary>
-        [Index]
-        [Column("IsArchived")]
-        public bool IsArchived { get; set; } = false;
-
-        [ForeignKey("ProdDbId")]
-        public virtual ProdModel Prod { get; set; }
-
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/DbConfig.cs

@@ -1,10 +1,7 @@
-using Ionic.Zip;
-using System;
-using System.Diagnostics;
-using System.IO;
+using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Reflection;
-using System.Xml.Linq;
+using System.Text;
 
 namespace EgtBEAMWALL.DataLayer
 {
@@ -21,7 +18,6 @@ namespace EgtBEAMWALL.DataLayer
         public static string DATABASE_SERV = "127.0.0.1";
 
         public static string DATABASE_USER = "EgtUser";
-        public static string ZIP_PWD = "viacremasca-viacremasca-viacremasca-viacremasca";
 
         #endregion Public Fields
 
@@ -33,7 +29,7 @@ namespace EgtBEAMWALL.DataLayer
         public static string ADMIN_CONNECTION_STRING { get; set; } = "";
 
         /// <summary>
-        /// DB Connection string, per effettuare migration riportare valore connessione admin cablato (server=localhost;port=3306;database=EgtBwDb_000102;)
+        /// DB Connection string
         /// </summary>
         public static string CONNECTION_STRING { get; set; } = "";
 
@@ -41,237 +37,23 @@ namespace EgtBEAMWALL.DataLayer
 
         #region Public Methods
 
-        /// <summary>
-        /// Effettua migrazione esplicita del DB
-        /// </summary>
-        /// <returns></returns>
-        public static bool CheckMigrateDb()
+        public static void InitDb(string server, string nKey, string sKey)
         {
-            // esecuzione script di migrations del DB
-            return Controllers.DbController.man.checkMigrateDb();
-        }
-
-        /// <summary>
-        /// Effettua verifica presenza utente
-        /// </summary>
-        /// <param name="nKey"></param>
-        /// <param name="sKey"></param>
-        /// <param name="isNetwork"></param>
-        /// <returns></returns>
-        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);
-        }
-
-        /// <summary>
-        /// Effettua verifica presenza view prod + relativo utente
-        /// </summary>
-        /// <param name="nKey"></param>
-        /// <param name="sKey"></param>
-        /// <param name="isNetwork"></param>
-        /// <returns></returns>
-        public static bool CheckViews(string nKey, string sKey)
-        {
-            // esecuzione script di install locale
-            return Controllers.DbController.man.refreshViews(DATABASE_NAME);
-        }
-
-        /// <summary>
-        /// Effettua DUMP del DB dato utente admin + percorso salvataggio (zip cifrato)
-        /// </summary>
-        /// <param name="zipFilePath">Percorso di salvataggio del dump (*.zip)</param>
-        /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
-        /// <param name="mysqlDumpPath">Nome o Percorso Eseguibile mysqldump (opzionale)</param>
-        /// <param name="exportOpt">Opzioni in fase di export (default: --skip-extended-insert)</param>
-        /// <returns></returns>
-        public static bool DataBaseDumpToFile(string zipFilePath, string dbName = "", string mysqlDumpPath = "mysqldump", string exportOpt = "--skip-extended-insert")
-        {
-            bool fatto = false;
-            // fix path eseguibile
-            if (string.IsNullOrEmpty(mysqlDumpPath))
-            {
-                mysqlDumpPath = "mysqldump";
-            }
-            if (string.IsNullOrEmpty(dbName))
-            {
-                dbName = DATABASE_NAME;
-            }
-            // verifica zip finale
-            if (!zipFilePath.EndsWith(".zip"))
-            {
-                zipFilePath = $"{zipFilePath}.zip";
-            }
-            // creo nome file per export sql (temporaneo)
-            string tempSqlPath = zipFilePath.Replace(".zip", ".sql");
-            // esecuzione script x dump del DB
-            string dirPath = Path.GetDirectoryName(zipFilePath);
-            if (!Directory.Exists(dirPath))
-            {
-                Directory.CreateDirectory(dirPath);
-            }
-            // se ci fosse già file elimino (sql/zip)
-            if (File.Exists(tempSqlPath))
-            {
-                File.Delete(tempSqlPath);
-            }
-            if (File.Exists(zipFilePath))
-            {
-                File.Delete(zipFilePath);
-            }
-            // creazione SQL, tramite  script esterno... importante parametro "--skip-extended-insert" altrimenti problemi con restore (anche se + verboso e lento in backup...)
-            string callScript = $"\"{mysqlDumpPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {dbName} {exportOpt} > {tempSqlPath}";
-            ExecuteCommand(callScript);
-            // compressione con pwd!
-            using (ZipFile zip = new ZipFile())
-            {
-                // aggiungo pwd
-                zip.Password = ZIP_PWD;
-                // inserisco file
-                zip.AddFile(tempSqlPath, "");
-                zip.Save(zipFilePath);
-                fatto = true;
-            }
-            // elimino file sql temporaneo...
-            if (File.Exists(tempSqlPath))
-            {
-                File.Delete(tempSqlPath);
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Effettua restore come overwrite del DB di DEFAULT... irreversibile
-        /// </summary>
-        /// <param name="zipFilePath">Percorso di lettura del dump cifrato (*.zip)</param>
-        /// <param name="dbName">Nome del DB da processare (se vuoto quello di default calcolato)</param>
-        /// <param name="tempFolder">Percorso cartella temp x esecuzione</param>
-        /// <param name="mysqlPath">Nome o Percorso Eseguibile mysql (opzionale)</param>
-        /// <param name="importOpt">Opzioni in fase di import (default: --force)</param>
-        /// <returns></returns>
-        public static bool DataBaseRestoreFromFile(string zipFilePath, string dbName = "", string tempFolder="", string mysqlPath = "mysql", string importOpt = "--force")
-        {
-            bool fatto = false;
-            // fix path eseguibile
-            if (string.IsNullOrEmpty(mysqlPath))
-            {
-                mysqlPath = "mysql";
-            }
-            if (string.IsNullOrEmpty(dbName))
-            {
-                dbName = DATABASE_NAME;
-            }
-            if (string.IsNullOrEmpty(tempFolder))
-            {
-                tempFolder = "C:\\Temp";
-            }
-            // verifica zip finale
-            if (!zipFilePath.EndsWith(".zip"))
-            {
-                zipFilePath = $"{zipFilePath}.zip";
-            }
-            // elimino eventuale temp folder precedente...
-            if (Directory.Exists(tempFolder))
-            {
-                Directory.Delete(tempFolder, true);
-            }
-            Directory.CreateDirectory(tempFolder);
-            // scompatto file zip --> sql
-            using (ZipFile zip = ZipFile.Read(zipFilePath))
-            {
-                zip.Password = ZIP_PWD;
-                zip.ExtractAll(tempFolder, ExtractExistingFileAction.OverwriteSilently);
-            }
-            // verifico che ci sia 1 file sql...
-            var sqlFiles = Directory.GetFiles(tempFolder, "*.sql");
-            if (sqlFiles != null && sqlFiles.Length == 1)
-            {
-                // verifico nome file per export sql (temporaneo)
-                string tempSqlPath = sqlFiles.FirstOrDefault();
-                // chiamo script esterno...
-                string callScript = $"\"{mysqlPath}\" -u{DATABASE_USER}  -p{DATABASE_PWD} {importOpt} {dbName} < {tempSqlPath}";
-                ExecuteCommand(callScript);
-                // elimino il file sql importato...
-                File.Delete(tempSqlPath);
-                // elimino temp folder...
-                Directory.Delete(tempFolder, true);
-                fatto = true;
-            }
-            return fatto;
-        }
-
-        /// <summary>
-        /// Esecuzione di un comando esterno
-        /// </summary>
-        /// <param name="command"></param>
-        public static void ExecuteCommand(string command)
-        {
-            int exitCode;
-            ProcessStartInfo processInfo;
-            Process process;
-
-            processInfo = new ProcessStartInfo("cmd.exe", "/c " + command);
-            processInfo.CreateNoWindow = true;
-            processInfo.UseShellExecute = false;
-            // *** Redirect the output ***
-            processInfo.RedirectStandardError = true;
-            processInfo.RedirectStandardOutput = true;
-
-            process = Process.Start(processInfo);
-            process.WaitForExit();
-
-            // *** Read the streams ***
-            // Warning: This approach can lead to deadlocks, see Edit #2
-            string output = process.StandardOutput.ReadToEnd();
-            string error = process.StandardError.ReadToEnd();
-
-            exitCode = process.ExitCode;
-
-            Console.WriteLine("output>>" + (String.IsNullOrEmpty(output) ? "(none)" : output));
-            Console.WriteLine("error>>" + (String.IsNullOrEmpty(error) ? "(none)" : error));
-            Console.WriteLine("ExitCode: " + exitCode.ToString(), "ExecuteCommand");
-            process.Close();
-        }
-
-        /// <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 chiave</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_NAME = $"EgtBwDb_{nKey}";
             DATABASE_USER = $"user_{nKey}";
             DATABASE_PWD = $"pwd_{sKey}";
-            ZIP_PWD = $"{DATABASE_USER}:{DATABASE_PWD}:{DATABASE_USER}:{DATABASE_PWD}";
-            CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};SslMode=None";
+            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";
+            ADMIN_CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database=mysql;uid=root;pwd=Egalware_24068!;sslmode=None;CHARSET=utf8";
         }
 
-        /// <summary>
-        /// Aggiorna conf NLog x target DIR
-        /// </summary>
-        /// <param name="logDir"></param>
-        public static void SetupLogDir(string logDir)
-        {
-            string appDir = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-            string filePath = Path.Combine(appDir, "NLog.config");
-            // leggo il file NLog
-            string rawData = File.ReadAllText(filePath);
+      public static bool CheckUser(string nKey, string sKey)
+      {
+         // esecuzione script di install locale
+         return Controllers.DbController.man.checkCreateUser(DATABASE_USER, DATABASE_PWD);
+      }
 
-            // sostituzione livello minimo da selezione
-            rawData = rawData.Replace("${basedir}", logDir);
-
-            // ri-scrivo file NLog
-            File.WriteAllText(filePath, rawData);
-        }
-
-        #endregion Public Methods
-    }
+      #endregion Public Methods
+   }
 }

EgtBEAMWALL.DataLayer/DbManager.cs

@@ -9,6 +9,7 @@ namespace EgtBEAMWALL.DataLayer
     {
         #region Public Fields
 
+        public static DbManager obj = new DbManager();
         public Controllers.BTLPartController BtlPartCtr = new Controllers.BTLPartController();
         public Controllers.LogMachineController LogMacCtr = new Controllers.LogMachineController();
         public Controllers.LogSupportController LogSupCtr = new Controllers.LogSupportController();

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -37,14 +37,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BouncyCastle.Crypto, Version=1.9.0.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
-      <HintPath>..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll</HintPath>
-    </Reference>
-    <Reference Include="DotNetZip, Version=1.16.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
-      <HintPath>..\packages\DotNetZip.1.16.0\lib\net40\DotNetZip.dll</HintPath>
-    </Reference>
     <Reference Include="EgtWPFLib5">
-      <HintPath>..\ExtLibs\EgtWPFLib5.dll</HintPath>
+      <HintPath>..\..\..\EgtProg\DllD32\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>
@@ -52,37 +46,16 @@
     <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="Google.Protobuf, Version=3.21.9.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.21.9\lib\net45\Google.Protobuf.dll</HintPath>
+    <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>
-    <Reference Include="K4os.Compression.LZ4, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.1.3.5\lib\net462\K4os.Compression.LZ4.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.5.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.5\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
-    </Reference>
-    <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
-      <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\MySql.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="MySql.Data.EntityFramework, Version=8.0.21.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.EntityFramework.8.0.21\lib\net452\MySql.Data.EntityFramework.dll</HintPath>
+    <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>
     <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>
     </Reference>
-    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
-    </Reference>
-    <Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
-      <HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
-    </Reference>
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
@@ -90,39 +63,16 @@
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Drawing.Design" />
-    <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
-    </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
     <Reference Include="System.Security" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceProcess" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Ubiety.Dns.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Zstandard.Net, Version=1.1.7.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
-      <HintPath>..\packages\MySql.Data.8.0.21\lib\net452\Zstandard.Net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdminContext.cs" />
@@ -171,31 +121,12 @@
     <Compile Include="Migrations\202109141058345_AddMachine2ProjProd.designer.cs">
       <DependentUpon>202109141058345_AddMachine2ProjProd.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\202207051703296_UpgradeLockModel.cs" />
-    <Compile Include="Migrations\202207051703296_UpgradeLockModel.designer.cs">
-      <DependentUpon>202207051703296_UpgradeLockModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202306081452095_UpdateProjModel.cs" />
-    <Compile Include="Migrations\202306081452095_UpdateProjModel.designer.cs">
-      <DependentUpon>202306081452095_UpdateProjModel.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202308241516227_AddProdStatusVarAndIndex.cs" />
-    <Compile Include="Migrations\202308241516227_AddProdStatusVarAndIndex.designer.cs">
-      <DependentUpon>202308241516227_AddProdStatusVarAndIndex.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migrations\202308250853396_AddProjArchivedField.cs" />
-    <Compile Include="Migrations\202308250853396_AddProjArchivedField.designer.cs">
-      <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
-    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="NLog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -223,18 +154,6 @@
     <EmbeddedResource Include="Migrations\202109141058345_AddMachine2ProjProd.resx">
       <DependentUpon>202109141058345_AddMachine2ProjProd.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202207051703296_UpgradeLockModel.resx">
-      <DependentUpon>202207051703296_UpgradeLockModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202306081452095_UpdateProjModel.resx">
-      <DependentUpon>202306081452095_UpdateProjModel.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202308241516227_AddProdStatusVarAndIndex.resx">
-      <DependentUpon>202308241516227_AddProdStatusVarAndIndex.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\202308250853396_AddProjArchivedField.resx">
-      <DependentUpon>202308250853396_AddProjArchivedField.cs</DependentUpon>
-    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

EgtBEAMWALL.DataLayer/Migrations/202207051703296_UpgradeLockModel.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class UpgradeLockModel : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpgradeLockModel));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202207051703296_UpgradeLockModel"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202207051703296_UpgradeLockModel.cs

@@ -1,28 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class UpgradeLockModel : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.ProjList", "LockedBy", c => c.String(unicode: false, nullable: false, defaultValueSql:""));
-            AddColumn("dbo.ProjList", "LockDate", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('1900-01-01')"));
-            AddColumn("dbo.ProdList", "LockedBy", c => c.String(unicode: false, nullable: false, defaultValueSql: ""));
-            AddColumn("dbo.ProdList", "LockDate", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('1900-01-01')"));
-            //AddColumn("dbo.ProjList", "LockedBy", c => c.String(unicode: false));
-            //AddColumn("dbo.ProjList", "LockDate", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('1900 - 01 - 01')"));
-            //AddColumn("dbo.ProdList", "LockedBy", c => c.String(unicode: false));
-            //AddColumn("dbo.ProdList", "LockDate", c => c.DateTime(nullable: false, precision: 0, defaultValueSql: "DATE('1900 - 01 - 01')"));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.ProdList", "LockDate");
-            DropColumn("dbo.ProdList", "LockedBy");
-            DropColumn("dbo.ProjList", "LockDate");
-            DropColumn("dbo.ProjList", "LockedBy");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202306081452095_UpdateProjModel.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class UpdateProjModel : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(UpdateProjModel));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202306081452095_UpdateProjModel"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202306081452095_UpdateProjModel.cs

@@ -1,20 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class UpdateProjModel : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.ProjList", "IsActive", c => c.Boolean(nullable: false, defaultValueSql: "1"));
-            AddColumn("dbo.ProjList", "ProjDescription", c => c.String(unicode: false));
-        }
-        
-        public override void Down()
-        {
-            DropColumn("dbo.ProjList", "ProjDescription");
-            DropColumn("dbo.ProjList", "IsActive");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202308241516227_AddProdStatusVarAndIndex.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddProdStatusVarAndIndex : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddProdStatusVarAndIndex));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202308241516227_AddProdStatusVarAndIndex"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202308241516227_AddProdStatusVarAndIndex.cs

@@ -1,42 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddProdStatusVarAndIndex : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.ProdList", "IsActive", c => c.Boolean(nullable: false));
-            AddColumn("dbo.ProdList", "IsProduced", c => c.Boolean(nullable: false));
-            AddColumn("dbo.ProdList", "IsArchived", c => c.Boolean(nullable: false));
-            CreateIndex("dbo.ProjList", "DtCreated");
-            CreateIndex("dbo.ProjList", "DtExported");
-            CreateIndex("dbo.ProjList", "IsActive");
-            CreateIndex("dbo.ProjList", "IsNew");
-            CreateIndex("dbo.ProjList", "Id");
-            CreateIndex("dbo.ProdList", "DtCreated");
-            CreateIndex("dbo.ProdList", "Id");
-            CreateIndex("dbo.ProdList", "IsActive");
-            CreateIndex("dbo.ProdList", "IsProduced");
-            CreateIndex("dbo.ProdList", "IsArchived");
-        }
-        
-        public override void Down()
-        {
-            DropIndex("dbo.ProdList", new[] { "IsArchived" });
-            DropIndex("dbo.ProdList", new[] { "IsProduced" });
-            DropIndex("dbo.ProdList", new[] { "IsActive" });
-            DropIndex("dbo.ProdList", new[] { "Id" });
-            DropIndex("dbo.ProdList", new[] { "DtCreated" });
-            DropIndex("dbo.ProjList", new[] { "Id" });
-            DropIndex("dbo.ProjList", new[] { "IsNew" });
-            DropIndex("dbo.ProjList", new[] { "IsActive" });
-            DropIndex("dbo.ProjList", new[] { "DtExported" });
-            DropIndex("dbo.ProjList", new[] { "DtCreated" });
-            DropColumn("dbo.ProdList", "IsArchived");
-            DropColumn("dbo.ProdList", "IsProduced");
-            DropColumn("dbo.ProdList", "IsActive");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202308250853396_AddProjArchivedField.Designer.cs

@@ -1,29 +0,0 @@
-// <auto-generated />
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System.CodeDom.Compiler;
-    using System.Data.Entity.Migrations;
-    using System.Data.Entity.Migrations.Infrastructure;
-    using System.Resources;
-    
-    [GeneratedCode("EntityFramework.Migrations", "6.4.4")]
-    public sealed partial class AddProjArchivedField : IMigrationMetadata
-    {
-        private readonly ResourceManager Resources = new ResourceManager(typeof(AddProjArchivedField));
-        
-        string IMigrationMetadata.Id
-        {
-            get { return "202308250853396_AddProjArchivedField"; }
-        }
-        
-        string IMigrationMetadata.Source
-        {
-            get { return null; }
-        }
-        
-        string IMigrationMetadata.Target
-        {
-            get { return Resources.GetString("Target"); }
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/202308250853396_AddProjArchivedField.cs

@@ -1,20 +0,0 @@
-namespace EgtBEAMWALL.DataLayer.Migrations
-{
-    using System;
-    using System.Data.Entity.Migrations;
-    
-    public partial class AddProjArchivedField : DbMigration
-    {
-        public override void Up()
-        {
-            AddColumn("dbo.ProjList", "IsArchived", c => c.Boolean(nullable: false));
-            CreateIndex("dbo.ProjList", "IsArchived");
-        }
-        
-        public override void Down()
-        {
-            DropIndex("dbo.ProjList", new[] { "IsArchived" });
-            DropColumn("dbo.ProjList", "IsArchived");
-        }
-    }
-}

EgtBEAMWALL.DataLayer/Migrations/Configuration.cs

@@ -1,6 +1,9 @@
 namespace EgtBEAMWALL.DataLayer.Migrations
 {
+    using System;
+    using System.Data.Entity;
     using System.Data.Entity.Migrations;
+    using System.Linq;
 
     internal sealed class Configuration : DbMigrationsConfiguration<EgtBEAMWALL.DataLayer.DatabaseContext>
     {
@@ -9,6 +12,7 @@ namespace EgtBEAMWALL.DataLayer.Migrations
         public Configuration()
         {
             AutomaticMigrationsEnabled = true;
+            //AutomaticMigrationsEnabled = false;
         }
 
         #endregion Public Constructors
@@ -17,14 +21,18 @@ namespace EgtBEAMWALL.DataLayer.Migrations
 
         protected override void Seed(EgtBEAMWALL.DataLayer.DatabaseContext context)
         {
-            // This method will be called after migrating to the latest version.
+            //  This method will be called after migrating to the latest version.
 
-            // You can use the DbSet<T>.AddOrUpdate() helper extension method to avoid creating
-            // duplicate seed data. E.g.
+            //  You can use the DbSet<T>.AddOrUpdate() helper extension method
+            //  to avoid creating duplicate seed data. E.g.
+            //
+            //    context.People.AddOrUpdate(
+            //      p => p.FullName,
+            //      new Person { FullName = "Andrew Peters" },
+            //      new Person { FullName = "Brice Lambson" },
+            //      new Person { FullName = "Rowan Miller" }
+            //    );
             //
-            // context.People.AddOrUpdate( p => p.FullName, new Person { FullName = "Andrew Peters"
-            // }, new Person { FullName = "Brice Lambson" }, new Person { FullName = "Rowan Miller"
-            // } );
         }
 
         #endregion Protected Methods

EgtBEAMWALL.DataLayer/NLog.config

@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.nlog-project.org/schemas/NLog.xsd NLog.xsd"
-      autoReload="true"
-      throwExceptions="false"
-      internalLogLevel="Off" internalLogFile="c:\temp\nlog-internal.log">
-
-    <variable name="logDir" value="${basedir}"/>
-    <targets>
-        <target xsi:type="File"
-            name="f_base"
-            fileName="${logDir}/${shortdate}.log"
-            layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}"
-            archiveFileName="${logDir}/${shortdate}.{###}.log"
-            archiveNumbering="Sequence"
-            archiveAboveSize="10240000"
-            maxArchiveFiles="60"
-            enableArchiveFileCompression="false"
-            keepFileOpen="false"
-        />
-        <target xsi:type="File"
-            name="f_error"
-            fileName="${logDir}/${shortdate}_err.log"
-            layout="${longdate} [${uppercase:${level}}] ${logger:shortName=true}|${message}${newline}${exception:format=tostring}"
-            archiveFileName="${logDir}/${shortdate}_err.{###}.log"
-            archiveNumbering="Sequence"
-            archiveAboveSize="10240000"
-            maxArchiveFiles="60"
-            enableArchiveFileCompression="false"
-            keepFileOpen="false"
-        />
-    </targets>
-    <rules>
-        <!-- Logging Levels (Trace, Debug, Info, Warn, Error, Fatal)-->
-        <logger name="*" minlevel="Info" maxlevel="Warn" final="true" writeTo="f_base" />
-        <logger name="*" minlevel="Error" writeTo="f_error" />
-    </rules>
-</nlog>

EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Egalware s.r.l.")]
 [assembly: AssemblyProduct("EgtBEAMWALL.DataLayer")]
-[assembly: AssemblyCopyright("Copyright ©  2020-2023 by Egalware s.r.l.")]
+[assembly: AssemblyCopyright("Copyright ©  2020-2022 by Egalware s.r.l.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.5.8.1")]
-[assembly: AssemblyFileVersion("2.5.8.1")]
+[assembly: AssemblyVersion("2.4.2.1")]
+[assembly: AssemblyFileVersion("2.4.2.1")]

EgtBEAMWALL.DataLayer/packages.config

@@ -1,22 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="BouncyCastle" version="1.8.5" targetFramework="net472" />
-  <package id="DotNetZip" version="1.16.0" targetFramework="net472" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
-  <package id="Google.Protobuf" version="3.21.9" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4" version="1.3.5" targetFramework="net472" />
-  <package id="K4os.Compression.LZ4.Streams" version="1.3.5" targetFramework="net472" />
-  <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
-  <package id="MySql.Data" version="8.0.21" targetFramework="net472" />
-  <package id="MySql.Data.EntityFramework" version="8.0.21" 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="net452" />
-  <package id="NLog" version="5.0.1" targetFramework="net472" />
-  <package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
-  <package id="SSH.NET" version="2016.1.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="5.0.2" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
 </packages>

EgtBEAMWALL.StressTest/App.config

@@ -1,51 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
-        <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"/>
         <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
     </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, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
+            <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.Entity.EF6, Version=6.10.9.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
         </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" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-3.21.9.0" newVersion="3.21.9.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.3.5.0" newVersion="1.3.5.0" />
-            </dependentAssembly>
-            <dependentAssembly>
-                <assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
-                <bindingRedirect oldVersion="0.0.0.0-1.9.0.0" newVersion="1.9.0.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.5.2"/></startup></configuration>

EgtBEAMWALL.StressTest/EgtBEAMWALL.StressTest.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>EgtBEAMWALL.StressTest</RootNamespace>
     <AssemblyName>EgtBEAMWALL.StressTest</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
@@ -35,20 +35,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib, Version=2.4.6.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgtWPFLib5.2.4.7.1\lib\EgtUILib.dll</HintPath>
-    </Reference>
-    <Reference Include="EgtWPFLib, Version=2.4.5.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgtWPFLib5.2.4.7.1\lib\EgtWPFLib.dll</HintPath>
-    </Reference>
-    <Reference Include="EgtWPFLib5, Version=2.4.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgtWPFLib5.2.4.7.1\lib\EgtWPFLib5.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\EgtWPFLib5.2.4.7.1\lib\System.Windows.Interactivity.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -83,7 +71,6 @@
       <DependentUpon>StressTest.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="App.config" />
-    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

EgtBEAMWALL.StressTest/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace EgtBEAMWALL.StressTest.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

EgtBEAMWALL.StressTest/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace EgtBEAMWALL.StressTest.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.6.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

EgtBEAMWALL.StressTest/Simulator.cs

@@ -1,11 +1,25 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Text;
 
 namespace EgtBEAMWALL.StressTest
 {
     public class Simulator
     {
+        #region Protected Fields
+
+        protected DataLayer.Controllers.BTLPartController BtlPartCtr = new DataLayer.Controllers.BTLPartController();
+        protected DataLayer.Controllers.MachGroupController MachGroupCtr = new DataLayer.Controllers.MachGroupController();
+        protected SimParams MaxParams = new SimParams();
+
+        protected DataLayer.Controllers.PartController PartCtr = new DataLayer.Controllers.PartController();
+        protected DataLayer.Controllers.ProdController ProdCtr = new DataLayer.Controllers.ProdController();
+        protected DataLayer.Controllers.ProjController ProjCtr = new DataLayer.Controllers.ProjController();
+
+        #endregion Protected Fields
+
         #region Public Fields
 
         public List<Core.BTLPartM> BtlPartList = new List<Core.BTLPartM>();
@@ -16,6 +30,30 @@ namespace EgtBEAMWALL.StressTest
 
         #endregion Public Fields
 
+        #region Protected Properties
+
+        /// <summary>
+        /// restituisce un set di parametri simulazione generando a caso dal set di base
+        /// </summary>
+        protected SimParams RandomParamSet
+        {
+            get
+            {
+                Random rndGen = new Random();
+                SimParams answ = new SimParams()
+                {
+                    BtlPart2Proj = rndGen.Next(MaxParams.BtlPart2Proj) + 1,
+                    BtlRepeat = rndGen.Next(MaxParams.BtlRepeat) + 1,
+                    Part2MachGroup = rndGen.Next(MaxParams.Part2MachGroup) + 1,
+                    Proj2Prod = rndGen.Next(MaxParams.Proj2Prod) + 1
+                };
+
+                return answ;
+            }
+        }
+
+        #endregion Protected Properties
+
         #region Public Methods
 
         /// <summary>
@@ -41,7 +79,7 @@ namespace EgtBEAMWALL.StressTest
                 List<DataLayer.DatabaseModels.BTLPartModel> currPartList = new List<DataLayer.DatabaseModels.BTLPartModel>();
                 List<Core.MyMachGroupM> currMachGroupList = new List<Core.MyMachGroupM>();
                 List<Core.PartM> currMGPartList = new List<Core.PartM>();
-                ProjCtr.UpdateInfo(currProjId, "TestBTL", $"{DateTime.Now:yyyyMMdd_HHmmssfff}", $"LN_{DateTime.Now:yyyyMMdd_HHmm}", DateTime.Now.AddSeconds(15), Core.ConstBeam.BWType.BEAM, "SIM01");
+                ProjCtr.UpdateInfo(currProjId, $"{DateTime.Now:yyyyMMdd_HHmmssfff}", $"LN_{DateTime.Now:yyyyMMdd_HHmm}", DateTime.Now.AddSeconds(15));
                 // genero le BTLParts ed assegno..
                 for (int j = 0; j < currRandom.BtlPart2Proj; j++)
                 {
@@ -69,9 +107,9 @@ namespace EgtBEAMWALL.StressTest
                     {
                         for (int l = 0; l < currRandom.Part2MachGroup; l++)
                         {
-                            // FixME!!! non può creare x loop in CreateBeamDL che vuole
-                            // nParentMachGroup genero le Part x MachGroup ed assegno
-                            Core.PartM currPart = Core.PartM.CreatePart(Core.ConstBeam.BWType.BEAM, currMachGroupList.FirstOrDefault(), currPartList[BPIdx].PartId, 1);
+                            // FixME!!! non può creare x loop in CreateBeamDL che vuole nParentMachGroup
+                            // genero le Part x MachGroup ed assegno
+                            Core.PartM currPart = Core.BeamM.CreateBeamDL(null, currPartList[BPIdx].PartId, 1);
                             currMGPartList.Add(currPart);
                             //currMGPartList.Add(new DataLayer.DatabaseModels.PartModel() { BTLPartDbId = currBTLPart.BTLPartDbId, PDN = l * k * currRandom.Part2MachGroup, PartId = l, H = 10 * l, L = 50 * l, W = 5 * l });
                         }
@@ -100,45 +138,9 @@ namespace EgtBEAMWALL.StressTest
 
         public void initDb()
         {
-            var firstData = ProjCtr.GetLastDesc(1, true);
+            var firstData = ProjCtr.GetLastDesc(1);
         }
 
         #endregion Public Methods
-
-        #region Protected Fields
-
-        protected DataLayer.Controllers.BTLPartController BtlPartCtr = new DataLayer.Controllers.BTLPartController();
-        protected DataLayer.Controllers.MachGroupController MachGroupCtr = new DataLayer.Controllers.MachGroupController();
-        protected SimParams MaxParams = new SimParams();
-
-        protected DataLayer.Controllers.PartController PartCtr = new DataLayer.Controllers.PartController();
-        protected DataLayer.Controllers.ProdController ProdCtr = new DataLayer.Controllers.ProdController();
-        protected DataLayer.Controllers.ProjController ProjCtr = new DataLayer.Controllers.ProjController();
-
-        #endregion Protected Fields
-
-        #region Protected Properties
-
-        /// <summary>
-        /// restituisce un set di parametri simulazione generando a caso dal set di base
-        /// </summary>
-        protected SimParams RandomParamSet
-        {
-            get
-            {
-                Random rndGen = new Random();
-                SimParams answ = new SimParams()
-                {
-                    BtlPart2Proj = rndGen.Next(MaxParams.BtlPart2Proj) + 1,
-                    BtlRepeat = rndGen.Next(MaxParams.BtlRepeat) + 1,
-                    Part2MachGroup = rndGen.Next(MaxParams.Part2MachGroup) + 1,
-                    Proj2Prod = rndGen.Next(MaxParams.Proj2Prod) + 1
-                };
-
-                return answ;
-            }
-        }
-
-        #endregion Protected Properties
     }
 }

EgtBEAMWALL.StressTest/StressTest.Designer.cs

@@ -35,10 +35,6 @@ namespace EgtBEAMWALL.StressTest
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.buttonDataSeed = new System.Windows.Forms.Button();
             this.labelResult = new System.Windows.Forms.Label();
-            this.btnDbDump = new System.Windows.Forms.Button();
-            this.btnDbRestore = new System.Windows.Forms.Button();
-            this.txtDumpFile = new System.Windows.Forms.TextBox();
-            this.txtDbName = new System.Windows.Forms.TextBox();
             this.groupBox1.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -96,57 +92,17 @@ namespace EgtBEAMWALL.StressTest
             // labelResult
             // 
             this.labelResult.AutoSize = true;
-            this.labelResult.Location = new System.Drawing.Point(250, 75);
+            this.labelResult.Location = new System.Drawing.Point(479, 91);
             this.labelResult.Name = "labelResult";
             this.labelResult.Size = new System.Drawing.Size(35, 13);
             this.labelResult.TabIndex = 4;
             this.labelResult.Text = "label2";
             // 
-            // btnDbDump
-            // 
-            this.btnDbDump.Location = new System.Drawing.Point(18, 136);
-            this.btnDbDump.Name = "btnDbDump";
-            this.btnDbDump.Size = new System.Drawing.Size(75, 45);
-            this.btnDbDump.TabIndex = 5;
-            this.btnDbDump.Text = "DB Dump";
-            this.btnDbDump.UseVisualStyleBackColor = true;
-            this.btnDbDump.Click += new System.EventHandler(this.btnDbDump_Click);
-            // 
-            // btnDbRestore
-            // 
-            this.btnDbRestore.Location = new System.Drawing.Point(338, 136);
-            this.btnDbRestore.Name = "btnDbRestore";
-            this.btnDbRestore.Size = new System.Drawing.Size(75, 45);
-            this.btnDbRestore.TabIndex = 6;
-            this.btnDbRestore.Text = "DB Restore";
-            this.btnDbRestore.UseVisualStyleBackColor = true;
-            this.btnDbRestore.Click += new System.EventHandler(this.btnDbRestore_Click);
-            // 
-            // txtDumpFile
-            // 
-            this.txtDumpFile.Location = new System.Drawing.Point(118, 161);
-            this.txtDumpFile.Name = "txtDumpFile";
-            this.txtDumpFile.Size = new System.Drawing.Size(186, 20);
-            this.txtDumpFile.TabIndex = 3;
-            this.txtDumpFile.Text = "C:\\Temp\\MyDbDump.zip";
-            // 
-            // txtDbName
-            // 
-            this.txtDbName.Location = new System.Drawing.Point(118, 136);
-            this.txtDbName.Name = "txtDbName";
-            this.txtDbName.Size = new System.Drawing.Size(186, 20);
-            this.txtDbName.TabIndex = 7;
-            this.txtDbName.Text = "egtbwdb_000142";
-            // 
             // StressTest
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.txtDbName);
-            this.Controls.Add(this.txtDumpFile);
-            this.Controls.Add(this.btnDbRestore);
-            this.Controls.Add(this.btnDbDump);
             this.Controls.Add(this.labelResult);
             this.Controls.Add(this.groupBox1);
             this.Name = "StressTest";
@@ -166,10 +122,6 @@ namespace EgtBEAMWALL.StressTest
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.Button buttonDataSeed;
         private System.Windows.Forms.Label labelResult;
-        private System.Windows.Forms.Button btnDbDump;
-        private System.Windows.Forms.Button btnDbRestore;
-        private System.Windows.Forms.TextBox txtDumpFile;
-        private System.Windows.Forms.TextBox txtDbName;
     }
 }
 

EgtBEAMWALL.StressTest/StressTest.cs

@@ -1,25 +1,17 @@
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
 using System.Diagnostics;
-using System.IO;
+using System.Drawing;
+using System.Linq;
+using System.Text;
 using System.Windows.Forms;
 
 namespace EgtBEAMWALL.StressTest
 {
     public partial class StressTest : Form
     {
-        #region Public Constructors
-
-        public StressTest()
-        {
-            InitializeComponent();
-            // init cablato sul mio DB
-            DataLayer.DbConfig.InitDb("127.0.0.1", "000470", "36311", "000470");
-            //// warm up DB
-            //CurrSim.initDb();
-        }
-
-        #endregion Public Constructors
-
         #region Protected Fields
 
         /// <summary>
@@ -29,6 +21,17 @@ namespace EgtBEAMWALL.StressTest
 
         #endregion Protected Fields
 
+        #region Public Constructors
+
+        public StressTest()
+        {
+            InitializeComponent();
+            // warm up DB
+            CurrSim.initDb();
+        }
+
+        #endregion Public Constructors
+
         #region Protected Properties
 
         protected int numProj
@@ -49,54 +52,6 @@ namespace EgtBEAMWALL.StressTest
 
         #region Private Methods
 
-        private void btnDbDump_Click(object sender, EventArgs e)
-        {
-            var result = MessageBox.Show("Sicuro di voler generare il dump del DB corrente?", "DB Dump", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
-
-            if (result == DialogResult.Yes)
-            {
-                labelResult.Text = "...";
-                Stopwatch sw = new Stopwatch();
-                sw.Start();
-                //string binPath = "C:\\Program Files\\MariaDB 10.5\\bin";
-                //string myDumpPath = Path.Combine(binPath, "mysqldump.exe");
-                string outPath = txtDumpFile.Text.Trim();
-                string dbName = txtDbName.Text.Trim();
-                if (!string.IsNullOrEmpty(outPath))
-                {
-                    // effettua dump
-                    //DataLayer.DbConfig.DataBaseDumpToFile(outPath,  "mysqldump");
-                    //DataLayer.DbConfig.DataBaseDumpToFile(outPath, "mysqldump", "--skip-extended-insert");
-                    DataLayer.DbConfig.DataBaseDumpToFile(outPath, dbName);
-                    sw.Stop();
-                    var elapsed = sw.Elapsed;
-                    labelResult.Text = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} | Dump Done in {elapsed.TotalSeconds:N3} sec!";
-                }
-            }
-        }
-
-        private void btnDbRestore_Click(object sender, EventArgs e)
-        {
-            var result = MessageBox.Show("Sicuro di voler ripristinare il file dump sul DB corrente?", "DB Restore", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation);
-
-            if (result == DialogResult.Yes)
-            {
-                labelResult.Text = "...";
-                string inPath = txtDumpFile.Text.Trim();
-                string dbName = txtDbName.Text.Trim();
-                string tempFolder = Path.Combine(Path.GetDirectoryName(inPath), "DbRestore");
-                Stopwatch sw = new Stopwatch();
-                sw.Start();
-                // effettua restore
-                DataLayer.DbConfig.DataBaseRestoreFromFile(inPath, dbName, tempFolder); sw.Stop();
-                //string binPath = "C:\\Program Files\\MariaDB 10.5\\bin";
-                //string mysqlPath = Path.Combine(binPath, "mysql.exe");
-                //DataLayer.DbConfig.DataBaseRestoreFromFile(inPath, "mysql");
-                var elapsed = sw.Elapsed;
-                labelResult.Text = $"{DateTime.Now:yyyy/MM/dd HH:mm:ss} | Restore Done in {elapsed.TotalSeconds:N3} sec!";
-            }
-        }
-
         private void buttonDataSeed_Click(object sender, EventArgs e)
         {
             // genero dati col SIM

EgtBEAMWALL.StressTest/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="EgtWPFLib5" version="2.4.7.1" targetFramework="net452" />
-</packages>

EgtBEAMWALL.Supervisor/AboutBoxWindow/AboutBoxV.xaml.vb

@@ -3,7 +3,8 @@ Imports EgtBEAMWALL.Core
 
 Public Class AboutBoxV
 
-   Private Sub AboutBoxWD_Loaded(sender As Object, e As RoutedEventArgs) Handles Me.Loaded
+   Private Sub AboutBoxWD_Initialized(sender As Object, e As EventArgs) Handles Me.Initialized
+      Me.Owner = Application.Current.MainWindow
       DescriptionLbl.Text = My.Application.Info.Description.ToString()
       VersionLbl.Text = "Version : " & My.Application.Info.Version.Major.ToString() &
                                  "." & My.Application.Info.Version.Minor.ToString() &
@@ -24,9 +25,6 @@ Public Class AboutBoxV
       sInfo &= sKey & " - " & sKlev & " - " & sOpts & sLeftDays & Environment.NewLine
       sInfo &= "DataRoot " & Map.refMainWindowVM.MainWindowM.sDataRoot & Environment.NewLine
       sInfo &= "MachinesRoot " & Map.refMainWindowVM.MainWindowM.sMachinesRoot & Environment.NewLine
-      Dim sOpSys As String = String.Empty
-      EgtGetOsInfo( sOpSys)
-      sInfo &= sOpSys & Environment.NewLine
       Dim sCPU As String = String.Empty
       EgtGetCpuInfo( sCPU)
       sInfo &= sCPU & Environment.NewLine
@@ -34,7 +32,7 @@ Public Class AboutBoxV
       EgtGetSceneInfo(sScene)
       sInfo &= sScene
       InfoLbl.Text = sInfo
-      ExitBtn.Content = EgtMsg(MSG_MISSINGKEYWD + 4)          'Ok
+      ExitBtn.Content = EgtMsg(constmsg.MSG_MISSINGKEYWD + 4)          'Ok
    End Sub
 
 End Class

EgtBEAMWALL.Supervisor/AxesPanel/AxesPanelV.xaml

@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:EgtCOMMTest"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
    <ItemsControl ItemsSource="{Binding AxesList}">

EgtBEAMWALL.Supervisor/AxesPanel/AxesPanelVM.vb

@@ -101,35 +101,27 @@ Public Class Axis
    Public ReadOnly Property sValue As String
       Get
          Dim nDec As Integer = 0
-         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
+         Select Case Type
+            Case AxisTypes.LINEAR
+               nDec = -3
+            Case AxisTypes.ROTATIONAL
+               nDec = -4
+            Case Else
+               nDec = 0
+         End Select
          Return DoubleToString(m_dValue, nDec)
       End Get
    End Property
 
    Friend Sub SetValue(value As Double)
-      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
+      Select Case Type
+         Case AxisTypes.LINEAR
+            m_dValue = value / 1000
+         Case AxisTypes.ROTATIONAL
+            m_dValue = value / 10000
+         Case Else
+            m_dValue = value
+      End Select
       NotifyPropertyChanged(NameOf(sValue))
    End Sub
 

EgtBEAMWALL.Supervisor/CALCPanel/CALCPanelVM.vb

@@ -16,34 +16,11 @@ Public Class CALCPanelVM
       End Set
    End Property
 
-   Private m_bMachineLog As Boolean = False
-   Public Property bMachineLog As Boolean
-      Get
-         Return m_bMachineLog
-      End Get
-      Set(value As Boolean)
-         m_bMachineLog = value
-         If value Then
-            Map.refProjectVM.SetSelTabPage(ProjectVM.TabPages.MACHINELOG)
-         ElseIf Not IsNothing(Map.refLeftPanelVM.SelOPMode) AndAlso Map.refLeftPanelVM.SelOPMode.Id = OPModes.Mdi Then
-            Map.refProjectVM.SetSelTabPage(ProjectVM.TabPages.MDI)
-         Else
-            Map.refProjectVM.SetSelTabPage(ProjectVM.TabPages.SCENE)
-         End If
-      End Set
-   End Property
-   Friend Sub SetMachineLog(value As Boolean)
-      m_bMachineLog = value
-      NotifyPropertyChanged(NameOf(bMachineLog))
-   End Sub
-
    ' Definizione comandi
    Private m_cmdVerify As ICommand
    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
@@ -81,7 +58,6 @@ 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
@@ -95,19 +71,15 @@ Public Class CALCPanelVM
       End If
       ' ciclo sui pezzi
       Dim bNotOkFound As Boolean = False
-      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
+      For Each MachGroup As MyMachGroupVM In Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList
          ' 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()
-      ' riabilito bottoni di comunicazione a fine invio programma
-      Map.refMachCommandMessagePanelVM.SetCommBtnIsEnabled(True)
    End Sub
 
    Private Sub Calc_ProcessEnded(sender As Object, e As CalcProcessEndEventArgs)
@@ -118,10 +90,6 @@ Public Class CALCPanelVM
    End Sub
 
    Private Shared Sub ProcessResults(Bar As Bar)
-      If IsNothing(Bar) Then Return
-
-      ' disabilito impostazione modificato
-      Dim DisableMgr As New DisableModifiedMgr
 
       Dim BtlPath As String = Bar.sBarPath
       Dim ResPath As String = Path.ChangeExtension(BtlPath, ".txt")
@@ -143,13 +111,14 @@ Public Class CALCPanelVM
          Dim cutId As Integer = 0
          Dim taskId As Integer = 0
          Dim prevCutId As Integer = GDB_ID.NULL
+         Dim currPart As PartVM
 
          Dim lines As String() = System.IO.File.ReadAllLines(ResPath)
          For Each line As String In lines
 
             If line.StartsWith("ERR=") Then
                Dim nVal As Integer? = GetVal(line, "ERR")
-               nErr = (If(Not IsNothing(nVal), nVal.Value, 0))
+               nErr = (If(nVal IsNot Nothing, nVal.Value, 0))
                sMsg = ""
                dRot = 0
                nFall = 0
@@ -157,24 +126,24 @@ Public Class CALCPanelVM
                taskId = 0
             ElseIf line.StartsWith("ROT=") Then
                Dim nVal As Integer? = GetVal(line, "ROT")
-               Dim nRot As Integer = (If(Not IsNothing(nVal), nVal.Value, 0))
+               Dim nRot As Integer = (If(nVal IsNot Nothing, nVal.Value, 0))
                dRot = Math.Abs(((4 - nRot) Mod 4) * 90)
                dPartRot = Math.Max(dPartRot, dRot)
                dTotRot = Math.Max(dTotRot, dRot)
             ElseIf line.StartsWith("CUTID=") Then
                Dim nVal As Integer? = GetVal(line, "CUTID")
-               cutId = If(Not IsNothing(nVal), nVal.Value, 0)
+               cutId = If(nVal IsNot Nothing, nVal.Value, 0)
             ElseIf line.StartsWith("TASKID=") Then
                Dim nVal As Integer? = GetVal(line, "TASKID")
-               taskId = (If(Not IsNothing(nVal), nVal.Value, 0))
+               taskId = (If(nVal IsNot Nothing, nVal.Value, 0))
                ProcessResultAdd(ProcessResultList, ProcessResult.CreateTaskResult(cutId, taskId, nErr, sMsg, dRot), Bar)
             ElseIf line.StartsWith("FALL=") Then
                Dim nVal As Integer? = GetVal(line, "FALL")
-               nFall = (If(Not IsNothing(nVal), nVal.Value, 0))
+               nFall = (If(nVal IsNot Nothing, nVal.Value, 0))
                ProcessResultList.Add(ProcessResult.CreateFallResult(cutId, nErr, sMsg, nFall))
             ElseIf line.StartsWith("TIME=") Then
                Dim nVal As Integer? = GetVal(line, "TIME")
-               nTotTime = (If(Not IsNothing(nVal), nVal.Value, 0))
+               nTotTime = (If(nVal IsNot Nothing, nVal.Value, 0))
                ProcessResultList.Add(ProcessResult.CreateTimeResult(cutId, nTotTime))
                'If Bar.nBarType = ProjectType.PROJ AndAlso Not IsNothing(currBTLPart) Then
                '   EgtSetInfo(currBTLPart.nPartId, If(Bar.nBarType = ProjectType.PROJ, ITG_PROJ_TIME, ITG_PROD_TIME), nTotTime, True)
@@ -193,9 +162,9 @@ Public Class CALCPanelVM
             Machgroup.CalcMachGroupUpdate(0, 0, "")
             ' Ciclo ...
             Dim nCUTID As Integer = -1
-            Dim CurrPartVM As PartVM = Nothing
-            Dim CurrMachgroupVM As MyMachGroupVM = Nothing
-            Dim CurrBTLFeatureVM As BTLFeatureVM = Nothing
+            Dim CurrPartVM As PartVM
+            Dim CurrMachgroupVM As MyMachGroupVM
+            Dim CurrBTLFeatureVM As BTLFeatureVM
             For Each Line In ProcessResultList
                ' se necessario recupero part
                If Line.nCUTID <> 0 Then
@@ -217,39 +186,32 @@ Public Class CALCPanelVM
                End If
                Select Case Line.Type
                   Case ProcessResult.ProcessResultTypes.BAR
-                     If Not IsNothing(CurrMachgroupVM) Then CurrMachgroupVM.CalcMachGroupUpdate(Line.nERR, Line.dROT, Line.sMSG)
+                     CurrMachgroupVM.CalcMachGroupUpdate(Line.nERR, Line.dROT, Line.sMSG)
                   Case ProcessResult.ProcessResultTypes.PART
-                     If Not IsNothing(CurrPartVM) Then CurrPartVM.CalcPartUpdate(Line.nERR, Line.dROT, Line.sMSG)
+                     CurrPartVM.CalcPartUpdate(Line.nERR, Line.dROT, Line.sMSG)
                   Case ProcessResult.ProcessResultTypes.TASKID
-                     If Not IsNothing(CurrBTLFeatureVM) Then CurrBTLFeatureVM.CalcFeatureUpdate(Line.nERR, Line.dROT, Line.sMSG)
+                     CurrBTLFeatureVM.CalcFeatureUpdate(Line.nERR, Line.dROT, Line.sMSG)
                   Case ProcessResult.ProcessResultTypes.FALL
-                     If Not IsNothing(CurrPartVM) Then CurrPartVM.CalcFallUpdate(Line.nFALL)
+                     CurrPartVM.CalcFallUpdate(Line.nFALL)
                   Case ProcessResult.ProcessResultTypes.TIME
                      If IsNothing(CurrMachgroupVM) Then CurrMachgroupVM = GetMachgroupVMFromMachgroupId(Bar.nBarId)
-                     If Not IsNothing(CurrMachgroupVM) Then CurrMachgroupVM.CalcTimeUpdate(Line.nTIME)
+                     CurrMachgroupVM.CalcTimeUpdate(Line.nTIME)
                End Select
             Next
             Machgroup = GetMachgroupVMFromMachgroupId(Bar.nBarId)
-            If Not IsNothing(Machgroup) Then
-               For Each Part In Machgroup.PartVMList
-                  Part.CalcGlobalUpdate()
-               Next
-               Machgroup.CalcGlobalUpdate()
-            End If
+            For Each Part In Machgroup.PartVMList
+               Part.CalcGlobalUpdate()
+            Next
+            Machgroup.CalcGlobalUpdate()
 
          End If
 
-         ' mando notifica aggiornamento ad ottimizzatore
-         DbControllers.m_StatusMapController.UpdateAction(DbControllers.m_SupervisorId, Map.refSupervisorManagerVM.CurrProd.nProdId, Bar.nBarId, StatusMapItemType.MachGroup, StatusMapOpType.MachGroupValidationUpdate, "")
-
       Else
          bErrors = True
          nLastErr = 25
          sLastMsg = "Execution Error"
       End If
 
-      ' ripristino precedente impostazione modificato
-      DisableMgr.ReEnable()
    End Sub
 
    Private Shared Function GetVal(sText As String, sKey As String) As Integer?
@@ -265,7 +227,7 @@ Public Class CALCPanelVM
    End Function
 
    Private Shared Sub ProcessResultAdd(PRList As List(Of ProcessResult), NewPR As ProcessResult, Bar As Bar)
-      Dim Prev As ProcessResult = Nothing
+      Dim Prev As ProcessResult
       Select Case NewPR.Type
          Case ProcessResult.ProcessResultTypes.BAR
             If Bar.nProgramPage = ProjectType.PROJ Then
@@ -297,7 +259,6 @@ Public Class CALCPanelVM
          Dim PartVM As PartVM = MachGroupVM.PartVMList.FirstOrDefault(Function(x) x.nPartId = nPartId)
          If Not IsNothing(PartVM) Then Return PartVM
       Next
-      Return Nothing
    End Function
 
    Private Shared Function GetMachgroupVMFromMachgroupId(nMachGroupId As Integer) As MyMachGroupVM
@@ -380,8 +341,7 @@ Public Class CALCPanelVM
                                                       .nProgramPage = ProjectType.PROD,
                                                       .nProjType = ProjType,
                                                       .bBarOk = True,
-                                                      .nMachineName = MachineName,
-                                                      .nGlobState = MachGroup.nGlobalState}
+                                                      .nMachineName = MachineName}
             Select Case MachGroup.nGlobalState
                Case Core.CalcStates.OK, Core.CalcStates.INFO
                   Bar.nCmdType = CalcIntegration.CmdTypes.GENERATE
@@ -397,7 +357,7 @@ Public Class CALCPanelVM
       ' disabilito interfaccia
       Map.refProjectVM.ManageIsEnabled(False)
       ' lancio calcolo
-      EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refSupervisorManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc, True)
+      EgtBEAMWALL.Core.CalcIntegration.Run(BarList, Map.refSupervisorManagerVM.CurrProd.sProdDirPath, AddressOf ManageCalc)
    End Sub
 
    ' funzione che gestisce risposta da thread di verifica, aggiorna progress e segnala comando di interruzione
@@ -504,7 +464,7 @@ Public Class CALCPanelVM
                                                   .bBarOk = True,
                                                   .nMachineName = MachineName,
                                                   .nCmdType = CalcIntegration.CmdTypes.SIMULATE}
-         If SelMachGroup.nGlobalState = CalcStates.NOTCALCULATED Then
+         If SelMachGroup.nGlobalState <> Core.CalcStates.OK Then
             Dim sMachGroupFilePath As String = Map.refSupervisorManagerVM.CurrProd.sProdDirPath & "\" & SelMachGroup.Name.ToString() & ".ori.bwe"
             If File.Exists(sMachGroupFilePath) Then File.Delete(sMachGroupFilePath)
          End If

EgtBEAMWALL.Supervisor/CALCPanel/CalcPanelV.xaml

@@ -29,10 +29,5 @@
            IsEnabled="{Binding CALCPanel_IsEnabled}">
       <Image Source="/Resources/CALCPanel/Simulate.png" Stretch="Uniform"/>
    </Button>
-   <ToggleButton ToolTip="{Binding MachineLog_ToolTip}"
-                 Content="Log"
-                 IsChecked="{Binding bMachineLog}"
-                 Style="{StaticResource ToolBar_ToggleButton}">
-   </ToggleButton>
 
 </EgtFloating:EgtFloatingPanel>

EgtBEAMWALL.Supervisor/Comms/NUMAxiumComm.vb

@@ -1,846 +0,0 @@
-Imports EgtBEAMWALL.Core
-Imports EgtBEAMWALL.Core.ConstMachComm
-Imports EgtUILib
-Imports EgtWPFLib5
-
-Public Class NUMAxiumComm
-
-   Enum CNMode As Integer
-      AUTO = 0
-      SINGLE_ = 1
-      MDI = 2
-      MANUAL = 7
-   End Enum
-
-   Private m_MachManaging As MachManaging
-   Friend ReadOnly Property MachManaging As MachManaging
-      Get
-         Return m_MachManaging
-      End Get
-   End Property
-
-   Public ReadOnly Property bIsTransferActive As Boolean
-      Get
-         Return If(Not IsNothing(objDFileTransfer), objDFileTransfer.IsTransferActive(), False)
-      End Get
-   End Property
-
-   'Private objDRunTimeSystem As FXServer.DRunTimeSystem
-   Private WithEvents objDGroupManager As APServer.DGroupManager
-   Private WithEvents objDGeneralFunction As APServer.DGeneralFunctions
-   Private WithEvents objDMainCncData As APServer.DMainCncData
-   Private WithEvents objErrorHandler As APLog.ErrorHandler
-   Private WithEvents objDReadELS As APServer.DReadELS
-   Private WithEvents objDReadPlcVarList As APServer.DReadPlcVarList
-   Private WithEvents objDFileTransfer As APServer.DFileTransfer
-   Private WithEvents objDPosition As APServer.DPosition
-   Private WithEvents objDMdiCommand As APServer.DMdiCommand
-   Private WithEvents objDVariables As APServer.DVariables
-   Private WithEvents objDCncMode As APServer.DCncMode
-   Private WithEvents objDReadOperatorMessage As APServer.DReadOperatorMessage
-
-   Private m_CNCVersion As String = ""
-   Private _PartProgramNumber As Single
-   Private _CNCAxisChannelArray As String() = New String() {"Channel 1", "Channel 2"}
-   Private m_ChannelList As New List(Of String)
-   ' Arraylist for read out the messages
-   Private m_ReadFXMessages As New List(Of ReadMessages)
-   Private m_ReadOperatorMessages As New List(Of ReadMessages)
-   ' lista variabili in lettura
-   Private Shared m_ReadingVars(100) As CommVar
-   Private m_BytesTransferedCounter As Integer
-   Private m_LinearAxisPrecision As Integer
-
-   Public Sub New(MachManaging As MachManaging)
-      m_MachManaging = MachManaging
-   End Sub
-
-#Region "METHODS"
-
-   Friend Sub InitFxServer()
-   End Sub
-
-   Friend Sub InitFxObjects()
-      objDGroupManager = CreateObject("APServer.DGroupManager")
-      AddHandler objDGroupManager.ErrorHandler, AddressOf objDGroupManager_ErrorHandler
-      AddHandler objDGroupManager.AssignmentChanged, AddressOf objDGroupManager_AssignmentChanged
-      objDGroupManager.CncNumber = 0
-      objDGroupManager.AxisGroup = 0
-
-      objDMainCncData = CreateObject("APServer.DMainCncData")
-      Dim s = objDMainCncData.Init(objDGroupManager.Handle)
-      m_LinearAxisPrecision = objDMainCncData.GetLinearPrecision()
-      Dim CncFxIdentifier As String = objDMainCncData.GetCncIdentifier()
-      EgtOutLog("CncFxIdentifier: " & CncFxIdentifier)
-
-      m_CNCVersion = objDMainCncData.GetCncVersion()
-
-      ' Initialize for Channel Change
-      Dim CncGroupNumber As Integer = objDMainCncData.GetCncGroupNumber()
-      Dim PlcGroupNumber As Integer = objDMainCncData.GetPlcGroupNumber()
-
-      Dim sumChannels As Integer = 0
-      sumChannels = PlcGroupNumber + CncGroupNumber
-      For i = 1 To sumChannels
-         m_ChannelList.Add(i)
-      Next
-
-      objDGeneralFunction = CreateObject("APServer.DGeneralFunctions")
-      AddHandler objDGeneralFunction.ProgramActivated, AddressOf objDGeneralFunction_ProgramActivated
-      AddHandler objDGeneralFunction.OnCncStart, AddressOf objDGeneralFunction_OnCncStart
-      AddHandler objDGeneralFunction.OnCncStop, AddressOf objDGeneralFunction_OnCncStop
-      AddHandler objDGeneralFunction.OnCncReset, AddressOf objDGeneralFunction_OnCncReset
-      AddHandler objDGeneralFunction.CncModeWritten, AddressOf objDGeneralFunction_CncModeWritten
-      AddHandler objDGeneralFunction.VariableWritten, AddressOf objDGeneralFunction_VariableWritten
-      Dim l = objDGeneralFunction.Init(objDGroupManager.Handle)
-      Dim MaxWaiting As Integer = 100
-      Dim WaitingIndex As Integer = 0
-      While objDGeneralFunction.ConnectionStatus <> 2 AndAlso WaitingIndex < MaxWaiting
-         Threading.Thread.Sleep(100)
-         UpdateUI()
-         WaitingIndex += 1
-      End While
-      Dim j = objDGeneralFunction.ConnectionStatus
-      Dim oi = objDGeneralFunction.ConnectionString
-      ' Initialize FXLog Objects
-      objErrorHandler = CreateObject("APLog.ErrorHandler")
-      'AddHandler objErrorHandler.ErrorFromActiveCnc, AddressOf objErrorHandler_ErrorFromActiveCnc2
-      AddHandler objErrorHandler.ErrorOnCnc, AddressOf objErrorHandler_ErrorOnCnc
-      AddHandler objErrorHandler.ErrorOnOtherChannel, AddressOf objErrorHandler_ErrorOnOtherChannel
-      AddHandler objErrorHandler.Exception, AddressOf objErrorHandler_Exception
-      'Initialisation config for testing
-      'Accepting all messages
-      'Consult the documentation for detailed information
-
-      objErrorHandler.AllError = 1
-      objErrorHandler.ErrorGlobal = 0
-      objErrorHandler.SetChannel(0, 0)
-      objErrorHandler.AcceptBootSysMessage(1)
-      objErrorHandler.AcceptException(0)
-
-      'Initialize FXServer class DFileTransferv
-      objDFileTransfer = CreateObject("APServer.DFileTransfer")
-      AddHandler objDFileTransfer.Completed, AddressOf objDFileTransfer_Completed
-      AddHandler objDFileTransfer.TransferStarted, AddressOf objDFileTransfer_TransferStarted
-      AddHandler objDFileTransfer.Failed, AddressOf objDFileTransfer_Failed
-      AddHandler objDFileTransfer.BytesTransfered, AddressOf objDFileTransfer_BytesTransfered
-      objDFileTransfer.Init(objDGroupManager.Handle)
-
-      objDPosition = CreateObject("APServer.DPosition")
-      AddHandler objDPosition.PositionChanged, AddressOf objDPosition_PositionChanged
-      objDPosition.ModeOP = 1
-      objDPosition.Flag = 0
-      objDPosition.Init(objDGroupManager.Handle)
-      objDPosition.FireValidAxis()
-      objDPosition.FireValues()
-
-      'Initialize FXServer class DMdiCommand
-      objDMdiCommand = CreateObject("APServer.DMdiCommand")
-      AddHandler objDMdiCommand.CommandWritten, AddressOf objDMdiCommand_CommandWritten
-      objDMdiCommand.Init(objDGroupManager.Handle)
-
-      ' Initialize FXServer class DCncMode
-      objDCncMode = CreateObject("APServer.DCncMode")
-      AddHandler objDCncMode.ValueChanged, AddressOf objDCncMode_ValueChanged
-      objDCncMode.Init(objDGroupManager.Handle)
-
-      ' Initialize FXServer class DReadOperatorMessage
-      objDReadOperatorMessage = CreateObject("APServer.DReadOperatorMessage")
-      AddHandler objDReadOperatorMessage.ValueChanged, AddressOf objDReadOperatorMessage_ValueChanged
-      Dim tc = objDReadOperatorMessage.Init(objDGroupManager.Handle)
-      If tc <> 0 Then EgtOutLog("Init failed ! return code : " + tc)
-
-      ' Initialize FXServer class DReadELS
-      'objDReadELS = CreateObject("APServer.DReadELS")
-      'AddHandler objDReadELS.ValueChanged, AddressOf objDReadELS_ValueChanged
-      'Dim y = objDReadELS.Init(objDGroupManager.Handle)
-
-      objDReadPlcVarList = CreateObject("APServer.DReadPlcVarList")
-      AddHandler objDReadPlcVarList.ValueChanged, AddressOf objDPlcVariables_ReadPLCVariablesChanged
-      ' Init & send the list of requested variables
-      'tc = objDReadPlcVarList.Init(objDGroupManager.Handle)
-      'If tc <> 0 Then EgtOutLog(" objDReadPlcVarList.Init() Error : " + tc)
-
-      'Initialize FXServer class DVariables
-      objDVariables = CreateObject("APServer.DVariables")
-      'AddHandler objDVariables.ValueChanged, AddressOf objDVariables_ValueChanged
-      ' Init & send the list of requested variables
-      'Dim rc As Short = objDVariables.Init(objDGroupManager.Handle, "E80000", 0)
-      AddHandler objDVariables.VariableWritten, AddressOf objDVariables_VariableWritten
-      AddHandler objDVariables.ValueChanged, AddressOf objDPlcVariables_ReadVariablesChanged
-      'If rc <> 0 Then EgtOutLog(" objDVariables.Init() Error : " + rc)
-
-      ' attivo programma main
-      Map.refMachManaging.Num_Axium_APServer.ActivateProg(9000)
-
-   End Sub
-
-   Friend Sub CloseFxObjects()
-      If Not IsNothing(objDReadOperatorMessage) Then
-         objDReadOperatorMessage.Close()
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDReadOperatorMessage)
-         objDReadOperatorMessage = Nothing
-      End If
-      If Not IsNothing(objDCncMode) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDCncMode)
-         objDCncMode = Nothing
-      End If
-      If Not IsNothing(objDReadPlcVarList) Then
-         objDReadPlcVarList.Close()
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDReadPlcVarList)
-         objDReadPlcVarList = Nothing
-      End If
-      If Not IsNothing(objDVariables) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDVariables)
-         objDVariables = Nothing
-      End If
-      If Not IsNothing(objDMdiCommand) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDMdiCommand)
-         objDMdiCommand = Nothing
-      End If
-      If Not IsNothing(objDPosition) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDPosition)
-         objDPosition = Nothing
-      End If
-      If Not IsNothing(objDFileTransfer) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDFileTransfer)
-         objDFileTransfer = Nothing
-      End If
-      If Not IsNothing(objDReadELS) Then
-         objDReadELS.Close()
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDReadELS)
-         objDReadELS = Nothing
-      End If
-      If Not IsNothing(objErrorHandler) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objErrorHandler)
-         objErrorHandler = Nothing
-      End If
-      If Not IsNothing(objDGeneralFunction) Then
-         objDGeneralFunction.Connect(0)
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDGeneralFunction)
-         objDGeneralFunction = Nothing
-      End If
-      If Not IsNothing(objDMainCncData) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDMainCncData)
-         objDMainCncData = Nothing
-      End If
-      If Not IsNothing(objDGroupManager) Then
-         System.Runtime.InteropServices.Marshal.ReleaseComObject(objDGroupManager)
-         objDGroupManager = Nothing
-      End If
-      Dim ServerProcList As Process() = Process.GetProcessesByName("APServer")
-      Dim LogProcList As Process() = Process.GetProcessesByName("APLog")
-      For Each ServerProc In ServerProcList
-         ServerProc.Kill()
-      Next
-      For Each LogProc In LogProcList
-         LogProc.Kill()
-      Next
-   End Sub
-
-   Friend Sub GetGeneralFunctions()
-      Dim _GetConnectState As Int16 = 0
-      Dim MaxWaiting As Integer = 100
-      Dim WaitingIndex As Integer = 0
-      While _GetConnectState <> 2 AndAlso WaitingIndex < MaxWaiting
-         _GetConnectState = objDGeneralFunction.ConnectionStatus
-         Threading.Thread.Sleep(100)
-         UpdateUI()
-         WaitingIndex += 1
-      End While
-
-      Select Case _GetConnectState
-         Case 0
-            ' Not connected
-            m_MachManaging.SetConnected(False)
-            m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.NULL, ResultTypes.RESULT, "")
-         Case 1
-            ' Connection error
-            m_MachManaging.SetConnected(False)
-            m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.ERROR_, ResultTypes.RESULT, "")
-         Case 2
-            ' Connected
-            m_MachManaging.SetConnected(True)
-            m_ResultCallbackDlg(CommandTypes.CONNECT, CommandStates.OK, ResultTypes.RESULT, "")
-            ' avvio lettura variabili
-            'MachManaging.CommandList.Add(ThreadCommand.CreateCommand(CommandTypes.READ_NUMFLEXIUM))
-            StartReadList()
-            StartReadPLCList()
-            'StartReadELS()
-         Case Else
-      End Select
-   End Sub
-
-   Friend Sub Start()
-      objDGeneralFunction.CncStart()
-   End Sub
-
-   Friend Sub Stop_()
-      objDGeneralFunction.CncStop()
-   End Sub
-
-   Friend Sub Reset()
-      objDGeneralFunction.CncReset()
-   End Sub
-
-   Friend Sub SetMode(value As CNMode)
-      objDGeneralFunction.WriteCncMode(value, 0)
-   End Sub
-
-   Friend Sub SetChannel(value As Integer)
-      ChangeChannel(CShort(value))
-      'objDGroupManager.AxisGroup = CShort(value)
-   End Sub
-
-   Friend Sub ActivateProg(PartProgramNumberActivate As Integer)
-      ' attivo programma main
-      Dim _FXReturn As Int16 = objDGeneralFunction.ActivateProgram(PartProgramNumberActivate * 10, 0)
-      If _FXReturn <> 0 Then
-         EgtOutLog("Error Activate Program:" & " " & _FXReturn.ToString())
-      End If
-   End Sub
-
-   Private Sub ChangeChannel(Channel As Short)
-      objErrorHandler.SetChannel(1, Channel)
-   End Sub
-
-   Friend Sub StartReadList()
-      'Dim AddressList() As String = (From CommVar In m_ReadingVars
-      '                               Where Not IsNothing(CommVar) AndAlso CommVar.nType = CommVar.Types.PLC
-      '                               Select CommVar.sAddress).ToArray()
-      'm_PlcVariablesList = New ArrayList((From CommVar In m_ReadingVars
-      '                                    Where Not IsNothing(CommVar) AndAlso CommVar.nType = CommVar.Types.PLC
-      '                                    Select CommVar.sAddress).ToArray())
-      Dim nPLCVarIndex As Integer = 0
-      Dim PlcVariablesList As New ArrayList
-      Dim sPLCVariableList = ""
-      For VarIndex = 0 To m_ReadingVars.Length - 1
-         Dim CommVar As CommVar = m_ReadingVars(VarIndex)
-         If Not IsNothing(CommVar) AndAlso CommVar.Paragraph = CommVar.Paragraphs.MAIN AndAlso CommVar.nType = CommVar.Types.CN Then
-            PlcVariablesList.Add(CommVar.sAddress)
-            If Not String.IsNullOrWhiteSpace(sPLCVariableList) Then
-               sPLCVariableList &= ","
-            End If
-            sPLCVariableList &= """" & CommVar.sAddress & """"
-            CommVar.Index = nPLCVarIndex
-            nPLCVarIndex += 1
-         End If
-      Next
-      'Dim sPLCVariableList = ""
-      'For VariableIndex = 0 To PlcVariablesList.Count - 1
-      '   If VariableIndex <> 0 Then
-      '      sPLCVariableList &= ","
-      '   End If
-      '   sPLCVariableList &= """" & PlcVariablesList(VariableIndex) & """"
-      'Next
-      Dim _FXReturn As Short = objDVariables.Init(objDGroupManager.Handle, sPLCVariableList, 1) 'PlcVariablesList.ToArray().ToString())
-      'Dim _FXReturn As Short = objDVariables.ReadVariables(PlcVariablesList.ToArray())
-
-      'If _FXReturn <> 0 Then
-      '   EgtOutLog("Error ReadVariables:" & " " & _FXReturn.ToString())
-      'End If
-   End Sub
-
-   Friend Sub StartReadPLCList()
-      'Dim AddressList() As String = (From CommVar In m_ReadingVars
-      '                               Where Not IsNothing(CommVar) AndAlso CommVar.nType = CommVar.Types.PLC
-      '                               Select CommVar.sAddress).ToArray()
-      'm_PlcVariablesList = New ArrayList((From CommVar In m_ReadingVars
-      '                                    Where Not IsNothing(CommVar) AndAlso CommVar.nType = CommVar.Types.PLC
-      '                                    Select CommVar.sAddress).ToArray())
-      Dim nPLCVarIndex As Integer = 0
-      Dim PlcVariablesList As New ArrayList
-      Dim sPLCVariableList = ""
-      For VarIndex = 0 To m_ReadingVars.Length - 1
-         Dim CommVar As CommVar = m_ReadingVars(VarIndex)
-         If Not IsNothing(CommVar) AndAlso CommVar.nType = CommVar.Types.PLC AndAlso
-            CommVar.Paragraph = CommVar.Paragraphs.MAIN Then
-            PlcVariablesList.Add(CommVar.sAddress)
-            If Not String.IsNullOrWhiteSpace(sPLCVariableList) Then
-               sPLCVariableList &= ","
-            End If
-            sPLCVariableList &= CommVar.sAddress
-            CommVar.Index = nPLCVarIndex
-            nPLCVarIndex += 1
-         End If
-      Next
-      objDReadPlcVarList.Argument = sPLCVariableList        ' "%M5.L,%M5.B"
-      Dim h = objDReadPlcVarList.Init(objDGroupManager.Handle)
-      'Dim _FXReturn As Short = objDVariables.ReadVariables(PlcVariablesList.ToArray())
-
-      'If _FXReturn <> 0 Then
-      '   EgtOutLog("Error ReadVariables:" & " " & _FXReturn.ToString())
-      'End If
-   End Sub
-
-   Friend Sub CloseReadList()
-      'objDPlcVariables.CloseReadList()
-   End Sub
-
-   Private Sub ReadVariablesOnce(Address As String)
-      'Dim _ReadSymbolicPlcVariableOnetime As String = "Application.IOCONFIG_GLOBALS.Flexium_NCK.RCNC.General.Mode"
-      'Dim _FXReturn As Int16 = objDPlcVariables.ReadVariablesOnce(10, Address)
-
-      'If _FXReturn <> 0 Then
-      '   EgtOutLog("Error ReadVariablesOnce:" & " " & _FXReturn.ToString())
-      'End If
-
-   End Sub
-
-   Friend Sub WritePlcVariables(Address As String, value As String)
-      'Dim _WriteSymbolicPlcVariable As String = _txtReadWritePlcVariables0.Text
-      'Dim _FXReturn As Int16 = objDPlcVariables.WriteVariables2(11, Address, value)
-      '
-      'If _FXReturn <> 0 Then
-      '   EgtOutLog("Error WriteVariables2 :" & " " & _FXReturn.ToString())
-      'End If
-
-   End Sub
-
-   Public Shared Function InitVar(Variable As CommVar) As CommVar
-      Dim Index As Integer = Array.IndexOf(m_ReadingVars, Nothing)
-      m_ReadingVars(Index) = Variable
-      Return m_ReadingVars(Index)
-   End Function
-
-   Friend Sub StartReadELS()
-      For Index = 0 To m_ReadingVars.Length - 1
-         If IsNothing(m_ReadingVars(Index)) Then Continue For    'OrElse m_ReadingVars(Index).nType <> CommVar.Types.CN Then Continue For
-         Dim rc As Short = objDReadELS.AddParameter(m_ReadingVars(Index).sAddress, Index + 1)
-         If rc <> 0 Then EgtOutLog(" Error AddParameter2 : " & rc & " on Variable : " & m_ReadingVars(Index).sAddress)
-      Next
-   End Sub
-
-   Friend Sub CloseReadELS()
-      'objDPlcVariables.CloseReadList()
-   End Sub
-
-#Region "File transfer"
-
-   Friend Sub FileDownload(sFileType As String, sFilePath As String)
-      Dim _Return_Download As Short
-
-      _Return_Download = objDFileTransfer.FileDownload(10, sFileType, sFilePath, "", 1)
-
-      If _Return_Download <> 0 Then
-         EgtOutLog("Error: File not stored to the job list:" & " " & _Return_Download.ToString())
-      End If
-   End Sub
-
-   Private Sub FileUpload(sFileType As String, sFilePath As String)
-      Dim _Return_Upload As Short
-      _Return_Upload = objDFileTransfer.FileUpload(20, sFileType, sFilePath, "")
-
-      If _Return_Upload <> 0 Then
-         EgtOutLog("Error: File not stored to the job list:" & " " & _Return_Upload.ToString())
-      End If
-   End Sub
-
-   Friend Sub FileDelete(sFileType As String, sFilePath As String)
-      Dim _ReturnFileDelete As Short
-      _ReturnFileDelete = objDFileTransfer.FileDelete(20, sFileType, "")
-
-      If _ReturnFileDelete <> 0 Then
-         EgtOutLog("Error: File not deleted:" & " " & _ReturnFileDelete.ToString())
-      End If
-   End Sub
-
-   Friend Sub StartTransfer()
-      Dim _Return_StartTransfer As Short
-      _Return_StartTransfer = objDFileTransfer.StartTransfer()
-
-      If _Return_StartTransfer <> 0 Then
-         EgtOutLog("Error: Start transfer not executed:" & " " & _Return_StartTransfer.ToString())
-      Else
-         m_BytesTransferedCounter = 0
-      End If
-   End Sub
-
-#End Region    ' File transfer
-
-#Region "MDI"
-
-   Friend Sub MDI_Execute(sCommand As String)
-      Dim nRet As Int16 = objDMdiCommand.ExecuteCommand(sCommand)
-      If nRet <> 0 Then
-         EgtOutLog("Error ExecuteCommand :" & " " & nRet.ToString())
-      End If
-   End Sub
-
-#End Region    ' MDI
-
-#Region "Variables"
-
-   Friend Sub WriteNCVariables(Address As String, value As String)
-      Try
-         Dim dValue As Double = 0
-         StringToDoubleAdv(value, dValue)
-         Dim rc As Short = objDVariables.WriteVariables(objDGroupManager.Handle, Address, value)
-
-         'If rc <> 0 Then EgtOutLog(" objDVariables.WriteVariables2() Error : " & rc)
-
-      Catch ex As Exception
-         EgtOutLog(" objDVariables.WriteVariables2() Exception : " & ex.Message)
-      End Try
-   End Sub
-
-#End Region    ' Variables
-
-#End Region    ' METHODS
-
-#Region "EVENTS"
-
-   Private Sub objDRunTimeSystem_ServerInitializationFinished()
-      InitFxObjects()
-      GetGeneralFunctions()
-   End Sub
-
-   Private Sub objDRunTimeSystem_ServerReinitializationStarted()
-      CloseFxObjects()
-   End Sub
-
-   Private Sub objDGeneralFunction_ProgramActivated(ByVal nerrorCode As Short)
-      EgtOutLog("Part program activated:" & " " & nerrorCode)
-      'DbControllers.m_LogMachineController.Create(MachLog.CreateResultLog(CommandTypes.SENDPROG, CommandStates.OK, ResultTypes.EXECUTED, "Part program activated:" & " " & nerrorCode))
-      ' scrivo evento programma attivato
-      DbControllers.m_LogMachineController.Create(LogEvent.CreateMachCommandLog(LogEvent.MachineCommands.PROGRAM_ACTIVATION, "", nerrorCode, DbControllers.SupervisorId))
-   End Sub
-
-   Private Sub objDGeneralFunction_OnCncStart(ByVal errorCode As Short)
-      Dim bOk As Boolean = (errorCode = 0)
-      m_MachManaging.SetStartPending(bOk)
-      m_ResultCallbackDlg(CommandTypes.START, If(bOk, CommandStates.OK, CommandStates.ERROR_), ResultTypes.EXECUTED, If(bOk, "", "Error CNC Start: " & errorCode.ToString()))
-   End Sub
-
-   Private Sub objDGeneralFunction_OnCncStop(ByVal errorCode As Short)
-      Dim bOk As Boolean = (errorCode = 0)
-      m_ResultCallbackDlg(CommandTypes.STOP_, If(bOk, CommandStates.OK, CommandStates.ERROR_), ResultTypes.EXECUTED, If(bOk, "", "Error Feed Hold: " & errorCode.ToString()))
-   End Sub
-
-   Private Sub objDGeneralFunction_OnCncReset(ByVal errorCode As Short)
-      Dim bOk As Boolean = (errorCode = 0)
-      m_ResultCallbackDlg(CommandTypes.RESET, If(bOk, CommandStates.OK, CommandStates.ERROR_), ResultTypes.EXECUTED, If(bOk, "", "Error CNC Reset: " & errorCode.ToString()))
-   End Sub
-
-   Private Sub objDGeneralFunction_CncModeWritten(ByVal errorCode As Short)
-      If errorCode <> 0 Then EgtOutLog("Error CNC Mode selection completed:" & " " & errorCode.ToString())
-   End Sub
-
-   Private Sub objDGroupManager_ErrorHandler(ByVal sError As String, ByVal nTextNumber As Short)
-      EgtOutLog("ErrorHandler message:" & " " & sError & " " & "ErrorHandler number:" & " " & nTextNumber.ToString())
-   End Sub
-
-   Private Sub objDGroupManager_AssignmentChanged(ByVal CncNumber As Short, ByVal AxisGroup As Short)
-      m_ChannelCallbackDlg(AxisGroup)
-   End Sub
-
-   Private Sub _comboCncAxisChannel_SelectedIndexChanged(ByVal sender As Object, ByVal e As EventArgs)
-      'Select Case _comboCncAxisChannel.SelectedItem.ToString()
-      '   Case "Channel 1"
-      '      objDGroupManager.AxisGroup = 0
-      '   Case "Channel 2"
-      '      objDGroupManager.AxisGroup = 1
-      '   Case Else
-      'End Select
-   End Sub
-
-   Private Sub objDGeneralFunction_VariableWritten(ByVal errorCode As Short)
-      If errorCode <> 0 Then
-         MessageBox.Show("Error from VariableWritten:" & " " & errorCode.ToString())
-      Else
-         MessageBox.Show("VariableWritten successfully")
-      End If
-   End Sub
-
-   Private Sub objErrorHandler_ErrorOnCnc(ByVal cnc As Short, ByVal channel As Short, ByVal [set] As Short)
-      'AplCncNumber.Add(cnc)
-      'AplChannel.Add(channel)
-      'AplSet.Add([set])
-   End Sub
-
-   Private Sub objErrorHandler_ErrorOnOtherChannel(ByVal status As Short)
-      'AplStatus = status
-   End Sub
-
-   Private Sub objErrorHandler_Exception(ByVal status As Short)
-      'ExceptStatus = status
-   End Sub
-
-   Friend Sub objErrorHandler_ErrorFromActiveCnc2(ErrorNumber As List(Of Integer))
-      ' resetto stati bFound
-      For Each Message In m_ReadFXMessages
-         Message.bFound = False
-      Next
-
-      For index As Integer = 0 To ErrorNumber.Count - 1
-         Dim nIndex As Integer = index
-         Dim NewMessageInList As ReadMessages = m_ReadFXMessages.FirstOrDefault(Function(x) x.CMsgCncNumber = 0.ToString() AndAlso
-                                                                                            x.CMsgErrorType = 6.ToString() AndAlso
-                                                                                            x.CMsgErrorIndex = "" AndAlso
-                                                                                            x.CMsgErrorNumber = ErrorNumber(nIndex).ToString() AndAlso
-                                                                                            x.CMsgErrorLine = "" AndAlso
-                                                                                            x.CMsgErrorMessage = "")
-         ' se il messaggio e' gia' in lista
-         If Not IsNothing(NewMessageInList) Then
-            ' lo segno come trovato
-            NewMessageInList.bFound = True
-         Else
-            ' lo aggiungo
-            Dim NewMessage As ReadMessages = New ReadMessages(0.ToString(),
-                                                              6.ToString(),
-                                                              "",
-                                                              ErrorNumber(index).ToString(),
-                                                              "",
-                                                              "",
-                                                              "")
-            NewMessage.bFound = True
-            m_ReadFXMessages.Add(NewMessage)
-            m_NUMAlarmCallbackDlg(0, 0, 6.ToString(), "", ErrorNumber(index).ToString(), "", "", "")
-         End If
-      Next
-
-      ' cancello messaggi non trovati
-      For Index = m_ReadFXMessages.Count - 1 To 0 Step -1
-         Dim Message As ReadMessages = m_ReadFXMessages(Index)
-         If Not Message.bFound Then
-            m_NUMAlarmCallbackDlg(Message.CMsgCncNumber, 1, Message.CMsgErrorType, Message.CMsgErrorIndex, Message.CMsgErrorNumber, Message.CMsgErrorLine, Message.CMsgErrorMessage, Message.CMsgErrorAdditional)
-            m_ReadFXMessages.RemoveAt(Index)
-         End If
-      Next
-
-   End Sub
-
-#Region "PLC Variables"
-
-   Private Sub objDPlcVariables_ReadVariablesChanged(ByVal index As Object, ByVal value As Object)
-      Dim _ObjIndex As Object() = CType(index, Object())
-      Dim _ObjValue As Object() = CType(value, Object())
-
-      For index = 0 To _ObjIndex.Length - 1
-         Dim nObjIndex As Integer = Integer.Parse(_ObjIndex(index).ToString())
-         Dim CommVar As CommVar = m_ReadingVars.FirstOrDefault(Function(x) Not IsNothing(x) AndAlso
-                                                                           x.Paragraph = CommVar.Paragraphs.MAIN AndAlso
-                                                                           x.nType = CommVar.Types.CN AndAlso
-                                                                           x.Index = nObjIndex)
-         If Not IsNothing(CommVar) Then
-            CommVar.SetValue(_ObjValue(index).ToString())
-         End If
-      Next
-   End Sub
-
-   Private Sub objDPlcVariables_ReadPLCVariablesChanged(ByVal index As Object, ByVal value As Object)
-      Dim _ObjIndex As Object() = CType(index, Object())
-      Dim _ObjValue As Object() = CType(value, Object())
-
-      For index = 0 To _ObjIndex.Length - 1
-         Dim nObjIndex As Integer = Integer.Parse(_ObjIndex(index).ToString())
-         Dim CommVar As CommVar = m_ReadingVars.FirstOrDefault(Function(x) Not IsNothing(x) AndAlso
-                                                                           x.Paragraph = CommVar.Paragraphs.MAIN AndAlso
-                                                                           x.nType = CommVar.Types.PLC AndAlso
-                                                                           x.Index = nObjIndex)
-         If Not IsNothing(CommVar) Then
-            CommVar.SetValue(_ObjValue(index).ToString())
-         End If
-      Next
-   End Sub
-
-   Private Sub objDPlcVariables_InvalidReadList(ByVal errorCode As Short)
-      EgtOutLog("InvalidReadList - ErrorCode: " & errorCode)
-   End Sub
-
-   Private Sub objDPlcVariables_AbortReadVariables()
-      EgtOutLog("InvalidReadList - ErrorCode: ")
-   End Sub
-
-   Private Sub objDPlcVariables_ReadOnceVariablesChanged(ByVal lHandle As Integer, ByVal value As Object)
-      'Dim _ObjValue As Object() = CType(value, Object())
-
-      'If lHandle = 10 Then
-
-      '   For i As Integer = 0 To _ObjValue.Length - 1
-      '      _ReadPlcVariableOnetime(i).Invoke(CType(Function()
-      '                                                 _ReadPlcVariableOnetime(i).Text = _ObjValue(i).ToString()
-      '                                              End Function, MethodInvoker))
-      '   Next
-      'End If
-   End Sub
-
-   Private Sub objDPlcVariables_VariablesWritten2(ByVal lHandle As Integer, ByVal errorCode As Integer)
-      Dim bOk As Boolean = (errorCode <> 0)
-      m_ResultCallbackDlg(CommandTypes.WRITE, If(bOk, CommandStates.OK, CommandStates.ERROR_), ResultTypes.RESULT, If(bOk, "", "Error VariablesWritten2 :" & " " & errorCode.ToString()))
-   End Sub
-
-#End Region    ' PLC Variables
-
-#Region "ReadELS"
-
-   Private Sub objDReadELS_ValueChanged(ByVal nHandle As Short, ByVal dValue As Double, ByVal nerrorCode As Short)
-      If nHandle < 1 OrElse nHandle > m_ReadingVars.Count - 1 Then Return
-      If nerrorCode <> 0 Then EgtOutLog(" Error in Validchanged2 : " & nerrorCode & " Handle : " & nHandle)
-
-      Try
-         m_ReadingVars(nHandle - 1).SetValue(dValue.ToString("F04"))
-      Catch Ex As Exception
-         EgtOutLog(Ex.Message)
-      End Try
-   End Sub
-
-#End Region    ' ReadELS
-
-#Region "File transfer"
-
-   Private Sub objDFileTransfer_Completed(ByVal lHandle As Integer)
-      If lHandle = 10 OrElse lHandle = 20 Then
-         'resetto contatore di trasferimento
-         m_BytesTransferedCounter = 0
-         EgtOutLog("Up- or Download successful completed:" & " " & lHandle.ToString())
-         ' aggiorno variabili del MAIN
-         Dim ISONumVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_NUM)
-         Dim ISOSentVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = ISO_SENT)
-         Dim SentMachGroup As MyMachGroupVM = Map.refSupervisorMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x As MyMachGroupVM) x.bSendingToMachine)
-         If Not IsNothing(SentMachGroup) Then
-            ISONumVariable.sValue = SentMachGroup.Name
-            ISOSentVariable.sValue = 0
-            SentMachGroup.SetSentToMachine(True)
-         End If
-      End If
-   End Sub
-
-   Private Sub objDFileTransfer_TransferStarted(ByVal lHandle As Integer)
-      EgtOutLog("Transfer has been started !")
-   End Sub
-
-   Private Sub objDFileTransfer_Failed(ByVal lHandle As Integer, ByVal nSeq As Short, ByVal nReason As Short)
-      EgtOutLog("Sequence:" & " " & nSeq.ToString() & " " & "Reason:" & " " & nReason.ToString())
-   End Sub
-
-   Private Sub objDFileTransfer_BytesTransfered(ByVal lHandle As Integer, ByVal lBytes As Integer)
-      m_BytesTransferedCounter += lBytes
-   End Sub
-
-#End Region    ' File transfer
-
-#Region "Position"
-
-   Private Sub objDPosition_PositionChanged(ByVal vtArrayIndex As Object, ByVal vtArrayValues As Object)
-      Dim _indexArray As Object() = CType(vtArrayIndex, Object())
-      Dim _valueArray As Object() = CType(vtArrayValues, Object())
-
-      For _index As Integer = 0 To _indexArray.Length - 1
-
-         Dim _index1 As Int16 = CType(_indexArray.GetValue(_index), Int16)
-         Dim _axisPosValue As Int32 = CType(_valueArray.GetValue(_index), Int32)
-         Dim _axisRefPosValue As Single = CSng(_axisPosValue) / m_LinearAxisPrecision
-         m_AxisCoordinatesCallbackDlg(_axisPosValue, _index1)
-
-      Next
-   End Sub
-
-#End Region    ' Position
-
-#Region "MDI"
-
-   Private Sub objDMdiCommand_CommandWritten(ByVal retVal As Short)
-      If retVal <> 0 Then
-         EgtOutLog("Error CommandWritten :" & " " & retVal.ToString())
-      End If
-      Map.refMDIPageVM.SendMDIResult(retVal)
-   End Sub
-
-#End Region    ' MDI
-
-#Region "Variables"
-
-   Private Sub objDVariables_VariableWritten2(ByVal lHandle As Integer, ByVal errorCode As Short)
-      If lHandle <> 2 OrElse errorCode <> 0 Then
-         EgtOutLog(" Error on objDVariables_VariableWritten2 : handle " & lHandle.ToString() & " errorCode : " & errorCode.ToString())
-      End If
-   End Sub
-
-   Private Sub objDVariables_VariableWritten(ByVal errorCode As Short)
-      If errorCode <> 0 Then
-         EgtOutLog(" Error on objDVariables_VariableWritten errorCode : " & errorCode.ToString())
-      End If
-   End Sub
-
-   Private Sub objDVariables_ValueChanged(ByVal vtArrayIndex As Object, ByVal vtArrayValues As Object)
-      Dim AplArrayIndex As Object() = CType(vtArrayIndex, Object())
-      Dim AplArrayValue As Object() = CType(vtArrayValues, Object())
-
-      For index As Integer = 0 To AplArrayIndex.Length - 1
-         Dim nHandle As Integer = CType(AplArrayIndex.GetValue(index), Int16)
-         If nHandle < 1 OrElse nHandle > m_ReadingVars.Count - 1 Then Return
-         Dim dValue As Double = CDbl(AplArrayValue.GetValue(index))
-         Try
-            m_ReadingVars(nHandle - 1).SetValue(dValue.ToString("F04"))
-         Catch Ex As Exception
-            EgtOutLog(Ex.Message)
-         End Try
-      Next
-   End Sub
-
-#End Region    ' Variables
-
-#Region "CNCMode"
-
-   Private Sub objDCncMode_ValueChanged(ByVal mode As Short, ByVal preselected As Short)
-      m_OpModeCallbackDlg(mode)
-   End Sub
-
-#End Region    ' CNCMode
-
-#Region "ReadOperatorMessage"
-
-   Private Sub objDReadOperatorMessage_ValueChanged(ByVal line As Object)
-      ' resetto stati bFound
-      For Each Message In m_ReadOperatorMessages
-         Message.bFound = False
-      Next
-      Dim objLine As String = TryCast(line, String)
-      Dim OpMsgErrType As Integer = 30
-      Dim NewMessageInList As ReadMessages = m_ReadOperatorMessages.FirstOrDefault(Function(x) x.CMsgCncNumber = 0 AndAlso
-                                                                                               x.CMsgErrorType = OpMsgErrType.ToString() AndAlso
-                                                                                               x.CMsgErrorIndex = "" AndAlso
-                                                                                               x.CMsgErrorNumber = "" AndAlso
-                                                                                               x.CMsgErrorLine = "" AndAlso
-                                                                                               x.CMsgErrorMessage = objLine AndAlso
-                                                                                               x.CMsgErrorAdditional = "")
-      ' se il messaggio e' gia' in lista
-      If Not IsNothing(NewMessageInList) Then
-         ' lo segno come trovato
-         NewMessageInList.bFound = True
-      Else
-         ' se e' diverso da stringa vuota
-         If Not String.IsNullOrWhiteSpace(objLine.ToString()) Then
-            ' lo aggiungo
-            Dim NewMessage As ReadMessages = New ReadMessages(0,
-                                                           OpMsgErrType.ToString(),
-                                                           "",
-                                                           "",
-                                                           "",
-                                                           objLine,
-                                                           "")
-            NewMessage.bFound = True
-            m_ReadOperatorMessages.Add(NewMessage)
-            m_NUMAlarmCallbackDlg(0, 0, OpMsgErrType.ToString(), "", "", "", objLine, "")
-         End If
-      End If
-
-      ' cancello messaggi non trovati
-      If m_ReadOperatorMessages.Count > 0 Then
-         For Index = m_ReadOperatorMessages.Count - 1 To 0 Step -1
-            Dim Message As ReadMessages = m_ReadOperatorMessages(Index)
-            If Not Message.bFound Then
-               m_NUMAlarmCallbackDlg(Message.CMsgCncNumber, 1, Message.CMsgErrorType, Message.CMsgErrorIndex, Message.CMsgErrorNumber, Message.CMsgErrorLine, Message.CMsgErrorMessage, Message.CMsgErrorAdditional)
-               m_ReadOperatorMessages.RemoveAt(Index)
-            End If
-         Next
-      End If
-
-   End Sub
-
-#End Region    ' ReadOperatorMessage
-
-#End Region    ' EVENTS
-
-End Class

EgtBEAMWALL.Supervisor/Comms/NUMFlexiumComm.vb

@@ -53,7 +53,7 @@ Public Class NUMFlexiumComm
    Private m_ReadFXMessages As New List(Of ReadMessages)
    Private m_ReadOperatorMessages As New List(Of ReadMessages)
    ' lista variabili in lettura
-   Private Shared m_ReadingVars(230) As CommVar
+   Private Shared m_ReadingVars(100) As CommVar
    Private m_BytesTransferedCounter As Integer
    Private m_LinearAxisPrecision As Integer
 
@@ -368,31 +368,6 @@ Public Class NUMFlexiumComm
 
    Friend Sub FileDownload(sFileType As String, sFilePath As String)
       Dim _Return_Download As Short
-      '' leggo variabile E30099
-      'Dim SendPermissionVariable As Variable = Map.refMachCommandMessagePanelVM.MainVariablesList.FirstOrDefault(Function(x) x.sName = SENDPERMISSION)
-      'Dim dTemp As Double = 0
-      'Dim nSendPermission As Integer = 0
-      'EgtOutLog("Inizio invio programma")
-      'While nSendPermission <> 2
-      '   Dim bFirstWriteOne = True
-      '   EgtOutLog("Inizio ciclo verifica diverso da 2")
-      '   ' leggo valore
-      '   If Not IsNothing(SendPermissionVariable.sValue) Then
-      '      StringToDoubleAdv(SendPermissionVariable.sValue, dTemp)
-      '      Integer.TryParse(dTemp, nSendPermission)
-      '      EgtOutLog("Lettura variabile E30099: " & nSendPermission)
-      '   Else
-      '      EgtOutLog("nSendPermission = -1")
-      '      nSendPermission = -1
-      '   End If
-      '   ' se uguale a zero ci scrivo uno
-      '   If nSendPermission = 0 And bFirstWriteOne Then
-      '      bFirstWriteOne = False
-      '      SendPermissionVariable.sValue = 1
-      '      EgtOutLog("Scrittura variabile E30099 = 1")
-      '   End If
-      '   Threading.Thread.Sleep(1000)
-      'End While
 
       _Return_Download = objDFileTransfer.FileDownload2(10, sFileType, sFilePath, "", 1, 0)
 
@@ -449,7 +424,7 @@ Public Class NUMFlexiumComm
    Friend Sub WriteNCVariables(Address As String, value As String)
       Try
          Dim dValue As Double = 0
-         StringToDoubleAdv(value, dValue)
+         StringToDouble(value, dValue)
          Dim rc As Short = objDVariables.WriteVariables2(2, objDGroupManager.Handle, Address, dValue)
 
          If rc <> 0 Then EgtOutLog(" objDVariables.WriteVariables2() Error : " & rc)
@@ -476,9 +451,7 @@ Public Class NUMFlexiumComm
 
    Private Sub objDGeneralFunction_ProgramActivated(ByVal nerrorCode As Short)
       EgtOutLog("Part program activated:" & " " & nerrorCode)
-      'DbControllers.m_LogMachineController.Create(MachLog.CreateResultLog(CommandTypes.SENDPROG, CommandStates.OK, ResultTypes.EXECUTED, "Part program activated:" & " " & nerrorCode))
-      ' scrivo evento programma attivato
-      DbControllers.m_LogMachineController.Create(LogEvent.CreateMachCommandLog(LogEvent.MachineCommands.PROGRAM_ACTIVATION, "", nerrorCode, DbControllers.SupervisorId))
+      DbControllers.m_LogMachineController.Create(MachLog.CreateResultLog(CommandTypes.SENDPROG, CommandStates.OK, ResultTypes.EXECUTED, "Part program activated:" & " " & nerrorCode))
    End Sub
 
    Private Sub objDGeneralFunction_OnCncStart(ByVal errorCode As Short)
@@ -556,14 +529,13 @@ Public Class NUMFlexiumComm
       Dim AplErrorAdditional As Object() = CType(ErrorAdditional, Object())
 
       For index As Integer = 0 To numberOfError - 1
-         Dim nIndex As Integer = index
          Dim NewMessageInList As ReadMessages = m_ReadFXMessages.FirstOrDefault(Function(x) x.CMsgCncNumber = AplCnCNumber AndAlso
-                                                                                            x.CMsgErrorType = AplErrorType(nIndex).ToString() AndAlso
-                                                                                            x.CMsgErrorIndex = AplErrorIndex(nIndex).ToString() AndAlso
-                                                                                            x.CMsgErrorNumber = AplErrorNumber(nIndex).ToString() AndAlso
-                                                                                            x.CMsgErrorLine = AplErrorLine(nIndex).ToString() AndAlso
-                                                                                            x.CMsgErrorMessage = AplErrorMessage(nIndex).ToString() AndAlso
-                                                                                            x.CMsgErrorAdditional = AplErrorAdditional(nIndex).ToString())
+                                                                                            x.CMsgErrorType = AplErrorType(index).ToString() AndAlso
+                                                                                            x.CMsgErrorIndex = AplErrorIndex(index).ToString() AndAlso
+                                                                                            x.CMsgErrorNumber = AplErrorNumber(index).ToString() AndAlso
+                                                                                            x.CMsgErrorLine = AplErrorLine(index).ToString() AndAlso
+                                                                                            x.CMsgErrorMessage = AplErrorMessage(index).ToString() AndAlso
+                                                                                            x.CMsgErrorAdditional = AplErrorAdditional(index).ToString())
          ' se il messaggio e' gia' in lista
          If Not IsNothing(NewMessageInList) Then
             ' lo segno come trovato
@@ -917,13 +889,12 @@ Public Class NUMFlexiumComm
       Dim objLine As Object() = CType(line, Object())
       Dim OpMsgErrType As Integer = 30
       For index As Integer = 0 To objMsgNumber.Length - 1
-         Dim nIndex As Integer = index
          Dim NewMessageInList As ReadMessages = m_ReadOperatorMessages.FirstOrDefault(Function(x) x.CMsgCncNumber = 0 AndAlso
                                                                                                   x.CMsgErrorType = OpMsgErrType.ToString() AndAlso
                                                                                                   x.CMsgErrorIndex = "" AndAlso
-                                                                                                  x.CMsgErrorNumber = objMsgNumber(nIndex).ToString() AndAlso
+                                                                                                  x.CMsgErrorNumber = objMsgNumber(index).ToString() AndAlso
                                                                                                   x.CMsgErrorLine = "" AndAlso
-                                                                                                  x.CMsgErrorMessage = objLine(nIndex).ToString() AndAlso
+                                                                                                  x.CMsgErrorMessage = objLine(index).ToString() AndAlso
                                                                                                   x.CMsgErrorAdditional = "")
          ' se il messaggio e' gia' in lista
          If Not IsNothing(NewMessageInList) Then

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)
@@ -93,7 +93,7 @@ Public Class TPAComm
       System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(channel, False)
       Dim remoteType As System.Runtime.Remoting.WellKnownClientTypeEntry = New System.Runtime.Remoting.WellKnownClientTypeEntry(GetType(ISOCNC.Remoting_Server), serverURI)
       System.Runtime.Remoting.RemotingConfiguration.RegisterWellKnownClientType(remoteType)
-      Dim objectUri As String = Nothing
+      Dim objectUri As String
       Dim messageSink As System.Runtime.Remoting.Messaging.IMessageSink = channel.CreateMessageSink("ipc://localhost:9090/IRemoteObject.rem", Nothing, objectUri)
       Console.WriteLine("The URI of the message sink is {0}.", objectUri)
 
@@ -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,7 +122,6 @@ 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
@@ -131,7 +130,6 @@ 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
@@ -156,10 +154,9 @@ 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
@@ -242,7 +239,6 @@ Public Class TPAComm
    End Sub
 
    Private Sub RemoteObject_TickUpdate(ByVal newTick As ULong)
-      'EgtUILib.EgtOutLog("Tick: " & newTick)
    End Sub
 
 End Class