Vermerke

2024-06-07 14:18:03 +02:00
parent 58300fd00b
commit b8dfcbee4c
2 changed files with 86 additions and 81 deletions
--- a/VERAGAddIn/frmAvisoAnfügen.Designer.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.Designer.vb
@@ -35,6 +35,11 @@ Partial Class frmAvisoAnfuegen
        Me.Label3 = New System.Windows.Forms.Label()
        Me.cbx = New System.Windows.Forms.CheckBox()
        Me.CheckBox1 = New System.Windows.Forms.CheckBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.btnVermerke = New System.Windows.Forms.Button()
+        Me.bttnSaveMail = New System.Windows.Forms.Button()
+        Me.btnSaveAttachments = New System.Windows.Forms.Button()
        Me.dgvAnhaenge = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.columnName = New System.Windows.Forms.DataGridViewTextBoxColumn()
        Me.Pfad = New System.Windows.Forms.DataGridViewTextBoxColumn()
@@ -46,11 +51,6 @@ Partial Class frmAvisoAnfuegen
        Me.cboFiliale = New VERAG_PROG_ALLGEMEIN.MyComboBox()
        Me.txtLKWNr = New VERAG_PROG_ALLGEMEIN.MyTextBox()
        Me.dgvAviso = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Button2 = New System.Windows.Forms.Button()
-        Me.bttnSaveMail = New System.Windows.Forms.Button()
-        Me.btnSaveAttachments = New System.Windows.Forms.Button()
        Me.usrcntrVermerke = New AVISO.rCntrlVermerke()
        CType(Me.dgvAnhaenge, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.dgvSendungen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -183,6 +183,72 @@ Partial Class frmAvisoAnfuegen
        Me.CheckBox1.UseVisualStyleBackColor = True
        Me.CheckBox1.Visible = False
        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.ForeColor = System.Drawing.Color.Red
+        Me.Label4.Location = New System.Drawing.Point(530, 4)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(100, 20)
+        Me.Label4.TabIndex = 39
+        Me.Label4.Text = "Testsystem"
+        '
+        'Label5
+        '
+        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
+        Me.Label5.ForeColor = System.Drawing.Color.Black
+        Me.Label5.Location = New System.Drawing.Point(12, 817)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(55, 13)
+        Me.Label5.TabIndex = 41
+        Me.Label5.Text = "Vermerke:"
+        '
+        'btnVermerke
+        '
+        Me.btnVermerke.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnVermerke.Enabled = False
+        Me.btnVermerke.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnVermerke.Image = Global.VERAGAddIn.My.Resources.Resources.vermerk
+        Me.btnVermerke.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVermerke.Location = New System.Drawing.Point(15, 855)
+        Me.btnVermerke.Name = "btnVermerke"
+        Me.btnVermerke.Size = New System.Drawing.Size(112, 69)
+        Me.btnVermerke.TabIndex = 42
+        Me.btnVermerke.Text = "Vermerk" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "hinzufügen"
+        Me.btnVermerke.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnVermerke.UseVisualStyleBackColor = True
+        '
+        'bttnSaveMail
+        '
+        Me.bttnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.bttnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.bttnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1
+        Me.bttnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.bttnSaveMail.Location = New System.Drawing.Point(451, 596)
+        Me.bttnSaveMail.Name = "bttnSaveMail"
+        Me.bttnSaveMail.Size = New System.Drawing.Size(179, 53)
+        Me.bttnSaveMail.TabIndex = 11
+        Me.bttnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13)
+        Me.bttnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.bttnSaveMail.UseVisualStyleBackColor = True
+        '
+        'btnSaveAttachments
+        '
+        Me.btnSaveAttachments.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnSaveAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat
+        Me.btnSaveAttachments.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
+        Me.btnSaveAttachments.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnSaveAttachments.Location = New System.Drawing.Point(239, 597)
+        Me.btnSaveAttachments.Name = "btnSaveAttachments"
+        Me.btnSaveAttachments.Size = New System.Drawing.Size(206, 69)
+        Me.btnSaveAttachments.TabIndex = 9
+        Me.btnSaveAttachments.Text = "Nur Anhänge speichern"
+        Me.btnSaveAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnSaveAttachments.UseVisualStyleBackColor = True
+        '
        'dgvAnhaenge
        '
        Me.dgvAnhaenge.AKTUALISIERUNGS_INTERVALL = -1
