From ff1369b10b91091d55a0ddf7068eb26baecc5ecb Mon Sep 17 00:00:00 2001
From: "Christian P. MOMON" <christian.momon@devinsy.fr>
Date: Sat, 21 Nov 2020 07:09:55 +0100
Subject: [PATCH] Added stats button in federation page. Rename federation
 stats page.

---
 .../statoolinfos/htmlize/FederationPage.java  |   2 +
 .../htmlize/FederationStatsPage.java          |   2 +-
 .../statoolinfos/htmlize/Htmlizer.java        |   9 +-
 .../statoolinfos/htmlize/WebCharterView.java  |   1 +
 .../statoolinfos/htmlize/federation.xhtml     |   1 +
 .../stuff/circle-icons/barchart-mono.svg      |  78 +++++++++++++
 .../htmlize/stuff/circle-icons/barchart.svg   | 107 ++++++++++++++++++
 .../statoolinfos/htmlize/webCharterView.xhtml |   2 +-
 8 files changed, 197 insertions(+), 5 deletions(-)
 create mode 100644 src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart-mono.svg
 create mode 100644 src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart.svg

diff --git a/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java b/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
index 52464b9..2482236 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/FederationPage.java
@@ -102,6 +102,8 @@ public class FederationPage
             data.setAttribute("rawLink", "href", federation.getTechnicalName() + ".properties");
             data.setAttribute("rawCheckLink", "href", federation.getTechnicalName() + "-check.xhtml");
 
+            data.setAttribute("statsLink", "href", federation.getTechnicalName() + "-stats.xhtml");
+
             if (StringUtils.isNotBlank(federation.getLegalWebsite()))
             {
                 data.setEscapedAttribute("legalLink", "href", federation.getLegalWebsite());
diff --git a/src/fr/devinsy/statoolinfos/htmlize/FederationStatsPage.java b/src/fr/devinsy/statoolinfos/htmlize/FederationStatsPage.java
index a96c0b1..77a320e 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/FederationStatsPage.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/FederationStatsPage.java
@@ -110,7 +110,7 @@ public class FederationStatsPage
             BreadcrumbTrail trail = new BreadcrumbTrail();
             String page = WebCharterView.build(content, trail);
 
-            FileUtils.write(new File(htmlizeDirectory, "federationStats.xhtml"), page, StandardCharsets.UTF_8);
+            FileUtils.write(new File(htmlizeDirectory, federation.getTechnicalName() + "-stats.xhtml"), page, StandardCharsets.UTF_8);
         }
         catch (XidynException exception)
         {
diff --git a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java
index 7f0c0eb..f9470dd 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java
@@ -186,6 +186,9 @@ public class Htmlizer
             File circle = new File(targetDirectory, "circle-icons");
             circle.mkdirs();
 
+            StatoolInfosUtils.copyRessource(source + "circle-icons/barchart.svg", circle);
+            StatoolInfosUtils.copyRessource(source + "circle-icons/barchart-mono.svg", circle);
+
             StatoolInfosUtils.copyRessource(source + "circle-icons/booklet.svg", circle);
             StatoolInfosUtils.copyRessource(source + "circle-icons/booklet-mono.svg", circle);
 
@@ -198,6 +201,9 @@ public class Htmlizer
             StatoolInfosUtils.copyRessource(source + "circle-icons/contacts.svg", circle);
             StatoolInfosUtils.copyRessource(source + "circle-icons/contacts-mono.svg", circle);
 
+            StatoolInfosUtils.copyRessource(source + "circle-icons/creditcard.svg", circle);
+            StatoolInfosUtils.copyRessource(source + "circle-icons/creditcard-mono.svg", circle);
+
             StatoolInfosUtils.copyRessource(source + "circle-icons/cruise.svg", circle);
             StatoolInfosUtils.copyRessource(source + "circle-icons/cruise-mono.svg", circle);
 
@@ -207,9 +213,6 @@ public class Htmlizer
             StatoolInfosUtils.copyRessource(source + "circle-icons/document.svg", circle);
             StatoolInfosUtils.copyRessource(source + "circle-icons/document-mono.svg", circle);
 
-            StatoolInfosUtils.copyRessource(source + "circle-icons/creditcard.svg", circle);
-            StatoolInfosUtils.copyRessource(source + "circle-icons/creditcard-mono.svg", circle);
-
             StatoolInfosUtils.copyRessource(source + "circle-icons/email.svg", circle);
             StatoolInfosUtils.copyRessource(source + "circle-icons/email-mono.svg", circle);
 
diff --git a/src/fr/devinsy/statoolinfos/htmlize/WebCharterView.java b/src/fr/devinsy/statoolinfos/htmlize/WebCharterView.java
index e607a9a..85dbbfd 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/WebCharterView.java
+++ b/src/fr/devinsy/statoolinfos/htmlize/WebCharterView.java
@@ -85,6 +85,7 @@ public class WebCharterView
             data.setContent("lastUpdateDate", LocalDateTime.now().format(DateTimeFormatter.ofPattern("dd/MM/yyyy HH':'mm", Locale.FRANCE)));
             data.setContent("webCharterContent", XidynUtils.extractBodyContent(content));
             data.setContent("breadcrumbTrail", trail.toString());
+            data.setAttribute("federationStatsButton", "href", HtmlizerContext.instance().getFederation().getTechnicalName() + "-stats.xhtml");
 
             result = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/webCharterView.xhtml", data).toString();
         }
