WG-227 - Modified PDF viewer to accept blob

WebGde/.classpath

@@ -11,11 +11,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.payara.tools.lib.system">
-		<attributes>
-			<attribute name="owner.project.facets" value="jst.web"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="optional" value="true"/>
@@ -29,5 +24,10 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.payara.tools.lib.system">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

WebGde/.settings/org.eclipse.wst.common.project.facet.core.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="Payara Server 5 (5.2022.1)"/>
+  <runtime name="Payara Server 5 (5.2021.1)"/>
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>

WebGde/WebContent/src/BPO/rejectElement.js

@@ -121,18 +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();
-    	var fileName = sessionStorage.getItem("file_Name");
-    	if(fileName !== null && fileName !== undefined){
-    		document.getElementById("controlsContainer").outerHTML="";	
-    	}else{
-			document.getElementById("TiffViewer_ButtonContainer").outerHTML="";	
-		}
+    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 () {         
@@ -304,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/accessFile/accessFile.js

@@ -71,7 +71,8 @@ async function accessFile() {
 									    TiffViewer_filedetail.textContent = "Filename: " + idQuery.result.name;
 									    TiffViewer_filedetail.title = "Filename: " + idQuery.result.name;
 									    TiffViewer_Header.append(TiffViewer_filedetail);
-								  		displayPdf(idQuery.result.path);								  		
+                                        // displayPdf(idQuery.result.path);	
+                                        displayPdf(url);  							  		
 										} else {
 										  	console.log("This is not a pdf file");
 										  	window.addEventListener("load", loadDoc(url, TIFFViewer, idQuery.result.name), false);
@@ -90,7 +91,8 @@ async function accessFile() {
 									    TiffViewer_filedetail.textContent = "Filename: " + idQuery.result.name;
 									    TiffViewer_filedetail.title = "Filename: " + idQuery.result.name;
 									    TiffViewer_Header.append(TiffViewer_filedetail);
-								  		displayPdf(idQuery.result.path);								  		
+                                        // displayPdf(idQuery.result.path);
+                                        displayPdf(url);  	
 										} else {
 										  	console.log("This is not a pdf file");
 										  	window.addEventListener("load", loadDoc(url, TIFFViewer, idQuery.result.name), false);
@@ -182,7 +184,8 @@ async function accessFile() {
 									    TiffViewer_filedetail.textContent = "Filename: " + filename;
 									    TiffViewer_filedetail.title = "Filename: " + filename;
 									    TiffViewer_Header.append(TiffViewer_filedetail);
-								  		displayPdf(img);								  		
+                                        // displayPdf(img);
+                                        displayPdf(url);  								  		
 									} else {
 									  	window.addEventListener("load", loadDoc(url, TIFFViewer,filename), false);
 									}
@@ -550,7 +553,8 @@ function refreshImage() {
 									    TiffViewer_filedetail.textContent = "Filename: " + idQuery.result.name;
 									    TiffViewer_filedetail.title = "Filename: " + idQuery.result.name;
 									    TiffViewer_Header.append(TiffViewer_filedetail);
-								  		displayPdf(idQuery.result.path);								  		
+                                        // displayPdf(idQuery.result.path);
+                                        displayPdf(url);  								  		
 									} else {
 									  	console.log("This is not a pdf file");
 									  	window.addEventListener("load", loadDoc(url, TIFFViewer,idQuery.result.name), false);

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;