From 18aa9ffce643405eded3e5c608860fbff588ab38 Mon Sep 17 00:00:00 2001
From: Georg-Notebook <georg@dergeorg.at>
Date: Wed, 17 Mar 2021 13:49:25 +0100
Subject: [PATCH] Erster Button klickbar v2

---
 log/log4j/log.out                           | 16 ++++++
 src/tourplaner/business/TourPlaner.java     | 11 ++--
 src/tourplaner/tourplaner.fxml              | 35 ++++++------
 src/tourplaner/ui/TourplanerController.java | 16 ++++++
 src/tourplaner/viewmodels/ViewModel.java    | 61 +++++++++++----------
 5 files changed, 87 insertions(+), 52 deletions(-)

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 @@
     </MenuBar>
       <HBox id="HBox" alignment="CENTER_LEFT" layoutX="10.0" layoutY="588.0" spacing="5.0">
          <children>
-            <AnchorPane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS">
+            <AnchorPane prefWidth="-1.0" HBox.hgrow="ALWAYS">
                <children>
                   <Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+" />
                   <Label layoutX="14.0" layoutY="4.0" text="Tours" />
@@ -111,9 +111,9 @@
       </HBox>
     <SplitPane dividerPositions="0.21492204899777284" focusTraversable="true" prefHeight="522.0" prefWidth="900.0" VBox.vgrow="ALWAYS">
       <items>
-            <AnchorPane prefHeight="520.0" prefWidth="239.0">
+            <AnchorPane prefWidth="239.0">
                <children>
-                  <ListView fx:id="TourListView" layoutX="-1.0" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                  <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>
@@ -122,9 +122,9 @@
             </AnchorPane>
             <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0">
                <items>
-                  <VBox prefHeight="200.0" prefWidth="100.0">
+                  <VBox prefWidth="100.0">
                      <children>
-                        <AnchorPane prefHeight="51.0" prefWidth="676.0">
+                        <AnchorPane prefWidth="676.0">
                            <children>
                               <HBox id="HBox" alignment="CENTER_LEFT" prefHeight="7.0" prefWidth="44.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                  <children>
@@ -138,21 +138,21 @@
                               </HBox>
                            </children>
                         </AnchorPane>
-                        <AnchorPane prefHeight="200.0" prefWidth="200.0">
+                        <AnchorPane prefWidth="200.0">
                            <children>
-                              <TabPane layoutX="1.0" layoutY="69.0" prefHeight="225.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
+                              <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">
                                        <content>
-                                          <AnchorPane prefHeight="200.0" prefWidth="200.0">
+                                          <AnchorPane prefWidth="200.0">
                                              <children>
-                                                <WebView id="mapView" prefHeight="200.0" prefWidth="200.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
+                                                <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" />
                                              </children>
                                           </AnchorPane>
                                        </content></Tab>
                                     <Tab text="Description">
                                        <content>
-                                          <AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="180.0" prefWidth="200.0" />
+                                          <AnchorPane minHeight="0.0" minWidth="0.0" prefWidth="200.0" />
                                        </content>
                                     </Tab>
                                  </tabs>
@@ -161,13 +161,13 @@
                         </AnchorPane>
                      </children>
                   </VBox>
-                  <AnchorPane prefHeight="200.0" prefWidth="200.0">
+                  <AnchorPane prefWidth="200.0">
                      <children>
-                        <VBox prefHeight="200.0" prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                        <VBox prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                            <children>
-                              <AnchorPane prefHeight="51.0" prefWidth="676.0">
+                              <AnchorPane prefWidth="676.0">
                                  <children>
-                                    <HBox id="HBox" alignment="CENTER_LEFT" prefHeight="38.0" prefWidth="702.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                    <HBox id="HBox" alignment="CENTER_LEFT" prefWidth="702.0" spacing="5.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                        <children>
                                           <Label text="Logs:">
                                              <HBox.margin>
@@ -191,14 +191,17 @@
                                     </HBox>
                                  </children>
                               </AnchorPane>
-                              <AnchorPane prefHeight="200.0" prefWidth="200.0">
+                              <AnchorPane prefWidth="200.0">
                                  <children>
-                                    <TableView prefHeight="209.0" prefWidth="702.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+                                    <TableView AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                       <columns>
                                         <TableColumn prefWidth="238.0" text="Date" />
                                         <TableColumn prefWidth="223.0" text="Duration" />
                                           <TableColumn prefWidth="240.0" text="Distance" />
                                       </columns>
+                                       <columnResizePolicy>
+                                          <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                                       </columnResizePolicy>
                                     </TableView>
                                  </children>
                               </AnchorPane>
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<String> 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<MouseEvent>() {
+            @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<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<String> 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<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));
+                    tourNamen.add(this.neueTourName);
+                });
+            });
+        });
+    }
 
-    private String neueTourName, neueTourStart;
 
     public ObservableList<String> 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<String> 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<String> 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() {
     }