Skip to content
Snippets Groups Projects
Commit 6ad4a828 authored by Jonas Blatt's avatar Jonas Blatt :ant:
Browse files

In Multitable for each rule one button.

parent 25df551f
Branches
Tags
No related merge requests found
......@@ -35,10 +35,6 @@ public class VerificationResult implements Serializable {
return new ArrayList<>(rules);
}
private void setMessage(String message) {
this.message = message;
}
public String getMessage() {
return message;
}
......@@ -78,12 +74,12 @@ public class VerificationResult implements Serializable {
}
public Builder withMessage(String message, Object... args) {
value.setMessage(String.format(message, args));
value.message = String.format(message, args);
return this;
}
public Builder withMessage(String message) {
value.setMessage(message);
value.message = message;
return this;
}
......
......@@ -2,7 +2,9 @@ package de.unikoblenz.fgbks.dmn.core.models;
import de.unikoblenz.fgbks.base.builder.DefaultBuilder;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
......@@ -21,11 +23,16 @@ public class VerifierResult implements Serializable {
@XmlElementWrapper(name = "verifications")
@XmlElement(name = "verification")
private Set<VerificationResult> verifications;
private List<VerificationResult> verifications;
protected VerifierResult() {
super();
verifications = new HashSet<>();
verifications = new ArrayList<>();
}
@XmlElement(name = "multiTable")
public boolean isMultiTable() {
return verifierType.isMultiTable();
}
@XmlElement(name = "verificationsCount")
......
......@@ -3,7 +3,8 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:p="http://primefaces.org/ui">
xmlns:p="http://primefaces.org/ui"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<ui:define name="content">
<link rel="stylesheet" href="https://unpkg.com/dmn-js@6.3.1/dist/assets/diagram-js.css"/>
<link rel="stylesheet" href="https://unpkg.com/dmn-js@6.3.1/dist/assets/dmn-js-shared.css"/>
......@@ -116,10 +117,22 @@
<h:outputText value="#{results.message}"/>
</p:column>
<p:column styleClass="subcol-rules" headerText="Rules">
<p:commandButton styleClass="ruleselect-button"
style="width: 95%;"
onclick="addHighlightCss(#{results.rulesAsJson});"
value="Show"/>
<h:panelGroup rendered="#{not verifier.multiTable}">
<p:commandButton styleClass="ruleselect-button"
style="width: 95%;"
onclick="addHighlightCss(#{results.rulesAsJson});"
value="Show"/>
</h:panelGroup>
<h:panelGroup rendered="#{verifier.multiTable}">
<p:dataTable var="rule" value="#{results.rules}">
<p:column style="padding: 0px">
<p:commandButton styleClass="ruleselect-button"
style="width: 95%;"
onclick="addHighlightCssSingleRule('#{rule.ruleId}', '#{rule.decisionKey}');"
value="#{rule.tableName.concat(' (').concat(rule.rowNumber).concat(')')}"/>
</p:column>
</p:dataTable>
</h:panelGroup>
</p:column>
</p:dataTable>
</p:rowExpansion>
......
......@@ -101,3 +101,8 @@ function addHighlightCss(ruleC) {
$('[data-row-id=' + rule.ruleId + ']').toggleClass('highlight');
});
}
function addHighlightCssSingleRule(id, decisionKey) {
$('#tab-dec-' + decisionKey).click();
$('[data-row-id=' + id + ']').toggleClass('highlight');
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment