Log Rating + Create Table bugfix

lang.ini fix+
alert fix

.gitignore

@@ -1,3 +1,5 @@
-.idea/
 out/
 conf.ini
+log/
+reports/
+.idea/dataSources*

.idea/.gitignore

@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/../../../../:\FH_OFFLINE\Tourplaner\.idea/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/libraries/com_google_code_gson_gson_2_8_6.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="com.google.code.gson:gson:2.8.6" type="repository">
+    <properties maven-id="com.google.code.gson:gson:2.8.6" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/iText_4_2_0_com_itextpdf.xml

@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="iText-4.2.0-com.itextpdf">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/iText-4.2.0-com.itextpdf.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/javadoc.xml

@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="javadoc">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/javadoc/type-search-index.zip!/" />
+      <root url="jar://$PROJECT_DIR$/javadoc/member-search-index.zip!/" />
+      <root url="jar://$PROJECT_DIR$/javadoc/package-search-index.zip!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/lib.xml

@@ -0,0 +1,17 @@
+<component name="libraryTable">
+  <library name="lib">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.fxml.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.swing.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx-swt.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.controls.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.graphics.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.web.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.media.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/src.zip!/" />
+      <root url="jar://$PROJECT_DIR$/lib/javafx-sdk-11.0.2/lib/javafx.base.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.idea/libraries/log4j_log4j_1_2_17.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="log4j:log4j:1.2.17" type="repository">
+    <properties maven-id="log4j:log4j:1.2.17" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/log4j/log4j/1.2.17/log4j-1.2.17.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.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>

.idea/libraries/org_ini4j_ini4j_0_5_4.xml

@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="org.ini4j:ini4j:0.5.4" type="repository">
+    <properties maven-id="org.ini4j:ini4j:0.5.4" />
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/ini4j/ini4j/0.5.4/ini4j-0.5.4.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

.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>

.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/tourplaner.iml" filepath="$PROJECT_DIR$/tourplaner.iml" />
+    </modules>
+  </component>
+</project>

.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>

.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>

.idea/vcs.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

Tourplaner.iml

@@ -1,25 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Spring" name="Spring">
-      <configuration>
-        <fileset id="fileset" name="ConfigHelper" removed="false">
-          <file>file://$MODULE_DIR$/src/tourplaner/business/ConfigHelper.java</file>
-        </fileset>
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="11" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib" level="project" />
-    <orderEntry type="library" name="junit:junit:4.13.2" level="project" />
-    <orderEntry type="library" name="org.slf4j:slf4j-log4j12:1.7.12" 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.postgresql:postgresql:42.2.19" level="project" />
+    <orderEntry type="library" name="iText-4.2.0-com.itextpdf" level="project" />
+    <orderEntry type="library" name="org.json:json:20180130" level="project" />
+    <orderEntry type="library" name="com.google.code.gson:gson:2.8.6" level="project" />
   </component>
 </module>

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);

conf.ini.sample

@@ -1,5 +1,20 @@
 [start]
 message = Tour Planer App gestartet
+apptitle = Tour Planer
+logo = logo.png
+
+[lang]
+lang = langde
+
+[settings]
+openpdf = 1
+openmap = 0
+
+[einheiten]
+zeit = min
+strecke = km
+meter = m
+speed = km/h
 
 [db]
 dbname = tourplaner
@@ -8,42 +23,17 @@ port = 5432
 user =
 pw =
 
+[report]
+path = ./reports/
+
 [hilfe]
 gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
 doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
 javadoc = https://git.dergeorg.at/dergeorg/tourplaner
 
-
+[map]
-[langde]
+key =
-achtung = ACHTUNG
+size = 1500,400
-openbrowsererror = TourplanerController -> Browser:
+sizePdf = 600,400
-browserexception = Browser Exception
+path = D:\\TourplanerImages\\
-browserexceptionmsg = Error beim öffnen des Browsers
+file_pre = file:///
-suchfeldleer = Suchfeld ist leer!
-suchtextzuerst = Bitte zuerst den Suchtext in das Suchfeld eingeben!
-keinetourselected = Keine Tour ausgewählt!
-tournametitle = Tourname
-tournameheader = Bitte geben Sie den Namen der Tour an!
-tournamemsg = Name:
-namevergebenheader = Name bereits vergeben!
-namevergebenmsg1 = Der Name '
-namevergebenmsg2 = ' ist bereits vergeben, bitte verwenden Sie einen andern!
-startpunkttitle = Tour Startpunkt
-startpunktheader = Bitte geben Sie den Startpunkt der Tour an!
-startpunktmsg = Startpunkt:
-zielpunkttitle = Tour zielpunkt
-zielpunktheader = Bitte geben Sie den Zielpunkt der Tour an!
-zielpunktmsg = Zielpunkt:
-deltournoselect = ViewModel -> DelTour
-deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus, bevor Sie auf löschen klicken!
-exceptionstackheader = Exception stacktrace:
-keinelogsvorhanden = Fügen Sie erst ein Log hinzu um es anzuzeigen!
-datum = Datum
-dauer = Dauer
-strecke = Strecke
-streckemsg = Strecke des Logeintrages
-dauermsg = Dauer des Logeintrages
-doppelpunkt = :
-fktnichtimplementiert = Diese Funktion ist noch nicht Implementiert
-vergessenodernochnichtsoweit = Entweder hat DerGeorg darauf vergessen oder ist noch nicht so weit gekommen um das zu machen!
-logtournotselectedmsg = Bitte wählen Sie zuerst eine Tour aus, bevor sie einen log Eintrag erstellen!

langde.ini

@@ -0,0 +1,109 @@
+[langde]
+achtung = ACHTUNG
+openbrowsererror = TourplanerController -> Browser:
+browserexception = Browser Exception
+browserexceptionmsg = Error beim öffnen des Browsers
+suchfeldleer = Suchfeld ist leer!
+suchtextzuerst = Bitte zuerst den Suchtext in das Suchfeld eingeben!
+keinetourselected = Keine Tour ausgewählt!
+tournametitle = Tourname
+tournameheader = Bitte geben Sie den Namen der Tour an!
+tournamemsg = Name:
+namevergebenheader = Name bereits vergeben!
+namevergebenmsg1 = Der Name '
+namevergebenmsg2 = ' ist bereits vergeben, bitte verwenden Sie einen andern!
+startpunkttitle = Tour Startpunkt
+startpunktheader = Bitte geben Sie den Startpunkt der Tour an!
+startpunktmsg = Startpunkt:
+zielpunkttitle = Tour zielpunkt
+zielpunktheader = Bitte geben Sie den Zielpunkt der Tour an!
+zielpunktmsg = Zielpunkt:
+deltournoselect = ViewModel -> DelTour
+deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus!
+exceptionstackheader = Exception stacktrace:
+keinelogsvorhanden = Fügen Sie erst ein Log hinzu um es anzuzeigen!
+datum = Datum
+dauer = Dauer
+strecke = Strecke
+streckemsg = Strecke des Logeintrages
+dauermsg = Dauer des Logeintrages
+doppelpunkt = :
+fktnichtimplementiert = Diese Funktion ist noch nicht Implementiert
+vergessenodernochnichtsoweit = Entweder hat DerGeorg darauf vergessen oder ist noch nicht so weit gekommen um das zu machen!
+logtournotselectedmsg = Bitte wählen Sie zuerst eine Tour aus, bevor sie einen log Eintrag erstellen!
+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.
+tourreportvon = Tour Report von ->
+tourplanervon = Tourplaner by DerGeorg
+reportkeywords = Tourplaner, Tour, Report
+tourplaner = Tourplaner"
+tour = Tour
+reportvon = Report erstellt von:
+reportstart = Startpunkt der Tour:
+reportziel = Zielpunkt der Tour:
+reportdauercal = Berechnete Dauer der Tour:
+reportstreckecal = Berechnete Strecke der Tour:
+logs = Logs
+countlog = Anzahl der Logeinträge:
+logvom = Log vom:
+logdauer = Dauer:
+logpause = Davon Pause:
+loggegangen = Davon gegangen:
+logavg = Berechnete Durchschnittliche Geschwindigkeit:
+logstrecke = Entfernung:
+loghight = Höhenmeter:
+logbemerkung = Bemerkung:
+
+fkarte = Karte
+fbeschreibung = Beschreibung
+fedit = Bearbeiten
+fname = Tourname
+fstrecke = Berechnete Strecke
+fdauer =  Berechnete Dauer
+fziel = Ziel
+fstart = Start
+favg = Durchschnittsgeschwindigkeit
+fbemerkung = Bemerkung
+fdatum = Datum
+fdauer = Dauer
+fgegangen = Davon gegangen
+fhight = Höhenmeter
+fpause = Davon Pause
+fstrecke = Strecke
+
+keinlogselected = Kein Logeintrag ausgewählt
+keinlogselectedmsg = Bitte zuerst einen Logeintrag auswählen
+
+fsuche = Suchen
+fopenmapsetting = Map automatisch öffnen
+fopenpdfsetting = Report automatisch öffnen
+flangenglisch = Englisch
+flangdeutsch = Deutsch
+fdatei = Datei
+fbearbeiten = Bearbeiten
+foptionen = Optionen
+fsprache = Sprache auswählen
+fhilfe = Hilfe
+freposum = Erstelle Report über alle Touren
+frepotour = Erstelle Report über aktuelle Tour
+fbeenden = Beenden
+fpunkte = ...
+
+rzeitallerlogs = Gesammte Zeit aller Logs:
+rstreckeallerlogs = gesammte Strecke aller Logs:
+rcalzeitallerlogs = Berechnete Zeit aller Logs:
+calstreckeallerloggs = Berechnete Strecke aller Touren:
+rdaten = Daten
+rsummrepo = Zusammengefasster Report
+
+bewertung = Bewertung
+bewertungmsg = Bitte die Bewertung zwischen 0 und 5 eingeben
+bewertungeror = Bitte nur Bewertungen von 0 und 5 eingeben
+bewertungerror2 = Bitte nur Zahlen zum Bewerten

langen.ini

@@ -0,0 +1,110 @@
+[langen]
+achtung = ATTENTION
+openbrowsererror = TourplanerController -> Browser:
+browserexception = Browser Exception
+browserexceptionmsg = Error at opening Browser
+suchfeldleer = Search field is empty!
+suchtextzuerst = Please enter search term first!
+keinetourselected = No Tour selected
+tournametitle = Tour name
+tournameheader = Please enter a Tourname!
+tournamemsg = Name:
+namevergebenheader = Name is already occupied!
+namevergebenmsg1 = The name '
+namevergebenmsg2 = ' is already in use!
+startpunkttitle = Tour start
+startpunktheader = Please enter the start of the Tour
+startpunktmsg = Start:
+zielpunkttitle = Tour destination:
+zielpunktheader = Please enter the tour destination!
+zielpunktmsg = Destination:
+deltournoselect = ViewModel -> DelTour
+deltournoselectmsg = Please select a tour first!
+exceptionstackheader = Exception stacktrace:
+keinelogsvorhanden = First add a Log!
+datum = Date
+dauer = Duration
+strecke = Distance
+streckemsg = Distance of the log entry
+dauermsg = Duration of the log entry
+doppelpunkt = :
+fktnichtimplementiert = Not implementet jet
+vergessenodernochnichtsoweit = Not implementet jet
+logtournotselectedmsg = Please select a tour first!
+keintextimfeld = Please enter a text!
+nurzahlen = Only numbers!
+nurpositivezahlen = Only positiv numbers!
+pause = Break
+pausemsg = Duration of the break
+hightmeter = Vertical meters
+hightmetermsg = Vertical meters of the etape
+bemerkung = Comment
+bemerkungheader = Please enter a Comment, can also be empty!
+tourreportvon = Tour Report from ->
+tourplanervon = Tourplaner by DerGeorg
+reportkeywords = Tourplaner, Tour, Report
+tourplaner = Tourplaner
+tour = Tour
+reportvon = Report created by:
+reportstart = Start of the tour:
+reportziel = Destination of the tour:
+reportdauercal = Calculated duration of the tour:
+reportstreckecal = Calculated distance of the tour:
+logs = Logs
+countlog = Number of log entries:
+logvom = Log from:
+logdauer = Duration:
+logpause = Break from that:
+loggegangen = Gone away:
+logavg = Calculated averrage speed:
+logstrecke = Distance:
+loghight = Vertical meters:
+logbemerkung = Comment:
+
+fkarte = Map
+fbeschreibung = Description
+fedit = Edit
+fname = Tourname
+fstrecke = Calculated Distance
+fdauer =  Calculated Duration
+fziel = Destination
+fstart = Start
+favg = Average speed
+fbemerkung = Comment
+fdatum = Date
+fdauer = Duration
+fgegangen = Gone away
+fhight = Vertical meters
+fpause = Break from that
+fstrecke = Distance
+
+keinlogselected = No log selected
+keinlogselectedmsg = Please select a log first!
+
+
+fsuche = Search
+fopenmapsetting = Open map automatic
+fopenpdfsetting = Open report automatic
+flangenglisch = English
+flangdeutsch = German
+fdatei = File
+fbearbeiten = Edit
+foptionen = Options
+fsprache = Choose Language
+fhilfe = Help
+freposum = Generate summarize-report
+frepotour = Generate tour-report
+fbeenden = Quit
+fpunkte = ...
+
+rzeitallerlogs = Time of all logs:
+rstreckeallerlogs = Distance of all logs:
+rcalzeitallerlogs = Calculated time of all logs:
+calstreckeallerloggs = Calculated distance  of all logs:
+rdaten = Data
+rsummrepo = Summary Report
+
+bewertung = Rating
+bewertungmsg = Please enter a rating from 0 to 5
+bewertungeror = Please enter only a rating from 0 to 5
+bewertungerror2 = Please only enter numbers for rating

