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

implemented functionality of PlacesFormular

This commit is contained in:
schrom01 2022-05-01 22:43:41 +02:00
parent 594299f3b2
commit 2f111cf1e4
11 changed files with 185 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/FactoryDecorator.java
View File

@ -61,6 +61,10 @@ public class FactoryDecorator implements IsObservable{
factory.loadPlacesFormular((BorderPane) pane, this);
}
public void openScheduleView() {
factory.loadGameScheduler((BorderPane) pane, this);
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();

10
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Game.java
View File

@ -5,14 +5,14 @@ import java.io.Serializable;
public class Game implements Serializable {
private Participant participant1, Participant2;
private int points1, points2;
private Location location;
private Place place;
public Location getLocation() {
return location;
public Place getLocation() {
return place;
}
public void setLocation(Location location) {
this.location = location;
public void setLocation(Place place) {
this.place = place;
}
public int getPoints1() {

17
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Location.java
View File

@ -1,17 +0,0 @@
package ch.zhaw.projekt2.turnierverwaltung;
public class Location {
private String name;
public Location(String name){
setName(name);
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

21
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Place.java Normal file
View File

@ -0,0 +1,21 @@
package ch.zhaw.projekt2.turnierverwaltung;
public class Place {
private final String NAME_MATCHING_REGEX = "[a-zA-Z0-9]{1,20}";
private String name;
public Place(String name) throws InvalidNameException {
if(!name.matches(NAME_MATCHING_REGEX)){
throw new InvalidNameException("The Name is Invalid.");
}
setName(name);
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

45
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/Tournament.java
View File

@ -13,6 +13,7 @@ public class Tournament implements Serializable {
private String name;
private Type type;
private List<Participant> participants;
private List<Place> places;
@ -50,6 +51,28 @@ public class Tournament implements Serializable {
return participantsObservable;
}
public void addPlace(Place newPlace) throws PlaceExistsException {
for(Place place : places){
if(place.equals(newPlace)){
places.remove(place);
}
}
places.add(newPlace);
}
public void removePlace(Place place) throws PlaceNotExistsException {
if(!places.contains(place)){
throw new PlaceNotExistsException("The given Place is not part of this Tournament");
}
places.remove(place);
}
public ObservableList<Place> getPlaces() {
ObservableList<Place> placesObservable = FXCollections.observableArrayList();
placesObservable.addAll(places);
return placesObservable;
}
public String getName() {
return name;
}
@ -120,5 +143,27 @@ public class Tournament implements Serializable {
}
public class PlaceExistsException extends Exception {
public PlaceExistsException() {
super();
}
public PlaceExistsException(String errorMessage) {
super(errorMessage);
}
}
public class PlaceNotExistsException extends Exception {
public PlaceNotExistsException() {
super();
}
public PlaceNotExistsException(String errorMessage) {
super(errorMessage);
}
}
}

20
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/TournamentDecorator.java
View File

@ -101,6 +101,26 @@ public class TournamentDecorator implements IsObservable{
}
}
public void savePlace(String name){
try {
tournament.addPlace(new Place(name));
informListener();
} catch (Tournament.PlaceExistsException e) {
e.printStackTrace(); //TODO handle and logging
} catch (InvalidNameException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void deletePlace(Place place){
try {
tournament.removePlace(place);
informListener();
} catch (Tournament.PlaceNotExistsException e) {
e.printStackTrace(); //TODO handle and logging
}
}
public void informListener() {
for(IsObserver observer : listener) {
observer.update();

9
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/participantAddFormular/ParticipantFormularController.java
View File

@ -76,27 +76,20 @@ public class ParticipantFormularController extends FXController {
birthDateTextField.setText(participant.getFormatedDateOfBirth());
}
@FXML
void changeParticipant(MouseEvent event) {
}
@FXML
void saveParticipant(ActionEvent event) {
getTournamentDecorator().savePlayer(firstNameTextField.getText(), participantNameTextField.getText(), phoneNumberTextField.getText(), birthDateTextField.getText());
}
@FXML
void delete(ActionEvent event) {
System.out.println("delete");
Participant participant = participantListView.getSelectionModel().getSelectedItems().get(0);
getTournamentDecorator().deleteParticipant(participant);
}
@FXML
void close(ActionEvent event) {
getFactoryDecorator().openScheduleView();
}
@Override

60
app/src/main/java/ch/zhaw/projekt2/turnierverwaltung/main/placesAddFormular/PlacesFormularController.java
View File

@ -1,6 +1,8 @@
package ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular;
import ch.zhaw.projekt2.turnierverwaltung.FXController;
import ch.zhaw.projekt2.turnierverwaltung.Place;
import ch.zhaw.projekt2.turnierverwaltung.Player;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import javafx.scene.control.Button;
@ -9,11 +11,33 @@ import javafx.scene.control.ListView;
import javafx.scene.control.TextField;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.VBox;
public class PlacesFormularController extends FXController {
@FXML
private Label AddListTitle;
private Button addBtn;
@FXML
private Label birthDateLabel;
@FXML
private TextField birthDateTextField;
@FXML
private VBox changeBtn;
@FXML
private Label firstNameLabel;
@FXML
private TextField firstNameTextField;
@FXML
private GridPane grid;
@FXML
private Label newPlaceFormularTitle;
@FXML
private Button closeBtn;
@ -21,46 +45,52 @@ public class PlacesFormularController extends FXController {
@FXML
private Button deleteBtn;
@FXML
private GridPane grid;
@FXML
private ListView<?> locationListView;
private Label placeListTitle;
@FXML
private Label locationNameLabel;
private ListView<Place> placeListView;
@FXML
private TextField locationNameTextField;
private Label placeNameLabel;
@FXML
private Label newLocationFormularTitle;
private TextField placeNameTextField;
@FXML
private Label phoneNumberLabel;
@FXML
private TextField phoneNumberTextField;
@FXML
private Button saveBtn;
@FXML
void changedSelection(MouseEvent event){
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
placeNameTextField.setText(place.getName());
}
@FXML
void closeFormular(ActionEvent event) {
void savePlace(ActionEvent event) {
getTournamentDecorator().savePlace(placeNameTextField.getText());
}
@FXML
void deleteSelectedPlace(ActionEvent event) {
void delete(ActionEvent event) {
Place place = placeListView.getSelectionModel().getSelectedItems().get(0);
getTournamentDecorator().deletePlace(place);
}
@FXML
void saveLocation(ActionEvent event) {
void close(ActionEvent event) {
getFactoryDecorator().openScheduleView();
}
@Override
public void loadContent() {
placeListView.setItems(getTournamentDecorator().getTournament().getPlaces());
}
}

2
app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/participantAddFormular/participantFormular.fxml
View File

@ -53,7 +53,7 @@
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Separator>
<VBox fx:id="changeBtn" alignment="TOP_CENTER" onDragDetected="#changeParticipant" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="newParticipantFormularTitle" text="Teilnehmer ändern/erstellen">
<font>

57
app/src/main/resources/ch/zhaw/projekt2/turnierverwaltung/placesAddFormular/PlacesFormular.fxml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
@ -13,11 +12,11 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<HBox maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="404.0" prefWidth="635.0" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
<HBox alignment="CENTER" VBox.vgrow="ALWAYS" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/17" fx:controller="ch.zhaw.projekt2.turnierverwaltung.main.placesAddFormular.PlacesFormularController">
<children>
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="AddListTitle" text="Hinzugefügt">
<Label fx:id="placeListTitle" text="Hinzugefügt">
<font>
<Font name="System Bold" size="21.0" />
</font>
@ -25,30 +24,38 @@
<Insets bottom="20.0" />
</VBox.margin>
</Label>
<ListView fx:id="locationListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<ListView fx:id="placeListView" onMouseClicked="#changedSelection" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets left="10.0" right="10.0" />
</VBox.margin>
<opaqueInsets>
<Insets />
</opaqueInsets>
</VBox.margin>
</ListView>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<children>
<Button fx:id="closeBtn" mnemonicParsing="false" onAction="#closeFormular" text="Schliessen">
<Button fx:id="closeBtn" mnemonicParsing="false" onAction="#close" text="Schliessen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#delete" text="Löschen">
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</Button>
<Button fx:id="deleteBtn" mnemonicParsing="false" onAction="#deleteSelectedPlace" text="Löschen" />
</children>
</HBox>
</children>
<HBox.margin>
<Insets left="40.0" />
</HBox.margin>
</VBox>
<Separator orientation="VERTICAL" prefHeight="200.0" />
<VBox alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0">
<Separator orientation="VERTICAL" prefHeight="200.0">
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Separator>
<VBox fx:id="changeBtn" alignment="TOP_CENTER" prefHeight="331.0" prefWidth="308.0" HBox.hgrow="ALWAYS">
<children>
<Label fx:id="newLocationFormularTitle" text="Austragungsort bearbeiten/erstellen">
<Label fx:id="newplaceFormularTitle" text="Teilnehmer ändern/erstellen">
<font>
<Font name="System Bold" size="21.0" />
</font>
@ -64,27 +71,43 @@
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label fx:id="locationNameLabel" styleClass="lableGrid" text="Austragungsort">
<Label fx:id="placeNameLabel" styleClass="lableGrid" text="Name">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="locationNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
<TextField fx:id="placeNameTextField" styleClass="inputGrid" GridPane.columnIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</TextField>
<Label fx:id="firstNameLabel" styleClass="lableGrid" text="Vorname" GridPane.rowIndex="1">
<GridPane.margin>
<Insets />
</GridPane.margin>
</Label>
<TextField fx:id="firstNameTextField" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<TextField fx:id="phoneNumberTextField" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<TextField fx:id="birthDateTextField" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label fx:id="phoneNumberLabel" text="Telefonnummer" GridPane.rowIndex="2" />
<Label fx:id="birthDateLabel" text="Geb. Datum" GridPane.rowIndex="3" />
</children>
</GridPane>
<Separator prefWidth="200.0" />
<Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#saveLocation" text="Speichern" VBox.vgrow="ALWAYS">
<Button fx:id="saveBtn" alignment="TOP_LEFT" mnemonicParsing="false" onAction="#savePlace" text="Speichern" VBox.vgrow="ALWAYS">
<VBox.margin>
<Insets bottom="10.0" top="30.0" />
</VBox.margin>
</Button>
</children>
<HBox.margin>
<Insets right="40.0" />
</HBox.margin>
</VBox>
</children>
</HBox>

4
gradlew.bat vendored
View File

@ -46,7 +46,7 @@ echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo place of your Java installation.
goto fail
@ -60,7 +60,7 @@ echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo place of your Java installation.
goto fail