ZHAW-IT21b_WIN
/
team02-AngryNerds-projekt2-turnierverwaltung
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Develope game branch #33

Merged
schrom01 merged 23 commits from develope_Game_branch into main 2022-05-12 13:44:47 +02:00
Conversation 0 Commits 23 Files Changed 17 +26 -8
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b51a585167 - Show all commits

13
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameController.java
View File

@ -1,7 +1,8 @@
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView; package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
import ch.zhaw.projekt2.turnierverwaltung.*; import ch.zhaw.projekt2.turnierverwaltung.*;
import javafx.event.ActionEvent; import javafx.beans.value.ObservableValue;
import javafx.event.Event;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.ChoiceBox; import javafx.scene.control.ChoiceBox;
import javafx.scene.control.Label; import javafx.scene.control.Label;
@ -32,8 +33,13 @@ public class GameController extends FXController{
private TextField pointsTeamTwo; private TextField pointsTeamTwo;
@FXML @FXML
void saveGamerResult(ActionEvent event) { void saveGameResult(Event event) {
gameDecorator.saveGame(pointsTeamOne.getText(), pointsTeamTwo.getText(), placesChoiceBox.getValue()); gameDecorator.saveGameResult(pointsTeamOne.getText(), pointsTeamTwo.getText());
}
private void saveGamePlace(Place newPlace) {
gameDecorator.saveGamePlace(newPlace);
} }
public double getGameBoxHeigth(){ public double getGameBoxHeigth(){
@ -68,6 +74,7 @@ public class GameController extends FXController{
public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator) { public void setup(TournamentDecorator tournamentDecorator, FileIO fileIO, FactoryDecorator factoryDecorator, Pane pane, GameDecorator gameDecorator) {
setTournamentDecorator(tournamentDecorator); setTournamentDecorator(tournamentDecorator);
this.gameDecorator = gameDecorator; this.gameDecorator = gameDecorator;
placesChoiceBox.getSelectionModel().selectedItemProperty().addListener((ObservableValue<? extends Place> observable, Place oldValue, Place newValue) -> saveGamePlace(newValue));
} }
} }

14
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/gameScheduleView/GameDecorator.java
View File

@ -24,9 +24,17 @@ public class GameDecorator implements IsObservable{
listener.remove(observer); listener.remove(observer);
} }
public void saveGame(String points1, String points2, Place place){ public void saveGameResult(String points1, String points2){
game.setPoints1(Integer.parseInt(points1)); if(points1.length() > 0){
game.setPoints2(Integer.parseInt(points2)); game.setPoints1(Integer.parseInt(points1));
}
if(points2.length() > 0) {
game.setPoints2(Integer.parseInt(points2));
}
informListener();
}
public void saveGamePlace(Place place){
game.setPlace(place); game.setPlace(place);
informListener(); informListener();
} }

7
app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/gameScheduleView/GameSchedule.fxml
View File

@ -20,10 +20,13 @@
</Button> </Button>
<Button fx:id="editLocBtn" mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten"> <Button fx:id="editLocBtn" mnemonicParsing="false" onAction="#openPlacesFormular" text="Orte bearbeiten">
<HBox.margin> <HBox.margin>
<Insets right="40.0" /> <Insets right="20.0" />
</HBox.margin> </HBox.margin>
</Button> </Button>
<Button fx:id="closeTournamentBtn" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament" /> <Button fx:id="closeTournamentBtn" layoutX="470.0" layoutY="10.0" mnemonicParsing="false" onAction="#closeTournament" text="Close Tournament">
<HBox.margin>
<Insets right="20.0" />
</HBox.margin></Button>
</children> </children>
</HBox> </HBox>
</top> </top>