Refresh lib

EgtBEAMWALL.Core/Constants/ConstBeam.vb

@@ -101,6 +101,13 @@
       DOWN = 1
    End Enum
 
+   ' Tipo di progetto (Beam o Wall)
+    Public Enum BWType As Integer
+        NULL = 0
+        BEAM = 1
+        WALL = 2
+    End Enum
+    
    Public Const BTLFEATURES_FILE_NAME As String = "BTLFeatures.ini"
 
    'Public Const S_GENERAL As String = "General"
@@ -112,12 +119,6 @@
       PROD = 2
    End Enum
 
-   ' Tipo di progetto (Beam o Wall)
-   Public Enum BWType As Integer
-      BEAM = 1
-      WALL = 2
-   End Enum
-
    Friend Const PROJ As String = "PROJ"
    Friend Const FILENAMESEPARATOR As Char = "^"c
    Friend Const BTLINFO As String = "BtlInfo"

EgtBEAMWALL.Core/EgtBEAMWALL.Core.vbproj

@@ -180,6 +180,6 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent>
+    <!-- <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.Core.dll</PostBuildEvent> -->
   </PropertyGroup>
 </Project>

EgtBEAMWALL.Core/ProdFileM.vb

@@ -2,41 +2,55 @@
 Imports EgtUILib
 
 Public Class ProdFileM
-   Inherits ProjectFileM
+    Inherits ProjectFileM
 
-   Protected m_nProjIdList As List(Of Integer)
+#Region "Protected Fields"
-   Public ReadOnly Property nProjIdList As List(Of Integer)
-      Get
-         Return m_nProjIdList
-      End Get
-   End Property
 
-   Protected m_sName As String
+    Protected m_nProjIdList As List(Of Integer)
-   Public ReadOnly Property sName As String
+    Protected m_sName As String
-      Get
-         Return m_sName
-      End Get
-   End Property
 
-#Region "CONSTRUCTORS"
+#End Region
 
-   Protected Sub New()
+#Region "Protected Constructors"
-   End Sub
 
-   Public Shared Function CreateNewProdFileM() As ProdFileM
+    Protected Sub New()
-      Return New ProdFileM
+    End Sub
-   End Function
 
-   Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer),
+#End Region
-                                             dtCreateProjDate As DateTime, sName As String) As ProdFileM
-      Dim NewProjectFileM As New ProdFileM
-      NewProjectFileM.m_nProdId = nProdId
-      NewProjectFileM.m_nProjIdList = nProjIdList
-      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
-      NewProjectFileM.m_sName = sName
-      Return NewProjectFileM
-   End Function
 
-#End Region    ' CONSTRUCTORS
+#Region "Public Properties"
+
+    Public ReadOnly Property nProjIdList As List(Of Integer)
+        Get
+            Return m_nProjIdList
+        End Get
+    End Property
+
+    Public ReadOnly Property sName As String
+        Get
+            Return m_sName
+        End Get
+    End Property
+
+#End Region
+
+#Region "Public Methods"
+
+    Public Shared Function CreateNewProdFileM() As 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) 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
+
+        Return NewProjectFileM
+    End Function
+
+#End Region
 
 End Class

EgtBEAMWALL.Core/ProjFileM.vb

@@ -2,55 +2,71 @@
 Imports EgtUILib
 
 Public Class ProjFileM
-   Inherits ProjectFileM
+    Inherits ProjectFileM
 
-   Protected m_dtExportDate As DateTime
+#Region "Protected Fields"
-   Public ReadOnly Property dtExportDate As DateTime
-      Get
-         Return m_dtExportDate
-      End Get
-   End Property
 
-   Protected m_sListName As String
+    Protected m_dtExportDate As DateTime
-   Public ReadOnly Property sListName As String
+    Protected m_sBTLFileName As String = String.Empty
-      Get
-         Return m_sListName
-      End Get
-   End Property
 
-   Protected m_sBTLFileName As String = String.Empty
+    Protected m_sListName As String
-   Public Property sBTLFileName As String
-      Get
-         Return m_sBTLFileName
-      End Get
-      Set(value As String)
-         m_sBTLFileName = value
-      End Set
-   End Property
 
-#Region "CONSTRUCTORS"
+#End Region
 
-   Protected Sub New()
+#Region "Protected Constructors"
-   End Sub
 
