From 3e328d186cd35aaeb57e9437a1a38c033e8c1aad Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Fri, 6 Jan 2023 23:07:02 +0100 Subject: [PATCH] Changed metrics menu entry from 2020 to 2022. --- .../htmlize/FederationMetricMenuView.java | 20 +++++++++---------- .../htmlize/OrganizationMetricMenuView.java | 20 +++++++++---------- .../htmlize/ServiceMetricMenuView.java | 20 +++++++++---------- .../statoolinfos/htmlize/metricMenuView.xhtml | 2 +- .../htmlize/organizationMetricView.xhtml | 6 +++--- 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/fr/devinsy/statoolinfos/htmlize/FederationMetricMenuView.java b/src/fr/devinsy/statoolinfos/htmlize/FederationMetricMenuView.java index f5fa6f2..46dc6c2 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/FederationMetricMenuView.java +++ b/src/fr/devinsy/statoolinfos/htmlize/FederationMetricMenuView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Christian Pierre MOMON + * Copyright (C) 2021-2023 Christian Pierre MOMON * * This file is part of StatoolInfos, simple service statistics tool. * @@ -41,8 +41,8 @@ public class FederationMetricMenuView { FULL, LAST, - Y2020, - Y2021; + Y2021, + Y2022; /** * 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()); 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()); 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"); } - else if (period == PeriodMenu.Y2020) - { - data.appendAttribute("2020PeriodButton", "class", "button selected"); - } else if (period == PeriodMenu.Y2021) { 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(); diff --git a/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricMenuView.java b/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricMenuView.java index 6d9863a..a8cc725 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricMenuView.java +++ b/src/fr/devinsy/statoolinfos/htmlize/OrganizationMetricMenuView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Christian Pierre MOMON + * Copyright (C) 2021-2023 Christian Pierre MOMON * * This file is part of StatoolInfos, simple service statistics tool. * @@ -41,8 +41,8 @@ public class OrganizationMetricMenuView { FULL, LAST, - Y2020, - Y2021; + Y2021, + Y2022; /** * 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()); 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()); 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"); } - else if (period == PeriodMenu.Y2020) - { - data.appendAttribute("2020PeriodButton", "class", "button selected"); - } else if (period == PeriodMenu.Y2021) { 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(); diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java index b1948d3..d28a9ab 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java +++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021 Christian Pierre MOMON + * Copyright (C) 2021-2023 Christian Pierre MOMON * * This file is part of StatoolInfos, simple service statistics tool. * @@ -41,8 +41,8 @@ public class ServiceMetricMenuView { FULL, LAST, - Y2020, - Y2021; + Y2021, + Y2022; /** * 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()); 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()); 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"); } - else if (period == PeriodMenu.Y2020) - { - data.appendAttribute("2020PeriodButton", "class", "button selected"); - } else if (period == PeriodMenu.Y2021) { 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(); diff --git a/src/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml index ac19652..9092941 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/metricMenuView.xhtml @@ -30,8 +30,8 @@ PĂ©riode Tout 12 mois - 2020 2021 + 2022 diff --git a/src/fr/devinsy/statoolinfos/htmlize/organizationMetricView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/organizationMetricView.xhtml index d3e9cbe..6b1a838 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/organizationMetricView.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/organizationMetricView.xhtml @@ -20,12 +20,12 @@
-