diff --git a/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb b/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb index 5bb31bb0..0269c5b4 100644 --- a/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb +++ b/EgtBEAMWALL.Core/ProjectFileVM/ProdItem.vb @@ -5,9 +5,10 @@ Imports System.Windows Public Class ProdItem Inherits VMBase - Public Shared m_delIsModifiedSetUp As Action(Of Boolean) + Public Shared m_delUpdateNameInDb As Action(Of Integer, String) + Public Shared m_delIsModifiedSetUp As Action(Of Boolean) - Protected m_ProdFileVM As ProdFileVM + Protected m_ProdFileVM As ProdFileVM Public ReadOnly Property ProdFileVM As ProdFileVM Get Return m_ProdFileVM @@ -32,10 +33,12 @@ Public Class ProdItem Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "") End Get Set(value As String) - If Not IsNothing(m_ProdFileVM) Then - m_ProdFileVM.sName = value - End If - End Set + If Not IsNothing(m_ProdFileVM) Then + m_delUpdateNameInDb(m_ProdFileVM.nProdId, value) + m_ProdFileVM.sName = value + m_delIsModifiedSetUp(False) + End If + End Set End Property Public ReadOnly Property dtCreateDate As Date diff --git a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb index 95c4c6d4..b2d64428 100644 --- a/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb +++ b/EgtBEAMWALL.ViewerOptimizer/NewOpenProjectFileDialog/NewOpenProjectFileDialogVM.vb @@ -22,6 +22,7 @@ Public Class NewOpenProjectFileDialogVM Public Overrides Function Init(ProjectType As ProjectType, Optional CurrProjectList As List(Of ProjectFileVM) = Nothing, Optional GoToProd As Boolean = False) As Boolean? m_ProjectType = ProjectType + ProdItem.m_delUpdateNameInDb = AddressOf DbControllers.m_ProdController.UpdateDescription NotifyPropertyChanged(NameOf(FilterTypeList)) m_SelFilterType = m_FilterTypeList(0) @@ -250,33 +251,3 @@ Public Class NewOpenProjectFileDialogVM #End Region ' METHODS End Class - -Public Class ProdItem - Inherits Core.ProdItem - - Public Overrides Property sName As String - Get - Return If(Not IsNothing(m_ProdFileVM), m_ProdFileVM.sName, "") - End Get - Set(value As String) - If Not IsNothing(m_ProdFileVM) Then - DbControllers.m_ProdController.UpdateDescription(m_ProdFileVM.nProdId, value) - m_ProdFileVM.sName = value - m_delIsModifiedSetUp(False) - End If - End Set - End Property - - Sub New(ProdFileVM As ProdFileVM, ProjFileVM As ProjFileVM) - MyBase.New(ProdFileVM, ProjFileVM) - End Sub - - Sub New(ProjFileVM As ProjFileVM) - MyBase.New(ProjFileVM) - End Sub - - Sub New(ProdFileVM As ProjectFileVM, ProjFileVMList As List(Of ProjectFileVM)) - MyBase.New(ProdFileVM, ProjFileVMList) - End Sub - -End Class \ No newline at end of file diff --git a/EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb b/EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb index a19d80b0..8b6f680e 100644 --- a/EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb +++ b/EgtBEAMWALL.ViewerOptimizer/Utility/DbControllers.vb @@ -68,8 +68,6 @@ Public Module DbControllers DataLayer.DbConfig.CheckMigrateDb() DataLayer.DbConfig.CheckUser(sUser, sPwd, m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK)) DataLayer.DbConfig.CheckViews(sUser, sPwd) - ' riattivare il dump per il backup - 'DataLayer.DbConfig.DumpDB("C:\Program Files\MariaDB 10.5\bin\mysqldump", "c:\Temp\Pippo.sql") If m_bNetwork AndAlso Map.refMainWindowVM.MainWindowM.GetKeyOption(KEY_OPT.NETWORK) Then ' imposto cartella condivisa GetMainPrivateProfileString(S_GENERAL, K_SHAREDFOLDER, Map.refMainWindowVM.MainWindowM.sDataDir, sSharedFolder)