log/log4j/log.out

@@ -1,139 +0,0 @@
-Tour planer Startet!
-Tour planer Startet!
-App started
-2021-02-26 15:59:44 INFO  TourPlaner:15 - App started
-2021-02-26 16:06:01 FATAL TourPlanerConfig:27 - C:\Users\georg\OneDrive\FH\Swe\Tourplaner\conf.ini (Das System kann die angegebene Datei nicht finden)
-2021-02-26 16:08:31 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-02-26 21:27:46 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-02-26 21:27:46 ERROR PresenterMain:33 - 
-/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56
-
-2021-02-26 21:27:46 INFO  PostgresHelper:15 - User Table created
-2021-02-26 21:27:46 ERROR ClassNotFoundException:33 - org.postgresql.Driver
-2021-02-26 21:27:46 ERROR NullPointerException:33 - 
-2021-02-26 21:30:59 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-02-26 21:30:59 ERROR PresenterMain:33 - 
-/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56
-
-2021-02-26 21:30:59 INFO  PostgresHelper:15 - User Table created
-2021-02-26 21:31:01 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-02-26 21:31:01 ERROR NullPointerException:33 - 
-2021-02-26 21:32:19 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-02-26 21:32:19 ERROR PresenterMain:33 - 
-/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56
-
-2021-02-26 21:32:19 INFO  PostgresHelper:15 - User Table created
-2021-02-26 21:32:21 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-02-26 21:32:21 ERROR NullPointerException:33 - 
-2021-02-26 21:33:05 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-02-26 21:33:05 ERROR PresenterMain:33 - 
-/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56
-
-2021-02-26 21:33:05 INFO  PostgresHelper:15 - User Table created
-2021-02-26 21:33:07 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-02-26 21:33:07 ERROR NullPointerException:33 - 
-2021-02-26 21:35:08 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-02-26 21:35:08 ERROR PresenterMain:33 - 
-/C:/Users/georg/OneDrive/FH/Swe/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:56
-
-2021-02-26 21:35:08 INFO  PostgresHelper:15 - User Table created
-2021-02-26 21:35:10 ERROR PSQLException:33 - Connection to postgres.dergeorg.at:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-02-26 21:35:10 ERROR NullPointerException:33 - 
-2021-03-03 13:12:33 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-03 13:12:34 INFO  PostgresHelper:15 - User Table created
-2021-03-03 13:16:04 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-03 13:16:04 ERROR PresenterMain:33 - 
-/C:/Users/georg/Documents/FH/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:163
-
-2021-03-03 13:16:04 INFO  PostgresHelper:15 - User Table created
-2021-03-03 13:20:58 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-03 13:20:58 ERROR PresenterMain:33 - 
-/C:/Users/georg/Documents/FH/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:163
-
-2021-03-03 13:20:58 INFO  PostgresHelper:15 - User Table created
-2021-03-03 15:48:05 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-03 15:48:05 ERROR PresenterMain:33 - 
-/C:/Users/georg/Documents/FH/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:163
-
-2021-03-03 15:48:05 INFO  PostgresHelper:15 - User Table created
-2021-03-03 15:50:47 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-03 15:50:47 ERROR PresenterMain:33 - 
-/C:/Users/georg/Documents/FH/Tourplaner/out/production/Tourplaner/tourplaner/ui/tourplaner.fxml:163
-
-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 - 
-2021-03-17 14:39:16 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 14:39:16 INFO  PostgresHelper:15 - User Table created
-2021-03-17 14:39:18 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 14:39:18 ERROR NullPointerException:33 - 
-2021-03-17 14:46:45 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 14:46:45 INFO  PostgresHelper:15 - User Table created
-2021-03-17 14:46:47 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 14:46:47 ERROR NullPointerException:33 - 
-2021-03-17 14:48:46 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 14:48:46 INFO  PostgresHelper:15 - User Table created
-2021-03-17 14:48:48 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 14:48:48 ERROR NullPointerException:33 - 
-2021-03-17 15:20:09 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 15:20:09 INFO  PostgresHelper:15 - User Table created
-2021-03-17 15:20:11 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 15:20:11 ERROR NullPointerException:33 - 
-2021-03-17 15:36:24 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-17 15:38:41 ERROR ViewModel -> DelTour:33 - Keine Tour ausgewählt!
-2021-03-17 16:02:24 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 16:02:24 INFO  PostgresHelper:15 - User Table created
-2021-03-17 16:02:26 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 16:02:26 ERROR NullPointerException:33 - 
-2021-03-17 16:03:16 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 16:03:16 INFO  PostgresHelper:15 - User Table created
-2021-03-17 16:03:18 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 16:03:18 ERROR NullPointerException:33 - 
-2021-03-17 16:04:18 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 16:04:18 INFO  PostgresHelper:15 - User Table created
-2021-03-17 16:04:20 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 16:04:20 ERROR NullPointerException:33 - 
-2021-03-17 16:04:26 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 16:04:26 INFO  PostgresHelper:15 - User Table created
-2021-03-17 16:04:28 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 16:04:28 ERROR NullPointerException:33 - 
-2021-03-17 16:06:47 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 16:06:47 INFO  PostgresHelper:15 - User Table created
-2021-03-17 16:06:49 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 16:06:49 ERROR NullPointerException:33 - 
-2021-03-17 16:06:55 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 16:06:55 INFO  PostgresHelper:15 - User Table created
-2021-03-17 16:06:57 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 16:06:57 ERROR NullPointerException:33 - 
-2021-03-17 17:02:33 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 17:02:33 INFO  PostgresHelper:15 - User Table created
-2021-03-17 17:02:35 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 17:02:35 ERROR NullPointerException:33 - 
-2021-03-17 17:02:38 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 17:02:38 INFO  PostgresHelper:15 - User Table created
-2021-03-17 17:02:40 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 17:02:40 ERROR NullPointerException:33 - 
-2021-03-17 17:08:23 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 17:08:23 INFO  PostgresHelper:15 - User Table created
-2021-03-17 17:08:25 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 17:08:25 ERROR NullPointerException:33 - 
-2021-03-17 17:08:31 INFO  TourPlaner:15 - Tour Planer App gestartet
-2021-03-17 17:08:31 INFO  PostgresHelper:15 - User Table created
-2021-03-17 17:08:33 ERROR PSQLException:33 - Connection to 192.168.1.116:5432 refused. Check that the hostname and port are correct and that the postmaster is accepting TCP/IP connections.
-2021-03-17 17:08:33 ERROR NullPointerException:33 - 

src/tourplaner/Main.java

@@ -4,9 +4,11 @@ import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 
 import tourplaner.business.ConfigHelper;
+import tourplaner.business.TourPlaner;
 
 import java.io.IOException;
 
@@ -21,7 +23,9 @@ public class Main extends Application {
     public void start(Stage primaryStage) throws IOException {
         Parent root  = FXMLLoader.load(Main.class.getResource("tourplaner.fxml"));
         primaryStage.setTitle(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "apptitle"));
-        primaryStage.setScene(new Scene(root, 600, 600));
+        primaryStage.getIcons().add(new Image("file:"+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo")));
+        TourPlaner.init();
+        primaryStage.setScene(new Scene(root, 1500, 1000));
         primaryStage.show();
     }
 }

src/tourplaner/business/AlertHelper.java

@@ -1,177 +0,0 @@
-package tourplaner.business;
-
-import javafx.scene.Scene;
-import javafx.scene.control.*;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextArea;
-import javafx.scene.layout.*;
-import javafx.scene.text.Text;
-import javafx.stage.Stage;
-
-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;
-
-public class AlertHelper {
-
-    /**
-     * Warning Dialog
-     * @param title Title des Dialogs
-     * @param header Header des Dialogs
-     * @param msg Nachricht des Dialogs
-     */
-    public static void warn(String title, String header, String msg){
-        alertType(Alert.AlertType.WARNING, title, header, msg);
-    }
-
-    /**
-     * Info Dialog
-     * @param title Title des Dialogs
-     * @param header Header des Dialogs
-     * @param msg Nachricht des Dialogs
-     */
-    public static void inform(String title, String header, String msg){
-        alertType(Alert.AlertType.INFORMATION, title, header, msg);
-    }
-
-    /**
-     * Info Dialog ohne Header
-     * @param title Title des Dialogs
-     * @param msg Nachricht des Dialogs
-     */
-    public static void informNoHeader(String title, String msg){
-        inform(title, null, msg);
-    }
-
-    /**
-     * Error Dialog
-     * @param title Title des Dialogs
-     * @param header Header des Dialogs
-     * @param msg Nachricht des Dialogs
-     */
-    public static void error(String title, String header, String msg){
-        alertType(Alert.AlertType.ERROR, title, header, msg);
-    }
-
-    /**
-     * Ausgabe einer Exception in einem Dialog
-     * @param title Title des Dialogs
-     * @param header Header des Dialogs
-     * @param msg Nachricht des Dialogs
-     * @param ex Die exception die ausgegeben werden soll
-     */
-    public static void exerror(String title, String header, String msg, Exception ex){
-        Alert alert = new Alert(Alert.AlertType.ERROR);
-        alert.setTitle(title);
-        alert.setHeaderText(header);
-        alert.setContentText(msg);
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        ex.printStackTrace(pw);
-        String exceptionText = sw.toString();
-        Label label = new Label(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "exceptionstackheader"));
-        TextArea textArea = new TextArea(exceptionText);
-        textArea.setEditable(false);
-        textArea.setWrapText(true);
-        textArea.setMaxWidth(Double.MAX_VALUE);
-        textArea.setMaxHeight(Double.MAX_VALUE);
-        GridPane.setVgrow(textArea, Priority.ALWAYS);
-        GridPane.setHgrow(textArea, Priority.ALWAYS);
-        GridPane expContent = new GridPane();
-        expContent.setMaxWidth(Double.MAX_VALUE);
-        expContent.add(label, 0, 0);
-        expContent.add(textArea, 0, 1);
-        alert.getDialogPane().setExpandableContent(expContent);
-        alert.showAndWait();
-    }
-
-    /**
-     *
-     * @param alertly Typ des Dialogs
-     * @param title Title des Dialogs
-     * @param header Header des Dialogs
-     * @param msg Nachricht des Dialogs
-     */
-    private static void alertType(Alert.AlertType alertly, String title, String header, String msg){
-        Alert alert = new Alert(alertly);
-        alert.setTitle(title);
-        alert.setHeaderText(header);
-        alert.setContentText(msg);
-
-        alert.showAndWait();
-    }
-
-    /**
-     * Texteingabe
-     * @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) {
-        TextInputDialog dialog = new TextInputDialog();
-        dialog.setTitle(title);
-        dialog.setHeaderText(header);
-        dialog.setContentText(msg);
-        Optional<String> result = dialog.showAndWait();
-        AtomicReference<String> returnText = new AtomicReference<>("");
-        result.ifPresent(returnText::set);
-        if(!returnText.get().isEmpty()){
-            return returnText.get();
-        }else{
-            return null;
-        }
-    }
-
-    /**
-     * 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
-     */
-    public static int inputNumber(String title, String header, String msg) {
-        TextInputDialog dialog = new TextInputDialog();
-        dialog.setTitle(title);
-        dialog.setHeaderText(header);
-        dialog.setContentText(msg);
-        Optional<String> result = dialog.showAndWait();
-        AtomicReference<Integer> returnText = new AtomicReference<Integer>(-1);
-        result.ifPresent(s -> {
-            try {
-                int resultInt = Integer.parseInt(result.get());
-                returnText.set(resultInt);
-            }catch (NumberFormatException e){
-                AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"), "Bitte nur Zahlen eingeben!", "Bitte geben sie nur Zahlen von 0 - 10 an!");
-                returnText.set(-1);
-            }
-        });
-        return returnText.get();
-    }
-
-    /**
-     * Date Picker Dialog, sobald ein Datum ausgewählt wurde, wird es automatisch bestätigt und der dialog geschlossen
-     * @param title Name des Dialogs
-     * @return Gewähltes datum
-     */
-    public static LocalDate datePicker(String title){
-        final DatePicker datePicker = new DatePicker(LocalDate.now());
-        final Stage stage = new Stage();
-        AtomicReference<LocalDate> selectedDate = new AtomicReference<>();
-        datePicker.setOnAction(event -> {
-            LocalDate date = datePicker.getValue();
-            System.out.println("Selected date: " + date);
-            selectedDate.set(date);
-            stage.close();
-        });
-
-        stage.setScene(
-                new Scene(datePicker)
-        );
-        stage.showAndWait();
-        return selectedDate.get();
-    }
-}

