Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator
This commit is contained in:
commit
330ffe30a5
@ -131,7 +131,7 @@ Public Class EnvelopeModel
|
|||||||
|
|
||||||
If Database.ExecuteNonQuery(oCommand) Then
|
If Database.ExecuteNonQuery(oCommand) Then
|
||||||
pEnvelope.Id = GetEnvelopeId(pEnvelope)
|
pEnvelope.Id = GetEnvelopeId(pEnvelope)
|
||||||
SetEnvelopeDate(pEnvelope) 'TODO JJ fragen
|
SetEnvelopeDate(pEnvelope)
|
||||||
Return True
|
Return True
|
||||||
Else
|
Else
|
||||||
Return False
|
Return False
|
||||||
|
|||||||
@ -231,6 +231,9 @@
|
|||||||
<data name="There are already elements for this recipient" xml:space="preserve">
|
<data name="There are already elements for this recipient" xml:space="preserve">
|
||||||
<value>There are already elements for this recipient. Do you still want to delete the recipient?</value>
|
<value>There are already elements for this recipient. Do you still want to delete the recipient?</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="There are unsaved changes." xml:space="preserve">
|
||||||
|
<value>There are unsaved changes. Do you want to save them?</value>
|
||||||
|
</data>
|
||||||
<data name="You received a document to sign" xml:space="preserve">
|
<data name="You received a document to sign" xml:space="preserve">
|
||||||
<value>You received a document to sign:</value>
|
<value>You received a document to sign:</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -231,6 +231,9 @@
|
|||||||
<data name="There are already elements for this recipient" xml:space="preserve">
|
<data name="There are already elements for this recipient" xml:space="preserve">
|
||||||
<value>Es gibt für diesen Empfänger bereits Elemente. Wollen Sie den Empfänger trotzdem löschen?</value>
|
<value>Es gibt für diesen Empfänger bereits Elemente. Wollen Sie den Empfänger trotzdem löschen?</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="There are unsaved changes" xml:space="preserve">
|
||||||
|
<value>Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern?</value>
|
||||||
|
</data>
|
||||||
<data name="You received a document to sign" xml:space="preserve">
|
<data name="You received a document to sign" xml:space="preserve">
|
||||||
<value>Sie haben ein Dokument zum signieren erhalten:</value>
|
<value>Sie haben ein Dokument zum signieren erhalten:</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -406,6 +406,15 @@ Namespace My.Resources
|
|||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
|
'''<summary>
|
||||||
|
''' Sucht eine lokalisierte Zeichenfolge, die Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern? ähnelt.
|
||||||
|
'''</summary>
|
||||||
|
Public Shared ReadOnly Property There_are_unsaved_changes() As String
|
||||||
|
Get
|
||||||
|
Return ResourceManager.GetString("There are unsaved changes", resourceCulture)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die Sie haben ein Dokument zum signieren erhalten: ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die Sie haben ein Dokument zum signieren erhalten: ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
|
|||||||
@ -25,7 +25,7 @@ Partial Public Class frmFieldEditor
|
|||||||
|
|
||||||
Private UnsavedChanges As Boolean = False
|
Private UnsavedChanges As Boolean = False
|
||||||
|
|
||||||
Private Const SIGNATURE_LABEL = "Signatur"
|
Private SIGNATURE_LABEL As String
|
||||||
Private Const SIGNATURE_WIDTH As Single = 1
|
Private Const SIGNATURE_WIDTH As Single = 1
|
||||||
Private Const SIGNATURE_HEIGHT As Single = 0.5
|
Private Const SIGNATURE_HEIGHT As Single = 0.5
|
||||||
|
|
||||||
@ -39,6 +39,7 @@ Partial Public Class frmFieldEditor
|
|||||||
|
|
||||||
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
|
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load
|
||||||
Text = $"{State.DbConfig.ExternalProgramName} - {Resources.Envelope.Signature_Editor}"
|
Text = $"{State.DbConfig.ExternalProgramName} - {Resources.Envelope.Signature_Editor}"
|
||||||
|
SIGNATURE_LABEL = Resources.Envelope.Signature
|
||||||
|
|
||||||
If Document Is Nothing Then
|
If Document Is Nothing Then
|
||||||
Throw New ArgumentNullException("Document")
|
Throw New ArgumentNullException("Document")
|
||||||
@ -251,7 +252,7 @@ Partial Public Class frmFieldEditor
|
|||||||
Exit Sub
|
Exit Sub
|
||||||
End If
|
End If
|
||||||
|
|
||||||
If MsgBox("Wollen Sie die Signatur löschen?", MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) = DialogResult.Yes Then
|
If MsgBox(Resources.Envelope.Do_you_want_to_delete_the_signature, MsgBoxStyle.YesNo Or MsgBoxStyle.Question, Text) = DialogResult.Yes Then
|
||||||
Dim oAnnotation = GDViewer.GetAnnotationFromIdx(oSelected)
|
Dim oAnnotation = GDViewer.GetAnnotationFromIdx(oSelected)
|
||||||
Dim oElement = Controller.GetElement(oAnnotation)
|
Dim oElement = Controller.GetElement(oAnnotation)
|
||||||
|
|
||||||
@ -410,7 +411,7 @@ Partial Public Class frmFieldEditor
|
|||||||
|
|
||||||
Private Sub frmFieldEditor_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
|
Private Sub frmFieldEditor_FormClosing(sender As Object, e As FormClosingEventArgs) Handles MyBase.FormClosing
|
||||||
If UnsavedChanges Then
|
If UnsavedChanges Then
|
||||||
Dim oResult = MsgBox("Es sind ungespeicherte Änderungen vorhanden. Wollen Sie diese Speichern?", MsgBoxStyle.Question Or MsgBoxStyle.YesNoCancel, Text)
|
Dim oResult = MsgBox(Resources.Envelope.There_are_unsaved_changes, MsgBoxStyle.Question Or MsgBoxStyle.YesNoCancel, Text)
|
||||||
|
|
||||||
Select Case oResult
|
Select Case oResult
|
||||||
Case MsgBoxResult.Cancel
|
Case MsgBoxResult.Cancel
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user