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

Improved graphics.

Browse source
This commit is contained in:
Christian P. MOMON 2021-02-28 03:31:57 +01:00
parent 5e1f2d68d4
commit 37a04848ef
5 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -109,7 +109,6 @@ public class FederationStatsPage
data.setContent("registrationClientTypeChart", DoughnutChartView.build(pie)); data.setContent("registrationClientTypeChart", DoughnutChartView.build(pie));
} }
data.setContent("serviceCountMonthChart", Htmlizer.htmlizeServiceCountMonthChart(federation));
data.setContent("serviceCountYearChart", Htmlizer.htmlizeServiceCountYearChart(federation)); data.setContent("serviceCountYearChart", Htmlizer.htmlizeServiceCountYearChart(federation));
data.setContent("serviceDateStatusChart", Htmlizer.htmlizeServiceDateStatusChart(federation.getAllServices())); data.setContent("serviceDateStatusChart", Htmlizer.htmlizeServiceDateStatusChart(federation.getAllServices()));

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

@ -267,7 +267,7 @@ public class Htmlizer
ChartColors colors = ChartColor.valueList(); ChartColors colors = ChartColor.valueList();
colors.remove(ChartColor.BLUE); colors.remove(ChartColor.BLUE);
PieChart pie = new PieChart("Distribution des catégories"); PieChart pie = new PieChart("Répartition des services par catégorie");
int index = 0; int index = 0;
while ((index < stats.size() && (index < 10))) while ((index < stats.size() && (index < 10)))
{ {
@ -685,7 +685,7 @@ public class Htmlizer
BarChart chart; BarChart chart;
chart = new BarChart("Nombre de services déclarés (mois)"); chart = new BarChart("Nombre de services (mois)");
chart.addDataset("Services"); chart.addDataset("Services");
YearMonth now = YearMonth.now(); YearMonth now = YearMonth.now();
@ -862,7 +862,7 @@ public class Htmlizer
BarChart chart; BarChart chart;
chart = new BarChart("Nombre de services déclarés"); chart = new BarChart("Nombre de services");
chart.addDataset("Services"); chart.addDataset("Services");
int now = LocalDate.now().getYear(); int now = LocalDate.now().getYear();
@ -919,7 +919,7 @@ public class Htmlizer
{ {
String result; String result;
PieChart pie = new PieChart("Services avec dates"); PieChart pie = new PieChart("Services avec ou son date");
long filled = 0; long filled = 0;
long unfilled = 0; long unfilled = 0;
@ -1037,7 +1037,7 @@ public class Htmlizer
ChartColors colors = ChartColor.valueList(); ChartColors colors = ChartColor.valueList();
colors.remove(ChartColor.BLUE); colors.remove(ChartColor.BLUE);
PieChart pie = new PieChart("Distribution des logiciels"); PieChart pie = new PieChart("Répartition des services par logiciel");
int index = 0; int index = 0;
while ((index < stats.size() && (index < 10))) while ((index < stats.size() && (index < 10)))
{ {

1
src/fr/devinsy/statoolinfos/htmlize/OrganizationStatsPage.java
View file

@ -84,7 +84,6 @@ public class OrganizationStatsPage
TagDataManager data = new TagDataManager(); TagDataManager data = new TagDataManager();
data.setContent("serviceCountMonthChart", Htmlizer.htmlizeServiceCountMonthChart(organization));
data.setContent("serviceCountYearChart", Htmlizer.htmlizeServiceCountYearChart(organization)); data.setContent("serviceCountYearChart", Htmlizer.htmlizeServiceCountYearChart(organization));
data.setContent("serviceDateStatusChart", Htmlizer.htmlizeServiceDateStatusChart(organization.getServices())); data.setContent("serviceDateStatusChart", Htmlizer.htmlizeServiceDateStatusChart(organization.getServices()));

2
src/fr/devinsy/statoolinfos/htmlize/federationStats.xhtml
View file

@ -14,6 +14,7 @@
<div class="row center_table" style="width: 1100px;"> <div class="row center_table" style="width: 1100px;">
<h2 id="title" class="center">Statistiques</h2> <h2 id="title" class="center">Statistiques</h2>
<p>Les graphiques ci-dessous sont générés à partir de données déclarées et potentiellement partielles.</p>
<div> <div>
<div> <div>
<div id="turnoutChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/> <div id="turnoutChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
@ -44,7 +45,6 @@
</div> </div>
</div> </div>
<div> <div>
<div id="serviceCountMonthChart" class="chartborder" style="width: 500px; height: 200px; display: inline-block;"/>
<div id="serviceDateStatusChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/> <div id="serviceDateStatusChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
<div id="serviceCountYearChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/> <div id="serviceCountYearChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
</div> </div>

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

@ -38,7 +38,6 @@
</div> </div>
</div> </div>
<div> <div>
<div id="serviceCountMonthChart" class="chartborder" style="width: 500px; height: 200px; display: inline-block;"/>
<div id="serviceDateStatusChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/> <div id="serviceDateStatusChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
<div id="serviceCountYearChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/> <div id="serviceCountYearChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
</div> </div>