From a638a5abd55ad3c0775280f9464cd9b8a39ebad1 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 11 Feb 2021 03:20:40 +0100
Subject: [PATCH] Improved service date displaying.

---
 src/fr/devinsy/statoolinfos/htmlize/ServicePage.java | 9 +++++++++
 src/fr/devinsy/statoolinfos/htmlize/service.xhtml    | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
index 8ba29f4..abf0cd2 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
@@ -120,8 +120,17 @@ public class ServicePage
             data.setEscapedAttribute("serviceURL", "href", service.getWebsite());
 
             data.setEscapedContent("serviceDescription", StringUtils.defaultIfBlank(service.getDescription(), "n/a"));
+
             data.setContent("serviceStartDate", StringUtils.defaultIfBlank(service.getStartDate(), "n/a"));
             data.setContent("serviceEndDate", StringUtils.defaultIfBlank(service.getEndDate(), "n/a"));
+            if (StringUtils.isBlank(service.getEndDate()))
+            {
+                data.setAttribute("serviceEndDateData", "style", "display: none;");
+            }
+            else
+            {
+                data.setAttribute("serviceStartDateWord", "style", "display: none;");
+            }
 
             data.setAttribute("serviceStatusImg", "src", "status-" + service.getStatus().toString().toLowerCase() + ".png");
             data.setAttribute("serviceStatusImg", "title", StringUtils.defaultIfBlank(service.getStatusDescription(), service.getStatus().toString()));
diff --git a/src/fr/devinsy/statoolinfos/htmlize/service.xhtml b/src/fr/devinsy/statoolinfos/htmlize/service.xhtml
index 701fb9e..665a22c 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/service.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/service.xhtml
@@ -23,7 +23,7 @@
 			<p id="serviceDescription" class="center_table" style="width: 500px;">Description absente…</p>
 		</div>
 			
-		<div>Date ouverture : <span id="serviceStartDate">n/a</span> – Date fermeture : <span id="serviceEndDate">n/a</span> – Statut : <img id="serviceStatusImg" src="status-void.png" style="width: 25px; vertical-align: bottom;" /></div>
+		<div><span id="serviceStartDateWord">Depuis</span> <span id="serviceStartDate">n/a</span><span id="serviceEndDateData"> – <span id="serviceEndDate">n/a</span></span> – Statut : <img id="serviceStatusImg" src="status-void.png" style="width: 25px; vertical-align: bottom;" /></div>
 		<div class="content_infos" style="border: 0px solid blue; border-radius: 8px; margin: 5px;">
 		Inscription : 	
 			<img id="registrationNoneImg" src="circle-icons/global-mono.svg" class="disabled" title="Sans compte"/>