src/tourplaner/business/ConfigHelper.java

@@ -11,6 +11,7 @@ import java.io.IOException;
 public class ConfigHelper {
 
     public static String standartConfig = "conf.ini"; // Config.ini befindet sich im Root Verzeichnis
+    public static String standartLangDe = "langde.ini"; // langde.ini befindet sich im Root Verzeichnis
 
     /**
      * Liest einen Int aus der Config aus
@@ -42,12 +43,22 @@ public class ConfigHelper {
         try {
             ini = new Wini(new File(filename));
         } catch (IOException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
+            LogHelper.error(e);
         }
         assert ini != null;
         return ini.get(sectionName, optionName, String.class);
     }
 
+    /**
+     * Liest einen String aus der Lang datei aus
+     * Die Sprache wird im config file umgestellt
+     * @param optionName Options Name
+     * @return Den angeforderten String
+     */
+    public static String getLangIniString(String optionName){
+        return ConfigHelper.getIniString(getIniString(getStandartConfig(), "lang", "lang") + ".ini", ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
+    }
+
     /**
      * Setzt ein String in der Config
      * @param filename Speicherort
@@ -81,7 +92,7 @@ public class ConfigHelper {
             ini.put(sectionName, optionName, value);
             ini.store();
         } catch (IOException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
+            LogHelper.error(e);
         }
     }
 
@@ -92,4 +103,12 @@ public class ConfigHelper {
     public static String getStandartConfig() {
         return standartConfig;
     }
+
+    /**
+     * Gibt den namen des standard langde file zurück
+     * @return Name des standard langde files
+     */
+    public static String getStandartLangde() {
+        return standartLangDe;
+    }
 }

src/tourplaner/business/DirectionMap.java

@@ -0,0 +1,94 @@
+package tourplaner.business;
+
+import java.awt.*;
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * Zuständig für das besorgen der Map für die UI und PDF-Reports und für die Berechneten infos der Tour (Dauer, Strecke)
+ */
+public class DirectionMap {
+    private double dauer, strecke;
+    private String start, end, tourname, file, filepdf;
+    private Image map, mappdf;
+
+    /**
+     * Holt die Map als image und alle Daten zur berechneten Route
+     *
+     * @param start Startpunkt
+     * @param ende Endpunkt
+     * @param tourname Name der Aktuellen Tour
+     * @throws IOException Fehler beim Image der Map
+     */
+    public DirectionMap (String start, String ende, String tourname) throws IOException {
+        this.map = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size"));
+        this.mappdf = getMap(start, ende, ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "sizePdf"));
+        this.start = start;
+        this.end = ende;
+        this.tourname = tourname;
+        this.file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + ".jpg";
+        this.filepdf = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + "_pdf.jpg";
+        FileHelper.saveImage(this.map, "jpg", new File(this.file));
+        FileHelper.saveImage(this.mappdf, "jpg", new File(this.filepdf));
+        getDirections(start, ende);
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
+            FileHelper.openDefault(file);
+        }
+    }
+
+    /**
+     * Get berechnete Dauer in Minuten
+     * @return Berechnete Dauer der Tour
+     */
+    public double getDauer() {
+        return dauer;
+    }
+
+    /**
+     * Get berechnete Strecke
+     * @return Berechnete Strecke der Tour
+     */
+    public double getStrecke() {
+        return strecke;
+    }
+
+    /**
+     * Downloadet die Map von Mapquest
+     * @param start Startpunkt
+     * @param ende Endpunkt
+     * @return Image von der Map
+     * @throws IOException Fehler beim Get der Map
+     */
+    private Image getMap(String start, String ende, String size) throws IOException {
+        return HttpHelper.httpGetImage("https://www.mapquestapi.com/staticmap/v5/map?start="+start+"&end="+ende+"&size="+size+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
+    }
+
+    /**
+     * Besorgt die Infos der Tour von Mapquest Directions
+     * @param start Start der Tour
+     * @param ende Ende der Tour
+     * @throws IOException Fehler beim besorgen der infos über die Tour
+     */
+    private void getDirections(String start, String ende) throws IOException {
+        System.out.println("LOCS: " + start + ende);
+        String json = HttpHelper.httpGetJsonString("https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
+        System.out.println("JSON: " + json);
+        System.out.println("URL https://www.mapquestapi.com/directions/v2/route?key="+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key")+"&from="+start+"&to="+ende+"&outFormat=json&ambiguities=ignore&routeType=fastest&doReverseGeocode=false&enhancedNarrative=false&avoidTimedConditions=false");
+        this.strecke = JsonHelper.getDoubleFromJson(json, "distance");
+        this.dauer = formatetTimeToMinutes(JsonHelper.getStingFromJson(json, "formattedTime"));
+    }
+
+    /**
+     * Formatet time HH:MM:SS in Minuten umwandeln
+     * @param formatetTime Formatet time HH:MM:SS
+     * @return Zeit in Minuten
+     */
+    private double formatetTimeToMinutes(String formatetTime){
+        double minutes = 0;
+        String[] result = formatetTime.split(":");
+        minutes += Double.parseDouble(result[0]) * 60;
+        minutes += Double.parseDouble(result[1]);
+        minutes += Double.parseDouble(result[2]) / 60;
+        return minutes;
+    }
+}

src/tourplaner/business/EinheitenAdder.java

@@ -0,0 +1,50 @@
+package tourplaner.business;
+
+/**
+ * Fügt am ende eines Strings die einheiten an
+ */
+public class EinheitenAdder {
+
+    /**
+     * Fügt meter hinzu
+     * @param meter Meter als String
+     * @return Meter mit einheit
+     */
+    public static String addMeter(String meter){
+        return meter + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "meter");
+    }
+
+    public static String addSpeed(String speed){
+        return speed + " " + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "speed");
+    }
+    
+    /**
+     * Fügt km hinzu
+     * @param km km als String
+     * @return km mit einheit
+     */
+    public static String addKm(String km){
+        return km + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "strecke");
+    }
+    
+    /**
+     * Fügt minuten hinzu
+     * @param min minuten als String
+     * @return minuten mit einheit
+     */
+    public static String addMinuten(String min){
+        return min + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "zeit");
+    }
+
+    /**
+     * Fügt am ende .json hinzu. Sofern es nicht schon dort ist
+     * @param filename Filename ohne .json am ende
+     * @return Der Filename mit .json am ende-
+     */
+    public static String addJson(String filename){
+        if(!filename.contains(".json")){
+            filename += ".json";
+        }
+        return filename;
+    }
+}

src/tourplaner/business/Exporter.java

@@ -0,0 +1,77 @@
+package tourplaner.business;
+
+import tourplaner.data.DbConnect;
+import tourplaner.object.Log;
+import tourplaner.object.Tour;
+import tourplaner.ui.AlertHelper;
+import tourplaner.ui.ProgressBar;
+
+import javax.swing.*;
+import java.io.*;
+import java.util.ArrayList;
+
+/**
+ * Ist für das importieren und Exportieren der Daten zuständig
+ */
+public class Exporter {
+
+    private ArrayList<Tour> touren;
+    private String path;
+
+    /**
+     * Erstellt den Exporter mit dem gegebenen Path
+     * @param path Gegebener Path
+     */
+    public Exporter(String path) {
+        this.path = path;
+    }
+
+    /**
+     * Führt den Export aus -> Holt daten, erstellt file
+     * @throws IOException Fehler beim File erstellen
+     */
+    public void doExport() throws IOException {
+        ProgressBar progressBar = new ProgressBar("Export...");
+        int step = progressBar.getProgressSize(4, 100);
+        ArrayList<Tour> data = new DbConnect().getAllTouren();
+
+        progressBar.addProgress(step);
+        FileWriter fileWriter = new FileWriter(EinheitenAdder.addJson(this.path));
+        progressBar.addProgress(step);
+        JsonHelper.getJsonFromObj(data, fileWriter);
+        progressBar.addProgress(step);
+        BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+        progressBar.setProgress(100);
+        bufferedWriter.close();
+    }
+
+    /**
+     * Führt den Imput aus -> File holen, Daten in db erstellen
+     * @throws IOException Fehler beim File öffnen
+     */
+    public void doImport() {
+        ProgressBar progressBar = new ProgressBar("Import...");
+        try {
+            this.touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path)));
+            DbConnect dbConnect = new DbConnect();
+            dbConnect.delAllData();
+            progressBar.addProgress(5);
+            int size = progressBar.getProgressSize(this.touren.size() * 3, 100);
+            for (Tour tour:this.touren) {
+                    new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
+                progressBar.addProgress(size);
+                dbConnect.addTour(tour);
+                progressBar.addProgress(size);
+                ArrayList<Log> logs = tour.getLogs();
+                for (Log log:logs) {
+                    dbConnect.addLog(tour.getName(), log);
+                }
+                progressBar.addProgress(size);
+            }
+        } catch (IOException e) {
+            LogHelper.error(e);
+            progressBar.setProgress(100);
+        }
+        progressBar.setProgress(100);
+    }
+}

src/tourplaner/business/FileHelper.java

