diff --git a/src/main/java/com/example/application/data/bean/PlayerForTable.java b/src/main/java/com/example/application/data/bean/PlayerForTable.java index 0bf25fb..27726ae 100644 --- a/src/main/java/com/example/application/data/bean/PlayerForTable.java +++ b/src/main/java/com/example/application/data/bean/PlayerForTable.java @@ -17,6 +17,7 @@ public class PlayerForTable { private Double gamePointDiff; private Integer place; + private String placeString; private Integer placeDiffToLastMatchday; public PlayerForTable(Player player, @@ -119,6 +120,14 @@ public class PlayerForTable { this.place = place; } + public String getPlaceString() { + return placeString; + } + + public void setPlaceString(String placeString) { + this.placeString = placeString; + } + public Integer getPlaceDiffToLastMatchday() { return placeDiffToLastMatchday; } diff --git a/src/main/java/com/example/application/data/service/PlayerService.java b/src/main/java/com/example/application/data/service/PlayerService.java index cdecb3d..2fb8724 100644 --- a/src/main/java/com/example/application/data/service/PlayerService.java +++ b/src/main/java/com/example/application/data/service/PlayerService.java @@ -63,19 +63,19 @@ public class PlayerService extends CrudService { PlayerForTable currentPlayer; for (int i = 0; i < playerForTableList.size(); i++) { currentPlayer = playerForTableList.get(i); - if (i>0) { - lastPlayer = playerForTableList.get(i-1); + if (i > 0) { + lastPlayer = playerForTableList.get(i - 1); // TODO: add direct comparison below if (Objects.equals(currentPlayer.getMatchPoints(), lastPlayer.getMatchPoints()) && Objects.equals(currentPlayer.getGamePointsForSelf(), lastPlayer.getGamePointsForSelf()) && Objects.equals(currentPlayer.getGamePointsForOpponents(), lastPlayer.getGamePointsForOpponents())) { - offset +=1; - } - else { + offset += 1; + } else { offset = 0; } } currentPlayer.setPlace(i + 1 - offset); + currentPlayer.setPlaceString(offset == 0 ? String.valueOf(i + 1) : ""); } // TODO: add diff to last matchday return playerForTableList; diff --git a/src/main/java/com/example/application/views/results/ResultsView.java b/src/main/java/com/example/application/views/results/ResultsView.java index 024e10d..9c7c295 100644 --- a/src/main/java/com/example/application/views/results/ResultsView.java +++ b/src/main/java/com/example/application/views/results/ResultsView.java @@ -113,7 +113,8 @@ public class ResultsView extends SeasonAndMatchdayNavigationView { Label headerPlayer2 = new Label("Player 2"); headerPlayer2.addClassName("column_header"); - getGrid().addColumn(VaadinUtils.getPlayerRenderer(CalculatedMatch::getPlayer1)) +// getGrid().addColumn(VaadinUtils.getPlayerRenderer(CalculatedMatch::getPlayer1)) + getGrid().addColumn((ValueProvider) CalculatedMatch::getPlayer1) .setHeader(headerPlayer1) .setTextAlign(ColumnTextAlign.END) .setWidth("13em"); @@ -123,7 +124,8 @@ public class ResultsView extends SeasonAndMatchdayNavigationView { .setTextAlign(ColumnTextAlign.CENTER) .setWidth("6em"); - getGrid().addColumn(VaadinUtils.getPlayerRenderer(CalculatedMatch::getPlayer2)) +// getGrid().addColumn(VaadinUtils.getPlayerRenderer(CalculatedMatch::getPlayer2)) + getGrid().addColumn((ValueProvider) CalculatedMatch::getPlayer2) .setHeader(headerPlayer2) .setTextAlign(ColumnTextAlign.START) .setWidth("13em"); diff --git a/src/main/java/com/example/application/views/table/TableView.java b/src/main/java/com/example/application/views/table/TableView.java index d1daeef..21d6bac 100644 --- a/src/main/java/com/example/application/views/table/TableView.java +++ b/src/main/java/com/example/application/views/table/TableView.java @@ -84,7 +84,7 @@ public class TableView extends SeasonAndMatchdayNavigationView { Label headerDiff = new Label("Diff"); headerDiff.addClassName("column_header"); - getGrid().addColumn((ValueProvider) PlayerForTable::getPlace) + getGrid().addColumn((ValueProvider) PlayerForTable::getPlaceString) .setHeader(headerPlace) .setTextAlign(ColumnTextAlign.CENTER) .setWidth("5em");