From 85ea317bfe01265f690175c7b195b98b8610ef4b Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Mon, 1 Mar 2021 04:42:59 +0100
Subject: [PATCH] Improved age display in service page.

---
 src/fr/devinsy/statoolinfos/core/Service.java | 19 +++++++++++++++++++
 .../statoolinfos/htmlize/ServicePage.java     |  1 +
 .../statoolinfos/htmlize/organization.xhtml   |  2 +-
 .../statoolinfos/htmlize/service.xhtml        |  2 +-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/core/Service.java b/src/fr/devinsy/statoolinfos/core/Service.java
index 4cfd9bb..8c321ef 100644
--- a/src/fr/devinsy/statoolinfos/core/Service.java
+++ b/src/fr/devinsy/statoolinfos/core/Service.java
@@ -21,6 +21,7 @@ package fr.devinsy.statoolinfos.core;
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -121,6 +122,24 @@ public class Service extends PathPropertyList
         super(properties);
     }
 
+    /**
+     * Gets the age.
+     *
+     * @return the age
+     */
+    public String getAge()
+    {
+        String result;
+
+        LocalDate startDate = StatoolInfosUtils.parseDate(getStartDate());
+        LocalDate endDate = StatoolInfosUtils.parseDate(getEndDate());
+
+        result = StatoolInfosUtils.toHumanDuration(startDate, endDate);
+
+        //
+        return result;
+    }
+
     /**
      * Gets the contact email.
      *
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
index 23f3167..c2abd53 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
@@ -123,6 +123,7 @@ public class ServicePage
 
             data.setContent("serviceStartDate", StringUtils.defaultIfBlank(service.getStartDate(), "n/a"));
             data.setContent("serviceEndDate", StringUtils.defaultIfBlank(service.getEndDate(), "n/a"));
+            data.setContent("serviceAge", StringUtils.defaultIfBlank(service.getAge(), "n/a"));
             if (StringUtils.isBlank(service.getEndDate()))
             {
                 data.setAttribute("serviceEndDateData", "style", "display: none;");
diff --git a/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
index a99d5c4..85cfc34 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
@@ -22,7 +22,7 @@
 			</div>
 			<p id="organizationDescription" class="center_table" style="width: 500px;">Description absente…</p>
 		</div>
-		<div><span id="organizationStartDateWord">Depuis</span> <span id="organizationStartDate">n/a</span><span id="organizationEndDateData"> – Date d'arrêt : <span id="organizationEndDate">n/a</span></span> (<span id="organizationAge">n/a</span>)</div>
+		<div><span id="organizationStartDateWord">Depuis</span> <span id="organizationStartDate">n/a</span><span id="organizationEndDateData"> – <span id="organizationEndDate">n/a</span></span> (<span id="organizationAge">n/a</span>)</div>
 		<div>Membre <span id="organizationMemberOfName">n/a</span> <span id="organizationMemberOfWord">depuis/:</span> <span id="organizationMemberStartDate">n/a</span><span id="organizationMemberEndDateData"> – <span id="organizationMemberEndDate">n/a</span></span> (<span id="organizationMemberAge">n/a</span>)</div>
 		<div class="content_infos" style="margin: 5px;">
 		Liens : 
diff --git a/src/fr/devinsy/statoolinfos/htmlize/service.xhtml b/src/fr/devinsy/statoolinfos/htmlize/service.xhtml
index faad019..bafd74b 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><span id="serviceStartDateWord">Depuis</span> <span id="serviceStartDate">n/a</span><span id="serviceEndDateData"> – <span id="serviceEndDate">n/a</span></span>&#160;&#160;&#160;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> (<span id="serviceAge">n/a</span>)&#160;&#160;&#160;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"/>