diff --git a/src/main/java/ru/ulstu/extractor/controller/Route.java b/src/main/java/ru/ulstu/extractor/controller/Route.java index 34853a5..8a0282e 100644 --- a/src/main/java/ru/ulstu/extractor/controller/Route.java +++ b/src/main/java/ru/ulstu/extractor/controller/Route.java @@ -13,6 +13,7 @@ public class Route { public static final String LIST_REPOSITORY_BRANCHES = "listBranches"; public static final String INDEXING_NEW_REPOSITORY = "indexNewRepository"; public static final String FILTER_COMMITS = "filterCommits"; + public static final String STATISTIC = "statistic"; public static String getLIST_INDEXED_REPOSITORIES() { return LIST_INDEXED_REPOSITORIES; @@ -29,4 +30,8 @@ public class Route { public static String getFILTER_COMMITS() { return FILTER_COMMITS; } + + public static String getSTATISTIC() { + return STATISTIC; + } } diff --git a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java index bb53b62..55f1f33 100644 --- a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java +++ b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java @@ -13,6 +13,8 @@ import ru.ulstu.extractor.repository.CommitRepository; import java.util.List; import java.util.stream.Collectors; +import static ru.ulstu.extractor.controller.Route.STATISTIC; + @Controller public class StatisticController { private final CommitRepository commitRepository; @@ -21,9 +23,8 @@ public class StatisticController { this.commitRepository = commitRepository; } - @GetMapping("/statistic") - public String indexBranch( - Model model) { + @GetMapping(STATISTIC) + public String indexBranch(Model model) { List authorCommits = commitRepository.getCommitAuthorStatistic().stream() .map(stat -> new Object[]{stat.getAuthor(), stat.getCountCommit()}) .collect(Collectors.toList()); @@ -40,13 +41,13 @@ public class StatisticController { for (int i = 0; i < timeCommits.size(); i++) { date[i] = timeCommits.get(i)[0].toString(); } - model.addAttribute("datas", date); + model.addAttribute("dates", date); String[] url = new String[urlCommits.size()]; for (int i = 0; i < urlCommits.size(); i++) { - url[i] = urlCommits.get(i)[0].toString(); + url[i] = urlCommits.get(i)[0].toString().substring(urlCommits.get(i)[0].toString().lastIndexOf("/") + 1); } model.addAttribute("urls", url); - return "statistic"; + return STATISTIC; } } diff --git a/src/main/resources/templates/statistic.html b/src/main/resources/templates/statistic.html index 7888244..fd2107b 100644 --- a/src/main/resources/templates/statistic.html +++ b/src/main/resources/templates/statistic.html @@ -23,7 +23,7 @@ text: 'Количество коммитов во времени' }; var xAxis = { - categories: [[${datas}]], + categories: [[${dates}]], title: { enabled: true, text: 'Дата' @@ -129,7 +129,7 @@ categories: [[${urls}]], crosshair: true, title: { - text: 'Url' + text: 'Репозиторий' } }; var yAxis = { @@ -141,7 +141,7 @@ var tooltip = { headerFormat: '{point.key}', pointFormat: '' + - '', + '', footerFormat: '
{series.name}: {point.y:.1f} mm
{point.y:.1f}
', shared: true, useHTML: true