WG-227 - Modified PDF viewer to accept blob

WebGde/WebContent/src/BPO/rejectElement.js

@@ -121,12 +121,26 @@ function createRejectWindow(){
                 
     setRadioHandler('MssgBox');
     
-    okButton.onclick = function () {     	   	
-    	saveExceptionToXml();//save xml
-        rejectElement();//reject on bpo
-    	screenMain.style.display = 'none';
-    	rejectButton.disabled = false;
-    	popUpDisplay.remove();
+    okButton.onclick = function () {
+        if (document.querySelector('input[name="rejectRadio"]:checked').value != null) {
+            if (document.querySelector('input[name="rejectRadio"]:checked').value.trim().length != 0) {
+                saveExceptionToXml();//save xml
+                rejectElement();//reject on bpo
+                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="";	
+                }
+                return;
+            }
+        }
+        
+        document.getElementById('MssgBox').value = "";
+    	document.getElementById('rejectSubmit').click();
    	}
    	    
     cancelButton.onclick = function () {         
@@ -298,19 +312,28 @@ function saveExceptionToXml(){
 }
 
 function createMessageBox(id){
+    let form = document.createElement('form');
     var mssgBox =  document.createElement('textarea');
     mssgBox.id = id;
     mssgBox.name = "rejectRadio";
     mssgBox.maxLength = "1000";
     mssgBox.cols = "20";
-    mssgBox.rows = "5"; 
+    mssgBox.rows = "5";
+    mssgBox.required = true; 
     mssgBox.disabled = true;
     mssgBox.onkeyup = function () {
     	let radioFive = document.getElementById('check5');
     	radioFive.value = mssgBox.value;
     }
 
-    return mssgBox;
+    let submit = document.createElement('input');
+    submit.id = 'rejectSubmit';
+    submit.type = 'submit';
+    submit.style.visibility = 'hidden';
+
+    form.appendChild(mssgBox);
+    form.appendChild(submit);
+    return form;
 }
 	
 		

WebGde/WebContent/src/BPO/returnElement.js

@@ -67,14 +67,28 @@ 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"));
+       	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="";	
+		}
     }
 });
 

WebGde/WebContent/src/pdfviewer/pdfv.js

@@ -188,24 +188,24 @@ var displayPdf = function(doc) {
 
         fitContentButton.addEventListener('click', function() {
 
-            if (currentScale != fitScale) {
+            /*if (currentScale != fitScale) {
                 currentScale = fitScale;
                 renderPage(currentPage);
-            } else {
+            } else {*/
                 currentScale = 1.3;
                 renderPage(currentPage);
-            }
+            //}
         });
 
         document.addEventListener("keydown", function(e) {
             if (e.shiftKey && e.key == 'F') {
-                if (currentScale != fitScale) {
-                    currentScale = fitScale;
-                    renderPage(currentPage);
-                } else {
+                // if (currentScale != fitScale) {
+                //     currentScale = fitScale;
+                //     renderPage(currentPage);
+                // } else {
                     currentScale = 1.3;
                     renderPage(currentPage);
-                }
+                // }
             }
         });
 

WebGde/WebContent/src/tiffViewer/tiffViewer.css

 .tiffViewerContainer {
 	margin: auto;
-	height: calc(100% - 60px);
+	/* height: calc(100% - 60px); */
 	width: 70%;
 	position: relative;
 	display: block;

WebGde/WebContent/style.css

@@ -468,7 +468,6 @@ div#nextDivContainer {
 }
 
 #nextDiv {
-	z-index: 1;
     background-color: #000000a1;
     width: 35px;
     display: flex;