MS_21.10.2015

app/DD-Record-Organiser/frmDokumentart_NameConvention.vb

@@ -6,9 +6,9 @@
     Private loaded As Boolean = False
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndexM.Click
-        If Not Me.cmbIndex_m.Text = "" Then
+        If Not Me.cmbIndex_AUTO.Text = "" Then
             'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version]
-            Dim text As String = "[%m" & Me.cmbIndex_m.Text.ToString.ToUpper & "]"
+            Dim text As String = "[%a" & Me.cmbIndex_AUTO.Text.ToString.ToUpper & "]"
             Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart()
             Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text)
             Me.txtnamenKonv.SelectionStart = altePosition + text.Length
@@ -16,9 +16,9 @@
     End Sub
 
     Private Sub btnAddIndexA_Click(sender As Object, e As EventArgs) Handles btnAddIndexA.Click
-        If Not Me.cmbIndex_A.Text = "" Then
+        If Not Me.cmbIndex_Controls.Text = "" Then
             'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version]
-            Dim text As String = "[%a" & Me.cmbIndex_A.Text.ToString.ToUpper & "|" & cmbIndex_A.SelectedValue & "]"
+            Dim text As String = "[%a" & Me.cmbIndex_Controls.Text.ToString.ToUpper & "#" & cmbIndex_Controls.SelectedValue & "]"
             Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart()
             Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text)
             Me.txtnamenKonv.SelectionStart = altePosition + text.Length
@@ -59,8 +59,9 @@
     Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
         Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID
         If ClassDatabase.Execute_non_Query(sql, True) = True Then
-            frmDokumentart_Konfig.akt_Namenkonvention = txtnamenKonv.Text
             Me.Close()
+        Else
+            MsgBox("Unexpected Error in Save NameConvention - Check logfile", MsgBoxStyle.Exclamation)
         End If
     End Sub
 
@@ -85,6 +86,9 @@
     End Sub
 
     Private Sub cmbEntity_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntity.SelectedIndexChanged
+        Load_EntityData()
+    End Sub
+    Sub Load_EntityData()
         Try
             If cmbEntity.SelectedIndex <> -1 Then
                 TBPMO_WD_FORMVIEW_DOKTYPES_GUID = Me.cmbEntity.SelectedValue
@@ -104,16 +108,14 @@
         Try
             Dim DT1 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] , [CONTROL_COL_NAME]  AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID in (2,3,4) and FORM_ID = (SELECT FORM_ID FROM TBPMO_FORM_VIEW WHERE GUID = " & FORM_VIEW_ID & ")", "LoadControlsForEntity - NameConvention")
             If DT1.Rows.Count >= 1 Then
-                cmbIndex_A.DataSource = DT1
-                cmbIndex_A.DisplayMember = DT1.Columns(1).ColumnName
-                cmbIndex_A.ValueMember = DT1.Columns(0).ColumnName
-                cmbIndex_A.DroppedDown = True
-                cmbIndex_A.Enabled = True
+                cmbIndex_Controls.DataSource = DT1
+                cmbIndex_Controls.DisplayMember = DT1.Columns(1).ColumnName
+                cmbIndex_Controls.ValueMember = DT1.Columns(0).ColumnName
+                cmbIndex_Controls.Enabled = True
                 btnAddIndexA.Enabled = True
             Else
-                cmbIndex_A.Enabled = False
+                cmbIndex_Controls.Enabled = False
                 btnAddIndexA.Enabled = False
-                cmbIndex_A.DroppedDown = False
             End If
 
         Catch ex As Exception
@@ -125,6 +127,7 @@
         loaded = True
         If DT_ENTITIES.Rows.Count = 1 Then
             Load_Controls()
+            Load_EntityData()
         End If
     End Sub
 End Class