diff --git a/EgtBEAMWALL.DataLayer/App.config b/EgtBEAMWALL.DataLayer/App.config index 9f27467b..76e6e625 100644 --- a/EgtBEAMWALL.DataLayer/App.config +++ b/EgtBEAMWALL.DataLayer/App.config @@ -1,30 +1,35 @@  - -
+ +
- + - + - + - + - - + + - + \ No newline at end of file diff --git a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj index 63d488fe..30c241be 100644 --- a/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj +++ b/EgtBEAMWALL.Supervisor/EgtBEAMWALL.Supervisor.vbproj @@ -1,4 +1,5 @@  + Debug @@ -8,9 +9,12 @@ WinExe EgtBEAMWALL.Supervisor EgtBEAMWALL.Supervisor - v4.0 + v4.5.2 Custom true + + + AnyCPU @@ -22,6 +26,7 @@ bin\Debug\ EgtBEAMWALL.Supervisor.xml 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 + false AnyCPU @@ -34,6 +39,7 @@ bin\Release\ EgtBEAMWALL.Supervisor.xml 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 + false On @@ -57,6 +63,7 @@ full x64 MinimumRecommendedRules.ruleset + false true @@ -67,6 +74,7 @@ pdbonly x64 MinimumRecommendedRules.ruleset + false true @@ -78,6 +86,7 @@ full x86 MinimumRecommendedRules.ruleset + false true @@ -88,6 +97,7 @@ pdbonly x86 MinimumRecommendedRules.ruleset + false @@ -97,10 +107,10 @@ ..\..\..\EgtProg\DllD32\EgtWPFLib5.dll - ..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.dll + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.SqlServer.dll + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll @@ -208,4 +218,12 @@ + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/EgtBEAMWALL.Supervisor/My Project/Resources.Designer.vb b/EgtBEAMWALL.Supervisor/My Project/Resources.Designer.vb index b22e10f7..6741b686 100644 --- a/EgtBEAMWALL.Supervisor/My Project/Resources.Designer.vb +++ b/EgtBEAMWALL.Supervisor/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:$clrversion$ +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -11,52 +11,53 @@ Option Strict On Option Explicit On +Imports System Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - '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. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Returns the cached ResourceManager instance used by this class. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("$safeprojectname$.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module + + 'This class was auto-generated by the StronglyTypedResourceBuilder + '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. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EgtBEAMWALL.Supervisor.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + End Module End Namespace diff --git a/EgtBEAMWALL.Supervisor/My Project/Settings.Designer.vb b/EgtBEAMWALL.Supervisor/My Project/Settings.Designer.vb index 4fc18d52..0fa11962 100644 --- a/EgtBEAMWALL.Supervisor/My Project/Settings.Designer.vb +++ b/EgtBEAMWALL.Supervisor/My Project/Settings.Designer.vb @@ -12,62 +12,60 @@ Option Strict On Option Explicit On -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + _ +Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + #Region "My.Settings Auto-Save Functionality" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - + + Public Shared ReadOnly Property [Default]() As MySettings + Get + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance - End Get - End Property - End Class -End Namespace + End Get + End Property +End Class Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.EgtBEAMWALL.Supervisor.My.MySettings - Get - Return Global.EgtBEAMWALL.Supervisor.My.MySettings.Default - End Get - End Property - End Module + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.EgtBEAMWALL.Supervisor.MySettings + Get + Return Global.EgtBEAMWALL.Supervisor.MySettings.Default + End Get + End Property + End Module End Namespace diff --git a/EgtBEAMWALL.Supervisor/app.config b/EgtBEAMWALL.Supervisor/app.config index daadb639..fc848f6d 100644 --- a/EgtBEAMWALL.Supervisor/app.config +++ b/EgtBEAMWALL.Supervisor/app.config @@ -1,31 +1,37 @@  -
- - + +
- + - + + - + - - + + - - + + - \ No newline at end of file + diff --git a/EgtBEAMWALL.Supervisor/packages.config b/EgtBEAMWALL.Supervisor/packages.config index 90556424..3424f949 100644 --- a/EgtBEAMWALL.Supervisor/packages.config +++ b/EgtBEAMWALL.Supervisor/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/EgtBEAMWALL.ViewerOptimizer/App.config b/EgtBEAMWALL.ViewerOptimizer/App.config index e13657de..0cad1d2b 100644 --- a/EgtBEAMWALL.ViewerOptimizer/App.config +++ b/EgtBEAMWALL.ViewerOptimizer/App.config @@ -1,30 +1,37 @@  -
- + +
- + - + + - + - - + + - - + + - \ No newline at end of file + diff --git a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj index f5b59a7e..18746ad5 100644 --- a/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj +++ b/EgtBEAMWALL.ViewerOptimizer/EgtBEAMWALL.ViewerOptimizer.vbproj @@ -1,4 +1,5 @@  + Debug @@ -8,11 +9,12 @@ WinExe EgtBEAMWALL.ViewerOptimizer EgtBEAMWALL.ViewerOptimizer - v4.0 + v4.5.2 Custom true + AnyCPU @@ -24,6 +26,7 @@ bin\Debug\ EgtBEAMWALL.ViewerOptimizer.xml 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 + false AnyCPU @@ -36,6 +39,7 @@ bin\Release\ EgtBEAMWALL.ViewerOptimizer.xml 41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314 + false On @@ -59,6 +63,7 @@ full x64 MinimumRecommendedRules.ruleset + false true @@ -69,6 +74,7 @@ pdbonly x64 MinimumRecommendedRules.ruleset + false true @@ -80,6 +86,7 @@ full x86 MinimumRecommendedRules.ruleset + false true @@ -90,6 +97,7 @@ pdbonly x86 MinimumRecommendedRules.ruleset + false Resources\EgtBEAMWALL.ico @@ -102,10 +110,10 @@ ..\..\..\EgtProg\DllD32\EgtWPFLib5.dll - ..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.dll + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll - ..\packages\EntityFramework.6.0.0\lib\net40\EntityFramework.SqlServer.dll + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll ..\packages\MySql.Data.6.10.9\lib\net40\MySql.Data.dll @@ -545,4 +553,12 @@ IF "$(PlatformName)"=="x86" IF "$(ConfigurationName)" == "Debug" copy $(TargetPa IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Release" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerR64.exe IF "$(PlatformName)"=="x64" IF "$(ConfigurationName)" == "Debug" copy $(TargetPath) c:\EgtProg\EgtBEAMWALL\ViewerOptimizer\EgtBEAMWALL.ViewerOptimizerD64.exe + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/Resources.Designer.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/Resources.Designer.vb index b22e10f7..fc14094a 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/Resources.Designer.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/Resources.Designer.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:$clrversion$ +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -11,52 +11,53 @@ Option Strict On Option Explicit On +Imports System Namespace My.Resources - - 'This class was auto-generated by the StronglyTypedResourceBuilder - '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. - ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. - ''' - _ - Friend Module Resources - - Private resourceMan As Global.System.Resources.ResourceManager - - Private resourceCulture As Global.System.Globalization.CultureInfo - - ''' - ''' Returns the cached ResourceManager instance used by this class. - ''' - _ - Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager - Get - If Object.ReferenceEquals(resourceMan, Nothing) Then - Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("$safeprojectname$.Resources", GetType(Resources).Assembly) - resourceMan = temp - End If - Return resourceMan - End Get - End Property - - ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. - ''' - _ - Friend Property Culture() As Global.System.Globalization.CultureInfo - Get - Return resourceCulture - End Get - Set(ByVal value As Global.System.Globalization.CultureInfo) - resourceCulture = value - End Set - End Property - End Module + + 'This class was auto-generated by the StronglyTypedResourceBuilder + '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. + ''' + ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' + _ + Friend Module Resources + + Private resourceMan As Global.System.Resources.ResourceManager + + Private resourceCulture As Global.System.Globalization.CultureInfo + + ''' + ''' Returns the cached ResourceManager instance used by this class. + ''' + _ + Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager + Get + If Object.ReferenceEquals(resourceMan, Nothing) Then + Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("EgtBEAMWALL.ViewerOptimizer.Resources", GetType(Resources).Assembly) + resourceMan = temp + End If + Return resourceMan + End Get + End Property + + ''' + ''' Overrides the current thread's CurrentUICulture property for all + ''' resource lookups using this strongly typed resource class. + ''' + _ + Friend Property Culture() As Global.System.Globalization.CultureInfo + Get + Return resourceCulture + End Get + Set + resourceCulture = value + End Set + End Property + End Module End Namespace diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/Settings.Designer.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/Settings.Designer.vb index 406fadbc..a87a1915 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/Settings.Designer.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/Settings.Designer.vb @@ -12,62 +12,60 @@ Option Strict On Option Explicit On -Namespace My - - _ - Partial Friend NotInheritable Class MySettings - Inherits Global.System.Configuration.ApplicationSettingsBase - - Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings) + _ +Partial Friend NotInheritable Class MySettings + Inherits Global.System.Configuration.ApplicationSettingsBase + + Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) + #Region "My.Settings Auto-Save Functionality" #If _MyType = "WindowsForms" Then - Private Shared addedHandler As Boolean + Private Shared addedHandler As Boolean - Private Shared addedHandlerLockObject As New Object + Private Shared addedHandlerLockObject As New Object - _ - Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs) - If My.Application.SaveMySettingsOnExit Then - My.Settings.Save() - End If - End Sub + _ + Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) + If My.Application.SaveMySettingsOnExit Then + My.Settings.Save() + End If + End Sub #End If #End Region - - Public Shared ReadOnly Property [Default]() As MySettings - Get - + + Public Shared ReadOnly Property [Default]() As MySettings + Get + #If _MyType = "WindowsForms" Then - If Not addedHandler Then - SyncLock addedHandlerLockObject - If Not addedHandler Then - AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings - addedHandler = True - End If - End SyncLock - End If + If Not addedHandler Then + SyncLock addedHandlerLockObject + If Not addedHandler Then + AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings + addedHandler = True + End If + End SyncLock + End If #End If Return defaultInstance - End Get - End Property - End Class -End Namespace + End Get + End Property +End Class Namespace My - - _ - Friend Module MySettingsProperty - - _ - Friend ReadOnly Property Settings() As Global.EgtBEAMWALL.ViewerOptimizer.My.MySettings - Get - Return Global.EgtBEAMWALL.ViewerOptimizer.My.MySettings.Default - End Get - End Property - End Module + + _ + Friend Module MySettingsProperty + + _ + Friend ReadOnly Property Settings() As Global.EgtBEAMWALL.ViewerOptimizer.MySettings + Get + Return Global.EgtBEAMWALL.ViewerOptimizer.MySettings.Default + End Get + End Property + End Module End Namespace diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb index 8dc1a285..991ef407 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/ProjManager/ProjManagerVM.vb @@ -171,15 +171,22 @@ Public Class ProjManagerVM End If End Sub - Private Function InitNewProject(ByRef nProjId As Integer, ByRef sProjDir As String) + Private Function InitNewProject(ProjectType As ProjectType, ByRef nProjId As Integer, ByRef nProdId As Integer, ByRef sProjectDir As String) As Boolean ' richiedo indice nuovo progetto - nProjId = DbControllers.m_ProjController.GetNextIndex() - sProjDir = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000") - ' creo cartella nuovo progetto - If Not Directory.Exists(sProjDir) Then - Directory.CreateDirectory(sProjDir) + If ProjectType = ProjectType.PROJ Then + nProjId = DbControllers.m_ProjController.GetNextIndex() + If nProjId <= 0 Then Return False + sProjectDir = refMainWindowVM.MainWindowM.sProjsDir & "\" & nProjId.ToString("0000") Else - Dim di As System.IO.DirectoryInfo = New DirectoryInfo(sProjDir) + nProdId = DbControllers.m_ProdController.GetNextIndex(nProjId) + If nProdId <= 0 Then Return False + sProjectDir = refMainWindowVM.MainWindowM.sProdsDir & "\" & nProdId.ToString("0000") + End If + ' creo cartella nuovo progetto + If Not Directory.Exists(sProjectDir) Then + Directory.CreateDirectory(sProjectDir) + Else + Dim di As System.IO.DirectoryInfo = New DirectoryInfo(sProjectDir) For Each file As FileInfo In di.EnumerateFiles() file.Delete() Next @@ -187,12 +194,19 @@ Public Class ProjManagerVM dir.Delete(True) Next End If + Return True + End Function + + Private Function UpdateProjData(nProjId As Integer, nProdId As Integer, dtCreateProjDate As DateTime, dtExportDate As DateTime, + sListName As String, sBTLFileName As String) + DbControllers.m_ProjController.UpdateName(nProjId, sBTLFileName) + ' aggiornare tutti gli altri dati!!! End Function Public Function SetCurrProj(nProjId As Integer) As Boolean Dim Currproj As ProjModel = DbControllers.m_ProjController.FindByProjId(nProjId) If IsNothing(Currproj) Then Return False - m_CurrProj = New ProjectFileVM(ProjectFileM.CreateProjectFileM(ProjectType.PROJ, Currproj.ProjId, 0, Currproj.BTLFileName)) + m_CurrProj = New ProjectFileVM(ProjectFileM.CreateProjectFileM(ProjectType.PROJ, Currproj.ProjId, 0, Date.Now, Date.Now, "", Currproj.BTLFileName)) Return True End Function @@ -418,7 +432,7 @@ Public Class ProjManagerVM If bOk Then ' aggiorno Db Dim sBTLFileName As String = Path.GetFileNameWithoutExtension(BTLDlg.FileName) - DbControllers.m_ProjController.UpdateName(nProjId, sBTLFileName) + UpdateProjData(nProjId, 0, Date.Now(), Date.Now(), "", sBTLFileName) SetCurrProj(nProjId) 'm_CurrProj.NewProj = True Map.refMainWindowVM.UpdateTitle() diff --git a/EgtBEAMWALL.ViewerOptimizer/packages.config b/EgtBEAMWALL.ViewerOptimizer/packages.config index d2be58c1..0844dbd7 100644 --- a/EgtBEAMWALL.ViewerOptimizer/packages.config +++ b/EgtBEAMWALL.ViewerOptimizer/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file