Compare commits

...

4 Commits
dev ... 0.1.2

Author SHA1 Message Date
29476f49e7 Add Tour -> unique Name + no empty imput
AlertHelper -> warn, info, error, exception
2021-03-17 17:13:28 +01:00
df1cef295b Beenden Knopf 2021-03-17 15:30:20 +01:00
a7479726ac Del Tour 2021-03-17 15:20:31 +01:00
33aaaebe89 Tour Listview onclick + Tour Beschreibung Daten Laden 2021-03-17 14:55:56 +01:00
6 changed files with 351 additions and 119 deletions

View File

@ -79,3 +79,61 @@ App started
2021-03-17 13:13:25 INFO PostgresHelper:15 - User Table created
2021-03-17 13:13:27 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 13:13:27 ERROR NullPointerException:33 -
2021-03-17 14:39:16 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 14:39:16 INFO PostgresHelper:15 - User Table created
2021-03-17 14:39:18 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 14:39:18 ERROR NullPointerException:33 -
2021-03-17 14:46:45 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 14:46:45 INFO PostgresHelper:15 - User Table created
2021-03-17 14:46:47 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 14:46:47 ERROR NullPointerException:33 -
2021-03-17 14:48:46 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 14:48:46 INFO PostgresHelper:15 - User Table created
2021-03-17 14:48:48 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 14:48:48 ERROR NullPointerException:33 -
2021-03-17 15:20:09 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 15:20:09 INFO PostgresHelper:15 - User Table created
2021-03-17 15:20:11 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 15:20:11 ERROR NullPointerException:33 -
2021-03-17 15:36:24 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
2021-03-17 15:38:41 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
2021-03-17 16:02:24 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 16:02:24 INFO PostgresHelper:15 - User Table created
2021-03-17 16:02:26 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 16:02:26 ERROR NullPointerException:33 -
2021-03-17 16:03:16 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 16:03:16 INFO PostgresHelper:15 - User Table created
2021-03-17 16:03:18 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 16:03:18 ERROR NullPointerException:33 -
2021-03-17 16:04:18 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 16:04:18 INFO PostgresHelper:15 - User Table created
2021-03-17 16:04:20 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 16:04:20 ERROR NullPointerException:33 -
2021-03-17 16:04:26 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 16:04:26 INFO PostgresHelper:15 - User Table created
2021-03-17 16:04:28 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 16:04:28 ERROR NullPointerException:33 -
2021-03-17 16:06:47 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 16:06:47 INFO PostgresHelper:15 - User Table created
2021-03-17 16:06:49 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 16:06:49 ERROR NullPointerException:33 -
2021-03-17 16:06:55 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 16:06:55 INFO PostgresHelper:15 - User Table created
2021-03-17 16:06:57 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 16:06:57 ERROR NullPointerException:33 -
2021-03-17 17:02:33 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 17:02:33 INFO PostgresHelper:15 - User Table created
2021-03-17 17:02:35 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 17:02:35 ERROR NullPointerException:33 -
2021-03-17 17:02:38 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 17:02:38 INFO PostgresHelper:15 - User Table created
2021-03-17 17:02:40 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 17:02:40 ERROR NullPointerException:33 -
2021-03-17 17:08:23 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 17:08:23 INFO PostgresHelper:15 - User Table created
2021-03-17 17:08:25 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 17:08:25 ERROR NullPointerException:33 -
2021-03-17 17:08:31 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-17 17:08:31 INFO PostgresHelper:15 - User Table created
2021-03-17 17:08:33 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
2021-03-17 17:08:33 ERROR NullPointerException:33 -

View File

@ -0,0 +1,79 @@
package tourplaner.business;
import javafx.scene.control.Alert;
import javafx.scene.control.Label;
import javafx.scene.control.TextArea;
import javafx.scene.control.TextInputDialog;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
public class AlertHelper {
public static void warn(String title, String header, String msg){
alertType(Alert.AlertType.WARNING, title, header, msg);
}
public static void inform(String title, String header, String msg){
alertType(Alert.AlertType.INFORMATION, title, header, msg);
}
public static void informNoHeader(String title, String msg){
inform(title, null, msg);
}
public static void error(String title, String header, String msg){
alertType(Alert.AlertType.ERROR, title, header, msg);
}
public static void exerror(String title, String header, String msg, Exception ex){
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle(title);
alert.setHeaderText(header);
alert.setContentText(msg);
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
ex.printStackTrace(pw);
String exceptionText = sw.toString();
Label label = new Label("Exception stacktrace:");
TextArea textArea = new TextArea(exceptionText);
textArea.setEditable(false);
textArea.setWrapText(true);
textArea.setMaxWidth(Double.MAX_VALUE);
textArea.setMaxHeight(Double.MAX_VALUE);
GridPane.setVgrow(textArea, Priority.ALWAYS);
GridPane.setHgrow(textArea, Priority.ALWAYS);
GridPane expContent = new GridPane();
expContent.setMaxWidth(Double.MAX_VALUE);
expContent.add(label, 0, 0);
expContent.add(textArea, 0, 1);
alert.getDialogPane().setExpandableContent(expContent);
alert.showAndWait();
}
private static void alertType(Alert.AlertType alertly, String title, String header, String msg){
Alert alert = new Alert(alertly);
alert.setTitle(title);
alert.setHeaderText(header);
alert.setContentText(msg);
alert.showAndWait();
}
public static String inputText(String title, String header, String msg) {
TextInputDialog dialog = new TextInputDialog();
dialog.setTitle(title);
dialog.setHeaderText(header);
dialog.setContentText(msg);
Optional<String> result = dialog.showAndWait();
AtomicReference<String> returnText = new AtomicReference<>("");
result.ifPresent(returnText::set);
if(!returnText.get().isEmpty()){
return returnText.get();
}else{
return null;
}
}
}

