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 579704e..4fc3420 100644 --- a/src/main/java/com/example/application/views/results/ResultsView.java +++ b/src/main/java/com/example/application/views/results/ResultsView.java @@ -111,38 +111,35 @@ public class ResultsView extends SeasonAndMatchdayNavigationView { headerPlayer1.addClassName("column_header"); Label headerPlayer2 = new Label("Player 2"); headerPlayer2.addClassName("column_header"); - Label headerResult = new Label("Result"); - headerResult.addClassName("column_header"); getGrid().addColumn((ValueProvider) CalculatedMatch::getPlayer1) .setHeader(headerPlayer1) - .setTextAlign(ColumnTextAlign.CENTER) + .setTextAlign(ColumnTextAlign.END) .setWidth("13em"); - getGrid().addColumn((ValueProvider) match -> "vs.") + + getGrid().addColumn((ValueProvider) this::getResultString) .setHeader("vs.") .setTextAlign(ColumnTextAlign.CENTER) - .setWidth("3em"); + .setWidth("6em"); + getGrid().addColumn((ValueProvider) CalculatedMatch::getPlayer2) .setHeader(headerPlayer2) - .setTextAlign(ColumnTextAlign.CENTER) + .setTextAlign(ColumnTextAlign.START) .setWidth("13em"); - getGrid().addColumn((ValueProvider) match -> { - - String result = match.getScore1().toString().replace(".0", "") - + " : " - + match.getScore2().toString().replace(".0", ""); - return result.equals("0 : 0") ? "" : result; - }) - .setHeader(headerResult) - .setTextAlign(ColumnTextAlign.CENTER) - .setWidth("6em"); - getGrid().setWidth("36em"); + getGrid().setWidth("32em"); getGrid().setHeightByRows(true); getGrid().addClassName("my_grid"); } + private String getResultString(CalculatedMatch match) { + String result = match.getScore1().toString().replace(".0", "") + + " : " + + match.getScore2().toString().replace(".0", ""); + return result.equals("0 : 0") ? "- : -" : result; + } + ///////////// // CONTENT // /////////////