Merge remote-tracking branch 'origin/features/ComboFinishing'

MachiningDbWindow/MachiningTreeView.vb

@@ -7358,7 +7358,7 @@ Public Class MachiningTreeViewItem
                   ' Itero su ogni coppia e dividila per l'uguale (=)
                   For Each pair As String In pairs
                      keyValue = pair.Split("="c)
-                     value.Add(New ComboParameter(CInt(keyValue(0)), keyValue(1)))
+                     value.Add(New ComboParameter(keyValue(0), keyValue(1)))
                   Next
                   m_NotesList.Add(New NoteListBoxItem(IndexNote, sNotes(0), sNotes(1), value))
                   ' Controllo per visualizzare in modo corretto il selezionato
@@ -7444,7 +7444,7 @@ Public Class MachiningTreeViewItem
                For Each pair As String In pairs
                   Dim keyValue As String() = pair.Split("="c)
                   Dim key As String = keyValue(0)
-                  value.Add(New ComboParameter(CInt(keyValue(0)), keyValue(1)))
+                  value.Add(New ComboParameter(keyValue(0), keyValue(1)))
                Next
             End If
          Next

Note/NoteListBoxItem.vb

@@ -213,12 +213,12 @@ Public Class ComboParameter
 
 #Region "FIELDS % PROPERTIES"
 
-   Friend m_Index As Integer
-   Public Property Index As Integer
+   Friend m_Index As String
+   Public Property Index As String
       Get
          Return m_Index
       End Get
-      Set(value As Integer)
+      Set(value As String)
          m_Index = value
       End Set
    End Property
@@ -237,7 +237,7 @@ Public Class ComboParameter
 
 #Region "CONSTRUCTOR"
 
-   Public Sub New(Index As Integer, KeyValue As String)
+   Public Sub New(Index As String, KeyValue As String)
       m_Index = Index
       m_KeyValue = KeyValue
    End Sub