@@ -0,0 +1,62 @@
+package tourplaner.business;
+
+import javax.imageio.ImageIO;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+public class FileHelper {
+
+    /**
+     * Öffnet ein File mit dem Standart Program
+     * @param f File Path als string
+     */
+    public static void openDefault(String f){
+        // A reference to a text file
+        File file = new File(f);
+
+        try {
+            Desktop desktop = Desktop.getDesktop();
+
+            // Open a file using the default program for the file type. In the example
+            // we will launch a default registered program to open a text file. For
+            // example on Windows operating system this call might launch a notepad.exe
+            // to open the file.
+            desktop.open(file);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Speichert ein Image
+     * @param img Das zu speichernde Bild
+     * @param type Dateityp z.b. jpg
+     * @param file Wo die datei zu speichern ist
+     * @throws IOException
+     */
+    public static void saveImage(Image img, String type, File file) throws IOException {
+        ImageIO.write(ImgHelper.toBufferedImage(img), type, file);
+    }
+
+    /**
+     * Holt ein image von einem File
+     * @param file File mit dem image
+     * @return Das buffered image
+     * @throws IOException Fehler beim öffnen des bildes
+     */
+    public static BufferedImage getImage(File file) throws IOException {
+        return ImageIO.read(file);
+    }
+
+    /**
+     * Löscht ein File
+     * @param file File das zu löschen ist
+      * @return false bei error
+     */
+    public static boolean delFile(File file){
+        return file.delete();
+    }
+}

src/tourplaner/business/HttpHelper.java

@@ -0,0 +1,53 @@
+package tourplaner.business;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+/**
+ * Http Hilfsfunktionen
+ */
+public class HttpHelper {
+
+    /**
+     * Holt ein Image von gegebener URL
+     * @param url Url als Sting
+     * @return Image von der Url
+     * @throws IOException Fehler beim Bild holen
+     */
+    public static Image httpGetImage(String url) throws IOException {
+        URL urls = new URL(url);
+        return ImageIO.read(urls);
+    }
+
+    /**
+     * Http GET Json string vom Url string
+     * @param url Url als String
+     * @return Json als String
+     * @throws IOException Fehler beim Json holen
+     */
+    public static String httpGetJsonString(String url) throws IOException {
+        HttpURLConnection con = null;
+        try {
+            var myurl = new URL(url);
+            con = (HttpURLConnection) myurl.openConnection();
+            con.setRequestMethod("GET");
+            StringBuilder content;
+            try (BufferedReader in = new BufferedReader(
+                    new InputStreamReader(con.getInputStream()))) {
+                String line;
+                content = new StringBuilder();
+                while ((line = in.readLine()) != null) {
+                    content.append(line);
+                    content.append(System.lineSeparator());
+                }
+            }
+            return content.toString();
+        } finally {
+            assert con != null;
+            con.disconnect();
+        }
+    }
+}

src/tourplaner/business/ImgHelper.java

@@ -0,0 +1,35 @@
+package tourplaner.business;
+
+import java.awt.*;
+import java.awt.image.BufferedImage;
+
+/**
+ * Image Hilfsfunktionen
+ */
+public class ImgHelper {
+
+    /**
+     * Converts a given Image into a BufferedImage
+     *
+     * @param img The Image to be converted
+     * @return The converted BufferedImage
+     */
+    public static BufferedImage toBufferedImage(Image img)
+    {
+        if (img instanceof BufferedImage)
+        {
+            return (BufferedImage) img;
+        }
+
+        // Create a buffered image with transparency
+        BufferedImage bimage = new BufferedImage(img.getWidth(null), img.getHeight(null), BufferedImage.TYPE_INT_ARGB);
+
+        // Draw the image on to the buffered image
+        Graphics2D bGr = bimage.createGraphics();
+        bGr.drawImage(img, 0, 0, null);
+        bGr.dispose();
+
+        // Return the buffered image
+        return bimage;
+    }
+}

src/tourplaner/business/JsonHelper.java

@@ -0,0 +1,72 @@
+package tourplaner.business;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.reflect.TypeToken;
+import tourplaner.object.Tour;
+
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.util.ArrayList;
+
+/**
+ * Hilfsklasse für Json (Gson)
+ */
+public class JsonHelper {
+
+    /**
+     * String aus json extrahieren
+     * @param json Json als String
+     * @param gets Eintrag im Json unter "route"
+     * @return Gesammelter String
+     */
+    public static String getStingFromJson(String json, String gets){
+        return getJObj(json).get("route").getAsJsonObject().get(gets).getAsString();
+    }
+
+    /**
+     * Double aus json extrahieren
+     * @param json Json als String
+     * @param gets Eintrag im Json unter "route"
+     * @return Gesammelter Double Wert
+     */
+    public static double getDoubleFromJson(String json, String gets){
+        return getJObj(json).get("route").getAsJsonObject().get(gets).getAsDouble();
+    }
+
+    /**
+     * Erzeugt ein Json aus einem Object
+     * @param obj Das Objekt
+     * @return Json des Objektes
+     */
+    public static String getJsonFromObj(Object obj){
+        return new Gson().toJson(obj);
+    }
+
+    /**
+     * Erzeugt ein Json aus einem Object
+     * @param obj Das Objekt
+     * @param writer File in das geschrieben werden soll
+     */
+    public static void getJsonFromObj(Object obj , FileWriter writer){
+        new Gson().toJson(obj, writer);
+    }
+
+    /**
+     * Wandelt ein Json file in ein Data Objekt um
+     * @param reader File aus dem gelesen wird
+     * @return Data objekt das gelesen wurde
+     */
+    public static ArrayList<Tour> getTourenFromJson(FileReader reader){
+        return new Gson().fromJson(reader, new TypeToken<ArrayList<Tour>>() {}.getType());
+    }
+
+    /**
+     * Json String to JsonObject
+     * @param json Json string
+     * @return Neues JsonObject aus String
+     */
+    private static JsonObject getJObj(String json){
+       return new Gson().fromJson(json, JsonObject.class);
+    }
+}

src/tourplaner/business/LogHelper.java

@@ -33,6 +33,14 @@ public class LogHelper{
         getLog(name).error(msg);
     }
 
+    /**
+     * Log info in file und Console
+     * @param e Exception
+     */
+    public static void error(Exception e){
+        getLog(e.getClass().getName()).error(e.getMessage());
+    }
+
     /**
      * Log info in file und Console
      * @param msg Nachricht in dem Log

src/tourplaner/business/Reporter.java

@@ -0,0 +1,244 @@
+package tourplaner.business;
+
+import com.itextpdf.text.*;
+import com.itextpdf.text.Font;
+import com.itextpdf.text.Image;
+import tourplaner.object.Log;
+import tourplaner.object.Tour;
+
+import com.itextpdf.text.pdf.PdfWriter;
+
+import java.awt.*;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * PDF Report generierung mit iText
+ *
+ * Erstellt Reports über einzelne Touren und fasst alle Touren zusammen
+ *
+ * iText 4 ist gratis verfügbar, siehe:
+ * https://github.com/ymasory/iText-4.2.0
+ */
+public class Reporter {
+
+    private static Font catFont = new Font(Font.TIMES_ROMAN, 18,
+            Font.BOLD);
+    private static Font redFont = new Font(Font.TIMES_ROMAN, 12,
+            Font.NORMAL, Color.RED);
+    private static Font subFont = new Font(Font.TIMES_ROMAN, 16,
+            Font.BOLD);
+    private static Font smallBold = new Font(Font.TIMES_ROMAN, 12,
+            Font.BOLD);
+
+    /**
+     * Erstellt den Summary Report
+     */
+    public static void sumReport(){
+        ArrayList<Tour> tours = TourPlaner.getAllTours();
+        String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "summary.pdf";
+        try {
+            Document document = new Document();
+            PdfWriter.getInstance(document, new FileOutputStream(file));
+            document.open();
+            addSumRepo(document, tours);
+
+            document.close();
+        } catch (DocumentException | FileNotFoundException e) {
+            LogHelper.error(e.getMessage(), e.getClass().getName());
+        }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
+            FileHelper.openDefault(file);
+        }
+    }
+
+    /**
+     * Content des Sumary reports
+     * @param document Document auf das geschrieben wird
+     * @param touren Touren die berechnet werden
+     * @throws DocumentException Fehler beim schreiben auf das Dokument
+     */
+    private static void addSumRepo(Document document, ArrayList<Tour> touren) throws DocumentException {
+        double dauer = 0;
+        double strecke = 0;
+        double calDauer = 0;
+        double calStecke = 0;
+        for (Tour tour:touren) {
+            calStecke += tour.getStrecke();
+            calDauer += Double.parseDouble(tour.getDauer());
+            ArrayList<Log> logs = tour.getLogs();
+            for (Log log:logs) {
+                dauer += log.getDauer();
+                strecke += log.getStrecke();
+            }
+        }
+        Anchor anchor = new Anchor(ConfigHelper.getLangIniString("rsummrepo"), catFont);
+        anchor.setName(ConfigHelper.getLangIniString("rsummrepo"));
+        // Second parameter is the number of the chapter
+        Chapter catPart = new Chapter(new Paragraph(anchor), 1);
+        Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("rdaten"), subFont);
+        Section subCatPart = catPart.addSection(subPara);
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + " " + System.getProperty("user.name") + ", " + new Date()));
+        subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("rzeitallerlogs") + " " + dauer)));
+        subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("rstreckeallerlogs") + " " + strecke)));
+        subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("rcalzeitallerlogs") + " " + calDauer)));
+        subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("calstreckeallerloggs") + " " + calStecke)));
+        document.add(catPart);
+    }
+
+    /**
+     * Erstellt einen Tour Report
+     * @param tourname Name der Tour die Gereportet werden soll
+     */
+    public static void createTourReport(String tourname)   {
+        Tour tour = TourPlaner.getTour(tourname);
+        tour.setLog(TourPlaner.getLogs(tourname));
+        String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + tourname+".pdf";
+        try {
+            Document document = new Document();
+            PdfWriter.getInstance(document, new FileOutputStream(file));
+            document.open();
+            addMetaData(document, tour);
+//            addTitlePage(document, tour);
+            addContent(document, tour);
+            document.close();
+        } catch (DocumentException | FileNotFoundException e) {
+            LogHelper.error(e.getMessage(), e.getClass().getName());
+        }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
+            FileHelper.openDefault(file);
+        }
+    }
+
+    // iText allows to add metadata to the PDF which can be viewed in your Adobe
+    // Reader
+    // under File -> Properties
+    private static void addMetaData(Document document, Tour tour) {
+        document.addTitle(ConfigHelper.getLangIniString("tourreportvon") + " " + tour.getName());
+        document.addSubject(ConfigHelper.getLangIniString("tourplanervon"));
+        document.addKeywords(ConfigHelper.getLangIniString("reportkeywords"));
+        document.addAuthor(ConfigHelper.getLangIniString("tourplaner"));
+        document.addCreator(ConfigHelper.getLangIniString("tourplaner"));
+    }
+
+    /**
+     * Erstellt den inhalt des Reports
+     * @param document Aktuelles Dokument
+     * @param tour Aktuelle Tour
+     * @throws DocumentException Fehler beim hinzufügen des Inhaltes
+     */
+    private static void addContent(Document document, Tour tour) throws DocumentException {
+        Anchor anchor = new Anchor(ConfigHelper.getLangIniString("tourreportvon") + tour.getName(), catFont);
+        anchor.setName(ConfigHelper.getLangIniString("tourreportvon") + tour.getName());
+
+        // Second parameter is the number of the chapter
+        Chapter catPart = new Chapter(new Paragraph(anchor), 1);
+
+        Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("tour"), subFont);
+        Section subCatPart = catPart.addSection(subPara);
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + " " + System.getProperty("user.name") + ", " + new Date()));
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportstart") + " " + tour.getStart()));
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportziel") + " " + tour.getZiel()));
+        subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("reportdauercal") + " " + tour.getDauer())));
+        subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("reportstreckecal") + " " + tour.getStrecke())));
+        Paragraph emptyLine = new Paragraph();
+        addEmptyLine(emptyLine, 5);
+        subCatPart.add(emptyLine);
+        // now add all this to the document
+        document.add(catPart);
+
+        Image image1 = null;
+        try {
+            image1 = Image.getInstance(TourPlaner.getImagePdfPath(tour.getName()));
+            image1.setAlignment(Element.ALIGN_CENTER);
+            image1.scaleAbsolute(600, 400);
+
+            document.add(image1);
+        } catch (IOException e) {
+            LogHelper.error(e);
+        }
+        ArrayList<Log> logs = tour.getLogs();
+        // Second parameter is the number of the chapter
+        anchor = new Anchor(ConfigHelper.getLangIniString("logs"), catFont);
+        anchor.setName(ConfigHelper.getLangIniString("logs"));
+        catPart = new Chapter(new Paragraph(anchor), 2);
+        catPart.add(new Paragraph(ConfigHelper.getLangIniString("countlog") + " " + logs.size()));
+
+        for (Log log: logs) {
+            subPara = new Paragraph(ConfigHelper.getLangIniString("logvom") + " " + log.getDatum() , subFont);
+            subCatPart = catPart.addSection(subPara);
+            subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("logdauer") + " " + log.getDauer())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("logpause") + " " + log.getPause())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("loggegangen") + " " + log.getGegangen())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addSpeed(ConfigHelper.getLangIniString("logavg") + " " + log.getAvgspeed())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("logstrecke") + " " + log.getStrecke())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMeter(ConfigHelper.getLangIniString("loghight") + " " + log.getHightmeter())));
+            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logbemerkung") + " " + log.getBemerkung()));
+        }
+        // now add all this to the document
+        document.add(catPart);
+    }
+
+    /**
+     * Fügt eine leere zeile an den Paragraph an
+     * @param paragraph Hier wird hinzugefügt
+     * @param number Um wie viele Leere Zeilen hinzugefügt werden soll
+     */
+    private static void addEmptyLine(Paragraph paragraph, int number) {
+        for (int i = 0; i < number; i++) {
+            paragraph.add(new Paragraph(" "));
+        }
+    }
+//    private static void createTable(Section subCatPart)
+//            throws BadElementException {
+//        PdfPTable table = new PdfPTable(5);
+//
+//        // t.setBorderColor(BaseColor.GRAY);
+//        // t.setPadding(4);
+//        // t.setSpacing(4);
+//        // t.setBorderWidth(1);
+//
+//        PdfPCell c1 = new PdfPCell(new Phrase("NR"));
+//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        table.addCell(c1);
+//
+//        c1 = new PdfPCell(new Phrase("Datum"));
+//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        table.addCell(c1);
+//
+//        c1 = new PdfPCell(new Phrase("Entfernung"));
+//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        table.addCell(c1);
+//
+//        c1 = new PdfPCell(new Phrase("Höhenmeter"));
+//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        table.addCell(c1);
+//
+//        c1 = new PdfPCell(new Phrase("AVG Geschwindigkeit"));
+//        c1.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        table.addCell(c1);
+//
+//
+//        table.setHeaderRows(1);
+//
+//        table.addCell("1.0");
+//        table.addCell("1.1");
+//        table.addCell("1.2");
+//        table.addCell("1.3");
+//        table.addCell("1.4");
+//        table.addCell("1.5");
+//
+//        table.addCell("2.0");
+//        table.addCell("2.1");
+//        table.addCell("2.2");
+//        table.addCell("2.3");
+//        table.addCell("2.4");
+//        table.addCell("2.5");
+//
+//        subCatPart.add(table);
+//
+//    }
+}

