DB -> Log get, add, edit, del

DB -> Tour add, edit, del
DB Table erstellt + Get All Tours
2021-04-14 23:47:35 +02:00 · 2021-04-14 22:11:53 +02:00 · 2021-04-14 00:37:00 +02:00 · 2021-04-13 23:22:54 +02:00 · 2021-04-13 14:52:36 +02:00 · 2021-04-13 14:16:07 +02:00
22 changed files with 1050 additions and 198 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,5 @@
 out/
 conf.ini
+log/
+reports/
+.idea/dataSources*
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="postgres@postgres.dergeorg.at" uuid="304c5f90-6427-4696-beb2-a9a4e6b29a05">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://postgres.dergeorg.at:5432/postgres</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>
--- a/.idea/libraries/org_apache_pdfbox_pdfbox_1_8_9.xml
+++ b/.idea/libraries/org_apache_pdfbox_pdfbox_1_8_9.xml
@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="org.apache.pdfbox:pdfbox:1.8.9" type="repository">
+    <properties maven-id="org.apache.pdfbox:pdfbox:1.8.9" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/pdfbox/pdfbox/1.8.9/pdfbox-1.8.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/pdfbox/fontbox/1.8.9/fontbox-1.8.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/pdfbox/jempbox/1.8.9/jempbox-1.8.9.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
--- a/.idea/libraries/org_postgresql_postgresql_42_2_19.xml
+++ b/.idea/libraries/org_postgresql_postgresql_42_2_19.xml
@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="org.postgresql:postgresql:42.2.19" type="repository">
+    <properties maven-id="org.postgresql:postgresql:42.2.19" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/postgresql/postgresql/42.2.19/postgresql-42.2.19.jar!/" />
+      <root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.5.0/checker-qual-3.5.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/src/tourplaner/data/PostgresHelper.java" dialect="GenericSQL" />
+    <file url="PROJECT" dialect="PostgreSQL" />
+  </component>
+</project>
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>
--- a/Tourplaner.iml
+++ b/Tourplaner.iml
@ -10,5 +10,7 @@
    <orderEntry type="library" name="lib" level="project" />
    <orderEntry type="library" name="org.ini4j:ini4j:0.5.4" level="project" />
    <orderEntry type="library" name="log4j:log4j:1.2.17" level="project" />
+    <orderEntry type="library" name="org.apache.pdfbox:pdfbox:1.8.9" level="project" />
+    <orderEntry type="library" name="org.postgresql:postgresql:42.2.19" level="project" />
  </component>
 </module>
--- a/TourplanerTabellen.sql
+++ b/TourplanerTabellen.sql
@ -0,0 +1,20 @@
+// Tour Tabelle
+
+create table tour
+(
+	tourname varchar not null,
+	dauer decimal,
+	mapjson varchar,
+	start varchar,
+	ziel varchar,
+	strecke decimal
+);
+
+create unique index tour_tourname_uindex
+	on tour (tourname);
+
+alter table tour add constraint tour_pk primary key (tourname);
+
+#// Log Table
+
+create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal);
--- a/conf.ini.sample
+++ b/conf.ini.sample
@ -13,6 +13,9 @@ port = 5432
 user =
 pw =

+[report]
+path = ./reports/
+
 [hilfe]
 gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
 doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
--- a/langde.ini
+++ b/langde.ini
@ -34,3 +34,9 @@ logtournotselectedmsg = Bitte wählen Sie zuerst eine Tour aus, bevor sie einen
 keintextimfeld = Bitte tragen Sie einen Text in das Feld ein!
 nurzahlen = Bitte geben Sie nur Zahlen an!
 nurpositivezahlen = Bitte geben Sie nur positive Zahlen an!
+pause = Pause
+pausemsg = Dauer der Pause
+hightmeter = Höhenmeter
+hightmetermsg = Höhenmeter des Abschnitts
+bemerkung = Bemerkung
+bemerkungheader = Bitte geben Sie die Bemerkungen zu diesem Log eintrag ein, kann auch leer bleiben.
--- a/log/log4j/log.out
+++ b/log/log4j/log.out
@ -1,10 +0,0 @@
-2021-03-18 22:41:23 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 22:48:51 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 22:53:17 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 22:57:20 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 22:57:28 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 22:58:33 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 22:58:34 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 23:05:00 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 23:11:45 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-18 23:14:55 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
--- a/src/tourplaner/Main.java
+++ b/src/tourplaner/Main.java
@ -8,6 +8,7 @@ import javafx.scene.image.Image;
 import javafx.stage.Stage;

 import tourplaner.business.ConfigHelper;
+import tourplaner.business.TourPlaner;

 import java.io.IOException;

@ -23,7 +24,8 @@ public class Main extends Application {
        Parent root  = FXMLLoader.load(Main.class.getResource("tourplaner.fxml"));
        primaryStage.setTitle(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "apptitle"));
        primaryStage.getIcons().add(new Image("file:"+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo")));
-        primaryStage.setScene(new Scene(root, 600, 600));
+        TourPlaner.init();
+        primaryStage.setScene(new Scene(root, 1500, 1000));
        primaryStage.show();
    }
 }
--- a/src/tourplaner/business/Reporter.java
+++ b/src/tourplaner/business/Reporter.java
@ -0,0 +1,34 @@
+package tourplaner.business;
+
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
+
+import java.io.IOException;
+
+public class Reporter {
+
+    public static void createTourReport(String tourname) throws IOException, COSVisitorException {
+        PDDocument document = new PDDocument();
+        PDPage page = new PDPage();
+        document.addPage(page);
+
+        PDFont font = PDType1Font.HELVETICA;
+        PDPageContentStream contentStream = new PDPageContentStream(document, page);
+        contentStream.beginText();
+        contentStream.setFont(font, 12);
+        contentStream.moveTextPositionByAmount(100,700);
+        contentStream.drawString(tourname);
+//        contentStream.drawString();
+        contentStream.endText();
+
+        contentStream.close();
+
+        document.save(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "test.pdf");
+        document.close();
+    }
+
+}
--- a/src/tourplaner/business/TourPlaner.java
+++ b/src/tourplaner/business/TourPlaner.java
@ -1,7 +1,14 @@
 package tourplaner.business;

 import org.apache.log4j.Logger;
+import org.apache.pdfbox.exceptions.COSVisitorException;
 import tourplaner.data.DbConnect;
+import tourplaner.data.PostgresHelper;
+import tourplaner.object.Log;
+import tourplaner.object.Tour;
+
+import java.io.IOException;
+import java.util.ArrayList;

 /**
 * Haupt Logik des Tourplaners
@ -9,14 +16,76 @@ import tourplaner.data.DbConnect;
 public class TourPlaner{
    private Logger logger;

-    public TourPlaner(){
-        LogHelper.info(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"),
-                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "app"));
+    /**
+     * Erstellt alle DB Tabellen falls nötig
+     */
+    public static void init(){
        new DbConnect().init();
-
    }

-    public String getMapJson(String start, String ziel){
+    /**
+     * Holt alle touren aus der DB 
+     * @return Alle touren als ArrayList
+     */
+    public static ArrayList<Tour> getAllTours(){
+        return new DbConnect().getAllTouren();
+    }
+
+    /**
+     * Bearbeitet eine Tour
+     * @param oldname Alter Tourname
+     * @param tour Neuer Tourname
+     * @return false bei error
+     */
+    public static boolean editTour(String oldname, Tour tour){
+        return new DbConnect().editTour(oldname, tour);
+    }
+
+    public static boolean delTour(String tourname){
+        return new DbConnect().delTour(tourname);
+    }
+
+    /**
+     * Fügt eine Tour hinzu
+     * @param newTour Neue Tour
+     * @return false bei error
+     */
+    public static boolean addTour(Tour newTour){
+        return new DbConnect().addTour(newTour);
+    }
+
+
+    public static ArrayList<Log> getLogs(String tourname){
+        return new DbConnect().getLogs(tourname);
+    }
+
+    public static void doReport(String tourname){
+        try {
+            Reporter.createTourReport(tourname);
+        } catch (IOException e) {
+            LogHelper.error(e.getMessage(), e.getClass().getName());
+        } catch (COSVisitorException e) {
+            LogHelper.error(e.getMessage(), e.getClass().getName());
+        }
+    }
+
+    public static boolean addLog(String tourname, Log log){
+        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
+        return new DbConnect().addLog(tourname, log);
+    }
+
+    public static boolean delLog(String tourname, String id){
+        return new DbConnect().delLog(tourname, id);
+    }
+
+    public static boolean editLog(String tourname, Log log){
+        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
+        return new DbConnect().editLog(tourname, log);
+    }
+
+
+    public static String getMapJson(String start, String ziel){
+        // TODO: 14.04.2021 Map Quest
        return start + " " + ziel;
    }
 }
--- a/src/tourplaner/data/DbConnect.java
+++ b/src/tourplaner/data/DbConnect.java
@ -1,9 +1,14 @@
 package tourplaner.data;

-import tourplaner.business.PostgresHelper;
+import javafx.geometry.Pos;
+import tourplaner.object.Log;
+import tourplaner.object.Tour;

 import java.sql.Connection;
+import java.sql.Date;
+import java.sql.ResultSet;
 import java.sql.Statement;
+import java.time.LocalDate;
 import java.util.ArrayList;

 /**
@ -28,10 +33,151 @@ public class DbConnect {
     * @return True bei erfolg, sonst error
     */
    public boolean init() {
-        // TODO: 26.02.2021 Alle sql im init sind noch falsch
        ArrayList<Boolean> errors = new ArrayList<>();
-        errors.add(PostgresHelper.executeUpdateMessage("CREATE TABLE IF NOT EXISTS USERS (username TEXT PRIMARY KEY NOT NULL, nachname TEXT NOT NULL, email TEXT NOT NULL, password TEXT NOT NULL, bio TEXT, image TEXT, coins integer default 20 not null)", "User Table created"));
+        errors.add(PostgresHelper.executeUpdateMessage("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);", "Tour Table created"));
+        errors.add(PostgresHelper.executeUpdateMessage("create unique index tour_tourname_uindex on tour (tourname);", "Tour Table unique created"));
+        errors.add(PostgresHelper.executeUpdateMessage("alter table tour add constraint tour_pk primary key (tourname);", "Tour Table primary created"));
+        errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal);", "Log Table created"));
        return !errors.contains(false);
    }

+
+    /**
+     * Bearbeitet eine Tour
+     * @param oldname Alter Tour name
+     * @param tour Neues Tour Object
+     * @return false bei error
+     */
+    public boolean editTour(String oldname, Tour tour) {
+        String tourname = tour.getName();
+        ArrayList<Boolean> result = new ArrayList<>();
+        ArrayList<Log> logs = getLogs(oldname);
+        result.add(delLogs(oldname));
+        result.add(PostgresHelper.executeUpdate("UPDATE public.tour SET tourname = '"+tour.getName()+"', dauer = 1, mapjson = '"+tour.getMapJson()+"', start = '"+tour.getStart()+"', ziel = '"+tour.getZiel()+"', strecke = "+tour.getStrecke()+" WHERE tourname ='" + oldname + "';"));
+        logs.forEach(log -> {
+            result.add(addLog(tourname, log));
+        });
+        return !result.contains(false);
+    }
+
+    private boolean delLogs(String tourname){
+        return PostgresHelper.executeUpdate("DELETE FROM public.log WHERE tourname = '"+tourname+"'");
+    }
+    /**
+     * Fügt eine Tour hinzu
+     * @param tour Neue Tour
+     * @return false bei error
+     */
+    public boolean addTour(Tour tour){
+        return PostgresHelper.executeUpdate("INSERT INTO public.tour (tourname, dauer, mapjson, start, ziel, strecke) VALUES ('"+tour.getName()+"', "+tour.getDauer()+", '"+tour.getMapJson()+"', '"+tour.getStart()+"', '"+tour.getZiel()+"', "+tour.getStrecke()+")");
+    }
+
+    /**
+     * Löscht eine Tour anhand des Tournamens
+     * @param tourname Tourname der zu löschen ist
+     * @return false bei error
+     */
+    public boolean delTour(String tourname){
+        ArrayList<Boolean> result = new ArrayList<>();
+        result.add(delLogs(tourname));
+        result.add(PostgresHelper.executeUpdate("DELETE FROM public.tour WHERE tourname = '"+tourname+"'"));
+        return !result.contains(false);
+    }
+
+    public ArrayList<Log> getLogs(String tourname){
+
+        this.c = PostgresHelper.con();
+        String id, bemerkung ;
+        double dauer, strecke, pause, gegangen, avg, hightmeter;
+        Date datum;
+
+        ArrayList<Log> logs = new ArrayList<>();
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("SELECT * FROM public.log where tourname = '"+ tourname +"'");
+            while (rs.next()) {
+                id = rs.getString("id");
+                bemerkung = rs.getString("bemerkung");
+                datum = rs.getDate("datum");
+                dauer = rs.getDouble("dauer");
+//                avg = rs.getDouble("avg");
+                hightmeter = rs.getDouble("hightmeter");
+                pause = rs.getDouble("pause");
+//                gegangen = rs.getDouble("gegangen");
+                strecke = rs.getDouble("strecke");
+                if (!tourname.isEmpty()) {
+                    logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause));
+                }else {
+                    return null;
+                }
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+            return logs;
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+    }
+
+
+    /**
+     * Füght einen Logeintrag ein
+     * @param tourname Zu welcher Tour der Logeintrag gehört
+     * @param log Der Logeintrag
+     * @return false bei error
+     */
+    public boolean addLog(String tourname, Log log){
+        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
+        return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
+                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+")");
+    }
+
+    public boolean editLog(String tourname, Log log){
+        return PostgresHelper.executeUpdate("UPDATE public.log SET bemerkung = '"+log.getBemerkung()+"', datum = '"+log.getDatum()+"', strecke = "+log.getStrecke()+", avg = "+log.getAvgspeed()+", hightmeter = "+
+                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
+    }
+
+    public boolean delLog(String tourname, String id){
+        System.out.println("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
+        return PostgresHelper.executeUpdate("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
+    }
+
+    /**
+     * Holt alle Touren aus der Datenbank
+     * @return Null bei fehler, sonst eine List aus den IDs
+     */
+    public ArrayList<Tour> getAllTouren(){
+        this.c = PostgresHelper.con();
+        String tourname, mapjson, start, ziel;
+        double dauer, strecke;
+
+        ArrayList<Tour> touren = new ArrayList<>();
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from tour;");
+            while (rs.next()) {
+                tourname = rs.getString("tourname");
+                mapjson = rs.getString("mapjson");
+                start = rs.getString("start");
+                ziel = rs.getString("ziel");
+                dauer = rs.getDouble("dauer");
+                strecke = rs.getDouble("strecke");
+                if (!tourname.isEmpty()) {
+                    touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel));
+                }else {
+                    return null;
+                }
+            }
+            rs.close();
+            stmt.close();
+            this.c.close();
+            return touren;
+        } catch (Exception e) {
+            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            return null;
+        }
+    }
+
 }
--- a/src/tourplaner/business/PostgresHelper.java
+++ b/src/tourplaner/business/PostgresHelper.java
@ -1,15 +1,22 @@
-package tourplaner.business;
+package tourplaner.data;


+import tourplaner.business.ConfigHelper;
+import tourplaner.business.LogHelper;
+import tourplaner.object.Tour;
+
 import java.sql.Connection;
 import java.sql.DriverManager;
+import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.ArrayList;

 /**
 * Hilfsfunktionen für die verwendung der Postgres DB
 */
 public class PostgresHelper {
-
+    private Connection c;
+    private Statement stmt;
    /**
     * Verbindet mit der Datenbank
     * @return Das Connection Objekt
@ -18,6 +25,8 @@ public class PostgresHelper {
        Connection c = null;
        try {
            Class.forName("org.postgresql.Driver");
+            System.out.println("jdbc:postgresql://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname")+
+                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user")+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw"));
            c = DriverManager
                    .getConnection("jdbc:postgresql://" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "url") + ":" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "port") + "/" + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "dbname"),
                            ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "user"), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "db", "pw"));
--- a/src/tourplaner/object/Log.java
+++ b/src/tourplaner/object/Log.java
@ -6,15 +6,60 @@ import java.time.LocalDate;
 import java.util.Date;

 public class Log {
-    private String id, dauer;
+    private String id, bemerkung;
    private LocalDate datum;
-    private double strecke;
+    private double strecke, avgspeed, hightmeter, pause, dauer, gegangen;

-    public Log(String id, String dauer, LocalDate datum, double strecke) {
+    public Log(String id, double dauer, LocalDate datum, double strecke, String bemerkung, double hightmeter, double pause) {
        this.id = id;
        this.dauer = dauer;
        this.datum = datum;
        this.strecke = strecke;
+        this.bemerkung = bemerkung;
+        this.hightmeter = hightmeter;
+        this.pause = pause;
+        this.gegangen = this.dauer - this.pause;
+        this.avgspeed = this.strecke / (this.gegangen);
+    }
+
+    public String getBemerkung() {
+        return bemerkung;
+    }
+
+    public void setBemerkung(String bemerkung) {
+        this.bemerkung = bemerkung;
+    }
+
+    public double getAvgspeed() {
+        return avgspeed;
+    }
+
+    public void setAvgspeed(double avgspeed) {
+        this.avgspeed = avgspeed;
+    }
+
+    public double getHightmeter() {
+        return hightmeter;
+    }
+
+    public void setHightmeter(double hightmeter) {
+        this.hightmeter = hightmeter;
+    }
+
+    public double getPause() {
+        return pause;
+    }
+
+    public void setPause(double pause) {
+        this.pause = pause;
+    }
+
+    public double getGegangen() {
+        return gegangen;
+    }
+
+    public void setGegangen(double gegangen) {
+        this.gegangen = gegangen;
    }

    public String getId() {
@ -25,11 +70,11 @@ public class Log {
        this.id = id;
    }

-    public String getDauer() {
+    public double getDauer() {
        return dauer;
    }

-    public void setDauer(String dauer) {
+    public void setDauer(double dauer) {
        this.dauer = dauer;
    }

--- a/src/tourplaner/object/Tour.java
+++ b/src/tourplaner/object/Tour.java
@ -21,6 +21,16 @@ public class Tour {
        this.log = new ArrayList<>();
    }

+    public void setTour(Tour tour){
+        this.dauer = tour.getDauer();
+        this.mapJson = tour.getMapJson();
+        this.strecke = tour.getStrecke();
+        this.name = tour.getName();
+        this.start = tour.getStart();
+        this.ziel = tour.getZiel();
+        this.log = tour.getLogs();
+    }
+
    /**
     * Holt einen einzigen Log Eintrag anhand der Id
     * @param id Id des Eintrags der zu besorgen ist
--- a/src/tourplaner/tourplaner.fxml
+++ b/src/tourplaner/tourplaner.fxml
@ -32,26 +32,13 @@
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->

-<?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?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.paint.*?>
+<?import javafx.scene.text.*?>

-<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/11.0.2" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
+<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">
  <children>
    <MenuBar VBox.vgrow="NEVER">
      <menus>
@ -67,6 +54,7 @@
        </Menu>
            <Menu mnemonicParsing="false" text="Optionen">
               <items>
+                  <MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report erstellen" />
                  <MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
               </items>
            </Menu>
@ -86,6 +74,7 @@
                  <Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+" />
                  <Label layoutX="14.0" layoutY="4.0" text="Tours" />
                  <Button fx:id="tourDel" layoutX="89.0" mnemonicParsing="false" onAction="#delTour" text="-" />
+                  <Button layoutX="117.0" mnemonicParsing="false" onAction="#editTourBtn" text="Edit" />
               </children></AnchorPane>
            <TextField fx:id="sucheInput" promptText="Suche..." />
            <Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
@ -94,7 +83,7 @@
            <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
         </padding>
      </HBox>
-    <SplitPane dividerPositions="0.21492204899777284" focusTraversable="true" prefHeight="522.0" prefWidth="900.0" VBox.vgrow="ALWAYS">
+    <SplitPane dividerPositions="0.060133630289532294" focusTraversable="true" prefHeight="522.0" prefWidth="300.0" VBox.vgrow="ALWAYS">
      <items>
            <AnchorPane prefWidth="239.0">
               <children>
@ -131,7 +120,7 @@
                                       <content>
                                          <AnchorPane>
                                             <children>
-                                                <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">
+                                                <TableView fx:id="beschreibungTableView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" 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" />
@ -154,9 +143,9 @@
                     <children>
                        <VBox prefWidth="100.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                           <children>
-                              <AnchorPane prefWidth="676.0">
+                              <AnchorPane>
                                 <children>
-                                    <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">
+                                    <HBox id="HBox" alignment="CENTER_LEFT" layoutY="2.0" prefWidth="702.0" spacing="5.0" AnchorPane.bottomAnchor="-2.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="2.0">
                                       <children>
                                          <Label text="Logs:">
                                             <HBox.margin>
@ -170,9 +159,10 @@
                                          </Button>
                                          <Button fx:id="logDel" mnemonicParsing="false" onAction="#delLog" prefWidth="21.0" text="-" textAlignment="CENTER">
                                             <HBox.margin>
-                                                <Insets right="10.0" />
+                                                <Insets />
                                             </HBox.margin>
                                          </Button>
+                                          <Button mnemonicParsing="false" onAction="#editLogBtn" text="Edit" />
                                       </children>
                                       <padding>
                                          <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
@ -180,13 +170,18 @@
                                    </HBox>
                                 </children>
                              </AnchorPane>
-                              <AnchorPane prefWidth="200.0">
+                              <AnchorPane>
                                 <children>
                                    <TableView fx:id="logTableView" onMouseClicked="#logItemSelected" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                      <columns>
-                                        <TableColumn fx:id="logDatumCol" prefWidth="238.0" text="Datum" />
-                                        <TableColumn fx:id="logDauerCol" prefWidth="223.0" text="Dauer" />
+                                        <TableColumn fx:id="logDatumCol" prefWidth="49.0" text="Datum" />
+                                        <TableColumn fx:id="logDauerCol" prefWidth="126.0" text="Dauer" />
                                          <TableColumn fx:id="logStreckeCol" prefWidth="240.0" text="Entfernung" />
+                                          <TableColumn fx:id="logAvgCol" prefWidth="75.0" text="AVG Geschwindigkeit" />
+                                          <TableColumn fx:id="logHightCol" prefWidth="75.0" text="Höhenmeter" />
+                                          <TableColumn fx:id="logPauseCol" prefWidth="75.0" text="Davon Pause" />
+                                          <TableColumn fx:id="logGegangenCol" prefWidth="75.0" text="Davon Unterwegs" />
+                                          <TableColumn fx:id="logBemerkungCol" prefWidth="75.0" text="Bemerkung" />
                                      </columns>
                                       <columnResizePolicy>
                                          <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
--- a/src/tourplaner/business/AlertHelper.java
+++ b/src/tourplaner/business/AlertHelper.java
@ -1,18 +1,19 @@
-package tourplaner.business;
+package tourplaner.ui;

+import javafx.event.EventHandler;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextArea;
 import javafx.scene.image.Image;
 import javafx.scene.layout.*;
-import javafx.scene.text.Text;
 import javafx.stage.Stage;
+import javafx.stage.WindowEvent;
+import tourplaner.business.ConfigHelper;

 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;

@ -108,24 +109,41 @@ public class AlertHelper {
    }

    /**
-     * Texteingabe
+     * Texteingabe die nicht leer sein darf
     * @param title Title des Dialogs
     * @param header Header des Dialogs
     * @param msg Nachricht des Dialogs
     * @return Null bei keiner eingabe
     */
-    public static String inputText(String title, String header, String msg) {
-        String returnStr = "";
-        while (returnStr.isEmpty()) {
-            Optional<String> result = inputHelper(title, header, msg);
+    public static String inputText(String title, String header, String msg, String content){
+        return inputTextNotNull(title, header, msg, content, true);
+    }
+
+    /**
+     * Texteingabe
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     * @param notNull true wenn der input nicht leer sein darf
+     * @return Null bei keiner eingabe
+     */
+    public static String inputTextNotNull(String title, String header, String msg, String content, boolean notNull) {
+        String returnStr = null;
+        while (returnStr == null) {
+            Optional<String> result = inputHelper(title, header, msg, content);
+
            AtomicReference<String> returnText = new AtomicReference<>("");
+            if(result.isPresent()) {
                result.ifPresent(returnText::set);
                returnStr = returnText.get();
-            if (returnStr.isEmpty()) {
+                if (returnStr.isEmpty() && notNull) {
                    AlertHelper.warn(ConfigHelper.getLangIniString("tournametitle"),
                            ConfigHelper.getLangIniString("achtung"),
                            ConfigHelper.getLangIniString("keintextimfeld"));
                }
+            }else{
+                return "";
+            }
        }
        return returnStr;
    }
@ -137,11 +155,12 @@ public class AlertHelper {
     * @param msg Nachricht des Dialogs
     * @return Result des Inputs
     */
-    private static Optional<String> inputHelper(String title, String header, String msg){
-        TextInputDialog dialog = new TextInputDialog();
+    private static Optional<String> inputHelper(String title, String header, String msg, String content){
+        TextInputDialog dialog = new TextInputDialog(content);
        dialog.setTitle(title);
        dialog.setHeaderText(header);
        dialog.setContentText(msg);
+
        Stage stage = (Stage) dialog.getDialogPane().getScene().getWindow();
        stage.getIcons().add(
                new Image("file:"+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo")));
@ -150,48 +169,53 @@ public class AlertHelper {

    }

+
    /**
     * Positive Nummer eingabe. Wenn Convertierung zu int nicht klappt -> -1
     * @param title Title des Dialogs
     * @param header Header des Dialogs
     * @param msg Nachricht des Dialogs
-     * @return -1 bei error sonst ein Int
+     * @return -1.0 bei error sonst ein double
     */
-    public static int inputNumber(String title, String header, String msg) {
-        int returnInt = -2;
-        while (returnInt <= 0 ) {
-            Optional<String> result = inputHelper(title, header, msg);
-            AtomicReference<Integer> returnText = new AtomicReference<Integer>(-1);
+    public static double inputNumber(String title, String header, String msg, String content) {
+        double returnDouble = -2.0;
+        while (returnDouble < -1.0) {
+            Optional<String> result = inputHelper(title, header, msg, content);
+            AtomicReference<Double> returnText = new AtomicReference<Double>(-1.0);
            result.ifPresent(s -> {
                try {
-                    int resultInt = Integer.parseInt(result.get());
-                    returnText.set(resultInt);
-                    if (resultInt < 0){
+                    double resultDouble = Double.parseDouble(result.get());
+//                    int resultInt = Integer.parseInt(result.get());
+                    returnText.set(resultDouble);
+                    if (resultDouble < 0){
                        AlertHelper.warn(title, ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("nurpositivezahlen"));
                    }
                } catch (NumberFormatException e) {
                    AlertHelper.warn(title, ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("nurzahlen"));
-                    returnText.set(-1);
+                    returnText.set(-2.0);
                }

            });
-            returnInt = returnText.get();
+            returnDouble = returnText.get();
        }
-
-        return returnInt;
+        return returnDouble;
    }

    /**
     * Date Picker Dialog, sobald ein Datum ausgewählt wurde, wird es automatisch bestätigt und der dialog geschlossen
-     * @param title Name des Dialogs
+     * @param content Aktuelles datum
     * @return Gewähltes datum
     */
-    public static LocalDate datePicker(String title){
-        final DatePicker datePicker = new DatePicker(LocalDate.now());
+    public static LocalDate datePicker(LocalDate content){
+        final DatePicker datePicker = new DatePicker(content);
        final Stage stage = new Stage();
        stage.getIcons().add(
                new Image("file:"+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo")));
        AtomicReference<LocalDate> selectedDate = new AtomicReference<>();
+        stage.setOnCloseRequest(ev -> {
+           stage.close();
+        });
+
        datePicker.setOnAction(event -> {
            LocalDate date = datePicker.getValue();
            System.out.println("Selected date: " + date);
--- a/src/tourplaner/ui/TourplanerController.java
+++ b/src/tourplaner/ui/TourplanerController.java
@ -9,9 +9,9 @@ import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.scene.input.MouseEvent;
-import tourplaner.business.AlertHelper;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
+import tourplaner.business.TourPlaner;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
 import tourplaner.viewmodels.ViewModel;
@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicReference;

 public class TourplanerController implements Initializable {
    //VM
-    public ViewModel viewModel = new ViewModel();
+    private final ViewModel viewModel = new ViewModel();
    //Tour list -> links
    public ListView<String> TourListView = new ListView<>();
    //Tabs zu Tour -> rechts oben
@ -39,15 +39,32 @@ public class TourplanerController implements Initializable {
    public TextField titleTextView, sucheInput;
    //Log -> rechts unten
    public TableView<Log> logTableView;
-    public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol;
+    public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;

+    @FXML
+    private void tourReport(){
+        this.viewModel.tourReport();
+    }
+
+
+    @FXML
+    private void editTourBtn(){
+        this.viewModel.editTour();
+        syncTour(this.viewModel.getSelectedTour().getName());
+    }
+
+    @FXML
+    private void editLogBtn(){
+        this.viewModel.editLog();
+        syncLogs();
+    }
    /**
     * Öffnet github im standart browser
     *
     */
    @FXML
    private void gitWebBrowser(){
-       openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "gitrepo"), "Git");
+       this.viewModel.gitWebBrowser();
    }

    /**
@ -56,7 +73,7 @@ public class TourplanerController implements Initializable {
     */
    @FXML
    private void javaDocBrowser(){
-       openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "javadoc"), "JavaDoc");
+       this.viewModel.javaDocBrowser();
    }

    /**
@ -65,28 +82,24 @@ public class TourplanerController implements Initializable {
     */
    @FXML
    private void doxygenDocBrowser(){
-        openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "doxygendoc"), "Doxygen");
+        this.viewModel.doxygenDocBrowser();
    }

-    /**
-     * Öffnet einen link im Standart Browser
-     * @param uriString
-     * @param appname
-     */
-    private void openBrowser(String uriString, String appname){
-        Desktop desktop = java.awt.Desktop.getDesktop();
-        try {
-            URI oURL = new URI(
-                    uriString);
-            desktop.browse(oURL);
-        } catch (URISyntaxException | IOException e) {
-            LogHelper.error(e.getMessage(), ConfigHelper.getLangIniString("openbrowsererror") + appname);
-            AlertHelper.exerror(ConfigHelper.getLangIniString("browserexception"),
-                    ConfigHelper.getLangIniString("openbrowsererror") + appname,
-                    ConfigHelper.getLangIniString("browserexceptionmsg"), e);
+    private void syncTour(String selectedItem){
+        beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
+        beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
    }
+
+    private void syncTourNamen(){
+        TourListView.setItems(this.viewModel.getTourNamen());
    }

+    private void syncLogs(){
+        logTableView.getItems().removeIf(s -> true);
+        logTableView.setItems(this.viewModel.getLogData());
+    }
+
+
    /**
     * Wird gestartet wenn eine Tour in der Tour listView ausgewählt wird
     * @param mouseEvent Triggered Event
@ -96,8 +109,7 @@ public class TourplanerController implements Initializable {
        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));
+        syncTour(selectedItem);
        startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
        zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
        dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
@ -106,10 +118,17 @@ public class TourplanerController implements Initializable {

        //Log anzeigen
        logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
+        logTableView.getItems().removeIf(s -> true);
        logTableView.setItems(this.viewModel.getLogData());
        logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
        logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
        logDatumCol.setCellValueFactory(new PropertyValueFactory<Log, String>("datum"));
+        logAvgCol.setCellValueFactory(new PropertyValueFactory<Log, String>("avgspeed"));
+        logHightCol.setCellValueFactory(new PropertyValueFactory<Log, String>("hightmeter"));
+        logPauseCol.setCellValueFactory(new PropertyValueFactory<Log, String>("pause"));
+        logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
+        logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
+
    }

    /**
@ -139,7 +158,6 @@ public class TourplanerController implements Initializable {
        this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
        this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
        this.viewModel.delTour();
-        this.viewModel.setSelectedTour(null);
        logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
    }

@ -149,14 +167,7 @@ public class TourplanerController implements Initializable {
     */
    @FXML
    private void suche(){
-        String sucheInput = this.sucheInput.getText();
-        if(sucheInput.isEmpty()){
-            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
-                    ConfigHelper.getLangIniString("suchfeldleer"),
-                    ConfigHelper.getLangIniString("suchtextzuerst"));
-        }else {
-            this.viewModel.suche(sucheInput);
-        }
+        this.viewModel.suche(this.sucheInput.getText());
    }

    /**
@ -165,54 +176,14 @@ public class TourplanerController implements Initializable {
     */
    @FXML
    private void addLog(){
-        Tour selectedTour = this.viewModel.getSelectedTour();
-        if (selectedTour == null){
-            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
-                    ConfigHelper.getLangIniString("keinetourselected"),
-                    ConfigHelper.getLangIniString("logtournotselectedmsg"));
-        }else {
-            ObservableList<Tour> tourData = this.viewModel.getTourData();
-            tourData.forEach(s -> {
-                if (s.getName().equals(selectedTour.getName())) {
-                    ObservableList<Log> logData = this.viewModel.getLogData();
-                    AtomicReference<String> newId = new AtomicReference<>();
-                    newId.set(UUID.randomUUID().toString());
-                    logData.forEach(ss -> {
-                        if (ss.getId().equals(newId.get())) {
-                            newId.set(UUID.randomUUID().toString());
-                        }
-                    });
-                    LocalDate neuesDatum = null;
-                    while (neuesDatum == null) {
-                        neuesDatum = AlertHelper.datePicker(ConfigHelper.getLangIniString("datum"));
-                    }
-                    double neueDauer = AlertHelper.inputNumber(ConfigHelper.getLangIniString("dauer"),
-                                ConfigHelper.getLangIniString("dauermsg"),
-                                ConfigHelper.getLangIniString("dauer") +
-                                        ConfigHelper.getLangIniString("doppelpunkt"));
-                    double neueStrecke = AlertHelper.inputNumber(ConfigHelper.getLangIniString("strecke"),
-                                ConfigHelper.getLangIniString("streckemsg"),
-                                ConfigHelper.getLangIniString("strecke") +
-                                        ConfigHelper.getLangIniString("doppelpunkt"));
-
-                    Log newLog = new Log(newId.get(), neueDauer + "", neuesDatum, neueStrecke);
-                    logData.add(newLog);
-                    s.addLog(newLog);
-                }
-            });
-        }
+        this.viewModel.addLog();
+        syncLogs();
    }

    @FXML
    private void delLog(){
-        Log selectedLog = this.viewModel.getSelectedLog();
-        if(selectedLog != null) {
-            this.viewModel.delLog(selectedLog.getId());
-        }else{
-            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
-                    ConfigHelper.getLangIniString("keinetourselected"),
-                    ConfigHelper.getLangIniString("deltournoselectmsg"));
-        }
+        this.viewModel.delLog();
+        syncLogs();
    }

    /**
@ -221,9 +192,7 @@ public class TourplanerController implements Initializable {
     */
    @FXML
    private void logItemSelected(MouseEvent mouseEvent){
-        String selectedItem = logTableView.getSelectionModel().getSelectedItem().getId();
-        this.viewModel.selectLog(selectedItem);
-        System.out.println(selectedItem);
+        this.viewModel.selectLog(logTableView.getSelectionModel().getSelectedItem().getId());
    }

    /**
@ -236,7 +205,7 @@ public class TourplanerController implements Initializable {
        //Tour list -> links
        TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
        TourListView.setOrientation(Orientation.VERTICAL);
-        TourListView.setItems(this.viewModel.getTourNamen());
+        syncTourNamen();
        //Tabs zu Tour -> rechts oben
        beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
        titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));
@ -249,10 +218,8 @@ public class TourplanerController implements Initializable {
     * Funktion für noch nicht implementierte sachen wie im Menu der 'Bearbeiten' und 'Optionen' Knopf
     */
    @FXML
-    public void nimpButton(){
-        AlertHelper.inform(ConfigHelper.getLangIniString("achtung"),
-                ConfigHelper.getLangIniString("fktnichtimplementiert"),
-                ConfigHelper.getLangIniString("vergessenodernochnichtsoweit"));
+    private void nimpButton(){
+        this.viewModel.nimpButton();
    }

 }
--- a/src/tourplaner/viewmodels/ViewModel.java
+++ b/src/tourplaner/viewmodels/ViewModel.java
@ -2,35 +2,103 @@ package tourplaner.viewmodels;

 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import tourplaner.business.AlertHelper;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import tourplaner.business.Reporter;
+import tourplaner.business.TourPlaner;
+import tourplaner.data.DbConnect;
+import tourplaner.ui.AlertHelper;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;

+import java.awt.*;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;

 public class ViewModel {
    //Tour
-    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> tourData = FXCollections.observableArrayList();
+    private final ObservableList<String> tourNamen = FXCollections.observableArrayList();
    private Tour selectedTour;
-    private String neueTourName, neueTourStart, neueTourZiel;
+    private String neueTourName, neueTourStart, neueTourZiel, neueBemerkung;
    //Log
    private final ObservableList<Log> logData = FXCollections.observableArrayList();
    private Log selectedLog;


+
    /**
-     * Fügt eine neue Tour hinzu
+     * Bearbeitet eine bereits bestehende Tour
+     * prüft ob eine tour ausgewählt ist
     */
-    public void addTour(){
+    public void editTour(){
+        if (this.selectedTour == null){
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("keinetourselected"),
+                    ConfigHelper.getLangIniString("logtournotselectedmsg"));
+        }else {
+            AtomicInteger index = new AtomicInteger(-1);
+            AtomicInteger aktIndex = new AtomicInteger(-1);
+            this.tourData.forEach(s -> {
+                index.getAndIncrement();
+                if (s.getName().equals(this.selectedTour.getName())) {
+                    aktIndex.set(index.intValue());
+                }
+            });
+            if(aktIndex.intValue() != -1){
+
+                if(tourNameInputDuplicatCheck(this.selectedTour.getName(), false)) {
+                    if (tourStartInput(this.selectedTour.getStart())) {
+                        if (tourZielInput(this.selectedTour.getZiel())) {
+
+                            this.tourData.removeIf(tour -> tour.getName().equals(this.selectedTour.getName()));
+                            this.tourNamen.removeIf(tour -> tour.equals(this.selectedTour.getName()));
+                            Tour newTour = new Tour(this.neueTourName, "TBD", "TBD", 0, this.neueTourStart, this.neueTourZiel);
+                            this.tourData.add(newTour);
+                            this.tourNamen.add(this.neueTourName);
+                            LogHelper.info("Edit Tour: " + this.neueTourName + " upload zu Postgres war: " + TourPlaner.editTour(this.selectedTour.getName(), newTour), "ViewModel - EditTour");
+                            selectTour(this.neueTourName);
+                        }
+                    }
+                }
+                this.neueTourName = null;
+                this.neueTourStart = null;
+                this.neueTourZiel = null;
+            }
+        }
+    }
+
+    /**
+     * Input mit duplications check des Namens und ohne content im input feld
+     */
+    private void tourNameInput(){
+        tourNameInputDuplicatCheck("", true);
+    }
+
+    /**
+     * Input des Tour Namen wird so lange durchgeführt, bis er korrekt ist. Das heißt:
+     * er darf nicht schon vorhanden sein und er darf nicht Null sein
+     * @param checkDuplicate Prüft ob name bereits vorhanden ist
+     * @param content inhalt des Input fields
+     * @return false beim schließen des input dialogs
+     */
+    private boolean tourNameInputDuplicatCheck(String content, boolean checkDuplicate){
        while(this.neueTourName == null) {
            this.neueTourName = AlertHelper.inputText(ConfigHelper.getLangIniString("tournametitle"),
                    ConfigHelper.getLangIniString("tournameheader"),
-                    ConfigHelper.getLangIniString("tournamemsg"));
-            if (getTour(this.neueTourName) != null) {
+                    ConfigHelper.getLangIniString("tournamemsg"), content);
+            System.out.println(this.neueTourName);
+            if(this.neueTourName.isEmpty()){
+                return false;
+            }
+            if (getTour(this.neueTourName) != null && checkDuplicate) {
                AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                        ConfigHelper.getLangIniString("namevergebenheader"),
                        ConfigHelper.getLangIniString("namevergebenmsg1")
@ -39,47 +107,255 @@ public class ViewModel {
                this.neueTourName = null;
            }
        }
+        return true;
+    }
+
+    /**
+     * Input der Startpunkt der Tour
+     * Wird erst beendet wenn die eingabe erfolgreich war
+     * @param content inhalt des Input fields
+     * @return false beim schließen des input dialogs
+     */
+    private boolean tourStartInput(String content){
        while(this.neueTourStart == null){
            this.neueTourStart = AlertHelper.inputText(ConfigHelper.getLangIniString("startpunkttitle"),
                    ConfigHelper.getLangIniString("startpunktheader"),
-                    ConfigHelper.getLangIniString("startpunktmsg"));
+                    ConfigHelper.getLangIniString("startpunktmsg"), content);
+            if(this.neueTourStart.isEmpty()){
+                return false;
            }
+        }
+        return true;
+    }
+
+    /**
+     * Input des Zielpunktes der Tour
+     * Wird erst beendet wenn die eingabe erfolgreich war
+     * @param content inhalt des Input fields
+     * @return false beim schließen des input dialogs
+     */
+    private boolean tourZielInput(String content){
        while(this.neueTourZiel == null){
            this.neueTourZiel = AlertHelper.inputText(ConfigHelper.getLangIniString("zielpunkttitle"),
                    ConfigHelper.getLangIniString("zielpunktheader"),
-                    ConfigHelper.getLangIniString("zielpunktmsg"));
+                    ConfigHelper.getLangIniString("zielpunktmsg"), content);
+            if(this.neueTourZiel.isEmpty()){
+                return false;
            }
+        }
+        return true;
+    }
+
+
+    /**
+     * Fügt eine neue Tour hinzu
+     */
+    public void addTour(){
+        tourNameInput();
+        tourStartInput("");
+        tourZielInput("");
        if (getTour(this.neueTourName) == null) {
-            tourData.add(new Tour(this.neueTourName, "TBD", "TBD", 0, this.neueTourStart, this.neueTourZiel));
+            Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
+            tourData.add(newTour);
            tourNamen.add(this.neueTourName);
+            TourPlaner.addTour(newTour);
        }
        this.neueTourStart = null;
        this.neueTourZiel = null;
        this.neueTourName = null;
    }

-    /**
-     * Entfernt ein Log anhand dessen Id
-     * @param id Id des Logs welches entfernt werden soll
-     */
-    public void delLog(String id){
-        this.logData.removeIf(s -> s.getId().equals(id));
-        AtomicReference<Tour> tourToEdit = new AtomicReference<>();
-        this.tourData.forEach(s -> {
-            if (s.getLogs() != null) {
-                s.getLogs().forEach(ss -> {
-                    if (ss.getId().equals(id)) {
-                        tourToEdit.set(s);
+    private boolean keineTourSelected(){
+        if (this.selectedTour == null){
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("keinetourselected"),
+                    ConfigHelper.getLangIniString("logtournotselectedmsg"));
+            return true;
+        }else {
+            return false;
        }
-                });
    }
-        });

-        if (tourToEdit.get() != null){
-            Tour toEdit = tourToEdit.get();
-            toEdit.delLog(id);
-            this.tourData.removeIf(s -> s.getName().equals(toEdit.getName()));
-            this.tourData.add(toEdit);
+    /**
+     * Bearbeitet einen gewählten Log eintrag
+     */
+    public void editLog(){
+        AtomicReference<Tour> tourAkt = new AtomicReference<>();
+        AtomicReference<Log> logAkt = new AtomicReference<>();
+        this.tourData.forEach(tourd -> {
+            if(tourd.getName().equals(this.selectedTour.getName())) {
+                tourd.getLogs().forEach(log -> {
+                    if(this.selectedLog.getId().equals(log.getId())){
+                        logAkt.set(log);
+                        tourAkt.set(tourd);
+                    }
+                });
+            }
+        });
+        double dauer = dauerInput(this.selectedLog.getDauer());
+        double strecke = -1;
+        double pause = -1.0;
+        double hightmeter = -1.0;
+        boolean bemerkung = false;
+        LocalDate datum = null;
+        if (dauer >= 0) {
+            strecke = streckeInput(this.selectedLog.getStrecke() + "");
+            if (strecke >= 0) {
+                pause = pauseInput("");
+                if(pause >= 0.0) {
+                    hightmeter = hightmeterInput("");
+                    if (hightmeter >= 0.0) {
+                        bemerkung = bemerkungInput("");
+                        if (bemerkung) {
+                            datum = dateInput(this.selectedLog.getDatum());
+                            if (datum != null) {
+                                Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause);
+                                this.logData.removeIf(ld -> ld.getId().equals(this.selectedLog.getId()));
+                                this.logData.add(newLog);
+//                                tourAkt.get().delLog(this.selectedLog.getId());
+//                                tourAkt.get().addLog(newLog);
+                                this.tourData.removeIf(td -> td.getName().equals(this.selectedTour.getName()));
+                                this.tourData.add(tourAkt.get());
+                                TourPlaner.editLog(this.selectedTour.getName(), newLog);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        this.neueBemerkung = null;
+    }
+
+    /**
+     * Eingabe der Strecke bis diese Korrekt ist
+     * @return Korrekte eingegebene Strecke
+     */
+    private double streckeInput(String content){
+        return AlertHelper.inputNumber(ConfigHelper.getLangIniString("strecke"),
+                ConfigHelper.getLangIniString("streckemsg"),
+                ConfigHelper.getLangIniString("strecke") +
+                        ConfigHelper.getLangIniString("doppelpunkt"), content);
+    }
+
+    /**
+     * Eingabe der Dauer bis sie korrekt ist
+     * @param content Wenn der Content -1.0 ist, wird er nicht in das input feld eingeschleust, sonst schon
+     * @return Die eingegebene Dauer
+     */
+    private double dauerInput(double content){
+        String realcontent = "";
+        if (content != -1){
+            realcontent = content + "";
+        }
+        return AlertHelper.inputNumber(ConfigHelper.getLangIniString("dauer"),
+                ConfigHelper.getLangIniString("dauermsg"),
+                ConfigHelper.getLangIniString("dauer") +
+                        ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
+    }
+
+    /**
+     * Datum eingabe bis diese Korrekt ist
+     * @return Das eingegebene korekte Datum
+     */
+    private LocalDate dateInput(LocalDate date){
+        LocalDate neuesDatum = null;
+        neuesDatum = AlertHelper.datePicker(date);
+        System.out.println(neuesDatum);
+        return neuesDatum;
+    }
+
+    /**
+     * Bemerkung input, darf auch leer bleiben
+     * @param content Startwert im Input feld
+     * @return True bei erfolg, wenn es abgebrochen wird ist es false
+     */
+    private boolean bemerkungInput(String content){
+        this.neueBemerkung = AlertHelper.inputTextNotNull(ConfigHelper.getLangIniString("bemerkung"),
+                ConfigHelper.getLangIniString("bemerkungheader"),
+                ConfigHelper.getLangIniString("bemerkung")+
+                        ConfigHelper.getLangIniString("doppelpunkt"), content, false);
+        return !(this.neueBemerkung == null);
+    }
+
+    private double hightmeterInput(String content) {
+        return AlertHelper.inputNumber(ConfigHelper.getLangIniString("hightmeter"),
+                ConfigHelper.getLangIniString("hightmetermsg"),
+                ConfigHelper.getLangIniString("hightmeter") +
+                        ConfigHelper.getLangIniString("doppelpunkt"), content);
+    }
+
+    /**
+     * Pause eingabe bis diese Korrekt ist
+     * @param content Default value für das Input Feld
+     * @return -1 bei error
+     */
+    private double pauseInput(String content){
+        return AlertHelper.inputNumber(ConfigHelper.getLangIniString("pause"),
+                ConfigHelper.getLangIniString("pausemsg"),
+                ConfigHelper.getLangIniString("pause") +
+                        ConfigHelper.getLangIniString("doppelpunkt"), content);
+    }
+
+    /**
+     * Fügt einen Log eintrag zu einer Tour hinzu.
+     * Ist keine Tour ausgewählt, dann kommt eine Warnung an den User!
+     */
+    public void addLog(){
+        if (!keineTourSelected()){
+            this.tourData.forEach(s -> {
+                if (s.getName().equals(this.selectedTour.getName())) {
+                    AtomicReference<String> newId = new AtomicReference<>();
+                    newId.set(UUID.randomUUID().toString());
+                    this.logData.forEach(ss -> {
+                        if (ss.getId().equals(newId.get())) {
+                            newId.set(UUID.randomUUID().toString());
+                        }
+                    });
+                    double dauer = dauerInput(-1.0);
+                    double strecke, pause, hightmeter;
+                    boolean bemerkung = false;
+                    LocalDate date = null;
+                    if(dauer >= 0) {
+                        strecke = streckeInput("");
+                        if (strecke >= 0.0) {
+                            pause = pauseInput("");
+                            if(pause >= 0.0) {
+                                hightmeter = hightmeterInput("");
+                                if (hightmeter >= 0.0) {
+                                     bemerkung = bemerkungInput("");
+                                     if (bemerkung){
+                                        date = dateInput(LocalDate.now());
+                                        if (date != null) {
+                                            Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause);
+                                            this.logData.add(newLog);
+                                            TourPlaner.addLog(this.selectedTour.getName(), newLog);
+                                            s.addLog(newLog);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            });
+            this.neueBemerkung = null;
+        }
+    }
+
+
+
+
+    /**
+     * Entfernt ein Log anhand des selectierten Logs
+     */
+    public void delLog(){
+        if(this.selectedLog != null) {
+                TourPlaner.delLog(this.selectedTour.getName(), this.selectedLog.getId());
+                this.selectedLog = null;
+        }else{
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("keinetourselected"),
+                    ConfigHelper.getLangIniString("deltournoselectmsg"));
        }
    }

@ -115,6 +391,8 @@ public class ViewModel {
    }

    public ObservableList<Log> getLogData() {
+        logData.removeAll();
+        logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
        return logData;
    }

@ -169,6 +447,12 @@ public class ViewModel {
    }

    public ObservableList<String> getTourNamen() {
+        ArrayList<String> namen = new ArrayList<>();
+        getTourData().forEach(s -> {
+            namen.add(s.getName());
+        });
+        tourNamen.removeAll();
+        tourNamen.addAll(namen);
        return tourNamen;
    }

@ -189,6 +473,9 @@ public class ViewModel {
    }

    public ObservableList<Tour> getTourData() {
+        tourData.removeAll();
+//        ObservableList<Tour> data = ;
+        tourData.addAll(TourPlaner.getAllTours());
        return tourData;
    }

@ -201,6 +488,8 @@ public class ViewModel {
            tourData.removeIf(s -> s.getName().equals(tourname));
            tourNamen.removeIf(s -> s.equals(tourname));
            logData.removeIf(s -> true);
+            setSelectedTour(null);
+            TourPlaner.delTour(tourname);
        }catch (NullPointerException e){
            LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
                    ConfigHelper.getLangIniString("deltournoselect"));
@ -212,8 +501,79 @@ public class ViewModel {

    /**
     * Sucht eine Tour
+     * @param sucheInput Text nach dem gesucht werden soll
     */
-    public void suche(String suchString){
+    public void suche(String sucheInput){
+        if(sucheInput.isEmpty()){
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("suchfeldleer"),
+                    ConfigHelper.getLangIniString("suchtextzuerst"));
+        }
+            // TODO: 19.03.2021 Suchlogik
+    }

+    /**
+     * Öffnet github im standart browser
+     *
+     */
+    public void gitWebBrowser(){
+        openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "gitrepo"), "Git");
+    }
+
+    /**
+     * Öffnet Java Doc im standart browser
+     *
+     */
+    public void javaDocBrowser(){
+        openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "javadoc"), "JavaDoc");
+    }
+
+    /**
+     * Öffnet Doxygen Doc im standart browser
+     *
+     */
+    public void doxygenDocBrowser(){
+        openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "doxygendoc"), "Doxygen");
+    }
+
+    /**
+     * Öffnet einen link im Standart Browser
+     * @param uriString
+     * @param appname
+     */
+    private void openBrowser(String uriString, String appname){
+        Desktop desktop = java.awt.Desktop.getDesktop();
+        try {
+            URI oURL = new URI(
+                    uriString);
+            desktop.browse(oURL);
+        } catch (URISyntaxException | IOException e) {
+            LogHelper.error(e.getMessage(), ConfigHelper.getLangIniString("openbrowsererror") + appname);
+            AlertHelper.exerror(ConfigHelper.getLangIniString("browserexception"),
+                    ConfigHelper.getLangIniString("openbrowsererror") + appname,
+                    ConfigHelper.getLangIniString("browserexceptionmsg"), e);
+        }
+    }
+
+    /**
+     * Funktion für noch nicht implementierte sachen wie im Menu der 'Bearbeiten' und 'Optionen' Knopf
+     */
+    public void nimpButton(){
+        AlertHelper.inform(ConfigHelper.getLangIniString("achtung"),
+                ConfigHelper.getLangIniString("fktnichtimplementiert"),
+                ConfigHelper.getLangIniString("vergessenodernochnichtsoweit"));
+    }
+
+    /**
+     * Startet den Tour Report
+     */
+    public void tourReport() {
+        if (this.selectedTour == null){
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("keinetourselected"),
+                    ConfigHelper.getLangIniString("logtournotselectedmsg"));
+        }else {
+           TourPlaner.doReport(this.selectedTour.getName());
+        }
    }
 }
Author	SHA1	Message	Date
Georg-Notebook	d9adebc934	DB -> Log get, add, edit, del	2021-04-14 23:47:35 +02:00
Georg-Notebook	bb8a796bd4	DB -> Tour add, edit, del	2021-04-14 22:11:53 +02:00
Georg-Notebook	dd1357ec1d	DB Table erstellt + Get All Tours	2021-04-14 00:37:00 +02:00
Georg-Notebook	0e43c28c67	Log -> + Avg, höhenmeter, pause, unterwegs, bemerkung	2021-04-13 23:22:54 +02:00
Georg-Notebook	2265014db3	Edit Tour/Log Bugfixes	2021-04-13 14:52:36 +02:00
Georg-Notebook	100da38493	Edit Log + Tour	2021-04-13 14:16:07 +02:00
Georg-Notebook	0b8f8f996d	Logik von Controller -> ViewModel verschoben	2021-03-19 22:40:30 +01:00