-   Public Shared Function CreateNewProjFileM() As ProjFileM
+    Protected Sub New()
-      Return New ProjFileM
+    End Sub
-   End Function
 
-   Public Shared Function CreateProjFileM(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime,
+#End Region
-                                          dtExportDate As DateTime, sListName As String, sBTLFileName As String, IsNew As Boolean, IsLocked As Boolean) As ProjFileM
-      Dim NewProjectFileM As New ProjFileM
-      NewProjectFileM.m_nProjId = nProjId
-      NewProjectFileM.m_nProdId = nProdId
-      NewProjectFileM.m_dtCreateDate = dtCreateProjDate
-      NewProjectFileM.m_dtExportDate = dtExportDate
-      NewProjectFileM.m_sListName = sListName
-      NewProjectFileM.m_sBTLFileName = sBTLFileName
-      NewProjectFileM.m_bIsNew = IsNew
-      NewProjectFileM.m_bIsLocked = IsLocked
-      Return NewProjectFileM
-   End Function
 
-#End Region    ' CONSTRUCTORS
+#Region "Public Properties"
+
+    Public ReadOnly Property dtExportDate As DateTime
+        Get
+            Return m_dtExportDate
+        End Get
+    End Property
+
+    Public Property sBTLFileName As String
+        Get
+            Return m_sBTLFileName
+        End Get
+        Set(value As String)
+            m_sBTLFileName = value
+        End Set
+    End Property
+
+    Public ReadOnly Property sListName As String
+        Get
+            Return m_sListName
+        End Get
+    End Property
+
+#End Region
+
+#Region "Public Methods"
+
+    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, IsNew As Boolean, IsLocked As Boolean, nType As BWType) As ProjFileM
+        Dim NewProjectFileM As New ProjFileM
+        NewProjectFileM.m_nProjId = nProjId
+        NewProjectFileM.m_nProdId = nProdId
+        NewProjectFileM.m_dtCreateDate = dtCreateProjDate
+        NewProjectFileM.m_dtExportDate = dtExportDate
+        NewProjectFileM.m_sListName = sListName
+        NewProjectFileM.m_sBTLFileName = sBTLFileName
+        NewProjectFileM.m_bIsNew = IsNew
+        NewProjectFileM.m_bIsLocked = IsLocked
+        NewProjectFileM.m_nType = nType
+
+        Return NewProjectFileM
+    End Function
+
+#End Region
 
 End Class

EgtBEAMWALL.Core/ProjectFileM.vb

@@ -3,70 +3,85 @@ Imports EgtUILib
 
 Public Class ProjectFileM
 
-   'Protected m_nProjectType As ProjectType
+    'Protected m_nProjectType As ProjectType
-   'Public ReadOnly Property nProjectType As ProjectType
+    'Public ReadOnly Property nProjectType As ProjectType
-   '   Get
+    '   Get
-   '      Return m_nProjectType
+    '      Return m_nProjectType
-   '   End Get
+    '   End Get
-   'End Property
+    'End Property
-   'Public Sub SetProjectType(nProjectType As ProjectType)
+    'Public Sub SetProjectType(nProjectType As ProjectType)
-   '   m_nProjectType = nProjectType
+    '   m_nProjectType = nProjectType
-   'End Sub
+    'End Sub
 
-   Protected m_nProjId As Integer = 0
+#Region "Protected Fields"
-   Public ReadOnly Property nProjId As Integer
-      Get
-         Return m_nProjId
-      End Get
-   End Property
 
-   Protected m_nProdId As Integer = 0
+    Protected m_bIsLocked As Boolean
-   Public ReadOnly Property nProdId As Integer
+    Protected m_bIsNew As Boolean
-      Get
+    Protected m_dtCreateDate As DateTime
-         Return m_nProdId
+    Protected m_nProdId As Integer = 0
-      End Get
+    Protected m_nProjId As Integer = 0
-   End Property
+    Protected m_nType As BWType
 
-   Protected m_dtCreateDate As DateTime
+#End Region
-   Public ReadOnly Property dtCreateDate As DateTime
-      Get
-         Return m_dtCreateDate
-      End Get
-   End Property
 