src/tourplaner/business/TourPlaner.java

@@ -2,6 +2,15 @@ package tourplaner.business;
 
 import org.apache.log4j.Logger;
 import tourplaner.data.DbConnect;
+import tourplaner.object.Log;
+import tourplaner.object.Tour;
+import tourplaner.ui.ProgressBar;
+
+import java.awt.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * Haupt Logik des Tourplaners
@@ -9,14 +18,184 @@ import tourplaner.data.DbConnect;
 public class TourPlaner{
     private Logger logger;
 
-    public TourPlaner(){
+    /**
-        LogHelper.info(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "message"),
+     * Erstellt alle DB Tabellen falls nötig
-                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "app"));
+     */
+    public static void init(){
         new DbConnect().init();
-
     }
 
-    public String getMapJson(String start, String ziel){
+    /**
-        return start + " " + 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) throws IOException {
+        ProgressBar progressBar = new ProgressBar("Edit...");
+        int step = progressBar.getProgressSize(3, 100);
+        FileHelper.delFile(new File(getImagePath(oldname)));
+        FileHelper.delFile(new File(getImagePdfPath(oldname)));
+        progressBar.addProgress(step);
+        DirectionMap directionMap = new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
+        progressBar.addProgress(step);
+        tour.setDauer(directionMap.getDauer()+"");
+        tour.setStrecke(directionMap.getStrecke());
+        boolean ret = new DbConnect().editTour(oldname, tour);
+        progressBar.setProgress(100);
+        return ret;
+    }
+
+    /**
+     * Löscht eine Tour
+     * @param tourname Tourname
+     * @return false bei error
+     */
+    public static boolean delTour(String tourname){
+        ProgressBar progressBar = new ProgressBar("Del...");
+        int step = progressBar.getProgressSize(3, 100);
+        FileHelper.delFile(new File(getImagePath(tourname)));
+        progressBar.addProgress(step);
+        FileHelper.delFile(new File(getImagePdfPath(tourname)));
+        progressBar.addProgress(step);
+        boolean ret = new DbConnect().delTour(tourname);
+        progressBar.setProgress(100);
+        return ret;
+    }
+    /**
+     * Fügt eine Tour hinzu
+     * @param newTour Neue Tour
+     * @return false bei error
+     */
+    public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException {
+        int step = progressBar.getProgressSize(2, 100);
+        DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
+        progressBar.addProgress(step);
+        newTour.setDauer(directionMap.getDauer()+"");
+        newTour.setStrecke(directionMap.getStrecke());
+        boolean ret = new DbConnect().addTour(newTour);
+        progressBar.setProgress(100);
+        return ret;
+    }
+
+    /**
+     * Holt das Gui Bild
+     * @param tourname Name der Tour
+     * @return Das Bild
+     * @throws IOException Error beim Bild holen
+     */
+    public static Image getImage(String tourname) throws IOException {
+        return FileHelper.getImage(new File(getImagePath(tourname)));
+    }
+
+     /**
+     * Path zu dem Bild für die GUI
+     * @param tourname Name der Tour
+     * @return Path zu dem Bild für die GUI
+     */
+    public static String getImagePath(String tourname){
+        return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
+    }
+
+    /**
+     * Path zu dem Bild für die PDF
+     * @param tourname Name der Tour
+     * @return Path zu dem Bild für die PDF
+     */
+    public static String getImagePdfPath(String tourname){
+        return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg";
+    }
+
+    /**
+     * Öffnet ein Bild einer Tour
+     * @param tourname Tourname
+     */
+    public static void openImage(String tourname){
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
+            FileHelper.openDefault(getImagePath(tourname));
+        }
+    }
+
+
+    /**
+     * Holt alle Logs einer Tour
+     * @param tourname Tourname
+     * @return Alle Logs der Tour
+     */
+    public static ArrayList<Log> getLogs(String tourname){
+        return new DbConnect().getLogs(tourname);
+    }
+
+    /**
+     * Führt einen Rport aus
+     * @param tourname Name der Tour die gereportet wird
+     */
+    public static void doReport(String tourname){
+        Reporter.createTourReport(tourname);
+    }
+
+    /**
+     * Holt eine Tour
+     * @param tourname Name der zu holenden Tour
+     * @return Tour die geholt werden soll
+     */
+    public static Tour getTour(String tourname){
+        return new DbConnect().getTour(tourname);
+    }
+
+    /**
+     * Fügt ein Log hinzu
+     * @param tourname Name der Tour
+     * @param log Neues Log
+     * @return false bei error
+     */
+    public static boolean addLog(String tourname, Log log){
+        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
+        return new DbConnect().addLog(tourname, log);
+    }
+
+    /**
+     * Löscht ein Log
+     * @param tourname Name der Tour
+     * @param id Id des Logs
+     * @return false bei error
+     */
+    public static boolean delLog(String tourname, String id){
+        return new DbConnect().delLog(tourname, id);
+    }
+
+    /**
+     * Editiert ein Log
+     * @param tourname Name der Tour
+     * @param log Neues Log
+     * @return false bei error
+     */
+    public static boolean editLog(String tourname, Log log){
+        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
+        return new DbConnect().editLog(tourname, log);
+    }
+
+    /**
+     * Sucht alle touren die den gegebenen tournamen enthalten
+     * @param tourname Name der zu suchen ist
+     * @return Alle touren die auf den Suchterm passen
+     */
+    public static ArrayList<Tour> sucheTour(String tourname){
+        ArrayList<Tour> touren = new ArrayList<>();
+        getAllTours().forEach(t ->{
+            if(t.getName().contains(tourname)){
+                touren.add(t);
+            }
+        });
+        return touren;
+    }
+
 }

src/tourplaner/data/DbConnect.java

@@ -1,9 +1,14 @@
 package tourplaner.data;
 
-import tourplaner.business.PostgresHelper;
+import javafx.geometry.Pos;
+import tourplaner.business.LogHelper;
+import tourplaner.object.Log;
+import tourplaner.object.Tour;
+import tourplaner.ui.AlertHelper;
+import tourplaner.ui.ProgressBar;
 
-import java.sql.Connection;
+import java.sql.*;
-import java.sql.Statement;
+import java.time.LocalDate;
 import java.util.ArrayList;
 
 /**
@@ -28,10 +33,225 @@ 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,rating varchar);", "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 boolean delAllData(){
+        ArrayList<Boolean> result = new ArrayList<>();
+        result.add(delAllLog());
+        result.add(delAllTour());
+        return !result.contains(false);
+    }
+
+    private boolean delAllTour(){
+        return PostgresHelper.executeUpdate("DELETE FROM public.tour");
+    }
+
+    private boolean delAllLog(){
+        return  PostgresHelper.executeUpdate("DELETE FROM public.log");
+    }
+
+    public ArrayList<Log> getLogs(String tourname){
+
+        this.c = PostgresHelper.con();
+        String id, bemerkung, rating;
+        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");
+                rating = rs.getString("rating");
+                datum = rs.getDate("datum");
+                dauer = rs.getDouble("dauer");
+                hightmeter = rs.getDouble("hightmeter");
+                pause = rs.getDouble("pause");
+                strecke = rs.getDouble("strecke");
+                if (!tourname.isEmpty()) {
+                    logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause, rating));
+                }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);
+        System.out.println("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
+                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
+        return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
+                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
+    }
+
+    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()+"', rating = '"+log.getRating()+"'");
+    }
+
+    public boolean delLog(String tourname, String id){
+        return PostgresHelper.executeUpdate("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
+    }
+
+    private int getTourSize() throws SQLException {
+        Connection con = PostgresHelper.con();
+        Statement s = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
+        ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM tour;");
+        int size =0;
+        if (rs != null)
+        {
+            rs.last();    // moves cursor to the last row
+            size = rs.getInt("count"); // get row id
+            con.close();
+            return size;
+        }
+        con.close();
+        return -1;
+    }
+
+    /**
+     * 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<>();
+        ProgressBar progressBar = new ProgressBar("Get...");
+        try {
+            int tourSize = getTourSize();
+            int step =  progressBar.getProgressSize(tourSize, 100);
+            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, getLogs(tourname)));
+                    progressBar.addProgress(step);
+                }else {
+                    progressBar.setProgress(100);
+                    return null;
+                }
+            }
+            progressBar.setProgress(100);
+            rs.close();
+            stmt.close();
+            this.c.close();
+            return touren;
+        } catch (Exception e) {
+            LogHelper.error(e);
+            progressBar.setProgress(100);
+            return null;
+        }
+    }
+
+    /**
+     * Holt eine Tour aus der Datenbank
+     * @param tn Tourname
+     * @return Null bei fehler, sonst eine List aus den IDs
+     */
+    public Tour getTour(String tn){
+        this.c = PostgresHelper.con();
+        String tourname, mapjson, start, ziel;
+        double dauer, strecke;
+
+        Tour touren = null;
+        try {
+            stmt = this.c.createStatement();
+            ResultSet rs = stmt.executeQuery("select * from tour where tourname = '"+tn+"';");
+            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 = 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;
+        }
+    }
+
 }

src/tourplaner/data/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"));

src/tourplaner/object/Log.java

