Skip to content

W
web-ui
Commit 6568ebde by Lynette Lizardo
Options

demo comments fixes

parent 74ae382e
Showing with 60 additions and 25 deletions
WebGde/WebContent/WebGde-Widgets/BPO/getElement.js
import { ENCODING_PASS } from "../config.js";
import { createInfoModal, createModal } from "../genericPopup/genericPopup.js";
import { INDEXED_DB_STORAGE } from "../globalVariable.js";
import { getUrlGetReturnedElement, getUrlGetWaitingElement, getUrlGetWorkload, getUrlReturnElement } from "./bpoService.js";
import { urlGetFields, urlGetIfExisting } from "./gfsService.js";
......@@ -19,11 +20,20 @@ export class BPO {
if (xml.isExisting) {
const xmlString = await xml.data.join('').replace('\t', '');
const lastImage = this.getXmlLastImage(xmlString);
console.log("lastImage " + lastImage);
/*sessionStorage.setItem('section', getXmlSection(xmlString));
sessionStorage.setItem('doctype', getXmlDocType(xmlString));*/
//console.log("lastImage " + lastImage);
let dir = await lst.data;
if(lastImage){
const index = dir.indexOf(lastImage);
console.log(index);
if (index > -1) { // only splice array when item is found
dir = dir.splice(0, index); // 2nd parameter means remove one item only
}
if(dir.length === 0){
continue;
}
}
sessionStorage.setItem("dir_files", JSON.stringify(dir));
sessionStorage.setItem("element_id", retElement.element.elementId);
......@@ -38,7 +48,11 @@ export class BPO {
} else if (retElement.errorCode == 463) {
continue;
} else {
PROMPT.createInfoPrompt(`Error ${retElement.errorCode}: Fetching returned element`);
function modalTest() {
sessionStorage.clear();
logoutKeycloak();
}
createInfoModal(modalTest(), 'Log out', "We've encountered some errors. Please log-out and try again.");
}
}
......@@ -68,15 +82,17 @@ export class BPO {
} else if (element.errorCode == 463) {
function modalTest() {
sessionStorage.clear();
logoutKeycloak();
}
createInfoModal(modalTest, 'Log out', "No Element Available");
createInfoModal(modalTest(), 'Log out', "No Element Available");
return false;
} else {
function modalTest() {
sessionStorage.clear();
logoutKeycloak();
}
createInfoModal(modalTest, 'Logout', 'Error'+element.errorCode+': Fetching waiting element.');
createInfoModal(modalTest(), 'Logout', 'Error'+element.errorCode+': Fetching waiting element.');
return false;
}
}
......@@ -89,7 +105,11 @@ export class BPO {
let json = await response.json();
return json.elements;
} else {
PROMPT.createInfoPrompt(`Error ${response.status}: Fetching workload`);
function modalTest() {
sessionStorage.clear();
logoutKeycloak();
}
createInfoModal(modalTest(), 'Log out', "We've encountered some errors. Please log-out and try again.");
}
}
......@@ -137,7 +157,11 @@ export class BPO {
});
if (response.status != 200) {
PROMPT.createInfoPrompt(`Error ${response.status}: Returning element`)
function modalTest() {
sessionStorage.clear();
logoutKeycloak();
}
createInfoModal(modalTest(), 'Log out', "We've encountered some errors. Please log-out and try again.");
}
}
......@@ -301,15 +325,8 @@ async function completeToNextNode(elementId) {
},
body: JSON.stringify(requestJSON)
});
if (response.status == 200) {
// let json = await response.json();
// return json.elements;
localStorage.clear();
//localStorage.sfIndex = 1;
await initGetElement();
init();
} else {
PROMPT.createInfoPrompt(`Error ${response.status}: Completing element to next node, Check if Complete Node Exist`);
if (response.status != 200) {
createInfoModal(null, 'OK', "We've encountered some errorrs while completing element to next node, Check if Complete Node Exist");
}
}
......
WebGde/WebContent/WebGde-Widgets/BPO/rejectElement.js
......@@ -90,6 +90,8 @@ async function rejectElement() {
else{
//PROMPT.createInfoPrompt(`Error ${response.status}: Rejecting element`);
function successfulReturn() {
INDEXED_DB_STORAGE.clear();
sessionStorage.clear();
logoutKeycloak();
}
......@@ -160,10 +162,10 @@ export function createRejectWindow(){
setRadioHandler('MssgBox');
okButton.onclick = function () {
okButton.onclick = async function () {
if (document.querySelector('input[name="rejectRadio"]:checked').value != null) {
if (document.querySelector('input[name="rejectRadio"]:checked').value.trim().length != 0) {
saveExceptionToXml();//save xml
await saveExceptionToXml();//save xml
rejectElement();//reject on bpo
document.getElementById("rejectWindow").remove();
// popUpDisplay.remove();
......
WebGde/WebContent/WebGde-Widgets/BPO/returnElement.js
......@@ -128,6 +128,8 @@ export function createReturnWindow() {
}else{
//PROMPT.createInfoPrompt(`Error ${response.status}: Returning element`);
function successfulReturn() {
INDEXED_DB_STORAGE.clear();
sessionStorage.clear();
logoutKeycloak();
}
removeLoadingScreen();
......
WebGde/WebContent/WebGde-Widgets/config.js
......@@ -38,9 +38,9 @@ export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.
export const ROOT_FOLDER = "/WebGde-Widgets";
//this determines if the images will be retrieved from the gfs
export const DOMAIN = "http://54.146.187.173:8080"
export const DOMAIN = "http://54.174.197.197:8080"
export const CONTEXTROOT = "gfs-explorer-ws"
export const GFS_URL = "http://54.146.187.173:8080" + "/WebGde/svc/gfs-rest"
export const GFS_URL = "http://54.174.197.197:8080" + "/WebGde/svc/gfs-rest"
export const FOLDER_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/"
export const DOWNLOAD_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-download-link"
export const IS_RETRIEVE_FROM_GFS = "N"
......@@ -51,7 +51,7 @@ export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen
export const IS_RETRIEVE_FROM_BPO = "Y"
// export const BPO_URL = "http://35.171.20.94:8080/bpo-sqa/"
// export const CURRENT_NODE = "Web GDE"
export const BPO_URL = "http://54.146.187.173:8080/bpo/"
export const BPO_URL = "http://54.174.197.197:8080/bpo/"
export const CURRENT_NODE = "Web_GDE_DEV"
export const ENCODING_PASS = "PASS1"
export const NEXT_NODE = "Complete"
......
WebGde/WebContent/script.js
......@@ -58,6 +58,8 @@ async function initializeWebGDE() {
init();
} else {
function exitTool() {
INDEXED_DB_STORAGE.clear();
sessionStorage.clear();
logoutKeycloak();
}
removeLoadingScreen();
......@@ -102,11 +104,12 @@ async function checkBPODetails() {
await BPO_OBJECT.returnElement(elementId);
function exitTool() {
INDEXED_DB_STORAGE.clear();
sessionStorage.clear();
logoutKeycloak();
}
removeLoadingScreen();
createInfoModal(exitTool,'Log out', "Please log-out and try again.");
sessionStorage.clear();
}
} else {
await BPO_OBJECT.returnElement(elementId);
......@@ -204,8 +207,8 @@ async function createInputForm() {
displayFieldClass.generateFields();
// displayFieldClass.editHeader(element-id)
displayFieldClass.updateHeaderText(0, "User: " + sessionStorage.getItem("user_id"));
displayFieldClass.updateHeaderText(1, "Element ID: " + sessionStorage.getItem("element_id"));
displayFieldClass.updateHeaderText(2, "");
displayFieldClass.updateHeaderText(1, "Record 0 of 0");
displayFieldClass.updateHeaderText(2,"Element ID: " + sessionStorage.getItem("element_id"));
//document.getElementById("input-field-container").appendChild(controls.getWidget());
}
......@@ -234,6 +237,7 @@ function createMenuBar() {
///logoutKeycloak();
async function successfulReturn() {
await returnElementBPO(sessionStorage.getItem("element_id"));
INDEXED_DB_STORAGE.clear();
sessionStorage.clear();
logoutKeycloak();
}
......@@ -330,6 +334,8 @@ async function displayPreviousRecord(e) {
IMAGE_VIEWER_OBJECT.setCurrentImage("previousImage", IMAGE_VIEWER_OBJECT.getPreviousImage());
HIGHLIGHT_OBJECT.createHighlight();
DISPLAY_FIELD_OBJECT.updateHeaderText(1, "Record "+ current +" of " + urls.length);
DISPLAY_FIELD_OBJECT.clearForm();
await populateFields(urls[current]);
......@@ -365,6 +371,8 @@ export async function displayNextRecord(e) {
IMAGE_VIEWER_OBJECT.setCurrentImage("nextImage", IMAGE_VIEWER_OBJECT.getNextImage());
HIGHLIGHT_OBJECT.createHighlight();
DISPLAY_FIELD_OBJECT.updateHeaderText(1, "Record "+ current +" of " + urls.length);
DISPLAY_FIELD_OBJECT.clearForm();
await populateFields(urls[current]);
......@@ -504,6 +512,8 @@ export async function resetGDE() {
removeLoadingScreen();
} else {
function modalTest() {
INDEXED_DB_STORAGE.clear();
sessionStorage.clear();
logoutKeycloak();
}
removeLoadingScreen();
......
WebGde/WebContent/style.css
......@@ -113,6 +113,10 @@ h3{
color:#fff;
}
#checkBoxCont{
text-align: left;
}
#input-field-container::-webkit-scrollbar {
......
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