statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Improved display of date in organization header page.

Browse source
This commit is contained in:
Christian P. MOMON 2021-02-11 03:00:58 +01:00
parent 22addc634f
commit 51b656d434
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/fr/devinsy/statoolinfos/htmlize/OrganizationPage.java
View file

@ -147,13 +147,19 @@ public class OrganizationPage
data.setEscapedContent("organizationDescription", organization.get("organization.description")); 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("organizationStartDate", StringUtils.defaultIfBlank(organization.getStartDate(), "n/a"));
data.setContent("organizationEndDate", StringUtils.defaultIfBlank(organization.getEndDate(), "n/a")); data.setContent("organizationEndDate", StringUtils.defaultIfBlank(organization.getEndDate(), "n/a"));
data.setContent("organizationAge", StringUtils.defaultIfBlank(organization.getAge(), "n/a")); data.setContent("organizationAge", StringUtils.defaultIfBlank(organization.getAge(), "n/a"));
if (StringUtils.isBlank(organization.getEndDate())) if (StringUtils.isBlank(organization.getEndDate()))
{ {
data.setContent("organizationMemberOfWord", "depuis");
data.setAttribute("organizationEndDateData", "style", "display: none;"); data.setAttribute("organizationEndDateData", "style", "display: none;");
} }
else
{
data.setContent("organizationMemberOfWord", ":");
}
data.setContent("organizationMemberStartDate", StringUtils.defaultIfBlank(organization.getMemberStartDate(), "n/a")); data.setContent("organizationMemberStartDate", StringUtils.defaultIfBlank(organization.getMemberStartDate(), "n/a"));
data.setContent("organizationMemberEndDate", StringUtils.defaultIfBlank(organization.getMemberEndDate(), "n/a")); data.setContent("organizationMemberEndDate", StringUtils.defaultIfBlank(organization.getMemberEndDate(), "n/a"));
@ -162,6 +168,10 @@ public class OrganizationPage
{ {
data.setAttribute("organizationMemberEndDateData", "style", "display: none;"); data.setAttribute("organizationMemberEndDateData", "style", "display: none;");
} }
else
{
data.setContent("organizationStartDateWord", "");
}
{ {
try try

4
src/fr/devinsy/statoolinfos/htmlize/organization.xhtml
View file

@ -22,8 +22,8 @@
</div> </div>
<p id="organizationDescription" class="center_table" style="width: 500px;">Description absente…</p> <p id="organizationDescription" class="center_table" style="width: 500px;">Description absente…</p>
</div> </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>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>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><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;"> <div class="content_infos" style="margin: 5px;">
Liens : Liens :
<a id="legalLink" href="#"><img id="legalLinkImg" src="circle-icons/ribbon.svg" class="disabled" title="Mentions légales"/></a> <a id="legalLink" href="#"><img id="legalLinkImg" src="circle-icons/ribbon.svg" class="disabled" title="Mentions légales"/></a>