-   Protected m_bIsNew As Boolean
+#Region "Public Properties"
-   Public Property bIsNew As Boolean
-      Get
-         Return m_bIsNew
-      End Get
-      Set(value As Boolean)
-         m_bIsNew = value
-      End Set
-   End Property
 
-   Protected m_bIsLocked As Boolean
+    Public Property bIsLocked As Boolean
-   Public Property bIsLocked As Boolean
+        Get
-      Get
+            Return m_bIsLocked
-         Return m_bIsLocked
+        End Get
-      End Get
+        Set(value As Boolean)
-      Set(value As Boolean)
+            m_bIsLocked = value
-         m_bIsLocked = value
+        End Set
-      End Set
+    End Property
-   End Property
 
-#Region "CONSTRUCTORS"
+    Public Property bIsNew As Boolean
+        Get
+            Return m_bIsNew
+        End Get
+        Set(value As Boolean)
+            m_bIsNew = value
+        End Set
+    End Property
 
-   'Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
+    Public ReadOnly Property dtCreateDate As DateTime
-   '   m_nProjectType = nProjectType
+        Get
-   '   If m_nProjectType = ProjectType.PROJ Then
+            Return m_dtCreateDate
-   '      m_nProjId = nProjId
+        End Get
-   '      m_nProdId = nProdId
+    End Property
-   '      m_BTLFileName = sBTLFileName
-   '   ElseIf m_nProjectType = ProjectType.PROD Then
-   '      m_nProdId = nProdId
-   '   End If
-   'End Sub
 
-#End Region    ' CONSTRUCTORS
+    Public ReadOnly Property nProdId As Integer
+        Get
+            Return m_nProdId
+        End Get
+    End Property
+
+    Public ReadOnly Property nProjId As Integer
+        Get
+            Return m_nProjId
+        End Get
+    End Property
+
+    Public Property nType As BWType
+        Get
+            Return m_nType
+        End Get
+        Set(value As BWType)
+            m_nType = value
+        End Set
+    End Property
+
+#End Region
+
+    'Sub New(nProjectType As ProjectType, nProjId As Integer, nProdId As Integer, sBTLFileName As String)
+    '   m_nProjectType = nProjectType
+    '   If m_nProjectType = ProjectType.PROJ Then
+    '      m_nProjId = nProjId
+    '      m_nProdId = nProdId
+    '      m_BTLFileName = sBTLFileName
+    '   ElseIf m_nProjectType = ProjectType.PROD Then
+    '      m_nProdId = nProdId
+    '   End If
+    'End Sub
 
 End Class

EgtBEAMWALL.DataLayer/Controllers/ProdController.cs

@@ -200,7 +200,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         {
             var currProd = FindByProdId(ProdId);
 
-            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description);
+            return Core.ProdFileM.CreateProdFileM(currProd.ProdId, ProjIdByProd(ProdId), currProd.DtCreated, currProd.Description, currProd.PType);
         }
 
         /// <summary>
@@ -213,7 +213,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
             List<Core.ProdFileM> result = new List<Core.ProdFileM>();
             var dbResult = GetLastDbModelDesc(numRecord);
             // conversione
-            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description)).ToList();
+            result = dbResult.Select(x => Core.ProdFileM.CreateProdFileM(x.ProdId, ProjIdByProd(x.ProdId), x.DtCreated, x.Description, currProd.PType)).ToList();
             return result;
         }
 
@@ -244,17 +244,17 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 nextId = maxRecord.ProdId + 1;
             }
 
-            // creo nuovo PROD...
-            var newProd = dbCtx
-                .ProdList
-                .Add(new ProdModel() { ProdId = nextId, Locked = true, DtCreated = DateTime.Now });
-
             // cerco Proj
             var currProj = dbCtx
                 .ProjList
                 .Where(x => x.ProjId == ProjId)
                 .FirstOrDefault();
 
+            // creo nuovo PROD...
+            var newProd = dbCtx
+                .ProdList
+                .Add(new ProdModel() { ProdId = nextId, Locked = true, DtCreated = DateTime.Now, PType = currProj.PType });
+
             // aggiungo proj-prod
             currProj.ProdDbId = newProd.ProdDbId;
             currProj.Locked = true;

