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..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)) @@ -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 diff --git a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index 11df4009..bb3f303b 100644 --- a/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Core/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -42,6 +42,8 @@ Public MustInherit Class OpenProjectFileDialogVM Friend Event m_CloseWindow(bDialogResult As Boolean) + Protected m_GoToProd As Boolean = False + Protected m_ProjectColumns As New ObservableCollection(Of EgtDataGridColumn) Public Property ProjectColumns As ObservableCollection(Of EgtDataGridColumn) Get @@ -167,7 +169,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 +415,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 @@ -438,7 +440,7 @@ Public MustInherit Class OpenProjectFileDialogVM #Region "METHODS" Public MustOverride Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean? - Public Overridable Sub RefreshProjectList(Optional GoToProd As Boolean = False) + Public Overridable Sub RefreshProjectList() End Sub Protected Sub LoadColumns(ProjectType As ProjectType) diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb index 58286ce9..df781938 100644 --- a/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb +++ b/EgtBEAMWALL.Core/ProjectFileVM/ProdFileM.vb @@ -14,6 +14,13 @@ Public Class ProdFileM m_nProjIdList = value End Sub + Protected m_ProjMList As List(Of ProjFileM) + Public ReadOnly Property ProjMList As List(Of ProjFileM) + Get + Return m_ProjMList + End Get + End Property + Protected m_sName As String Public Property sName As String Get @@ -60,6 +67,24 @@ Public Class ProdFileM Return NewProjectFileM End Function + Public Shared Function CreateProdFileM(nProdId As Integer, nProjIdList As List(Of Integer), dtCreateProjDate As DateTime, sName As String, nType As BWType, + sMachine As String, sLockedBy As String, dtLock As DateTime, bIsActive As Boolean, bIsProduced As Boolean, bIsArchived As Boolean, ProjMList As List(Of ProjFileM)) 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 + NewProjectFileM.m_sMachine = sMachine + NewProjectFileM.m_sLockedBy = sLockedBy + NewProjectFileM.m_dtLock = dtLock + NewProjectFileM.m_bIsActive = bIsActive + NewProjectFileM.m_bIsProduced = bIsProduced + NewProjectFileM.m_bIsArchived = bIsArchived + NewProjectFileM.m_ProjMList = ProjMList + Return NewProjectFileM + End Function + #End Region ' CONSTRUCTORS End Class \ No newline at end of file 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.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.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index a2208cce..6a5ebb90 100644 --- a/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.Supervisor/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -11,13 +11,14 @@ Public Class OpenProjectFileDialogVM Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean? m_ProjectType = ProjectType + m_GoToProd = GoToProd ' carico colonne LoadColumns(m_ProjectType) NotifyPropertyChanged(NameOf(FilterTypeList)) m_SelFilterType = m_FilterTypeList(0) ' carico lista progetti If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then - RefreshProjectList(GoToProd) + RefreshProjectList() Else m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList) NotifyPropertyChanged(NameOf(ProjectList)) @@ -26,7 +27,7 @@ Public Class OpenProjectFileDialogVM m_ProjectList_View.Filter = AddressOf ProjectFilter End Function - Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False) + Public Overrides Sub RefreshProjectList() m_ProjectList.Clear() ' calcolo periodo e righe Dim dtStart As DateTime @@ -43,13 +44,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/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..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(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 diff --git a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb index c7eff983..3a94b47e 100644 --- a/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/OpenProjectFileDialog/OpenProjectFileDialogVM.vb @@ -12,6 +12,7 @@ Public Class OpenProjectFileDialogVM Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean? m_ProjectType = ProjectType + m_GoToProd = GoToProd ' carico colonne LoadColumns(ProjectType) NotifyPropertyChanged(NameOf(FilterTypeList)) @@ -19,7 +20,7 @@ Public Class OpenProjectFileDialogVM ' carico lista progetti If IsNothing(CurrProjectList) OrElse CurrProjectList.Count = 0 Then SetFixedProjectList(False) - RefreshProjectList(GoToProd) + RefreshProjectList() Else SetFixedProjectList(True) m_ProjectList = New ObservableCollection(Of ProjectFileVM)(CurrProjectList) @@ -29,7 +30,7 @@ Public Class OpenProjectFileDialogVM m_ProjectList_View.Filter = AddressOf ProjectFilter End Function - Public Overrides Sub RefreshProjectList(Optional GoToProd As Boolean = False) + Public Overrides Sub RefreshProjectList() m_ProjectList.Clear() ' calcolo periodo e righe Dim dtStart As DateTime @@ -46,16 +47,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 @@ -66,30 +67,15 @@ Public Class OpenProjectFileDialogVM Else DbProjectList = DbControllers.m_ProjController.GetLastByExpDesc(dtStart, dtEnd, nRowQuantity, False) End If - For Each Project In DbProjectList - ' recupero path per verificare esista - If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For - Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge" - If File.Exists(sPath) Then - m_ProjectList.Add(New ProjFileVM(Project)) - Else - ' CheckMe impostata come cancellazione FISICA dal DB... - DbControllers.m_ProjController.DeleteProj(Project.nProjId, False) - EgtOutLog("Found project on Db without the folder and erased it! Proj number " & Project.nProjId.ToString("0000")) - End If - Next - ElseIf m_ProjectType = ProjectType.PROD Then - Dim DbProjectList As New List(Of ProdFileM) - DbProjectList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True) - If GoToProd Then + If m_GoToProd Then For Each Project In DbProjectList ' recupero path per verificare esista If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For - Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge" + Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge" If Project.sMachine = Map.refProjManagerVM.CurrProj.sMachine AndAlso Project.nType = Map.refProjManagerVM.CurrProj.nType Then If File.Exists(sPath) Then - m_ProjectList.Add(New ProdFileVM(Project)) + m_ProjectList.Add(New ProjFileVM(Project)) Else DbControllers.m_ProdController.DeleteProd(Project.nProdId, True) EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000")) @@ -99,16 +85,31 @@ Public Class OpenProjectFileDialogVM Else For Each Project In DbProjectList ' recupero path per verificare esista - If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For - Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge" + If IsNothing(Project.nProjId) OrElse Project.nProjId = 0 Then Continue For + Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProjsDir & "\" & Project.nProjId.ToString("0000") & "\" & Project.nProjId.ToString("0000") & ".nge" If File.Exists(sPath) Then - m_ProjectList.Add(New ProdFileVM(Project)) + m_ProjectList.Add(New ProjFileVM(Project)) Else - DbControllers.m_ProdController.DeleteProd(Project.nProdId, True) - EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000")) + ' CheckMe impostata come cancellazione FISICA dal DB... + DbControllers.m_ProjController.DeleteProj(Project.nProjId, False) + EgtOutLog("Found project on Db without the folder and erased it! Proj number " & Project.nProjId.ToString("0000")) End If Next End If + ElseIf m_ProjectType = ProjectType.PROD Then + Dim DbProjectList As New List(Of ProdFileM) + DbProjectList = DbControllers.m_ProdController.GetLastDesc(dtStart, dtEnd, nRowQuantity, True) + For Each Project In DbProjectList + ' recupero path per verificare esista + If IsNothing(Project.nProdId) OrElse Project.nProdId = 0 Then Continue For + Dim sPath As String = Map.refMainWindowVM.MainWindowM.sProdsDir & "\" & Project.nProdId.ToString("0000") & "\" & Project.nProdId.ToString("0000") & ".nge" + If File.Exists(sPath) Then + m_ProjectList.Add(New ProdFileVM(Project)) + Else + DbControllers.m_ProdController.DeleteProd(Project.nProdId, True) + EgtOutLog("Found project on Db without the folder and erased it! Prod number " & Project.nProdId.ToString("0000")) + End If + Next End If End Sub diff --git a/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb b/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb index 105345d1..9fec89cf 100644 --- a/EgtBEAMWALL.ViewerOptimizer/ProjectFileVM/ProdFileVM.vb +++ b/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() 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