#826 fix issue with incomplete squad assignments

luechtdiode · Feb 16, 2024 · 922a157 · 922a157
1 parent f84a42f
commit 922a157
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/main/scala/ch/seidel/kutu/renderer/RiegenblattToHtmlRenderer.scala b/src/main/scala/ch/seidel/kutu/renderer/RiegenblattToHtmlRenderer.scala
@@ -91,12 +91,14 @@ object RiegenBuilder {
       val riegen = kandidatriegen.map(_._2).sortBy(r => r.start.map( dzl.indexOf(_)))
       //kandidat.diszipline für die Rotationsberechnung verwenden
       val rg = riegen.groupBy(e => e.start).toList.sortBy{d => d._1.map( dzl.indexOf(_))}
-      val geraete = dzl.foldLeft(rg){(acc, item) =>
-        acc.find(p => p._1.exists { f => f.equals(item) }) match {
-          case Some(_) => acc
-          case _ => acc :+ (Some(item) -> List[Riege]())
+      val geraete = dzl.foldLeft(rg) { (acc, item) =>
+          acc.find(p => p._1.exists { f => f.equals(item) }) match {
+            case Some(_) => acc
+            case _ => acc :+ (Some(item) -> List[Riege]())
+          }
         }
-      }.sortBy(geraet => geraet._1.map(g => dzl.indexOf(g)))
+        .filter(pair => dzlmap.exists(p => pair._1.contains(p._1)))
+        .sortBy(geraet => geraet._1.map(g => dzl.indexOf(g)))
         .map(geraet => (geraet._1, geraet._2, dzlmap(geraet._1.get)))
 
       val startformationen = pickStartformationen(geraete, durchgang, k => (k.einteilung, k.diszipline))