Feature/setting veto system fields #229
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sheikah45
requested changes
Nov 29, 2024
src/main/java/com/faforever/moderatorclient/ui/main_window/BracketListViewController.java
Outdated
Show resolved
Hide resolved
src/main/java/com/faforever/moderatorclient/ui/main_window/BracketListViewController.java
Outdated
Show resolved
Hide resolved
src/main/java/com/faforever/moderatorclient/ui/main_window/BracketListViewController.java
Outdated
Show resolved
Hide resolved
Sheikah45
requested changes
Dec 1, 2024
Comment on lines
33
to
37
| public Spinner<Integer> vetoTokensPerPlayerSpinner; | ||
| public Spinner<Integer> maxTokensPerMapSpinner; | ||
| public Spinner<Double> minimumMapsAfterVetoSpinner; | ||
| public CheckBox dynamicMaxTokensPerMapCheckBox; | ||
| public HBox maxTokensPerMapHBox; |
There was a problem hiding this comment.
I would follow convention and make these not public and use @FXML
| public void bindVetoParams(MatchmakerQueueMapPoolFX bracket) { | ||
| dynamicMaxTokensPerMapCheckBox.selectedProperty().addListener((observable, oldValue, newValue) -> { | ||
| if (newValue){ | ||
| log.debug(String.valueOf(bracket.maxTokensPerMapProperty().get())); |
There was a problem hiding this comment.
This log statement isn't needed anymore
Comment on lines
69
to
71
| bracket.maxTokensPerMapProperty().set(0); | ||
| } else { | ||
| bracket.maxTokensPerMapProperty().set(1); |
There was a problem hiding this comment.
Suggested change
| bracket.maxTokensPerMapProperty().set(0); | |
| } else { | |
| bracket.maxTokensPerMapProperty().set(1); | |
| bracket.setMaxTokensPerMap(0); | |
| } else { | |
| bracket.setMaxTokensPerMap(1); |
| } | ||
| }); | ||
|
|
||
| dynamicMaxTokensPerMapCheckBox.setSelected(bracket.maxTokensPerMapProperty().get() == 0); |
There was a problem hiding this comment.
Suggested change
| dynamicMaxTokensPerMapCheckBox.setSelected(bracket.maxTokensPerMapProperty().get() == 0); | |
| dynamicMaxTokensPerMapCheckBox.setSelected(bracket.getMaxTokensPerMap() == 0); |
|
|
||
| dynamicMaxTokensPerMapCheckBox.setSelected(bracket.maxTokensPerMapProperty().get() == 0); | ||
|
|
||
| maxTokensPerMapSpinner.getValueFactory().setValue(bracket.maxTokensPerMapProperty().get()); |
There was a problem hiding this comment.
Suggested change
| maxTokensPerMapSpinner.getValueFactory().setValue(bracket.maxTokensPerMapProperty().get()); | |
| maxTokensPerMapSpinner.getValueFactory().setValue(bracket.getMaxTokensPerMap()); |
| vetoTokensPerPlayerSpinner.valueProperty().addListener((observable, oldValue, newValue) -> bracket.vetoTokensPerPlayerProperty().set(newValue)); | ||
|
|
||
| minimumMapsAfterVetoSpinner.getValueFactory().setValue(bracket.minimumMapsAfterVetoProperty().get()); | ||
| minimumMapsAfterVetoSpinner.valueProperty().addListener((observable, oldValue, newValue) -> bracket.minimumMapsAfterVetoProperty().set(newValue)); |
There was a problem hiding this comment.
Suggested change
| minimumMapsAfterVetoSpinner.valueProperty().addListener((observable, oldValue, newValue) -> bracket.minimumMapsAfterVetoProperty().set(newValue)); | |
| minimumMapsAfterVetoSpinner.valueProperty().addListener((observable, oldValue, newValue) -> bracket.setMinimumMapsAfterVeto(newValue)); |
| vetoTokensPerPlayerSpinner.getValueFactory().setValue(bracket.vetoTokensPerPlayerProperty().get()); | ||
| vetoTokensPerPlayerSpinner.valueProperty().addListener((observable, oldValue, newValue) -> bracket.vetoTokensPerPlayerProperty().set(newValue)); | ||
|
|
||
| minimumMapsAfterVetoSpinner.getValueFactory().setValue(bracket.minimumMapsAfterVetoProperty().get()); |
There was a problem hiding this comment.
Suggested change
| minimumMapsAfterVetoSpinner.getValueFactory().setValue(bracket.minimumMapsAfterVetoProperty().get()); | |
| minimumMapsAfterVetoSpinner.getValueFactory().setValue(bracket.getMinimumMapsAfterVeto()); |
| maxTokensPerMapSpinner.getValueFactory().setValue(bracket.maxTokensPerMapProperty().get()); | ||
| maxTokensPerMapSpinner.valueProperty().addListener((observable, oldValue, newValue) -> bracket.maxTokensPerMapProperty().set(newValue)); | ||
|
|
||
| vetoTokensPerPlayerSpinner.getValueFactory().setValue(bracket.vetoTokensPerPlayerProperty().get()); |
There was a problem hiding this comment.
Suggested change
| vetoTokensPerPlayerSpinner.getValueFactory().setValue(bracket.vetoTokensPerPlayerProperty().get()); | |
| vetoTokensPerPlayerSpinner.getValueFactory().setValue(bracket.getVetoTokensPerPlayer()); |
Comment on lines
196
to
205
| ElideNavigatorOnId<MatchmakerQueueMapPool> navigator = ElideNavigator.of(MatchmakerQueueMapPool.class) | ||
| .id(bracketFX.getId()); | ||
| MatchmakerQueueMapPool dto = matchmakerQueueMapPoolMapper.mapToDto(bracketFX); | ||
| dto.setMapPool(null); | ||
| dto.setCreateTime(null); | ||
| dto.setMinRating(null); | ||
| dto.setMaxRating(null); | ||
| dto.setMatchmakerQueue(null); | ||
| dto.setUpdateTime(null); | ||
| apiService.patch(navigator, dto); |
There was a problem hiding this comment.
This should be a method inside mapService
There was a problem hiding this comment.
like the changes to mappoolassignments below
| @@ -64,6 +67,7 @@ public class LadderMapPoolController implements Controller<SplitPane> { | |||
| public static final double MIN_MAP_SIZE_STEP = 1.25; | |||
| private final MapService mapService; | |||
| private final UiService uiService; | |||
| private final FafApiCommunicationService apiService; | |||
There was a problem hiding this comment.
This should only need mapService
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #227
requires updated database and api with veto system fields updates
maxTokenPerMap: set "D" into the field as "Dynamic". I think this is more clear than 0.
Under the hood, D transforms to 0 anyway. Would be nice to have null instead of 0, but not possible currently due to patch request limitations in current api-service code.