Ecoscore integration

open4good · Nov 27, 2023 · c35a100 · c35a100
1 parent 2014bc0
commit c35a100
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 3 deletions.
diff --git a/commons/src/main/java/org/open4goods/model/data/Score.java b/commons/src/main/java/org/open4goods/model/data/Score.java
@@ -139,6 +139,28 @@ public boolean is(Integer number) {
 		}
 	}
 
+
+
+
+	/**
+	 * Generate the letter score 
+	 * @return
+	 */
+	public String letter() {
+		Long percent = percent();
+
+		if (percent <= 20.0) {
+			return "A";
+		} else if (percent <= 40.0) {
+			return "B";
+		}else if (percent <= 60.0) {
+			return "C";
+		}else if (percent <= 80.0) {
+			return "D";
+		} else {
+			return "E";
+		}
+	}
 
 	@JsonIgnore
 	public boolean is1() {

diff --git a/commons/src/main/java/org/open4goods/model/product/Product.java b/commons/src/main/java/org/open4goods/model/product/Product.java
@@ -233,6 +233,14 @@ public List<Score> realScores() {
 		return ret;
 	}
 
+	/**
+	 * 
+	 * @return the ecoscore or null
+	 */
+	public Score ecoscore() {
+		// TODO : const
+		return scores.get("ECOSCORE");
+	}
 
 	/**
 	 *

diff --git a/ui/src/main/resources/static/icons/ecoscore/A.png b/ui/src/main/resources/static/icons/ecoscore/A.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/B.png b/ui/src/main/resources/static/icons/ecoscore/B.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/C.png b/ui/src/main/resources/static/icons/ecoscore/C.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/D.png b/ui/src/main/resources/static/icons/ecoscore/D.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/E.png b/ui/src/main/resources/static/icons/ecoscore/E.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/scoring-A.png b/ui/src/main/resources/static/icons/ecoscore/scoring-A.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/scoring-B.png b/ui/src/main/resources/static/icons/ecoscore/scoring-B.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/scoring-C.png b/ui/src/main/resources/static/icons/ecoscore/scoring-C.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/scoring-D.png b/ui/src/main/resources/static/icons/ecoscore/scoring-D.png
diff --git a/ui/src/main/resources/static/icons/ecoscore/scoring-E.png b/ui/src/main/resources/static/icons/ecoscore/scoring-E.png
diff --git a/ui/src/main/resources/templates/inc/product-ecoscore.html b/ui/src/main/resources/templates/inc/product-ecoscore.html
@@ -52,13 +52,14 @@
 				<!-- Score -->
 				<div class="tab-pane fade active show" id="panel-ecoscore"	role="tabpanel" aria-labelledby="panel-ecoscore">					
 					<div>
-						<div class="text-center">				           
-				           <img class="mt-4"  width="350px" src="/icons/ecoscore.png">
+						<div th:if="${product.ecoscore}" class="text-center">				           
+				           <img class="mt-4"  width="350px" th:alt="'Ecoscore : ' + ${product.ecoscore.letter()}" th:title="'éco-score : ' + ${product.ecoscore.letter()}" th:src="'/icons/ecoscore/scoring-'+${product.ecoscore.letter()}+'.png'">
 						</div>
 						<div  class="m-5">						
 							<div th:each="score : ${product.realScores()}" class="progress-wrapper">
-
+								
 								<div class="progress-info">
+									<span><img height="50" th:src="'/icons/ecoscore/'+${score.letter()}+'.png'"></span>
 									<span  class="h4 help-pointer progress-tooltip" data-bs-toggle="tooltip" data-bs-placement="top" th:title="#{'ecoscore.' +${score.name}+'.tooltip'(${score.absValue()}, ${score.relValue()}, ${product.attributes.aggregatedAttributes.get(score.name)})}" th:classappend="'bg-'+${score.colorClassName()}" th:text="#{'score-'+${score.name}}"></span>
 									<div class="progress-percentage">
 										<!--