diff --git a/log/log4j/log.out b/log/log4j/log.out
index cb8f24b..c07f544 100644
--- a/log/log4j/log.out
+++ b/log/log4j/log.out
@@ -63,3 +63,19 @@ App started
2021-03-03 15:50:47 INFO PostgresHelper:15 - User Table created
2021-03-03 15:52:06 INFO TourPlaner:15 - Tour Planer App gestartet
2021-03-03 15:52:07 INFO PostgresHelper:15 - User Table created
+2021-03-16 22:03:23 INFO TourPlaner:15 - Tour Planer App gestartet
+2021-03-16 22:03:23 INFO PostgresHelper:15 - User Table created
+2021-03-16 22:03: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-16 22:03:25 ERROR NullPointerException:33 -
+2021-03-16 22:03:58 INFO TourPlaner:15 - Tour Planer App gestartet
+2021-03-16 22:03:58 INFO PostgresHelper:15 - User Table created
+2021-03-16 22:04:00 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-16 22:04:00 ERROR NullPointerException:33 -
+2021-03-16 22:04:06 INFO TourPlaner:15 - Tour Planer App gestartet
+2021-03-16 22:04:06 INFO PostgresHelper:15 - User Table created
+2021-03-16 22:04:08 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-16 22:04:08 ERROR NullPointerException:33 -
+2021-03-17 13:13:25 INFO TourPlaner:15 - Tour Planer App gestartet
+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 -
diff --git a/src/tourplaner/business/TourPlaner.java b/src/tourplaner/business/TourPlaner.java
index 744534f..1323415 100644
--- a/src/tourplaner/business/TourPlaner.java
+++ b/src/tourplaner/business/TourPlaner.java
@@ -1,6 +1,5 @@
package tourplaner.business;
-import javafx.stage.Stage;
import org.apache.log4j.Logger;
import tourplaner.data.DbConnect;
@@ -10,14 +9,14 @@ import tourplaner.data.DbConnect;
public class TourPlaner{
private Logger logger;
- /**
- * Startet alle bennötigten Komponenten
- * @param primaryStage Stage für den Presenter
- */
- public TourPlaner(Stage primaryStage){
+ public TourPlaner(){
String startText = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message");
LogHelper.info(startText, "TourPlaner");
new DbConnect().init();
}
+
+ public String getMapJson(String start, String ziel){
+ return start + " " + ziel;
+ }
}
diff --git a/src/tourplaner/tourplaner.fxml b/src/tourplaner/tourplaner.fxml
index 08e8e24..b90af69 100644
--- a/src/tourplaner/tourplaner.fxml
+++ b/src/tourplaner/tourplaner.fxml
@@ -96,7 +96,7 @@
-
+
@@ -111,9 +111,9 @@
-
+
-
+
@@ -122,9 +122,9 @@
-
+
-
+
@@ -138,21 +138,21 @@
-
+
-
+
-
+
-
+
-
+
@@ -161,13 +161,13 @@
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
diff --git a/src/tourplaner/ui/TourplanerController.java b/src/tourplaner/ui/TourplanerController.java
index 2dd2b71..afd5488 100644
--- a/src/tourplaner/ui/TourplanerController.java
+++ b/src/tourplaner/ui/TourplanerController.java
@@ -1,10 +1,13 @@
package tourplaner.ui;
+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.input.MouseEvent;
import javafx.scene.web.WebView;
import tourplaner.viewmodels.ViewModel;
@@ -15,6 +18,13 @@ public class TourplanerController implements Initializable {
public ViewModel viewModel = new ViewModel();
public ListView TourListView = new ListView<>();
+ public TabPane viewTabPane;
+ public Tab kartenTab, beschreibungTab;
+
+ @FXML
+ private void tourListSelectedItem(MouseEvent mouseEvent){
+ System.out.println(TourListView.getSelectionModel().getSelectedItem());
+ }
@FXML
private void addTour(){
@@ -39,5 +49,11 @@ public class TourplanerController implements Initializable {
TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
TourListView.setOrientation(Orientation.VERTICAL);
TourListView.setItems(this.viewModel.getTourNamen());
+ TourListView.setOnMouseClicked(new EventHandler() {
+ @Override
+ public void handle(MouseEvent mouseEvent) {
+ System.out.println(TourListView.getSelectionModel().getSelectedItem());
+ }
+ });
}
}
diff --git a/src/tourplaner/viewmodels/ViewModel.java b/src/tourplaner/viewmodels/ViewModel.java
index 25839b5..7249bf2 100644
--- a/src/tourplaner/viewmodels/ViewModel.java
+++ b/src/tourplaner/viewmodels/ViewModel.java
@@ -3,16 +3,44 @@ package tourplaner.viewmodels;
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.scene.control.TextInputDialog;
+import tourplaner.business.TourPlaner;
import tourplaner.object.Tour;
-
import java.util.Optional;
public class ViewModel {
-
private final ObservableList tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3),new Tour("Test 2", "210", "json dings", 42.3));
private final ObservableList tourNamen = FXCollections.observableArrayList("Test 1", "Test 2");
+ private String neueTourName, neueTourStart, neueTourZiel;
+
+ 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 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 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 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));
+ tourNamen.add(this.neueTourName);
+ });
+ });
+ });
+ }
- private String neueTourName, neueTourStart;
public ObservableList getTourNamen() {
return tourNamen;
@@ -38,33 +66,6 @@ public class ViewModel {
return tourData;
}
- public void addTour(){
- TextInputDialog dialog = new TextInputDialog("");
- dialog.setTitle("Tour Name");
- dialog.setHeaderText("Bitte geben Sie den Namen der Tour an!");
- dialog.setContentText("Name: ");
-
-// Traditional way to get the response value.
- Optional result = dialog.showAndWait();
- result.ifPresent(s -> {
- this.neueTourName = result.get();
- TextInputDialog dialogg = new TextInputDialog("");
- dialogg.setTitle("Tour Startpunkt");
- dialogg.setHeaderText("Bitte geben Sie den Startpunkt der Tour an!");
- dialogg.setContentText("Startpunkt: ");
-
-// Traditional way to get the response value.
- Optional resultt = dialogg.showAndWait();
- result.ifPresent(ss -> {
- this.neueTourStart = resultt.get();
- tourData.add(new Tour("Test 3", "120", "json dings", 22.3));
- tourNamen.add("Test 3");
- });
- });
-
- }
-
-
public void delTour() {
}