Commit 72b8e641 by Leonard Ambros II

Merge branch 'feature-WG-387' to 'development'

parents 9bc578fc 2df749bb
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="Payara Server 5 (5.2022.5)"/> <runtime name="Payara Server 5 (5.2022.2)"/>
<secondary-runtime name="Payara Server 5 (5.2022.5)"/>
<fixed facet="jst.web"/> <fixed facet="jst.web"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="wst.jsdt.web"/> <fixed facet="wst.jsdt.web"/>
......
...@@ -8,7 +8,7 @@ export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno. ...@@ -8,7 +8,7 @@ export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.
export const ROOT_FOLDER = "/WebGde-Widgets"; export const ROOT_FOLDER = "/WebGde-Widgets";
//this determines if the images will be retrieved from the gfs //this determines if the images will be retrieved from the gfs
const IP = "54.86.68.94" const IP = "54.211.251.251"
const GDE_CONTEXTROOT = "WebGde-v121-b1" const GDE_CONTEXTROOT = "WebGde-v121-b1"
export const DOMAIN = `http://${IP}:8080` export const DOMAIN = `http://${IP}:8080`
export const CONTEXTROOT = "gfs-explorer-ws" export const CONTEXTROOT = "gfs-explorer-ws"
......
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
"aka" : "field5", "aka" : "field5",
"validation" : { "validation" : {
"fieldLength" : 1.0, "fieldLength" : 1.0,
"collection" : "radiolist", "collection" : "dropdown",
"items" : [ "M", "F" ], "options" : [ "M", "F" ],
"mandatory" : true "mandatory" : true
} }
}, },
......
...@@ -443,10 +443,22 @@ async function createImageViewer() { ...@@ -443,10 +443,22 @@ async function createImageViewer() {
// if(!successfully modified){ // if(!successfully modified){
// createInfoModal(null, "OK", "Current record was not successfully changed"); // createInfoModal(null, "OK", "Current record was not successfully changed");
// } else{ // } else{
saveForm(sessionStorage.getItem("display_counter")); saveForm(sessionStorage.getItem("display_counter"));
console.log("Display Counter " + parseInt(sessionStorage.getItem("display_counter")) + " saved"); console.log("Display Counter " + parseInt(sessionStorage.getItem("display_counter")) + " saved");
await submitForm(e);
displayPreviousRecord(e); let isSuccessful = await submitForm(e);
if(isSuccessful){
displayPreviousRecord(e);
} else {
document.getElementById("previousRecordImage").style.visibility = "visible";
}
// await submitForm(e);
// } // }
} else { } else {
displayPreviousRecord(e); displayPreviousRecord(e);
...@@ -490,8 +502,17 @@ async function createImageViewer() { ...@@ -490,8 +502,17 @@ async function createImageViewer() {
// } else{ // } else{
saveForm(sessionStorage.getItem("display_counter")); saveForm(sessionStorage.getItem("display_counter"));
console.log("Display Counter " + parseInt(sessionStorage.getItem("display_counter")) + " saved"); console.log("Display Counter " + parseInt(sessionStorage.getItem("display_counter")) + " saved");
await submitForm(e);
displayNextRecord(e); let isSuccessful = await submitForm(e);
if(isSuccessful){
createInfoModal(null, "OK", "Record has been saved");
displayNextRecord(e);
} else {
document.getElementById("nextRecordImage").style.visibility = "visible";
}
//await submitForm(e);
// } // }
} else { } else {
displayNextRecord(e); displayNextRecord(e);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment