From cccd606ac77d0f446d2a08071c98da0822840b0e Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Fri, 4 Jun 2021 16:51:50 +0200
Subject: [PATCH] Fixed n/a sort and date sort.

---
 .../statoolinfos/htmlize/FederationPage.java  | 22 ++-----------------
 .../statoolinfos/htmlize/ServiceListView.java |  4 ++++
 .../statoolinfos/htmlize/federation.xhtml     |  3 ++-
 .../htmlize/serviceListView.xhtml             | 10 ++++++---
 4 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java b/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
index c7d62f4..f218777 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
@@ -128,26 +128,8 @@ public class FederationPage
                 data.setEscapedAttribute("organizationListLine", index, "organizationListLineUrlLink", "href", organization.getWebsite());
 
                 data.setContent("organizationListLine", index, "organizationListLineServiceCount", organization.getServiceCount());
-
-                long count = organization.getPreviousMonthUserCount();
-                if (count == 0)
-                {
-                    data.setContent("organizationListLine", index, "organizationListLineUserCount", "n/a");
-                }
-                else
-                {
-                    data.setContent("organizationListLine", index, "organizationListLineUserCount", count);
-                }
-
-                count = organization.getPreviousMonthVisitCount();
-                if (count == 0)
-                {
-                    data.setContent("organizationListLine", index, "organizationListLineVisitCount", "n/a");
-                }
-                else
-                {
-                    data.setContent("organizationListLine", index, "organizationListLineVisitCount", count);
-                }
+                data.setContent("organizationListLine", index, "organizationListLineUserCount", organization.getPreviousMonthUserCount());
+                data.setContent("organizationListLine", index, "organizationListLineVisitCount", organization.getPreviousMonthVisitCount());
 
                 data.setContent("organizationListLine", index, "organizationListLineDate", organization.getCrawledDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY")));
                 data.setAttribute("organizationListLine", index, "organizationListLineDate", "title", organization.getCrawledDate().format(DateTimeFormatter.ofPattern("HH:mm:ss")));
diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
index 74d4226..dceebd9 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceListView.java
@@ -85,6 +85,10 @@ public class ServiceListView
                     data.setEscapedContent("serviceListLine", index, "serviceListLineSoftwareLink", service.getSoftwareName());
                     data.setAttribute("serviceListLine", index, "serviceListLineSoftwareLink", "href", "software-" + service.getSoftwareTechnicalName() + ".xhtml");
 
+                    data.setContent("serviceListLine", index, "serviceListLineUserCount", service.getPreviousMonthUserCount());
+
+                    data.setContent("serviceListLine", index, "serviceListLineVisitCount", service.getPreviousMonthVisitCount());
+
                     data.setEscapedContent("serviceListLine", index, "serviceListLineDate", service.getCrawledDate().format(DateTimeFormatter.ofPattern("dd/MM/YYYY")));
                     data.setEscapedAttribute("serviceListLine", index, "serviceListLineDate", "title", service.getCrawledDate().format(DateTimeFormatter.ofPattern("HH:mm:ss")));
 
diff --git a/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml b/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
index 678412d..f516cbb 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
@@ -50,7 +50,8 @@
 			paging: false,
 		    ordering:  true,
 		    "order": [[ 2, "desc" ]],
-		    language: dataTableFrench
+		    language: dataTableFrench,
+		    "columns": [null, null, null, null, null, { "sType": "date" } ]
 		});
 	</script>
 </body>
diff --git a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
index 96802a3..09a05aa 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/serviceListView.xhtml
@@ -11,7 +11,7 @@
 	<script src="Chart.bundle.min.js"></script>
 </head>
 <body>
-	<div class="center_table" style="width: 1450px;">
+	<div class="center_table" style="width: 1500px;">
 		<br/>
 		<div class="center">Nombre de services : <span id="serviceCount">n/a</span></div>
 
@@ -53,6 +53,7 @@
 					<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 class="" style="width: 25px;">Statut</th>
 					<th class="" style="width: 25px;" colspan="5">Inscription</th>
 					<th class="" style="width: 25px;" colspan="5">Liens</th>
@@ -79,7 +80,8 @@
 						<a href="#" id="serviceListLineSoftwareLink" title="">n/a</a>
 					</td>
 					<td id="serviceListLineUserCount" class="td_number">n/a</td>
-
+					<td id="serviceListLineVisitCount" class="td_number">n/a</td>
+	
 					<td id="" class="td_icon_alone">
 						<img id="serviceStatusImg" src="status-void.png" title="n/a"/>
 					</td>
@@ -136,7 +138,9 @@
 			paging: false,
 		    ordering:  true,
 		    "order": [[ 2, "desc" ]],
-		    language: dataTableFrench
+		    language: dataTableFrench,
+		    "columns": [null, null, null, null, null, null, null, null, null, null, 
+		    	null, null, null, null, null, null, null, null, null, null, { "sType": "date" } ]
 		});
 	</script>
 </body>