From 6eff288068ab4e99e91d95e8ee24c610e30dc841 Mon Sep 17 00:00:00 2001 From: Renzo Lanza Date: Thu, 23 Jul 2020 15:25:40 +0000 Subject: [PATCH] LicenceManager 2.2g1 : - aggiunti i campi Lock ID e Seriale (non modificabili) in UpdateLicencePage - aggiunto Seriale ai filtri di ricerca in SearchLicencePage --- My Project/AssemblyInfo.vb | 4 +- SearchLicencePage/SearchLicencePageV.xaml | 10 +++++ SearchLicencePage/SearchLicencePageVM.vb | 24 ++++++++++++ UpdateLicencePage/UpdateLicencePageV.xaml | 45 ++++++++++++++++++++-- UpdateLicencePage/UpdateLicencePageVM.vb | 46 +++++++++++++++++++++++ 5 files changed, 123 insertions(+), 6 deletions(-) diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb index b74a8ef..6473753 100644 --- a/My Project/AssemblyInfo.vb +++ b/My Project/AssemblyInfo.vb @@ -59,5 +59,5 @@ Imports System.Windows ' usando l'asterisco '*' come illustrato di seguito: ' - - + + diff --git a/SearchLicencePage/SearchLicencePageV.xaml b/SearchLicencePage/SearchLicencePageV.xaml index b7b1c2e..b46e29f 100644 --- a/SearchLicencePage/SearchLicencePageV.xaml +++ b/SearchLicencePage/SearchLicencePageV.xaml @@ -140,6 +140,16 @@ Grid.Row="4" Style="{StaticResource ParametersComboBox}"/> + + + + diff --git a/SearchLicencePage/SearchLicencePageVM.vb b/SearchLicencePage/SearchLicencePageVM.vb index 60e931f..abbc6c9 100644 --- a/SearchLicencePage/SearchLicencePageVM.vb +++ b/SearchLicencePage/SearchLicencePageVM.vb @@ -141,6 +141,17 @@ Public Class SearchLicencePageVM End Set End Property + Private m_SerialNumber As String + Public Property SerialNumber As String + Get + Return m_SerialNumber + End Get + Set(value As String) + m_SerialNumber = value + NotifyPropertyChanged("SerialNumber") + End Set + End Property + Private m_IsDongleList As New List(Of String)({"Hardware", "Software", "---ANY---"}) Public ReadOnly Property IsDongleList As List(Of String) Get @@ -282,6 +293,12 @@ Public Class SearchLicencePageVM End Get End Property + Public ReadOnly Property SerialNumberMsg As String + Get + Return "Seriale" + End Get + End Property + Public ReadOnly Property NewMsg As String Get Return "New" @@ -348,6 +365,8 @@ Public Class SearchLicencePageVM NotifyPropertyChanged("SelProductLevel") File = String.Empty NotifyPropertyChanged("File") + SerialNumber = String.Empty + NotifyPropertyChanged("SerialNumber") ProductDeadline = Nothing NotifyPropertyChanged("ProductDeadline") @@ -502,6 +521,7 @@ Public Class SearchLicencePageVM Not String.IsNullOrWhiteSpace(LockID) OrElse Not IsNothing(LicenseDate) OrElse Not String.IsNullOrWhiteSpace(File) OrElse + Not String.IsNullOrWhiteSpace(SerialNumber) OrElse Not IsNothing(m_SelIsDongle) Then Query &= " WHERE " If Not IsNothing(m_SelProduct) Then @@ -546,6 +566,10 @@ Public Class SearchLicencePageVM EvalWhere(bFirstWhere, Query) Query &= DB_FILE & " LIKE '%" & File & "%' " End If + If Not String.IsNullOrWhiteSpace(SerialNumber) Then + EvalWhere(bFirstWhere, Query) + Query &= DB_SERIALE & " LIKE '%" & SerialNumber & "%' " + End If If Not IsNothing(LicenseDate) Then EvalWhere(bFirstWhere, Query) Query &= DB_LICENCE & "." & DB_DATE & " LIKE '%" & Format(LicenseDate, "yyyy-MM-dd") & "%' " diff --git a/UpdateLicencePage/UpdateLicencePageV.xaml b/UpdateLicencePage/UpdateLicencePageV.xaml index 5e4f2f6..9afa582 100644 --- a/UpdateLicencePage/UpdateLicencePageV.xaml +++ b/UpdateLicencePage/UpdateLicencePageV.xaml @@ -14,10 +14,47 @@ BorderThickness="1" Height="75" Grid.Row="0"> - + + + + + + + + + + + + + + + TextAlignment="Center" + Grid.RowSpan="2" + Grid.ColumnSpan="6"/> + + + + + + + + + @@ -34,8 +71,8 @@ - - + + diff --git a/UpdateLicencePage/UpdateLicencePageVM.vb b/UpdateLicencePage/UpdateLicencePageVM.vb index 31074e3..bad550f 100644 --- a/UpdateLicencePage/UpdateLicencePageVM.vb +++ b/UpdateLicencePage/UpdateLicencePageVM.vb @@ -37,6 +37,28 @@ Public Class UpdateLicencePageVM End Set End Property + Private m_LockId As String + Public Property LockId As String + Get + Return m_LockId + End Get + Set(value As String) + m_LockId = value + NotifyPropertyChanged("LockId") + End Set + End Property + + Private m_SerialNumber As String + Public Property SerialNumber As String + Get + Return m_SerialNumber + End Get + Set(value As String) + m_SerialNumber = value + NotifyPropertyChanged("SerialNumber") + End Set + End Property + Private m_ProductName As String Public Property ProductName As String Get @@ -326,6 +348,18 @@ Public Class UpdateLicencePageVM End Get End Property + Public ReadOnly Property LockIdMsg As String + Get + Return "Lock ID" + End Get + End Property + + Public ReadOnly Property SerialNumberMsg As String + Get + Return "Serial number" + End Get + End Property + #End Region ' Messages #Region "CONSTRUCTOR" @@ -358,6 +392,18 @@ Public Class UpdateLicencePageVM FileName = Licence.File ' String.Empty NotifyPropertyChanged("File") + ' Carico LockId della Licenza selezionata da aggiornare + LockId = Licence.Number + NotifyPropertyChanged("LockId") + + ' Carico Seriale della Chiave che contiene la Licenza selezionata da aggiornare + Dim nQuery As String = "SELECT * FROM " & DB_KEY & " WHERE " & DB_LOCKID & " = '" & Licence.Number & "'" + 'SerialNumber = ManageDb.ExecuteKeyQuery(nQuery).FirstOrDefault().Seriale + Dim keyDummy As Key = ManageDb.ExecuteKeyQuery(nQuery).FirstOrDefault() + SerialNumber = If(IsNothing(keyDummy), Nothing, keyDummy.Seriale) + NotifyPropertyChanged("SerialNumber") + + ' Carico ProductName della Licenza selezionata da aggiornare Dim ProdQuery As String = "SELECT * FROM " & DB_PRODUCT & " WHERE " & DB_PRODUCTID & " = " & Licence.ProductID ProductName = ManageDb.ExecuteProductQuery(ProdQuery)(0).ProductName NotifyPropertyChanged("ProductName")