statool/statoolinfosweb
statool/statoolinfosweb
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Activity

Added organization stats page.

Browse source
This commit is contained in:
Christian P. MOMON 2020-11-21 07:35:59 +01:00
parent ff1369b10b
commit 35a2987447
9 changed files with 213 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/fr/devinsy/statoolinfos/htmlize/FederationStatsPage.java
View file

@ -73,7 +73,7 @@ public class FederationStatsPage
//
{
RegistrationStats stats = StatAgent.statRegistrationTypes(federation);
RegistrationStats stats = StatAgent.statRegistrationTypes(federation.getAllServices());
BarChart bar = Htmlizer.toBarChart(stats);
data.setContent("registrationTypeChart", BarChartView.build(bar));

26
src/fr/devinsy/statoolinfos/htmlize/Htmlizer.java
View file

@ -29,6 +29,7 @@ import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.HtmlizerContext;
import fr.devinsy.statoolinfos.core.Category;
import fr.devinsy.statoolinfos.core.Configuration;
import fr.devinsy.statoolinfos.core.Organization;
import fr.devinsy.statoolinfos.core.Organizations;
import fr.devinsy.statoolinfos.core.Services;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
@ -270,9 +271,10 @@ public class Htmlizer
AboutPage.build();
EditoPage.build();
FederationStatsPage.build();
FederationPage.build();
FederationStatsPage.build();
OrganizationPage.buildAll();
OrganizationStatsPage.buildAll();
ServicePage.buildAll();
ServicesPage.build();
PropertyFileCheckPage.buildAll();
@ -342,6 +344,28 @@ public class Htmlizer
return result;
}
/**
* Htmlize organization turnout chart.
*
* @param organization
* the organization
* @return the string
* @throws StatoolInfosException
* the statool infos exception
*/
public static String htmlizeOrganizationTurnoutChart(final Organization organization) throws StatoolInfosException
{
String result;
Organizations organizations = new Organizations();
organizations.add(organization);
result = htmlizeOrganizationTurnoutChart(organizations);
//
return result;
}
/**
* Htmlize organization turnout chart.
*

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

@ -120,6 +120,8 @@ public class OrganizationPage
data.setAttribute("rawLink", "href", organization.getTechnicalName() + ".properties");
data.setAttribute("rawCheckLink", "href", organization.getTechnicalName() + "-check.xhtml");
data.setAttribute("statsLink", "href", organization.getTechnicalName() + "-stats.xhtml");
if (StringUtils.isNotBlank(organization.getLegalWebsite()))
{
data.setEscapedAttribute("legalLink", "href", organization.getLegalWebsite());

138
src/fr/devinsy/statoolinfos/htmlize/OrganizationStatsPage.java Normal file
View file

@ -0,0 +1,138 @@
/*
* Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org>
*
* This file is part of StatoolInfos, simple service statistics tool.
*
* StatoolInfos is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* StatoolInfos is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with StatoolInfos. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.devinsy.statoolinfos.htmlize;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import fr.devinsy.statoolinfos.HtmlizerContext;
import fr.devinsy.statoolinfos.core.Federation;
import fr.devinsy.statoolinfos.core.Organization;
import fr.devinsy.statoolinfos.core.StatoolInfosException;
import fr.devinsy.statoolinfos.htmlize.charts.BarChart;
import fr.devinsy.statoolinfos.htmlize.charts.BarChartView;
import fr.devinsy.statoolinfos.htmlize.charts.ChartColor;
import fr.devinsy.statoolinfos.htmlize.charts.DoughnutChartView;
import fr.devinsy.statoolinfos.htmlize.charts.PieChart;
import fr.devinsy.statoolinfos.stats.StatAgent;
import fr.devinsy.statoolinfos.stats.services.RegistrationStats;
import fr.devinsy.xidyn.XidynException;
import fr.devinsy.xidyn.data.TagDataManager;
import fr.devinsy.xidyn.presenters.PresenterUtils;
/**
* The Class SocialNetworksPage.
*/
public class OrganizationStatsPage
{
private static Logger logger = LoggerFactory.getLogger(OrganizationStatsPage.class);
/**
* Builds the.
*
* @throws StatoolInfosException
* the statool infos exception
* @throws IOException
* Signals that an I/O exception has occurred.
*/
public static void buildAll() throws StatoolInfosException, IOException
{
Federation federation = HtmlizerContext.instance().getFederation();
for (Organization organization : federation.getOrganizations())
{
htmlize(organization);
}
}
/**
* Builds the.
*
* @throws StatoolInfosException
* the statool infos exception
* @throws IOException
* Signals that an I/O exception has occurred.
*/
public static void htmlize(final Organization organization) throws StatoolInfosException, IOException
{
try
{
logger.debug("Building organization stats page {}…");
File htmlizeDirectory = HtmlizerContext.instance().getHtmlizeDirectory();
TagDataManager data = new TagDataManager();
data.setContent("turnoutChart", Htmlizer.htmlizeOrganizationTurnoutChart(organization));
data.setContent("hostServerTypeChart", Htmlizer.htmlizeHostServerTypeChart(organization.getServices()));
data.setContent("hostProviderTypeChart", Htmlizer.htmlizeHostProviderTypeChart(organization.getServices()));
//
{
RegistrationStats stats = StatAgent.statRegistrationTypes(organization.getServices());
BarChart bar = Htmlizer.toBarChart(stats);
data.setContent("registrationTypeChart", BarChartView.build(bar));
PieChart pie = new PieChart("Sans");
pie.setLegendVisible(false);
pie.add("Sans", stats.getNoneCount(), ChartColor.GREEN);
pie.add("Autre", stats.getCount() - stats.getNoneCount(), ChartColor.BLUE);
data.setContent("registrationNoneTypeChart", DoughnutChartView.build(pie));
pie = new PieChart("Libre");
pie.setLegendVisible(false);
pie.add("Sans", stats.getFreeCount(), ChartColor.YELLOW);
pie.add("Libre", stats.getCount() - stats.getFreeCount(), ChartColor.BLUE);
data.setContent("registrationFreeTypeChart", DoughnutChartView.build(pie));
pie = new PieChart("Membre");
pie.setLegendVisible(false);
pie.add("Sans", stats.getMemberCount(), ChartColor.ORANGE);
pie.add("Membre", stats.getCount() - stats.getMemberCount(), ChartColor.BLUE);
data.setContent("registrationMemberTypeChart", DoughnutChartView.build(pie));
pie = new PieChart("Client");
pie.setLegendVisible(false);
pie.add("Sans", stats.getClientCount(), ChartColor.RED);
pie.add("Client", stats.getCount() - stats.getClientCount(), ChartColor.BLUE);
data.setContent("registrationClientTypeChart", DoughnutChartView.build(pie));
}
//
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/organizationStats.xhtml", data).toString();
//
BreadcrumbTrail trail = new BreadcrumbTrail();
trail.add(organization.getName(), organization.getTechnicalName() + ".xhtml");
String page = WebCharterView.build(content, trail);
FileUtils.write(new File(htmlizeDirectory, organization.getTechnicalName() + "-stats.xhtml"), page, StandardCharsets.UTF_8);
}
catch (XidynException exception)
{
throw new StatoolInfosException("Error building organization stats page: " + exception.getMessage(), exception);
}
}
}

