frmAnhaengeVormulare

VERAGAddIn/frmAvisoAnfügen.vb

@@ -7,7 +7,7 @@ Public Class frmAvisoAnfuegen
     Public AvisoId = -1
     Public SendungsId = -1
     Public Bezeichnung = ""
-    Public PDF_MAIL = ""
+    Public PDF_MAIL As cANHANGSART_ADDIN
     Public Art = ""
     Dim VSQL As New VERAG_PROG_ALLGEMEIN.SQL
 
@@ -59,7 +59,7 @@ Public Class frmAvisoAnfuegen
         If ATT.Count = 0 Then
             btnSaveAttachments.Enabled = False
         Else
-            btnSaveAttachments.Enabled = CheckBox1.Checked
+            btnSaveAttachments.Enabled = cbxAnhaengeSpeichern.Checked
             For Each a In ATT
                 Dim display = a
                 If a.Contains("\") Then
@@ -181,7 +181,7 @@ Public Class frmAvisoAnfuegen
     End Sub
 
 
-    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSaveAttachments.Click, bttnSaveMail.Click
+    Private Sub btn_Click(sender As Object, e As EventArgs) Handles btnSaveAttachments.Click, btnSaveMail.Click
         lblErr_Bezeichnung.Visible = False
         lblErr_Aviso.Visible = False
         If dgvAviso.SelectedRows.Count > 0 Then
@@ -195,8 +195,21 @@ Public Class frmAvisoAnfuegen
             Else
                 Me.SendungsId = -1
             End If
-            If sender Is btnSaveAttachments Then PDF_MAIL = "PDF"
-            If sender Is bttnSaveMail Then PDF_MAIL = If(CheckBox1.Checked, If(cbx.Checked, "PDFMAIL", "MAIL"), "ONLYMAIL")
+            If sender Is btnSaveAttachments Then
+                PDF_MAIL = cANHANGSART_ADDIN.PDF
+            End If
+            If sender Is btnSaveMail Then
+                If cbxAnhaengeSpeichern.Checked Then
+                    If cbxAnhaengeZusaetzlichSpeichern.Checked Then
+                        PDF_MAIL = cANHANGSART_ADDIN.PDFANDMAIL
+                    Else
+                        PDF_MAIL = cANHANGSART_ADDIN.YMAIL
+                    End If
+                Else
+                    PDF_MAIL = cANHANGSART_ADDIN.YMAIL
+                End If
+
+            End If
             Bezeichnung = txtBezeichnung.Text
             Me.DialogResult = Windows.Forms.DialogResult.OK
         Else
@@ -238,11 +251,11 @@ Public Class frmAvisoAnfuegen
         End If
     End Sub
 
-    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles CheckBox1.CheckedChanged
-        dgvAnhaenge.Enabled = CheckBox1.Checked
-        cbx.Enabled = CheckBox1.Checked
+    Private Sub CheckBox1_CheckedChanged(sender As Object, e As EventArgs) Handles cbxAnhaengeSpeichern.CheckedChanged
+        dgvAnhaenge.Enabled = cbxAnhaengeSpeichern.Checked
+        cbxAnhaengeZusaetzlichSpeichern.Enabled = cbxAnhaengeSpeichern.Checked
 
-        If CheckBox1.Checked Then
+        If cbxAnhaengeSpeichern.Checked Then
             btnSaveAttachments.Enabled = dgvAnhaenge.Rows.Count > 0
         Else
             btnSaveAttachments.Enabled = False