From fa3d285d83601338e41ab7527314329aa5478b2e Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 5 Apr 2021 12:31:36 +0400 Subject: [PATCH] #18 -- fix percents --- .../controller/StatisticController.java | 28 +++++----------- src/main/resources/templates/statistic.html | 32 +++++++------------ 2 files changed, 20 insertions(+), 40 deletions(-) diff --git a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java index f18c03e..9a7b675 100644 --- a/src/main/java/ru/ulstu/extractor/controller/StatisticController.java +++ b/src/main/java/ru/ulstu/extractor/controller/StatisticController.java @@ -1,3 +1,8 @@ +/* + * Copyright (C) 2021 Anton Romanov - All Rights Reserved + * You may use, distribute and modify this code, please write to: romanov73@gmail.com. + */ + package ru.ulstu.extractor.controller; import org.springframework.stereotype.Controller; @@ -24,28 +29,11 @@ public class StatisticController { "Europe", "North America", "Sourth America" }; - model.addAttribute("continents", continents); - model.addAttribute("array", new int[]{1, 2, 3}); - List listArr = commitRepository.getCommitAuthorStatistic().stream() - .map(stat -> new String[]{stat.getAuthor(), stat.getCountCommit().toString()}) + List authorCommits = commitRepository.getCommitAuthorStatistic().stream() + .map(stat -> new Object[]{stat.getAuthor(), stat.getCountCommit()}) .collect(Collectors.toList()); - String[][] commitAuthorData = listArr.toArray(String[][]::new); - model.addAttribute("commitAuthorData", findPercent(commitAuthorData)); + model.addAttribute("commitAuthorData", authorCommits); return "statistic"; } - - public String[][] findPercent(String[][] commitAuthorData) { - long sum = 0; - for (int i = 0; i < commitAuthorData.length; i++) { - sum = sum + Integer.parseInt(commitAuthorData[i][1]); - } - System.out.println(sum); - long percent = 0; - for (int i = 0; i < commitAuthorData.length; i++) { - percent = Integer.parseInt(commitAuthorData[i][1]) * 100 / sum; - commitAuthorData[i][1] = ""; - } - return commitAuthorData; - } } diff --git a/src/main/resources/templates/statistic.html b/src/main/resources/templates/statistic.html index a15b6df..7a42dc4 100644 --- a/src/main/resources/templates/statistic.html +++ b/src/main/resources/templates/statistic.html @@ -1,3 +1,8 @@ + +
- -