diff --git a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index ad8570c9..10507a51 100644 --- a/EgtBEAMWALL.Core/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/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)) @@ -556,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 diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index 11df4009..73e2dc6b 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/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 diff --git a/EgtBEAMWALL.Core/Utility/MachLog.vb b/EgtBEAMWALL.Core/Utility/MachLog.vb index 2b2c110b..1e641336 100644 --- a/EgtBEAMWALL.Core/Utility/MachLog.vb +++ b/EgtBEAMWALL.Core/Utility/MachLog.vb @@ -87,7 +87,6 @@ Public ReadOnly Property sPROD As String Get - Return m_VarValue End Get End Property diff --git a/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index a2208cce..5a98738d 100644 --- a/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/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 diff --git a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index f55da36d..95c4c6d4 100644 --- a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/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(30) + dtStart = dtEnd - TimeSpan.FromDays(30.5) Case DayTypes.LAST3MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(30 * 3) + dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3) Case DayTypes.LAST6MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(30 * 6) + dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6) Case DayTypes.PERIOD 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 diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index 3d9e5a5a..fbb1481f 100644 --- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -46,13 +46,13 @@ Public Class OpenProjectFileDialogVM Select Case m_SelDayType Case DayTypes.LASTMONTH dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(30) + dtStart = dtEnd - TimeSpan.FromDays(30.5) Case DayTypes.LAST3MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(30 * 3) + dtStart = dtEnd - TimeSpan.FromDays(30.5 * 3) Case DayTypes.LAST6MONTHS dtEnd = DateTime.Today + TimeSpan.FromDays(1) - dtStart = dtEnd - TimeSpan.FromDays(30 * 6) + dtStart = dtEnd - TimeSpan.FromDays(30.5 * 6) Case DayTypes.PERIOD dtEnd = dtEndDate + TimeSpan.FromDays(1) dtStart = dtStartDate