@@ -6,15 +6,72 @@ import java.time.LocalDate;
 import java.util.Date;
 
 public class Log {
-    private String id, dauer;
+    private String id, bemerkung, rating;
     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, String rating) {
         this.id = id;
         this.dauer = dauer;
         this.datum = datum;
         this.strecke = strecke;
+        this.bemerkung = bemerkung;
+        this.hightmeter = hightmeter;
+        this.pause = pause;
+        this.rating = rating;
+        this.gegangen = this.dauer - this.pause;
+        this.avgspeed = this.strecke / (this.gegangen/60);
+        if(Double.isInfinite(this.avgspeed)){
+            this.avgspeed = -1;
+        }
+    }
+
+    public String getRating() {
+        return rating;
+    }
+
+    public void setRating(String rating) {
+        this.rating = rating;
+    }
+
+    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 +82,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;
     }
 

src/tourplaner/object/Tour.java

@@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * Model einer Tour
  */
 public class Tour {
-    private String dauer, mapJson, name, start, ziel;
+    private String dauer, mapJson, name, start, ziel, rating;
     private double strecke;
     private ArrayList<Log> log;
 
@@ -21,6 +21,30 @@ public class Tour {
         this.log = new ArrayList<>();
     }
 
+    public Tour(String name, String dauer, String mapJson, double strecke, String start, String ziel, ArrayList<Log> logs) {
+        this.dauer = dauer;
+        this.mapJson = mapJson;
+        this.strecke = strecke;
+        this.name = name;
+        this.start = start;
+        this.ziel = ziel;
+        this.log = logs;
+    }
+
+    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();
+    }
+
+    public void setLog(ArrayList<Log> log) {
+        this.log = log;
+    }
+
     /**
      * Holt einen einzigen Log Eintrag anhand der Id
      * @param id Id des Eintrags der zu besorgen ist

src/tourplaner/tourplaner.fxml

@@ -32,45 +32,43 @@
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 -->
 
-<?import javafx.geometry.Insets?>
+<?import javafx.geometry.*?>
-<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.*?>
-<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.*?>
-<?import javafx.scene.control.ListView?>
+<?import javafx.scene.layout.*?>
-<?import javafx.scene.control.Menu?>
+<?import javafx.scene.paint.*?>
-<?import javafx.scene.control.MenuBar?>
+<?import javafx.scene.text.*?>
-<?import javafx.scene.control.MenuItem?>
-<?import javafx.scene.control.SplitPane?>
-<?import javafx.scene.control.Tab?>
-<?import javafx.scene.control.TabPane?>
-<?import javafx.scene.control.TableColumn?>
-<?import javafx.scene.control.TableView?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.AnchorPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.paint.Color?>
-<?import javafx.scene.text.Font?>
 
-<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
+<VBox prefHeight="600.0" prefWidth="900.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="tourplaner.ui.TourplanerController">
   <children>
     <MenuBar VBox.vgrow="NEVER">
       <menus>
         <Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
           <items>
+                  <MenuItem fx:id="reportsummary" mnemonicParsing="false" onAction="#reportSum" text="Report Summary" />
+                  <MenuItem fx:id="tourreport" mnemonicParsing="false" onAction="#tourReport" text="Tour Report" />
             <MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
           </items>
         </Menu>
-        <Menu mnemonicParsing="false" text="Bearbeiten">
+        <Menu fx:id="menuebearbeiten" mnemonicParsing="false" text="Bearbeiten">
                <items>
-                  <MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
+                  <MenuItem fx:id="menueimport" mnemonicParsing="false" onAction="#importBtn" text="Import" />
+                  <MenuItem fx:id="menueexport" mnemonicParsing="false" onAction="#exportBtn" text="Export" />
                </items>
         </Menu>
-            <Menu mnemonicParsing="false" text="Optionen">
+            <Menu fx:id="menueoptionen" mnemonicParsing="false" text="Optionen">
                <items>
-                  <MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
+                  <CheckMenuItem fx:id="openmap" mnemonicParsing="false" onAction="#openmapaction" text="Map automatisch öffnen" />
+                  <CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
+                  <Menu fx:id="menuesprachen" mnemonicParsing="false" text="Sprache">
+                    <items>
+                        <RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
+                        <RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
+                    </items>
+                  </Menu>
                </items>
             </Menu>
-        <Menu mnemonicParsing="false" text="Hilfe">
+        <Menu fx:id="menuehilfe" mnemonicParsing="false" text="Hilfe">
           <items>
             <MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
                   <MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
@@ -86,6 +84,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 fx:id="editTourBtn" 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 +93,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>
@@ -123,19 +122,20 @@
                            <children>
                               <TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
                                  <tabs>
-                                    <Tab fx:id="kartenTab" text="Karte">
+                                     <Tab fx:id="kartenTab" text="Karte">
-                                       <content>
+                                         <AnchorPane>
-                                          <AnchorPane />
+                                             <ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
-                                       </content></Tab>
+                                         </AnchorPane>
+                                     </Tab>
                                     <Tab fx:id="beschreibungTab" text="Beschreibung">
                                        <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="nameCol" minWidth="100.0" prefWidth="-1.0" text="Tourname" />
-                                                    <TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="40.0" prefWidth="-1.0" text="Dauer" />
+                                                    <TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Dauer" />
-                                                      <TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="50.0" prefWidth="-1.0" text="Strecke" />
+                                                      <TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Strecke" />
                                                       <TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Startpunk" />
                                                       <TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Zielpunkt" />
                                                   </columns>
@@ -154,9 +154,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 +170,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 fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn" text="Edit" />
                                        </children>
                                        <padding>
                                           <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
@@ -180,13 +181,19 @@
                                     </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="logDatumCol" minWidth="-1.0" prefWidth="-1.0" text="Datum" />
-                                        <TableColumn fx:id="logDauerCol" prefWidth="223.0" text="Dauer" />
+                                        <TableColumn fx:id="logDauerCol" minWidth="-1.0" prefWidth="-1.0" text="Dauer" />
-                                          <TableColumn fx:id="logStreckeCol" prefWidth="240.0" text="Entfernung" />
+                                          <TableColumn fx:id="logStreckeCol" minWidth="-1.0" prefWidth="-1.0" text="Entfernung" />
+                                          <TableColumn fx:id="logAvgCol" minWidth="-1.0" prefWidth="-1.0" text="AVG Geschwindigkeit" />
+                                          <TableColumn fx:id="logHightCol" minWidth="-1.0" prefWidth="75.0" text="Höhenmeter" />
+                                          <TableColumn fx:id="logPauseCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Pause" />
+                                          <TableColumn fx:id="logGegangenCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Unterwegs" />
+                                          <TableColumn fx:id="logBemerkungCol" minWidth="-1.0" prefWidth="-1.0" text="Bemerkung" />
+                                          <TableColumn fx:id="logRatingCol1" minWidth="-1.0" prefWidth="-1.0" text="Rating" />
                                       </columns>
                                        <columnResizePolicy>
                                           <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
@@ -204,7 +211,7 @@
     </SplitPane>
     <HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER">
       <children>
-        <Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Left status" HBox.hgrow="ALWAYS">
+        <Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Tourplaner" HBox.hgrow="ALWAYS">
           <font>
             <Font size="11.0" fx:id="x3" />
           </font>
@@ -213,7 +220,7 @@
           </textFill>
         </Label>
         <AnchorPane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" />
-        <Label font="$x3" maxWidth="-1.0" text="Right status" textFill="$x4" HBox.hgrow="NEVER" />
+        <Label font="$x3" maxWidth="-1.0" text="Georg Reisinger" textFill="$x4" HBox.hgrow="NEVER" />
       </children>
       <padding>
         <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />

src/tourplaner/ui/AlertHelper.java

@@ -0,0 +1,258 @@
+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.stage.Stage;
+import javafx.stage.WindowEvent;
+import tourplaner.business.ConfigHelper;
+import tourplaner.business.EinheitenAdder;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.*;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.time.LocalDate;
+import java.util.Optional;
+import java.util.concurrent.atomic.AtomicReference;
+
+public class AlertHelper {
+
+    /**
+     * Warning Dialog
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     */
+    public static void warn(String title, String header, String msg){
+        alertType(Alert.AlertType.WARNING, title, header, msg);
+    }
+
+    /**
+     * Info Dialog
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     */
+    public static void inform(String title, String header, String msg){
+        alertType(Alert.AlertType.INFORMATION, title, header, msg);
+    }
+
+    /**
+     * Info Dialog ohne Header
+     * @param title Title des Dialogs
+     * @param msg Nachricht des Dialogs
+     */
+    public static void informNoHeader(String title, String msg){
+        inform(title, null, msg);
+    }
+
+    /**
+     * Error Dialog
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     */
+    public static void error(String title, String header, String msg){
+        alertType(Alert.AlertType.ERROR, title, header, msg);
+    }
+
+    /**
+     * Ausgabe einer Exception in einem Dialog
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     * @param ex Die exception die ausgegeben werden soll
+     */
+    public static void exerror(String title, String header, String msg, Exception ex){
+        Alert alert = new Alert(Alert.AlertType.ERROR);
+        alert.setTitle(title);
+        alert.setHeaderText(header);
+        alert.setContentText(msg);
+        StringWriter sw = new StringWriter();
+        PrintWriter pw = new PrintWriter(sw);
+        ex.printStackTrace(pw);
+        String exceptionText = sw.toString();
+        Label label = new Label(ConfigHelper.getLangIniString("exceptionstackheader"));
+        TextArea textArea = new TextArea(exceptionText);
+        textArea.setEditable(false);
+        textArea.setWrapText(true);
+        textArea.setMaxWidth(Double.MAX_VALUE);
+        textArea.setMaxHeight(Double.MAX_VALUE);
+        GridPane.setVgrow(textArea, Priority.ALWAYS);
+        GridPane.setHgrow(textArea, Priority.ALWAYS);
+        GridPane expContent = new GridPane();
+        expContent.setMaxWidth(Double.MAX_VALUE);
+        expContent.add(label, 0, 0);
+        expContent.add(textArea, 0, 1);
+        alert.getDialogPane().setExpandableContent(expContent);
+        alert.showAndWait();
+    }
+
+    /**
+     *
+     * @param alertly Typ des Dialogs
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     */
+    private static void alertType(Alert.AlertType alertly, String title, String header, String msg){
+        Alert alert = new Alert(alertly);
+        alert.setTitle(title);
+        alert.setHeaderText(header);
+        alert.setContentText(msg);
+        Stage stage = (Stage) alert.getDialogPane().getScene().getWindow();
+        stage.getIcons().add(
+                new Image("file:"+ ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo")));
+        alert.showAndWait();
+    }
+
+    /**
+     * 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 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() && notNull) {
+                    AlertHelper.warn(ConfigHelper.getLangIniString("tournametitle"),
+                            ConfigHelper.getLangIniString("achtung"),
+                            ConfigHelper.getLangIniString("keintextimfeld"));
+                }
+            }else{
+                return "";
+            }
+        }
+        return returnStr;
+    }
+
+    /**
+     * Erstellt einen Text Input Dialog
+     * @param title Title des Dialogs
+     * @param header Header des Dialogs
+     * @param msg Nachricht des Dialogs
+     * @return Result des Inputs
+     */
+    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")));
+
+        return dialog.showAndWait();
+
+    }
+
+
+    /**
+     * 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.0 bei error sonst ein double
+     */
+    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 {
+                    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(-2.0);
+                }
+
+            });
+            returnDouble = returnText.get();
+        }
+        return returnDouble;
+    }
+
+    /**
+     * Date Picker Dialog, sobald ein Datum ausgewählt wurde, wird es automatisch bestätigt und der dialog geschlossen
+     * @param content Aktuelles datum
+     * @return Gewähltes datum
+     */
+    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);
+            selectedDate.set(date);
+            stage.close();
+        });
+
+        stage.setScene(
+                new Scene(datePicker)
+        );
+        stage.showAndWait();
+        return selectedDate.get();
+    }
+
+
+    /**
+     * File Auswahl
+     * @param btn Text des Speichern/Öffnen Btn
+     * @return String des Files, bei error null
+     */
+    public static String fileChooser(String btn){
+        // JFileChooser-Objekt erstellen
+        JFileChooser chooser = new JFileChooser();
+        // Dialog zum Oeffnen von Dateien anzeigen
+        int rueckgabeWert = chooser.showDialog(null, btn);
+
+        /* Abfrage, ob auf "Öffnen" geklickt wurde */
+        if(rueckgabeWert == JFileChooser.APPROVE_OPTION)
+        {
+            return chooser.getSelectedFile().getAbsolutePath();
+        }
+        return null;
+    }
+}

