Skip to content

Feat: choose 960 start position on the analysis board #16978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Mar 24, 2025
Merged

Feat: choose 960 start position on the analysis board #16978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bdaf822
choose 960 start position on the analysis board
allanjoseph98 Feb 15, 2025
2cee138
Merge branch 'master' into analysis-960
ornicar Feb 18, 2025
82d30b1
rework after review
allanjoseph98 Feb 18, 2025
0ec7e41
keep up with merge conflicts
allanjoseph98 Mar 9, 2025
df833e9
Merge branch 'master' into analysis-960
ornicar Mar 24, 2025
ee68d88
code golf
ornicar Mar 24, 2025
3a6b25b
analyse ui chess960 position refactor into function
ornicar Mar 24, 2025
ea1e856
use a better translation
ornicar Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions app/controllers/UserAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package controllers

import chess.format.Fen
import chess.variant.{ FromPosition, Standard, Variant }
import chess.variant.{ FromPosition, Standard, Variant, Chess960 }
import chess.{ ByColor, FullMoveNumber, Situation }
import play.api.libs.json.Json
import play.api.mvc.*
Expand Down Expand Up @@ -31,13 +31,17 @@ final class UserAnalysis(
case _ => load("", Standard)

def load(urlFen: String, variant: Variant) = Open:
val decodedFen: Option[Fen.Full] = lila.common.String
val inputFen: Option[Fen.Full] = lila.common.String
.decodeUriPath(urlFen)
.filter(_.trim.nonEmpty)
.orElse(get("fen"))
.map(Fen.Full.clean)
val pov = makePov(decodedFen, variant)
val orientation = get("color").flatMap(Color.fromName) | pov.color
val chess960PositionNum: Option[Int] = variant.chess960.so:
getInt("position").orElse: // no input fen or num defaults to standard start position
Chess960.positionNumber(inputFen | variant.initialFen)
val decodedFen: Option[Fen.Full] = chess960PositionNum.flatMap(Chess960.positionToFen).orElse(inputFen)
val pov = makePov(decodedFen, variant)
val orientation = get("color").flatMap(Color.fromName) | pov.color
for
data <- env.api.roundApi.userAnalysisJson(
pov,
Expand All @@ -46,7 +50,7 @@ final class UserAnalysis(
orientation,
owner = false
)
page <- renderPage(views.analyse.ui.userAnalysis(data, pov))
page <- renderPage(views.analyse.ui.userAnalysis(data, pov, chess960PositionNum))
yield Ok(page)
.withCanonical(routes.UserAnalysis.index)
.enforceCrossSiteIsolation
Expand Down
38 changes: 31 additions & 7 deletions modules/analyse/src/main/ui/AnalyseUi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ final class AnalyseUi(helpers: Helpers)(endpoints: AnalyseEndpoints):
def userAnalysis(
data: JsObject,
pov: Pov,
chess960PositionNum: Option[Int] = None,
withForecast: Boolean = false,
inlinePgn: Option[String] = None
)(using ctx: Context): Page =
Expand Down Expand Up @@ -69,14 +70,16 @@ final class AnalyseUi(helpers: Helpers)(endpoints: AnalyseEndpoints):
lila.ui.bits.mselect(
"analyse-variant",
span(cls := "text", dataIcon := iconByVariant(pov.game.variant))(pov.game.variant.name),
Variant.list.all.filter(FromPosition != _).map { v =>
a(
dataIcon := iconByVariant(v),
cls := (pov.game.variant == v).option("current"),
href := routes.UserAnalysis.parseArg(v.key.value)
)(v.name)
}
Variant.list.all
.filter(FromPosition != _)
.map: v =>
a(
dataIcon := iconByVariant(v),
cls := (pov.game.variant == v).option("current"),
href := routes.UserAnalysis.parseArg(v.key.value)
)(v.name)
),
pov.game.variant.chess960.option(chess960selector(chess960PositionNum)),
pov.game.variant.standard.option(
fieldset(cls := "analyse__wiki empty toggle-box toggle-box--toggle", id := "wikibook-field")(
legend(tabindex := 0)("WikiBook"),
Expand All @@ -90,6 +93,27 @@ final class AnalyseUi(helpers: Helpers)(endpoints: AnalyseEndpoints):
div(cls := "analyse__controls")
)

private def chess960selector(num: Option[Int])(using Translate) =
div(cls := "jump-960")(
num.map(pos => label(`for` := "chess960-position")(trans.site.chess960StartPosition(pos))),
br,
form(
cls := "control-960",
method := "GET",
action := routes.UserAnalysis.parseArg("chess960")
)(
input(
id := "chess960-position",
`type` := "number",
name := "position",
min := 0,
max := 959,
value := num
),
form3.submit(trans.site.loadPosition(), icon = none)
)
)

private def iconByVariant(variant: Variant): Icon =
PerfKey.byVariant(variant).fold(Icon.CrownElite)(_.perfIcon)

Expand Down
11 changes: 11 additions & 0 deletions ui/analyse/css/_analyse.free.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,3 +91,14 @@ $label-width: 5ch;
}
}
}

.jump-960 {
margin-top: 1em;
margin-bottom: 1em; //col1
.control-960 {
margin-top: 0.7em;
button {
margin-left: 1em;
}
}
}