LicenceManager 2.1c5:

- Aggiunti 2 nuovi Stati Chiave: Interna e InternaEgt
- Entrando in ogni SearchPage viene subito riempita la tabella dell'elemento relativo (Chiave, Licenze, ecc.) senza bisogno di premere "Search"
- Pulsante "Cancel" è diventato "Close" e spostato in fondo a destra
- Aggiunto LicenceBox: form che visualizza il contenuto del file di licenza e ne permette il download (sostituisce il MessageBox che c'era prima)
- "Update (Overwrite)" ora è seguito dalla rigenerazione della licenza
- MainMenu non include più i pulsanti "New [...]". Questi sono stati tutti spostati all'interno delle SearchPage
This commit is contained in:
Renzo Lanza
2019-03-20 15:56:23 +00:00
parent 697eaab19a
commit 80360b0306
32 changed files with 498 additions and 123 deletions
+43 -7
View File
@@ -41,7 +41,7 @@ Public Class SearchKeyPageVM
End Get
End Property
Private m_StateList As New List(Of String)({"Consegnata", "InDeposito", "InDepositoEgt", "Guasta", "---ANY---"})
Private m_StateList As New List(Of String)({"Consegnata", "InDeposito", "InDepositoEgt", "Guasta", "Interna", "InternaEgt", "---ANY---"})
Public Overloads ReadOnly Property StateList As List(Of String)
Get
Return m_StateList
@@ -57,16 +57,20 @@ Public Class SearchKeyPageVM
Return m_SelState.ToString()
End Get
Set(value As String)
If String.IsNullOrWhiteSpace( value) Then
If String.IsNullOrWhiteSpace(value) Then
' m_SelState = Nothing
ElseIf value.Equals("Consegnata") Then
m_SelState = Key.KeyState.Consegnata
Else If value.Equals("InDeposito") Then
ElseIf value.Equals("InDeposito") Then
m_SelState = Key.KeyState.InDeposito
Else If value.Equals("InDepositoEgt") Then
ElseIf value.Equals("InDepositoEgt") Then
m_SelState = Key.KeyState.InDepositoEgt
Else If value.Equals("Guasta") Then
ElseIf value.Equals("Guasta") Then
m_SelState = Key.KeyState.Guasta
ElseIf value.Equals("Interna") Then
m_SelState = Key.KeyState.Interna
ElseIf value.Equals("InternaEgt") Then
m_SelState = Key.KeyState.InternaEgt
ElseIf value.Equals("---ANY---") Then
m_SelState = Key.KeyState.ANY
End If
@@ -75,6 +79,7 @@ Public Class SearchKeyPageVM
End Property
' Definizione comandi
Private m_cmdNewKey As Command
Private m_cmdSearch As Command
Private m_cmdCancel As Command
Private m_cmdUpdate As Command
@@ -88,6 +93,12 @@ Public Class SearchKeyPageVM
End Get
End Property
Public ReadOnly Property NewMsg As String
Get
Return "New"
End Get
End Property
Public ReadOnly Property SearchMsg As String
Get
Return "Search"
@@ -96,7 +107,7 @@ Public Class SearchKeyPageVM
Public ReadOnly Property CancelMsg As String
Get
Return "Cancel"
Return "Close"
End Get
End Property
@@ -137,7 +148,11 @@ Public Class SearchKeyPageVM
' Nascondo la GeneratedLockID
GeneratedLockID_Visibility = Visibility.Collapsed
m_SearchResult = New ObservableCollection(Of SearchKey)()
' m_SearchResult = New ObservableCollection(Of SearchKey)()
Dim Query As String = "SELECT * FROM " & DB_KEY & " LEFT JOIN " & DB_CLIENT &
" ON " & DB_KEY & "." & DB_CLIENTID & " = " & DB_CLIENT & "." & DB_CLIENTID & " " &
" ORDER BY " & DB_NUMBER
m_SearchResult = New ObservableCollection(Of SearchKey)(ManageDb.ExecuteSearchKeyQuery(Query))
NotifyPropertyChanged("SearchResult")
m_SelState = Key.KeyState.ANY
NotifyPropertyChanged("SelState")
@@ -224,6 +239,27 @@ Public Class SearchKeyPageVM
#End Region ' Search
#Region "NewKey"
' Returns a command that manage the MainWindow_Unloaded command
Public ReadOnly Property NewKey_Command As ICommand
Get
If m_cmdNewKey Is Nothing Then
m_cmdNewKey = New Command(AddressOf NewKey)
End If
Return m_cmdNewKey
End Get
End Property
Public Sub NewKey(ByVal param As Object)
' Manage the MainWindow_Unloaded event. This method is invoked by the cmdMainWindow_Unloaded.
Map.refMainWindowVM.SelProjectMode = MainWindowVM.ProjectModeOpt.NEWKEY
End Sub
#End Region ' NewKey
#Region "Cancel"
' Returns a command that manage the MainWindow_Unloaded command