- cambiato giorni del mese da 30 o 31 a sempre 30.5

- aggiunta gestione sempre tra i filtri temporali NewOpenDialog

EgtBEAMWALL.Core/My Project/AssemblyInfo.vb

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

EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -32,6 +32,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       LAST3MONTHS = 1
       LAST6MONTHS = 2
       PERIOD = 3
+      ALWAYS = 4
    End Enum
 
    Public Enum RowQuantities As Integer
@@ -189,7 +190,7 @@ Public MustInherit Class NewOpenProjectFileDialogVM
    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)
+   Public Overridable ReadOnly Property DayTypeList As List(Of String)
       Get
          Return m_DayTypeList
       End Get
@@ -209,13 +210,16 @@ Public MustInherit Class NewOpenProjectFileDialogVM
             Select Case PrevSelDayType
                Case DayTypes.LASTMONTH
                   m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31)
+                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
                Case DayTypes.LAST3MONTHS
                   m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+                  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(31 * 6)
+                  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))
@@ -386,8 +390,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
 
@@ -554,13 +560,13 @@ Public MustInherit Class NewOpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+            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(31 * 6)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             Dim sStartDate As String = "0"
             Dim lStartDate As Long = 0

EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -167,7 +167,7 @@ Public MustInherit Class OpenProjectFileDialogVM
             Select Case PrevSelDayType
                Case DayTypes.LASTMONTH
                   m_dtStartDate = DateTime.Today + TimeSpan.FromDays(1)
-                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(31)
+                  m_dtEndDate = m_dtStartDate - TimeSpan.FromDays(30.5)
                Case DayTypes.LAST3MONTHS
 
                Case DayTypes.LAST6MONTHS
@@ -413,13 +413,13 @@ Public MustInherit Class OpenProjectFileDialogVM
       Select Case m_SelDayType
          Case DayTypes.LASTMONTH
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5)
          Case DayTypes.LAST3MONTHS
             m_dtEndDate = DateTime.Today + TimeSpan.FromDays(1)
-            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(31 * 3)
+            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(31 * 6)
+            m_dtStartDate = m_dtEndDate - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             Dim sStartDate As String = "0"
             Dim lStartDate As Long = 0

EgtBEAMWALL.Core/Utility/MachLog.vb

@@ -87,7 +87,6 @@
 
    Public ReadOnly Property sPROD As String
       Get
-
          Return m_VarValue
       End Get
    End Property

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")]

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())

EgtBEAMWALL.Supervisor/My Project/AssemblyInfo.vb

@@ -70,5 +70,5 @@ Imports System.Windows
 ' 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")>

EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb

@@ -43,13 +43,13 @@ 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.5)
          Case DayTypes.LAST3MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 3)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 6)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
             dtStart = dtStartDate + TimeSpan.FromDays(1)
             dtEnd = dtEndDate

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())

EgtBEAMWALL.ViewerOptimizer/My Project/AssemblyInfo.vb

@@ -70,5 +70,5 @@ Imports System.Windows
 ' 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")>

EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb

@@ -8,6 +8,16 @@ Imports EgtWPFLib5
 Public Class NewOpenProjectFileDialogVM
    Inherits Core.NewOpenProjectFileDialogVM
 
+   Public Overrides ReadOnly Property DayTypeList As List(Of String)
+      Get
+         Dim CurrDayTypeList As New List(Of String)({EgtMsg(62532), EgtMsg(62533), EgtMsg(62534), EgtMsg(62531)})
+         If Map.refMainWindowVM.MainWindowM.nUserLevel > 5 Then
+            CurrDayTypeList.Add("Always")
+         End If
+         Return CurrDayTypeList
+      End Get
+   End Property
+
 #Region "METHODS"
 
    Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean?
@@ -44,24 +54,27 @@ 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.5)
          Case DayTypes.LAST3MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 3)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 6)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6)
          Case DayTypes.PERIOD
-            dtStart = dtStartDate + TimeSpan.FromDays(1)
-            dtEnd = dtEndDate
+            dtEnd = dtEndDate + TimeSpan.FromDays(1)
+            dtStart = dtStartDate
+         Case DayTypes.ALWAYS
+            dtEnd = DateTime.Today + TimeSpan.FromDays(1)
+            dtStart = New DateTime(2020, 1, 1)
       End Select
       ' leggo da db
       If m_ProjectType = ProjectType.PROJ Then
          Dim DbProjList As New List(Of ProjFileM)
          If m_SelBTLDateType = BTLDateTypes.CREATEDATE Then
-            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
+            DbProjList = DbControllers.m_ProjController.GetLastDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
          Else
-            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, True, bViewArchived)
+            DbProjList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity * 3, True, bViewArchived)
          End If
          For Each Project In DbProjList
             If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For

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.5)
          Case DayTypes.LAST3MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 3)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3)
          Case DayTypes.LAST6MONTHS
             dtEnd = DateTime.Today + TimeSpan.FromDays(1)
-            dtStart = dtEnd - TimeSpan.FromDays(31 * 6)
+            dtStart = dtEnd - TimeSpan.FromDays(30.5 * 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

EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb

@@ -1,6 +1,7 @@
 Imports System.IO
 Imports EgtBEAMWALL.Core
 Imports EgtUILib
+Imports EgtWPFLib5
 
 Public Class ProdFileVM
    Inherits Core.ProdFileVM
@@ -155,7 +156,7 @@ Public Class ProdFileVM
                   End Try
                   Map.refProdManagerVM.m_MruFiles.Remove(CurrProject.sProdPath)
                   Map.refProdManagerVM.NotifyPropertyChanged(NameOf(Map.refProdManagerVM.MruFileNames))
-                  DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId, True)
+                  DbControllers.m_ProdController.DeleteProd(CurrProject.nProdId, False)
                   If CurrProject.nProdId = Map.refProjManagerVM.CurrProj.nProdId Then
                      ' reset prod in path proj
                      Map.refProjManagerVM.UpdateCurrProj()