return and reject pop up display fix

WebGde/WebContent/WebGde-Widgets/BPO/rejectElement.js

@@ -21,13 +21,7 @@ async function rejectElement() {
         body: JSON.stringify(load)
     });
     if (response.status == 200) {  
-        if(INDEXED_DB_STORAGE){
-            INDEXED_DB_STORAGE.clear();
-        }
-
-		if(IMAGE_VIEWER_OBJECT){
-            IMAGE_VIEWER_OBJECT.clearImageContainer();
-        }
+      
 	    
         // [...document.getElementsByClassName("bar")].forEach(el => {
 	    //     el.style.removeProperty('display');
@@ -351,8 +345,8 @@ function saveExceptionToXml(){
         "section": section
     	}
 
-       updateXMLException(xmlData);
-	   return false;	
+       return updateXMLException(xmlData);
+	//    return false;	
 }
 
 function createMessageBox(id){
@@ -395,8 +389,9 @@ async function updateXMLException(xmlData){
         console.log("Exception Updated");
         return true;
     }
-    else{      
-        PROMPT.createInfoPrompt(`Error ${response.status}: Xml Update`);
-    }
+    // else{      
+    //     // PROMPT.createInfoPrompt(`Error ${response.status}: Xml Update`);
+    //     return false
+    // }
     return false;
 }
\ No newline at end of file

WebGde/WebContent/WebGde-Widgets/BPO/returnElement.js

 import { resetGDE } from "../../script.js";
+import { interval } from "../captureMetrics/captureMetrics.js";
 import { createModal } from "../genericPopup/genericPopup.js";
 import { BPO_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from "../globalVariable.js";
 import { getUrlReturnElement } from "./bpoService.js";
@@ -7,22 +8,10 @@ export async function returnElementBPO(elementId) {
     let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
 
     if (response.status == 200) {
-    	if(INDEXED_DB_STORAGE){
-            INDEXED_DB_STORAGE.clear();
-        }
-
-		if(IMAGE_VIEWER_OBJECT){
-            IMAGE_VIEWER_OBJECT.clearImageContainer();
-        }
-	    
-        // [...document.getElementsByClassName("bar")].forEach(el => {
-	    //     el.style.removeProperty('display');
-	    // });
-		//document.getElementById("counter").innerHTML = "";
-        //clearTimeout(interval);
+		document.getElementById("counter").innerHTML = "";
+        clearTimeout(interval);
         sessionStorage.removeItem("section");
         sessionStorage.removeItem("doctype");
-        //isCanvasNotCreated = true;   
 		localStorage.clear(); 
 
         function successfulReturn() {
@@ -33,9 +22,7 @@ export async function returnElementBPO(elementId) {
         if(await BPO_OBJECT.getRandomWaitingElement()){
             resetGDE();
         };
-		//localStorage.sfIndex = 1;    
-        // await loadWaitingElement();
-        // init();
+
     }else{
         //PROMPT.createInfoPrompt(`Error ${response.status}: Returning element`);
         function successfulReturn() {
@@ -184,16 +171,16 @@ export function createReturnWindow() {
     okEnd.id = 'okEndButtn';
     okEnd.onclick = function() {
     	returnElementBPO(sessionStorage.getItem("element_id"));
-		var fileName = sessionStorage.getItem("file_Name");
-		if(fileName !== null && fileName !== undefined){
-			if(document.getElementById("controlsContainer") !== null) {
-				document.getElementById("controlsContainer").outerHTML="";
-			}
-		}else{
-			if(document.getElementById("TiffViewer_ButtonContainer") !== null) {
-				document.getElementById("TiffViewer_ButtonContainer").outerHTML="";
-			}
-		}
+		// var fileName = sessionStorage.getItem("file_Name");
+		// if(fileName !== null && fileName !== undefined){
+		// 	if(document.getElementById("controlsContainer") !== null) {
+		// 		document.getElementById("controlsContainer").outerHTML="";
+		// 	}
+		// }else{
+		// 	if(document.getElementById("TiffViewer_ButtonContainer") !== null) {
+		// 		document.getElementById("TiffViewer_ButtonContainer").outerHTML="";
+		// 	}
+		// }
 		overlay.remove();
     }
 

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

@@ -67,7 +67,7 @@ export class Highlight {
 
         this.highlightCanvas.setAttribute("width", w);
         this.highlightCanvas.setAttribute("height", h);
-        this.highlightCanvas.style.zIndex = "10";
+        this.highlightCanvas.style.zIndex = "3";
 
     }
 

WebGde/WebContent/WebGde-Widgets/documentControlWidget/documentControlWidget.js

@@ -147,7 +147,8 @@ export class DocumentControlWidget {
         }
 
         this.global.returnBtn.onclick = (e) => {
-            returnElementBPO(sessionStorage.getItem("element_id"));
+            createReturnWindow();
+            //returnElementBPO(sessionStorage.getItem("element_id"));
             // var fileName = sessionStorage.getItem("file_Name");
             // if (fileName !== null && fileName !== undefined) {
             //     document.getElementById("controlsContainer").outerHTML="";	
@@ -155,7 +156,7 @@ export class DocumentControlWidget {
             //     document.getElementById("TiffViewer_ButtonContainer").outerHTML="";
             // }	
 
-            //createReturnWindow();
+            
         }
         
         this.global.returnBtn.onkeydown = (e) => {

WebGde/WebContent/style.css

@@ -244,7 +244,7 @@ textarea{
     height: 100%;
     position: absolute;
     top: 0;
-    z-index: 1;
+    z-index: 5;
     backdrop-filter: blur(4px);
 }