dyn Mailvorlagen

2024-04-19 09:40:25 +02:00
parent 441a66bd61
commit dd610d6efb
4 changed files with 37 additions and 22 deletions
--- a/SDL/Formulare/KDFormulare/frmFormulare.vb
+++ b/SDL/Formulare/KDFormulare/frmFormulare.vb
@@ -187,7 +187,7 @@ Public Class frmFormulare

        End Try

-        cboTextkonserve.fillWithSQL("SELECT distinct([txt_bezeichnung])  FROM [tblTextkonserve]  where [txt_kategorie] ='FRM_MNGR_MailText'  and [txt_FIRMA]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", False, "FMZOLL", True)
+        cboTextkonserve.fillWithSQL("SELECT distinct([txt_bezeichnung])  FROM [tblTextkonserve]  where [txt_kategorie] ='FRM_MNGR_MailText' and txt_dynMailvorlage = 0  and [txt_FIRMA]='" & VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA & "' ", False, "FMZOLL", True)

        Select Case VERAG_PROG_ALLGEMEIN.cAllgemein.FIRMA
            Case "IMEX"
--- a/SDL/SDL.vbproj
+++ b/SDL/SDL.vbproj
@@ -105,6 +105,10 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>C:\Program Files (x86)\GrapeCity\ActiveReports 15\Tools\BouncyCastle.Crypto.dll</HintPath>
    </Reference>
+    <Reference Include="ChilkatDotNet47, Version=9.5.0.96, Culture=neutral, PublicKeyToken=eb5fc1fc52ef09bd, processorArchitecture=AMD64">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\VERAG_PROG_ALLGEMEIN\bin\Debug\ChilkatDotNet47.dll</HintPath>
+    </Reference>
    <Reference Include="ClosedXML, Version=0.76.0.0, Culture=neutral, PublicKeyToken=fd1eb21b62ae805b, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
      <HintPath>F:\PROGRAMMIERUNG\dll\closedxml\95\ClosedXML.dll</HintPath>
--- a/SDL/frmdynMailvorlage.Designer.vb
+++ b/SDL/frmdynMailvorlage.Designer.vb
@@ -22,7 +22,9 @@ Partial Class frmdynMailvorlage
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
        Me.mainPanel = New System.Windows.Forms.Panel()
+        Me.TextBox2 = New System.Windows.Forms.TextBox()
        Me.btn = New System.Windows.Forms.Button()
        Me.lblWordcount = New System.Windows.Forms.Label()
        Me.cboFirmensignatur = New VERAG_PROG_ALLGEMEIN.MyComboBox()
@@ -51,8 +53,7 @@ Partial Class frmdynMailvorlage
        Me.Label4 = New System.Windows.Forms.Label()
        Me.Label3 = New System.Windows.Forms.Label()
        Me.cbxFirma = New VERAG_PROG_ALLGEMEIN.MyComboBox()
-        Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview()
-        Me.TextBox2 = New System.Windows.Forms.TextBox()
+        Me.dgvMailvorlagen = New VERAG_PROG_ALLGEMEIN.MyDatagridview(Me.components)
        Me.mainPanel.SuspendLayout()
        Me.pnlTop.SuspendLayout()
        CType(Me.dgvMailvorlagen, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -86,6 +87,17 @@ Partial Class frmdynMailvorlage
        Me.mainPanel.Size = New System.Drawing.Size(1283, 449)
        Me.mainPanel.TabIndex = 101
        '
+        'TextBox2
+        '
+        Me.TextBox2.BackColor = System.Drawing.SystemColors.Control
+        Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.TextBox2.Location = New System.Drawing.Point(22, 400)
+        Me.TextBox2.Multiline = True
+        Me.TextBox2.Name = "TextBox2"
+        Me.TextBox2.Size = New System.Drawing.Size(256, 45)
+        Me.TextBox2.TabIndex = 34
+        Me.TextBox2.Text = "* Email-Text-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%VAR-GRENZE%"
+        '
        'btn
        '
        Me.btn.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
@@ -246,9 +258,9 @@ Partial Class frmdynMailvorlage
        Me.Label1.AutoSize = True
        Me.Label1.Location = New System.Drawing.Point(19, 56)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(115, 13)
+        Me.Label1.Size = New System.Drawing.Size(60, 13)
        Me.Label1.TabIndex = 1
-        Me.Label1.Text = "Email-Text (als HTML)*"
+        Me.Label1.Text = "Email-Text*"
        '
        'btnAdd
        '
@@ -404,17 +416,6 @@ Partial Class frmdynMailvorlage
        Me.dgvMailvorlagen.Size = New System.Drawing.Size(1283, 365)
        Me.dgvMailvorlagen.TabIndex = 104
        '
-        'TextBox2
-        '
-        Me.TextBox2.BackColor = System.Drawing.SystemColors.Control
-        Me.TextBox2.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.TextBox2.Location = New System.Drawing.Point(22, 400)
-        Me.TextBox2.Multiline = True
-        Me.TextBox2.Name = "TextBox2"
-        Me.TextBox2.Size = New System.Drawing.Size(256, 45)
-        Me.TextBox2.TabIndex = 34
-        Me.TextBox2.Text = "* Email-Text-Variablen: " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "%VAR-GRENZE%"
-        '
        'frmdynMailvorlage
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
--- a/SDL/frmdynMailvorlage.vb
+++ b/SDL/frmdynMailvorlage.vb
@@ -1,15 +1,20 @@
-Imports Microsoft.Office.Interop
+Imports System.Windows.Controls
+Imports Microsoft.Office.Interop
 Imports VERAG_PROG_ALLGEMEIN

 Public Class frmdynMailvorlage

    Dim txtkonserve As New cTextkonserve
    Dim editall As Boolean = False
+    Dim h2t As New Chilkat.HtmlToText
+
+


    Sub New(permission As Boolean)
        InitializeComponent()
        editall = permission
+        VERAG_PROG_ALLGEMEIN.cChilkat_Helper.UnlockCilkat()
    End Sub

    Private Sub Mailvorlage_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -190,7 +195,7 @@ Public Class frmdynMailvorlage
            txtBetreff.Text = txtkonserve.txt_betreff
            cbxAktiv.Checked = txtkonserve.txt_dynMailvorlage
            cboSprache._value = txtkonserve.txt_sprache
-            rtb_Emailtext.Text = txtkonserve.txt_text
+            rtb_Emailtext.Text = h2t.ToText(txtkonserve.txt_text)
            cboFirmensignatur.changeItem(txtkonserve.txt_firmaSig)
            cbxFirmaChange.changeItem(txtkonserve.txt_FIRMA)

@@ -214,7 +219,7 @@ Public Class frmdynMailvorlage
            txtKS.txt_betreff = txtBetreff.Text
            txtKS.txt_dynMailvorlage = cbxAktiv.Checked
            txtKS.txt_sprache = cboSprache._value
-            txtKS.txt_text = rtb_Emailtext.Text
+            txtKS.txt_text = insertlinebreaks(rtb_Emailtext.Text)
            txtKS.txt_FIRMA = cbxFirmaChange._value
            txtKS.txt_firmaSig = cboFirmensignatur._value

@@ -306,7 +311,7 @@ Public Class frmdynMailvorlage
            If rtb_Emailtext.Text <> "" AndAlso cboSprache._value <> "" Then

                Dim TextHTML = ""
-                TextHTML &= rtb_Emailtext.Text
+                TextHTML &= insertlinebreaks(rtb_Emailtext.Text)
                TextHTML &= "<br>"
                TextHTML &= "<br>"
                TextHTML &= "Mit freundlichen Grüßen<br>"
@@ -330,7 +335,12 @@ Public Class frmdynMailvorlage

    End Sub

-    Private Sub Label1_Click(sender As Object, e As EventArgs) Handles Label1.Click
+    Private Function insertlinebreaks(text As String) As String
+
+        Return text.ToString.Replace(vbLf, vbLf & "<br>")
+
+    End Function
+
+

-    End Sub
 End Class