EgtBEAMWALL.DataLayer/Controllers/ProjController.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using EgtBEAMWALL.DataLayer.DatabaseModels;
+using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.Controllers
 {
@@ -33,7 +34,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <returns></returns>
         protected Core.ProjFileM coreConv(ProjModel currProj)
         {
-            Core.ProjFileM answ = Core.ProjFileM.CreateProjFileM(currProj.ProjId, ProdIdByProdDbId(currProj.ProdDbId), currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.IsNew, currProj.Locked);
+            Core.ProjFileM answ = Core.ProjFileM.CreateProjFileM(currProj.ProjId, ProdIdByProdDbId(currProj.ProdDbId), currProj.DtCreated, currProj.DtExported, currProj.ListName, currProj.BTLFileName, currProj.IsNew, currProj.Locked, currProj.PType);
             return answ;
         }
 
@@ -336,7 +337,7 @@ namespace EgtBEAMWALL.DataLayer.Controllers
                 //currProjs.ForEach(x => x.Locked = Locked);
                 foreach (var item in currProjs)
                 {
-               //item.ProdDbId = currProd.ProdDbId;
+                    //item.ProdDbId = currProd.ProdDbId;
                     item.Locked = Locked;
                     dbCtx.Entry(item).State = System.Data.Entity.EntityState.Modified;
                 }
@@ -498,13 +499,14 @@ namespace EgtBEAMWALL.DataLayer.Controllers
         /// <param name="ListName"></param>
         /// <param name="DtExported"></param>
         /// <returns></returns>
-        public Core.ProjFileM UpdateInfo(int ProjId, string BTLFileName, string ListName, DateTime DtExported)
+        public Core.ProjFileM UpdateInfo(int ProjId, string BTLFileName, string ListName, DateTime DtExported, BWType PType)
         {
             var currData = FindByProjId(ProjId);
             // aggiorno valore BTL
             currData.BTLFileName = BTLFileName;
             currData.DtExported = DtExported;
             currData.ListName = ListName;
+            currData.PType = PType;
 
             // Commit changes
             dbCtx.SaveChanges();

EgtBEAMWALL.DataLayer/DatabaseModels/ProdModel.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
@@ -48,6 +49,11 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("Id")]
         public int ProdId { get; set; }
 
+        /// <summary>
+        /// Tipologia del progetto (Travi, Pareti, ...)
+        /// </summary>
+        public BWType PType { get; set; } = BWType.NULL;
+
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/DatabaseModels/ProjModel.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Text;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
+using static EgtBEAMWALL.Core.ConstBeam;
 
 namespace EgtBEAMWALL.DataLayer.DatabaseModels
 {
@@ -60,6 +61,11 @@ namespace EgtBEAMWALL.DataLayer.DatabaseModels
         [Column("Id")]
         public int ProjId { get; set; }
 
+        /// <summary>
+        /// Tipologia del progetto (Travi, Pareti, ...)
+        /// </summary>
+        public BWType PType { get; set; } = BWType.NULL;
+
         #endregion Public Properties
     }
 }

EgtBEAMWALL.DataLayer/EgtBEAMWALL.DataLayer.csproj

@@ -114,6 +114,14 @@
     <Compile Include="Migrations\202105051121209_renameIndex.designer.cs">
       <DependentUpon>202105051121209_renameIndex.cs</DependentUpon>
     </Compile>
+    <Compile Include="Migrations\202107141618197_AddBwProjType.cs" />
+    <Compile Include="Migrations\202107141618197_AddBwProjType.designer.cs">
+      <DependentUpon>202107141618197_AddBwProjType.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Migrations\202107150824339_AddBwProdType.cs" />
+    <Compile Include="Migrations\202107150824339_AddBwProdType.designer.cs">
+      <DependentUpon>202107150824339_AddBwProdType.cs</DependentUpon>
+    </Compile>
     <Compile Include="Migrations\Configuration.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Utils.cs" />
@@ -141,10 +149,16 @@
     <EmbeddedResource Include="Migrations\202105051121209_renameIndex.resx">
       <DependentUpon>202105051121209_renameIndex.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202107141618197_AddBwProjType.resx">
+      <DependentUpon>202107141618197_AddBwProjType.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Migrations\202107150824339_AddBwProdType.resx">
+      <DependentUpon>202107150824339_AddBwProdType.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.DataLayer.dll</PostBuildEvent>
+    <!-- <PostBuildEvent>copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.DataLayer.dll</PostBuildEvent> -->
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

