Added TOOLING in service install type graphics.
This commit is contained in:
parent
c378b3a83d
commit
2ce73a5d27
7 changed files with 35 additions and 12 deletions
|
@ -77,6 +77,7 @@ public class Service extends PathPropertyList
|
|||
{
|
||||
DISTRIBUTION,
|
||||
PROVIDER,
|
||||
TOOLING,
|
||||
PACKAGE,
|
||||
CLONEREPO,
|
||||
ARCHIVE,
|
||||
|
|
|
@ -476,8 +476,9 @@ public class Htmlizer
|
|||
pie.add("Distribution", stats.getDistributionCount(), ChartColor.PURPLE);
|
||||
pie.add("Fournisseur", stats.getProviderCount(), ChartColor.GREEN);
|
||||
pie.add("Paquet", stats.getPackageCount(), ChartColor.YELLOW);
|
||||
pie.add("Dépôt cloné", stats.getClonerepoCount(), ChartColor.ORANGE);
|
||||
pie.add("Archive", stats.getArchiveCount(), ChartColor.RED);
|
||||
pie.add("Outillage", stats.getToolingCount(), ChartColor.ORANGE);
|
||||
pie.add("Dépôt cloné", stats.getClonerepoCount(), ChartColor.RED);
|
||||
pie.add("Archive", stats.getArchiveCount(), ChartColor.VIOLET);
|
||||
pie.add("Sources", stats.getSourcesCount(), ChartColor.GREY);
|
||||
pie.add("Containeur", stats.getContainerCount(), ChartColor.TURQUOISE);
|
||||
pie.add("Inconnu", stats.getUnknownCount(), ChartColor.BLUE);
|
||||
|
|
|
@ -123,6 +123,14 @@ public class OrganizationStatsPage
|
|||
data.setContent("registrationClientTypeChart", DoughnutChartView.build(pie));
|
||||
}
|
||||
|
||||
//
|
||||
// Metric metric = organization.getMetric("metrics.http.hits");
|
||||
// if ((metric != null) && (!metric.isEmpty()))
|
||||
// {
|
||||
// data.setContent("fooChart", graphicIndex++,
|
||||
// BarMonthsChartView.build(metric));
|
||||
// }
|
||||
|
||||
//
|
||||
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/organizationStats.xhtml", data).toString();
|
||||
|
||||
|
|
|
@ -25,14 +25,17 @@ public enum ChartColor
|
|||
{
|
||||
// https://html-color-codes.info/
|
||||
|
||||
RED("rgb(255, 99, 132)"),
|
||||
ORANGE("rgb(255, 159, 64)"),
|
||||
YELLOW("rgb(255, 205, 86)"),
|
||||
TURQUOISE("rgb(64, 224, 208)"),
|
||||
GREEN("rgb(75, 192, 192)"),
|
||||
BLUE("rgb(54, 162, 235)"),
|
||||
PURPLE("rgb(153, 102, 255)"),
|
||||
GREY("rgb(201, 203, 207)");
|
||||
GREEN0("rgb(0, 128, 0)"), // #008000
|
||||
GREEN("rgb(75, 192, 192)"), // #4bc0c0
|
||||
YELLOW("rgb(255, 205, 86)"), // #ffcd56
|
||||
ORANGE("rgb(255, 159, 64)"), // #ff9f40
|
||||
RED("rgb(255, 99, 132)"), // #ff6384
|
||||
HOTPINK("rgb(255, 105, 180)"), // #FF69B4
|
||||
VIOLET("rgb(190,129,247)"), // #be81f7
|
||||
PURPLE("rgb(153, 102, 255)"), // #9966ff
|
||||
BLUE("rgb(54, 162, 235)"), // #36a2eb
|
||||
TURQUOISE("rgb(64, 224, 208)"), // #40e0d0
|
||||
GREY("rgb(201, 203, 207)"); // #c9cbcf
|
||||
|
||||
private String code;
|
||||
private String light;
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
<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 id="serviceInstallTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
|
||||
<div id="serviceInstallTypeChart" class="chartborder" style="width: 250px; height: 230px; display: inline-block; vertical-align: top;"/>
|
||||
<div id="serviceCountryChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
<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 id="serviceInstallTypeChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
|
||||
<div id="serviceInstallTypeChart" class="chartborder" style="width: 250px; height: 230px; display: inline-block; vertical-align: top;"/>
|
||||
<div id="serviceCountryChart" class="chartborder" style="width: 250px; height: 200px; display: inline-block;"/>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
|
|
@ -28,6 +28,7 @@ public class ServiceInstallTypeStats
|
|||
private long distributionCount;
|
||||
private long providerCount;
|
||||
private long packageCount;
|
||||
private long toolingCount;
|
||||
private long clonerepoCount;
|
||||
private long archiveCount;
|
||||
private long sourcesCount;
|
||||
|
@ -42,6 +43,7 @@ public class ServiceInstallTypeStats
|
|||
this.distributionCount = 0;
|
||||
this.providerCount = 0;
|
||||
this.packageCount = 0;
|
||||
this.toolingCount = 0;
|
||||
this.clonerepoCount = 0;
|
||||
this.archiveCount = 0;
|
||||
this.sourcesCount = 0;
|
||||
|
@ -84,6 +86,11 @@ public class ServiceInstallTypeStats
|
|||
return this.sourcesCount;
|
||||
}
|
||||
|
||||
public long getToolingCount()
|
||||
{
|
||||
return this.toolingCount;
|
||||
}
|
||||
|
||||
public long getUnknownCount()
|
||||
{
|
||||
return this.unknownCount;
|
||||
|
@ -108,6 +115,9 @@ public class ServiceInstallTypeStats
|
|||
case PACKAGE:
|
||||
this.packageCount += 1;
|
||||
break;
|
||||
case TOOLING:
|
||||
this.toolingCount += 1;
|
||||
break;
|
||||
case CLONEREPO:
|
||||
this.clonerepoCount += 1;
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue