Adding energy consumption and weight filters

open4good · Dec 11, 2024 · 43a2438 · 43a2438
1 parent d4b80ea
commit 43a2438
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 32 deletions.
diff --git a/commons/src/main/java/org/open4goods/commons/services/SearchService.java b/commons/src/main/java/org/open4goods/commons/services/SearchService.java
@@ -153,6 +153,7 @@ public VerticalSearchResponse verticalSearch(VerticalConfig vertical, VerticalSe
 
 
 		// Adding custom numeric filters
+//		Criteria optional
 		for (NumericRangeFilter filter : request.getNumericFilters()) {
 
 		    if (!filter.isAllowEmptyValues()) {

diff --git a/ui/src/main/java/org/open4goods/ui/controllers/ui/VerticalController.java b/ui/src/main/java/org/open4goods/ui/controllers/ui/VerticalController.java
@@ -78,6 +78,14 @@ protected ModelAndView handleRequestInternal(HttpServletRequest request, HttpSer
 		vRequest.getNumericFilters().add(new NumericRangeFilter("price.minPrice.price", 0.0001, 500000.0, 100.0, false));
 		vRequest.getNumericFilters().add(new NumericRangeFilter("scores.ECOSCORE.value", 0.0001, 500000.0, 0.1, true));
 		vRequest.getNumericFilters().add(new NumericRangeFilter("scores.BRAND_SUSTAINABILITY.value", 0.0001, 500000.0, 0.1, true));
+		vRequest.getNumericFilters().add(new NumericRangeFilter("attributes.indexed.POWER_CONSUMPTION.numericValue", 0.0001, 500000.0, 0.1, true));
+		vRequest.getNumericFilters().add(new NumericRangeFilter("attributes.indexed.POWER_CONSUMPTION_OFF.numericValue", 0.0001, 500000.0, 0.1, true));
+
+
+
+
+
+
 		List<AttributeConfig> numericFilters = config.getVerticalFilters().stream()
 			.map(e -> config.getAttributesConfig().getAttributeConfigByKey(e))
 			.filter(e-> e != null)

diff --git a/ui/src/main/resources/templates/default/inc/vertical-filters-eco.html b/ui/src/main/resources/templates/default/inc/vertical-filters-eco.html
@@ -25,6 +25,56 @@
 	</th:block>	
 
 
+
+    <!-- 
+    <th:block th:with="title='Evaluation ESG',
+                       id='scores.BRAND_SUSTAINABILITY.value',
+                       labelType='alert-success',   
+                       icon='fa-cart-plus',                   
+                       label='Evaluation de performance ESG, par Sustainalytics',
+                       min=0,
+                       max=5,  
+                       interval=1, 
+                       includeUndefined=true,
+                       showIncludeUndefinedButton=true,
+                       includeUndefinedLabel='Afficher les non évalués'
+                       ">
+
+        <th:block th:insert="~{inc/vertical-filter-item-numeric.html}"></th:block>
+    </th:block> 
+     -->
+
+    <th:block th:with="title='Consommation en marche',
+                       id='attributes.indexed.POWER_CONSUMPTION.numericValue',
+                       labelType='alert-success',   
+                       icon='fa-cart',                   
+                       label='Consommation en marche (typique / max)',
+                       min=0,
+                       max=1000,  
+                       interval=1, 
+                       includeUndefined=true,
+                       showIncludeUndefinedButton=true,
+                       includeUndefinedLabel='Afficher les non évalués',
+                       undefinedCount=${products.unknown('attributes.indexed.POWER_CONSUMPTION.numericValue')}
+                       ">
+        <th:block th:insert="~{inc/vertical-filter-item-numeric.html}"></th:block>
+    </th:block>                        
+
+    <th:block th:with="title='Consommation en veille',
+                       id='attributes.indexed.POWER_CONSUMPTION_OFF.numericValue',
+                       labelType='alert-success',   
+                       icon='fa-cart',                   
+                       label='Consommation en veille (ou à l\'arrèt)',
+                       min=0,
+                       max=1000,  
+                       interval=1, 
+                       includeUndefined=true,
+                       showIncludeUndefinedButton=true,
+                       includeUndefinedLabel='Afficher les non évalués',
+                       undefinedCount=${products.unknown('attributes.indexed.POWER_CONSUMPTION_OFF.numericValue')}
+                       ">
+        <th:block th:insert="~{inc/vertical-filter-item-numeric.html}"></th:block>
+    </th:block>    
 
 
 	<!-- The item condition -->
@@ -42,25 +92,9 @@
 	</th:block>	
 
 
-
-	<!-- 
-    <th:block th:with="title='Evaluation ESG',
-                       id='scores.BRAND_SUSTAINABILITY.value',
-                       labelType='alert-success',   
-                       icon='fa-cart-plus',                   
-                       label='Evaluation de performance ESG, par Sustainalytics',
-                       min=0,
-                       max=5,  
-                       interval=1, 
-                       includeUndefined=true,
-                       showIncludeUndefinedButton=true,
-                       includeUndefinedLabel='Afficher les non évalués'
-                       ">
 
-        <th:block th:insert="~{inc/vertical-filter-item-numeric.html}"></th:block>
-    </th:block> 
-	 -->
-
+
+
 
 	<!-- The originating countries -->
 	<th:block th:with="id='countries',
@@ -75,20 +109,8 @@
 					   ">
 		<th:block th:insert="~{inc/vertical-filter-item-terms.html}"></th:block>
 	</th:block>	
-	<!-- 
-    <th:block th:with="title='Consommation en marche',
-                       id='attributes.indexed.POWER_CONSUMPTION.numericValue',
-                       labelType='alert-success',   
-                       icon='fa-cart-energy',                   
-                       label='Consommation en marche (typique / max)',
-                       min=0,
-                       max=500,  
-                       interval=1, 
-                       includeUndefined=true,
-                       showIncludeUndefinedButton=true,
-                       includeUndefinedLabel='Afficher les non évalués'
-                       ">
-	 -->
+
+
 
 	<!--  Custom eco filters -->
 	<th:block th:each="filterName : ${verticalConfig.ecoFilters}">