From 1ddf8ead17a94bb085309def3c268ba5adc80923 Mon Sep 17 00:00:00 2001
From: goulven <goulven@goulven-Ionico-IV-15>
Date: Fri, 6 Dec 2024 09:29:48 +0100
Subject: [PATCH] Fixing missing non-leaf verticals in view

---
 .../commons/model/ProductCategory.java        | 20 +++++++++++++++++++
 .../resources/templates/default/category.html | 14 ++++---------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/commons/src/main/java/org/open4goods/commons/model/ProductCategory.java b/commons/src/main/java/org/open4goods/commons/model/ProductCategory.java
index 84e3313f..4f6197a2 100644
--- a/commons/src/main/java/org/open4goods/commons/model/ProductCategory.java
+++ b/commons/src/main/java/org/open4goods/commons/model/ProductCategory.java
@@ -201,9 +201,29 @@ public List<ProductCategory> leafs(boolean havingVertical) {
 
 		return ret;
 		
+	}
+
+	
+	/**
+	 * Return all verticals defined from this google node
+	 */
+	public List<ProductCategory> verticals() {
+		List<ProductCategory> ret = new ArrayList<ProductCategory>();
+		
+		for (ProductCategory c : children) {
+			ret.addAll(c.verticals());
+		}
+		
+		if (vertical != null) {
+				ret.add(this);
+		}
+
+		return ret;
 		
 	}
 
+	
+	
 	/**
 	 * Return the hierarchy for this category
 	 * 
diff --git a/ui/src/main/resources/templates/default/category.html b/ui/src/main/resources/templates/default/category.html
index 28d5f8c9..6d85aebc 100644
--- a/ui/src/main/resources/templates/default/category.html
+++ b/ui/src/main/resources/templates/default/category.html
@@ -41,7 +41,7 @@
 
 
 	
-        <!-- Hero for Core Team -->
+        <!-- Hero section -->
         <section class="bg-green-transparent ">
             <div class="container">
                 <div class="row justify-content-center">
@@ -76,18 +76,12 @@ <h1 class="display-2  mb-3" th:text="${category.googleNames.i18n(siteLanguage)}"
 								</ol>
 							</nav>
                         </th:block>
-
-                  
-
-
-
-					
                     </div>
                 </div>
             </div>
         </section>
         
-        <!-- Core team Members -->
+        <!-- Categories tree links  -->
         <section class="pt-0">
             <div class="container  ">
                 <div class="row mt-4">
@@ -141,11 +135,11 @@ <h1 class="display-2  mb-3" th:text="${category.googleNames.i18n(siteLanguage)}"
         </section>
         
         
-        <!-- Quick access -->
+        <!-- All leaf categories  -->
         <section class="section bg-green-transparent section-lg pt-0">
           <div class="container ">
                 <div class="row mt-4">
-                    <div th:each="child, stat : ${category.leafs(true)}" th:classappend="${stat.first ? 'col-md-3 col-lg-3' : 'col-md-3 col-lg-3'} " class="col-12 mb-lg-0">
+                    <div th:each="child, stat : ${category.verticals()}" th:classappend="${stat.first ? 'col-md-3 col-lg-3' : 'col-md-3 col-lg-3'} " class="col-12 mb-lg-0">
                          <div th:unless="${category.children.contains(child)}" class="card shadow border-gray-300 mt-2">
                              
                              <div class="card-body text-center">