From 9e3547fbd9687e6e03a72bbc1ff2d60350987ee4 Mon Sep 17 00:00:00 2001
From: Claude Brisson <claude@renegat.net>
Date: Tue, 30 Jan 2024 16:31:07 +0100
Subject: [PATCH] Fix bug in missed rounds computation

---
 .../kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt    | 2 +-
 .../kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt    | 2 ++
 view-webapp/src/main/webapp/index.html                          | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
index 87bc582..f30ec92 100644
--- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
+++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/pairing/BasePairingHelper.kt
@@ -92,7 +92,7 @@ abstract class BasePairingHelper(
     val Pairable.sodos: Double get() = historyHelper.sodos[id] ?: 0.0
     val Pairable.cums: Double get() = historyHelper.cumScore[id] ?: 0.0
     fun Pairable.missedRounds(upToRound: Int, pairing: Set<ID>): Int = (1..upToRound).map { round ->
-        if (historyHelper.playersPerRound.getOrNull(round - 1)?.contains(id) == true || pairing.contains(id)) 0 else 1
+        if (historyHelper.playersPerRound.getOrNull(round - 1)?.contains(id) == true || round == upToRound && pairing.contains(id)) 0 else 1
     }.sum()
     fun Pairable.eval(criterion: Criterion) = evalCriterion(this, criterion)
     open fun evalCriterion(pairable: Pairable, criterion: Criterion) = when (criterion) {
diff --git a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt
index 70712be..280ae6c 100644
--- a/view-webapp/src/main/kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt
+++ b/view-webapp/src/main/kotlin/org/jeudego/pairgoth/ratings/EGFRatingsHandler.kt
@@ -19,6 +19,8 @@ object EGFRatingsHandler: RatingsHandler(RatingsManager.Ratings.EGF) {
                 }.toTypedArray()
                 Json.MutableObject(*pairs).also {
                     it["origin"] = "EGF"
+                    // override rank with rating equivalent
+                    val rating = it["rating"]?.toString()?.toIntOrNull()
                 }
             }
         }
diff --git a/view-webapp/src/main/webapp/index.html b/view-webapp/src/main/webapp/index.html
index eec2302..64fde18 100644
--- a/view-webapp/src/main/webapp/index.html
+++ b/view-webapp/src/main/webapp/index.html
@@ -10,8 +10,6 @@
 </div>
 <div class="tournaments section">
 #set($files = $api.get('tour'))
-$log.info("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@")
-$log.info($files)
 #if($files.containsKey('error'))
   #set($error = $files.error)
 #elseif($files.containsKey('message'))