Commit 1283c13f by Jorem Magcawas

push latest on ui

parent a91bbd4d
...@@ -55,10 +55,11 @@ async function initGetElement() { ...@@ -55,10 +55,11 @@ async function initGetElement() {
await returnElement(element.element); await returnElement(element.element);
} }
} else if (element.errorCode == 463) { } else if (element.errorCode == 463) {
alert("No more available element"); /*alert("No more available element");*/
sessionStorage.clear(); promptNoFilesLeft();
/* sessionStorage.clear();
localStorage.clear(); localStorage.clear();
logoutKeycloak(); logoutKeycloak();*/
break; break;
} else { } else {
alert(`Error ${element.errorCode}: Fetching waiting element`); alert(`Error ${element.errorCode}: Fetching waiting element`);
......
...@@ -103,10 +103,11 @@ async function loadWaitingElement(){ ...@@ -103,10 +103,11 @@ async function loadWaitingElement(){
await returnElement(element.element); await returnElement(element.element);
} }
} else if (element.errorCode == 463) { } else if (element.errorCode == 463) {
alert("No more available element"); /*alert("No more available element");*/
sessionStorage.clear(); promptNoFilesLeft();
/* sessionStorage.clear();
localStorage.clear(); localStorage.clear();
logoutKeycloak(); logoutKeycloak();*/
break; break;
} else { } else {
alert(`Error ${element.errorCode}: Fetching waiting element`); alert(`Error ${element.errorCode}: Fetching waiting element`);
......
...@@ -13,11 +13,11 @@ async function accessFile() { ...@@ -13,11 +13,11 @@ async function accessFile() {
elStatus.innerHTML = text; elStatus.innerHTML = text;
} }
const progressBar = document.getElementById('progressBar'); //const progressBar = document.getElementById('progressBar');
const elProgress = document.getElementById('progress'); const elProgress = document.getElementById('progress');
function progress({ loaded, total }) { function progress({ loaded, total }) {
// elProgress.innerHTML = Math.round(loaded * .000001) + " mb of " + Math.round(total * .000001); elProgress.innerHTML = Math.round(loaded * .000001) + " mb of " + Math.round(total * .000001);
progressBar.value = Math.round(loaded / total * 100); //progressBar.value = Math.round(loaded / total * 100);
} }
const indexedDB = const indexedDB =
...@@ -501,11 +501,11 @@ function refreshImage() { ...@@ -501,11 +501,11 @@ function refreshImage() {
elStatus.innerHTML = text; elStatus.innerHTML = text;
} }
const progressBar = document.getElementById('progressBar'); //const progressBar = document.getElementById('progressBar');
const elProgress = document.getElementById('progress'); const elProgress = document.getElementById('progress');
function progress() { function progress() {
// elProgress.innerHTML = Math.round(loaded * .000001) + " mb of " + Math.round(total * .000001); elProgress.innerHTML = Math.round(loaded * .000001) + " mb of " + Math.round(total * .000001);
progressBar.value = Math.round(100 / 100 * 100); //progressBar.value = Math.round(100 / 100 * 100);
} }
...@@ -550,22 +550,25 @@ function refreshImage() { ...@@ -550,22 +550,25 @@ function refreshImage() {
function promptNoFilesLeft(){ function promptNoFilesLeft(){
var viewer = document.getElementById('viewer');     var viewer = document.getElementById('viewer');
var promptMain = document.createElement('div');     let genericDiv = document.createElement("div");
promptMain.setAttribute("id", "prompt");     genericDiv.classList.add("genericPopup");
    var promptMain = document.createElement('div');
var message = document.createElement('p');     promptMain.setAttribute("id", "prompt");     var message =  document.createElement('p');
message.innerHTML = 'No images left to be fetched, Proceed to end session';     message.innerHTML = 'No images left to be fetched, Proceed to end session'; 
    var okButton = document.createElement('button');
    okButton.innerHTML = 'ok';
var okButton = document.createElement('button');     okButton.onclick = function() {
okButton.innerHTML = 'ok';     genericDiv.remove();
okButton.onclick = function() { sessionStorage.clear();
promptMain.style.display = 'none'; localStorage.clear();
}; logoutKeycloak();
promptMain.appendChild(message);         /*promptMain.style.display = 'none';*/
promptMain.appendChild(okButton);     };
viewer.appendChild(promptMain);     promptMain.appendChild(message);
    promptMain.appendChild(okButton);
    genericDiv.append(promptMain);
    viewer.append(genericDiv);
} }
function getGfsFileName(contentDisposition) { function getGfsFileName(contentDisposition) {
......
...@@ -13,6 +13,18 @@ html { ...@@ -13,6 +13,18 @@ html {
user-select: none; user-select: none;
} }
#prompt{
background-color:white;
height:10%
position: absolute;
display: block;
margin: auto;
width: 42%;
top: 47%;
left: 31%;
text-align: center;
}
/* The actual popup */ /* The actual popup */
.popup .popuptext { .popup .popuptext {
visibility: hidden; visibility: hidden;
...@@ -907,10 +919,6 @@ select { ...@@ -907,10 +919,6 @@ select {
background-color: yellow; background-color: yellow;
} }
#prompt{
}
.parent_Window { .parent_Window {
box-shadow: var(- -ds-shadow-overlay, 0 4px 8px -2px rgba(9, 30, 66, 0.25), 0 0 1px rgba(9, 30, 66, 0.31)); box-shadow: var(- -ds-shadow-overlay, 0 4px 8px -2px rgba(9, 30, 66, 0.25), 0 0 1px rgba(9, 30, 66, 0.31));
width: 238px; width: 238px;
...@@ -1020,3 +1028,5 @@ select { ...@@ -1020,3 +1028,5 @@ select {
from {opacity: 0;} from {opacity: 0;}
to {opacity:1 ;} to {opacity:1 ;}
} }
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