@@ -385,71 +451,6 @@ Partial Class frmAvisoAnfuegen
        Me.dgvAviso.Size = New System.Drawing.Size(615, 245)
        Me.dgvAviso.TabIndex = 6
        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.ForeColor = System.Drawing.Color.Red
-        Me.Label4.Location = New System.Drawing.Point(530, 4)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(100, 20)
-        Me.Label4.TabIndex = 39
-        Me.Label4.Text = "Testsystem"
-        '
-        'Label5
-        '
-        Me.Label5.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Label5.AutoSize = True
-        Me.Label5.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.0!, System.Drawing.FontStyle.Underline)
-        Me.Label5.ForeColor = System.Drawing.Color.Black
-        Me.Label5.Location = New System.Drawing.Point(12, 817)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(55, 13)
-        Me.Label5.TabIndex = 41
-        Me.Label5.Text = "Vermerke:"
-        '
-        'Button2
-        '
-        Me.Button2.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.Button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.Button2.Image = Global.VERAGAddIn.My.Resources.Resources.vermerk
-        Me.Button2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.Button2.Location = New System.Drawing.Point(15, 855)
-        Me.Button2.Name = "Button2"
-        Me.Button2.Size = New System.Drawing.Size(112, 69)
-        Me.Button2.TabIndex = 42
-        Me.Button2.Text = "Vermerk" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "hinzufügen"
-        Me.Button2.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Button2.UseVisualStyleBackColor = True
-        '
-        'bttnSaveMail
-        '
-        Me.bttnSaveMail.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.bttnSaveMail.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.bttnSaveMail.Image = Global.VERAGAddIn.My.Resources.Resources.email_big1
-        Me.bttnSaveMail.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.bttnSaveMail.Location = New System.Drawing.Point(451, 596)
-        Me.bttnSaveMail.Name = "bttnSaveMail"
-        Me.bttnSaveMail.Size = New System.Drawing.Size(179, 53)
-        Me.bttnSaveMail.TabIndex = 11
-        Me.bttnSaveMail.Text = "E-Mail speichern" & Global.Microsoft.VisualBasic.ChrW(13)
-        Me.bttnSaveMail.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.bttnSaveMail.UseVisualStyleBackColor = True
-        '
-        'btnSaveAttachments
-        '
-        Me.btnSaveAttachments.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnSaveAttachments.FlatStyle = System.Windows.Forms.FlatStyle.Flat
-        Me.btnSaveAttachments.Image = Global.VERAGAddIn.My.Resources.Resources.pdf
-        Me.btnSaveAttachments.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSaveAttachments.Location = New System.Drawing.Point(239, 597)
-        Me.btnSaveAttachments.Name = "btnSaveAttachments"
-        Me.btnSaveAttachments.Size = New System.Drawing.Size(206, 69)
-        Me.btnSaveAttachments.TabIndex = 9
-        Me.btnSaveAttachments.Text = "Nur Anhänge speichern"
-        Me.btnSaveAttachments.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnSaveAttachments.UseVisualStyleBackColor = True
-        '
        'usrcntrVermerke
        '
        Me.usrcntrVermerke.BackColor = System.Drawing.Color.White
@@ -465,7 +466,7 @@ Partial Class frmAvisoAnfuegen
        Me.BackColor = System.Drawing.Color.White
        Me.ClientSize = New System.Drawing.Size(642, 936)
        Me.Controls.Add(Me.usrcntrVermerke)
-        Me.Controls.Add(Me.Button2)
+        Me.Controls.Add(Me.btnVermerke)
        Me.Controls.Add(Me.Label5)
        Me.Controls.Add(Me.Label4)
        Me.Controls.Add(Me.dgvAnhaenge)
@@ -529,6 +530,6 @@ Partial Class frmAvisoAnfuegen
    Friend WithEvents columnName As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents Pfad As Windows.Forms.DataGridViewTextBoxColumn
    Friend WithEvents Label5 As Windows.Forms.Label
-    Friend WithEvents Button2 As Windows.Forms.Button
+    Friend WithEvents btnVermerke As Windows.Forms.Button
    Friend WithEvents usrcntrVermerke As AVISO.rCntrlVermerke
 End Class
--- a/VERAGAddIn/frmAvisoAnfügen.vb
+++ b/VERAGAddIn/frmAvisoAnfügen.vb
@@ -261,7 +261,8 @@ Public Class frmAvisoAnfuegen

    End Sub

-    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+    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()
@@ -274,16 +275,19 @@ Public Class frmAvisoAnfuegen
                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