diff --git a/source/src/main/java/org/cerberus/core/crud/service/impl/TagStatisticService.java b/source/src/main/java/org/cerberus/core/crud/service/impl/TagStatisticService.java index e9ef5946e..290087252 100644 --- a/source/src/main/java/org/cerberus/core/crud/service/impl/TagStatisticService.java +++ b/source/src/main/java/org/cerberus/core/crud/service/impl/TagStatisticService.java @@ -21,7 +21,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.tika.sax.Link; import org.cerberus.core.crud.dao.ITagStatisticDAO; import org.cerberus.core.crud.entity.*; import org.cerberus.core.crud.service.IApplicationService; @@ -37,8 +36,6 @@ import org.json.JSONException; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; import java.sql.Timestamp; @@ -317,6 +314,7 @@ public Map createMapAggregatedStatistics(Map createMapAggregatedStatistics(Map createMapAggregatedStatistics(Map tagStatistics) { - List systemsAllowedforUser = null; + List systemsAllowedForUser; try { - systemsAllowedforUser = getSystemsAllowedForUser(user); + systemsAllowedForUser = getSystemsAllowedForUser(user); } catch (CerberusException exception) { LOG.error("Unable to get systems allowed for user: ", exception); return false; @@ -425,7 +424,7 @@ public boolean userHasRightSystems(String user, List tagStatistics .replace("]", "") .split(",")) .collect(Collectors.toList()); - if (!new HashSet<>(systemsAllowedforUser).containsAll(systemList)) { + if (!new HashSet<>(systemsAllowedForUser).containsAll(systemList)) { return false; } } @@ -467,7 +466,7 @@ private JSONObject createJsonCampaignStatByEnvCountry(JSONArray systems, JSONArr .put("avgNbExeUsefull", avgNbExeUsefull); } - private JSONObject createJsonCampaignStat(String campaign, JSONArray systems, JSONArray applications, String group1, double avgDuration, String minDateStart, String maxDateEnd, double avgOK, double avgReliability, int avgNbExeUsefull) throws JSONException { + private JSONObject createJsonCampaignStat(String campaign, JSONArray systems, JSONArray applications, String group1, double avgDuration, String minDateStart, String maxDateEnd, double avgOK, double avgReliability, int avgNbExeUsefull, int numberCampaignExecutions) throws JSONException { return new JSONObject(new LinkedHashMap<>()) .put("campaign", campaign) .put("systemList", systems) @@ -478,7 +477,8 @@ private JSONObject createJsonCampaignStat(String campaign, JSONArray systems, JS .put("maxDateEnd", maxDateEnd) .put("avgOK", avgOK) .put("avgReliability",avgReliability) - .put("avgNbExeUsefull", avgNbExeUsefull); + .put("avgNbExeUsefull", avgNbExeUsefull) + .put("numberCampaignExecutions", numberCampaignExecutions); } private String setKeyAccordingToAggregateType(String aggregateType, TagStatistic tagStatistic) { diff --git a/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java b/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java index cf87e56b2..2e4248007 100644 --- a/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java +++ b/source/src/main/java/org/cerberus/core/database/DocumentationDatabaseService.java @@ -2912,8 +2912,10 @@ public ArrayList getSqlDocumentation() { b.append(",('page_campaignstatistics','avgDuration_col','','en','Average duration','',NULL)"); b.append(",('page_campaignstatistics','avgReliability_col','','fr','Fiabilité moyenne','',NULL)"); b.append(",('page_campaignstatistics','avgReliability_col','','en','Average reliability','',NULL)"); - b.append(",('page_campaignstatistics','avgNbExeUsefull_col','','fr','Nombre moyen d\\'exécutions utiles','',NULL)"); - b.append(",('page_campaignstatistics','avgNbExeUsefull_col','','en','Average number of usefull executions','',NULL)"); + b.append(",('page_campaignstatistics','avgNbExeUseful_col','','fr','Nombre moyen d\\'exécutions utiles','',NULL)"); + b.append(",('page_campaignstatistics','avgNbExeUseful_col','','en','Average number of useful executions','',NULL)"); + b.append(",('page_campaignstatistics','numberCampaignExecutions_col','','fr','Nombre d\\'exécutions de la campagne','',NULL)"); + b.append(",('page_campaignstatistics','numberCampaignExecutions_col','','en','Number of campaign executions','',NULL)"); b.append(",('page_robot','button_create','','en','Create new Robot','',NULL)"); b.append(",('page_robot','button_create','','fa','ایجاد ربات جدید','',NULL)"); b.append(",('page_robot','button_create','','fr','Créer un nouveau Robot','',NULL)"); diff --git a/source/src/main/webapp/js/pages/ReportingCampaignStatistics.js b/source/src/main/webapp/js/pages/ReportingCampaignStatistics.js index f67210e67..24c67f048 100644 --- a/source/src/main/webapp/js/pages/ReportingCampaignStatistics.js +++ b/source/src/main/webapp/js/pages/ReportingCampaignStatistics.js @@ -35,12 +35,7 @@ $.when($.getScript("js/global/global.js")).then(function () { } //Hide the columns header search bar (searchable activated on specific columns to allow the global search on datatable, but not useful to show the header filter search bar on each column) - $('#tagStatisticTable').on('draw.dt', function () { - $(".filterHeader span").hide(); - }); - $('#tagStatisticDetailTable').on('draw.dt', function () { - $(".filterHeader span").hide(); - }); + hideColumnSearchBar(); $('[data-toggle="popover"]').popover({ 'placement': 'auto', @@ -395,7 +390,14 @@ function aoColumnsFunc(tableId) { "name": "avgNbExeUsefull", "searchable": false, "width": "130px", - "title": doc.getDocLabel("page_campaignstatistics", "avgNbExeUsefull_col") + "title": doc.getDocLabel("page_campaignstatistics", "avgNbExeUseful_col") + }, + { + "data": "numberCampaignExecutions", + "name": "numberCampaignExecutions", + "searchable": false, + "width": "130px", + "title": doc.getDocLabel("page_campaignstatistics", "numberCampaignExecutions_col") }, ]; return aoColumns; @@ -501,7 +503,7 @@ function aoColumnsDetailFunc(tableId) { "name": "avgNbExeUsefull", "searchable": false, "width": "130px", - "title": doc.getDocLabel("page_campaignstatistics", "avgNbExeUsefull_col") + "title": doc.getDocLabel("page_campaignstatistics", "avgNbExeUseful_col") }, ]; return aoColumns; @@ -512,3 +514,13 @@ function getGreenToRed(percent) { g = percent > 50 ? 255 : Math.floor((percent * 2) * 255 / 100); return 'rgb(' + r + ',' + g + ',0)'; } + +function hideColumnSearchBar() { + $(".filterHeader span").hide(); + $('#tagStatisticTable').on('draw.dt', function () { + $(".filterHeader span").hide(); + }); + $('#tagStatisticDetailTable').on('draw.dt', function () { + $(".filterHeader span").hide(); + }); +}