#826 fix issue with incomplete squad assignments

luechtdiode · Feb 16, 2024 · c31d7f7 · c31d7f7
1 parent 1f65b05
commit c31d7f7
Showing 1 changed file with 10 additions and 6 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))
@@ -136,7 +138,9 @@ object RiegenBuilder {
           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.einteilung2, k.diszipline2))