Commit 683d4fdb by Jorem Magcawas

fix fetch of return of element with no fields

parent 071dfd76
...@@ -57,7 +57,6 @@ async function returnElementLogout(elementId) { ...@@ -57,7 +57,6 @@ async function returnElementLogout(elementId) {
let response = await fetch(getUrlReturnElement(elementId), {method: "POST"}); let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
if (response.status == 200) { if (response.status == 200) {
returnSaveXML();//save xml
alert('Element Returned'); alert('Element Returned');
}else{ }else{
alert(`Error ${response.status}: Returning element`); alert(`Error ${response.status}: Returning element`);
......
...@@ -287,7 +287,7 @@ async function accessFile() { ...@@ -287,7 +287,7 @@ async function accessFile() {
if(IS_RETRIEVE_FROM_GFS == "Y"){ if(IS_RETRIEVE_FROM_GFS == "Y"){
const modal = document.getElementById("TiffViewerModal"); const modal = document.getElementById("TiffViewerModal");
modal.style.display = 'none';//hide local modal\ modal.style.display = 'none';//hide local modal\
getFolder(FOLDER_URL+sessionStorage.getItem('user_id')+'/element6'); getFolder(FOLDER_URL+sessionStorage.getItem('user_id')+'/element2');
}else{ }else{
if((localStorage.length)==0){ if((localStorage.length)==0){
if(updated_input_files.length==0){ if(updated_input_files.length==0){
......
...@@ -50,58 +50,42 @@ const displayFields = async (parentID) => { ...@@ -50,58 +50,42 @@ const displayFields = async (parentID) => {
let doctype = sessionStorage.getItem('doctype'); let doctype = sessionStorage.getItem('doctype');
let section = sessionStorage.getItem('section'); let section = sessionStorage.getItem('section');
if (doctype == null && section == null) {
Object.keys(schema).every(function(key) { Object.keys(schema).every(function(key) {
let doctypes = schema[key]; let doctypes = schema[key];
sessionStorage.setItem("currentDoctype", key); sessionStorage.setItem("currentDoctype", key);
const { valid, error } = validateSchema() const {
if(!valid){ valid,
error
} = validateSchema()
if (!valid) {
div.textContent = error div.textContent = error
div.style.color = '#ff3333' div.style.color = '#ff3333'
} }
for (let key in doctypes) { for (let key in doctypes) {
if (doctype == null && section == null) {
sessionStorage.setItem("currentSection", key); sessionStorage.setItem("currentSection", key);
createDocTypeDropdown('DocType', div, schema); createDocTypeDropdown('DocType', div, schema);
createSection('Section', div, doctypes, key); createSection('Section', div, doctypes, key);
div = deconstruct(doctypes[key], div, key) div = deconstruct(doctypes[key], div, key)
/* const submit = document.createElement('input')
submit.className = key;
submit.type = 'submit'
div.appendChild(submit)*/
return false; return false;
} }
}
return true;
}); });
} else {
$(document.body).on("change","#DocType",function(){ let doctypes = schema[doctype];
const elements = document.getElementsByClassName(sessionStorage.getItem("currentSection")); sessionStorage.setItem("currentDoctype", doctype);
while(elements.length > 0){ const {
elements[0].parentNode.removeChild(elements[0]); valid,
} error
} = validateSchema()
let doctypes = schema[this.value]; if (!valid) {
sessionStorage.setItem("currentDoctype", this.value);
const { valid, error } = validateSchema()
if(!valid){
div.textContent = error div.textContent = error
div.style.color = '#ff3333' div.style.color = '#ff3333'
} }
for (let key in doctypes) { sessionStorage.setItem("currentSection", section);
sessionStorage.setItem("currentSection", key); createDocTypeDropdown('DocType', div, schema);
createSection('Section', div, doctypes, key); createSection('Section', div, doctypes, section);
div = deconstruct(doctypes[key], div, key) div = deconstruct(doctypes[section], div, section)
const submit = document.createElement('input')
submit.className = key;
submit.type = 'submit'
div.appendChild(submit)
break;
} }
});
/* const { ACCOUNTING_DOCUMENTS } = schema /* const { ACCOUNTING_DOCUMENTS } = schema
......
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