From 1c4b9cfe875d4a3ca5ec18208ce42665e0bc92dd Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Fri, 21 Jan 2022 00:43:37 +0100
Subject: [PATCH] Added date tips in header column with monthly label.

---
 .../devinsy/statoolinfos/htmlize/OrganizationListView.java  | 2 ++
 src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java    | 6 ++++++
 .../devinsy/statoolinfos/htmlize/organizationListView.xhtml | 4 ++--
 src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml   | 5 +++--
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationListView.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationListView.java
index 0fea56b..84252f5 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationListView.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationListView.java
@@ -65,6 +65,8 @@ public class OrganizationListView
 
             String monthLabel = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("MMMM yyyy")).replace(" ", "&#160;");
             data.setContent("monthLabel", monthLabel);
+            data.setAttribute("userCountHeaderColumn", "title", monthLabel);
+            data.setAttribute("visitCountHeaderColumn", "title", monthLabel);
 
             int index = 0;
             for (Organization organization : organizations.sortByReverseServiceCount())
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
index 780f0ae..5bcf5e4 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
@@ -18,6 +18,7 @@
  */
 package fr.devinsy.statoolinfos.htmlize;
 
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
 import org.apache.commons.lang3.StringUtils;
@@ -68,6 +69,11 @@ public class ServiceListView
             }
             else
             {
+                String monthLabel = LocalDate.now().minusMonths(1).format(DateTimeFormatter.ofPattern("MMMM yyyy")).replace(" ", "&#160;");
+                data.setContent("monthLabel", monthLabel);
+                data.setAttribute("userCountHeaderColumn", "title", monthLabel);
+                data.setAttribute("visitCountHeaderColumn", "title", monthLabel);
+
                 int index = 0;
                 for (Service service : services.sortByName())
                 {
diff --git a/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
index 592912d..e00bba2 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/organizationListView.xhtml
@@ -21,8 +21,8 @@
 					<th style="width: 200px;">Membre</th>
 					<th style="width: 250px;">URL</th>
 					<th style="width: 10px;">Services</th>
-					<th style="width: 10px;">Utilisateurs mensuels<sup>*</sup></th>
-					<th style="width: 10px;">Visites mensuelles<sup>*</sup></th>
+					<th id="userCountHeaderColumn" style="width: 10px;">Utilisateurs mensuels<sup>*</sup></th>
+					<th id="visitCountHeaderColumn" style="width: 10px;">Visites mensuelles<sup>*</sup></th>
 					<th style="width: 10px;">Date</th>
 				</tr>
 			</thead>
diff --git a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
index 0eef982..83d21b0 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
@@ -52,8 +52,8 @@
 					<th class="" style="width: 225px;">Organisation</th>
 					<th class="">URL</th>
 					<th class="">Logiciel</th>
-					<th class="" style="width: 100px;">Utilisateurs mensuels</th>
-					<th class="" style="width: 10px;">Visites mensuelles</th>
+					<th id="userCountHeaderColumn" class="" style="width: 100px;">Utilisateurs mensuels<sup>*</sup></th>
+					<th id="visitCountHeaderColumn" class="" style="width: 10px;">Visites mensuelles<sup>*</sup></th>
 					<th class="" style="width: 25px;">Statut</th>
 					<th class="" style="width: 25px;" colspan="5">Inscription</th>
 					<th class="" style="width: 25px;" colspan="5">Liens</th>
@@ -131,6 +131,7 @@
 				</tr>
 			</tbody>
 		</table>
+		<div id="month_asterisk">(*) chiffres de <span id="monthLabel">n/a</span></div>
 	</div>
 	<script type="text/javascript">
 		$(document).ready(function()