Commit b13038a2 by Owen Ryan Ang

Merge branch 'feature-WG-467' into 'development'

Feature wg 467 See merge request !86
parents 3b961a39 83a5b1c8
...@@ -1071,7 +1071,7 @@ export function saveForm(index) { ...@@ -1071,7 +1071,7 @@ export function saveForm(index) {
saveXMLToStorage(index,values); saveXMLToStorage(index,values);
const currentPage = sessionStorage.getItem('current_page'); const currentPage = sessionStorage.getItem('current_page');
const totalPage = sessionStorage.getItem('total_page'); const totalPage = sessionStorage.getItem('total_pages');
if(currentPage == totalPage){ if(currentPage == totalPage){
sessionStorage.setItem('isElementComplete', true); sessionStorage.setItem('isElementComplete', true);
......
...@@ -194,9 +194,16 @@ export class ImageViewer { ...@@ -194,9 +194,16 @@ export class ImageViewer {
} }
displayCurrentImageFileName(imageName) { displayCurrentImageFileName(imageName) {
let filename = document.getElementById("imageFileName"); let filenameElement = document.getElementById("imageFileName");
filename.textContent = imageName.length > 30 ? imageName.substring(0, 30) : imageName; filenameElement.textContent = imageName; // Set the initial text content
filename.title = imageName;
// Set CSS style to hide overflow
filenameElement.style.overflow = "hidden";
filenameElement.style.whiteSpace = "nowrap"; // Prevent line breaks
// Optionally, you can also add text-overflow ellipsis to indicate truncation
filenameElement.style.textOverflow = "ellipsis";
filenameElement.title = imageName;
} }
displayePageDetails(current, total) { displayePageDetails(current, total) {
...@@ -497,6 +504,7 @@ export class ImageViewer { ...@@ -497,6 +504,7 @@ export class ImageViewer {
let fileNameDiv = document.createElement("div"); let fileNameDiv = document.createElement("div");
fileNameDiv.setAttribute("class", "row"); fileNameDiv.setAttribute("class", "row");
fileNameDiv.style.width = "30%";
let filenameLabel = document.createElement("label"); let filenameLabel = document.createElement("label");
filenameLabel.setAttribute("class", "label"); filenameLabel.setAttribute("class", "label");
filenameLabel.textContent = "Filename:"; filenameLabel.textContent = "Filename:";
......
...@@ -101,7 +101,7 @@ export const submitForm = async (e) => { ...@@ -101,7 +101,7 @@ export const submitForm = async (e) => {
export async function completeToNextNode(elementId) { export async function completeToNextNode(elementId) {
let requestJSON = { let requestJSON = {
"productionOutputUnits": { "productionOutputUnits": {
"keystroke": { "KEYSTROKE": {
"outputCount": 0, "outputCount": 0,
"errorCount": 0 "errorCount": 0
} }
......
...@@ -7,15 +7,14 @@ export const METRIC_FILES = "../../metrics/" ...@@ -7,15 +7,14 @@ export const METRIC_FILES = "../../metrics/"
export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.xlsx" export const HIGH_LIGHT_SCHEMA = "./WebGde-Widgets/sample_schema/dbSchema_anno.xlsx"
export const ROOT_FOLDER = "/WebGde-Widgets"; export const ROOT_FOLDER = "/WebGde-Widgets";
//this determines if the images will be retrieved from the gfs const IP = "localhost"
const IP = "3.84.233.4" const GDE_CONTEXTROOT = "WebGde"
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 GFS_CONTEXTROOT = "gfs-explorer-ws"
// export const GFS_URL = "http://54.174.197.197:8080" + "/WebGde/svc/gfs-rest" // export const GFS_URL = "http://54.174.197.197:8080" + "/WebGde/svc/gfs-rest"
export const GFS_URL = DOMAIN + `/${GDE_CONTEXTROOT}/svc/gfs-rest` export const GFS_URL = DOMAIN + `/${GDE_CONTEXTROOT}/svc/gfs-rest`
export const FOLDER_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/" export const FOLDER_URL = DOMAIN + "/" + GFS_CONTEXTROOT + "/svc/gfs-rest/get-folder?parentPath=/Users/"
export const DOWNLOAD_URL = DOMAIN + "/" + CONTEXTROOT + "/svc/gfs-rest/get-download-link" export const DOWNLOAD_URL = DOMAIN + "/" + GFS_CONTEXTROOT + "/svc/gfs-rest/get-download-link"
export const IS_RETRIEVE_FROM_GFS = "N" export const IS_RETRIEVE_FROM_GFS = "N"
export const LOCAL_URL = "http://44.201.248.43:8080" + "/WebGdeDev/svc/gfs-rest" export const LOCAL_URL = "http://44.201.248.43:8080" + "/WebGdeDev/svc/gfs-rest"
...@@ -23,16 +22,15 @@ export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen ...@@ -23,16 +22,15 @@ export const INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen
//BPO CONFIG //BPO CONFIG
export const IS_RETRIEVE_FROM_BPO = "Y" export const IS_RETRIEVE_FROM_BPO = "Y"
// export const BPO_URL = "http://35.171.20.94:8080/bpo-sqa/" export const BPO_URL = `${DOMAIN}/BPO-5295/`
// export const CURRENT_NODE = "Web GDE" export const CURRENT_NODE = "ASSIGNED_TO_OWEN"
export const BPO_URL = `${DOMAIN}/bpo/`
export const CURRENT_NODE = "Web_GDE_DEV"
export const ENCODING_PASS = "PASS1" export const ENCODING_PASS = "PASS1"
export const NEXT_NODE = "Complete" export const NEXT_NODE = "Completed"
export const EXCEPTION_NODE = "Exception" export const EXCEPTION_NODE = "Exception"
export const PDF_EXTENSION = ".pdf" export const PDF_EXTENSION = ".pdf"
export const JPG_EXTENSION = ".jpg" export const JPG_EXTENSION = ".jpg"
export const JPEG_EXTENSION = ".jpeg";
export const PNG_EXTENSION = ".png" export const PNG_EXTENSION = ".png"
export const REASON_LIST = "Reason1,Reason2,Reason3,Reason4" export const REASON_LIST = "Reason1,Reason2,Reason3,Reason4"
......
...@@ -335,6 +335,7 @@ async function initializeImageDisplay() { ...@@ -335,6 +335,7 @@ async function initializeImageDisplay() {
document.getElementById("previousRecordImage").style.visibility = "hidden"; document.getElementById("previousRecordImage").style.visibility = "hidden";
} }
DISPLAY_FIELD_OBJECT.updateHeaderText(2, "Record 1 of " + urls.length); DISPLAY_FIELD_OBJECT.updateHeaderText(2, "Record 1 of " + urls.length);
sessionStorage.setItem("total_pages", urls.length);
document.getElementById("zoomDetails").textContent = "Zoom: 100%"; document.getElementById("zoomDetails").textContent = "Zoom: 100%";
} }
...@@ -756,6 +757,7 @@ export async function resetGDE() { ...@@ -756,6 +757,7 @@ export async function resetGDE() {
sessionStorage.removeItem("isElementComplete"); sessionStorage.removeItem("isElementComplete");
let urls = JSON.parse(sessionStorage.getItem("dir_files")); let urls = JSON.parse(sessionStorage.getItem("dir_files"));
DISPLAY_FIELD_OBJECT.updateHeaderText(2, "Record 1 of " + urls.length); DISPLAY_FIELD_OBJECT.updateHeaderText(2, "Record 1 of " + urls.length);
sessionStorage.setItem("total_pages", urls.length);
if (urls) { if (urls) {
await initializeImageDisplay(); await initializeImageDisplay();
sessionStorage.removeItem('formArray'); sessionStorage.removeItem('formArray');
......
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