#687 fix grouping with empty teams/groups

luechtdiode · Jul 27, 2023 · 1a3a230 · 1a3a230
1 parent fe9e06c
commit 1a3a230
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/main/scala/ch/seidel/kutu/data/GroupBy.scala b/src/main/scala/ch/seidel/kutu/data/GroupBy.scala
@@ -127,14 +127,15 @@ sealed trait GroupBy {
 
   private def mapAndSortLeaf(grouped: Map[DataObject, Seq[WertungView]]) = {
     def reduce(switch: DataObject, list: Seq[WertungView]): Seq[GroupSection] = {
-      if (list.nonEmpty) {
-        val gl = GroupLeaf(switch, list)
+      val rl = list.filter(_.showInScoreList)
+      if (rl.nonEmpty) {
+        val gl = GroupLeaf(switch, rl)
         kind match {
           case Teamrangliste => {
-            TeamSums(gl).toSeq
+            TeamSums(gl)
           }
           case Einzelrangliste => Seq(gl)
-          case Kombirangliste => gl +: TeamSums(gl).toSeq
+          case Kombirangliste => gl +: TeamSums(gl)
         }
       } else {
         Seq()

diff --git a/src/main/scala/ch/seidel/kutu/data/GroupSection.scala b/src/main/scala/ch/seidel/kutu/data/GroupSection.scala
@@ -494,10 +494,10 @@ object TeamSums {
             case (_, teams) =>
               val diszs = teams.flatMap(_.diszList).distinct
                 .groupBy(_._1).toList.sortBy(_._2.head._2).map(_._2.head._1)
-              val tms = teams.map { team =>
+              val tms = teams.filter(team => team.wertungen.nonEmpty).map { team =>
                 GroupLeaf(team, team.wertungen, diszs)
               }
-              if (teams.isEmpty) None else Some(TeamSums(teamRows.groupKey.asInstanceOf[DataObject], tms))
+              if (tms.isEmpty) None else Some(TeamSums(teamRows.groupKey.asInstanceOf[DataObject], tms))
           }
           .toList
       } else List[TeamSums]()