From 6c3ce5a97ab9359393f44ddd42126abe08ae5c29 Mon Sep 17 00:00:00 2001
From: Jonas Blatt <jonasblatt@uni-koblenz.de>
Date: Sat, 26 Oct 2019 23:00:20 +0200
Subject: [PATCH] Frontend adjustments
---
.../verifier/impl/MissingRuleVerifier.java | 16 +++++++++-------
.../META-INF/resources/css/stylesheets.css | 3 ++-
.../META-INF/resources/js/dmnVerifier.js | 3 +++
.../META-INF/resources/js/dmnVerifierActions.js | 4 ++--
.../resources/META-INF/resources/js/dmnViewer.js | 2 +-
5 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java
index e75ffd35..e7e931d3 100644
--- a/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java
+++ b/dmnverifierapi/src/main/java/de/unikoblenz/fgbks/core/dmn/verification/verifier/impl/MissingRuleVerifier.java
@@ -69,13 +69,15 @@ public class MissingRuleVerifier extends AbstractVerifier {
fixActionBuilder.addValue("inputColumnId", v.getDmnInputColumn().getInputId().getValue());
fixActionBuilder.addValue("value", v.getBoundary().getParsedText());
}
- vreFactory.addVerificationFix(
- VerificationFix.getBuilder()
- .withFixName(FIX_NAME)
- .addAction(fixActionBuilder.build())
- .build());
- vreFactory.addElement(VerificationResultEntryElement.create(dmnDecisionTable));
- vreFactory.addToEntry(VerificationClassification.WARNING, sb.toString());
+ vreFactory
+ .addVerificationFix(VerificationFix.SHOW_DECISION)
+ .addVerificationFix(
+ VerificationFix.getBuilder()
+ .withFixName(FIX_NAME)
+ .addAction(fixActionBuilder.build())
+ .build())
+ .addElement(VerificationResultEntryElement.create(dmnDecisionTable))
+ .addToEntry(VerificationClassification.WARNING, sb.toString());
}
}
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css b/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css
index c7826d4f..eaef15d9 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/css/stylesheets.css
@@ -137,8 +137,9 @@ span.select2 {
border: 2px solid #0b3004;
border-radius: 5px;
display: block;
- background-size: cover;
background-position: center;
+ background-repeat: no-repeat;
+ background-size: 85%;
cursor: pointer;
}
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
index f1add96c..ad4f1c00 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js
@@ -267,6 +267,9 @@ function renderVerifierResult(verifierSelect) {
let verifier = findVerifierByName(verifierSelect.value);
if (verifier === undefined) {
lastTypeSelect = undefined;
+ let $verifierContent = $('#dmn-verifier-content');
+ $verifierContent.empty();
+ $verifierContent.css('display', 'none');
} else {
lastTypeSelect = verifier.type.name;
renderVerifier(verifier);
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifierActions.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifierActions.js
index a0ad8640..75706537 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifierActions.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifierActions.js
@@ -124,7 +124,7 @@ function fixSHOW_OUTPUT_COLUMN(verificationEntry, fixAction) {
* @param {Action} fixAction
*/
function fixSHOW_DECISION_TABLE(verificationEntry, fixAction) {
- highlightDecisions(verificationEntry.elements);
+ highlightDecision(verificationEntry.elements);
}
/**
@@ -133,5 +133,5 @@ function fixSHOW_DECISION_TABLE(verificationEntry, fixAction) {
* @param {Action} fixAction
*/
function fixSHOW_DECISION(verificationEntry, fixAction) {
- highlightDecisions(verificationEntry.elements);
+ highlightDecision(verificationEntry.elements);
}
diff --git a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
index 7ab3c8d3..275f92a8 100644
--- a/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
+++ b/dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js
@@ -257,7 +257,7 @@ function highlightInputData(elements) {
*
* @param {Array<VerificationEntryElement>}elements
*/
-function highlightDecisions(elements) {
+function highlightDecision(elements) {
console.log(elements);
renderHighlightFunction.push({
highlight: function () {
--
GitLab