View File

@ -6,22 +6,18 @@ package tourplaner.object;
public class Tour {
private String dauer;
private String mapJson;
private double distanz;
private double strecke;
private String name;
private String start;
private String ziel;
public Tour(String name, String dauer, String mapJson, double distanz) {
public Tour(String name, String dauer, String mapJson, double strecke, String start, String ziel) {
this.dauer = dauer;
this.mapJson = mapJson;
this.distanz = distanz;
this.name = name;
}
public String getName() {
return name;
}
public void setName(String name) {
this.strecke = strecke;
this.name = name;
this.start = start;
this.ziel = ziel;
}
public String getDauer() {
@ -40,11 +36,35 @@ public class Tour {
this.mapJson = mapJson;
}
public double getDistanz() {
return distanz;
public double getStrecke() {
return strecke;
}
public void setDistanz(double distanz) {
this.distanz = distanz;
public void setStrecke(double strecke) {
this.strecke = strecke;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getStart() {
return start;
}
public void setStart(String start) {
this.start = start;
}
public String getZiel() {
return ziel;
}
public void setZiel(String ziel) {
this.ziel = ziel;
}
}

View File

@ -32,64 +32,41 @@
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-->
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.paint.*?>
<?import javafx.scene.text.*?>
<?import javafx.scene.web.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ListView?>
<?import javafx.scene.control.Menu?>
<?import javafx.scene.control.MenuBar?>
<?import javafx.scene.control.MenuItem?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.control.Tab?>
<?import javafx.scene.control.TabPane?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.paint.Color?>
<?import javafx.scene.text.Font?>
<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
<children>
<MenuBar VBox.vgrow="NEVER">
<menus>
<Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
<items>
<MenuItem mnemonicParsing="false" text="Neu" />
<MenuItem mnemonicParsing="false" text="Öffnen" />
<Menu mnemonicParsing="false" text="Open Recent" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Close" />
<MenuItem mnemonicParsing="false" text="Save" />
<MenuItem mnemonicParsing="false" text="Save As…" />
<MenuItem mnemonicParsing="false" text="Revert" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Preferences…" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Quit" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Bearbeiten">
<items>
<MenuItem mnemonicParsing="false" text="Undo" />
<MenuItem mnemonicParsing="false" text="Redo" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Cut" />
<MenuItem mnemonicParsing="false" text="Copy" />
<MenuItem mnemonicParsing="false" text="Paste" />
<MenuItem mnemonicParsing="false" text="Delete" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Select All" />
<MenuItem mnemonicParsing="false" text="Unselect All" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Optionen">
<items>
<MenuItem mnemonicParsing="false" text="Undo" />
<MenuItem mnemonicParsing="false" text="Redo" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Cut" />
<MenuItem mnemonicParsing="false" text="Copy" />
<MenuItem mnemonicParsing="false" text="Paste" />
<MenuItem mnemonicParsing="false" text="Delete" />
<SeparatorMenuItem mnemonicParsing="false" />
<MenuItem mnemonicParsing="false" text="Select All" />
<MenuItem mnemonicParsing="false" text="Unselect All" />
<MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
</items>
</Menu>
<Menu mnemonicParsing="false" text="Bearbeiten" />
<Menu mnemonicParsing="false" text="Optionen" />
<Menu mnemonicParsing="false" text="Hilfe">
<items>
<MenuItem mnemonicParsing="false" text="About MyHelloApp" />
<MenuItem mnemonicParsing="false" text="Git Repo" />
<MenuItem mnemonicParsing="false" text="JavaDoc" />
<MenuItem mnemonicParsing="false" text="Unspecified Action" />
</items>
</Menu>
</menus>
@ -113,11 +90,7 @@
<items>
<AnchorPane prefWidth="239.0">
<children>
<ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
</padding>
</ListView>
<ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
</children>
</AnchorPane>
<SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0">
@ -133,7 +106,7 @@
<Insets left="10.0" />
</HBox.margin>
</Label>
<TextField fx:id="titleInput" />
<TextField fx:id="titleTextView" editable="false" />
</children>
</HBox>
</children>
@ -142,17 +115,25 @@
<children>
<TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
<tabs>
<Tab text="Route">
<Tab fx:id="kartenTab" text="Karte">
<content>
<AnchorPane prefWidth="200.0">
<AnchorPane />
</content></Tab>
<Tab fx:id="beschreibungTab" text="Beschreibung">
<content>
<AnchorPane>
<children>
<WebView id="mapView" prefHeight="-1.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
<TableView fx:id="beschreibungTableView" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<columns>
<TableColumn fx:id="nameCol" maxWidth="1.7976931348623157E308" minWidth="70.0" prefWidth="-1.0" text="Tourname" />
<TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="40.0" prefWidth="-1.0" text="Dauer" />
<TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="50.0" prefWidth="-1.0" text="Strecke" />
<TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Startpunk" />
<TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Zielpunkt" />
</columns>
</TableView>
</children>
</AnchorPane>
</content></Tab>
<Tab text="Description">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefWidth="200.0" />
</content>
</Tab>
</tabs>

View File

@ -1,14 +1,17 @@
package tourplaner.ui;
import javafx.collections.ObservableList;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.geometry.Orientation;
import javafx.scene.control.ListView;
import javafx.scene.control.SelectionMode;
import javafx.scene.control.TabPane;
import javafx.scene.control.*;
import javafx.scene.control.cell.PropertyValueFactory;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.Pane;
import javafx.scene.web.WebView;
import tourplaner.business.AlertHelper;
import tourplaner.object.Tour;
import tourplaner.viewmodels.ViewModel;
import java.net.URL;
@ -20,40 +23,82 @@ public class TourplanerController implements Initializable {
public ListView<String> TourListView = new ListView<>();
public TabPane viewTabPane;
public Tab kartenTab, beschreibungTab;
public TableView<Tour> beschreibungTableView;
public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
public TextField titleTextView, sucheInput;
/**
* Wird gestartet wenn eine Tour in der Tour listView ausgewählt wird
* @param mouseEvent Triggered Event
*/
@FXML
private void tourListSelectedItem(MouseEvent mouseEvent){
System.out.println(TourListView.getSelectionModel().getSelectedItem());
String selectedItem = TourListView.getSelectionModel().getSelectedItem();
this.viewModel.selectTour(selectedItem);
titleTextView.setText(selectedItem);
beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
streckeCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("strecke"));
nameCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("name"));
}
/**
* Beendet die App
* Verbunden mit dem Menu -> Datei -> Beenden
*/
@FXML
private void quitApp(){
System.exit(0);
}
/**
* Fügt eine Tour hinzu
* Verbunden mit Button -> Tour -> +
*/
@FXML
private void addTour(){
this.viewModel.addTour();
}
/**
* Entfernt eine ausgewählte Tour
* Verbunden mit Button -> Tour -> -
*/
@FXML
private void delTour(){
this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
this.titleTextView.setText("Keine Tour ausgewählt!");
this.viewModel.delTour();
}
/**
* Sucht eine Tour
* Verbunden mit Button -> Suche
*/
@FXML
private void suche(){
this.viewModel.suche();
String sucheInput = this.sucheInput.getText();
if(sucheInput.isEmpty()){
AlertHelper.warn("ACHTUNG", "Suchfeld ist leer!", "Bitte zuerst den Suchtext in das Suchfeld eingeben!");
}else {
this.viewModel.suche(sucheInput);
}
}
@FXML
private WebView mapView;
/**
* Wird beim Start ausgeführt
* @param url
* @param resourceBundle
*/
@Override
public void initialize(URL url, ResourceBundle resourceBundle) {
TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
TourListView.setOrientation(Orientation.VERTICAL);
TourListView.setItems(this.viewModel.getTourNamen());
TourListView.setOnMouseClicked(new EventHandler<MouseEvent>() {
@Override
public void handle(MouseEvent mouseEvent) {
System.out.println(TourListView.getSelectionModel().getSelectedItem());
}
});
this.beschreibungTableView.setPlaceholder(new Label("Keine Tour ausgewählt!"));
this.titleTextView.setText("Keine Tour ausgewählt!");
}
}

View File

@ -2,45 +2,80 @@ package tourplaner.viewmodels;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.scene.control.Alert;
import javafx.scene.control.TextInputDialog;
import tourplaner.business.AlertHelper;
import tourplaner.business.LogHelper;
import tourplaner.business.TourPlaner;
import tourplaner.object.Tour;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
public class ViewModel {
private final ObservableList<Tour> tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3),new Tour("Test 2", "210", "json dings", 42.3));
private final ObservableList<Tour> tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3, "Wien", "Graz"),new Tour("Test 2", "210", "json dings", 42.3, "Da", "Dort"));
private final ObservableList<String> tourNamen = FXCollections.observableArrayList("Test 1", "Test 2");
//private final ObservableList<Tour> selectedTour = FXCollections.observableArrayList();
private Tour selectedTour;
private String neueTourName, neueTourStart, neueTourZiel;
/**
* Fügt eine neue Tour hinzu
*/
public void addTour(){
TextInputDialog dialogName = new TextInputDialog("");
dialogName.setTitle("Tour Name");
dialogName.setHeaderText("Bitte geben Sie den Namen der Tour an!");
dialogName.setContentText("Name: ");
Optional<String> resultName = dialogName.showAndWait();
resultName.ifPresent(sname -> {
this.neueTourName = resultName.get();
TextInputDialog dialogStart = new TextInputDialog("");
dialogStart.setTitle("Tour Startpunkt");
dialogStart.setHeaderText("Bitte geben Sie den Startpunkt der Tour an!");
dialogStart.setContentText("Startpunkt: ");
Optional<String> resultStart = dialogStart.showAndWait();
resultStart.ifPresent(sstart -> {
this.neueTourStart = resultStart.get();
TextInputDialog dialogZiel = new TextInputDialog("");
dialogZiel.setTitle("Tour Zielpunkt");
dialogZiel.setHeaderText("Bitte geben Sie den Zielpunkt der Tour an!");
dialogZiel.setContentText("Zielpunkt: ");
Optional<String> resultZiel = dialogZiel.showAndWait();
resultZiel.ifPresent(sziel -> {
this.neueTourZiel = resultZiel.get();
tourData.add(new Tour(this.neueTourName, "120", new TourPlaner().getMapJson(this.neueTourStart, this.neueTourZiel) , 22.3));
while(this.neueTourName == null) {
this.neueTourName = AlertHelper.inputText("Tourname", "Bitte geben Sie den Namen der Tour an!", "Name:");
if (getTour(this.neueTourName) != null) {
AlertHelper.warn("ACHTUNG", "Name bereits vergeben!", "Der Name '"+ this.neueTourName +"' ist bereits vergeben, bitte verwenden Sie einen andern!");
this.neueTourName = null;
}
}
while(this.neueTourStart == null){
this.neueTourStart = AlertHelper.inputText("Tour Startpunkt", "Bitte geben Sie den Startpunkt der Tour an!", "Startpunkt: ");
}
while(this.neueTourZiel == null){
this.neueTourZiel = AlertHelper.inputText("Tour zielpunkt", "Bitte geben Sie den Zielpunkt der Tour an!", "Zielpunkt: ");
}
if (getTour(this.neueTourName) == null) {
tourData.add(new Tour(this.neueTourName, "TBD", "TBD", 0, this.neueTourStart, this.neueTourZiel));
tourNamen.add(this.neueTourName);
});
});
});
}
this.neueTourStart = null;
this.neueTourZiel = null;
this.neueTourName = null;
}
/**
* Holt das Tourobjekt anhand des Namens
* @param tourname Name der Tour
* @return Gefundene Tour
*/
public Tour getTour(String tourname){
AtomicReference<Tour> returnTour = new AtomicReference<>();
tourData.forEach(s -> {
if(s.getName().equals(tourname)){
returnTour.set(s);
}
});
return returnTour.get();
}
public void selectTour(String tourname){
this.selectedTour = getTour(tourname);
// this.selectedTour.removeIf(s -> true);//Alle deselect
// this.selectedTour.add(getTour(tourname));
}
public Tour getSelectedTour() {
return selectedTour;
}
public String getNeueTourZiel() {
return neueTourZiel;
}
public void setNeueTourZiel(String neueTourZiel) {
this.neueTourZiel = neueTourZiel;
}
public ObservableList<String> getTourNamen() {
return tourNamen;
@ -66,10 +101,24 @@ public class ViewModel {
return tourData;
}
public void delTour() {
/**
* Entfernt eine Tour anhand der ausgewählten Tour
*/
public void delTour(){
try {
String tourname = this.selectedTour.getName();
tourData.removeIf(s -> s.getName().equals(tourname));
tourNamen.removeIf(s -> s.equals(tourname));
}catch (NullPointerException e){
LogHelper.error("Keine Tour ausgewählt!", "ViewModel -> DelTour");
AlertHelper.warn("ACHTUNG", "Keine Tour ausgewählt!", "Bitte wählen Sie zuerst eine Tour aus, bevor Sie auf löschen klicken!");
}
}
public void suche(){
/**
* Sucht eine Tour
*/
public void suche(String suchString){
}
}