diff --git a/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java index ae29301..5a6bab0 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java +++ b/src/fr/devinsy/statoolinfos/htmlize/ServiceMetricMenuView.java @@ -60,26 +60,26 @@ public class ServiceMetricMenuView { TagDataManager data = new TagDataManager(); - data.setAttribute("summaryCategoryButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml"); - data.setAttribute("genericCategoryButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-metrics-generic.xhtml"); - data.setAttribute("webCategoryButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-metrics-web.xhtml"); - data.setAttribute("specificCategoryButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-metrics-specific.xhtml"); + data.setAttribute("summaryTypeButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + ".xhtml"); + data.setAttribute("genericTypeButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-metrics-generic.xhtml"); + data.setAttribute("webTypeButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-metrics-web.xhtml"); + data.setAttribute("specificTypeButton", "href", service.getOrganization().getTechnicalName() + "-" + service.getTechnicalName() + "-metrics-specific.xhtml"); if ((item == null) || (item == MenuItem.SUMMARY)) { - data.appendAttribute("summaryCategoryButton", "class", "button selected"); + data.appendAttribute("summaryTypeButton", "class", "button selected"); } else if (item == MenuItem.GENERIC) { - data.appendAttribute("genericCategoryButton", "class", "button selected"); + data.appendAttribute("genericTypeButton", "class", "button selected"); } else if (item == MenuItem.WEB) { - data.appendAttribute("webCategoryButton", "class", "button selected"); + data.appendAttribute("webTypeButton", "class", "button selected"); } else if (item == MenuItem.SPECIFIC) { - data.appendAttribute("specificCategoryButton", "class", "button selected"); + data.appendAttribute("specificTypeButton", "class", "button selected"); } // diff --git a/src/fr/devinsy/statoolinfos/htmlize/charts/lineMonthsChartView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/charts/lineMonthsChartView.xhtml index b2ac604..ff4bb0b 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/charts/lineMonthsChartView.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/charts/lineMonthsChartView.xhtml @@ -19,7 +19,7 @@ var ctx = document.getElementById('myChart'); var myChart = new Chart(ctx, { - type: 'line', + type: 'bar', data: { datasets: @@ -44,7 +44,7 @@ fill: true, lineTension: 0, pointBorderWidth: 0.00000001, - data: [1, 5, 9, 13, 15, 22] + data: [{t: '2020-01', y: 7},{t: '2020-02', y: 9},{t: '2020-03', y: 4},{t: '2020-04', y: 2},{t: '2020-05', y: 1},{t: '2020-06', y: 7},{t: '2020-07', y: 0},{t: '2020-08', y: 0},{t: '2020-09', y: 0},{t: '2020-10', y: 0},{t: '2020-11', y: 0},{t: '2020-12', y: 0}] } ] }, @@ -75,10 +75,11 @@ beginAtZero: false, maxTicksLimit: 0 }, + stacked: true, gridLines: { zeroLineColor: 'rgba(0, 0, 0, 0.1)', - offsetGridLines: false + offsetGridLines: true } }], yAxes: @@ -88,7 +89,8 @@ beginAtZero: false, suggestedMax: 10, precision: 0 - } + }, + stacked: true, }] } } diff --git a/src/fr/devinsy/statoolinfos/htmlize/serviceMetricMenuView.xhtml b/src/fr/devinsy/statoolinfos/htmlize/serviceMetricMenuView.xhtml index dead818..d278452 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/serviceMetricMenuView.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/serviceMetricMenuView.xhtml @@ -13,11 +13,11 @@
- Catégorie - Résumé - Génériques - Web - Spécifiques + Type + Résumé + Génériques + Web + Spécifiques
Période @@ -36,28 +36,28 @@