Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bb8a796bd4 | |||
| dd1357ec1d |
3
.gitignore
vendored
3
.gitignore
vendored
@ -1,5 +1,4 @@
|
|||||||
out/
|
out/
|
||||||
conf.ini
|
conf.ini
|
||||||
log/
|
log/log4j/log.out/
|
||||||
reports/
|
reports/
|
||||||
.idea/dataSources*
|
|
||||||
12
.idea/dataSources.xml
generated
Normal file
12
.idea/dataSources.xml
generated
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
||||||
|
<data-source source="LOCAL" name="postgres@postgres.dergeorg.at" uuid="304c5f90-6427-4696-beb2-a9a4e6b29a05">
|
||||||
|
<driver-ref>postgresql</driver-ref>
|
||||||
|
<synchronize>true</synchronize>
|
||||||
|
<jdbc-driver>org.postgresql.Driver</jdbc-driver>
|
||||||
|
<jdbc-url>jdbc:postgresql://postgres.dergeorg.at:5432/postgres</jdbc-url>
|
||||||
|
<working-dir>$ProjectFileDir$</working-dir>
|
||||||
|
</data-source>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
10
.idea/libraries/com_google_code_gson_gson_2_8_6.xml
generated
10
.idea/libraries/com_google_code_gson_gson_2_8_6.xml
generated
@ -1,10 +0,0 @@
|
|||||||
<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>
|
|
||||||
9
.idea/libraries/iText_4_2_0_com_itextpdf.xml
generated
9
.idea/libraries/iText_4_2_0_com_itextpdf.xml
generated
@ -1,9 +0,0 @@
|
|||||||
<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>
|
|
||||||
@ -10,9 +10,6 @@
|
|||||||
<orderEntry type="library" name="lib" level="project" />
|
<orderEntry type="library" name="lib" level="project" />
|
||||||
<orderEntry type="library" name="org.ini4j:ini4j:0.5.4" 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="log4j:log4j:1.2.17" level="project" />
|
||||||
<orderEntry type="library" name="org.postgresql:postgresql:42.2.19" level="project" />
|
<orderEntry type="library" name="org.apache.pdfbox:pdfbox:1.8.9" 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>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
@ -6,16 +6,6 @@ logo = logo.png
|
|||||||
[lang]
|
[lang]
|
||||||
lang = langde
|
lang = langde
|
||||||
|
|
||||||
[settings]
|
|
||||||
openpdf = 1
|
|
||||||
openmap = 0
|
|
||||||
|
|
||||||
[einheiten]
|
|
||||||
zeit = min
|
|
||||||
strecke = km
|
|
||||||
meter = m
|
|
||||||
speed = km/h
|
|
||||||
|
|
||||||
[db]
|
[db]
|
||||||
dbname = tourplaner
|
dbname = tourplaner
|
||||||
url =
|
url =
|
||||||
@ -29,11 +19,4 @@ path = ./reports/
|
|||||||
[hilfe]
|
[hilfe]
|
||||||
gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
|
gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
|
||||||
doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
|
doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
|
||||||
javadoc = https://git.dergeorg.at/dergeorg/tourplaner
|
javadoc = https://git.dergeorg.at/dergeorg/tourplaner
|
||||||
|
|
||||||
[map]
|
|
||||||
key =
|
|
||||||
size = 1500,400
|
|
||||||
sizePdf = 600,400
|
|
||||||
path = D:\\TourplanerImages\\
|
|
||||||
file_pre = file:///
|
|
||||||
66
langde.ini
66
langde.ini
@ -19,7 +19,7 @@ zielpunkttitle = Tour zielpunkt
|
|||||||
zielpunktheader = Bitte geben Sie den Zielpunkt der Tour an!
|
zielpunktheader = Bitte geben Sie den Zielpunkt der Tour an!
|
||||||
zielpunktmsg = Zielpunkt:
|
zielpunktmsg = Zielpunkt:
|
||||||
deltournoselect = ViewModel -> DelTour
|
deltournoselect = ViewModel -> DelTour
|
||||||
deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus!
|
deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus, bevor Sie auf löschen klicken!
|
||||||
exceptionstackheader = Exception stacktrace:
|
exceptionstackheader = Exception stacktrace:
|
||||||
keinelogsvorhanden = Fügen Sie erst ein Log hinzu um es anzuzeigen!
|
keinelogsvorhanden = Fügen Sie erst ein Log hinzu um es anzuzeigen!
|
||||||
datum = Datum
|
datum = Datum
|
||||||
@ -39,66 +39,4 @@ pausemsg = Dauer der Pause
|
|||||||
hightmeter = Höhenmeter
|
hightmeter = Höhenmeter
|
||||||
hightmetermsg = Höhenmeter des Abschnitts
|
hightmetermsg = Höhenmeter des Abschnitts
|
||||||
bemerkung = Bemerkung
|
bemerkung = Bemerkung
|
||||||
bemerkungheader = Bitte geben Sie die Bemerkungen zu diesem Log eintrag ein, kann auch leer bleiben.
|
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
|
|
||||||
105
langen.ini
105
langen.ini
@ -1,105 +0,0 @@
|
|||||||
[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
|
|
||||||
Binary file not shown.
@ -43,7 +43,7 @@ public class ConfigHelper {
|
|||||||
try {
|
try {
|
||||||
ini = new Wini(new File(filename));
|
ini = new Wini(new File(filename));
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LogHelper.error(e);
|
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||||
}
|
}
|
||||||
assert ini != null;
|
assert ini != null;
|
||||||
return ini.get(sectionName, optionName, String.class);
|
return ini.get(sectionName, optionName, String.class);
|
||||||
@ -56,7 +56,7 @@ public class ConfigHelper {
|
|||||||
* @return Den angeforderten String
|
* @return Den angeforderten String
|
||||||
*/
|
*/
|
||||||
public static String getLangIniString(String optionName){
|
public static String getLangIniString(String optionName){
|
||||||
return ConfigHelper.getIniString(getIniString(getStandartConfig(), "lang", "lang") + ".ini", ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
|
return ConfigHelper.getIniString(ConfigHelper.getStandartLangde(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -92,7 +92,7 @@ public class ConfigHelper {
|
|||||||
ini.put(sectionName, optionName, value);
|
ini.put(sectionName, optionName, value);
|
||||||
ini.store();
|
ini.store();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
LogHelper.error(e);
|
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,94 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,62 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,53 +0,0 @@
|
|||||||
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();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,35 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -33,14 +33,6 @@ public class LogHelper{
|
|||||||
getLog(name).error(msg);
|
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
|
* Log info in file und Console
|
||||||
* @param msg Nachricht in dem Log
|
* @param msg Nachricht in dem Log
|
||||||
|
|||||||
@ -1,244 +1,34 @@
|
|||||||
package tourplaner.business;
|
package tourplaner.business;
|
||||||
|
|
||||||
import com.itextpdf.text.*;
|
import org.apache.pdfbox.exceptions.COSVisitorException;
|
||||||
import com.itextpdf.text.Font;
|
import org.apache.pdfbox.pdmodel.PDDocument;
|
||||||
import com.itextpdf.text.Image;
|
import org.apache.pdfbox.pdmodel.PDPage;
|
||||||
import tourplaner.object.Log;
|
import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
|
||||||
import tourplaner.object.Tour;
|
import org.apache.pdfbox.pdmodel.font.PDFont;
|
||||||
|
import org.apache.pdfbox.pdmodel.font.PDType1Font;
|
||||||
|
|
||||||
import com.itextpdf.text.pdf.PdfWriter;
|
|
||||||
|
|
||||||
import java.awt.*;
|
|
||||||
import java.io.FileNotFoundException;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
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 {
|
public class Reporter {
|
||||||
|
|
||||||
private static Font catFont = new Font(Font.TIMES_ROMAN, 18,
|
public static void createTourReport(String tourname) throws IOException, COSVisitorException {
|
||||||
Font.BOLD);
|
PDDocument document = new PDDocument();
|
||||||
private static Font redFont = new Font(Font.TIMES_ROMAN, 12,
|
PDPage page = new PDPage();
|
||||||
Font.NORMAL, Color.RED);
|
document.addPage(page);
|
||||||
private static Font subFont = new Font(Font.TIMES_ROMAN, 16,
|
|
||||||
Font.BOLD);
|
|
||||||
private static Font smallBold = new Font(Font.TIMES_ROMAN, 12,
|
|
||||||
Font.BOLD);
|
|
||||||
|
|
||||||
/**
|
PDFont font = PDType1Font.HELVETICA;
|
||||||
* Erstellt den Summary Report
|
PDPageContentStream contentStream = new PDPageContentStream(document, page);
|
||||||
*/
|
contentStream.beginText();
|
||||||
public static void sumReport(){
|
contentStream.setFont(font, 12);
|
||||||
ArrayList<Tour> tours = TourPlaner.getAllTours();
|
contentStream.moveTextPositionByAmount(100,700);
|
||||||
String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "summary.pdf";
|
contentStream.drawString(tourname);
|
||||||
try {
|
// contentStream.drawString();
|
||||||
Document document = new Document();
|
contentStream.endText();
|
||||||
PdfWriter.getInstance(document, new FileOutputStream(file));
|
|
||||||
document.open();
|
|
||||||
addSumRepo(document, tours);
|
|
||||||
|
|
||||||
document.close();
|
contentStream.close();
|
||||||
} catch (DocumentException | FileNotFoundException e) {
|
|
||||||
LogHelper.error(e.getMessage(), e.getClass().getName());
|
document.save(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "test.pdf");
|
||||||
}
|
document.close();
|
||||||
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);
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -2,14 +2,9 @@ package tourplaner.business;
|
|||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.log4j.Logger;
|
||||||
import tourplaner.data.DbConnect;
|
import tourplaner.data.DbConnect;
|
||||||
import tourplaner.object.Log;
|
import tourplaner.data.PostgresHelper;
|
||||||
import tourplaner.object.Tour;
|
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;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -30,7 +25,9 @@ public class TourPlaner{
|
|||||||
* @return Alle touren als ArrayList
|
* @return Alle touren als ArrayList
|
||||||
*/
|
*/
|
||||||
public static ArrayList<Tour> getAllTours(){
|
public static ArrayList<Tour> getAllTours(){
|
||||||
return new DbConnect().getAllTouren();
|
DbConnect dbConnect = new DbConnect();
|
||||||
|
ArrayList<Tour> touren = dbConnect.getAllTouren();
|
||||||
|
return touren;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -39,163 +36,30 @@ public class TourPlaner{
|
|||||||
* @param tour Neuer Tourname
|
* @param tour Neuer Tourname
|
||||||
* @return false bei error
|
* @return false bei error
|
||||||
*/
|
*/
|
||||||
public static boolean editTour(String oldname, Tour tour) throws IOException {
|
public static boolean editTour(String oldname, Tour tour){
|
||||||
ProgressBar progressBar = new ProgressBar("Edit...");
|
DbConnect dbConnect = new DbConnect();
|
||||||
int step = progressBar.getProgressSize(3, 100);
|
return dbConnect.editTour(oldname, tour);
|
||||||
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){
|
public static boolean delTour(String tourname){
|
||||||
ProgressBar progressBar = new ProgressBar("Del...");
|
DbConnect dbConnect = new DbConnect();
|
||||||
int step = progressBar.getProgressSize(3, 100);
|
return dbConnect.delTour(tourname);
|
||||||
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
|
* Fügt eine Tour hinzu
|
||||||
* @param newTour Neue Tour
|
* @param newTour Neue Tour
|
||||||
* @return false bei error
|
* @return false bei error
|
||||||
*/
|
*/
|
||||||
public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException {
|
public static boolean addTour(Tour newTour){
|
||||||
int step = progressBar.getProgressSize(2, 100);
|
DbConnect dbConnect = new DbConnect();
|
||||||
DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
|
return dbConnect.addTour(newTour);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
public static String getMapJson(String start, String ziel){
|
||||||
* Führt einen Rport aus
|
// TODO: 14.04.2021 Map Quest
|
||||||
* @param tourname Name der Tour die gereportet wird
|
return start + " " + ziel;
|
||||||
*/
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,14 +1,10 @@
|
|||||||
package tourplaner.data;
|
package tourplaner.data;
|
||||||
|
|
||||||
import javafx.geometry.Pos;
|
|
||||||
import tourplaner.business.LogHelper;
|
|
||||||
import tourplaner.object.Log;
|
|
||||||
import tourplaner.object.Tour;
|
import tourplaner.object.Tour;
|
||||||
import tourplaner.ui.AlertHelper;
|
|
||||||
import tourplaner.ui.ProgressBar;
|
|
||||||
|
|
||||||
import java.sql.*;
|
import java.sql.Connection;
|
||||||
import java.time.LocalDate;
|
import java.sql.ResultSet;
|
||||||
|
import java.sql.Statement;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -49,20 +45,9 @@ public class DbConnect {
|
|||||||
* @return false bei error
|
* @return false bei error
|
||||||
*/
|
*/
|
||||||
public boolean editTour(String oldname, Tour tour) {
|
public boolean editTour(String oldname, Tour tour) {
|
||||||
String tourname = tour.getName();
|
return 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 + "';");
|
||||||
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
|
* Fügt eine Tour hinzu
|
||||||
* @param tour Neue Tour
|
* @param tour Neue Tour
|
||||||
@ -78,115 +63,20 @@ public class DbConnect {
|
|||||||
* @return false bei error
|
* @return false bei error
|
||||||
*/
|
*/
|
||||||
public boolean delTour(String tourname){
|
public boolean delTour(String tourname){
|
||||||
ArrayList<Boolean> result = new ArrayList<>();
|
return PostgresHelper.executeUpdate("DELETE FROM public.tour WHERE tourname = '"+tourname+"'");
|
||||||
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 ;
|
|
||||||
double dauer, strecke, pause, gegangen, avg, hightmeter;
|
|
||||||
Date datum;
|
|
||||||
|
|
||||||
ArrayList<Log> logs = new ArrayList<>();
|
|
||||||
try {
|
|
||||||
stmt = this.c.createStatement();
|
|
||||||
ResultSet rs = stmt.executeQuery("SELECT * FROM public.log where tourname = '"+ tourname +"'");
|
|
||||||
while (rs.next()) {
|
|
||||||
id = rs.getString("id");
|
|
||||||
bemerkung = rs.getString("bemerkung");
|
|
||||||
datum = rs.getDate("datum");
|
|
||||||
dauer = rs.getDouble("dauer");
|
|
||||||
// avg = rs.getDouble("avg");
|
|
||||||
hightmeter = rs.getDouble("hightmeter");
|
|
||||||
pause = rs.getDouble("pause");
|
|
||||||
// gegangen = rs.getDouble("gegangen");
|
|
||||||
strecke = rs.getDouble("strecke");
|
|
||||||
if (!tourname.isEmpty()) {
|
|
||||||
logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause));
|
|
||||||
}else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
rs.close();
|
|
||||||
stmt.close();
|
|
||||||
this.c.close();
|
|
||||||
return logs;
|
|
||||||
} catch (Exception e) {
|
|
||||||
System.err.println(e.getClass().getName() + ": " + e.getMessage());
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Füght einen Logeintrag ein
|
|
||||||
* @param tourname Zu welcher Tour der Logeintrag gehört
|
|
||||||
* @param log Der Logeintrag
|
|
||||||
* @return false bei error
|
|
||||||
*/
|
|
||||||
public boolean addLog(String tourname, Log log){
|
|
||||||
if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
|
|
||||||
return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
|
|
||||||
+log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+")");
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean editLog(String tourname, Log log){
|
|
||||||
return PostgresHelper.executeUpdate("UPDATE public.log SET bemerkung = '"+log.getBemerkung()+"', datum = '"+log.getDatum()+"', strecke = "+log.getStrecke()+", avg = "+log.getAvgspeed()+", hightmeter = "+
|
|
||||||
log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean delLog(String tourname, String id){
|
|
||||||
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
|
* Holt alle Touren aus der Datenbank
|
||||||
* @return Null bei fehler, sonst eine List aus den IDs
|
* @return Null bei fehler, sonst eine List aus den IDs
|
||||||
*/
|
*/
|
||||||
public ArrayList<Tour> getAllTouren() {
|
public ArrayList<Tour> getAllTouren(){
|
||||||
this.c = PostgresHelper.con();
|
this.c = PostgresHelper.con();
|
||||||
String tourname, mapjson, start, ziel;
|
String tourname, mapjson, start, ziel;
|
||||||
double dauer, strecke;
|
double dauer, strecke;
|
||||||
|
|
||||||
ArrayList<Tour> touren = new ArrayList<>();
|
ArrayList<Tour> touren = new ArrayList<>();
|
||||||
ProgressBar progressBar = new ProgressBar("Get...");
|
|
||||||
try {
|
try {
|
||||||
int tourSize = getTourSize();
|
|
||||||
int step = progressBar.getProgressSize(tourSize, 100);
|
|
||||||
stmt = this.c.createStatement();
|
stmt = this.c.createStatement();
|
||||||
ResultSet rs = stmt.executeQuery("select * from tour;");
|
ResultSet rs = stmt.executeQuery("select * from tour;");
|
||||||
while (rs.next()) {
|
while (rs.next()) {
|
||||||
@ -197,48 +87,7 @@ public class DbConnect {
|
|||||||
dauer = rs.getDouble("dauer");
|
dauer = rs.getDouble("dauer");
|
||||||
strecke = rs.getDouble("strecke");
|
strecke = rs.getDouble("strecke");
|
||||||
if (!tourname.isEmpty()) {
|
if (!tourname.isEmpty()) {
|
||||||
touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname)));
|
touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel));
|
||||||
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 {
|
}else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,9 +20,6 @@ public class Log {
|
|||||||
this.pause = pause;
|
this.pause = pause;
|
||||||
this.gegangen = this.dauer - this.pause;
|
this.gegangen = this.dauer - this.pause;
|
||||||
this.avgspeed = this.strecke / (this.gegangen);
|
this.avgspeed = this.strecke / (this.gegangen);
|
||||||
if(Double.isInfinite(this.avgspeed)){
|
|
||||||
this.avgspeed = -1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getBemerkung() {
|
public String getBemerkung() {
|
||||||
|
|||||||
@ -21,16 +21,6 @@ public class Tour {
|
|||||||
this.log = new ArrayList<>();
|
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){
|
public void setTour(Tour tour){
|
||||||
this.dauer = tour.getDauer();
|
this.dauer = tour.getDauer();
|
||||||
this.mapJson = tour.getMapJson();
|
this.mapJson = tour.getMapJson();
|
||||||
@ -41,10 +31,6 @@ public class Tour {
|
|||||||
this.log = tour.getLogs();
|
this.log = tour.getLogs();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLog(ArrayList<Log> log) {
|
|
||||||
this.log = log;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holt einen einzigen Log Eintrag anhand der Id
|
* Holt einen einzigen Log Eintrag anhand der Id
|
||||||
* @param id Id des Eintrags der zu besorgen ist
|
* @param id Id des Eintrags der zu besorgen ist
|
||||||
|
|||||||
@ -34,7 +34,6 @@
|
|||||||
|
|
||||||
<?import javafx.geometry.*?>
|
<?import javafx.geometry.*?>
|
||||||
<?import javafx.scene.control.*?>
|
<?import javafx.scene.control.*?>
|
||||||
<?import javafx.scene.image.*?>
|
|
||||||
<?import javafx.scene.layout.*?>
|
<?import javafx.scene.layout.*?>
|
||||||
<?import javafx.scene.paint.*?>
|
<?import javafx.scene.paint.*?>
|
||||||
<?import javafx.scene.text.*?>
|
<?import javafx.scene.text.*?>
|
||||||
@ -45,30 +44,21 @@
|
|||||||
<menus>
|
<menus>
|
||||||
<Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
|
<Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
|
||||||
<items>
|
<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" />
|
<MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
|
||||||
</items>
|
</items>
|
||||||
</Menu>
|
</Menu>
|
||||||
<Menu fx:id="menuebearbeiten" mnemonicParsing="false" text="Bearbeiten">
|
<Menu mnemonicParsing="false" text="Bearbeiten">
|
||||||
<items>
|
<items>
|
||||||
<MenuItem fx:id="menueimport" mnemonicParsing="false" onAction="#importBtn" text="Import" />
|
<MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
|
||||||
<MenuItem fx:id="menueexport" mnemonicParsing="false" onAction="#exportBtn" text="Export" />
|
|
||||||
</items>
|
</items>
|
||||||
</Menu>
|
</Menu>
|
||||||
<Menu fx:id="menueoptionen" mnemonicParsing="false" text="Optionen">
|
<Menu mnemonicParsing="false" text="Optionen">
|
||||||
<items>
|
<items>
|
||||||
<CheckMenuItem fx:id="openmap" mnemonicParsing="false" onAction="#openmapaction" text="Map automatisch öffnen" />
|
<MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report erstellen" />
|
||||||
<CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
|
<MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
|
||||||
<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>
|
</items>
|
||||||
</Menu>
|
</Menu>
|
||||||
<Menu fx:id="menuehilfe" mnemonicParsing="false" text="Hilfe">
|
<Menu mnemonicParsing="false" text="Hilfe">
|
||||||
<items>
|
<items>
|
||||||
<MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
|
<MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
|
||||||
<MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
|
<MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
|
||||||
@ -84,7 +74,7 @@
|
|||||||
<Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+" />
|
<Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+" />
|
||||||
<Label layoutX="14.0" layoutY="4.0" text="Tours" />
|
<Label layoutX="14.0" layoutY="4.0" text="Tours" />
|
||||||
<Button fx:id="tourDel" layoutX="89.0" mnemonicParsing="false" onAction="#delTour" text="-" />
|
<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" />
|
<Button layoutX="117.0" mnemonicParsing="false" onAction="#editTourBtn" text="Edit" />
|
||||||
</children></AnchorPane>
|
</children></AnchorPane>
|
||||||
<TextField fx:id="sucheInput" promptText="Suche..." />
|
<TextField fx:id="sucheInput" promptText="Suche..." />
|
||||||
<Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
|
<Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
|
||||||
@ -122,20 +112,19 @@
|
|||||||
<children>
|
<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">
|
<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>
|
<tabs>
|
||||||
<Tab fx:id="kartenTab" text="Karte">
|
<Tab fx:id="kartenTab" text="Karte">
|
||||||
<AnchorPane>
|
<content>
|
||||||
<ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
|
<AnchorPane />
|
||||||
</AnchorPane>
|
</content></Tab>
|
||||||
</Tab>
|
|
||||||
<Tab fx:id="beschreibungTab" text="Beschreibung">
|
<Tab fx:id="beschreibungTab" text="Beschreibung">
|
||||||
<content>
|
<content>
|
||||||
<AnchorPane>
|
<AnchorPane>
|
||||||
<children>
|
<children>
|
||||||
<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">
|
<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>
|
<columns>
|
||||||
<TableColumn fx:id="nameCol" minWidth="100.0" prefWidth="-1.0" text="Tourname" />
|
<TableColumn fx:id="nameCol" maxWidth="1.7976931348623157E308" minWidth="70.0" prefWidth="-1.0" text="Tourname" />
|
||||||
<TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Dauer" />
|
<TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="40.0" prefWidth="-1.0" text="Dauer" />
|
||||||
<TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Strecke" />
|
<TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="50.0" prefWidth="-1.0" text="Strecke" />
|
||||||
<TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Startpunk" />
|
<TableColumn fx:id="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" />
|
<TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Zielpunkt" />
|
||||||
</columns>
|
</columns>
|
||||||
@ -173,7 +162,7 @@
|
|||||||
<Insets />
|
<Insets />
|
||||||
</HBox.margin>
|
</HBox.margin>
|
||||||
</Button>
|
</Button>
|
||||||
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn" text="Edit" />
|
<Button mnemonicParsing="false" onAction="#editLogBtn" text="Edit" />
|
||||||
</children>
|
</children>
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
|
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
|
||||||
@ -185,14 +174,14 @@
|
|||||||
<children>
|
<children>
|
||||||
<TableView fx:id="logTableView" onMouseClicked="#logItemSelected" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
<TableView fx:id="logTableView" onMouseClicked="#logItemSelected" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||||
<columns>
|
<columns>
|
||||||
<TableColumn fx:id="logDatumCol" minWidth="-1.0" prefWidth="-1.0" text="Datum" />
|
<TableColumn fx:id="logDatumCol" prefWidth="49.0" text="Datum" />
|
||||||
<TableColumn fx:id="logDauerCol" minWidth="-1.0" prefWidth="-1.0" text="Dauer" />
|
<TableColumn fx:id="logDauerCol" prefWidth="126.0" text="Dauer" />
|
||||||
<TableColumn fx:id="logStreckeCol" minWidth="-1.0" prefWidth="-1.0" text="Entfernung" />
|
<TableColumn fx:id="logStreckeCol" prefWidth="240.0" text="Entfernung" />
|
||||||
<TableColumn fx:id="logAvgCol" minWidth="-1.0" prefWidth="-1.0" text="AVG Geschwindigkeit" />
|
<TableColumn fx:id="logAvgCol" prefWidth="75.0" text="AVG Geschwindigkeit" />
|
||||||
<TableColumn fx:id="logHightCol" minWidth="-1.0" prefWidth="75.0" text="Höhenmeter" />
|
<TableColumn fx:id="logHightCol" prefWidth="75.0" text="Höhenmeter" />
|
||||||
<TableColumn fx:id="logPauseCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Pause" />
|
<TableColumn fx:id="logPauseCol" prefWidth="75.0" text="Davon Pause" />
|
||||||
<TableColumn fx:id="logGegangenCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Unterwegs" />
|
<TableColumn fx:id="logGegangenCol" prefWidth="75.0" text="Davon Unterwegs" />
|
||||||
<TableColumn fx:id="logBemerkungCol" minWidth="-1.0" prefWidth="-1.0" text="Bemerkung" />
|
<TableColumn fx:id="logBemerkungCol" prefWidth="75.0" text="Bemerkung" />
|
||||||
</columns>
|
</columns>
|
||||||
<columnResizePolicy>
|
<columnResizePolicy>
|
||||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
||||||
@ -210,7 +199,7 @@
|
|||||||
</SplitPane>
|
</SplitPane>
|
||||||
<HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER">
|
<HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER">
|
||||||
<children>
|
<children>
|
||||||
<Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Tourplaner" HBox.hgrow="ALWAYS">
|
<Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Left status" HBox.hgrow="ALWAYS">
|
||||||
<font>
|
<font>
|
||||||
<Font size="11.0" fx:id="x3" />
|
<Font size="11.0" fx:id="x3" />
|
||||||
</font>
|
</font>
|
||||||
@ -219,7 +208,7 @@
|
|||||||
</textFill>
|
</textFill>
|
||||||
</Label>
|
</Label>
|
||||||
<AnchorPane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" />
|
<AnchorPane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" />
|
||||||
<Label font="$x3" maxWidth="-1.0" text="Georg Reisinger" textFill="$x4" HBox.hgrow="NEVER" />
|
<Label font="$x3" maxWidth="-1.0" text="Right status" textFill="$x4" HBox.hgrow="NEVER" />
|
||||||
</children>
|
</children>
|
||||||
<padding>
|
<padding>
|
||||||
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
|
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
|
||||||
|
|||||||
@ -10,13 +10,7 @@ import javafx.scene.layout.*;
|
|||||||
import javafx.stage.Stage;
|
import javafx.stage.Stage;
|
||||||
import javafx.stage.WindowEvent;
|
import javafx.stage.WindowEvent;
|
||||||
import tourplaner.business.ConfigHelper;
|
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.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
@ -235,24 +229,4 @@ public class AlertHelper {
|
|||||||
stage.showAndWait();
|
stage.showAndWait();
|
||||||
return selectedDate.get();
|
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;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,66 +0,0 @@
|
|||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,14 +1,13 @@
|
|||||||
package tourplaner.ui;
|
package tourplaner.ui;
|
||||||
|
|
||||||
|
import javafx.collections.ObservableList;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.fxml.Initializable;
|
import javafx.fxml.Initializable;
|
||||||
import javafx.geometry.Orientation;
|
import javafx.geometry.Orientation;
|
||||||
import javafx.scene.control.*;
|
import javafx.scene.control.*;
|
||||||
import javafx.scene.control.Button;
|
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.control.TextField;
|
import javafx.scene.control.TextField;
|
||||||
import javafx.scene.control.cell.PropertyValueFactory;
|
import javafx.scene.control.cell.PropertyValueFactory;
|
||||||
import javafx.scene.image.ImageView;
|
|
||||||
import javafx.scene.input.MouseEvent;
|
import javafx.scene.input.MouseEvent;
|
||||||
import tourplaner.business.ConfigHelper;
|
import tourplaner.business.ConfigHelper;
|
||||||
import tourplaner.business.LogHelper;
|
import tourplaner.business.LogHelper;
|
||||||
@ -16,9 +15,15 @@ import tourplaner.object.Log;
|
|||||||
import tourplaner.object.Tour;
|
import tourplaner.object.Tour;
|
||||||
import tourplaner.viewmodels.ViewModel;
|
import tourplaner.viewmodels.ViewModel;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.net.URI;
|
||||||
|
import java.net.URISyntaxException;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.ResourceBundle;
|
import java.util.ResourceBundle;
|
||||||
|
import java.util.UUID;
|
||||||
|
import java.util.concurrent.atomic.AtomicReference;
|
||||||
|
|
||||||
public class TourplanerController implements Initializable {
|
public class TourplanerController implements Initializable {
|
||||||
//VM
|
//VM
|
||||||
@ -31,30 +36,9 @@ public class TourplanerController implements Initializable {
|
|||||||
public TableView<Tour> beschreibungTableView;
|
public TableView<Tour> beschreibungTableView;
|
||||||
public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
|
public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
|
||||||
public TextField titleTextView, sucheInput;
|
public TextField titleTextView, sucheInput;
|
||||||
public ImageView mapImageView;
|
|
||||||
//Log -> rechts unten
|
//Log -> rechts unten
|
||||||
public TableView<Log> logTableView;
|
public TableView<Log> logTableView;
|
||||||
public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
|
public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
|
||||||
//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
|
@FXML
|
||||||
private void tourReport(){
|
private void tourReport(){
|
||||||
@ -64,18 +48,14 @@ public class TourplanerController implements Initializable {
|
|||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void editTourBtn(){
|
private void editTourBtn(){
|
||||||
try {
|
this.viewModel.editTour();
|
||||||
this.viewModel.editTour();
|
beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
|
||||||
} catch (IOException e) {
|
beschreibungTableView.getItems().add(this.viewModel.getTour(this.viewModel.getSelectedTour().getName()));
|
||||||
LogHelper.error(e);
|
|
||||||
}
|
|
||||||
syncTour(this.viewModel.getSelectedTour().getName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void editLogBtn(){
|
private void editLogBtn(){
|
||||||
this.viewModel.editLog();
|
this.viewModel.editLog();
|
||||||
syncLogs();
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Öffnet github im standart browser
|
* Öffnet github im standart browser
|
||||||
@ -104,21 +84,6 @@ public class TourplanerController implements Initializable {
|
|||||||
this.viewModel.doxygenDocBrowser();
|
this.viewModel.doxygenDocBrowser();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void syncTour(String selectedItem){
|
|
||||||
beschreibungTableView.getItems().clear(); //Leert die Table View komplett
|
|
||||||
beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
|
|
||||||
mapImageView.setImage(this.viewModel.getImage(selectedItem));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void syncTourNamen(){
|
|
||||||
TourListView.getItems().clear();
|
|
||||||
TourListView.setItems(this.viewModel.getTourNamen());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void syncLogs(){
|
|
||||||
logTableView.getItems().clear();
|
|
||||||
logTableView.setItems(this.viewModel.getLogData());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -127,13 +92,11 @@ public class TourplanerController implements Initializable {
|
|||||||
*/
|
*/
|
||||||
@FXML
|
@FXML
|
||||||
private void tourListSelectedItem(MouseEvent mouseEvent){
|
private void tourListSelectedItem(MouseEvent mouseEvent){
|
||||||
ProgressBar progressBar = new ProgressBar("Tour auswählen...");
|
|
||||||
String selectedItem = TourListView.getSelectionModel().getSelectedItem();
|
String selectedItem = TourListView.getSelectionModel().getSelectedItem();
|
||||||
this.viewModel.selectTour(selectedItem);
|
this.viewModel.selectTour(selectedItem);
|
||||||
titleTextView.setText(selectedItem);
|
titleTextView.setText(selectedItem);
|
||||||
progressBar.addProgress(10);
|
beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
|
||||||
syncTour(selectedItem);
|
beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
|
||||||
progressBar.addProgress(10);
|
|
||||||
startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
|
startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
|
||||||
zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
|
zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
|
||||||
dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
|
dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
|
||||||
@ -142,10 +105,7 @@ public class TourplanerController implements Initializable {
|
|||||||
|
|
||||||
//Log anzeigen
|
//Log anzeigen
|
||||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
|
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
|
||||||
logTableView.getItems().clear();
|
|
||||||
progressBar.addProgress(10);
|
|
||||||
logTableView.setItems(this.viewModel.getLogData());
|
logTableView.setItems(this.viewModel.getLogData());
|
||||||
progressBar.addProgress(10);
|
|
||||||
logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
|
logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
|
||||||
logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
|
logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
|
||||||
logDatumCol.setCellValueFactory(new PropertyValueFactory<Log, String>("datum"));
|
logDatumCol.setCellValueFactory(new PropertyValueFactory<Log, String>("datum"));
|
||||||
@ -154,16 +114,7 @@ public class TourplanerController implements Initializable {
|
|||||||
logPauseCol.setCellValueFactory(new PropertyValueFactory<Log, String>("pause"));
|
logPauseCol.setCellValueFactory(new PropertyValueFactory<Log, String>("pause"));
|
||||||
logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
|
logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
|
||||||
logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
|
logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -181,7 +132,7 @@ public class TourplanerController implements Initializable {
|
|||||||
*/
|
*/
|
||||||
@FXML
|
@FXML
|
||||||
private void addTour(){
|
private void addTour(){
|
||||||
if(this.viewModel.addTour()) this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
|
this.viewModel.addTour();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -190,11 +141,10 @@ public class TourplanerController implements Initializable {
|
|||||||
*/
|
*/
|
||||||
@FXML
|
@FXML
|
||||||
private void delTour(){
|
private void delTour(){
|
||||||
this.beschreibungTableView.getItems().clear(); //löscht alles aus der tabelle
|
this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
|
||||||
this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
|
this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
|
||||||
this.viewModel.delTour();
|
this.viewModel.delTour();
|
||||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||||
mapImageView.setImage(null);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -203,10 +153,7 @@ public class TourplanerController implements Initializable {
|
|||||||
*/
|
*/
|
||||||
@FXML
|
@FXML
|
||||||
private void suche(){
|
private void suche(){
|
||||||
ProgressBar progressBar = new ProgressBar("Suche");
|
|
||||||
this.viewModel.suche(this.sucheInput.getText());
|
this.viewModel.suche(this.sucheInput.getText());
|
||||||
progressBar.addProgress(100);
|
|
||||||
progressBar.closeProgress();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -216,13 +163,12 @@ public class TourplanerController implements Initializable {
|
|||||||
@FXML
|
@FXML
|
||||||
private void addLog(){
|
private void addLog(){
|
||||||
this.viewModel.addLog();
|
this.viewModel.addLog();
|
||||||
syncLogs();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@FXML
|
@FXML
|
||||||
private void delLog(){
|
private void delLog(){
|
||||||
this.viewModel.delLog();
|
this.viewModel.delLog();
|
||||||
syncLogs();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -244,104 +190,13 @@ public class TourplanerController implements Initializable {
|
|||||||
//Tour list -> links
|
//Tour list -> links
|
||||||
TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
|
TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
|
||||||
TourListView.setOrientation(Orientation.VERTICAL);
|
TourListView.setOrientation(Orientation.VERTICAL);
|
||||||
syncTourNamen();
|
TourListView.setItems(this.viewModel.getTourNamen());
|
||||||
deselectAll();
|
|
||||||
if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){
|
|
||||||
this.openpdf.setSelected(true);
|
|
||||||
}else {
|
|
||||||
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"));
|
|
||||||
}
|
|
||||||
|
|
||||||
@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
|
//Tabs zu Tour -> rechts oben
|
||||||
beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||||
titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));
|
titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));
|
||||||
//Log -> rechts unten
|
//Log -> rechts unten
|
||||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
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();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -2,12 +2,15 @@ package tourplaner.viewmodels;
|
|||||||
|
|
||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.scene.image.Image;
|
import org.apache.pdfbox.exceptions.COSVisitorException;
|
||||||
import tourplaner.business.*;
|
import tourplaner.business.Reporter;
|
||||||
|
import tourplaner.business.TourPlaner;
|
||||||
|
import tourplaner.data.DbConnect;
|
||||||
import tourplaner.ui.AlertHelper;
|
import tourplaner.ui.AlertHelper;
|
||||||
|
import tourplaner.business.ConfigHelper;
|
||||||
|
import tourplaner.business.LogHelper;
|
||||||
import tourplaner.object.Log;
|
import tourplaner.object.Log;
|
||||||
import tourplaner.object.Tour;
|
import tourplaner.object.Tour;
|
||||||
import tourplaner.ui.ProgressBar;
|
|
||||||
|
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -22,25 +25,20 @@ import java.util.concurrent.atomic.AtomicReference;
|
|||||||
public class ViewModel {
|
public class ViewModel {
|
||||||
//Tour
|
//Tour
|
||||||
private final ObservableList<Tour> tourData = FXCollections.observableArrayList();
|
private final ObservableList<Tour> tourData = FXCollections.observableArrayList();
|
||||||
private ObservableList<String> tourNamen = FXCollections.observableArrayList();
|
private final ObservableList<String> tourNamen = FXCollections.observableArrayList();
|
||||||
private Tour selectedTour;
|
private Tour selectedTour;
|
||||||
private String neueTourName, neueTourStart, neueTourZiel, neueBemerkung;
|
private String neueTourName, neueTourStart, neueTourZiel, neueBemerkung;
|
||||||
//Log
|
//Log
|
||||||
private final ObservableList<Log> logData = FXCollections.observableArrayList();
|
private final ObservableList<Log> logData = FXCollections.observableArrayList();
|
||||||
private Log selectedLog;
|
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
|
* Bearbeitet eine bereits bestehende Tour
|
||||||
* prüft ob eine tour ausgewählt ist
|
* prüft ob eine tour ausgewählt ist
|
||||||
*/
|
*/
|
||||||
public void editTour() throws IOException {
|
public void editTour(){
|
||||||
if (this.selectedTour == null){
|
if (this.selectedTour == null){
|
||||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||||
ConfigHelper.getLangIniString("keinetourselected"),
|
ConfigHelper.getLangIniString("keinetourselected"),
|
||||||
@ -79,10 +77,9 @@ public class ViewModel {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Input mit duplications check des Namens und ohne content im input feld
|
* Input mit duplications check des Namens und ohne content im input feld
|
||||||
* @return false beim schließen
|
|
||||||
*/
|
*/
|
||||||
private boolean tourNameInput(){
|
private void tourNameInput(){
|
||||||
return tourNameInputDuplicatCheck("", true);
|
tourNameInputDuplicatCheck("", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -153,31 +150,19 @@ public class ViewModel {
|
|||||||
/**
|
/**
|
||||||
* Fügt eine neue Tour hinzu
|
* Fügt eine neue Tour hinzu
|
||||||
*/
|
*/
|
||||||
public boolean addTour(){
|
public void addTour(){
|
||||||
if(tourNameInput()) {
|
tourNameInput();
|
||||||
if(tourStartInput("")) {
|
tourStartInput("");
|
||||||
if (tourZielInput("")) {
|
tourZielInput("");
|
||||||
if (getTour(this.neueTourName) == null) {
|
if (getTour(this.neueTourName) == null) {
|
||||||
ProgressBar progressBar = new ProgressBar("Add Tour...");
|
Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
|
||||||
Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
|
tourData.add(newTour);
|
||||||
tourData.add(newTour);
|
tourNamen.add(this.neueTourName);
|
||||||
tourNamen.add(this.neueTourName);
|
TourPlaner.addTour(newTour);
|
||||||
this.selectedTour = newTour;
|
}
|
||||||
progressBar.addProgress(10);
|
|
||||||
try {
|
|
||||||
TourPlaner.addTour(newTour, progressBar);
|
|
||||||
} catch (IOException e) {
|
|
||||||
LogHelper.error(e);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}else return false;
|
|
||||||
}else return false;
|
|
||||||
}else return false;
|
|
||||||
this.neueTourStart = null;
|
this.neueTourStart = null;
|
||||||
this.neueTourZiel = null;
|
this.neueTourZiel = null;
|
||||||
this.neueTourName = null;
|
this.neueTourName = null;
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean keineTourSelected(){
|
private boolean keineTourSelected(){
|
||||||
@ -195,59 +180,47 @@ public class ViewModel {
|
|||||||
* Bearbeitet einen gewählten Log eintrag
|
* Bearbeitet einen gewählten Log eintrag
|
||||||
*/
|
*/
|
||||||
public void editLog(){
|
public void editLog(){
|
||||||
System.out.println(this.selectedLog);
|
AtomicReference<Tour> tourAkt = new AtomicReference<>();
|
||||||
if(this.selectedTour != null) {
|
AtomicReference<Log> logAkt = new AtomicReference<>();
|
||||||
if(this.selectedLog != null) {
|
this.tourData.forEach(tourd -> {
|
||||||
AtomicReference<Tour> tourAkt = new AtomicReference<>();
|
if(tourd.getName().equals(this.selectedTour.getName())) {
|
||||||
AtomicReference<Log> logAkt = new AtomicReference<>();
|
tourd.getLogs().forEach(log -> {
|
||||||
this.tourData.forEach(tourd -> {
|
if(this.selectedLog.getId().equals(log.getId())){
|
||||||
if (tourd.getName().equals(this.selectedTour.getName())) {
|
logAkt.set(log);
|
||||||
tourd.getLogs().forEach(log -> {
|
tourAkt.set(tourd);
|
||||||
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 dauer = dauerInput(this.selectedLog.getDauer());
|
||||||
double hightmeter = -1.0;
|
double strecke = -1;
|
||||||
boolean bemerkung = false;
|
double pause = -1.0;
|
||||||
LocalDate datum = null;
|
double hightmeter = -1.0;
|
||||||
if (dauer >= 0) {
|
boolean bemerkung = false;
|
||||||
strecke = streckeInput(this.selectedLog.getStrecke() + "");
|
LocalDate datum = null;
|
||||||
if (strecke >= 0) {
|
if (dauer >= 0) {
|
||||||
pause = pauseInput(this.selectedLog.getPause() + "");
|
strecke = streckeInput(this.selectedLog.getStrecke() + "");
|
||||||
if (pause >= 0.0) {
|
if (strecke >= 0) {
|
||||||
hightmeter = hightmeterInput(this.selectedLog.getHightmeter() + "");
|
pause = pauseInput("");
|
||||||
if (hightmeter >= 0.0) {
|
if(pause >= 0.0) {
|
||||||
bemerkung = bemerkungInput(this.selectedLog.getBemerkung());
|
hightmeter = hightmeterInput("");
|
||||||
if (bemerkung) {
|
if (hightmeter >= 0.0) {
|
||||||
datum = dateInput(this.selectedLog.getDatum());
|
bemerkung = bemerkungInput("");
|
||||||
if (datum != null) {
|
if (bemerkung) {
|
||||||
Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause);
|
datum = dateInput(this.selectedLog.getDatum());
|
||||||
this.logData.removeIf(ld -> ld.getId().equals(this.selectedLog.getId()));
|
if (datum != null) {
|
||||||
this.logData.add(newLog);
|
Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause);
|
||||||
// tourAkt.get().delLog(this.selectedLog.getId());
|
this.logData.removeIf(ld -> ld.getId().equals(this.selectedLog.getId()));
|
||||||
// tourAkt.get().addLog(newLog);
|
this.logData.add(newLog);
|
||||||
this.tourData.removeIf(td -> td.getName().equals(this.selectedTour.getName()));
|
tourAkt.get().delLog(this.selectedLog.getId());
|
||||||
this.tourData.add(tourAkt.get());
|
tourAkt.get().addLog(newLog);
|
||||||
TourPlaner.editLog(this.selectedTour.getName(), newLog);
|
this.tourData.removeIf(td -> td.getName().equals(this.selectedTour.getName()));
|
||||||
}
|
this.tourData.add(tourAkt.get());
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}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;
|
this.neueBemerkung = null;
|
||||||
}
|
}
|
||||||
@ -354,7 +327,6 @@ public class ViewModel {
|
|||||||
if (date != null) {
|
if (date != null) {
|
||||||
Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause);
|
Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause);
|
||||||
this.logData.add(newLog);
|
this.logData.add(newLog);
|
||||||
TourPlaner.addLog(this.selectedTour.getName(), newLog);
|
|
||||||
s.addLog(newLog);
|
s.addLog(newLog);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -376,8 +348,25 @@ public class ViewModel {
|
|||||||
*/
|
*/
|
||||||
public void delLog(){
|
public void delLog(){
|
||||||
if(this.selectedLog != null) {
|
if(this.selectedLog != null) {
|
||||||
TourPlaner.delLog(this.selectedTour.getName(), this.selectedLog.getId());
|
this.logData.removeIf(s -> s.getId().equals(this.selectedLog.getId()));
|
||||||
|
AtomicReference<Tour> tourToEdit = new AtomicReference<>();
|
||||||
|
this.tourData.forEach(s -> {
|
||||||
|
if (s.getLogs() != null) {
|
||||||
|
s.getLogs().forEach(ss -> {
|
||||||
|
if (ss.getId().equals(this.selectedLog.getId())) {
|
||||||
|
tourToEdit.set(s);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (tourToEdit.get() != null){
|
||||||
|
Tour toEdit = tourToEdit.get();
|
||||||
|
toEdit.delLog(this.selectedLog.getId());
|
||||||
|
this.tourData.removeIf(s -> s.getName().equals(toEdit.getName()));
|
||||||
|
this.tourData.add(toEdit);
|
||||||
this.selectedLog = null;
|
this.selectedLog = null;
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||||
ConfigHelper.getLangIniString("keinetourselected"),
|
ConfigHelper.getLangIniString("keinetourselected"),
|
||||||
@ -417,8 +406,6 @@ public class ViewModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ObservableList<Log> getLogData() {
|
public ObservableList<Log> getLogData() {
|
||||||
logData.removeIf(s -> true);
|
|
||||||
if(this.selectedTour != null) logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
|
|
||||||
return logData;
|
return logData;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -477,7 +464,7 @@ public class ViewModel {
|
|||||||
getTourData().forEach(s -> {
|
getTourData().forEach(s -> {
|
||||||
namen.add(s.getName());
|
namen.add(s.getName());
|
||||||
});
|
});
|
||||||
tourNamen.clear();
|
tourNamen.removeAll();
|
||||||
tourNamen.addAll(namen);
|
tourNamen.addAll(namen);
|
||||||
return tourNamen;
|
return tourNamen;
|
||||||
}
|
}
|
||||||
@ -499,11 +486,9 @@ public class ViewModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ObservableList<Tour> getTourData() {
|
public ObservableList<Tour> getTourData() {
|
||||||
tourData.clear();
|
tourData.removeAll();
|
||||||
ArrayList<Tour> touren = TourPlaner.getAllTours();
|
// ObservableList<Tour> data = ;
|
||||||
if(touren != null) {
|
tourData.addAll(TourPlaner.getAllTours());
|
||||||
tourData.addAll(touren);
|
|
||||||
}
|
|
||||||
return tourData;
|
return tourData;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -511,18 +496,16 @@ public class ViewModel {
|
|||||||
* Entfernt eine Tour anhand der ausgewählten Tour
|
* Entfernt eine Tour anhand der ausgewählten Tour
|
||||||
*/
|
*/
|
||||||
public void delTour(){
|
public void delTour(){
|
||||||
if (this.selectedTour != null) {
|
try {
|
||||||
String tourname = this.selectedTour.getName();
|
String tourname = this.selectedTour.getName();
|
||||||
try {
|
tourData.removeIf(s -> s.getName().equals(tourname));
|
||||||
tourData.removeIf(s -> s.getName().equals(tourname));
|
tourNamen.removeIf(s -> s.equals(tourname));
|
||||||
tourNamen.removeIf(s -> s.equals(tourname));
|
logData.removeIf(s -> true);
|
||||||
logData.removeIf(s -> true);
|
setSelectedTour(null);
|
||||||
TourPlaner.delTour(tourname);
|
TourPlaner.delTour(tourname);
|
||||||
setSelectedTour(null);
|
}catch (NullPointerException e){
|
||||||
} catch (NullPointerException e) {
|
LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
|
||||||
LogHelper.error(e);
|
ConfigHelper.getLangIniString("deltournoselect"));
|
||||||
}
|
|
||||||
}else {
|
|
||||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||||
ConfigHelper.getLangIniString("keinetourselected"),
|
ConfigHelper.getLangIniString("keinetourselected"),
|
||||||
ConfigHelper.getLangIniString("deltournoselectmsg"));
|
ConfigHelper.getLangIniString("deltournoselectmsg"));
|
||||||
@ -539,20 +522,7 @@ public class ViewModel {
|
|||||||
ConfigHelper.getLangIniString("suchfeldleer"),
|
ConfigHelper.getLangIniString("suchfeldleer"),
|
||||||
ConfigHelper.getLangIniString("suchtextzuerst"));
|
ConfigHelper.getLangIniString("suchtextzuerst"));
|
||||||
}
|
}
|
||||||
ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput);
|
// TODO: 19.03.2021 Suchlogik
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -616,40 +586,14 @@ public class ViewModel {
|
|||||||
ConfigHelper.getLangIniString("keinetourselected"),
|
ConfigHelper.getLangIniString("keinetourselected"),
|
||||||
ConfigHelper.getLangIniString("logtournotselectedmsg"));
|
ConfigHelper.getLangIniString("logtournotselectedmsg"));
|
||||||
}else {
|
}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 {
|
try {
|
||||||
new Exporter(file).doExport();
|
Reporter.createTourReport(this.selectedTour.getName());
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
AlertHelper.error("Error", "Export Error", "Fehler beim Exportieren");
|
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||||
LogHelper.error(e);
|
} catch (COSVisitorException e) {
|
||||||
|
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user