-
Notifications
You must be signed in to change notification settings - Fork 93
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.
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
No longer showing "Scramble Set A" if there is only one scramble set/group #578
No longer showing "Scramble Set A" if there is only one scramble set/group #578
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review details have been discussed via remote video call.
TL;DR: Don't change the WCIF model.
@suushiemaniac should be fixed now. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the prompt fixes! Minor remarks concerning Kotlin left...
.../main/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/wcif/model/ActivityCode.kt
Outdated
Show resolved
Hide resolved
...c/main/kotlin/org/worldcubeassociation/tnoodle/server/webscrambles/wcif/model/ScrambleSet.kt
Outdated
Show resolved
Hide resolved
@@ -5,7 +5,8 @@ import org.worldcubeassociation.tnoodle.server.webscrambles.wcif.model.extension | |||
import org.worldcubeassociation.tnoodle.server.webscrambles.wcif.provider.IndexingIdProvider | |||
|
|||
@Serializable | |||
data class ScrambleSet(override val id: Int, val scrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, val extraScrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, override val extensions: List<Extension> = emptyList()) : ExtensionProvider(), IndexingIdProvider { | |||
data class ScrambleSet(override val id: Int, val scrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, val extraScrambles: List<@Serializable(with = Scramble.Companion::class) Scramble>, override val extensions: List<Extension> = emptyList() | |||
) : ExtensionProvider(), IndexingIdProvider { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, please try to figure out why IntelliJ doesn't do the automated line breaking like outlined above (or alternatively discard this change from this particular commit, adding only one weeny line break seems silly given the length of the line)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems there's an option for that in editorconfig https://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties but it's under "limited support"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the rigorous implementation :)
I had to make some changes in order to accomodate for broken schedules. Please |
e70ba9e
to
56569cf
Compare
Nevermind, figured out I can do the rebase by myself :) |
closes Issue #433