commit latest

WebGde/WebContent/config.js

@@ -39,7 +39,7 @@ var HIGH_LIGHT_SCHEMA = "./src/highlight/dbSchema_anno.xlsx"
 //this determines if the images will be retrieved from the gfs
 var DOMAIN = "http://35.169.23.0:8080"
 var CONTEXTROOT = "gfs-explorer-ws"
-
+var GFS_URL = "http://35.169.23.0:8080" + "/WebGde/svc/gfs-rest"
 var FOLDER_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/"
 var DOWNLOAD_URL = DOMAIN + "/" + CONTEXTROOT +  "/svc/gfs-rest/get-download-link"
 var IS_RETRIEVE_FROM_GFS = "N"
@@ -54,5 +54,7 @@ var ENCODING_PASS = "PASS1"
 var NEXT_NODE = "Complete"
 var EXCEPTION_NODE = "Exception"
 
+var REASON_LIST = "Reason1,Reason2,Reason3,Reason4"
+
 //KEYCLOAK CONFIG
 const REDIRECT_URL = 'http://auth-server/auth/realms/GFS/protocol/openid-connect/logout?redirect_uri=encodedRedirectUri';

WebGde/WebContent/index.html

@@ -230,6 +230,7 @@
 
 </body>
 <!--body onload-->
+<script src="./src/BPO/gfsService.js"></script>
 <script src="./src/BPO/bpoService.js"></script>
 <script src="./src/BPO/getElement.js"></script>
 <script src="./src/BPO/returnElement.js"></script>
@@ -255,14 +256,14 @@
 		function() {
 			localStorage.setItem("prev", "1");
 			const fieldForm = document.getElementById("fields");
-			fieldForm.querySelector('input[type="submit"]').click()
+			fieldForm.querySelector('input[type="submit"]').click();
 		}
 	);  		
 		
 		document.addEventListener("keydown", (e) => {
 			if (e.key === "F12") {
 				const fieldForm = document.getElementById("fields");
-                fieldForm.querySelector('input[type="submit"]').click()
+                fieldForm.querySelector('input[type="submit"]').click();
 			}
 		})
         

WebGde/WebContent/src/BPO/getElement.js

