tooltip on unmatched attributes

open4good · Oct 19, 2023 · 0caec17 · 0caec17
1 parent 079fc74
commit 0caec17
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 5 deletions.
diff --git a/commons/src/main/java/org/open4goods/model/product/AggregatedAttribute.java b/commons/src/main/java/org/open4goods/model/product/AggregatedAttribute.java
@@ -48,7 +48,47 @@ public class AggregatedAttribute implements IAttribute {
 	private Set<UnindexedKeyValTimestamp> sources = new HashSet<>();
 
 
+	/**
+	 * Number of sources for this attribute
+	 * @return
+	 */
+	public int sourcesCount() {
+		return sources.size();
+	}
+
+	/**
+	 * The number of different values for this item
+	 * @return
+	 */
+	public long distinctValues () {
+		return sources.stream().map(e-> e.getValue()).distinct().count();
+	}
+
 
+	public boolean hasConflicts() {
+		return distinctValues() > 1;
+	}
+
+	public String bgRow() {
+		String ret="table-default";
+		int sCount = sourcesCount();
+		long dValues = distinctValues();
+
+		if (sCount == 0) {
+			ret="table-danger";
+		} else if (sCount == 1) {
+			ret="table-default";
+		} else {
+			ret="table-info";
+		}
+
+		if (dValues > 1) {
+			ret = "table-danger";
+		}
+
+		return ret;
+	}
+
 	// TODO : Simple, but does not allow to handle conflicts, and so on
 	@Override
 	public int hashCode() {

diff --git a/ui/src/main/resources/i18n/messages_fr.properties b/ui/src/main/resources/i18n/messages_fr.properties
@@ -1,3 +1,5 @@
+attribute.sourcing = {0} source(s) de donnée(s), {1} conflit(s)
+
 ecoscore.WARRANTY.tooltip = La garantie est de {0} an(s).
 ecoscore.DATA-QUALITY.tooltip = La qualité de la donnée est de {1} sur 5.
 ecoscore.REPAIRABILITY_INDEX.tooltip = L''indice de réparabilité est de {0} sur 10 ({1}/5 en valeur relative).

diff --git a/ui/src/main/resources/templates/inc/product-unmatched-attributes.html b/ui/src/main/resources/templates/inc/product-unmatched-attributes.html
@@ -1,7 +1,7 @@
 <div th:if="${product.attributes.unmapedAttributes.size()} > 0"  class="card shadow my-3">
 	<div class="card-header"><h2 class="h5">Toutes les caractéristiques</h2></div>
 	<div class="card-body">
-		<table id="allAttributes" class="table table-striped" style="width: 100%">
+		<table id="allAttributes" class="table table-responsive" style="width: 100%">
 			<thead>
 				<tr>
 					<th>Nom</th>
@@ -10,10 +10,19 @@
 			</thead>
 			<tbody>
 
-				<tr th:each="attr : ${product.attributes.unmapedAttributes}">
-					<td><span th:text="${attr.name}"></span></td>
-					<td><span th:text="${attr.value}"></span> </td>
-				</tr>
+				<th:block th:each="attr : ${product.attributes.unmapedAttributes}">
+
+
+					<th:block th:with="sourcesCount = ${attr.sourcesCount()}, conflicts = ${attr.hasConflicts()}">
+						<tr th:class="${attr.bgRow()}" data-bs-toggle="tooltip" data-bs-placement="top" th:title="#{attribute.sourcing(${sourcesCount}, ${attr.distinctValues()})}">
+							<td><span th:text="${attr.name}"></span></td>						
+							<td><span  th:text="${attr.value}"></span> </td>
+						</tr>
+					</th:block>
+
+
+
+				</th:block>
 
 			</tbody>