diff --git a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb index da2d52c4..4d06dda3 100644 --- a/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Core/My Project/AssemblyInfo.vb @@ -35,5 +35,5 @@ Imports System.Runtime.InteropServices ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index 4c779469..ad8570c9 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb @@ -386,8 +386,10 @@ Public MustInherit Class NewOpenProjectFileDialogVM Set(value As Boolean) m_bViewArchived = value WriteMainPrivateProfileString(S_OPENFILEDIALOG, K_VIEWARCHIVED, If(bViewArchived, 1, 0)) - m_colArchived_Name.Visible = value - RefreshProjectList() + If Not IsNothing( m_colArchived_Name) Then + m_colArchived_Name.Visible = value + RefreshProjectList() + End If End Set End Property diff --git a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs index a34e4e0f..0eed6913 100644 --- a/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs +++ b/EgtBEAMWALL.DataLayer/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.5.7.1")] -[assembly: AssemblyFileVersion("2.5.7.1")] +[assembly: AssemblyVersion("2.5.8.1")] +[assembly: AssemblyFileVersion("2.5.8.1")] diff --git a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb index f4ceb29f..865b3fcb 100644 --- a/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.Supervisor/MainWindow/MainWindowM.vb @@ -248,8 +248,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2506, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2506, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2508, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2508, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & SUPGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb index b46caf6b..10e266d4 100644 --- a/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb index 84df48fb..7e1c5f13 100644 --- a/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/MainWindow/MainWindowM.vb @@ -235,8 +235,8 @@ Public Class MainWindowM EgtSetLockId( sLockId) End If ' Recupero livello e opzioni della chiave - Dim bKey As Boolean = EgtGetKeyLevel(5327, 2506, 1, m_nKeyLevel) And - EgtGetKeyOptions(5327, 2506, 1, m_nKeyOptions) + Dim bKey As Boolean = EgtGetKeyLevel(5327, 2508, 1, m_nKeyLevel) And + EgtGetKeyOptions(5327, 2508, 1, m_nKeyOptions) ' Inizializzazione generale di EgtInterface m_nDebug = GetMainPrivateProfileInt(S_GENERAL, K_DEBUG, 0) m_sLogFile = m_sTempDir & "\" & VWOPTGENLOG_FILE_NAME.Replace("#", m_nInstance.ToString()) diff --git a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb index 4524f549..4b420d76 100644 --- a/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb +++ b/EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb @@ -70,5 +70,5 @@ Imports System.Windows ' by using the '*' as shown below: ' - - + + diff --git a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index 6d3814b2..f55da36d 100644 --- a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb @@ -44,16 +44,16 @@ Public Class NewOpenProjectFileDialogVM Select Case m_SelDayType Case DayTypes.LASTMONTH dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(31) + dtStart = dtEnd - TimeSpan.FromDays(30) Case DayTypes.LAST3MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(31 * 3) + dtStart = dtEnd - TimeSpan.FromDays(30 * 3) Case DayTypes.LAST6MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(31 * 6) + dtStart = dtEnd - TimeSpan.FromDays(30 * 6) Case DayTypes.PERIOD - dtStart = dtStartDate + TimeSpan.FromDays(1) - dtEnd = dtEndDate + dtEnd = dtEndDate + TimeSpan.FromDays(1) + dtStart = dtStartDate End Select ' leggo da db If m_ProjectType = ProjectType.PROJ Then diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index c7eff983..3d9e5a5a 100644 --- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -46,16 +46,16 @@ Public Class OpenProjectFileDialogVM Select Case m_SelDayType Case DayTypes.LASTMONTH dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(31) + dtStart = dtEnd - TimeSpan.FromDays(30) Case DayTypes.LAST3MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(31 * 3) + dtStart = dtEnd - TimeSpan.FromDays(30 * 3) Case DayTypes.LAST6MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(31 * 6) + dtStart = dtEnd - TimeSpan.FromDays(30 * 6) Case DayTypes.PERIOD - dtStart = dtStartDate + TimeSpan.FromDays(1) - dtEnd = dtEndDate + dtEnd = dtEndDate + TimeSpan.FromDays(1) + dtStart = dtStartDate End Select ' leggo da db If m_ProjectType = ProjectType.PROJ Then diff --git a/ExtLibs/EgtUILib.dll b/ExtLibs/EgtUILib.dll index ace73520..5ba8f7f8 100644 Binary files a/ExtLibs/EgtUILib.dll and b/ExtLibs/EgtUILib.dll differ diff --git a/ExtLibs/EgtWPFLib5.dll b/ExtLibs/EgtWPFLib5.dll index 5cf36409..786487a1 100644 Binary files a/ExtLibs/EgtWPFLib5.dll and b/ExtLibs/EgtWPFLib5.dll differ