misc

open4good · Oct 16, 2023 · af922c1 · af922c1
1 parent d9586b6
commit af922c1
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 17 deletions.
diff --git a/commons/src/main/java/org/open4goods/model/data/UnindexedKeyVal.java b/commons/src/main/java/org/open4goods/model/data/UnindexedKeyVal.java
@@ -32,7 +32,7 @@ public int hashCode() {
 	@Override
 	public boolean equals(Object obj) {
 
-		if (obj instanceof UnindexedKeyVal) {
+		if (obj instanceof UnindexedKeyVal || obj instanceof UnindexedKeyValTimestamp) {
 			return ((UnindexedKeyVal)obj).key.equals(key);
 		}
 		return false;

diff --git a/commons/src/main/java/org/open4goods/model/product/AggregatedPrice.java b/commons/src/main/java/org/open4goods/model/product/AggregatedPrice.java
@@ -1,6 +1,8 @@
 
 package org.open4goods.model.product;
 
+import java.text.DecimalFormat;
+
 import org.open4goods.model.constants.Currency;
 import org.open4goods.model.constants.ProductState;
 import org.open4goods.model.data.DataFragment;
@@ -10,7 +12,9 @@
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
 public class AggregatedPrice extends Price {
-
+
+	private static final DecimalFormat df = new DecimalFormat("0.00");
+
 	@Field(index = false, store = false, type = FieldType.Keyword)
 	private String datasourceName;
 	@Field(index = false, store = false, type = FieldType.Keyword)
@@ -74,7 +78,24 @@ public AggregatedPrice(double price, Currency currency) {
 	}
 
 
-
+	/**
+	 * A human readable price (2 decimals max, skipped if int)
+	 * @return
+	 */
+	public String shortPrice() {
+
+		Double p = super.getPrice();		
+		boolean isInt = p == Math.rint(p);
+
+		if (isInt) {
+			return String.valueOf(p.intValue());
+		} else {
+			return String.valueOf(df.format(p));
+		}
+
+	}
+
+
 	public AggregatedPrice() {
 		super();
 	}

diff --git a/ui/src/main/resources/application.yml b/ui/src/main/resources/application.yml
@@ -63,12 +63,6 @@ brandConfig:
     CONTINENTAL EDISON: "http://www.service-client.fr/wp-content/uploads/2016/08/CONTINENTAL-EDISON.jpg"
     CHIQ: "https://www.buysmarte.com.au/media/manufacturer/chiq.jpg"
 
-
-
-
-
-
-
 management:
 
   health:
@@ -110,11 +104,11 @@ spring:
 
 
 #Css and js mimification
-wro4j:
-  filterUrl : /resources
-  cacheGzippedContent: true
-  ignoreMissingResources: false
-  managerFactory:
-    preProcessors: removeSourceMaps, cssImport, jsMin
+#wro4j:
+#  filterUrl : /resources
+#  cacheGzippedContent: true
+#  ignoreMissingResources: false
+ # managerFactory:
+ #   preProcessors: removeSourceMaps, cssImport, jsMin
 
 
diff --git a/ui/src/main/resources/templates/inc/product-price.html b/ui/src/main/resources/templates/inc/product-price.html
@@ -5,8 +5,10 @@
 			<div class="card-header border-0 bg-white text-center pb-0">
 				<h2 class="h3 ">Meilleur prix</h2>
 				<span class="d-block"> 
-					<span class="display-2 fw-bold">
-						<th:block th:text="${#numbers.formatDecimal(product.bestPrice().price, 1, 2)}"></th:block> 
+					<span class="display-3 fw-bold">
+						<th:block th:text="${product.bestPrice().shortPrice()}"></th:block> 
+
+
 						<span class="align-baseline font-medium" th:text="#{'symbol.'+${product.bestPrice().currency}}"></span>
 					</span>
 				</span>