Compare commits
9
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a1b73e22ca | ||
|
|
11d6ca1852 | ||
|
|
a78d1d9de7 | ||
|
|
5f6193d8b2 | ||
|
|
3d522dd13c | ||
|
|
7dea7919c5 | ||
|
|
f575bb94d3 | ||
|
|
55517a531e | ||
|
|
54a428cde2 |
@@ -85,7 +85,7 @@ public class TournamentDecorator implements IsObservable{
|
|||||||
} catch (Tournament.InvalidTypeException e) {
|
} catch (Tournament.InvalidTypeException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
//TODO: Logger
|
//TODO: Logger
|
||||||
factoryDecorator.printMessageToFooter("Turniermodus nicht möglich",true);
|
factoryDecorator.printMessageToFooter("Turniermodus nicht moeglich",true);
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
@@ -113,7 +113,7 @@ public class TournamentDecorator implements IsObservable{
|
|||||||
factoryDecorator.clearMessage(true);
|
factoryDecorator.clearMessage(true);
|
||||||
} catch (Tournament.NumberOfParticipantInvalidException e) {
|
} catch (Tournament.NumberOfParticipantInvalidException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
factoryDecorator.printMessageToFooter("Anzahl Teilnehmer nicht vielfaches von 2",true);
|
factoryDecorator.printMessageToFooter("Anzahl Teilnehmer muss mindestens 4 betragen und eine Potenz von 2 sein.",true);
|
||||||
}
|
}
|
||||||
informListener();
|
informListener();
|
||||||
}
|
}
|
||||||
@@ -131,7 +131,7 @@ public class TournamentDecorator implements IsObservable{
|
|||||||
factoryDecorator.printMessageToFooter("Invalide Telefonnummer",true);
|
factoryDecorator.printMessageToFooter("Invalide Telefonnummer",true);
|
||||||
} catch (Player.InvalidDateException e) {
|
} catch (Player.InvalidDateException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
factoryDecorator.printMessageToFooter("Ungültiges Geburtsdatum", true);
|
factoryDecorator.printMessageToFooter("Ungueltiges Geburtsdatum", true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
|
||||||
|
|
||||||
|
import javafx.scene.control.Alert;
|
||||||
|
import javafx.scene.control.ButtonBar;
|
||||||
|
import javafx.scene.control.ButtonType;
|
||||||
|
|
||||||
|
public class AlertNewSchedule extends Alert {
|
||||||
|
private ButtonType yesButton = new ButtonType("Ja", ButtonBar.ButtonData.YES);
|
||||||
|
private ButtonType noButton = new ButtonType("Nein", ButtonBar.ButtonData.NO);
|
||||||
|
private boolean result;
|
||||||
|
|
||||||
|
public AlertNewSchedule() {
|
||||||
|
super(AlertType.WARNING);
|
||||||
|
setTitle("Neu erstellen");
|
||||||
|
setHeaderText("Spielplan neu erstellen?");
|
||||||
|
setContentText("Sind Sie sicher, dass Sie den Spielplan neu erstellen moechten?\nAlle Spielfortschritte gehen daraufhin verloren!");
|
||||||
|
getButtonTypes().setAll(yesButton,noButton);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean showAndGetResult() {
|
||||||
|
showAndWait().ifPresent(input -> {
|
||||||
|
result = input == yesButton;
|
||||||
|
});
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
+8
-2
@@ -1,7 +1,6 @@
|
|||||||
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
|
package ch.zhaw.projekt2.turnierverwaltung.main.gameScheduleView;
|
||||||
|
|
||||||
import ch.zhaw.projekt2.turnierverwaltung.FXController;
|
import ch.zhaw.projekt2.turnierverwaltung.FXController;
|
||||||
import ch.zhaw.projekt2.turnierverwaltung.Tournament;
|
|
||||||
import javafx.event.ActionEvent;
|
import javafx.event.ActionEvent;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.Button;
|
import javafx.scene.control.Button;
|
||||||
@@ -30,7 +29,14 @@ public class GameScheduleController extends FXController {
|
|||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
void createNewSchedule(ActionEvent event) {
|
void createNewSchedule(ActionEvent event) {
|
||||||
getTournamentDecorator().createNewGameSchedule();
|
if (getTournamentDecorator().getTournament().getGameList().size() > 0) {
|
||||||
|
AlertNewSchedule alert = new AlertNewSchedule();
|
||||||
|
if (alert.showAndGetResult()) {
|
||||||
|
getTournamentDecorator().createNewGameSchedule();
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
getTournamentDecorator().createNewGameSchedule();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
|
|||||||
+1
-3
@@ -21,9 +21,7 @@ public class AlertDelete extends Alert {
|
|||||||
public boolean showAndGetResult() {
|
public boolean showAndGetResult() {
|
||||||
result = false;
|
result = false;
|
||||||
showAndWait().ifPresent(type -> {
|
showAndWait().ifPresent(type -> {
|
||||||
if (type == yesButton) {
|
result = type == yesButton;
|
||||||
result = true;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user