Skip to content

W
web-ui
Commit 57bb457f by Owen Ryan Ang
Options

Minor UI updates

parent be7a80c7
Showing with 74 additions and 34 deletions
WebContent/NoBpo/WebGde-Widgets/ElementListWidget/ElementListWidget.js
......@@ -43,7 +43,7 @@ export class ElementListWidget {
async init(nodeId, workerId) {
this.render();
createLoadingModal("Fetching Elements", "Fetching Workers", null, null, null);
createLoadingModal("Fetching Inspections", "Fetching Workers", null, null, null);
if (!this.global.pullToRefresh) {
this.global.pullToRefresh = PullToRefresh.init({
......@@ -59,8 +59,8 @@ export class ElementListWidget {
if (elementsArray.length === 0){
// No more elements
removeLoadingModal();
// createInfoModal(null, "Close", "No more elements available.");
createErrorModal(null, "Close", "No more elements available.");
// createInfoModal(null, "Close", "No more inspections available.");
createErrorModal(null, "Close", "No more inspections available.");
return;
} else {
this.elements = elementsArray;
......@@ -103,7 +103,7 @@ export class ElementListWidget {
// Create a search input field
this.global.searchInput = document.createElement("input");
this.global.searchInput.placeholder = "Search elements...";
this.global.searchInput.placeholder = "Search inspections...";
this.global.searchInput.id = "search-input";
this.global.searchInput.type = "text";
topDiv.appendChild(this.global.searchInput);
......@@ -222,7 +222,7 @@ export class ElementListWidget {
// Create text element
var text = document.createElement("div");
text.textContent = `Pending Elements (${elementCount})`;
text.textContent = `Pending Inspections (${elementCount})`;
text.classList.add("element-count-text");
// Create line element
......@@ -344,7 +344,28 @@ export class ElementListWidget {
}
async handleEncodeLogic() {
createLoadingModal("Assigning Element", "Assigning Element.", null, null, null);
createLoadingModal("Assigning Inspection", "Assigning Inspection.", null, null, null);
let elementFields;
let elementFieldsArray;
// Retrieve and display the selected element's ID
const elementId = this.global.selectedElement.elementId;
sessionStorage.setItem("element_id", elementId);
try {
elementFields = await getElementFieldsFromSqLite(elementId);
// Check if elementFields is null, empty, or blank
if (!elementFields || elementFields.trim() === "") {
removeLoadingModal();
createErrorModal(null, "Close", "Cannot Proceed: Necessary files missing or invalid. Please contact client admin for support.");
return;
}
elementFieldsArray = JSON.parse(elementFields);
} catch {
removeLoadingModal();
createErrorModal(null, "Close", "Cannot Proceed: Necessary files missing or invalid. Please contact client admin for support.");
return;
}
// Store the selected element's details in the session storage
if (this.global.selectedElement) {
sessionStorage.setItem('selectedElementId', this.global.selectedElement.elementId);
......@@ -352,10 +373,6 @@ export class ElementListWidget {
sessionStorage.setItem('element_file_loc', this.global.selectedElement.fileLocation)
}
// Retrieve and display the selected element's ID
const elementId = sessionStorage.getItem('selectedElementId');
sessionStorage.setItem("element_id", elementId);
// Remove the current container from the DOM
this.global.container.remove();
this.global.pullToRefresh.destroy();
......@@ -447,14 +464,9 @@ export class ElementListWidget {
setDocumentControlObject(new DocumentControlWidget());
inputContainer.appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());
try {
let elementFields = await getElementFieldsFromSqLite(elementId);
let elementFieldsArray = JSON.parse(elementFields);
await updateDoctypeAndSection(elementFieldsArray);
await populateFields(elementFieldsArray);
} catch {
}
removeLoadingModal();
}
......
WebContent/NoBpo/WebGde-Widgets/Submit/XMLWriter/XML_Saver.js
......@@ -186,12 +186,20 @@ async function createNonBPOXML(fields, labeledFields, metrics, doctype, section,
"eor": "N",
"fields": fields,
"labeledFields": labeledFields,
"outputDir": TEMPORARY_FOLDER + "/" + fileNameOnly + "/" + fileName,
"outputDir": TEMPORARY_FOLDER + "/"+ doctype + "/" +fileNameOnly + "/" + fileName,
"doctype": doctype,
"section": section,
"fieldOrder" : fieldOrder
}
if (doctype === "INDIVIDUAL") {
xmlData.outputDir = TEMPORARY_FOLDER + "/OTS-EVR-I/" + fileNameOnly + "/" + fileName;
}
if (doctype === "ESTABLISHMENT") {
xmlData.outputDir = TEMPORARY_FOLDER + "/OTS-EVR-E/" + fileNameOnly + "/" + fileName;
}
// try {
// const authToken = sessionStorage.getItem('token');
// let response = await fetch(urlWriteXml, {
......
WebContent/WebGde-Widgets/BPO/returnElement.js
......@@ -138,7 +138,7 @@ function returnSaveXML() {
export function createReturnWindow() {
async function returnButtonFunction(e) {
createLoadingModal("Returning Element", "Returning Element", null, null, null);
createLoadingModal("Returning Inspection", "Returning Inspection", null, null, null);
let submitStatus;
submitStatus = await returnForm(e);
if (submitStatus) {
......@@ -149,7 +149,7 @@ export function createReturnWindow() {
} else {
removeLoadingModal();
async function returnButtonFunction(){
createLoadingModal("Returning Element", "Returning Element", null, null, null);
createLoadingModal("Returning Inspection", "Returning Inspection", null, null, null);
await returnElementBPO(sessionStorage.getItem("element_id"));
removeLoadingModal();
goBackToElementListViewer();
......
WebContent/WebGde-Widgets/ElementListWidget/ElementListWidget.js
......@@ -43,7 +43,7 @@ export class ElementListWidget {
async init(nodeId, workerId) {
this.render();
createLoadingModal("Fetching Elements", "Fetching Workers", null, null, null);
createLoadingModal("Fetching Inspections", "Fetching Workers", null, null, null);
if (!this.global.pullToRefresh) {
this.global.pullToRefresh = PullToRefresh.init({
......@@ -59,8 +59,8 @@ export class ElementListWidget {
if (elementsArray.length === 0){
// No more elements
removeLoadingModal();
// createInfoModal(null, "Close", "No more elements available.");
createErrorModal(null, "Close", "No more elements available.");
// createInfoModal(null, "Close", "No more inspections available.");
createErrorModal(null, "Close", "No more inspections available.");
return;
} else {
this.elements = elementsArray;
......@@ -103,7 +103,7 @@ export class ElementListWidget {
// Create a search input field
this.global.searchInput = document.createElement("input");
this.global.searchInput.placeholder = "Search elements...";
this.global.searchInput.placeholder = "Search inspections...";
this.global.searchInput.id = "search-input";
this.global.searchInput.type = "text";
topDiv.appendChild(this.global.searchInput);
......@@ -222,7 +222,7 @@ export class ElementListWidget {
// Create text element
var text = document.createElement("div");
text.textContent = `Pending Elements (${elementCount})`;
text.textContent = `Pending Inspections (${elementCount})`;
text.classList.add("element-count-text");
// Create line element
......@@ -344,7 +344,28 @@ export class ElementListWidget {
}
async handleEncodeLogic() {
createLoadingModal("Assigning Element", "Assigning Element.", null, null, null);
createLoadingModal("Assigning Inspection", "Assigning Inspection.", null, null, null);
let elementFields;
let elementFieldsArray;
// Retrieve and display the selected element's ID
const elementId = this.global.selectedElement.elementId;
sessionStorage.setItem("element_id", elementId);
try {
elementFields = await getElementFieldsFromSqLite(elementId);
// Check if elementFields is null, empty, or blank
if (!elementFields || elementFields.trim() === "") {
removeLoadingModal();
createErrorModal(null, "Close", "Cannot Proceed: Necessary files missing or invalid. Please contact client admin for support.");
return;
}
elementFieldsArray = JSON.parse(elementFields);
} catch {
removeLoadingModal();
createErrorModal(null, "Close", "Cannot Proceed: Necessary files missing or invalid. Please contact client admin for support.");
return;
}
// Store the selected element's details in the session storage
if (this.global.selectedElement) {
sessionStorage.setItem('selectedElementId', this.global.selectedElement.elementId);
......@@ -352,10 +373,6 @@ export class ElementListWidget {
sessionStorage.setItem('element_file_loc', this.global.selectedElement.fileLocation)
}
// Retrieve and display the selected element's ID
const elementId = sessionStorage.getItem('selectedElementId');
sessionStorage.setItem("element_id", elementId);
// Remove the current container from the DOM
this.global.container.remove();
this.global.pullToRefresh.destroy();
......@@ -447,14 +464,9 @@ export class ElementListWidget {
setDocumentControlObject(new DocumentControlWidget());
inputContainer.appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());
try {
let elementFields = await getElementFieldsFromSqLite(elementId);
let elementFieldsArray = JSON.parse(elementFields);
await updateDoctypeAndSection(elementFieldsArray);
await populateFields(elementFieldsArray);
} catch {
}
removeLoadingModal();
}
......
WebContent/WebGde-Widgets/Submit/XMLWriter/XML_Saver.js
......@@ -186,12 +186,20 @@ async function createNonBPOXML(fields, labeledFields, metrics, doctype, section,
"eor": "N",
"fields": fields,
"labeledFields": labeledFields,
"outputDir": TEMPORARY_FOLDER + "/" + fileNameOnly + "/" + fileName,
"outputDir": TEMPORARY_FOLDER + "/"+ doctype + "/" +fileNameOnly + "/" + fileName,
"doctype": doctype,
"section": section,
"fieldOrder" : fieldOrder
}
if (doctype === "INDIVIDUAL") {
xmlData.outputDir = TEMPORARY_FOLDER + "/OTS-EVR-I/" + fileNameOnly + "/" + fileName;
}
if (doctype === "ESTABLISHMENT") {
xmlData.outputDir = TEMPORARY_FOLDER + "/OTS-EVR-E/" + fileNameOnly + "/" + fileName;
}
// try {
// const authToken = sessionStorage.getItem('token');
// let response = await fetch(urlWriteXml, {
......
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