Browse Source

no double places in table, revert resultsView player display because of vaadin bug

master
GAM 4 years ago
parent
commit
c8c2abebf1
4 changed files with 19 additions and 8 deletions
  1. +9
    -0
      src/main/java/com/example/application/data/bean/PlayerForTable.java
  2. +5
    -5
      src/main/java/com/example/application/data/service/PlayerService.java
  3. +4
    -2
      src/main/java/com/example/application/views/results/ResultsView.java
  4. +1
    -1
      src/main/java/com/example/application/views/table/TableView.java

+ 9
- 0
src/main/java/com/example/application/data/bean/PlayerForTable.java View File

@ -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;
}


+ 5
- 5
src/main/java/com/example/application/data/service/PlayerService.java View File

@ -63,19 +63,19 @@ public class PlayerService extends CrudService<Player, Integer> {
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;


+ 4
- 2
src/main/java/com/example/application/views/results/ResultsView.java View File

@ -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, Player>) 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, Player>) CalculatedMatch::getPlayer2)
.setHeader(headerPlayer2)
.setTextAlign(ColumnTextAlign.START)
.setWidth("13em");


+ 1
- 1
src/main/java/com/example/application/views/table/TableView.java View File

@ -84,7 +84,7 @@ public class TableView extends SeasonAndMatchdayNavigationView {
Label headerDiff = new Label("Diff");
headerDiff.addClassName("column_header");
getGrid().addColumn((ValueProvider<PlayerForTable, Integer>) PlayerForTable::getPlace)
getGrid().addColumn((ValueProvider<PlayerForTable, String>) PlayerForTable::getPlaceString)
.setHeader(headerPlace)
.setTextAlign(ColumnTextAlign.CENTER)
.setWidth("5em");


Loading…
Cancel
Save