fix sqa ticket

WebGde/WebContent/src/BPO/rejectElement.js

@@ -127,12 +127,6 @@ function createRejectWindow(){
     	screenMain.style.display = 'none';
     	rejectButton.disabled = false;
     	popUpDisplay.remove();
-    	var fileName = sessionStorage.getItem("file_Name");
-    	if(fileName !== null && fileName !== undefined){
-    		document.getElementById("controlsContainer").outerHTML="";	
-    	}else{
-			document.getElementById("TiffViewer_ButtonContainer").outerHTML="";	
-		}
    	}
    	    
     cancelButton.onclick = function () {         

WebGde/WebContent/src/BPO/returnElement.js

@@ -67,28 +67,14 @@ async function returnElementLogout(elementId) {
 }
 
 var returnButton = document.getElementById('return');
-
 returnButton.addEventListener("click", function () {
 	returnElementBPO(sessionStorage.getItem("element_id"));
-	var fileName = sessionStorage.getItem("file_Name");
-	if(fileName !== null && fileName !== undefined){
-		document.getElementById("controlsContainer").outerHTML="";	
-	}else{
-		document.getElementById("TiffViewer_ButtonContainer").outerHTML="";
-	}	
-});
-
 
+});
 
 window.addEventListener('keydown', function(e) {
     if (e.altKey == true && e.keyCode == 85){
-       	returnElementBPO(sessionStorage.getItem("element_id"));
-		var fileName = sessionStorage.getItem("file_Name");
-		if(fileName !== null && fileName !== undefined){
-			document.getElementById("controlsContainer").outerHTML="";		
-		}else{
-			document.getElementById("TiffViewer_ButtonContainer").outerHTML="";	
-		}
+   	returnElementBPO(sessionStorage.getItem("element_id"));
     }
 });
 

WebGde/WebContent/src/accessFile/accessFile.js

@@ -71,8 +71,16 @@ async function accessFile() {
                                 TiffViewer_filedetail.textContent = "Filename: " + idQuery.result.name;
                                 TiffViewer_filedetail.title = "Filename: " + idQuery.result.name;
                                 TiffViewer_Header.append(TiffViewer_filedetail);
+                                var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");                                
+								if (ctrlTiff) {
+								  ctrlTiff.outerHTML="";	
+								}
                                 displayPdf(idQuery.result.path);
                             } else {
+                            	var ctrlPdf = document.getElementById("controlsContainer");
+								if (ctrlPdf) {
+								  ctrlPdf.outerHTML="";	
+								}
                                 console.log("This is not a pdf file");
                                 window.addEventListener("load", loadDoc(url, TIFFViewer, idQuery.result.name), false);
                             }
@@ -90,8 +98,16 @@ async function accessFile() {
                                 TiffViewer_filedetail.textContent = "Filename: " + idQuery.result.name;
                                 TiffViewer_filedetail.title = "Filename: " + idQuery.result.name;
                                 TiffViewer_Header.append(TiffViewer_filedetail);
+                                var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");                           	
+                                if (ctrlTiff) {
+								  ctrlTiff.outerHTML="";	
+								}
                                 displayPdf(idQuery.result.path);
                             } else {
+                            	var ctrlPdf = document.getElementById("controlsContainer");
+								if (ctrlPdf) {
+								  ctrlPdf.outerHTML="";	
+								}
                                 console.log("This is not a pdf file");
                                 window.addEventListener("load", loadDoc(url, TIFFViewer, idQuery.result.name), false);
                             }
@@ -195,8 +211,16 @@ async function accessFile() {
                         TiffViewer_filedetail.textContent = "Filename: " + filename;
                         TiffViewer_filedetail.title = "Filename: " + filename;
                         TiffViewer_Header.append(TiffViewer_filedetail);
+                        var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");                           	
+                        if (ctrlTiff) {
+						  ctrlTiff.outerHTML="";	
+						}
                         displayPdf(img);
                     } else {
+                    	var ctrlPdf = document.getElementById("controlsContainer");
+						if (ctrlPdf) {
+						  ctrlPdf.outerHTML="";	
+						}
                         window.addEventListener("load", loadDoc(url, TIFFViewer, filename), false);
                     }
 
@@ -602,8 +626,16 @@ function refreshImage() {
                         TiffViewer_filedetail.textContent = "Filename: " + idQuery.result.name;
                         TiffViewer_filedetail.title = "Filename: " + idQuery.result.name;
                         TiffViewer_Header.append(TiffViewer_filedetail);
+                        var ctrlTiff = document.getElementById("TiffViewer_ButtonContainer");                           	
+                        if (ctrlTiff) {
+						  ctrlTiff.outerHTML="";	
+						}
                         displayPdf(idQuery.result.path);
                     } else {
+                    	var ctrlPdf = document.getElementById("controlsContainer");
+						if (ctrlPdf) {
+						  ctrlPdf.outerHTML="";	
+						}
                         console.log("This is not a pdf file");
                         window.addEventListener("load", loadDoc(url, TIFFViewer, idQuery.result.name), false);
                     }