02.08.2023

EnvelopeGenerator.Form/Controllers/FieldEditorController.vb

@@ -22,11 +22,12 @@ Public Class FieldEditorController
         ElementModel = New ElementModel(pState)
     End Sub
 
-    Public Sub AddOrUpdateElement(pAnnotation As AnnotationStickyNote, pReceiverId As Integer)
+    Public Sub AddOrUpdateElement(pAnnotation As AnnotationStickyNote)
         Dim oTag As String() = pAnnotation.Tag.Split("|"c)
-        Dim oPage = Integer.Parse(oTag(0))
-        Dim oIndex = Integer.Parse(oTag(1))
-        Dim oELement = Elements.Where(Function(e) e.AnnotationIndex = oIndex And e.Page = oPage).SingleOrDefault()
+        Dim oReceiverId = Integer.Parse(oTag(0))
+        Dim oPage = Integer.Parse(oTag(1))
+        Dim oIndex = Integer.Parse(oTag(2))
+        Dim oELement = Elements.Where(Function(e) e.AnnotationIndex = oIndex And e.Page = oPage And e.ReceiverId = oReceiverId).SingleOrDefault()
 
         If oELement IsNot Nothing Then
             oELement.Height = pAnnotation.Height
@@ -41,7 +42,7 @@ Public Class FieldEditorController
                 .X = pAnnotation.Left,
                 .Y = pAnnotation.Top,
                 .DocumentId = Document.Id,
-                .ReceiverId = pReceiverId,
+                .ReceiverId = oReceiverId,
                 .AnnotationIndex = oIndex,
                 .Page = oPage
             })