R11/release11-tools
4
2
Fork 0
Code Issues 9 Pull Requests 4 Packages Projects Releases 6 Wiki Activity

Fixed bugs mentioned in comments for #35

Browse Source 
Co-authored-by: Adam Bem <adam.bem@zoho.eu>
Reviewed-on: R11/release11-tools-web#85
This commit is contained in:
Adam Bem
2023-02-28 14:18:54 +01:00
parent f96f8270ce
commit 28e76b2374
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Frontend/assets/scripts/tools/scripts.js
View File

@@ -13,7 +13,12 @@ function clearDefaultContent(element, text) {
function clearDataField(){ function clearDataField(){
document.getElementById("xmlArea").value = ""; document.getElementById("xmlArea").value = "";
document.getElementById("xmlArea").style.color = null;
document.getElementById("xmlArea").style.backgroundColor = null;
document.getElementById("transformArea").value = ""; document.getElementById("transformArea").value = "";
document.getElementById("transformArea").style.color = null;
document.getElementById("transformArea").style.backgroundColor = null;
} }
function fillDefaultXML(element) { function fillDefaultXML(element) {
@@ -29,7 +34,7 @@ function fillDefaultXML(element) {
} }
//Set default text in grey //Set default text in grey
function setDefaultContent(element, text) { function setDefaultContent(element, text) {6543
if (element.value == "") { if (element.value == "") {
var id = element.getAttribute('id'); var id = element.getAttribute('id');
if (!defaultStrings.includes(text)) { if (!defaultStrings.includes(text)) {
@@ -99,12 +104,14 @@ function refreshTooltip() {
function performRequest(endpoint, checkXML, checkTransform){ function performRequest(endpoint, checkXML, checkTransform){
const sourceId = "xmlArea";
const transformId = "transformArea";
var xmlData = document.getElementById(sourceId).value.trim(); var xmlData = document.getElementById(sourceId).value.trim();
var transformData = document.getElementById(targetId).value.trim(); var transformData = document.getElementById(transformId).value.trim();
var port = 8081 var port = 8081;
if (getProcessor() == "libxml") { if (getProcessor() == "libxml") {
port = 8082 port = 8082;
} }
var empty = false; var empty = false;
@@ -114,11 +121,14 @@ function performRequest(endpoint, checkXML, checkTransform){
empty = true; empty = true;
} }
if (defaultStrings.includes(transformData) && checkTransform) { if (defaultStrings.includes(transformData) && checkTransform) {
document.getElementById(targetId).style.backgroundColor = color_red; document.getElementById(transformId).style.backgroundColor = color_red;
empty = true; empty = true;
} }
if (!empty) { if (!empty) {
restRequest(port, endpoint, xmlData, transformData).then(function(result) { restRequest(port, endpoint, xmlData, transformData).then(function(result) {
console.log(xmlData);
console.log(transformData);
document.getElementById("resultArea").value = result.result; document.getElementById("resultArea").value = result.result;
document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor); document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
if (result.status = "OK") { if (result.status = "OK") {
@@ -148,12 +158,11 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){
if (!empty) { if (!empty) {
restRequest(port, endpoint, xmlData, "").then(function(result) { restRequest(port, endpoint, xmlData, "").then(function(result) {
document.getElementById(targetId).value = result.result; if (result.status == "OK") {
document.getElementById(targetId).value = result.result;
}
}); });
}else{
document.getElementById(targetId).value = "No data provided!";
return false;
} }
} }