EgtBEAMWALL.DataLayer/Migrations/202107141618197_AddBwProjType.Designer.cs

@@ -0,0 +1,29 @@
+// <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 AddBwProjType : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(AddBwProjType));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202107141618197_AddBwProjType"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202107141618197_AddBwProjType.cs

@@ -0,0 +1,18 @@
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddBwProjType : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ProjList", "PType", c => c.Int(nullable: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.ProjList", "PType");
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202107150824339_AddBwProdType.Designer.cs

@@ -0,0 +1,29 @@
+// <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 AddBwProdType : IMigrationMetadata
+    {
+        private readonly ResourceManager Resources = new ResourceManager(typeof(AddBwProdType));
+        
+        string IMigrationMetadata.Id
+        {
+            get { return "202107150824339_AddBwProdType"; }
+        }
+        
+        string IMigrationMetadata.Source
+        {
+            get { return null; }
+        }
+        
+        string IMigrationMetadata.Target
+        {
+            get { return Resources.GetString("Target"); }
+        }
+    }
+}

EgtBEAMWALL.DataLayer/Migrations/202107150824339_AddBwProdType.cs

@@ -0,0 +1,18 @@
+namespace EgtBEAMWALL.DataLayer.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddBwProdType : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.ProdList", "PType", c => c.Int(nullable: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.ProdList", "PType");
+        }
+    }
+}

EgtBEAMWALL.Supervisor/SupervisorManager/SupervisorManagerVM.vb

@@ -7,132 +7,137 @@ Imports EgtUILib
 Imports EgtWPFLib5
 
 Public Class SupervisorManagerVM
-   Inherits VMBase
+    Inherits VMBase
 
-#Region "FIELDS & PROPERTIES"
+#Region "Private Fields"
 
-   Private m_CurrProd As ProdFileVM
+    ' Definizione comandi
-   Friend Property CurrProd As ProdFileVM
+    Private m_cmdOpen As ICommand
-      Get
-         Return m_CurrProd
-      End Get
-      Set(value As ProdFileVM)
-         m_CurrProd = value
-      End Set
-   End Property
 
-   ' Definizione comandi
+    Private m_CurrProd As ProdFileVM
-   Private m_cmdOpen As ICommand
-   'Private m_cmdSave As ICommand
-   'Private m_cmdGoToProj As ICommand
 
-   '#Region "ToolTip"
+#End Region
 
-   '   'Proprietà ToolTip
+#Region "Public Constructors"
-   '   Public ReadOnly Property OpenToolTip As String
-   '      Get
-   '         Return EgtMsg(MSG_TOPCOMMANDBAR + 2)
-   '      End Get
-   '   End Property
-   '   Public ReadOnly Property SaveToolTip As String
-   '      Get
-   '         Return EgtMsg(MSG_TOPCOMMANDBAR + 3)
-   '      End Get
-   '   End Property
 
-   '#End Region ' ToolTip
+    Sub New()
+        ' Creo riferimento a questa classe in Map
+        Map.SetRefSupervisorManagerVM(Me)
+    End Sub
 
-#End Region    ' Fields & Properties
+#End Region
 
-#Region "CONSTRUCTOR"
+#Region "Internal Properties"
 
-   Sub New()
+    Friend Property CurrProd As ProdFileVM
-      ' Creo riferimento a questa classe in Map
+        Get
-      Map.SetRefSupervisorManagerVM(Me)
+            Return m_CurrProd
-   End Sub
+        End Get
+        Set(value As ProdFileVM)
+            m_CurrProd = value
+        End Set
+    End Property
 
-#End Region    ' CONSTRUCTOR
+#End Region
 
-#Region "METHODS"
+    'Private m_cmdSave As ICommand
+    'Private m_cmdGoToProj As ICommand
 
-   Public Function SetCurrProd(nProdId As Integer) As Boolean
+    '#Region "ToolTip"
-      Dim Currprod As ProdModel = DbControllers.m_ProdController.FindByProdId(nProdId)
-      If IsNothing(Currprod) Then Return False
-      m_CurrProd = New ProdFileVM(ProdFileM.CreateProdFileM(Currprod.ProdId, New List(Of Integer), Date.Now(), ""))
-      Return True
-   End Function
 
