Vermerke

VERAGAddIn/frmAvisoAnfügen.vb

@@ -261,29 +261,33 @@ Public Class frmAvisoAnfuegen
 
     End Sub
 
-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
-        If Me.SendungsId >= 0 Then
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles btnVermerke.Click
+        If Me.AvisoId >= 0 Then
+            If Me.SendungsId >= 0 Then
 
-            Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
-            Dim sv As New AVISO.frmAddSendungsvermerkShort(AvisoId, Me.SendungsId) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
-            sv.Location = Me.PointToClient(Cursor.Position)
-            sv.ShowDialog(frmGrayOut)
-            frmGrayOut.Close()
-            sv.Close()
+                Dim frmGrayOut = VERAG_PROG_ALLGEMEIN.cMeineFunktionenAVISO.grayoutForm()
+                Dim sv As New AVISO.frmAddSendungsvermerkShort(AvisoId, Me.SendungsId) ', dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value)
+                sv.Location = Me.PointToClient(Cursor.Position)
+                sv.ShowDialog(frmGrayOut)
+                frmGrayOut.Close()
+                sv.Close()
 
-            initVermerke()
+                initVermerke()
 
+            End If
         End If
     End Sub
 
     Sub initVermerke()
         If dgvSendungen.SelectedRows.Count > 0 Then
+            btnVermerke.Enabled = True
             Me.SendungsId = dgvSendungen.SelectedRows(0).Cells("tblSnd_SendungID").Value
             Dim AVISO = VERAG_PROG_ALLGEMEIN.cAviso.getAvisoById(dgvSendungen.SelectedRows(0).Cells("tblSnd_AvisoID").Value)
             If AVISO IsNot Nothing Then
                 usrcntrVermerke.init(AVISO, SendungsId)
             End If
         Else
+            btnVermerke.Enabled = False
             usrcntrVermerke.init(Nothing, -1)
         End If