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 14:34:56 +02:00
parent 5ca4c04669
commit df2537bf29
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
EnvelopeGenerator.Form/frmMain.vb
View File

@@ -157,8 +157,7 @@ Public Class frmMain
If oSelectedRows.Count > 0 Then If oSelectedRows.Count > 0 Then
Dim ofrmAbort As New frmRueckruf Dim ofrmAbort As New frmRueckruf
frmRueckruf.ShowDialog() frmRueckruf.ShowDialog()
MsgBox("Abort: " & frmRueckruf.Abort & vbNewLine & "Reason: " & frmRueckruf.Reject_reason) If frmRueckruf.Continue_Reject = True Then
If frmRueckruf.Abort = False Then
DeleteEnvelope(oSelectedRows.First, frmRueckruf.Reject_reason) DeleteEnvelope(oSelectedRows.First, frmRueckruf.Reject_reason)
End If End If

18
EnvelopeGenerator.Form/frmRueckruf.vb
View File

@@ -4,7 +4,6 @@ Public Class frmRueckruf
Public Continue_Reject As Boolean = False Public Continue_Reject As Boolean = False
Public Reject_reason As String = "" Public Reject_reason As String = ""
Public Abort As Boolean = False
Public Sub New() Public Sub New()
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
@@ -16,14 +15,24 @@ Public Class frmRueckruf
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnWeiter.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnWeiter.Click
If txtReason.Text <> "" Then If txtReason.Text <> "" Then
If MsgBox(Resources.Envelope.Do_you_really_want_to_delete_this_envelope, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.No Then If MsgBox(Resources.Envelope.Do_you_really_want_to_delete_this_envelope, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.No Then
Abort = True
Me.Close() Me.Close()
End If End If
tsstatus.Text = "" tsstatus.Text = ""
Continue_Reject = True Continue_Reject = True
Dim oReason = txtReason.Text Dim oReason = txtReason.Text
oReason.Replace(vbCr, "<br>").Replace(vbLf, "<br>") 'If oReason.Contains(vbCrLf) Then
Reject_reason = txtReason.Text ' MsgBox("vbCrLf")
'ElseIf oReason.Contains(Chr(13)) Then
' MsgBox("chr13")
'ElseIf oReason.Contains(Chr(10)) Then
' MsgBox("chr10")
'End If
'oReason = oReason.Replace(vbLf, "<br>")
oReason = oReason.Replace(vbCrLf, "<br>")
oReason = oReason.Replace(Chr(13), "<br>")
oReason = oReason.Replace(Chr(10), "<br>")
Reject_reason = oReason
Me.Close() Me.Close()
Else Else
tsstatus.Text = "Please add a reason for aborting - " & Now tsstatus.Text = "Please add a reason for aborting - " & Now
@@ -31,7 +40,6 @@ Public Class frmRueckruf
End Sub End Sub
Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click Private Sub btnCancel_Click(sender As Object, e As EventArgs) Handles btnCancel.Click
Abort = True
Me.Close() Me.Close()
End Sub End Sub