09-08-2023

EnvelopeGenerator.Form/frmFieldEditor.vb

@@ -69,7 +69,9 @@ Partial Public Class frmFieldEditor
     End Function
 
     Private Sub BarItem_Click(sender As Object, e As ItemClickEventArgs)
-        If Controller.SaveElements() Then
+        AddElements()
+
+        If Controller.SaveElements(SelectedReceiver.Id) Then
             Dim oReceiver As EnvelopeReceiver = e.Item.Tag
             SetReceiver(oReceiver)
             ClearAnnotations()
@@ -122,10 +124,19 @@ Partial Public Class frmFieldEditor
     End Sub
 
     Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
-        Dim oPageCount = GDViewer.PageCount
-        Dim oCurrentPage = GDViewer.CurrentPage
-
         'TODO: Save Annotations in Background
+        AddElements()
+
+        If Not Controller.SaveElements(SelectedReceiver.Id) Then
+            MsgBox("Elemente konnten nicht gespeichert werden!", MsgBoxStyle.Critical, Text)
+        End If
+
+        GDViewer.DisplayPage(GDViewer.CurrentPage)
+    End Sub
+
+    Private Sub AddElements()
+        Dim oPageCount = GDViewer.PageCount
+
         For oPage = 1 To oPageCount
             GDViewer.DisplayPage(oPage)
             Dim oAnnotationCount = GDViewer.GetAnnotationCount()
@@ -138,16 +149,8 @@ Partial Public Class frmFieldEditor
                 End If
             Next
         Next
-
-        If Not Controller.SaveElements() Then
-            MsgBox("Elemente konnten nicht gespeichert werden!", MsgBoxStyle.Critical, Text)
-        End If
-
-        GDViewer.DisplayPage(oCurrentPage)
     End Sub
 
-
-
     Private Sub ApplyAnnotationStyle(ByRef pAnnotation As Annotation)
         If TypeOf pAnnotation Is AnnotationStickyNote Then
             Dim oStickyNote As AnnotationStickyNote = pAnnotation
@@ -187,8 +190,8 @@ Partial Public Class frmFieldEditor
             oAnnotation.Text = "SIGNATUR"
             oAnnotation.Tag = GetAnnotationTag(pReceiverId, oPage, oIndex)
 
-            If Manager.SaveAnnotationsToPage() = GdPictureStatus.OK Then
-            End If
+            'If Manager.SaveAnnotationsToPage() = GdPictureStatus.OK Then
+            'End If
         End If
     End Sub
 
@@ -209,7 +212,10 @@ Partial Public Class frmFieldEditor
         For oPage = 1 To oPageCount
             GDViewer.DisplayPage(oPage)
             Dim oCurrentPage = oPage
-            Dim oElements = Controller.Elements.Where(Function(element) element.Page = oCurrentPage And element.ReceiverId = pReceiverId).ToList()
+            Dim oElements = Controller.Elements.
+                Where(Function(e) e.Page = oCurrentPage And e.ReceiverId = pReceiverId).
+                ToList()
+
             For Each oElement In oElements
                 LoadAnnotation(oElement, pReceiverId)
             Next