Merge branch 'feature-java-prev-next' into 'development-encoding'

WebGde/WebContent/index.html

@@ -252,6 +252,14 @@
                 }
         );
 		
+ document.getElementById("prev").addEventListener('click', 
+		function() {
+			localStorage.setItem("prev", "1");
+			const fieldForm = document.getElementById("fields");
+			fieldForm.querySelector('input[type="submit"]').click()
+		}
+	);  		
+		
 		document.addEventListener("keydown", (e) => {
 			if (e.key === "F12") {
 				const fieldForm = document.getElementById("fields");
@@ -259,17 +267,8 @@
 			}
 		})
         
-        document.getElementById("prev").addEventListener('click',
-                function() {
-                        localStorage.setItem("display_counter", parseInt(localStorage.getItem("display_counter")) - 1);
-                        const fieldForm = document.getElementById("fields");
-                        fieldForm.querySelector('input[type="submit"]').click()
-                }
-        );
-		
 		document.addEventListener("keydown", (e) => {
 			if (e.key === "F11") {
-				localStorage.setItem("display_counter", parseInt(localStorage.getItem("display_counter")) - 1);
                 const fieldForm = document.getElementById("fields");
                 fieldForm.querySelector('input[type="submit"]').click()
 			}

WebGde/WebContent/src/BPO/getElement.js

@@ -167,7 +167,6 @@ async function getWaitingElement() {
 
 async function createOutputXml(fields, metrics, doctype, section) {
     let elementId = sessionStorage.getItem("element_id");
-
     let xmlData = {
         "projCode": PROJECT_CODE,
         "userId": sessionStorage.getItem("user_id"),
@@ -200,17 +199,19 @@ async function createOutputXml(fields, metrics, doctype, section) {
         body: JSON.stringify(xmlData)
     }); 
     
-    if(completenessCheck(await response.text())) {
-        let response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/update-eob', {
-            method: "POST",
-            headers: {
-                'Content-Type':'application/json'
-            },
-            body: JSON.stringify(xmlData)
-        });
-
-       await completeToNextNode(elementId);
-    }
+	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', {
+				method: "POST",
+				headers: {
+					'Content-Type': 'application/json'
+				},
+				body: JSON.stringify(xmlData)
+			});
+			await completeToNextNode(elementId);
+		}
+	}
+    
 }
 
 function completenessCheck(xml) {
@@ -239,7 +240,6 @@ async function completeToNextNode(elementId) {
         },
         body: JSON.stringify(requestJSON)
     }); 
-  
     if (response.status == 200) {
         // let json = await response.json(); 
         // return json.elements;

WebGde/WebContent/src/getFields/getFields.js

@@ -603,4 +603,69 @@ const createSection = (fieldLabel, div) => {
 	} catch(err) {
         throw err
     }
+}
+
+function saveForm(index){
+	
+	let formValues = {
+		name : document.getElementById("Name").value,
+		subject : document.getElementById("Subject").value,
+		docNo : document.getElementById("Document_No").value,
+		date : document.getElementById("Date").value,
+		accountNo : document.getElementById("Account_No").value,
+		empNo : document.getElementById("Employee_No").value,
+	}
+	index--;
+	var formArray = JSON.parse(sessionStorage.getItem('formArray'));
+	//formArray.push(formValues);
+	if(typeof formArray[index] !== 'undefined') {
+		formArray.splice(index, 1, formValues) 
+	} else {
+		formArray.splice(index, 0, formValues) 	
+	}
+	
+	sessionStorage.setItem('formArray', JSON.stringify(formArray));
+}
+
+function populateForm(index){
+	
+	index--;
+	if(localStorage.getItem("prev") == 1){
+		index--;
+	}
+	
+	var formArray = JSON.parse(sessionStorage.getItem('formArray'));
+	
+	var name = document.getElementById("Name"); 
+	var subject = document.getElementById("Subject");
+	var docNo = document.getElementById("Document_No");
+	var date = document.getElementById("Date");
+	var accountNo = document.getElementById("Account_No");
+	var empNo = document.getElementById("Employee_No");
+	
+	if (formArray[index].name != null) {
+		name.value = formArray[index].name;
+	}
+	
+	if (formArray[index].subject != null) {
+		subject.value = formArray[index].subject;
+	}
+	
+	if (formArray[index].docNo != null) {
+		docNo.value = formArray[index].docNo;
+	}
+	
+	if (formArray[index].date != null) {
+		date.value = formArray[index].date;
+	}
+	
+	if (formArray[index].accountNo != null) {
+		accountNo.value = formArray[index].accountNo;
+	}
+	
+	if (formArray[index].empNo != null) {
+		empNo.value = formArray[index].empNo;
+	}
+	
+	
 }
\ No newline at end of file

WebGde/WebContent/src/submit/submit.js

@@ -59,6 +59,7 @@ const submitForm = (e) => {
             const metrics = stopMetricCapture();
             WriteForm(e, metrics, doctype, section);
             saveMetrics(metrics, eoe_ts);
+			saveForm(localStorage.getItem("sfIndex"));
             [...document.getElementsByClassName("TiffModalContent")].forEach(el => {
                 while (el.children[1].hasChildNodes()) {
                     el.children[1].removeChild(el.children[1].firstChild);

WebGde/WebContent/src/tiffViewer/tiffViewer.js

@@ -98,8 +98,12 @@ function TIFFViewer(xhr, TiffViewerImageName) {
   let changed = false;
   let TiffViewer_pages = 0; //page count
   let TiffViewer_current = 1; // TiffViewer_current page number
-  sessionStorage.setItem("TiffViewer_current", "IMG" + TiffViewer_current);
-  Current_page = Current_page + 1;
+  if(localStorage.getItem("prev") == 1){
+    Current_page = Current_page - 1;
+  } else {
+	Current_page = Current_page + 1;  
+  }
+  
 
   //declaration of HTML Contents
   const TiffViewer_detailcont = document.createElement("div");