src/tourplaner/ui/ProgressBar.java

@@ -0,0 +1,66 @@
+package tourplaner.ui;
+
+import javafx.scene.image.Image;
+import tourplaner.business.ConfigHelper;
+
+import javax.imageio.ImageIO;
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+public class ProgressBar {
+    private int status;
+    private JFrame frame;
+    private JProgressBar progressBar;
+
+    public ProgressBar(String title){
+        this.frame = new JFrame(title);
+        File pathToFile = new File(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo"));
+        try {
+            BufferedImage image = ImageIO.read(pathToFile);
+            this.frame.setIconImage(image);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        this.frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+        Container content = this.frame.getContentPane();
+        this.progressBar = new JProgressBar();
+        this.progressBar.setValue(0);
+        this.progressBar.setStringPainted(true);
+        TitledBorder border = BorderFactory.createTitledBorder("Laden....");
+        this.progressBar.setBorder(border);
+        content.add(this.progressBar, BorderLayout.NORTH);
+        this.frame.setSize(300, 100);
+        this.frame.setVisible(true);
+    }
+
+    public void addProgress(int add){
+        this.status += add;
+        this.progressBar.setValue(this.status);
+        closeOnFinish();
+    }
+
+    private void closeOnFinish(){
+        if(this.status >= 100){
+            closeProgress();
+        }
+    }
+
+    public void setProgress(int set){
+        this.status = set;
+        closeOnFinish();
+    }
+
+    public void closeProgress(){
+        this.frame.setVisible(false);
+    }
+
+    public int getProgressSize(int todo, int maxLevel){
+        int steps = (progressBar.getValue() - maxLevel) / todo;
+        if(steps < 0) steps = steps*-1;
+        return steps;
+    }
+}

src/tourplaner/ui/TourplanerController.java

@@ -1,34 +1,28 @@
 package tourplaner.ui;
 
-import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.geometry.Orientation;
 import javafx.scene.control.*;
+import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
-import tourplaner.business.AlertHelper;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
 import tourplaner.viewmodels.ViewModel;
 
-import java.awt.*;
 import java.io.IOException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
-import java.time.LocalDate;
 import java.util.ResourceBundle;
-import java.util.UUID;
-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
@@ -37,17 +31,59 @@ public class TourplanerController implements Initializable {
     public TableView<Tour> beschreibungTableView;
     public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
     public TextField titleTextView, sucheInput;
+    public ImageView mapImageView;
     //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, logRatingCol1;
+    //Menue
+    public CheckMenuItem openmap, openpdf;
+    public RadioMenuItem langenglisch, langdeutsch;
+    private ToggleGroup langgroup;
+    public Menu menueFile, menuebearbeiten, menueoptionen, menuesprachen, menuehilfe;
+    public MenuItem reportsummary, tourreport, beendenButton;
+    //Elemente
+    public Button sucheButton, editBtn, editTourBtn;
 
+    @FXML
+    private void onlangenglisch(){
+        ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langen");
+        langToFxml();
+    }
+
+    @FXML
+    private void onlangdeutsch(){
+        ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langde");
+        langToFxml();
+    }
+
+    @FXML
+    private void tourReport(){
+        this.viewModel.tourReport();
+    }
+
+
+    @FXML
+    private void editTourBtn(){
+        try {
+            this.viewModel.editTour();
+        } catch (IOException e) {
+            LogHelper.error(e);
+        }
+        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 +92,7 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void javaDocBrowser(){
-       openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "javadoc"), "JavaDoc");
+       this.viewModel.javaDocBrowser();
     }
 
     /**
@@ -65,39 +101,39 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void doxygenDocBrowser(){
-        openBrowser(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "hilfe", "doxygendoc"), "Doxygen");
+        this.viewModel.doxygenDocBrowser();
     }
 
-    /**
+    private void syncTour(String selectedItem){
-     * Öffnet einen link im Standart Browser
+        beschreibungTableView.getItems().clear(); //Leert die Table View komplett
-     * @param uriString
+        beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
-     * @param appname
+        mapImageView.setImage(this.viewModel.getImage(selectedItem));
-     */
-    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.getIniString(ConfigHelper.getStandartConfig(), "langde", "openbrowsererror") + appname);
-            AlertHelper.exerror(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "browserexception"),
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "openbrowsererror") + appname,
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "browserexceptionmsg"), e);
-        }
     }
 
+    private void syncTourNamen(){
+        TourListView.getItems().clear();
+        TourListView.setItems(this.viewModel.getTourNamen());
+    }
+
+    private void syncLogs(){
+        logTableView.getItems().clear();
+        logTableView.setItems(this.viewModel.getLogData());
+    }
+
+
     /**
      * Wird gestartet wenn eine Tour in der Tour listView ausgewählt wird
      * @param mouseEvent Triggered Event
      */
     @FXML
     private void tourListSelectedItem(MouseEvent mouseEvent){
+        ProgressBar progressBar = new ProgressBar("Tour auswählen...");
         String selectedItem = TourListView.getSelectionModel().getSelectedItem();
         this.viewModel.selectTour(selectedItem);
         titleTextView.setText(selectedItem);
-        beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
+        progressBar.addProgress(10);
-        beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
+        syncTour(selectedItem);
+        progressBar.addProgress(10);
         startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
         zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
         dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
@@ -105,11 +141,30 @@ public class TourplanerController implements Initializable {
         nameCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("name"));
 
         //Log anzeigen
-        logTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinelogsvorhanden")));
+        logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
+        logTableView.getItems().clear();
+        progressBar.addProgress(10);
         logTableView.setItems(this.viewModel.getLogData());
+        progressBar.addProgress(10);
         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"));
+        logRatingCol1.setCellValueFactory(new PropertyValueFactory<Log, String>("rating"));
+        progressBar.addProgress(10);
+        mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
+        if(this.viewModel.isSucheAktiv()){
+            this.viewModel.setSucheAktiv(false);
+            progressBar.addProgress(10);
+            syncTourNamen();
+            progressBar.setProgress(100);
+            this.sucheInput.setText("");
+        }
+        progressBar.setProgress(100);
     }
 
     /**
@@ -127,7 +182,7 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void addTour(){
-        this.viewModel.addTour();
+        if(this.viewModel.addTour()) this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
     }
 
     /**
@@ -136,10 +191,11 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void delTour(){
-        this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
+        this.beschreibungTableView.getItems().clear(); //löscht alles aus der tabelle
-        this.titleTextView.setText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"));
+        this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
         this.viewModel.delTour();
-        logTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
+        logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
+        mapImageView.setImage(null);
     }
 
     /**
@@ -148,14 +204,10 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void suche(){
-        String sucheInput = this.sucheInput.getText();
+        ProgressBar progressBar = new ProgressBar("Suche");
-        if(sucheInput.isEmpty()){
+        this.viewModel.suche(this.sucheInput.getText());
-            AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
+        progressBar.addProgress(100);
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "suchfeldleer"),
+        progressBar.closeProgress();
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "suchtextzuerst"));
-        }else {
-            this.viewModel.suche(sucheInput);
-        }
     }
 
     /**
@@ -164,56 +216,14 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void addLog(){
-        Tour selectedTour = this.viewModel.getSelectedTour();
+        this.viewModel.addLog();
-        if (selectedTour == null){
+        syncLogs();
-            AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "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());
-                        }
-                    });
-                    double neueDauer = -1;
-                    double neueStrecke = -1;
-                    LocalDate neuesDatum = null;
-                    while (neuesDatum == null) {
-                        neuesDatum = AlertHelper.datePicker(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "datum"));
-                    }
-                    while (neueDauer == -1) {
-                        neueDauer = AlertHelper.inputNumber(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "dauer"),
-                                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "dauermsg"),
-                                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "dauer") +
-                                        ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "doppelpunkt"));
-                    }
-                    while (neueStrecke == -1) {
-                        neueStrecke = AlertHelper.inputNumber(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "strecke"),
-                                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "streckemsg"),
-                                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "strecke") +
-                                        ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "doppelpunkt"));
-                    }
-
-                    Log newLog = new Log(newId.get(), neueDauer + "", neuesDatum, neueStrecke);
-                    logData.add(newLog);
-                    s.addLog(newLog);
-                }
-            });
-        }
     }
 
     @FXML
     private void delLog(){
-        Log selectedLog = this.viewModel.getSelectedLog();
+        this.viewModel.delLog();
-        if(selectedLog != null) {
+        syncLogs();
-            this.viewModel.delLog(selectedLog.getId());
-        }
     }
 
     /**
@@ -222,9 +232,7 @@ public class TourplanerController implements Initializable {
      */
     @FXML
     private void logItemSelected(MouseEvent mouseEvent){
-        String selectedItem = logTableView.getSelectionModel().getSelectedItem().getId();
+        this.viewModel.selectLog(logTableView.getSelectionModel().getSelectedItem().getId());
-        this.viewModel.selectLog(selectedItem);
-        System.out.println(selectedItem);
     }
 
     /**
@@ -237,23 +245,114 @@ 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
+        deselectAll();
-        beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){
-        titleTextView.setText( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"));
+            this.openpdf.setSelected(true);
-        //Log -> rechts unten
+        }else {
-        logTableView.setPlaceholder(new Label( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected")));
+            this.openpdf.setSelected(false);
+        }
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1){
+            this.openmap.setSelected(true);
+        }else {
+            this.openmap.setSelected(false);
+        }
+        this.langgroup = new ToggleGroup();
+        this.langdeutsch.setToggleGroup(this.langgroup);
+        this.langenglisch.setToggleGroup(this.langgroup);
+        if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langde")){
+            this.langdeutsch.setSelected(true);
+            this.langenglisch.setSelected(false);
+        }else if(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang").equals("langen")){
+            this.langdeutsch.setSelected(false);
+            this.langenglisch.setSelected(true);
+        }
 
+        langToFxml();
+    }
+
+    private void langToFxml(){
+        this.kartenTab.setText(ConfigHelper.getLangIniString("fkarte"));
+        this.beschreibungTab.setText(ConfigHelper.getLangIniString("fbeschreibung"));
+        this.editBtn.setText(ConfigHelper.getLangIniString("fedit"));
+        this.editTourBtn.setText(ConfigHelper.getLangIniString("fedit"));
+        this.nameCol.setText(ConfigHelper.getLangIniString("fname"));
+        this.streckeCol.setText(ConfigHelper.getLangIniString("fstrecke"));
+        this.dauerCol.setText(ConfigHelper.getLangIniString("fdauer"));
+        this.zielCol.setText(ConfigHelper.getLangIniString("fziel"));
+        this.startCol .setText(ConfigHelper.getLangIniString("fstart"));
+        this.logAvgCol.setText(ConfigHelper.getLangIniString("favg"));
+        this.logBemerkungCol.setText(ConfigHelper.getLangIniString("fbemerkung"));
+        this.logDatumCol.setText(ConfigHelper.getLangIniString("fdatum"));
+        this.logDauerCol.setText(ConfigHelper.getLangIniString("fdauer"));
+        this.logGegangenCol.setText(ConfigHelper.getLangIniString("fgegangen"));
+        this.logHightCol.setText(ConfigHelper.getLangIniString("fhight"));
+        this.logPauseCol.setText(ConfigHelper.getLangIniString("fpause"));
+        this.logStreckeCol.setText(ConfigHelper.getLangIniString("fstrecke"));
+
+        this.sucheButton.setText(ConfigHelper.getLangIniString("fsuche"));
+        this.openmap.setText(ConfigHelper.getLangIniString("fopenmapsetting"));
+        this.openpdf.setText(ConfigHelper.getLangIniString("fopenpdfsetting"));
+        this.langenglisch.setText(ConfigHelper.getLangIniString("flangenglisch"));
+        this.langdeutsch.setText(ConfigHelper.getLangIniString("flangdeutsch"));
+        this.menueFile.setText(ConfigHelper.getLangIniString("fdatei"));
+        this.menuebearbeiten.setText(ConfigHelper.getLangIniString("fbearbeiten"));
+        this.menueoptionen.setText(ConfigHelper.getLangIniString("foptionen"));
+        this.menuesprachen.setText(ConfigHelper.getLangIniString("fsprache"));
+        this.menuehilfe.setText(ConfigHelper.getLangIniString("fhilfe"));
+        this.reportsummary.setText(ConfigHelper.getLangIniString("freposum"));
+        this.tourreport.setText(ConfigHelper.getLangIniString("frepotour"));
+        this.beendenButton.setText(ConfigHelper.getLangIniString("fbeenden"));
+        this.sucheInput.setPromptText(ConfigHelper.getLangIniString("fsuche")+ConfigHelper.getLangIniString("fpunkte"));
+
+        this.logRatingCol1.setText("Rating");
+    }
+
+    @FXML
+    private void openpdfaction(){
+        int selected = 0;
+        if(this.openpdf.isSelected()) selected = 1;
+        ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf", selected);
+    }
+
+    @FXML
+    private void openmapaction(){
+        int selected = 0;
+        if(this.openmap.isSelected()) selected = 1;
+        ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap", selected);
+    }
+
+    private void deselectAll(){
+        //Tabs zu Tour -> rechts oben
+        beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
+        titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));
+        //Log -> rechts unten
+        logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
+    }
+
+    @FXML
+    private void exportBtn(){
+        this.viewModel.exportData();
+    }
+
+    @FXML
+    private void importBtn(){
+        deselectAll();
+        this.viewModel.importData();
+        syncTourNamen();
+    }
+
+    @FXML
+    private void reportSum(){
+        this.viewModel.sumReport();
     }
 
     /**
      * Funktion für noch nicht implementierte sachen wie im Menu der 'Bearbeiten' und 'Optionen' Knopf
      */
     @FXML