diff --git a/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml b/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
index bb2db20..76627fe 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/federation.xhtml
@@ -31,6 +31,7 @@
 			<a id="technicalDocLink" href="#"><img id="technicalDocLinkImg" src="circle-icons/tools.svg" class="disabled" title="Documentation technique"/></a>
 			<a id="rawCheckLink" href="#"><img id="rawCheckLinkImg" src="circle-icons/clipboard-mono.svg" title="Fichier propriétés analysé"/></a>
 			<a id="rawLink" href="#"><img id="rawLinkImg" src="circle-icons/document-mono.svg" title="Fichier propriétés"/></a>
+			<a id="statsLink" href="#"><img id="statsLinkImg" src="circle-icons/barchart-mono.svg" title="Statistiques"/></a>
 		</div>
 		<br/>
 		</div>
diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart-mono.svg b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart-mono.svg
new file mode 100644
index 0000000..94385d7
--- /dev/null
+++ b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart-mono.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="85.333336"
+   height="85.333336"
+   viewBox="0 0 85.333336 85.333336"
+   sodipodi:docname="x.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath18"><path
+         d="M 0,64 H 64 V 0 H 0 Z"
+         id="path16"
+         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="830"
+     inkscape:window-height="480"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="2.7656249"
+     inkscape:cx="42.666668"
+     inkscape:cy="42.666668"
+     inkscape:window-x="673"
+     inkscape:window-y="221"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="Elegant_circle-icons"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"><g
+       id="g12"><g
+         id="g14"
+         clip-path="url(#clipPath18)"><g
+           id="g20"
+           transform="translate(34,53)"><path
+             d="M 0,0 H -4 C -6.209,0 -8,-1.791 -8,-4 V -36 H 4 V -4 C 4,-1.791 2.209,0 0,0"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path22"
+             inkscape:connector-curvature="0" /></g><g
+           id="g24"
+           transform="translate(50,33)"><path
+             d="m 0,0 h -4 c -2.209,0 -4,-1.791 -4,-4 v -12 h 8 c 2.209,0 4,1.791 4,4 v 8 C 4,-1.791 2.209,0 0,0"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path26"
+             inkscape:connector-curvature="0" /></g><g
+           id="g28"
+           transform="translate(18,38)"><path
+             d="m 0,0 h -4 c -2.209,0 -4,-1.791 -4,-4 v -13 c 0,-2.209 1.791,-4 4,-4 H 4 V -4 C 4,-1.791 2.209,0 0,0"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path30"
+             inkscape:connector-curvature="0" /></g><g
+           id="g32"
+           transform="translate(54,21)"><path
+             d="m 0,0 c 0,-2.209 -1.791,-4 -4,-4 h -8 V 8 c 0,2.209 1.791,4 4,4 h 4 c 2.209,0 4,-1.791 4,-4 z m -16,-4 h -12 v 32 c 0,2.209 1.791,4 4,4 h 4 c 2.209,0 4,-1.791 4,-4 z m -16,0 h -8 c -2.209,0 -4,1.791 -4,4 v 13 c 0,2.209 1.791,4 4,4 h 4 c 2.209,0 4,-1.791 4,-4 z m 10,47 c -17.673,0 -32,-14.327 -32,-32 0,-17.673 14.327,-32 32,-32 17.673,0 32,14.327 32,32 0,17.673 -14.327,32 -32,32"
+             style="fill:#4f5d73;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path34"
+             inkscape:connector-curvature="0" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart.svg b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart.svg
new file mode 100644
index 0000000..cfe2b06
--- /dev/null
+++ b/src/fr/devinsy/statoolinfos/htmlize/stuff/circle-icons/barchart.svg
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   xml:space="preserve"
+   width="85.333336"
+   height="85.333336"
+   viewBox="0 0 85.333336 85.333336"
+   sodipodi:docname="x.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath18"><path
+         d="M 0,64 H 64 V 0 H 0 Z"
+         id="path16"
+         inkscape:connector-curvature="0" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath30"><path
+         d="M 10,51 H 54 V 15 H 10 Z"
+         id="path28"
+         inkscape:connector-curvature="0" /></clipPath></defs><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="830"
+     inkscape:window-height="480"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="2.7656249"
+     inkscape:cx="43.389832"
+     inkscape:cy="41.22034"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g10" /><g
+     id="g10"
+     inkscape:groupmode="layer"
+     inkscape:label="Elegant_circle-icons"
+     transform="matrix(1.3333333,0,0,-1.3333333,0,85.333333)"><g
+       id="g12"><g
+         id="g14"
+         clip-path="url(#clipPath18)"><g
+           id="g20"
+           transform="translate(64,32)"><path
+             d="m 0,0 c 0,-17.673 -14.327,-32 -32,-32 -17.673,0 -32,14.327 -32,32 0,17.673 14.327,32 32,32 C -14.327,32 0,17.673 0,0"
+             style="fill:#4f5d73;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path22"
+             inkscape:connector-curvature="0" /></g><g
+           id="g24"><g
+             id="g26" /><g
+             id="g46"><g
+               clip-path="url(#clipPath30)"
+               id="g44"
+               style="opacity:0.19999701"><g
+                 transform="translate(18,36)"
+                 id="g34"><path
+                   d="m 0,0 h -4 c -2.209,0 -4,-1.791 -4,-4 v -13 c 0,-2.209 1.791,-4 4,-4 H 4 V -4 C 4,-1.791 2.209,0 0,0"
+                   style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path32"
+                   inkscape:connector-curvature="0" /></g><g
+                 transform="translate(34,51)"
+                 id="g38"><path
+                   d="M 0,0 H -4 C -6.209,0 -8,-1.791 -8,-4 V -36 H 4 V -4 C 4,-1.791 2.209,0 0,0"
+                   style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path36"
+                   inkscape:connector-curvature="0" /></g><g
+                 transform="translate(50,31)"
+                 id="g42"><path
+                   d="m 0,0 h -4 c -2.209,0 -4,-1.791 -4,-4 v -12 h 8 c 2.209,0 4,1.791 4,4 v 8 C 4,-1.791 2.209,0 0,0"
+                   style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+                   id="path40"
+                   inkscape:connector-curvature="0" /></g></g></g></g><g
+           id="g48"
+           transform="translate(18,38)"><path
+             d="m 0,0 h -4 c -2.209,0 -4,-1.791 -4,-4 v -13 c 0,-2.209 1.791,-4 4,-4 H 4 V -4 C 4,-1.791 2.209,0 0,0"
+             style="fill:#e0e0d1;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path50"
+             inkscape:connector-curvature="0" /></g><g
+           id="g52"
+           transform="translate(34,53)"><path
+             d="M 0,0 H -4 C -6.209,0 -8,-1.791 -8,-4 V -36 H 4 V -4 C 4,-1.791 2.209,0 0,0"
+             style="fill:#76c2af;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path54"
+             inkscape:connector-curvature="0" /></g><g
+           id="g56"
+           transform="translate(50,33)"><path
+             d="m 0,0 h -4 c -2.209,0 -4,-1.791 -4,-4 v -12 h 8 c 2.209,0 4,1.791 4,4 v 8 C 4,-1.791 2.209,0 0,0"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             id="path58"
+             inkscape:connector-curvature="0" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/src/fr/devinsy/statoolinfos/htmlize/webCharterView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/webCharterView.xhtml
index ad501c1..5c82336 100644
--- a/src/fr/devinsy/statoolinfos/htmlize/webCharterView.xhtml
+++ b/src/fr/devinsy/statoolinfos/htmlize/webCharterView.xhtml
@@ -30,7 +30,7 @@
 			<a id="" href="socialNetworks.xhtml" class="button" style="width: 130px;">Réseaux sociaux</a>
 			<a id="propertiesRawButton" href="propertiesFiles.xhtml" class="button">Fichiers</a>
 			<a id="propertiesRawButton" href="propertyStats.xhtml" class="button">Propriétés</a>
-			<a id="" href="federationStats.xhtml" class="button">Statistiques</a>
+			<a id="federationStatsButton" href="federationStats.xhtml" class="button">Statistiques</a>
 		</div>
 		
 		<div id="breadcrumbTrail" style="margin: 5px;">n/a > n/a</div>