highlight bug fix

WebGde/WebContent/WebGde-Widgets/ImageViewerWidget/modules/highlight/highlightClass.js

@@ -33,6 +33,9 @@ export class Highlight {
 
     //creates the canvas for highlight rectangles
     createHighlight() {
+        if(document.getElementById("highlightCanvas")){
+            document.getElementById("highlightCanvas").remove();
+        }
         this.highlightCanvas = document.createElement('canvas');
         this.highlightCanvas.id = "highlightCanvas";
         this.ctx = this.highlightCanvas.getContext("2d");

WebGde/WebContent/script.js

@@ -328,6 +328,7 @@ async function displayPreviousRecord(e) {
 
         IMAGE_VIEWER_OBJECT.setNextImage();
         IMAGE_VIEWER_OBJECT.setCurrentImage("previousImage", IMAGE_VIEWER_OBJECT.getPreviousImage());
+        HIGHLIGHT_OBJECT.createHighlight();
 
         DISPLAY_FIELD_OBJECT.clearForm();
         await populateFields(urls[current]);
@@ -362,6 +363,7 @@ export async function displayNextRecord(e) {
 
         IMAGE_VIEWER_OBJECT.setPreviousImage();
         IMAGE_VIEWER_OBJECT.setCurrentImage("nextImage", IMAGE_VIEWER_OBJECT.getNextImage());
+        HIGHLIGHT_OBJECT.createHighlight();
 
         DISPLAY_FIELD_OBJECT.clearForm();
         await populateFields(urls[current]);
@@ -398,27 +400,31 @@ function checkChangesInTheRecord(index) {
     var formArray = JSON.parse(sessionStorage.getItem('formArray'));
     if (formArray) {
         const obj2 = formArray.filter((x) => x.index == index)[0];
-        if (obj2.value) {
-            let objEqual = false;
-            const obj1Keys = Object.keys(obj1).sort();
-            const obj2Keys = Object.keys(obj2).sort();
-            if (obj1Keys.length !== obj2Keys.length) {
-                return objEqual;
-            } else {
-                const areEqual = obj1Keys.every((key, index) => {
-                    const objValue1 = obj1[key];
-                    const objValue2 = obj2[obj2Keys[index]];
-                    return objValue1 === objValue2;
-                });
-                if (areEqual) {
-                    objEqual = true;
+        if(obj2){
+            if (obj2.value) {
+                let objEqual = false;
+                const obj1Keys = Object.keys(obj1).sort();
+                const obj2Keys = Object.keys(obj2).sort();
+                if (obj1Keys.length !== obj2Keys.length) {
                     return objEqual;
                 } else {
-                    return objEqual;
+                    const areEqual = obj1Keys.every((key, index) => {
+                        const objValue1 = obj1[key];
+                        const objValue2 = obj2[obj2Keys[index]];
+                        return objValue1 === objValue2;
+                    });
+                    if (areEqual) {
+                        objEqual = true;
+                        return objEqual;
+                    } else {
+                        return objEqual;
+                    }
                 }
+            } else {
+                return false
             }
-        } else {
-            return false
+        }else{
+            return false;
         }
     } else {
         return false;