From 51b656d434573bcae2fc7dc558952dfaf5c09199 Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Thu, 11 Feb 2021 03:00:58 +0100
Subject: [PATCH] Improved display of date in organization header page.

---
 .../devinsy/statoolinfos/htmlize/OrganizationPage.java | 10 ++++++++++
 src/fr/devinsy/statoolinfos/htmlize/organization.xhtml |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
index f9efc6e..e674c53 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
@@ -147,13 +147,19 @@ public class OrganizationPage
 
             data.setEscapedContent("organizationDescription", organization.get("organization.description"));
 
+            data.setEscapedContent("organizationMemberOfName", StringUtils.defaultIfBlank(organization.getFederation().getName(), "n/a"));
             data.setContent("organizationStartDate", StringUtils.defaultIfBlank(organization.getStartDate(), "n/a"));
             data.setContent("organizationEndDate", StringUtils.defaultIfBlank(organization.getEndDate(), "n/a"));
             data.setContent("organizationAge", StringUtils.defaultIfBlank(organization.getAge(), "n/a"));
             if (StringUtils.isBlank(organization.getEndDate()))
             {
+                data.setContent("organizationMemberOfWord", "depuis");
                 data.setAttribute("organizationEndDateData", "style", "display: none;");
             }
+            else
+            {
+                data.setContent("organizationMemberOfWord", ":");
+            }
 
             data.setContent("organizationMemberStartDate", StringUtils.defaultIfBlank(organization.getMemberStartDate(), "n/a"));
             data.setContent("organizationMemberEndDate", StringUtils.defaultIfBlank(organization.getMemberEndDate(), "n/a"));
@@ -162,6 +168,10 @@ public class OrganizationPage
             {
                 data.setAttribute("organizationMemberEndDateData", "style", "display: none;");
             }
+            else
+            {
+                data.setContent("organizationStartDateWord", "");
+            }
 
             {
                 try
diff --git a/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
index b00678d..48aa29a 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
@@ -22,8 +22,8 @@
 			</div>
 			<p id="organizationDescription" class="center_table" style="width: 500px;">Description absente…</p>
 		</div>
-		<div>Date d'entrée : <span id="organizationMemberStartDate">n/a</span><span id="organizationMemberEndDateData"> – Date de sortie : <span id="organizationMemberEndDate">n/a</span></span> (<span id="organizationMemberAge">n/a</span>)</div>
-		<div>Date de création : <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>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><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 class="content_infos" style="margin: 5px;">
 		Liens : 
 			<a id="legalLink" href="#"><img id="legalLinkImg" src="circle-icons/ribbon.svg" class="disabled" title="Mentions légales"/></a>