Skip to content

W
web-ui
Commit abb3183a by Daniel Bawag
Options

Fixed the refresh bug

parent fb6165ad
Showing with 121 additions and 47 deletions
Web-GDE/index.html
...@@ -128,7 +128,11 @@ ...@@ -128,7 +128,11 @@
noConfig.style.display = "block"; noConfig.style.display = "block";
} }
} else { } else {
init(); if (performance.navigation.type == 1) {
refresh();
} else {
init();
}
} }
</script> </script>
<script src="./src/endSession/endSession.js"></script> <script src="./src/endSession/endSession.js"></script>
......
Web-GDE/src/accessFile/accessFile.js
var File_Name; var File_Name;
var File_Path; var File_Path;
function accessFile() { async function accessFile() {
var button = 0; var button = 0;
var size = 0; var size = 0;
...@@ -58,7 +58,7 @@ function accessFile() { ...@@ -58,7 +58,7 @@ function accessFile() {
const {done, value} = await reader.read(); const {done, value} = await reader.read();
if (done) break; if (done) break;
loaded += (value.byteLength); loaded += (value.byteLength);
// console.log("1"); // console.log(loaded);
progress({loaded, total}); progress({loaded, total});
controller.enqueue(value); controller.enqueue(value);
...@@ -85,6 +85,7 @@ function accessFile() { ...@@ -85,6 +85,7 @@ function accessFile() {
var count = store.count(); var count = store.count();
count.onsuccess = function() { count.onsuccess = function() {
if (count.result == 0 && (localStorage.length) == 0) { if (count.result == 0 && (localStorage.length) == 0) {
store.put({ id: count.result + 1, address: blob , name:filename, path:img});
url = URL.createObjectURL(blob); url = URL.createObjectURL(blob);
window.addEventListener("load", loadDoc(url, TIFFViewer,filename), false); window.addEventListener("load", loadDoc(url, TIFFViewer,filename), false);
localStorage.setItem("display_counter", 1); localStorage.setItem("display_counter", 1);
...@@ -94,7 +95,7 @@ function accessFile() { ...@@ -94,7 +95,7 @@ function accessFile() {
var file = new File([blob], filename + ".TIFF", {type: "img"}); //uplaod to uploadimgfolder //scanned images var file = new File([blob], filename + ".TIFF", {type: "img"}); //uplaod to uploadimgfolder //scanned images
uploadFile(file); uploadFile(file);
} else if (count.result == 0 && (localStorage.length) == 1) { } else if (count.result == 1 && (localStorage.length) == 1) {
store.put({ id: count.result + 1, address: blob , name:filename, path:img}); store.put({ id: count.result + 1, address: blob , name:filename, path:img});
localStorage.setItem("submit", "0"); localStorage.setItem("submit", "0");
localStorage.setItem("display_counter", 2); localStorage.setItem("display_counter", 2);
...@@ -102,35 +103,36 @@ function accessFile() { ...@@ -102,35 +103,36 @@ function accessFile() {
var file = new File([blob], filename + ".TIFF", {type: "img"}); //uplaod to uploadimgfolder //scanned images var file = new File([blob], filename + ".TIFF", {type: "img"}); //uplaod to uploadimgfolder //scanned images
uploadFile(file); uploadFile(file);
} else if(img == null && count.result == 1 && (localStorage.length) == 2 && localStorage.getItem("submit") == 1){ //if only one file left } else if(img == null && count.result == 2 && (localStorage.length) == 2 && localStorage.getItem("submit") == 1){ //if only one file left
const idQuery = store.get(1); const idQuery = store.get(parseInt(localStorage.getItem("display_counter")));
idQuery.onsuccess = function () { idQuery.onsuccess = function () {
url = URL.createObjectURL(idQuery.result.address); url = URL.createObjectURL(idQuery.result.address);
window.addEventListener("load", loadDoc(url, TIFFViewer,idQuery.result.name), false); window.addEventListener("load", loadDoc(url, TIFFViewer,idQuery.result.name), false);
File_Name = idQuery.result.name; File_Name = idQuery.result.name;
File_Path = idQuery.result.path; File_Path = idQuery.result.path;
store.clear(); store.delete(parseInt(localStorage.getItem("display_counter")) - 1);
localStorage.setItem("submit", "0"); localStorage.setItem("submit", "0");
}; };
} else if(img == null && count.result == 0 && (localStorage.length) == 2 && localStorage.getItem("submit") == 1){//no files left } else if(img == null && count.result == 1 && (localStorage.length) == 2 && localStorage.getItem("submit") == 1){//no files left
// alert("No Files Left"); // alert("No Files Left");
store.clear();
disableForm(); disableForm();
promptNoFilesLeft(); promptNoFilesLeft();
}else if (count.result == 1 && (localStorage.length) == 2 && localStorage.getItem("submit") == 1) { }else if (count.result == 2 && (localStorage.length) == 2 && localStorage.getItem("submit") == 1) {
const idQuery = store.get(1); const idQuery = store.get(parseInt(localStorage.getItem("display_counter")));
idQuery.onsuccess = function () { idQuery.onsuccess = function () {
url = URL.createObjectURL(idQuery.result.address); url = URL.createObjectURL(idQuery.result.address);
window.addEventListener("load", loadDoc(url, TIFFViewer,idQuery.result.name), false); window.addEventListener("load", loadDoc(url, TIFFViewer,idQuery.result.name), false);
File_Name = idQuery.result.name; File_Name = idQuery.result.name;
File_Path = idQuery.result.path; File_Path = idQuery.result.path;
store.clear(); store.delete(parseInt(localStorage.getItem("display_counter")) - 1);
store.put({ id: count.result, address: blob , name:filename, path:img}); store.put({ id: parseInt(localStorage.getItem("display_counter")) + 1, address: blob , name:filename, path:img});
localStorage.setItem("submit", "0"); localStorage.setItem("submit", "0");
localStorage.setItem("display_counter", parseInt(localStorage.getItem("display_counter")) + 1); //update how many have been fetched localStorage.setItem("display_counter", parseInt(localStorage.getItem("display_counter")) + 1); //update how many have been fetched
var file = new File([blob], filename + ".TIFF", {type: "img"}); //uplaod to uploadimgfolder //scanned images var file = new File([blob], filename + ".TIFF", {type: "img"}); //uplaod to uploadimgfolder //scanned images
...@@ -184,36 +186,6 @@ function accessFile() { ...@@ -184,36 +186,6 @@ function accessFile() {
return filename; return filename;
} }
function promptNoFilesLeft(){
var viewer = document.getElementById('viewer');
var promptMain = document.createElement('div');
promptMain.setAttribute("id", "prompt");
promptMain.style.zIndex = 999;
promptMain.style.textAlign = 'center';
promptMain.style.margin = 0 + ' auto';
promptMain.style.position = 'absolute';
promptMain.style.top = '50%';
promptMain.style.left = '50%';
promptMain.style.transform = 'translate(-50%, -50%)';
promptMain.style.backgroundColor = 'white';
promptMain.style.padding = '10px';
promptMain.style.display = 'block';
var message = document.createElement('p');
message.innerHTML = 'No images left to be fetched, Proceed to end session';
var okButton = document.createElement('button');
okButton.innerHTML = 'ok';
okButton.onclick = function() {
promptMain.style.display = 'none';
};
promptMain.appendChild(message);
promptMain.appendChild(okButton);
viewer.appendChild(promptMain);
}
function Input_files() { function Input_files() {
//Dirfiles from dir.php //Dirfiles from dir.php
var urls = Object.assign(new Array(), Dirfiles); //from config var urls = Object.assign(new Array(), Dirfiles); //from config
...@@ -300,3 +272,85 @@ function postServiceText(url, myObject, funcSuccess, funcFail){ ...@@ -300,3 +272,85 @@ function postServiceText(url, myObject, funcSuccess, funcFail){
return promise; return promise;
} }
function refreshImage() {
var size = 0;
const elStatus = document.getElementById('status');
function status(text) {
elStatus.innerHTML = text;
}
const progressBar = document.getElementById('progressBar');
const elProgress = document.getElementById('progress');
function progress() {
// elProgress.innerHTML = Math.round(loaded * .000001) + " mb of " + Math.round(total * .000001);
progressBar.value = Math.round(100 / 100 * 100);
}
const request = indexedDB.open("ImageDatabase", 1);
request.onsuccess = async function () {
// console.log("Database opened successfully " + val );
const db = request.result;
const transaction = db.transaction("image", "readwrite");
const store = transaction.objectStore("image");
const imageIndex = store.index("image_address");
var count = store.count();
count.onsuccess = function() {
if (count.result == 0 ) {
disableForm();
promptNoFilesLeft();
} else {
const idQuery = count.result == 2 ? store.get(parseInt(localStorage.getItem("display_counter")) - 1) : store.get(parseInt(localStorage.getItem("display_counter")));
idQuery.onsuccess = function () {
url = URL.createObjectURL(idQuery.result.address);
window.addEventListener("load", loadDoc(url, TIFFViewer,idQuery.result.name), false);
File_Name = idQuery.result.name;
File_Path = idQuery.result.path;
};
}
}
transaction.oncomplete = function () {
db.close();
status('downloaded '+Math.trunc(size/1000)+" kb");
progress();
};
};
}
function promptNoFilesLeft(){
var viewer = document.getElementById('viewer');
var promptMain = document.createElement('div');
promptMain.setAttribute("id", "prompt");
promptMain.style.zIndex = 999;
promptMain.style.textAlign = 'center';
promptMain.style.margin = 0 + ' auto';
promptMain.style.position = 'absolute';
promptMain.style.top = '50%';
promptMain.style.left = '50%';
promptMain.style.transform = 'translate(-50%, -50%)';
promptMain.style.backgroundColor = 'white';
promptMain.style.padding = '10px';
promptMain.style.display = 'block';
var message = document.createElement('p');
message.innerHTML = 'No images left to be fetched, Proceed to end session';
var okButton = document.createElement('button');
okButton.innerHTML = 'ok';
okButton.onclick = function() {
promptMain.style.display = 'none';
};
promptMain.appendChild(message);
promptMain.appendChild(okButton);
viewer.appendChild(promptMain);
}
Web-GDE/src/endSession/endSession.js
var submitted = false; // var submitted = false;
const form = document.getElementById("fields"); const form = document.getElementById("fields");
const sidebar = document.getElementById("sidebar"); const sidebar = document.getElementById("sidebar");
let closerWindow; let closerWindow;
form.addEventListener('submit', (e)=>{ // form.addEventListener('submit', (e)=>{
submitted = true; // submitted = true;
}) // })
endButton = document.createElement("button"); endButton = document.createElement("button");
endButton.id = "endBtn"; endButton.id = "endBtn";
...@@ -46,7 +46,7 @@ endButton.addEventListener("click", function(){ ...@@ -46,7 +46,7 @@ endButton.addEventListener("click", function(){
sessionStorage.clear(); sessionStorage.clear();
//if form is submitted or fields are blank, delete database //if form is submitted or fields are blank, delete database
if(submitted || checkForm(form)){ if(checkForm(form)){
var DBdeleteRequest = window.indexedDB.deleteDatabase("ImageDatabase"); var DBdeleteRequest = window.indexedDB.deleteDatabase("ImageDatabase");
DBdeleteRequest.addEventListener('blocked', function(e){ DBdeleteRequest.addEventListener('blocked', function(e){
console.log("Database cleared."); console.log("Database cleared.");
......
Web-GDE/src/init/init.js
...@@ -15,6 +15,22 @@ const init = () => { ...@@ -15,6 +15,22 @@ const init = () => {
} }
} }
const refresh = () => {
let started_flag = false;
displayFields("fields");
refreshImage();
window.onkeydown = (key) => {
if (!started_flag) {
if (searchStringInArray(`${key.key}`, keyArray) == true || key.ctrlKey && key.key) {
console.log('Invalid key cannot Start');
} else {
started_flag = true;
startMetricCapture();
}
}
}
}
function searchStringInArray(str, strArray) { function searchStringInArray(str, strArray) {
for (var j = 0; j < strArray.length; j++) { for (var j = 0; j < strArray.length; j++) {
......
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