Changed metrics menu entry from 2020 to 2022.
This commit is contained in:
parent
34550c8ab4
commit
3e328d186c
5 changed files with 34 additions and 34 deletions
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
|
* Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
|
||||||
*
|
*
|
||||||
* This file is part of StatoolInfos, simple service statistics tool.
|
* This file is part of StatoolInfos, simple service statistics tool.
|
||||||
*
|
*
|
||||||
|
@ -41,8 +41,8 @@ public class FederationMetricMenuView
|
||||||
{
|
{
|
||||||
FULL,
|
FULL,
|
||||||
LAST,
|
LAST,
|
||||||
Y2020,
|
Y2021,
|
||||||
Y2021;
|
Y2022;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the name.
|
* Gets the name.
|
||||||
|
@ -188,11 +188,11 @@ public class FederationMetricMenuView
|
||||||
filename = String.format("%s-metrics-%s-%s-last.xhtml", federation.getLocalFileBaseName(), type.getName(), view.getName());
|
filename = String.format("%s-metrics-%s-%s-last.xhtml", federation.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
data.setAttribute("lastPeriodButton", "href", filename);
|
data.setAttribute("lastPeriodButton", "href", filename);
|
||||||
|
|
||||||
filename = String.format("%s-metrics-%s-%s-2020.xhtml", federation.getLocalFileBaseName(), type.getName(), view.getName());
|
|
||||||
data.setAttribute("2020PeriodButton", "href", filename);
|
|
||||||
|
|
||||||
filename = String.format("%s-metrics-%s-%s-2021.xhtml", federation.getLocalFileBaseName(), type.getName(), view.getName());
|
filename = String.format("%s-metrics-%s-%s-2021.xhtml", federation.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
data.setAttribute("2021PeriodButton", "href", filename);
|
data.setAttribute("2021PeriodButton", "href", filename);
|
||||||
|
|
||||||
|
filename = String.format("%s-metrics-%s-%s-2022.xhtml", federation.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
|
data.setAttribute("2022PeriodButton", "href", filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -240,14 +240,14 @@ public class FederationMetricMenuView
|
||||||
{
|
{
|
||||||
data.appendAttribute("lastPeriodButton", "class", "button selected");
|
data.appendAttribute("lastPeriodButton", "class", "button selected");
|
||||||
}
|
}
|
||||||
else if (period == PeriodMenu.Y2020)
|
|
||||||
{
|
|
||||||
data.appendAttribute("2020PeriodButton", "class", "button selected");
|
|
||||||
}
|
|
||||||
else if (period == PeriodMenu.Y2021)
|
else if (period == PeriodMenu.Y2021)
|
||||||
{
|
{
|
||||||
data.appendAttribute("2021PeriodButton", "class", "button selected");
|
data.appendAttribute("2021PeriodButton", "class", "button selected");
|
||||||
}
|
}
|
||||||
|
else if (period == PeriodMenu.Y2022)
|
||||||
|
{
|
||||||
|
data.appendAttribute("2022PeriodButton", "class", "button selected");
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml", data).toString();
|
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml", data).toString();
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
|
* Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
|
||||||
*
|
*
|
||||||
* This file is part of StatoolInfos, simple service statistics tool.
|
* This file is part of StatoolInfos, simple service statistics tool.
|
||||||
*
|
*
|
||||||
|
@ -41,8 +41,8 @@ public class OrganizationMetricMenuView
|
||||||
{
|
{
|
||||||
FULL,
|
FULL,
|
||||||
LAST,
|
LAST,
|
||||||
Y2020,
|
Y2021,
|
||||||
Y2021;
|
Y2022;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the name.
|
* Gets the name.
|
||||||
|
@ -188,11 +188,11 @@ public class OrganizationMetricMenuView
|
||||||
filename = String.format("%s-metrics-%s-%s-last.xhtml", organization.getLocalFileBaseName(), type.getName(), view.getName());
|
filename = String.format("%s-metrics-%s-%s-last.xhtml", organization.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
data.setAttribute("lastPeriodButton", "href", filename);
|
data.setAttribute("lastPeriodButton", "href", filename);
|
||||||
|
|
||||||
filename = String.format("%s-metrics-%s-%s-2020.xhtml", organization.getLocalFileBaseName(), type.getName(), view.getName());
|
|
||||||
data.setAttribute("2020PeriodButton", "href", filename);
|
|
||||||
|
|
||||||
filename = String.format("%s-metrics-%s-%s-2021.xhtml", organization.getLocalFileBaseName(), type.getName(), view.getName());
|
filename = String.format("%s-metrics-%s-%s-2021.xhtml", organization.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
data.setAttribute("2021PeriodButton", "href", filename);
|
data.setAttribute("2021PeriodButton", "href", filename);
|
||||||
|
|
||||||
|
filename = String.format("%s-metrics-%s-%s-2022.xhtml", organization.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
|
data.setAttribute("2022PeriodButton", "href", filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -240,14 +240,14 @@ public class OrganizationMetricMenuView
|
||||||
{
|
{
|
||||||
data.appendAttribute("lastPeriodButton", "class", "button selected");
|
data.appendAttribute("lastPeriodButton", "class", "button selected");
|
||||||
}
|
}
|
||||||
else if (period == PeriodMenu.Y2020)
|
|
||||||
{
|
|
||||||
data.appendAttribute("2020PeriodButton", "class", "button selected");
|
|
||||||
}
|
|
||||||
else if (period == PeriodMenu.Y2021)
|
else if (period == PeriodMenu.Y2021)
|
||||||
{
|
{
|
||||||
data.appendAttribute("2021PeriodButton", "class", "button selected");
|
data.appendAttribute("2021PeriodButton", "class", "button selected");
|
||||||
}
|
}
|
||||||
|
else if (period == PeriodMenu.Y2022)
|
||||||
|
{
|
||||||
|
data.appendAttribute("2022PeriodButton", "class", "button selected");
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml", data).toString();
|
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml", data).toString();
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (C) 2021 Christian Pierre MOMON <christian@momon.org>
|
* Copyright (C) 2021-2023 Christian Pierre MOMON <christian@momon.org>
|
||||||
*
|
*
|
||||||
* This file is part of StatoolInfos, simple service statistics tool.
|
* This file is part of StatoolInfos, simple service statistics tool.
|
||||||
*
|
*
|
||||||
|
@ -41,8 +41,8 @@ public class ServiceMetricMenuView
|
||||||
{
|
{
|
||||||
FULL,
|
FULL,
|
||||||
LAST,
|
LAST,
|
||||||
Y2020,
|
Y2021,
|
||||||
Y2021;
|
Y2022;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets the name.
|
* Gets the name.
|
||||||
|
@ -188,11 +188,11 @@ public class ServiceMetricMenuView
|
||||||
filename = String.format("%s-metrics-%s-%s-last.xhtml", service.getLocalFileBaseName(), type.getName(), view.getName());
|
filename = String.format("%s-metrics-%s-%s-last.xhtml", service.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
data.setAttribute("lastPeriodButton", "href", filename);
|
data.setAttribute("lastPeriodButton", "href", filename);
|
||||||
|
|
||||||
filename = String.format("%s-metrics-%s-%s-2020.xhtml", service.getLocalFileBaseName(), type.getName(), view.getName());
|
|
||||||
data.setAttribute("2020PeriodButton", "href", filename);
|
|
||||||
|
|
||||||
filename = String.format("%s-metrics-%s-%s-2021.xhtml", service.getLocalFileBaseName(), type.getName(), view.getName());
|
filename = String.format("%s-metrics-%s-%s-2021.xhtml", service.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
data.setAttribute("2021PeriodButton", "href", filename);
|
data.setAttribute("2021PeriodButton", "href", filename);
|
||||||
|
|
||||||
|
filename = String.format("%s-metrics-%s-%s-2022.xhtml", service.getLocalFileBaseName(), type.getName(), view.getName());
|
||||||
|
data.setAttribute("2022PeriodButton", "href", filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
|
@ -240,14 +240,14 @@ public class ServiceMetricMenuView
|
||||||
{
|
{
|
||||||
data.appendAttribute("lastPeriodButton", "class", "button selected");
|
data.appendAttribute("lastPeriodButton", "class", "button selected");
|
||||||
}
|
}
|
||||||
else if (period == PeriodMenu.Y2020)
|
|
||||||
{
|
|
||||||
data.appendAttribute("2020PeriodButton", "class", "button selected");
|
|
||||||
}
|
|
||||||
else if (period == PeriodMenu.Y2021)
|
else if (period == PeriodMenu.Y2021)
|
||||||
{
|
{
|
||||||
data.appendAttribute("2021PeriodButton", "class", "button selected");
|
data.appendAttribute("2021PeriodButton", "class", "button selected");
|
||||||
}
|
}
|
||||||
|
else if (period == PeriodMenu.Y2022)
|
||||||
|
{
|
||||||
|
data.appendAttribute("2022PeriodButton", "class", "button selected");
|
||||||
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml", data).toString();
|
String content = PresenterUtils.dynamize("/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml", data).toString();
|
||||||
|
|
|
@ -30,8 +30,8 @@
|
||||||
<span style="display: inline-block; width: 100px">Période</span>
|
<span style="display: inline-block; width: 100px">Période</span>
|
||||||
<a id="fullPeriodButton" href="#" class="button">Tout</a>
|
<a id="fullPeriodButton" href="#" class="button">Tout</a>
|
||||||
<a id="lastPeriodButton" href="#" class="button">12 mois</a>
|
<a id="lastPeriodButton" href="#" class="button">12 mois</a>
|
||||||
<a id="2020PeriodButton" href="#" class="button">2020</a>
|
|
||||||
<a id="2021PeriodButton" href="#" class="button">2021</a>
|
<a id="2021PeriodButton" href="#" class="button">2021</a>
|
||||||
|
<a id="2022PeriodButton" href="#" class="button">2022</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -20,12 +20,12 @@
|
||||||
<div id="lastCharts" style="display: block;">
|
<div id="lastCharts" style="display: block;">
|
||||||
<div id="lastChart" style="width: 450px; height: 300px; display: inline-block; border: 1px solid #e7e7e7;"/>
|
<div id="lastChart" style="width: 450px; height: 300px; display: inline-block; border: 1px solid #e7e7e7;"/>
|
||||||
</div>
|
</div>
|
||||||
<div id="2020Charts" style="display: none;">
|
|
||||||
<div id="2020Chart" style="width: 450px; height: 300px; display: inline-block; border: 1px solid #e7e7e7;"/>
|
|
||||||
</div>
|
|
||||||
<div id="2021Charts" style="display: none;">
|
<div id="2021Charts" style="display: none;">
|
||||||
<div id="2021Chart" style="width: 450px; height: 300px; display: inline-block; border: 1px solid #e7e7e7;"/>
|
<div id="2021Chart" style="width: 450px; height: 300px; display: inline-block; border: 1px solid #e7e7e7;"/>
|
||||||
</div>
|
</div>
|
||||||
|
<div id="2022Charts" style="display: none;">
|
||||||
|
<div id="2022Chart" style="width: 450px; height: 300px; display: inline-block; border: 1px solid #e7e7e7;"/>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
Loading…
Reference in a new issue