AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MS Rückruf

Browse Source
This commit is contained in:
SchreiberM
2024-05-29 13:43:55 +02:00
parent 297ecfab7b
commit 5ca4c04669
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
EnvelopeGenerator.Common/Services/TemplateService.vb
View File

@@ -42,7 +42,7 @@ Public Class TemplateService
End Sub End Sub
Public Sub FillEnvelopeDeletedEmailBody(pEmailData As EmailData, pReason As String) Public Sub FillEnvelopeDeletedEmailBody(pEmailData As EmailData, pReason As String)
InitDictionary(pEmailData) InitDictionary(pEmailData, pReason)
Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentDeleted) Dim oTemplate = EmailHtmlTemplateModel.GetById(Constants.EmailTemplateType.DocumentDeleted)
pEmailData.EmailBody = FillTemplate(oTemplate.Body, pReason) pEmailData.EmailBody = FillTemplate(oTemplate.Body, pReason)
@@ -78,6 +78,7 @@ Public Class TemplateService
For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary For Each dictItem As KeyValuePair(Of String, String) In _replaceDictionary
If oText.Contains(dictItem.Key) Then If oText.Contains(dictItem.Key) Then
oText = oText.Replace(dictItem.Key, dictItem.Value) oText = oText.Replace(dictItem.Key, dictItem.Value)
End If End If

22
EnvelopeGenerator.Form/frmMain.vb
View File

@@ -152,19 +152,21 @@ Public Class frmMain
End Sub End Sub
Private Sub btnDeleteEnvelope_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeleteEnvelope.ItemClick Private Sub btnDeleteEnvelope_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeleteEnvelope.ItemClick
Dim oSelectedRows = ViewEnvelopes.GetSelectedRows() Try
If oSelectedRows.Count > 0 Then Dim oSelectedRows = ViewEnvelopes.GetSelectedRows()
Dim ofrmAbort As New frmRueckruf If oSelectedRows.Count > 0 Then
frmRueckruf.ShowDialog() Dim ofrmAbort As New frmRueckruf
MsgBox("Abort: " + frmRueckruf.Abort & vbNewLine & "Reason: " + frmRueckruf.Reject_reason) frmRueckruf.ShowDialog()
If frmRueckruf.Abort = False Then MsgBox("Abort: " & frmRueckruf.Abort & vbNewLine & "Reason: " & frmRueckruf.Reject_reason)
MsgBox(frmRueckruf.Abort & vbNewLine & frmRueckruf.Reject_reason) If frmRueckruf.Abort = False Then
DeleteEnvelope(oSelectedRows.First, frmRueckruf.Reject_reason) DeleteEnvelope(oSelectedRows.First, frmRueckruf.Reject_reason)
Else End If
End If End If
Catch ex As Exception
MsgBox(ex.Message, MsgBoxStyle.Critical)
End Try
End If
End Sub End Sub
Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing

3
EnvelopeGenerator.Form/frmRueckruf.vb
View File

@@ -21,7 +21,10 @@ Public Class frmRueckruf
End If End If
tsstatus.Text = "" tsstatus.Text = ""
Continue_Reject = True Continue_Reject = True
Dim oReason = txtReason.Text
oReason.Replace(vbCr, "<br>").Replace(vbLf, "<br>")
Reject_reason = txtReason.Text Reject_reason = txtReason.Text
Me.Close()
Else Else
tsstatus.Text = "Please add a reason for aborting - " & Now tsstatus.Text = "Please add a reason for aborting - " & Now
End If End If