Start/time chart fine-tuning (#42)

v6ak · Oct 15, 2023 · c36c85c · c36c85c
1 parent 156033c
commit c36c85c
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 6 deletions.
diff --git a/client/src/main/scala/com/example/Moment.scala b/client/src/main/scala/com/example/Moment.scala
@@ -53,6 +53,7 @@ import scala.scalajs.js.Date
 @js.native
 trait Moment extends js.Any {
   def add(time: Int, units: String): Moment = js.native
+  def subtract(time: Int, units: String): Moment = js.native
   //def plus(time: Int, units: String): Moment = js.native
 
 

diff --git a/client/src/main/scala/com/v6ak/zbdb/ChartJsUtils.scala b/client/src/main/scala/com/v6ak/zbdb/ChartJsUtils.scala
@@ -20,8 +20,9 @@ object ChartJsUtils {
 
   def zeroMoment = moment("2000-01-01") // We don't want to mutate it
 
-  def timeAxis(label: String) = literal(
+  def timeAxis(label: String, min: js.Any = js.undefined) = literal(
     `type` = "time",
+    min = min,
     time = literal(
       unit = "minute",
       displayFormats = literal(

diff --git a/client/src/main/scala/com/v6ak/zbdb/Gender.scala b/client/src/main/scala/com/v6ak/zbdb/Gender.scala
@@ -1,5 +1,8 @@
 package com.v6ak.zbdb
 
+import scala.scalajs.js
+import scala.language.implicitConversions
+
 abstract sealed class Gender(){
   def inflect[T](feminine:T, masculine: T): T
 }
@@ -11,4 +14,18 @@ object Gender{
   case object Female extends Gender {
     override def inflect[T](feminine: T, masculine: T): T = feminine
   }
-}
+}
+
+final class RichGenderSeq(val seq: Seq[Gender]) extends AnyVal {
+  def inflectCzech[T](feminine: T, masculine: T): T = if(seq.contains(Gender.Male)) masculine else feminine
+  def inflectCzech[T](feminineSingular: T, masculineSingular: T, femininePlural: T, masculinePlural: T): T = seq match {
+    case Seq(one) => one.inflect(feminine = feminineSingular, masculine = masculineSingular)
+    case _ => inflectCzech(feminine = femininePlural, masculine = masculinePlural)
+  }
+}
+
+object RichGenderSeq {
+  @inline implicit def toRichGenderSeq(seq: Seq[Gender]): RichGenderSeq = new RichGenderSeq(seq)
+  @inline implicit def toRichGenderSeq(seq: js.Array[Gender]): RichGenderSeq = new RichGenderSeq(seq.toSeq)
+
+}
diff --git a/client/src/main/scala/com/v6ak/zbdb/PlotRenderer.scala b/client/src/main/scala/com/v6ak/zbdb/PlotRenderer.scala
@@ -14,6 +14,7 @@ import Bootstrap.DialogUtils
 import com.example.moment._
 import com.example.RichMoment._
 import com.v6ak.zbdb.TextUtils.{formatLength, formatSpeed}
+import com.v6ak.zbdb.RichGenderSeq._
 
 
 final class PlotRenderer(participantTable: ParticipantTable) {
@@ -63,14 +64,29 @@ final class PlotRenderer(participantTable: ParticipantTable) {
       callbacks = literal(
         label = (context: js.Dynamic) => {
           val participants = context.raw.participants.asInstanceOf[js.Array[Participant]]
-          participants.map(_.fullName).mkString(", ") + " (" + participants.size + ")"
+          val names = participants.map(_.fullName).mkString(", ")
+          val started = participants.map(_.gender).inflectCzech(
+            feminineSingular = "Vyrazila",
+            femininePlural = "Vyrazily",
+            masculineSingular = "Vyrazil",
+            masculinePlural = "Vyrazili",
+          )
+          val finished = participants.map(_.gender).inflectCzech(
+            feminineSingular = "ušla",
+            femininePlural = "ušly",
+            masculineSingular = "ušel",
+            masculinePlural = "ušli",
+          )
+          val start = context.raw.x.asInstanceOf[Moment].hoursAndMinutes
+          val total = context.raw.y.asInstanceOf[Moment].hoursAndMinutes
+          s"$names (${participants.size}) – $started $start, celou trasu $finished za $total"
         },
       ),
     )
   }
 
   private def startTimeToTotalDurationPlot = showChartInModal(
-    title = "Porovnání startu a času (pouze finalisti)"
+    title = "Porovnání startu a celkového času (pouze finalisti)"
   ) { rows =>
     val finishers = rows.filter(p => p.hasFinished).groupBy(p =>
       (p.startTime.toString, p.partTimes.last.endTimeOption.get - p.startTime)
@@ -94,9 +110,12 @@ final class PlotRenderer(participantTable: ParticipantTable) {
       ),
       options = literal(
         scales = literal(
-          x = timeAxis("Čas startu"),
+          x = timeAxis(
+            label = "čas startu",
+            min = participantTable.startTime.subtract(5, "minutes").unix().toLong * 1000,
+          ),
           y = durationAxis(
-            label="Celková doba",
+            label="celková doba",
             min=zeroMoment.add(
               finishers.values.flatten.map(p =>
                 (p.partTimes.last.endTimeOption.get - p.startTime) / 3600 / 1000