return element bugs fix commit

WebGde/.classpath

@@ -24,7 +24,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.payara.tools.lib.system">
+	<classpathentry kind="con" path="fish.payara.eclipse.tools.server.lib.system">
 		<attributes>
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>

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.5)"/>
+  <runtime name="Payara"/>
   <fixed facet="jst.web"/>
   <fixed facet="java"/>
   <fixed facet="wst.jsdt.web"/>

WebGde/WebContent/WEB-INF/config/config.ini

@@ -24,4 +24,5 @@ USERNAME=root
 PASSWORD=p455w0rd
 
 [SSO CONFIG]
-PUBKEY = C:/Users/oang/git/web-ui-mobile2/WebGde/WebContent/WEB-INF/config/sso/pubkey.pem
+
\ No newline at end of file
+PUBKEY = C:/Users/jcalub/git/web-ui-479/WebGde/WebContent/WEB-INF/config/sso/pubkey.pem
\ No newline at end of file

WebGde/WebContent/WebGde-Widgets/BPO/returnElement.js

@@ -7,117 +7,157 @@ import { interval } from "../captureMetrics/captureMetrics.js";
 import { createConfirmationModal, createInfoModal, createModal } from "../genericPopup/genericPopup.js";
 import { BPO_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_STORAGE } from "../globalVariable.js";
 import { getUrlReturnElement } from "./bpoService.js";
+import { returnForm } from "../Submit/submit.js";
 
 export async function returnElementBPO(elementId) {
-    try {
-        let response = await fetch(getUrlReturnElement(elementId), { method: "POST" });
-
-        if (response.ok) {
-            // If the response status is 200
-            return { success: true, data: await response.json() };
-        } else {
-            // If the response status is not 200
-            return { success: false, error: `Error: ${response.status}` };
-        }
-    } catch (error) {
-        // Handle connection errors or other issues
-        console.error('Error:', error);
-        return { success: false, error: 'Connection error' };
-    }
+	try {
+
+		let response = await fetch(getUrlReturnElement(elementId), { method: "POST" });
+
+		if (response.ok) {
+			// If the response status is 200
+			console.log("RETURNED")
+
+			return { success: true, data: await response.json() };
+		} else {
+			// If the response status is not 200
+			return { success: false, error: `Error: ${response.status}` };
+		}
+	} catch (error) {
+		// Handle connection errors or other issues
+		console.error('Error:', error);
+		return { success: false, error: 'Connection error' };
+	}
 }
 
 
 async function returnElementLogout(elementId) {
-    let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
-
-    if (response.status == 200) {                         
-    	console.log('Element Returned');
-    }
-    // else{
-    //     //PROMPT.createInfoPrompt(`Error ${response.status}: Returning element`);
-    //     logoutKeycloak();
-    // }
-    
-    return response.status;
+	let response = await fetch(getUrlReturnElement(elementId), { method: "POST" });
+
+	if (response.status == 200) {
+		console.log('Element Returned');
+	}
+	// else{
+	//     //PROMPT.createInfoPrompt(`Error ${response.status}: Returning element`);
+	//     logoutKeycloak();
+	// }
+
+	return response.status;
 }
 
 
 
