Http Status
diff --git a/Backend/mocked-services/src/main/resources/static/js/uianimation.js b/Backend/mocked-services/src/main/resources/static/js/uianimation.js
index e375856..d80f6db 100644
--- a/Backend/mocked-services/src/main/resources/static/js/uianimation.js
+++ b/Backend/mocked-services/src/main/resources/static/js/uianimation.js
@@ -118,4 +118,14 @@ $('#headerValueInput').focusout(function(){focusOutTip('newHeaderTip')});
$('#btnSave').mouseover(function(){showTip('btnSaveTip');});
$('#btnSave').focusin(function(){focusInTip('btnSaveTip')});
$('#btnSave').mouseleave(function(){hidTip('btnSaveTip')});
-$('#btnSave').focusout(function(){focusOutTip('btnSaveTip')});
\ No newline at end of file
+$('#btnSave').focusout(function(){focusOutTip('btnSaveTip')});
+
+$('#new-tile').mouseover(function(){showTip('btn-newTileTip');});
+$('#new-tile').focusin(function(){focusInTip('btn-newTileTip')});
+$('#new-tile').mouseleave(function(){hidTip('btn-newTileTip')});
+$('#new-tile').focusout(function(){focusOutTip('btn-newTileTip')});
+
+$('#listItems').mouseover(function(){showTip('messagesTip');});
+$('#listItems').focusin(function(){focusInTip('messagesTip')});
+$('#listItems').mouseleave(function(){hidTip('messagesTip')});
+$('#listItems').focusout(function(){focusOutTip('messagesTip')});
\ No newline at end of file
diff --git a/Frontend/Dockerfile b/Frontend/Dockerfile
index aed3064..febd991 100644
--- a/Frontend/Dockerfile
+++ b/Frontend/Dockerfile
@@ -3,9 +3,13 @@ FROM nginx:stable-alpine
COPY ./tools/ /usr/share/nginx/html/tools/
COPY ./assets/ /usr/share/nginx/html/assets/
COPY ./index.html /usr/share/nginx/html
-#COPY ./logo.png /usr/share/nginx/html
-#COPY ./styles.css /usr/share/nginx/html
-#COPY ./common.css /usr/share/nginx/html
-#COPY ./favicon.ico /usr/share/nginx/html
+
+RUN mkdir -p /scripts
+COPY insert_version.sh /scripts/
+WORKDIR /scripts
+
+RUN chmod +x insert_version.sh
+RUN ./insert_version.sh
+
EXPOSE 80
diff --git a/Frontend/assets/css/tools/r11form.css b/Frontend/assets/css/tools/r11form.css
index 6eb8ab9..e54e151 100644
--- a/Frontend/assets/css/tools/r11form.css
+++ b/Frontend/assets/css/tools/r11form.css
@@ -330,6 +330,10 @@
height: 300px;
}
+.textarea-800 {
+ height: 800px;
+}
+
.centered-content {
display: flex;
justify-content: center;
diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js
index 6becf43..d464330 100644
--- a/Frontend/assets/scripts/tools/scripts.js
+++ b/Frontend/assets/scripts/tools/scripts.js
@@ -11,6 +11,11 @@ function clearDefaultContent(element, text) {
}
}
+function clearDataField(){
+ document.getElementById("xmlArea").value = "";
+ document.getElementById("transformArea").value = "";
+}
+
function fillDefaultXML(element) {
if(element.classList.contains("active")){
const serverAddress = window.location.protocol + "//" + window.location.hostname + ":8086";
@@ -91,22 +96,38 @@ function refreshTooltip() {
document.getElementById("xsltelementsheader").innerText = XSLTheader;
}
+
+
function performRequest(endpoint, checkXML, checkTransform){
- var xmlData = document.getElementById("xmlArea").value.trim();
- var transformData = document.getElementById("transformArea").value.trim();
+ var xmlData = document.getElementById(sourceId).value.trim();
+ var transformData = document.getElementById(targetId).value.trim();
+ var port = 8081
+ if (getProcessor() == "libxml") {
+ port = 8082
+ }
+
var empty = false;
if (defaultStrings.includes(xmlData) && checkXML) {
- document.getElementById("xmlArea").style.backgroundColor = color_red;
+ document.getElementById(sourceId).style.backgroundColor = color_red;
xmlData = "";
empty = true;
}
if (defaultStrings.includes(transformData) && checkTransform) {
- document.getElementById("transformArea").style.backgroundColor = color_red;
+ document.getElementById(targetId).style.backgroundColor = color_red;
empty = true;
}
if (!empty) {
- restRequest(endpoint, xmlData, transformData);
+ restRequest(port, endpoint, xmlData, transformData).then(function(result) {
+ document.getElementById("resultArea").value = result.result;
+ document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
+ if (result.status = "OK") {
+ document.getElementById("procinfo").innerText = document.getElementById("procinfo").innerText.concat(" in ", result.time, "ms");
+ procinfo.style.color = "#30aa58";
+ } else {
+ procinfo.style.color = "#aa3030";
+ }
+ });
}else{
document.getElementById("resultArea").value = "No data provided!";
return false;
@@ -114,33 +135,35 @@ function performRequest(endpoint, checkXML, checkTransform){
}
-function performFormatRequest(endpoint, checkXML){
- var xmlData = document.getElementById("xmlArea").value.trim();
+function performFormatRequest(endpoint, checkXML, sourceId, targetId){
+ const port = 8082;
+ var xmlData = document.getElementById(sourceId).value.trim();
var empty = false;
if (defaultStrings.includes(xmlData) && checkXML) {
- document.getElementById("xmlArea").style.backgroundColor = color_red;
+ document.getElementById(sourceId).style.backgroundColor = color_red;
xmlData = "";
empty = true;
}
+
if (!empty) {
- restRequest(endpoint, xmlData, null);
+ restRequest(port, endpoint, xmlData, "").then(function(result) {
+ document.getElementById(targetId).value = result.result;
+
+ });
}else{
- document.getElementById("resultArea").value = "No data provided!";
+ document.getElementById(targetId).value = "No data provided!";
return false;
}
}
-//Form REST request, send, receive and display in resultArea
-async function restRequest(endpoint, xmlData, transformData) {
+//Form REST request, send and return received data
+async function restRequest(port, endpoint, xmlData, transformData) {
const escapeChar = "specialEscapeChar";
- var port = ":8081/"
- if (getProcessor() == "libxml") {
- port = ":8082/"
- }
- const addr = window.location.protocol + "//" + window.location.hostname + port + endpoint;
+
+ const addr = window.location.protocol + "//" + window.location.hostname + ":" + port + "/" + endpoint;
if(defaultStrings.includes(xmlData)){
xmlData = "
";
@@ -167,21 +190,11 @@ async function restRequest(endpoint, xmlData, transformData) {
var request = new Request(addr, init);
-
- await fetch(request).then(response => {
- console.log(response.status);
- response.text().then(function (text) {
- console.log(text);
- var result = JSON.parse(text);
- document.getElementById("resultArea").value = result.result;
- document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
- if (response.ok) {
- document.getElementById("procinfo").innerText = document.getElementById("procinfo").innerText.concat(" in ", result.time, "ms");
- procinfo.style.color = "#30aa58";
- } else {
- procinfo.style.color = "#aa3030";
- }
+ var result = await fetch(request).then(response => {
+ return response.text().then(function(text) {
+ return JSON.parse(text);
});
-
+
});
+ return result;
}
diff --git a/Frontend/index.html b/Frontend/index.html
index d9d0cd2..bcee87d 100644
--- a/Frontend/index.html
+++ b/Frontend/index.html
@@ -27,15 +27,15 @@
XSD
Formatter
-
+