deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

more swiss tweaks

Browse source
This commit is contained in:
Thibault Duplessis 2020-05-16 15:15:22 -06:00
parent 9ff4ef407b
commit 93ea13ab76
3 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/swiss/bits.scala
View file

@ -75,8 +75,8 @@ object bits {
else if (s.settings.oneDayInterval) frag("One round per day")
else
frag(
if (s.settings.intervalSeconds < 60) strong(pluralize("second", s.settings.intervalSeconds))
else strong(pluralize("minute", s.settings.intervalSeconds / 60)),
if (s.settings.intervalSeconds < 60) pluralize("second", s.settings.intervalSeconds)
else pluralize("minute", s.settings.intervalSeconds / 60),
" between rounds"
)

3
modules/swiss/src/main/SwissApi.scala
View file

@ -369,7 +369,8 @@ final class SwissApi(
.flatMap { ids =>
lila.common.Future.applySequentially(ids) { id =>
Sequencing(id)(notFinishedById) { swiss =>
if (swiss.nbPlayers >= 4)
if (swiss.round.value >= swiss.settings.nbRounds) doFinish(swiss)
else if (swiss.nbPlayers >= 4)
director.startRound(swiss).flatMap {
_.fold {
systemChat(swiss.id, "All possible pairings were played.")

55
modules/swiss/src/main/SwissForm.scala
View file

@ -15,35 +15,36 @@ final class SwissForm(implicit mode: Mode) {
import SwissForm._
val form = Form(
mapping(
"name" -> optional(
text.verifying(
Constraints minLength 2,
Constraints maxLength 30,
Constraints.pattern(
regex = """[\p{L}\p{N}-\s:,;]+""".r,
error = "error.unknown"
def form(minRounds: Int = 3) =
Form(
mapping(
"name" -> optional(
text.verifying(
Constraints minLength 2,
Constraints maxLength 30,
Constraints.pattern(
regex = """[\p{L}\p{N}-\s:,;]+""".r,
error = "error.unknown"
)
)
)
),
"clock" -> mapping(
"limit" -> number.verifying(clockLimits.contains _),
"increment" -> number(min = 0, max = 600)
)(ClockConfig.apply)(ClockConfig.unapply)
.verifying("Invalid clock", _.estimateTotalSeconds > 0),
"startsAt" -> optional(inTheFuture(ISODateTimeOrTimestamp.isoDateTimeOrTimestamp)),
"variant" -> optional(nonEmptyText.verifying(v => Variant(v).isDefined)),
"rated" -> optional(boolean),
"nbRounds" -> number(min = 3, max = 100),
"description" -> optional(nonEmptyText),
"hasChat" -> optional(boolean),
"roundInterval" -> optional(numberIn(roundIntervals))
)(SwissData.apply)(SwissData.unapply)
)
),
"clock" -> mapping(
"limit" -> number.verifying(clockLimits.contains _),
"increment" -> number(min = 0, max = 600)
)(ClockConfig.apply)(ClockConfig.unapply)
.verifying("Invalid clock", _.estimateTotalSeconds > 0),
"startsAt" -> optional(inTheFuture(ISODateTimeOrTimestamp.isoDateTimeOrTimestamp)),
"variant" -> optional(nonEmptyText.verifying(v => Variant(v).isDefined)),
"rated" -> optional(boolean),
"nbRounds" -> number(min = minRounds, max = 100),
"description" -> optional(nonEmptyText),
"hasChat" -> optional(boolean),
"roundInterval" -> optional(numberIn(roundIntervals))
)(SwissData.apply)(SwissData.unapply)
)
def create =
form fill SwissData(
form() fill SwissData(
name = none,
clock = ClockConfig(180, 0),
startsAt = Some(DateTime.now plusSeconds {
@ -58,7 +59,7 @@ final class SwissForm(implicit mode: Mode) {
)
def edit(s: Swiss) =
form fill SwissData(
form(s.round.value) fill SwissData(
name = s.name.some,
clock = s.clock,
startsAt = s.startsAt.some,