-#End Region    ' METHODS
+    '   'Proprietà ToolTip
+    '   Public ReadOnly Property OpenToolTip As String
+    '      Get
+    '         Return EgtMsg(MSG_TOPCOMMANDBAR + 2)
+    '      End Get
+    '   End Property
+    '   Public ReadOnly Property SaveToolTip As String
+    '      Get
+    '         Return EgtMsg(MSG_TOPCOMMANDBAR + 3)
+    '      End Get
+    '   End Property
 
-#Region "COMMANDS"
+#Region "Public Properties"
 
-#Region "OpenCommand"
+    ''' <summary>
+    ''' Returns a command that do Open.
+    ''' </summary>
+    Public ReadOnly Property OpenCommand As ICommand
+        Get
+            If m_cmdOpen Is Nothing Then
+                m_cmdOpen = New Command(AddressOf Open)
+            End If
+            Return m_cmdOpen
+        End Get
+    End Property
 
-   ''' <summary>
+#End Region
-   ''' Returns a command that do Open.
-   ''' </summary>
-   Public ReadOnly Property OpenCommand As ICommand
-      Get
-         If m_cmdOpen Is Nothing Then
-            m_cmdOpen = New Command(AddressOf Open)
-         End If
-         Return m_cmdOpen
-      End Get
-   End Property
 
-   ''' <summary>
+#Region "Internal Methods"
-   ''' Execute the Open.  This method is invoked by the OpenCommand.
-   ''' </summary>
-   Friend Sub Open()
-      OpenProject()
-   End Sub
 
-   Friend Sub OpenProject()
+    ''' <summary>
-      '' verifico se progetto modificato, e chiedo se salvare
+    ''' Execute the Open.  This method is invoked by the OpenCommand.
-      'ProdFileVM.VerifyProjectModification(CurrProd)
+    ''' </summary>
-      Dim sFilePath As String = ""
+    Friend Sub Open()
-      ' se la string è vuota
+        OpenProject()
-      Dim TempCurrProd As ProdFileVM
+    End Sub
-      Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
+
-      ' apro dialogo di scelta file
+    Friend Sub OpenProject()
-      OpenProjectFileDialogVM = New OpenProjectFileDialogVM
+        '' verifico se progetto modificato, e chiedo se salvare
-      Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
+        'ProdFileVM.VerifyProjectModification(CurrProd)
-      Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
+        Dim sFilePath As String = ""
-      If IsNothing(DialogResult) OrElse Not DialogResult Then Return
+        ' se la string è vuota
-      sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
+        Dim TempCurrProd As ProdFileVM
-      TempCurrProd = OpenProjectFileDialogVM.SelProject
+        Dim OpenProjectFileDialogVM As OpenProjectFileDialogVM = Nothing
-      If File.Exists(sFilePath) Then
+        ' apro dialogo di scelta file
-         If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
+        OpenProjectFileDialogVM = New OpenProjectFileDialogVM
-            m_CurrProd = TempCurrProd
+        Dim OpenFile As New OpenProjectFileDialogV(Application.Current.MainWindow, OpenProjectFileDialogVM)
-            Map.refMainWindowVM.UpdateTitle()
+        Dim DialogResult As Boolean? = OpenFile.EgtShowDialog(ProjectType.PROD)
-            'If Map.refMachGroupPanelVM.InitMachGroupList() Then
+        If IsNothing(DialogResult) OrElse Not DialogResult Then Return
-            '   m_CurrProd = TempCurrProd
+        sFilePath = OpenProjectFileDialogVM.SelProject.sProdPath
-            '   Map.refMainWindowVM.SetTitle(CurrProd.nProdId.ToString("0000") & " - EgtBEAMWALL")
+        TempCurrProd = OpenProjectFileDialogVM.SelProject
-            'Else
+        If File.Exists(sFilePath) Then
-            'MessageBox.Show("Impossibile aprire gruppi di lavorazione del file!!")
+            If Map.refSceneHostVM.MainController.OpenProject(sFilePath, False) Then
-            'Map.refSceneHostVM.MainController.NewProject()
+                m_CurrProd = TempCurrProd
-            'Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
+                Map.refMainWindowVM.UpdateTitle()
-            'End If
+                'If Map.refMachGroupPanelVM.InitMachGroupList() Then
-         Else
+                '   m_CurrProd = TempCurrProd
-            MessageBox.Show("Impossibile aprire il file!!")
+                '   Map.refMainWindowVM.SetTitle(CurrProd.nProdId.ToString("0000") & " - EgtBEAMWALL")
+                'Else
+                'MessageBox.Show("Impossibile aprire gruppi di lavorazione del file!!")
+                'Map.refSceneHostVM.MainController.NewProject()
+                'Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
+                'End If
+            Else
+                MessageBox.Show("Impossibile aprire il file!!")
+                Map.refSceneHostVM.MainController.NewProject()
+                Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
+            End If
+        Else
+            MessageBox.Show("File non trovato!!")
             Map.refSceneHostVM.MainController.NewProject()
             Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
