#855: GeTuRi mit Barren

luechtdiode · Mar 29, 2024 · 0bbce52 · 0bbce52
1 parent 57caa80
commit 0bbce52
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/main/resources/dbscripts/geturi-barren.sql b/src/main/resources/dbscripts/geturi-barren.sql
@@ -0,0 +1,2 @@
+-- allow GeTuRi to use Barren too
+UPDATE wettkampfdisziplin SET feminim=1 WHERE id in (76,81,86,91,96,101,142);
diff --git a/src/main/scala/ch/seidel/kutu/domain/DBService.scala b/src/main/scala/ch/seidel/kutu/domain/DBService.scala
@@ -90,6 +90,7 @@ object DBService {
       , "AddPunktegleichstandsregelToWettkampf-sqllite.sql"
       , "teamwertung-ddl.sql"
       , "AddTeamToWettkampf-ddl.sql"
+      , "geturi-barren.sql"
     )
 
     (!dbfile.exists() || dbfile.length() == 0, Config.importDataFrom) match {
@@ -183,6 +184,7 @@ object DBService {
         , "AddPunktegleichstandsregelToWettkampf-pg.sql"
         , "teamwertung-ddl.sql"
         , "AddTeamToWettkampf-ddl.sql"
+        , "geturi-barren.sql"
       )
       installDB(db, sqlScripts)
       /*Config.importDataFrom match {

diff --git a/src/main/scala/ch/seidel/kutu/renderer/RiegenblattToHtmlRenderer.scala b/src/main/scala/ch/seidel/kutu/renderer/RiegenblattToHtmlRenderer.scala
@@ -62,7 +62,9 @@ object RiegenBuilder {
       )
 
       stationmap.values.toList.distinct.sorted.flatMap { station =>
-        athletdevicemap.map{ kandidat =>
+        athletdevicemap
+          .filter{ _._2.size >station }
+          .map{ kandidat =>
           (kandidat._2(station), kandidat)
         }.groupBy(_._1)
           .map{gr =>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- allow GeTuRi to use Barren too
		UPDATE wettkampfdisziplin SET feminim=1 WHERE id in (76,81,86,91,96,101,142);