20-11-23

EnvelopeGenerator.Web/wwwroot/js/annotation.js

@@ -70,6 +70,35 @@
         return annotation
     }
 
+    async createFrameAnnotation(annotation, receiver) {
+        const left = annotation.boundingBox.left - 25;
+        const top = annotation.boundingBox.top - 25;
+        const width = 150;
+        const height = 75;
+
+        const imageUrl = await this.Annotation.createAnnotationFrameBlob(receiver.name, width, height);
+        const request = await fetch(imageUrl);
+        const blob = await request.blob();
+
+        const imageAttachmentId = await this.Instance.createAttachment(blob);
+        const frameAnnotation = new PSPDFKit.Annotations.ImageAnnotation({
+            pageIndex: annotation.pageIndex,
+            isSignature: false,
+            readOnly: true,
+            locked: true,
+            lockedContents: true,
+            contentType: 'image/png',
+            imageAttachmentId,
+            description: 'FRAME',
+            boundingBox: new PSPDFKit.Geometry.Rect({
+                left: left,
+                top: top,
+                width: width,
+                height: height,
+            }),
+        });
+    }
+
     async createAnnotationFrameBlob(receiverName, width, height) {
         const canvas = document.createElement("canvas");
         canvas.width = width;

EnvelopeGenerator.Web/wwwroot/js/app.js

@@ -62,8 +62,7 @@ class App {
             const annotations = this.Annotation.createAnnotations(this.currentDocument)
             const createdAnnotations = await this.Instance.create(annotations)
 
-            const description = "Umschlag wurde geöffnet"
-            await this.Network.postHistory(this.envelopeKey, ActionType.Seen, description);
+            await this.Network.postHistory(this.envelopeKey, ActionType.Seen)
         } catch (e) {
             console.error(e)
         }
@@ -77,47 +76,12 @@ class App {
     handleAnnotationsChange() {}
 
     async handleAnnotationsCreate(createdAnnotations) {
-        console.log("annotations created");
-
-        console.log(createdAnnotations.toJS())
-
         const annotation = createdAnnotations.toJS()[0];
         const isFormField = !!annotation.formFieldName;
         const isSignature = !!annotation.isSignature;
 
         if (isFormField === false && isSignature === true) {
-                
-            const left = annotation.boundingBox.left - 25;
-            const top = annotation.boundingBox.top - 25;
-            const width = 150;
-            const height = 75;
-
-            console.log(annotation.boundingBox)
-
-            const imageUrl = await this.Annotation.createAnnotationFrameBlob(this.currentReceiver.name, width, height);
-
-            const request = await fetch(imageUrl);
-            const blob = await request.blob();
-            const imageAttachmentId = await this.Instance.createAttachment(blob);
-            const frameAnnotation = new PSPDFKit.Annotations.ImageAnnotation({
-                pageIndex: annotation.pageIndex,
-                isSignature: false,
-                readOnly: true,
-                locked: true,
-                lockedContents: true,
-                contentType: 'image/png',
-                imageAttachmentId,
-                description: 'FRAME',
-                boundingBox: new PSPDFKit.Geometry.Rect({
-                    left: left,
-                    top: top,
-                    width: width,
-                    height: height,
-                }),
-            });
-
-            this.Instance.create(frameAnnotation);
-            
+            await this.Annotation.createFrameAnnotation(annotation, this.currentReceiver)                
         }    
     }
 
@@ -169,6 +133,9 @@ class App {
                 return false;
             }
 
+            // Redirect to success page after saving to database
+            window.location.href = `/EnvelopeKey/${this.envelopeKey}/Success`
+
         } catch (e) {
             console.error(e);
             return false;

EnvelopeGenerator.Web/wwwroot/js/network.js

@@ -9,25 +9,6 @@
             .then(res => res.arrayBuffer());
     }
 
-    postDocument(envelopeKey, documentId, buffer) {
-        const url = `/api/document/${envelopeKey}?index=${documentId}`;
-        const options = {
-            credentials: "include",
-            method: "POST",
-            body: buffer
-        }
-
-        console.debug("PostDocument/Calling url: " + url)
-        return fetch(url, this.withCSRFToken(options))
-            .then(this.handleResponse)
-            .then((res) => {
-                if (!res.ok) {
-                    return false;
-                };
-                return true;
-            });
-    }
-
     postEnvelope(envelopeKey, documentId, jsonString) {
         const url = `/api/envelope/${envelopeKey}?index=${documentId}`;
         const options = {
@@ -47,12 +28,11 @@
             });
     }
 
-    postHistory(envelopeKey, actionType, actionDescription) {
+    postHistory(envelopeKey, actionType) {
         const url = `/api/history/${envelopeKey}`;
 
         const data = {
-            actionDescription: actionDescription,
-            actionType: actionType.toString()
+            actionType: actionType
         }
 
         const options = {