fix ranglistetab switch between Einzel-/Teamrangliste

- update filter-preset

#984, #1027

Author: luechtdiode

src/main/scala/ch/seidel/kutu/view/DefaultRanglisteTab.scala

@@ -88,7 +88,11 @@ abstract class DefaultRanglisteTab(wettkampfmode: BooleanProperty, override val
   def print(printer: Printer): Unit = {
     PrintUtil.printWebContent(webView.engine, printer, PageOrientation.Portrait)
   }
-  
+
+  def resetFilterPresets(combos: Seq[ComboBox[FilterBy]], scorelistKind: ScoreListKind): Unit = {
+
+  }
+
   def populate(groupers: List[FilterBy]): Seq[ComboBox[FilterBy]] = {
     val gr1Model = ObservableBuffer.from(groupers)
     val kindModel = ObservableBuffer.from(Seq[ScoreListKind](Einzelrangliste, Teamrangliste, Kombirangliste))
@@ -312,8 +316,11 @@ abstract class DefaultRanglisteTab(wettkampfmode: BooleanProperty, override val
         refreshRangliste(buildGrouper)
     }
     cbKind.onAction = _ => {
-      if(!restoring)
+      if(!restoring) {
+        restoring = true
+        resetFilterPresets(combs, cbKind.value.value)
         refreshRangliste(buildGrouper)
+      }
     }
 
     val btnPrint = PrintUtil.btnPrintFuture(text.value, getSaveAsFilenameDefault, true,

src/main/scala/ch/seidel/kutu/view/RanglisteTab.scala

@@ -6,14 +6,14 @@ import ch.seidel.kutu.Config._
 import ch.seidel.kutu.ConnectionStates
 import ch.seidel.kutu.KuTuApp.handleAction
 import ch.seidel.kutu.data._
-import ch.seidel.kutu.domain.{Altersklasse, Durchgang, KutuService, TeamRegel, WertungView, WettkampfView, encodeFileName, isNumeric}
+import ch.seidel.kutu.domain.{Altersklasse, Durchgang, KutuService, TeamRegel, WertungView, WettkampfView, encodeFileName}
 import ch.seidel.kutu.renderer.PrintUtil.FilenameDefault
 import scalafx.Includes.when
 import scalafx.beans.binding.Bindings
 import scalafx.beans.property.BooleanProperty
 import scalafx.event.ActionEvent
 import scalafx.scene.Node
-import scalafx.scene.control.{Button, Label, TextField}
+import scalafx.scene.control.{Button, ComboBox, Label, TextField}
 import scalafx.scene.layout.{BorderPane, Priority, VBox}
 
 import scala.concurrent.Await
@@ -221,27 +221,38 @@ class RanglisteTab(wettkampfmode: BooleanProperty, wettkampf: WettkampfView, ove
         btnPublikationFreigeben)
     }
 
+  override def resetFilterPresets(combos: Seq[ComboBox[FilterBy]], scoreListKind: ScoreListKind): Unit = {
+    scoreListKind match {
+      case Teamrangliste =>
+        val team = groupers.find(p => p.isInstanceOf[ByTeamRule] && p.groupname.startsWith("Wettkampf"))
+        combos(1).selectionModel.value.select(team.get)
+        combos(2).selectionModel.value.clearSelection()
+        combos(3).selectionModel.value.clearSelection()
+
+      case _ =>
+        val akg = groupers.find(p => p.isInstanceOf[ByAltersklasse] && p.groupname.startsWith("Wettkampf"))
+        val jakg = groupers.find(p => p.isInstanceOf[ByJahrgangsAltersklasse] && p.groupname.startsWith("Wettkampf"))
+        if (akg.nonEmpty) {
+          combos(1).selectionModel.value.select(ByProgramm(programmText))
+          combos(2).selectionModel.value.select(akg.get)
+          combos(3).selectionModel.value.select(ByGeschlecht())
+        } else if (jakg.nonEmpty) {
+          combos(1).selectionModel.value.select(ByProgramm(programmText))
+          combos(2).selectionModel.value.select(jakg.get)
+          combos(3).selectionModel.value.select(ByGeschlecht())
+        } else {
+          combos(1).selectionModel.value.select(ByProgramm(programmText))
+          combos(2).selectionModel.value.select(ByGeschlecht())
+        }
+    }
+  }
 
   override def isPopulated = {
     val combos = populate(groupers)
-    val akg = groupers.find(p => p.isInstanceOf[ByAltersklasse] && p.groupname.startsWith("Wettkampf"))
-    val jakg = groupers.find(p => p.isInstanceOf[ByJahrgangsAltersklasse] && p.groupname.startsWith("Wettkampf"))
-    val team = groupers.find(p => p.isInstanceOf[ByTeamRule] && p.groupname.startsWith("Wettkampf"))
-    if (akg.nonEmpty) {
-      combos(1).selectionModel.value.select(ByProgramm(programmText))
-      combos(2).selectionModel.value.select(akg.get)
-      combos(3).selectionModel.value.select(ByGeschlecht())
-    } else if (jakg.nonEmpty) {
-      combos(1).selectionModel.value.select(ByProgramm(programmText))
-      combos(2).selectionModel.value.select(jakg.get)
-      combos(3).selectionModel.value.select(ByGeschlecht())
-    } else if (team.nonEmpty) {
-      combos(1).selectionModel.value.select(team.get)
-    } else {
-      combos(1).selectionModel.value.select(ByProgramm(programmText))
-      combos(2).selectionModel.value.select(ByGeschlecht())
-    }
 
+    val team = groupers.find(p => p.isInstanceOf[ByTeamRule] && p.groupname.startsWith("Wettkampf"))
+    val kind: ScoreListKind = if (getData.exists(_.team > 0) || team.nonEmpty) Teamrangliste else Einzelrangliste
+    resetFilterPresets(combos, kind)
     true
   }