-function returnSaveXML(){
-       var elementId = sessionStorage.getItem("element_id");
-       
-        let doctype;
-        let section;
-
-        // Validate all elements again
-        for(let element of document.getElementById("fields").elements) {
-            if (element.style.display === 'none') continue
-            const { id, value,type  } = element
-            const { valid } = validateInput(id, value)
-
-            // Skip submit button
-            if(type==='submit') continue
-            if(id==='DocType') {
-                doctype = element.options[element.selectedIndex].text;
-                continue;
-            }
-            if(id==='Section') {
-                section = element.options[element.selectedIndex].text;
-                continue;
-            }
-       }
-
-       let filePaths = JSON.parse(sessionStorage.getItem("dir_files"));
-              
-       let xmlData = {
-        "projCode": PROJECT_CODE,
-        "userId": sessionStorage.getItem("user_id"),
-        "elementId": elementId,
-        "schema": SCHEMA_FILE_PATH,
-        "totalRec":"1",
-        "maxRec": "1",
-        "totalKeystroke": "",
-        "procTime": "",
-        "procDuration": "",
-        "eob": "",
-        "exceptionRemark": "",
-        "recordNo": "1",
-        "totalSubRec": "1",
-        "maxSubRec": "1",
-        "imageName": "",
-        "subRecordNo": "1",
-        "eor": "N",
-        "fields": fields,
-        "outputDir": sessionStorage.getItem("element_file_loc") + "/" + (ENCODING_PASS == "PASS1" ? elementId + ".DTA" : elementId + ".DTB"),
-        "doctype": doctype,
-        "section": section
-    	}
-
-       updateXMLException(xmlData);
-	   return false;	
+function returnSaveXML() {
+	var elementId = sessionStorage.getItem("element_id");
+
+	let doctype;
+	let section;
+
+	// Validate all elements again
+	for (let element of document.getElementById("fields").elements) {
+		if (element.style.display === 'none') continue
+		const { id, value, type } = element
+		const { valid } = validateInput(id, value)
+
+		// Skip submit button
+		if (type === 'submit') continue
+		if (id === 'DocType') {
+			doctype = element.options[element.selectedIndex].text;
+			continue;
+		}
+		if (id === 'Section') {
+			section = element.options[element.selectedIndex].text;
+			continue;
+		}
+	}
+
+	let filePaths = JSON.parse(sessionStorage.getItem("dir_files"));
+
+	let xmlData = {
+		"projCode": PROJECT_CODE,
+		"userId": sessionStorage.getItem("user_id"),
+		"elementId": elementId,
+		"schema": SCHEMA_FILE_PATH,
+		"totalRec": "1",
+		"maxRec": "1",
+		"totalKeystroke": "",
+		"procTime": "",
+		"procDuration": "",
+		"eob": "",
+		"exceptionRemark": "",
+		"recordNo": "1",
+		"totalSubRec": "1",
+		"maxSubRec": "1",
+		"imageName": "",
+		"subRecordNo": "1",
+		"eor": "N",
+		"fields": fields,
+		"outputDir": sessionStorage.getItem("element_file_loc") + "/" + (ENCODING_PASS == "PASS1" ? elementId + ".DTA" : elementId + ".DTB"),
+		"doctype": doctype,
+		"section": section
+	}
+
+	updateXMLException(xmlData);
+	return false;
 }
 
+/*export function createReturnWindow() {
+	async function returnButtonFunction() {
+		createLoadingModal("Returning Element", "Returning Element", null, null, null);
+		let response = await returnElementBPO(sessionStorage.getItem("element_id"));
+		if (response.success) {
+			let submitStatus;
+			submitStatus = await submitForm(e)
+			if (submitStatus) {
+				console.log("SUBMITTED")
+				sessionStorage.removeItem("section");
+				sessionStorage.removeItem("doctype");
+				removeLoadingModal();
+				goBackToElementListViewer();
+			} else {
+				console.log("LOL")
+			}
+
+		} else {
+			function errorReturn() {
+				removeLoadingModal();
+			}
+			createInfoModal(errorReturn, 'Error', `${response.error} while returning the element.`);
+		}
+	}
+
+	createConfirmationModal(returnButtonFunction, "Return to Item List Menu?", "Any unsubmitted inputs and items will be lost.");
+}*/
+
 export function createReturnWindow() {
-    async function returnButtonFunction() {
-        createLoadingModal("Returning Element", "Returning Element", null, null, null);
-    	let response = await returnElementBPO(sessionStorage.getItem("element_id"));
-        if (response.success) {
-            sessionStorage.removeItem("section");
-            sessionStorage.removeItem("doctype");
-            removeLoadingModal();
-            goBackToElementListViewer();
-
-        }else{
-            function errorReturn(){
-                removeLoadingModal();
-            }
-            createInfoModal(errorReturn, 'Error', `${response.error} while returning the element.`);
-        }
-    }
-    
-    createConfirmationModal(returnButtonFunction, "Return to Item List Menu?", "Any unsubmitted inputs and items will be lost.");
+	async function returnButtonFunction(e) {
+		createLoadingModal("Returning Element", "Returning Element", null, null, null);
+		let response = await returnElementBPO(sessionStorage.getItem("element_id"));
+		if (response.success) {
+			let submitStatus;
+			submitStatus = await returnForm(e);
+			if (submitStatus) {
+				sessionStorage.removeItem("section");
+				sessionStorage.removeItem("doctype");
+				removeLoadingModal();
+				goBackToElementListViewer();
+			} else {
+				sessionStorage.removeItem("section");
+				sessionStorage.removeItem("doctype");
+				removeLoadingModal();
+			}
+		} else {
+			function errorReturn() {
+				removeLoadingModal();
+			}
+			createInfoModal(errorReturn, 'Error', `${response.error} while returning the element.`);
+		}
+	}
+
+	createConfirmationModal(returnButtonFunction, "Return to Item List Menu?", null);
 }
 
+
 function createButtonElem(className, buttonName, icon) {
 	/* let buttonElem = document.createElement("button"); */
 	let buttonElem;

WebGde/WebContent/WebGde-Widgets/LogInWidget/LoginJavaInterface.js

@@ -2,43 +2,44 @@ import { initializeWebpage } from "../../startup.js";
 import { initializeConfig } from "../config.js";
 import { createInfoModal } from "../genericPopup/genericPopup.js";
 
-export function loginGde(token){
-    sessionStorage.setItem("token", token);
-    var decodedToken = parseJwt(token);
+export function loginGde(token) {
+	sessionStorage.setItem("token", token);
+	var decodedToken = parseJwt(token);
 
-    // Check if the decodedToken contains the desired properties
-    if (decodedToken) {
-        const { preferred_username, gde_domain, gde_bpo_domain, gde_bpo_node } = decodedToken;
+	// Check if the decodedToken contains the desired properties
+	if (decodedToken) {
+		const { preferred_username, gde_domain, gde_bpo_domain, gde_bpo_node } = decodedToken;
 
-        // Now you can use these variables as needed
-        console.log("Preferred Username:", preferred_username);
-        sessionStorage.setItem("user_id", preferred_username);
-        console.log("Domain:", gde_domain);
-        console.log("Bpo Domain:", gde_bpo_domain);
-        console.log("Node:", gde_bpo_node);
-        initializeConfig(gde_domain, gde_bpo_domain, gde_bpo_node);
-		createInfoModal(null, "OK", "Success! Logged in as "&preferred_username);
-        initializeWebpage();
+		// Now you can use these variables as needed
+		console.log("Preferred Username:", preferred_username);
+		sessionStorage.setItem("user_id", preferred_username);
+		console.log("Domain:", gde_domain);
+		sessionStorage.setItem("gde_domain", gde_domain);
+		console.log("Bpo Domain:", gde_bpo_domain);
+		console.log("Node:", gde_bpo_node);
+		initializeConfig(gde_domain, gde_bpo_domain, gde_bpo_node);
+		createInfoModal(null, "OK", "Success! Logged in as " & preferred_username);
+		initializeWebpage();
 
-        // You can return these values or perform any other actions with them here
-    } else {
-        // Handle the case where the token couldn't be decoded or doesn't contain the expected properties
-        console.error("Invalid token or missing properties.");
-    }
+		// You can return these values or perform any other actions with them here
+	} else {
+		// Handle the case where the token couldn't be decoded or doesn't contain the expected properties
+		console.error("Invalid token or missing properties.");
+	}
 }
 
-export function fallbackLogin(user_id, gde_domain, bpo_domain, node){
-    sessionStorage.setItem("user_id", user_id);
-    initializeConfig(gde_domain, bpo_domain, node);
-    initializeWebpage();
+export function fallbackLogin(user_id, gde_domain, bpo_domain, node) {
+	sessionStorage.setItem("user_id", user_id);
+	initializeConfig(gde_domain, bpo_domain, node);
+	initializeWebpage();
 }
 
-function parseJwt (token) {
-    var base64Url = token.split('.')[1];
-    var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-    var jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function(c) {
-        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-    }).join(''));
+function parseJwt(token) {
+	var base64Url = token.split('.')[1];
+	var base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+	var jsonPayload = decodeURIComponent(window.atob(base64).split('').map(function(c) {
+		return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+	}).join(''));
 
-    return JSON.parse(jsonPayload);
+	return JSON.parse(jsonPayload);
 }
\ No newline at end of file

WebGde/WebContent/WebGde-Widgets/sample_schema/REG-INP.json

@@ -10,6 +10,24 @@
           "mandatory" : true
         }
       },
+	  "capture_location_clearance_photo" : {
+        "fieldLabel" : "Capture Locational Clearance Photo",
+        "aka" : "field75",
+        "validation" : {
+          "fieldLength" : 1.0,
+          "collection" : "image-capture",
+          "mandatory" : true
+        }
+      },
+	  "fingerprint" : {
+        "fieldLabel" : "Fingerprint",
+        "aka" : "field76",
+        "validation" : {
+          "fieldLength" : 1.0,
+          "collection" : "fingerprint",
+          "mandatory" : true
+        }
+      },
       "registered_owner" : {
         "fieldLabel" : "Registered Owner",
         "aka" : "field3",