-         End If
+        End If
-      Else
+        Map.refProjectVM.SupervisorMachGroupPanelVM = New MyMachGroupPanelVM(MachGroupPanelM.CreateNewMachGroupPanel())
-         MessageBox.Show("File non trovato!!")
+        Dim TempList As List(Of DataLayer.DatabaseModels.MachGroupModel) = DbControllers.m_MachGroupController.GetByProdSupervisor(Map.refSupervisorManagerVM.CurrProd.nProdId, m_SupervisorId)
-         Map.refSceneHostVM.MainController.NewProject()
+        For Each MachGroup In TempList
-         Map.refMainWindowVM.SetTitle("New - EgtBEAMWALL")
+            Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Add(Map.refProjectVM.ProdMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = MachGroup.MachGroupId))
-      End If
+        Next
-      Map.refProjectVM.SupervisorMachGroupPanelVM = New MyMachGroupPanelVM(MachGroupPanelM.CreateNewMachGroupPanel())
+        Map.refProjectVM.SupervisorMachGroupPanelVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList))
-      Dim TempList As List(Of DataLayer.DatabaseModels.MachGroupModel) = DbControllers.m_MachGroupController.GetByProdSupervisor(Map.refSupervisorManagerVM.CurrProd.nProdId, m_SupervisorId)
+    End Sub
-      For Each MachGroup In TempList
-         Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList.Add(Map.refProjectVM.ProdMachGroupPanelVM.MachGroupVMList.FirstOrDefault(Function(x) x.Id = MachGroup.MachGroupId))
-      Next
-      Map.refProjectVM.SupervisorMachGroupPanelVM.NotifyPropertyChanged(NameOf(Map.refProjectVM.SupervisorMachGroupPanelVM.MachGroupVMList))
-   End Sub
 
-#End Region ' OpenCommand
+#End Region
 
-#End Region    ' Commands
+#Region "Public Methods"
+
+    '#End Region ' ToolTip
+    Public Function SetCurrProd(nProdId As Integer) As Boolean
+        Dim Currprod As ProdFileM = DbControllers.m_ProdController.FindCoreByProdId(nProdId)
+        If IsNothing(Currprod) Then Return False
+        m_CurrProd = New ProdFileVM(Currprod)
+        Return True
+    End Function
+
+#End Region
 
 End Class

EgtBEAMWALL.ViewerOptimizer/App.config

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

EgtBEAMWALL.ViewerOptimizer/DataRoot.ini

@@ -0,0 +1,3 @@
+; Commento per evitare BOM con UTF-8
+[Data]
+DataRoot=C:\EgtData\EgtBEAMWALL

EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj

@@ -103,11 +103,14 @@
     <ApplicationIcon>Resources\EgtBEAMWALL.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="EgtUILib">
+    <Reference Include="EgtUILib, Version=2.3.4.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtUILib.dll</HintPath>
+      <HintPath>..\packages\EgtUILib.2.3.4.4\lib\EgtUILib.dll</HintPath>
     </Reference>
-    <Reference Include="EgtWPFLib5">
+    <Reference Include="EgtWPFLib, Version=2.2.11.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\..\EgtProg\Dll32\EgtWPFLib5.dll</HintPath>
+      <HintPath>..\packages\EgtWPFLib.2.1.11.1\lib\EgtWPFLib.dll</HintPath>
+    </Reference>
+    <Reference Include="EgtWPFLib5, Version=2.3.4.3, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EgtWPF5Lib.2.3.4.3\lib\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>
@@ -598,11 +601,16 @@
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
     <None Include="App.config" />