-    public void nimpButton(){
+    private void nimpButton(){
-        AlertHelper.inform(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
+        this.viewModel.nimpButton();
-                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "fktnichtimplementiert"),
-                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "vergessenodernochnichtsoweit"));
     }
 
 }

src/tourplaner/viewmodels/ViewModel.java

@@ -2,84 +2,418 @@ package tourplaner.viewmodels;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import tourplaner.business.AlertHelper;
+import javafx.scene.image.Image;
-import tourplaner.business.ConfigHelper;
+import tourplaner.business.*;
-import tourplaner.business.LogHelper;
+import tourplaner.ui.AlertHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.ProgressBar;
 
+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<Tour> tourData = FXCollections.observableArrayList();
-    private final ObservableList<String> tourNamen = FXCollections.observableArrayList("Test 1", "Test 2");
+    private 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;
+// Suche
+    private boolean sucheAktiv;
+
+
+    public Image getImage(String tourname){
+        return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname));
+    }
+
+    /**
+     * Bearbeitet eine bereits bestehende Tour
+     * prüft ob eine tour ausgewählt ist
+     */
+    public void editTour() throws IOException {
+        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
+     * @return false beim schließen
+     */
+    private boolean tourNameInput(){
+        return 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"), 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")
+                                + this.neueTourName +
+                                ConfigHelper.getLangIniString("namevergebenmsg2"));
+                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"), 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"), content);
+            if(this.neueTourZiel.isEmpty()){
+                return false;
+            }
+        }
+        return true;
+    }
 
 
     /**
      * Fügt eine neue Tour hinzu
      */
-    public void addTour(){
+    public boolean addTour(){
-        while(this.neueTourName == null) {
+        if(tourNameInput()) {
-            this.neueTourName = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournametitle"),
+            if(tourStartInput("")) {
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournameheader"),
+                if (tourZielInput("")) {
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "tournamemsg"));
+                    if (getTour(this.neueTourName) == null) {
-            if (getTour(this.neueTourName) != null) {
+                        ProgressBar progressBar = new ProgressBar("Add Tour...");
-                AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
+                        Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
-                        ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenheader"),
+                        tourData.add(newTour);
-                        ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenmsg1")
+                        tourNamen.add(this.neueTourName);
-                                + this.neueTourName +
+                        this.selectedTour = newTour;
-                                ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "namevergebenmsg2"));
+                        progressBar.addProgress(10);
-                this.neueTourName = null;
+                        try {
-            }
+                            TourPlaner.addTour(newTour, progressBar);
-        }
+                        } catch (IOException e) {
-        while(this.neueTourStart == null){
+                            LogHelper.error(e);
-            this.neueTourStart = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunkttitle"),
+                            return false;
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunktheader"),
+                        }
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "startpunktmsg"));
+                    }
-        }
+                }else return false;
-        while(this.neueTourZiel == null){
+            }else return false;
-            this.neueTourZiel = AlertHelper.inputText(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunkttitle"),
+        }else return false;
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunktheader"),
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "zielpunktmsg"));
-        }
-        if (getTour(this.neueTourName) == null) {
-            tourData.add(new Tour(this.neueTourName, "TBD", "TBD", 0, this.neueTourStart, this.neueTourZiel));
-            tourNamen.add(this.neueTourName);
-        }
         this.neueTourStart = null;
         this.neueTourZiel = null;
         this.neueTourName = null;
+        return true;
+    }
+
+    private boolean keineTourSelected(){
+        if (this.selectedTour == null){
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("keinetourselected"),
+                    ConfigHelper.getLangIniString("logtournotselectedmsg"));
+            return true;
+        }else {
+            return false;
+        }
     }
 
     /**
-     * Entfernt ein Log anhand dessen Id
+     * Bearbeitet einen gewählten Log eintrag
-     * @param id Id des Logs welches entfernt werden soll
      */
-    public void delLog(String id){
+    public void editLog(){
-        this.logData.removeIf(s -> s.getId().equals(id));
+        System.out.println(this.selectedLog);
-        AtomicReference<Tour> tourToEdit = new AtomicReference<>();
+        if(this.selectedTour != null) {
-        this.tourData.forEach(s -> {
+            if(this.selectedLog != null) {
-            if (s.getLogs() != null) {
+                AtomicReference<Tour> tourAkt = new AtomicReference<>();
-                s.getLogs().forEach(ss -> {
+                AtomicReference<Log> logAkt = new AtomicReference<>();
-                    if (ss.getId().equals(id)) {
+                this.tourData.forEach(tourd -> {
-                        tourToEdit.set(s);
+                    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 rating = -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(this.selectedLog.getPause() + "");
+                        if (pause >= 0.0) {
+                            hightmeter = hightmeterInput(this.selectedLog.getHightmeter() + "");
+                            if (hightmeter >= 0.0) {
+                                bemerkung = bemerkungInput(this.selectedLog.getBemerkung());
+                                if (bemerkung) {
+                                    datum = dateInput(this.selectedLog.getDatum());
+                                    if (datum != null) {
+                                        rating = ratingInput(this.selectedLog.getRating());
+                                        if(rating >= 0.0) {
+                                            Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause, rating + "");
+                                            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);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }else{
+                //Kein log
+                AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("keinlogselected"), ConfigHelper.getLangIniString("keinlogselectedmsg"));
             }
-        });
+        }else {
+            //Keine Tour
+                AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("keinetourselected"), ConfigHelper.getLangIniString("deltournoselectmsg"));
+        }
+        this.neueBemerkung = null;
+    }
 
-        if (tourToEdit.get() != null){
+    /**
-            Tour toEdit = tourToEdit.get();
+     * Eingabe der Strecke bis diese Korrekt ist
-            toEdit.delLog(id);
+     * @return Korrekte eingegebene Strecke
-            this.tourData.removeIf(s -> s.getName().equals(toEdit.getName()));
+     */
-            this.tourData.add(toEdit);
+    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);
+    }
+
+    /**
+     * Eingabe des Ratings 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 des Ratings
+     */
+    private double ratingInput(String content){
+        String realcontent = "";
+        if (!content.isEmpty()){
+            realcontent = content + "";
+        }
+        double input = -1;
+        while(input <= 0) {
+            input = AlertHelper.inputNumber(ConfigHelper.getLangIniString("bewertung"),
+                    ConfigHelper.getLangIniString("bewertungmsg"),
+                    ConfigHelper.getLangIniString("bewertung") +
+                            ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
+            if(input < 0 && input > 5){
+                input = -1;
+                AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("bewertungeror"), ConfigHelper.getLangIniString("bewertungeror2"));
+            }
+        }
+        return input;
+    }
+
+    /**
+     * 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;
+                    double rating = -1.0;
+                    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) {
+                                            rating = ratingInput("");
+                                            if(rating >= 0.0) {
+                                                Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause, rating + "");
+                                                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 +449,8 @@ public class ViewModel {
     }
 
     public ObservableList<Log> getLogData() {
+        logData.removeIf(s -> true);
+        if(this.selectedTour != null) logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
         return logData;
     }
 
@@ -169,6 +505,12 @@ public class ViewModel {
     }
 
     public ObservableList<String> getTourNamen() {
+        ArrayList<String> namen = new ArrayList<>();
+        getTourData().forEach(s -> {
+            namen.add(s.getName());
+        });
+        tourNamen.clear();
+        tourNamen.addAll(namen);
         return tourNamen;
     }
 
@@ -189,6 +531,11 @@ public class ViewModel {
     }
 
     public ObservableList<Tour> getTourData() {
+        tourData.clear();
+        ArrayList<Tour> touren = TourPlaner.getAllTours();
+        if(touren != null) {
+            tourData.addAll(touren);
+        }
         return tourData;
     }
 
@@ -196,24 +543,145 @@ public class ViewModel {
      * Entfernt eine Tour anhand der ausgewählten Tour
      */
     public void delTour(){
-        try {
+        if (this.selectedTour != null) {
             String tourname = this.selectedTour.getName();
-            tourData.removeIf(s -> s.getName().equals(tourname));
+            try {
-            tourNamen.removeIf(s -> s.equals(tourname));
+                tourData.removeIf(s -> s.getName().equals(tourname));
-            logData.removeIf(s -> true);
+                tourNamen.removeIf(s -> s.equals(tourname));
-        }catch (NullPointerException e){
+                logData.removeIf(s -> true);
-            LogHelper.error(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
+                TourPlaner.delTour(tourname);
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "deltournoselect"));
+                setSelectedTour(null);
-            AlertHelper.warn(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "achtung"),
+            } catch (NullPointerException e) {
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "keinetourselected"),
+                LogHelper.error(e);
-                    ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "langde", "deltournoselectmsg"));
+            }
+        }else {
+            AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
+                    ConfigHelper.getLangIniString("keinetourselected"),
+                    ConfigHelper.getLangIniString("deltournoselectmsg"));
         }
     }
 
     /**
      * 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"));
+        }
+         ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput);
+        tourNamen.clear();
+        for (Tour tour:result) {
+            tourNamen.add(tour.getName());
+        }
+        this.sucheAktiv = true;
+    }
 
+    public boolean isSucheAktiv() {
+        return sucheAktiv;
+    }
+
+    public void setSucheAktiv(boolean sucheAktiv) {
+        this.sucheAktiv = sucheAktiv;
+    }
+
+    /**
+     * Ö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());
+        }
+    }
+
+    /**
+     * Exportiert alle daten in ein File das hier gewählt wird
+     */
+    public void exportData(){
+        String file = AlertHelper.fileChooser("Exportiere");
+        if(file != null){
+            try {
+                new Exporter(file).doExport();
+            } catch (IOException e) {
+                AlertHelper.error("Error", "Export Error", "Fehler beim Exportieren");
+                LogHelper.error(e);
+            }
+        }
+    }
+
+    /**
+     * Importiert alle daten von einem File das hier gewählt wird
+     */
+    public void importData() {
+        String file = AlertHelper.fileChooser("Importiere");
+        if (file != null){
+            this.tourNamen = FXCollections.observableArrayList();
+            new Exporter(file).doImport();
+        }
+    }
+
+    /**
+     * Erstellt einen Summary Report
+     */
+    public void sumReport(){
+        Reporter.sumReport();
     }
 }