From 47db7cc955af746d1340051cc478d9a3767c2bd9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 11 Jun 2024 21:06:03 +0200 Subject: [PATCH] Add missing table + fix colors if winner is unknown (#45) * poprawki * Add missing table + fix colors if winner is unknown --------- Co-authored-by: Krzysztof Lasecki --- .../com/rikishi/rikishi/generator/ReportGenerator.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/rikishi/rikishi/generator/ReportGenerator.java b/backend/src/main/java/com/rikishi/rikishi/generator/ReportGenerator.java index 8538c86..4515a5c 100644 --- a/backend/src/main/java/com/rikishi/rikishi/generator/ReportGenerator.java +++ b/backend/src/main/java/com/rikishi/rikishi/generator/ReportGenerator.java @@ -21,6 +21,7 @@ public class ReportGenerator { private static final String DEFAULT_FONT_NAME = FontFactory.TIMES; private static final BaseColor WIN_COLOR = BaseColor.GREEN; private static final BaseColor LOOSE_COLOR = BaseColor.RED; + private static final BaseColor UNKNOWN_COLOR = BaseColor.LIGHT_GRAY; private final UserService userService; private final FightService fightService; @@ -100,8 +101,11 @@ private void addFightWeightClassSection(WeightClass weightClass) throws Document addTableHeader(table, List.of("Fighter 1", "Fighter 2", "Number", "Score")); fightService.getAllCategoryFights(weightClass).forEach(fight -> { - Function fighterColor = fighter -> - fighter.id() == fight.winnerId() ? WIN_COLOR : LOOSE_COLOR; + Function fighterColor = fighter -> { + if (fight.winnerId() == -1) + return UNKNOWN_COLOR; + return fighter.id() == fight.winnerId() ? WIN_COLOR : LOOSE_COLOR; + }; var f1 = fight.firstUser(); var f2 = fight.secondUser(); @@ -113,6 +117,8 @@ private void addFightWeightClassSection(WeightClass weightClass) throws Document text(String.format("%s:%s", fight.score1(), fight.score2())) )); }); + + document.add(table); } private void addContestantsSection() throws DocumentException {