+    <None Include="DataRoot.ini">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="My Project\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.vb</LastGenOutput>
     </None>
     <None Include="packages.config" />
+    <None Include="_Tools\postBuildTgt.bat" />
+    <None Include="_Tools\preBuildTgt.bat" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\EgtBEAMWALL.ico" />
@@ -651,6 +659,29 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Behavior\" />
+    <Folder Include="FreeContourMgr\" />
+    <Folder Include="_Readme\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="_BaseLib\c3d.dll" />
+    <Content Include="_BaseLib\EgtExchangeR32.dll" />
+    <Content Include="_BaseLib\EgtExecutorR32.dll" />
+    <Content Include="_BaseLib\EgtGeneralR32.dll" />
+    <Content Include="_BaseLib\EgtGeomKernelR32.dll" />
+    <Content Include="_BaseLib\EgtGraphicsR32.dll" />
+    <Content Include="_BaseLib\EgtInterfaceR32.dll" />
+    <Content Include="_BaseLib\EgtMachKernelR32.dll" />
+    <Content Include="_BaseLib\EgtNestingR32.dll" />
+    <Content Include="_BaseLib\EgtNumKernelR32.dll" />
+    <Content Include="_BaseLib\FreeImage.dll" />
+    <Content Include="_BaseLib\glew32.dll" />
+    <Content Include="_BaseLib\liblcnsR32.dll" />
+    <Content Include="_BaseLib\libwinpthread-1.dll" />
+    <Content Include="_BaseLib\lua53.dll" />
+    <Content Include="_BaseLib\od32.dll" />
+    <Content Include="_BaseLib\System.Data.SQLite.dll" />
+    <Content Include="_BaseLib\zipR32.dll" />
+    <Content Include="_BaseLib\zlibR32.dll" />
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\AboutBoxImage.png" />
@@ -730,10 +761,12 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <PropertyGroup>
-    <PostBuildEvent>IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
+    <PostBuildEvent>
-IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerD32.exe
+      <!-- IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR32.exe
-IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR64.exe
+      IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerD32.exe
-IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerD64.exe</PostBuildEvent>
+      IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerR64.exe
+      IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\EgtBEAMWALL.ViewerOptimizerD64.exe -->
+    </PostBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -743,4 +776,7 @@ IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPa
     <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
   </Target>
   <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(ProjectDir)_Tools\preBuildTgt.bat" "$(ProjectDir)_BaseLib" $(TargetDir)</PreBuildEvent>
+  </PropertyGroup>
 </Project>

EgtBEAMWALL.ViewerOptimizer/_Tools/postBuildTgt.bat

@@ -0,0 +1,9 @@
+@echo off
+echo Effettua operazioni PostBuild: Platform: %1 | ConfigurationName: %2 | TargetPath:  %3 | BaseDir:  %4 | TargetDir:  %5
+
+
+REM modalità classica: copia in C:\EgtProg quanto compilato
+IF %1=="x86" IF %2 == "Release" copy %3 c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerR32.exe
+IF %1=="x86" IF %2 == "Debug"   copy %3 c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerD32.exe
+IF %1=="x64" IF %2 == "Release" copy %3 c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerR64.exe
+IF %1=="x64" IF %2 == "Debug"   copy %3 c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerD64.exe

EgtBEAMWALL.ViewerOptimizer/_Tools/preBuildTgt.bat

@@ -0,0 +1,7 @@
+@echo off
+echo Effettua operazioni PreBuild di copia DLL
+
+REM Modalità nuova: copio IN LOCALE le dll da _BaseLib
+ROBOCOPY %1 %2
+
+echo Fatto!

EgtBEAMWALL.ViewerOptimizer/packages.config

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EgtUILib" version="2.3.4.4" targetFramework="net452" />
+  <package id="EgtWPF5Lib" version="2.3.4.3" targetFramework="net452" />
+  <package id="EgtWPFLib" version="2.1.11.1" targetFramework="net452" />
   <package id="EntityFramework" version="6.4.4" targetFramework="net452" />
   <package id="MySql.Data" version="6.10.9" targetFramework="net40" requireReinstallation="true" />
   <package id="MySql.Data.Entity" version="6.10.9" targetFramework="net40" requireReinstallation="true" />