@@ -68,7 +68,7 @@ async function initGetElement() {
 }
 
 async function isLSTExisting(element) {    
-    const response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/get-if-existing', {
+    const response = await fetch(urlGetIfExisting, {
         method: "POST",
         headers: {
             'Content-Type':'application/json'
@@ -84,7 +84,7 @@ async function isLSTExisting(element) {
 }
 
 async function getFieldXml(element) {
-    const response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/get-xml', {
+    const response = await fetch(urlGetXml, {
         method: "POST",
         headers: {
             'Content-Type':'application/json'
@@ -191,7 +191,7 @@ async function createOutputXml(fields, metrics, doctype, section) {
         "section": section
     }
 
-    let response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/write-xml', {
+    let response = await fetch(urlWriteXml, {
         method: "POST",
         headers: {
             'Content-Type':'application/json'
@@ -199,9 +199,9 @@ async function createOutputXml(fields, metrics, doctype, section) {
         body: JSON.stringify(xmlData)
     }); 
     
-	if (localStorage.getItem("complete") == 1) {
+	/*if (localStorage.getItem("complete") == 1) {*/
 		if (completenessCheck(await response.text())) {
-			let response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/update-eob', {
+			let response = await fetch(urlUpdateEob, {
 				method: "POST",
 				headers: {
 					'Content-Type': 'application/json'
@@ -210,7 +210,7 @@ async function createOutputXml(fields, metrics, doctype, section) {
 			});
 			await completeToNextNode(elementId);
 		}
-	}
+/*	}*/
     
 }
 

WebGde/WebContent/src/BPO/gfsService.js

+let urlGetIfExisting = GFS_URL + "/" + "get-if-existing";
+let urlGetXml = GFS_URL + "/" + "get-xml";
+let urlWriteXml = GFS_URL + "/" + "write-xml";
+let urlUpdateEob = GFS_URL + "/" + "update-eob";
+let urlUpdateException = GFS_URL + "/" + "update-exception";
+let urlWriteMetrics = GFS_URL + "/" + "write-metrics";
\ No newline at end of file

WebGde/WebContent/src/BPO/rejectElement.js

@@ -45,12 +45,12 @@ function createRejectWindow(){
     screenMain.id = 'parent_Window';
     screenMain.style.display = 'none';
     document.body.appendChild(screenMain);
+    var resList = REASON_LIST.split(",");
     
-    //checkbox&label
-    screenMain.appendChild(checkLabelComponent('Reason 1','Reason 1','check1'));
-    screenMain.appendChild(checkLabelComponent('Reason 2','Reason 1','check2'));
-    screenMain.appendChild(checkLabelComponent('Reason 3','Reason 1','check3'));
-    screenMain.appendChild(checkLabelComponent('Reason 4','Reason 1','check4'));
+	for(let i = 0; i < resList.length; i++){
+		screenMain.appendChild(checkLabelComponent(resList[i],resList[i],"check" + (i + 1)));
+	}	
+
     screenMain.appendChild(checkLabelComponent('Others','','check5'));
     screenMain.appendChild(createMessageBox('text-area'));
     screenMain.appendChild(okCancelButton());
@@ -165,7 +165,7 @@ function createMessageBox(id){
     var mssgBox =  document.createElement('textarea');
     mssgBox.name = "rejectRadio";
     mssgBox.maxLength = "1000";
-    mssgBox.cols = "24";
+    mssgBox.cols = "20";
     mssgBox.rows = "5";
     mssgBox.id = id;
     mssgBox.disabled = true;
@@ -198,7 +198,7 @@ function createMessageBox(id){
 	
 async function updateXMLException(xmlData){
     
-    let response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/update-exception', {
+    let response = await fetch(urlUpdateException, {
             method: "POST",
             headers: {
                 'Content-Type':'application/json'

WebGde/WebContent/src/BPO/returnElement.js

 async function returnElementBPO(elementId) {
     let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
 
-    if (response.status == 200) {               
-        await loadWaitingElement();        
+    if (response.status == 200) {
+    	saveExceptionToXml(); 
+        await loadWaitingElement();
         init();
-        console.log('Element Returned');     
+        alert('Element Returned');     
     }else{
         alert(`Error ${response.status}: Returning element`);
+        logoutKeycloak();
     }
     
     return response.status;
 }
 
+
 async function returnElementLogout(elementId) {
     let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
 
-    if (response.status == 200) {                       
-        console.log('Element Returned');     
+    if (response.status == 200) {                      
+    	saveExceptionToXml();//save xml    
+    	alert('Element Returned');
     }else{
         alert(`Error ${response.status}: Returning element`);
         logoutKeycloak();

WebGde/WebContent/src/accessFile/accessFile.js

@@ -43,6 +43,14 @@ async function accessFile() {
         const store = db.createObjectStore("image", { keyPath: "id" });
         store.createIndex("image_address", ["address"], { unique: false });
     };
+    
+     request.onsuccess = function () {
+	
+		const db = request.result;
+		const delRequest = db.transaction("image", 'readwrite')
+	                      .objectStore("image")
+	                      .clear();
+	}
 
     async function main(img) { 
                     const request = indexedDB.open("ImageDatabase", 1);

WebGde/WebContent/src/captureMetrics/captureMetrics.js

@@ -157,7 +157,7 @@ const saveMetrics = async (metrics, eoe_ts) => {
             "eoe_ts" : eoe_ts
         };
 
-        fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/write-mertrics/', {    
+        fetch(urlWriteMetrics, {    
             method: 'POST',
             headers: {
             'Content-Type':'application/json'

WebGde/WebContent/src/highlight/highlight.js

@@ -183,8 +183,9 @@ function initHighlight() {
     //waits until TIFF image is loaded, since its size is based on the displayed TIFF image
     const observer = new MutationObserver(function (mutations, mutationInstance) {
     	console.log(sessionStorage.getItem("TiffViewer_current"));
-        const TIFFimg = document.getElementById(sessionStorage.getItem("TiffViewer_current"));
-        if (TIFFimg) {
+
+        var TIFFimg = document.getElementById(sessionStorage.getItem("TiffViewer_current"));
+        if (TIFFimg != null) {
         //waits until width and height has been assigned
         var sizeObserver = new window.ResizeObserver(entries => {
 

WebGde/WebContent/src/tiffViewer/tiffViewer.js

@@ -110,67 +110,84 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   const TiffViewer_detailcont = document.createElement("div");
   TiffViewer_detailcont.id = "TiffViewerDetailscontainer";
   TiffViewer_detailcont.classList.add("TiffViewercontainer");
+  
   const TiffViewer_filedetail = document.createElement('p');
   TiffViewer_filedetail.id = "TiffViewerImageName";
   TiffViewer_filedetail.style.display = "none";
   TiffViewer_filedetail.innerHTML = "Filename: ";
+  
   const TiffViewer_pagedetail = document.createElement('p');
   TiffViewer_pagedetail.id = "TiffViewer_PageCount";
   TiffViewer_pagedetail.style.display = "none";
   TiffViewer_pagedetail.innerHTML = "Page:    ";
+  
   const TiffViewer_filecont = document.createElement("div");
   TiffViewer_filecont.id = "TiffViewer_FileContainer";
   TiffViewer_filecont.classList.add("TiffViewercontainer");
+  
   const TiffViewer_scrncont = document.createElement("div");
   TiffViewer_scrncont.id = "TiffViewer_Screen";
+  
   const TiffViewer_imgcont = document.createElement("div");
   TiffViewer_imgcont.id = "TiffViewer_ImageContainer"
+  
   const TiffViewer_btncont = document.createElement("div");
   TiffViewer_btncont.id = "TiffViewer_ButtonContainer";
   TiffViewer_btncont.classList.add("TiffViewercontainer");
+  
   const TiffViewer_hflip = document.createElement("button");
   TiffViewer_hflip.id = "TiffViewer_FlipX";
   TiffViewer_hflip.classList.add("TiffViewer_ButtonClass");
   TiffViewer_hflip.innerHTML = "fh";
+  
   const TiffViewer_vflip = document.createElement("button");
   TiffViewer_vflip.id = "TiffViewer_FlipY";
   TiffViewer_vflip.classList.add("TiffViewer_ButtonClass");
   TiffViewer_vflip.innerHTML = "fv";
+  
   const TiffViewer_Rrotate = document.createElement("button");
   TiffViewer_Rrotate.id = "TiffViewer_RotateR";
   TiffViewer_Rrotate.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Rrotate.innerHTML = "rr";
+  
   const TiffViewer_Lrotate = document.createElement("button");
   TiffViewer_Lrotate.id = "TiffViewer_RotateL";
   TiffViewer_Lrotate.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Lrotate.innerHTML = "rl";
+  
   const TiffViewer_Pzoom = document.createElement("button");
   TiffViewer_Pzoom.id = "TiffViewer_ZoomP";
   TiffViewer_Pzoom.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Pzoom.innerHTML = "+";
+  
   const TiffViewer_Mzoom = document.createElement("button");
   TiffViewer_Mzoom.id = "TiffViewer_ZoomM";
   TiffViewer_Mzoom.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Mzoom.innerHTML = "-";
+  
   const TiffViewer_Pbtn = document.createElement("button");
   TiffViewer_Pbtn.id = "TiffViewer_PrevButton";
   TiffViewer_Pbtn.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Pbtn.innerHTML = "<";
   TiffViewer_Pbtn.style.display = "none";
+  
   const TiffViewer_Nbtn = document.createElement("button");
   TiffViewer_Nbtn.id = "TiffViewer_NextButton";
   TiffViewer_Nbtn.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Nbtn.innerHTML = ">";
   TiffViewer_Nbtn.style.display = "none";
+  
   const TiffViewer_Fscrn = document.createElement("button");
   TiffViewer_Fscrn.id = "TiffViewer_FullscreenButton";
   TiffViewer_Fscrn.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Fscrn.innerHTML = "fs";
+  
   const TiffViewer_Fit = document.createElement("button");
   TiffViewer_Fit.id = "TiffViewer_FitButton";
   TiffViewer_Fit.classList.add("TiffViewer_ButtonClass");
   TiffViewer_Fit.innerHTML = "fc";
   TiffViewer_Fit.style.display = "none";
+  
   const zoom = document.createElement("div");
   zoom.style.position = "absolute";
   zoom.style.right = -30;
@@ -258,6 +275,12 @@ function TIFFViewer(xhr, TiffViewerImageName) {
         img.style = "width: 800;";
         changed = true;
       }
+      
+      if(setheight < 800 && setwidth < 1000){
+      
+      		changed = true;
+      }	
+      
       if (changed) {
         setwidth = parseInt(img.style.width, 10);
         setheight = parseInt(img.style.height, 10);
@@ -269,6 +292,7 @@ function TIFFViewer(xhr, TiffViewerImageName) {
       wpercent = (parseInt(setwidth, 10) * (10 / 100));
       hzoom.push(parseInt(setheight, 10));
       wzoom.push(parseInt(setwidth, 10));
+      
       TiffViewer_scrn.style = `width: ${setwidth}; height: ${setheight};`;
       document.getElementById("TiffViewer_FileContainer").style = `width: ${setwidth}; height: ${setheight};`;
       TiffViewer_ImageContainer.style = `width: ${setwidth}; height: ${setheight};`;
@@ -606,12 +630,12 @@ function TIFFViewer(xhr, TiffViewerImageName) {
 		
 		var FitText = fitB.textContent || fitB.innerHTML;
 		
-		if (FitText !== "Fit Content") {
+		if (FitText !== "fc") {
 			setheight = changedheight;
 			setwidth = changedwidth;
 			wzoom[TiffViewer_current - 1] = changedwidth;
 			hzoom[TiffViewer_current - 1] = changedheight;
-			fitB.innerHTML = "Fit Content";		
+			fitB.innerHTML = "fc";		
 		}
 	
 		if (flippedX[TiffViewer_current - 1] != 1) {

WebGde/WebContent/style.css

@@ -3,8 +3,13 @@ html {
 }
 
 *{
+	-webkit-font-smoothing: auto;
     font-size: 13px;
-    font-family: Helvetica, sans-serif;
+    letter-spacing: 0.1em;
+    text-rendering: optimizeLegibility;
+    font-weight: normal;
+    font-family: OpenSans, sans-serif;
+    font-style: normal;
 }
 
 button:hover{
@@ -27,14 +32,14 @@ button:hover{
 }
 
 /* For the right pane */
-.sidebar {
+.sidebar {	
     grid-area: sidebar;
     display: flex;
     position: sticky;
     flex-direction: column;
-    background-color: #A1C3E2;
     max-height: 100vh;
     right: 0;
+    background-image: linear-gradient(to bottom, #23569f, #00a8c0);
 }
 
 
@@ -89,7 +94,7 @@ button:hover{
 }
 
 #fields>div {
-    background-color:E3E2E2;
+    background-color:white;
 }
 
 
@@ -216,7 +221,6 @@ textarea{
 }
 
 #refreshBtn {
-    background-color: #13B2EB;
 	padding: 10px;
 	color:white;
 }
@@ -403,7 +407,7 @@ body>div>button {
 /* Modal Content */
 .TiffModalContent {
     position: relative;
-    background-color: #E3E2E2;
+    background-color: white;
     margin: auto;
     padding: 0 5 5 5;
     /* border: 1px solid #888; 
@@ -489,8 +493,12 @@ body>div>button {
 }
 
 #TiffViewer_FileContainer{
-	border: 1px solid #446397;
+	border: 1px solid #ccc;
     overflow: hidden;
+    display: flex;
+    position: relative;
+    justify-content: center;
+    align-items: center;
 }
 
 
@@ -587,7 +595,7 @@ select {
 #parent_Window{
     height: 244px;
     width: 200px;
-    border: 1px solid;
+    border: 1px solid #ccc;
     position: absolute;
     top: calc(50% - 122px);
     transform: translate(0, -50%);
@@ -603,7 +611,7 @@ select {
 }
 
 #checkBoxCont>label{
-    border: 1px solid;
+	line-height: 20px;
     padding: 2px;
     width: 174px;
     height: 20px;
@@ -623,7 +631,7 @@ select {
 }
 
 #text-area{
-    margin-left: 3px;
+    margin-left: 32px;
     margin-bottom: 3px;
 }