Skip to content

W
web-ui
Commit bad3f112 by Jorem Magcawas
Options

commit changes to return and reject element

parent 2de41412
Showing with 177 additions and 304 deletions
WebGde/WebContent/config.js
...@@ -48,7 +48,7 @@ var INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLoc ...@@ -48,7 +48,7 @@ var INVALID_KEYS = "F1,F2,F3,F4,F5,F6,F7,F8,F9,F10,F11,F12,PrintScreen,ScrollLoc
//BPO CONFIG //BPO CONFIG
var IS_RETRIEVE_FROM_BPO = "Y" var IS_RETRIEVE_FROM_BPO = "Y"
var BPO_URL = "http://localhost:8080/BPO_v5.2.9.5/" var BPO_URL = "http://35.169.23.0:8080/bpo/"
var CURRENT_NODE = "Web GDE" var CURRENT_NODE = "Web GDE"
var ENCODING_PASS = "PASS1" var ENCODING_PASS = "PASS1"
var NEXT_NODE = "Complete" var NEXT_NODE = "Complete"
......
WebGde/WebContent/metrics/null_Metrics_20230111.csv deleted 100644 → 0
"record_no","filename","speed","eoe_timestamp","avg_speed"
"1","null_Metrics_20230111.csv","8152.994464016105","1/11/2023 4:54:32 PM","8152.994464016105"
"2","null_Metrics_20230111.csv","25552.050473186122","1/11/2023 4:55:06 PM","8152.9946"
WebGde/WebContent/metrics/undefined
...@@ -22,4 +22,13 @@ Start Time: 1/11/2023 5:07:25 PM ...@@ -22,4 +22,13 @@ Start Time: 1/11/2023 5:07:25 PM
End Time: 1/11/2023 5:07:41 PM End Time: 1/11/2023 5:07:41 PM
Start Time: 1/11/2023 5:15:32 PM Start Time: 1/11/2023 5:15:32 PM
End Time: 1/11/2023 5:15:34 PM End Time: 1/11/2023 5:15:34 PM
\ No newline at end of file
Start Time: 1/12/2023 3:13:39 PM
End Time: 1/12/2023 3:14:05 PM
Start Time: 1/12/2023 3:13:39 PM
End Time: 1/12/2023 3:15:44 PM
Start Time: 1/12/2023 3:24:06 PM
End Time: 1/12/2023 3:24:21 PM
\ No newline at end of file
WebGde/WebContent/metrics/worker1_Metrics_20230111.csv deleted 100644 → 0
"record_no","filename","speed","eoe_timestamp","avg_speed"
"1","worker1_Metrics_20230111.csv","7058.823529411765","1/11/2023 1:38:54 PM","7058.823529411765"
"2","worker1_Metrics_20230111.csv","9767.862526379258","1/11/2023 2:06:03 PM","7058.8237"
"3","worker1_Metrics_20230111.csv","862.1607237892497","1/11/2023 2:46:44 PM","7961.8364"
"4","worker1_Metrics_20230111.csv","7346.362137979751","1/11/2023 2:47:39 PM","6186.9175"
"5","worker1_Metrics_20230111.csv","10724.925521350548","1/11/2023 2:49:36 PM","6418.806"
"6","worker1_Metrics_20230111.csv","9671.5105629503","1/11/2023 2:51:22 PM","7136.4927"
"7","worker1_Metrics_20230111.csv","11096.69046073978","1/11/2023 2:51:49 PM","7498.638"
"8","worker1_Metrics_20230111.csv","9654.350417163289","1/11/2023 2:53:08 PM","7948.395"
"9","worker1_Metrics_20230111.csv","5483.1612794042985","1/11/2023 2:53:27 PM","8137.9453"
"10","worker1_Metrics_20230111.csv","10499.02786779002","1/11/2023 2:54:26 PM","7872.4673"
"11","worker1_Metrics_20230111.csv","10536.585365853658","1/11/2023 2:54:42 PM","8111.2456"
"12","worker1_Metrics_20230111.csv","7933.3986287952985","1/11/2023 2:56:01 PM","8313.357"
"13","worker1_Metrics_20230111.csv","13040.219835123657","1/11/2023 2:59:09 PM","8284.13"
"14","worker1_Metrics_20230111.csv","13329.80692938376","1/11/2023 2:59:32 PM","8623.851"
"15","worker1_Metrics_20230111.csv","10236.96682464455","1/11/2023 4:27:24 PM","8937.581"
"16","worker1_Metrics_20230111.csv","17030.028794734677","1/11/2023 4:27:31 PM","9018.793"
"17","worker1_Metrics_20230111.csv","14738.996929375639","1/11/2023 4:27:37 PM","9490.042"
"18","worker1_Metrics_20230111.csv","5609.418282548477","1/11/2023 4:35:01 PM","9781.651"
"19","worker1_Metrics_20230111.csv","7732.696897374701","1/11/2023 4:36:22 PM","9562.06"
"20","worker1_Metrics_20230111.csv","13289.581624282198","1/11/2023 4:36:49 PM","9470.592"
"21","worker1_Metrics_20230111.csv","5360.688285903375","1/11/2023 4:36:57 PM","9652.448"
"22","worker1_Metrics_20230111.csv","13080.339119903108","1/11/2023 4:38:07 PM","9457.368"
"23","worker1_Metrics_20230111.csv","15126.050420168069","1/11/2023 4:38:10 PM","9614.889"
"24","worker1_Metrics_20230111.csv","9963.09963099631","1/11/2023 4:38:15 PM","9844.5205"
"25","worker1_Metrics_20230111.csv","18030.050083472455","1/11/2023 4:38:19 PM","9849.264"
"26","worker1_Metrics_20230111.csv","20212.102308172176","1/11/2023 4:38:23 PM","10163.91"
"27","worker1_Metrics_20230111.csv","21936.357481381176","1/11/2023 4:39:51 PM","10536.064"
"28","worker1_Metrics_20230111.csv","28800","1/11/2023 4:40:44 PM","10943.218"
"29","worker1_Metrics_20230111.csv","10939.478348949102","1/11/2023 5:03:33 PM","11558.969"
"30","worker1_Metrics_20230111.csv","10448.242502418574","1/11/2023 5:03:51 PM","11538.318"
"31","worker1_Metrics_20230111.csv","11964.549483013294","1/11/2023 5:04:17 PM","11503.155"
"32","worker1_Metrics_20230111.csv","26811.10358835477","1/11/2023 5:07:27 PM","11517.574"
"33","worker1_Metrics_20230111.csv","7274.1968074358465","1/11/2023 5:07:35 PM","11981.015"
"34","worker1_Metrics_20230111.csv","9771.544899344039","1/11/2023 5:07:41 PM","11842.578"
"35","worker1_Metrics_20230111.csv","24179.104477611938","1/11/2023 5:09:49 PM","11783.405"
"36","worker1_Metrics_20230111.csv","23858.61561119293","1/11/2023 5:13:43 PM","12127.73"
"37","worker1_Metrics_20230111.csv","20930.232558139534","1/11/2023 5:13:59 PM","12444.782"
"38","worker1_Metrics_20230111.csv","12666.145426114153","1/11/2023 5:15:34 PM","12668.083"
"39","worker1_Metrics_20230111.csv","12432.847275518036","1/11/2023 5:17:19 PM","12668.033"
"40","worker1_Metrics_20230111.csv","14329.942503317116","1/11/2023 5:18:11 PM","12662.153"
"41","worker1_Metrics_20230111.csv","27787.307032590055","1/11/2023 5:18:37 PM","12702.831"
"42","worker1_Metrics_20230111.csv","6331.835059605237","1/11/2023 5:21:42 PM","13061.985"
"43","worker1_Metrics_20230111.csv","12910.938433950987","1/11/2023 5:23:47 PM","12905.47"
WebGde/WebContent/src/BPO/checkLST.php deleted 100644 → 0
<?php
$dir = json_decode($_POST['data'], true)['lst'];
if (file_exists($dir)){
$lst = explode("\r\n", file_get_contents($dir));
$response = array ("data" => $lst, "isExisting" => true);
echo json_encode($response);
} else {
$response = array ("isExisting" => false);
echo json_encode($response);
}
?>
WebGde/WebContent/src/BPO/checkXML.php deleted 100644 → 0
<?php
$dir = json_decode($_POST['data'], true)['xml'];
if (file_exists($dir)){
$xml = explode("\r\n", file_get_contents($dir));
$response = array ("data" => $xml, "isExisting" => true);
echo json_encode($response);
} else {
$response = array ("isExisting" => false);
echo json_encode($response);
}
?>
WebGde/WebContent/src/BPO/getElement.js
...@@ -65,19 +65,24 @@ async function initGetElement() { ...@@ -65,19 +65,24 @@ async function initGetElement() {
} }
} }
async function isLSTExisting(element) { async function isLSTExisting(element) {
const response = await fetch('http://localhost:8080/WebGde/svc/gfs-rest/get-if-existing', { const response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/get-if-existing', {
method: "POST", method: "POST",
headers: { headers: {
'Content-Type':'application/json' 'Content-Type':'application/json'
}, },
body: JSON.stringify({ "filePath": `${element.fileLocation}\\${element.elementId}.lst` }) body: JSON.stringify({ "filePath": `${element.fileLocation}/${element.elementId}.lst` })
}); });
return await response.json(); return await response.json();
//var folderLoc = `${element.fileLocation}` + "worker1" + "/" + "element1";
//getFolderLst(folderLoc);
// const response = await fetch()
} }
async function isXMLExisting(element) { async function isXMLExisting(element) {
const response = await fetch('http://localhost:8080/WebGde/svc/gfs-rest/get-if-existing', { const response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/get-if-existing', {
method: "POST", method: "POST",
headers: { headers: {
'Content-Type':'application/json' 'Content-Type':'application/json'
...@@ -185,7 +190,7 @@ async function createOutputXml(fields, metrics, doctype, section) { ...@@ -185,7 +190,7 @@ async function createOutputXml(fields, metrics, doctype, section) {
"section": section "section": section
} }
let response = await fetch('http://localhost:8080/WebGde/svc/gfs-rest/write-xml', { let response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/write-xml', {
method: "POST", method: "POST",
headers: { headers: {
'Content-Type':'application/json' 'Content-Type':'application/json'
...@@ -194,7 +199,7 @@ async function createOutputXml(fields, metrics, doctype, section) { ...@@ -194,7 +199,7 @@ async function createOutputXml(fields, metrics, doctype, section) {
}); });
if(completenessCheck(await response.text())) { if(completenessCheck(await response.text())) {
let response = await fetch('http://localhost:8080/WebGde/svc/gfs-rest/update-eob', { let response = await fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/update-eob', {
method: "POST", method: "POST",
headers: { headers: {
'Content-Type':'application/json' 'Content-Type':'application/json'
...@@ -218,35 +223,10 @@ function completenessCheck(xml) { ...@@ -218,35 +223,10 @@ function completenessCheck(xml) {
async function completeToNextNode(elementId) { async function completeToNextNode(elementId) {
let requestJSON = { let requestJSON = {
"productionOutputUnits": { "productionOutputUnits": {
"DOC": { "keystroke": {
"outputCount": 0,
"errorCount": 0
},
"PAGE": {
"outputCount": 0,
"errorCount": 0
},
"KEYSTROKE": {
"outputCount": 0,
"errorCount": 0
},
"CHAR": {
"outputCount": 0,
"errorCount": 0
},
"ELEM": {
"outputCount": 0,
"errorCount": 0
},
"COUNT": {
"outputCount": 0, "outputCount": 0,
"errorCount": 0 "errorCount": 0
} }
},
"extraDetails": {
"extra1": "asd",
"extra2": "qwe",
"extra3": "zxc"
} }
}; };
...@@ -268,4 +248,116 @@ async function completeToNextNode(elementId) { ...@@ -268,4 +248,116 @@ async function completeToNextNode(elementId) {
} else { } else {
alert(`Error ${response.status}: Completing element to next node`); alert(`Error ${response.status}: Completing element to next node`);
} }
}
function getFolderLst(url){
const promise = fetch(url, {
method: 'GET',
headers: {
'Authorization': sessionStorage.getItem('token')
// 'Content-Type': 'application/x-www-form-urlencoded',
}
})
.then(function (response) {
if(response.status === 200){
response.json().then(function(data) {
let temp = data.folderContent;
// temp.forEach(function(obj){
// //getFiles(DOWNLOAD_URL,obj.fileId);
// getFiles(DOWNLOAD_URL,obj.fileId);
// })
var container = document.getElementById("viewer");
var overlay;
var contain = ".lst";
for (let i = 0; i < temp.length; i++) {
overlay = document.createElement('div');
overlay.id = "containerModal" + i;
overlay.style.display = 'none';
container.append(overlay);
if(temp[i].name.includes(contain)){//contains
console.log(temp[i].name);
}
// getFiles(DOWNLOAD_URL,temp[i].fileId,overlay,temp[i].name);
}
let counter = 0;
sessionStorage.setItem("gfsCounter", counter);
var currDislplay = document.getElementById("containerModal" + sessionStorage.getItem('gfsCounter'));
currDislplay.style.display = 'block';
});
}else{
console.log("Error");
}
})
.catch(function (error) {
console.log('Request failed', error);
});
return promise;
}
async function getFileLst(url,id,overlay,filename){
console.log(url);
var myObject = {fileId : id};
fetch(url, {
method: 'POST',
headers: {
'Authorization': sessionStorage.getItem('token'),
'Content-Type':'application/json'
},
body: JSON.stringify(myObject)
})
.then(async function(response) {
await response.text().then(async function(imgData) {
getBlobService(imgData, function(data) {
var fileReader = new FileReader();
fileReader.onload = function() {
console.log(this.result);
var fileReader = new FileReader();
fileReader.onload = function () {
// File_Name = filename;
console.log(filename);
// tiffViewerTest(this.result, overlay, filename);
};
fileReader.readAsArrayBuffer(data);
};
fileReader.readAsArrayBuffer(data);
});
});
})
.catch(function (error) {
console.log('Request failed', error);
});
}
function getBlobService(url, func) {
const promise = fetch(url, {
method: 'get',
headers: {
'Authorization': sessionStorage.getItem('token')
}
})
.then(function(response) {
switch (response.status) {
case 200: response.blob().then(function(data) { func(data); }); break;
case 460: createInfoPopup("Error 460", "User does not exist."); break;
case 403: removeOverlay(); createInfoPopup("We are so sorry...", "Permission Denied: You don't have access here."); break;
case 464: createInfoPopup("Error 464", "No folder was retrieved."); break;
case 463: createInfoPopup("Error 463", "The folder name you entered already exists."); break;
case 462: createInfoPopup("Error 462", "No file was retrieved."); break;
case 461: createInfoPopup("Error 461", "File already exists."); break;
case 465: createInfoPopup("Error 465", "Source not found"); break;
case 500: removeOverlay(); createInfoPopup("It's not you. It's us... So sorry.", "Error 500: Please contact the support team so we can fix this immediately."); break;
default: break;
}
})
.catch(function(error) {
removeOverlay();
createInfoPopup("Whoops!", "We encountered some problems with your request. Rest assured we're working on this and it'll be okay soon.");
});
return promise;
} }
\ No newline at end of file
WebGde/WebContent/src/BPO/rejectElement.js
async function rejectElement() { async function rejectElement() {
let load = { let load = {
"queueIndex": 8, "queueIndex": 0,
"priority": 5 "priority": 9
} }
let response = await fetch(getRejectElement(), { let response = await fetch(getRejectElement(), {
method: "POST", method: "POST",
headers: { headers: {
...@@ -11,30 +10,35 @@ async function rejectElement() { ...@@ -11,30 +10,35 @@ async function rejectElement() {
}, },
body: JSON.stringify(load) body: JSON.stringify(load)
}); });
if (response.status != 200) { if (response.status == 200) {
alert(`Error ${response.status}: Rejecting element`) await initGetElement();
init();
alert("Element Rejected");
}
else{
alert(`Error ${response.status}: Rejecting element`);
} }
} }
createRejectWindow(); createRejectWindow(); //window for reason rejecting element
var rejectButton = document.getElementById('reject'); var rejectButton = document.getElementById('reject');
rejectButton.onclick = function () { rejectButton.onclick = function () {
let screenMain = document.getElementById('parent_Window'); // let screenMain = document.getElementById('parent_Window');
screenMain.style.display = 'block'; // screenMain.style.display = 'block';
rejectButton.disabled = true; // rejectButton.disabled = true;
// rejectElement(); rejectElement();
// const fieldForm = document.getElementById("fields"); const fieldForm = document.getElementById("fields");
// fieldForm.querySelector('input[type="submit"]').click(); fieldForm.querySelector('input[type="submit"]').click();
// alert("Element Rejected");
}; };
window.addEventListener('keydown', function(e) { window.addEventListener('keydown', function(e) {
if (e.ctrlKey == true && e.keyCode == 69){ if (e.ctrlKey == true && e.keyCode == 69){
returnElement(); // let screenMain = document.getElementById('parent_Window');
// screenMain.style.display = 'block';
// rejectButton.disabled = true;
rejectElement();
const fieldForm = document.getElementById("fields"); const fieldForm = document.getElementById("fields");
console.log(fieldForm);
fieldForm.querySelector('input[type="submit"]').click(); fieldForm.querySelector('input[type="submit"]').click();
alert("Element Returned");
} }
}); });
......
WebGde/WebContent/src/BPO/returnElement.js
async function returnElement(elementId) { async function returnElementBPO(elementId) {
let response = await fetch(getUrlReturnElement(elementId), {method: "POST"}); let response = await fetch(getUrlReturnElement(elementId), {method: "POST"});
if (response.status != 200) { if (response.status == 200) {
alert(`Error ${response.status}: Returning element`) alert("Element Returned");
await initGetElement();
init();
}else{
alert(`Error ${response.status}: Returning element`);
} }
} }
var returnButton = document.getElementById('return'); var returnButton = document.getElementById('return');
returnButton.onclick = function () { returnButton.onclick = function () {
returnElement(sessionStorage.getItem("element_id")); returnElementBPO(sessionStorage.getItem("element_id"));
const fieldForm = document.getElementById("fields"); // const fieldForm = document.getElementById("fields");
fieldForm.querySelector('input[type="submit"]').click(); // fieldForm.querySelector('input[type="submit"]').click();
alert("Element Returned");
}; };
window.addEventListener('keydown', function(e) { window.addEventListener('keydown', function(e) {
if (e.altKey == true && e.keyCode == 85){ if (e.altKey == true && e.keyCode == 85){
returnElement(sessionStorage.getItem("element_id")); returnElementBPO(sessionStorage.getItem("element_id"));
// const metrics = stopMetricCapture(); // const fieldForm = document.getElementById("fields");
// WriteForm(e, metrics, doctype, section); // fieldForm.querySelector('input[type="submit"]').click();
const fieldForm = document.getElementById("fields");
console.log(fieldForm);
fieldForm.querySelector('input[type="submit"]').click();
alert("Element Returned");
} }
}); });
\ No newline at end of file
WebGde/WebContent/src/BPO/writeXML.php deleted 100644 → 0
<?php
$projCode = json_decode($_POST['data'], true)["projCode"];
$userId = json_decode($_POST['data'], true)["userId"];
$elementId = json_decode($_POST['data'], true)["elementId"];
$schema = json_decode($_POST['data'], true)["schema"];
$totalRec = json_decode($_POST['data'], true)["totalRec"];
$maxRec = json_decode($_POST['data'], true)["maxRec"];
$totalKeystroke = json_decode($_POST['data'], true)["totalKeystroke"];
$procTime = json_decode($_POST['data'], true)["procTime"];
$procDuration = json_decode($_POST['data'], true)["procDuration"];
$eob = json_decode($_POST['data'], true)["eob"];
$exceptionRemark = json_decode($_POST['data'], true)["exceptionRemark"];
$recordNo = json_decode($_POST['data'], true)["recordNo"];
$totalSubRec = json_decode($_POST['data'], true)["totalSubRec"];
$maxSubRec = json_decode($_POST['data'], true)["maxSubRec"];
$imageName = json_decode($_POST['data'], true)["imageName"];
$subRecordNo = json_decode($_POST['data'], true)["subRecordNo"];
$eor = json_decode($_POST['data'], true)["eor"];
$fields = json_decode($_POST['data'], true)["fields"];
$outputDir = json_decode($_POST['data'], true)["outputDir"];
$doctype = json_decode($_POST['data'], true)["doctype"];
$section = json_decode($_POST['data'], true)["section"];
$dom = new DOMDocument('1.0', 'ISO-8859-1');
if (!file_exists($outputDir)) {
$root = $dom->createElement($projCode);
$root = $dom->appendChild($root);
$xmlHeader = $dom->createElement("header");
$xmlHeader->appendChild($dom->createElement("userid", $userId));
$xmlHeader->appendChild($dom->createElement("elementid", $elementId));
$xmlHeader->appendChild($dom->createElement("schema", $schema));
$xmlHeader->appendChild($dom->createElement("total_rec", $totalRec));
$xmlHeader->appendChild($dom->createElement("max_rec", $maxRec));
$xmlHeader->appendChild($dom->createElement("total_keystrokes", $totalKeystroke));
$xmlHeader->appendChild($dom->createElement("proc_time", $procTime));
$xmlHeader->appendChild($dom->createElement("proc_duration", $procDuration));
$xmlHeader->appendChild($dom->createElement("eob", $eob));
$xmlHeader->appendChild($dom->createElement("exception_remark", $exceptionRemark));
$root->appendChild($xmlHeader);
$xmlRecord = $dom->createElement("record");
$xmlRecordNo = $dom->createAttribute("no");
$xmlRecordNo->value=$recordNo;
$xmlRecordTotalSubRec = $dom->createAttribute("total_subrec");
$xmlRecordTotalSubRec->value=$totalSubRec;
$xmlRecordMaxSubRec = $dom->createAttribute("max_subrec");
$xmlRecordMaxSubRec->value=$maxSubRec;
$xmlRecord->appendChild($xmlRecordNo);
$xmlRecord->appendChild($xmlRecordTotalSubRec);
$xmlRecord->appendChild($xmlRecordMaxSubRec);
$xmlRecord->appendChild($dom->createElement("imagename", $imageName));
$xmlRecord->appendChild($dom->createElement("doctype", $doctype));
$xmlRecord->appendChild($dom->createElement("section", $section));
$xmlSubRecord = $dom->createElement("sub-record");
$xmlSubRecordNo = $dom->createAttribute("no");
$xmlSubRecordNo->value=$subRecordNo;
$xmlSubRecordEor = $dom->createAttribute("eor");
$xmlSubRecordEor->value=$eor;
$xmlSubRecord->appendChild($xmlSubRecordNo);
$xmlSubRecord->appendChild($xmlSubRecordEor);
foreach ($fields as $key => $value) {
$xmlField = $dom->createElement("field");
$xmlField->appendChild($dom->createElement("value", $value));
$xmlFieldNo = $dom->createAttribute("no");
$xmlFieldNo->value=$key;
$xmlField->appendChild($xmlFieldNo);
$xmlSubRecord->appendChild($xmlField);
}
$xmlRecord->appendChild($xmlSubRecord);
$root->appendChild($xmlRecord);
} else {
$dom->preserveWhiteSpace = false;
$dom->load($outputDir);
$root = $dom->getElementsByTagName($projCode)->item(0);
$xmlLastTotalKeystroke = $dom->getElementsByTagName('total_keystrokes')->item(0)->nodeValue;
$dom->getElementsByTagName('total_keystrokes')->item(0)->nodeValue = $xmlLastTotalKeystroke += $totalKeystroke;
$xmlLastProcDuration = $dom->getElementsByTagName('proc_duration')->item(0)->nodeValue;
$dom->getElementsByTagName('proc_duration')->item(0)->nodeValue = $xmlLastProcDuration += $procDuration;
$xmlRecords = $dom->getElementsByTagName('record');
$xmlLastRecord = $dom->getElementsByTagName('record')->item($xmlRecords->length - 1);
$lastRecordNo = $xmlLastRecord->getAttribute("no");
$xmlRecord = $dom->createElement("record");
$xmlRecordNo = $dom->createAttribute("no");
$xmlRecordNo->value=$lastRecordNo+= 1;
$xmlRecordTotalSubRec = $dom->createAttribute("total_subrec");
$xmlRecordTotalSubRec->value=$totalSubRec;
$xmlRecordMaxSubRec = $dom->createAttribute("max_subrec");
$xmlRecordMaxSubRec->value=$maxSubRec;
$xmlRecord->appendChild($xmlRecordNo);
$xmlRecord->appendChild($xmlRecordTotalSubRec);
$xmlRecord->appendChild($xmlRecordMaxSubRec);
$xmlRecord->appendChild($dom->createElement("imagename", $imageName));
$xmlRecord->appendChild($dom->createElement("doctype", $doctype));
$xmlRecord->appendChild($dom->createElement("section", $section));
$xmlSubRecord = $dom->createElement("sub-record");
$xmlSubRecordNo = $dom->createAttribute("no");
$xmlSubRecordNo->value=$subRecordNo;
$xmlSubRecordEor = $dom->createAttribute("eor");
$xmlSubRecordEor->value=$eor;
$xmlSubRecord->appendChild($xmlSubRecordNo);
$xmlSubRecord->appendChild($xmlSubRecordEor);
foreach ($fields as $key => $value) {
$xmlField = $dom->createElement("field");
$xmlField->appendChild($dom->createElement("value", $value));
$xmlFieldNo = $dom->createAttribute("no");
$xmlFieldNo->value=$key;
$xmlField->appendChild($xmlFieldNo);
$xmlSubRecord->appendChild($xmlField);
}
$xmlRecord->appendChild($xmlSubRecord);
$root->appendChild($xmlRecord);
}
$dom->formatOutput = true;
file_put_contents($outputDir, preg_replace_callback('/^( +)</m',
function($a) {
return str_repeat(' ',intval(strlen($a[1]) / 2) * 4).'<';
}, $dom->saveXML()));
echo $dom->saveXML();
?>
WebGde/WebContent/src/accessFile/accessFile.js
...@@ -247,8 +247,8 @@ async function accessFile() { ...@@ -247,8 +247,8 @@ async function accessFile() {
if(IS_RETRIEVE_FROM_GFS == "Y"){ if(IS_RETRIEVE_FROM_GFS == "Y"){
const modal = document.getElementById("TiffViewerModal"); const modal = document.getElementById("TiffViewerModal");
modal.style.display = 'none';//hide local modal modal.style.display = 'none';//hide local modal\
getFolder(FOLDER_URL+sessionStorage.getItem('user_id')); getFolder(FOLDER_URL+sessionStorage.getItem('user_id')+'/element5');
}else{ }else{
if((localStorage.length)==0){ if((localStorage.length)==0){
if(updated_input_files.length==0){ if(updated_input_files.length==0){
...@@ -351,6 +351,7 @@ async function accessFile() { ...@@ -351,6 +351,7 @@ async function accessFile() {
} }
async function getFiles(url,id,overlay,filename){ async function getFiles(url,id,overlay,filename){
console.log(url);
var myObject = {fileId : id}; var myObject = {fileId : id};
fetch(url, { fetch(url, {
method: 'POST', method: 'POST',
...@@ -365,7 +366,6 @@ async function accessFile() { ...@@ -365,7 +366,6 @@ async function accessFile() {
getBlobService(imgData, function(data) { getBlobService(imgData, function(data) {
var fileReader = new FileReader(); var fileReader = new FileReader();
fileReader.onload = function() { fileReader.onload = function() {
console.log(this.result);
var fileReader = new FileReader(); var fileReader = new FileReader();
fileReader.onload = function () { fileReader.onload = function () {
// File_Name = filename; // File_Name = filename;
...@@ -381,18 +381,6 @@ async function accessFile() { ...@@ -381,18 +381,6 @@ async function accessFile() {
.catch(function (error) { .catch(function (error) {
console.log('Request failed', error); console.log('Request failed', error);
}); });
// .then(response => {
// response.blob().then(blob => {
// console.log(blob);
// // const link = document.createElement('a');
// const url = URL.createObjectURL(blob);
// file_url.push(url);
// console.log(file_url);
// // link.href = url;
// // link.download = '111.txt';
// // link.click();
// })
// })
} }
function getBlobService(url, func) { function getBlobService(url, func) {
......
WebGde/WebContent/src/captureMetrics/captureMetrics.js
...@@ -158,7 +158,7 @@ const saveMetrics = async (metrics, eoe_ts) => { ...@@ -158,7 +158,7 @@ const saveMetrics = async (metrics, eoe_ts) => {
}; };
//fetch('./src/captureMetrics/saveMetrics.php', { //fetch('./src/captureMetrics/saveMetrics.php', {
fetch('http://localhost:8080/WebGde/svc/gfs-rest/write-mertrics/', { fetch('http://35.169.23.0:8080/WebGde/svc/gfs-rest/write-mertrics/', {
method: 'POST', method: 'POST',
headers: { headers: {
'Content-Type':'application/json' 'Content-Type':'application/json'
......
WebGde/WebContent/src/getFields/getFields.js
...@@ -22,7 +22,7 @@ const displayFields = async (parentID) => { ...@@ -22,7 +22,7 @@ const displayFields = async (parentID) => {
try { try {
document.getElementById("userNameValue").innerHTML = `User: ${sessionStorage.getItem("user_id")}`; document.getElementById("userNameValue").innerHTML = `User: ${sessionStorage.getItem("user_id")}`;
document.getElementById("elemIDValue").innerHTML = `Element ID: ${sessionStorage.getItem("element_id")}`; document.getElementById("elemIDValue").innerHTML = `Element ID: ${sessionStorage.getItem("element_id")}`;
let div = document.getElementById(parentID); let div = document.getElementById(parentID)
if(!div) return { valid: false, error: `Element with ID '${parentID}' not found` } if(!div) return { valid: false, error: `Element with ID '${parentID}' not found` }
clearFields(parentID) // make sure input fields are clear clearFields(parentID) // make sure input fields are clear
......
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