2
src/fr/devinsy/statoolinfos/htmlize/ServicePage.java
View file

@ -127,6 +127,8 @@ public class ServicePage
data.setAttribute("rawLink", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + ".properties");
data.setAttribute("rawCheckLink", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + "-check.xhtml");
data.setAttribute("statsLink", "href", organization.getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml");
if (StringUtils.isNotBlank(service.getLegalWebsite()))
{
data.setEscapedAttribute("legalLink", "href", service.getLegalWebsite());

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

@ -32,6 +32,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>Nombre de services : <span id="serviceCount">n/a</span></div>

41
src/fr/devinsy/statoolinfos/htmlize/organizationStats.xhtml Normal file
View file

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>StatoolInfos</title>
<meta charset="UTF-8" />
<meta name="keywords" content="statoolinfos,devinsy,federation" />
<link rel="shortcut icon" href="favicon.ico" type="image/x-icon" />
<link rel="stylesheet" type="text/css" href="statoolinfos.css" />
<script src="sorttable.js" />
<script src="Chart.bundle.min.js"></script>
</head>
<body>
<div class="row center_table" style="width: 1100px;">
<h2 id="title" class="center">Statistiques</h2>
<div>
<div>
<div id="turnoutChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
</div>
<div>
<div id="hostServerTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
<div id="hostProviderTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
</div>
<div class="row">
<div id="registrationTypeChart" class="column chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
<div class="column">
<div class="row">
<div id="registrationNoneTypeChart" class="chartborder" style="width: 122px; height: 97px; display: inline-block;"/>
<div id="registrationFreeTypeChart" class="chartborder" style="width: 122px; height: 97px; display: inline-block;"/>
</div>
<div class="row">
<div id="registrationMemberTypeChart" class="chartborder" style="width: 122px; height: 97px; display: inline-block;"/>
<div id="registrationClientTypeChart" class="chartborder" style="width: 122px; height: 97px; display: inline-block;"/>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

1
src/fr/devinsy/statoolinfos/htmlize/service.xhtml
View file

@ -40,6 +40,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>
<div class="content_infos" style="margin: 5px;">
Logiciel :

4
src/fr/devinsy/statoolinfos/stats/StatAgent.java
View file

@ -294,14 +294,14 @@ public class StatAgent
* the federation
* @return the registration stats
*/
public static RegistrationStats statRegistrationTypes(final Federation federation)
public static RegistrationStats statRegistrationTypes(final Services services)
{
RegistrationStats result;
result = new RegistrationStats();
//
for (Service service : federation.getAllServices())
for (Service service : services)
{
if (service.isRegistrationNone())
{