From 2ca1d245304e7ea6eeec290e98f6591eeeb46f15 Mon Sep 17 00:00:00 2001
From: Chaoscaot <chaoscaot@zohomail.eu>
Date: Sun, 12 Feb 2023 10:40:11 +0100
Subject: [PATCH] Fight Odd Group Generation and Add Group on Export

---
 lib/src/screens/generator/generators/group_generator.dart | 2 +-
 lib/src/util/event_fight_exporter.dart                    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/src/screens/generator/generators/group_generator.dart b/lib/src/screens/generator/generators/group_generator.dart
index 1f0ec38..dd72220 100644
--- a/lib/src/screens/generator/generators/group_generator.dart
+++ b/lib/src/screens/generator/generators/group_generator.dart
@@ -77,7 +77,7 @@ class GroupBracketGenerator extends HookConsumerWidget {
       List<List<List<List<int>>>> groupFights = [];
       final random = Random();
       for (final group in groups.value) {
-        int rounds = group.length - 1;
+        int rounds = group.length + (group.length % 2) - 1;
         List<List<List<int>>> groupFight = [];
         for (int i = 0; i < rounds; i++) {
           final availableTeams = group.toList();
diff --git a/lib/src/util/event_fight_exporter.dart b/lib/src/util/event_fight_exporter.dart
index c06a0f9..59ed816 100644
--- a/lib/src/util/event_fight_exporter.dart
+++ b/lib/src/util/event_fight_exporter.dart
@@ -30,13 +30,14 @@ Start,BlueTeam,RedTeam,WinnerTeam
 
 Uri exportFights(List<EventFight> fights, String eventName) {
   List<List<String>> csv = [];
-  csv.add(['Start', 'BlueTeam', 'RedTeam', 'WinnerTeam']);
+  csv.add(['Start', 'BlueTeam', 'RedTeam', 'WinnerTeam', 'Group']);
   for (var fight in fights) {
     csv.add([
       fight.start.toString(),
       fight.blueTeam.name,
       fight.redTeam.name,
       fight.winner.name,
+      fight.group ?? "Ungrouped"
     ]);
   }