Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
b234299e6b | |||
d872a39394 | |||
9d010d452c | |||
58e94e6cbd | |||
63e736152b | |||
ad5d7d98c4 | |||
d8c4680e16 | |||
49b6407ce6 | |||
9472a5537a | |||
f4e9b16792 | |||
c261652ce6 | |||
a0224b9870 | |||
ae93f365d5 |
@ -6,6 +6,16 @@ logo = logo.png
|
||||
[lang]
|
||||
lang = langde
|
||||
|
||||
[settings]
|
||||
openpdf = 1
|
||||
openmap = 0
|
||||
|
||||
[einheiten]
|
||||
zeit = min
|
||||
strecke = km
|
||||
meter = m
|
||||
speed = km/h
|
||||
|
||||
[db]
|
||||
dbname = tourplaner
|
||||
url =
|
||||
|
69
langde.ini
69
langde.ini
@ -19,7 +19,7 @@ zielpunkttitle = Tour zielpunkt
|
||||
zielpunktheader = Bitte geben Sie den Zielpunkt der Tour an!
|
||||
zielpunktmsg = Zielpunkt:
|
||||
deltournoselect = ViewModel -> DelTour
|
||||
deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus, bevor Sie auf löschen klicken!
|
||||
deltournoselectmsg = Bitte wählen Sie zuerst eine Tour aus!
|
||||
exceptionstackheader = Exception stacktrace:
|
||||
keinelogsvorhanden = Fügen Sie erst ein Log hinzu um es anzuzeigen!
|
||||
datum = Datum
|
||||
@ -40,3 +40,70 @@ hightmeter = Höhenmeter
|
||||
hightmetermsg = Höhenmeter des Abschnitts
|
||||
bemerkung = Bemerkung
|
||||
bemerkungheader = Bitte geben Sie die Bemerkungen zu diesem Log eintrag ein, kann auch leer bleiben.
|
||||
tourreportvon = Tour Report von ->
|
||||
tourplanervon = Tourplaner by DerGeorg
|
||||
reportkeywords = Tourplaner, Tour, Report
|
||||
tourplaner = Tourplaner"
|
||||
tour = Tour
|
||||
reportvon = Report erstellt von:
|
||||
reportstart = Startpunkt der Tour:
|
||||
reportziel = Zielpunkt der Tour:
|
||||
reportdauercal = Berechnete Dauer der Tour:
|
||||
reportstreckecal = Berechnete Strecke der Tour:
|
||||
logs = Logs
|
||||
countlog = Anzahl der Logeinträge:
|
||||
logvom = Log vom:
|
||||
logdauer = Dauer:
|
||||
logpause = Davon Pause:
|
||||
loggegangen = Davon gegangen:
|
||||
logavg = Berechnete Durchschnittliche Geschwindigkeit:
|
||||
logstrecke = Entfernung:
|
||||
loghight = Höhenmeter:
|
||||
logbemerkung = Bemerkung:
|
||||
|
||||
fkarte = Karte
|
||||
fbeschreibung = Beschreibung
|
||||
fedit = Bearbeiten
|
||||
fname = Tourname
|
||||
fstrecke = Berechnete Strecke
|
||||
fdauer = Berechnete Dauer
|
||||
fziel = Ziel
|
||||
fstart = Start
|
||||
favg = Durchschnittsgeschwindigkeit
|
||||
fbemerkung = Bemerkung
|
||||
fdatum = Datum
|
||||
fdauer = Dauer
|
||||
fgegangen = Davon gegangen
|
||||
fhight = Höhenmeter
|
||||
fpause = Davon Pause
|
||||
fstrecke = Strecke
|
||||
|
||||
keinlogselected = Kein Logeintrag ausgewählt
|
||||
keinlogselectedmsg = Bitte zuerst einen Logeintrag auswählen
|
||||
|
||||
fsuche = Suchen
|
||||
fopenmapsetting = Map automatisch öffnen
|
||||
fopenpdfsetting = Report automatisch öffnen
|
||||
flangenglisch = Englisch
|
||||
flangdeutsch = Deutsch
|
||||
fdatei = Datei
|
||||
fbearbeiten = Bearbeiten
|
||||
foptionen = Optionen
|
||||
fsprache = Sprache auswählen
|
||||
fhilfe = Hilfe
|
||||
freposum = Erstelle Report über alle Touren
|
||||
frepotour = Erstelle Report über aktuelle Tour
|
||||
fbeenden = Beenden
|
||||
fpunkte = ...
|
||||
|
||||
rzeitallerlogs = Gesammte Zeit aller Logs:
|
||||
rstreckeallerlogs = gesammte Strecke aller Logs:
|
||||
rcalzeitallerlogs = Berechnete Zeit aller Logs:
|
||||
calstreckeallerloggs = Berechnete Strecke aller Touren:
|
||||
rdaten = Daten
|
||||
rsummrepo = Zusammengefasster Report
|
||||
|
||||
bewertung = Bewertung
|
||||
bewertungmsg = Bitte die Bewertung zwischen 0 und 5 eingeben
|
||||
bewertungeror = Bitte nur Bewertungen von 0 und 5 eingeben
|
||||
bewertungerror2 = Bitte nur Zahlen zum Bewerten
|
110
langen.ini
Normal file
110
langen.ini
Normal file
@ -0,0 +1,110 @@
|
||||
[langen]
|
||||
achtung = ATTENTION
|
||||
openbrowsererror = TourplanerController -> Browser:
|
||||
browserexception = Browser Exception
|
||||
browserexceptionmsg = Error at opening Browser
|
||||
suchfeldleer = Search field is empty!
|
||||
suchtextzuerst = Please enter search term first!
|
||||
keinetourselected = No Tour selected
|
||||
tournametitle = Tour name
|
||||
tournameheader = Please enter a Tourname!
|
||||
tournamemsg = Name:
|
||||
namevergebenheader = Name is already occupied!
|
||||
namevergebenmsg1 = The name '
|
||||
namevergebenmsg2 = ' is already in use!
|
||||
startpunkttitle = Tour start
|
||||
startpunktheader = Please enter the start of the Tour
|
||||
startpunktmsg = Start:
|
||||
zielpunkttitle = Tour destination:
|
||||
zielpunktheader = Please enter the tour destination!
|
||||
zielpunktmsg = Destination:
|
||||
deltournoselect = ViewModel -> DelTour
|
||||
deltournoselectmsg = Please select a tour first!
|
||||
exceptionstackheader = Exception stacktrace:
|
||||
keinelogsvorhanden = First add a Log!
|
||||
datum = Date
|
||||
dauer = Duration
|
||||
strecke = Distance
|
||||
streckemsg = Distance of the log entry
|
||||
dauermsg = Duration of the log entry
|
||||
doppelpunkt = :
|
||||
fktnichtimplementiert = Not implementet jet
|
||||
vergessenodernochnichtsoweit = Not implementet jet
|
||||
logtournotselectedmsg = Please select a tour first!
|
||||
keintextimfeld = Please enter a text!
|
||||
nurzahlen = Only numbers!
|
||||
nurpositivezahlen = Only positiv numbers!
|
||||
pause = Break
|
||||
pausemsg = Duration of the break
|
||||
hightmeter = Vertical meters
|
||||
hightmetermsg = Vertical meters of the etape
|
||||
bemerkung = Comment
|
||||
bemerkungheader = Please enter a Comment, can also be empty!
|
||||
tourreportvon = Tour Report from ->
|
||||
tourplanervon = Tourplaner by DerGeorg
|
||||
reportkeywords = Tourplaner, Tour, Report
|
||||
tourplaner = Tourplaner
|
||||
tour = Tour
|
||||
reportvon = Report created by:
|
||||
reportstart = Start of the tour:
|
||||
reportziel = Destination of the tour:
|
||||
reportdauercal = Calculated duration of the tour:
|
||||
reportstreckecal = Calculated distance of the tour:
|
||||
logs = Logs
|
||||
countlog = Number of log entries:
|
||||
logvom = Log from:
|
||||
logdauer = Duration:
|
||||
logpause = Break from that:
|
||||
loggegangen = Gone away:
|
||||
logavg = Calculated averrage speed:
|
||||
logstrecke = Distance:
|
||||
loghight = Vertical meters:
|
||||
logbemerkung = Comment:
|
||||
|
||||
fkarte = Map
|
||||
fbeschreibung = Description
|
||||
fedit = Edit
|
||||
fname = Tourname
|
||||
fstrecke = Calculated Distance
|
||||
fdauer = Calculated Duration
|
||||
fziel = Destination
|
||||
fstart = Start
|
||||
favg = Average speed
|
||||
fbemerkung = Comment
|
||||
fdatum = Date
|
||||
fdauer = Duration
|
||||
fgegangen = Gone away
|
||||
fhight = Vertical meters
|
||||
fpause = Break from that
|
||||
fstrecke = Distance
|
||||
|
||||
keinlogselected = No log selected
|
||||
keinlogselectedmsg = Please select a log first!
|
||||
|
||||
|
||||
fsuche = Search
|
||||
fopenmapsetting = Open map automatic
|
||||
fopenpdfsetting = Open report automatic
|
||||
flangenglisch = English
|
||||
flangdeutsch = German
|
||||
fdatei = File
|
||||
fbearbeiten = Edit
|
||||
foptionen = Options
|
||||
fsprache = Choose Language
|
||||
fhilfe = Help
|
||||
freposum = Generate summarize-report
|
||||
frepotour = Generate tour-report
|
||||
fbeenden = Quit
|
||||
fpunkte = ...
|
||||
|
||||
rzeitallerlogs = Time of all logs:
|
||||
rstreckeallerlogs = Distance of all logs:
|
||||
rcalzeitallerlogs = Calculated time of all logs:
|
||||
calstreckeallerloggs = Calculated distance of all logs:
|
||||
rdaten = Data
|
||||
rsummrepo = Summary Report
|
||||
|
||||
bewertung = Rating
|
||||
bewertungmsg = Please enter a rating from 0 to 5
|
||||
bewertungeror = Please enter only a rating from 0 to 5
|
||||
bewertungerror2 = Please only enter numbers for rating
|
@ -43,7 +43,7 @@ public class ConfigHelper {
|
||||
try {
|
||||
ini = new Wini(new File(filename));
|
||||
} catch (IOException e) {
|
||||
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||
LogHelper.error(e);
|
||||
}
|
||||
assert ini != null;
|
||||
return ini.get(sectionName, optionName, String.class);
|
||||
@ -56,7 +56,7 @@ public class ConfigHelper {
|
||||
* @return Den angeforderten String
|
||||
*/
|
||||
public static String getLangIniString(String optionName){
|
||||
return ConfigHelper.getIniString(ConfigHelper.getStandartLangde(), ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
|
||||
return ConfigHelper.getIniString(getIniString(getStandartConfig(), "lang", "lang") + ".ini", ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "lang", "lang"),optionName);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -92,7 +92,7 @@ public class ConfigHelper {
|
||||
ini.put(sectionName, optionName, value);
|
||||
ini.store();
|
||||
} catch (IOException e) {
|
||||
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||
LogHelper.error(e);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,14 +1,13 @@
|
||||
package tourplaner.business;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.awt.image.RenderedImage;
|
||||
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;
|
||||
@ -32,13 +31,23 @@ public class DirectionMap {
|
||||
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;
|
||||
}
|
||||
@ -54,12 +63,26 @@ public class DirectionMap {
|
||||
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(":");
|
||||
|
50
src/tourplaner/business/EinheitenAdder.java
Normal file
50
src/tourplaner/business/EinheitenAdder.java
Normal file
@ -0,0 +1,50 @@
|
||||
package tourplaner.business;
|
||||
|
||||
/**
|
||||
* Fügt am ende eines Strings die einheiten an
|
||||
*/
|
||||
public class EinheitenAdder {
|
||||
|
||||
/**
|
||||
* Fügt meter hinzu
|
||||
* @param meter Meter als String
|
||||
* @return Meter mit einheit
|
||||
*/
|
||||
public static String addMeter(String meter){
|
||||
return meter + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "meter");
|
||||
}
|
||||
|
||||
public static String addSpeed(String speed){
|
||||
return speed + " " + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "speed");
|
||||
}
|
||||
|
||||
/**
|
||||
* Fügt km hinzu
|
||||
* @param km km als String
|
||||
* @return km mit einheit
|
||||
*/
|
||||
public static String addKm(String km){
|
||||
return km + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "strecke");
|
||||
}
|
||||
|
||||
/**
|
||||
* Fügt minuten hinzu
|
||||
* @param min minuten als String
|
||||
* @return minuten mit einheit
|
||||
*/
|
||||
public static String addMinuten(String min){
|
||||
return min + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "zeit");
|
||||
}
|
||||
|
||||
/**
|
||||
* Fügt am ende .json hinzu. Sofern es nicht schon dort ist
|
||||
* @param filename Filename ohne .json am ende
|
||||
* @return Der Filename mit .json am ende-
|
||||
*/
|
||||
public static String addJson(String filename){
|
||||
if(!filename.contains(".json")){
|
||||
filename += ".json";
|
||||
}
|
||||
return filename;
|
||||
}
|
||||
}
|
77
src/tourplaner/business/Exporter.java
Normal file
77
src/tourplaner/business/Exporter.java
Normal file
@ -0,0 +1,77 @@
|
||||
package tourplaner.business;
|
||||
|
||||
import tourplaner.data.DbConnect;
|
||||
import tourplaner.object.Log;
|
||||
import tourplaner.object.Tour;
|
||||
import tourplaner.ui.AlertHelper;
|
||||
import tourplaner.ui.ProgressBar;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.io.*;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Ist für das importieren und Exportieren der Daten zuständig
|
||||
*/
|
||||
public class Exporter {
|
||||
|
||||
private ArrayList<Tour> touren;
|
||||
private String path;
|
||||
|
||||
/**
|
||||
* Erstellt den Exporter mit dem gegebenen Path
|
||||
* @param path Gegebener Path
|
||||
*/
|
||||
public Exporter(String path) {
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
/**
|
||||
* Führt den Export aus -> Holt daten, erstellt file
|
||||
* @throws IOException Fehler beim File erstellen
|
||||
*/
|
||||
public void doExport() throws IOException {
|
||||
ProgressBar progressBar = new ProgressBar("Export...");
|
||||
int step = progressBar.getProgressSize(4, 100);
|
||||
ArrayList<Tour> data = new DbConnect().getAllTouren();
|
||||
|
||||
progressBar.addProgress(step);
|
||||
FileWriter fileWriter = new FileWriter(EinheitenAdder.addJson(this.path));
|
||||
progressBar.addProgress(step);
|
||||
JsonHelper.getJsonFromObj(data, fileWriter);
|
||||
progressBar.addProgress(step);
|
||||
BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
|
||||
progressBar.setProgress(100);
|
||||
bufferedWriter.close();
|
||||
}
|
||||
|
||||
/**
|
||||
* Führt den Imput aus -> File holen, Daten in db erstellen
|
||||
* @throws IOException Fehler beim File öffnen
|
||||
*/
|
||||
public void doImport() {
|
||||
ProgressBar progressBar = new ProgressBar("Import...");
|
||||
try {
|
||||
this.touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path)));
|
||||
DbConnect dbConnect = new DbConnect();
|
||||
dbConnect.delAllData();
|
||||
progressBar.addProgress(5);
|
||||
int size = progressBar.getProgressSize(this.touren.size() * 3, 100);
|
||||
for (Tour tour:this.touren) {
|
||||
new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
|
||||
progressBar.addProgress(size);
|
||||
dbConnect.addTour(tour);
|
||||
progressBar.addProgress(size);
|
||||
ArrayList<Log> logs = tour.getLogs();
|
||||
for (Log log:logs) {
|
||||
dbConnect.addLog(tour.getName(), log);
|
||||
}
|
||||
progressBar.addProgress(size);
|
||||
}
|
||||
} catch (IOException e) {
|
||||
LogHelper.error(e);
|
||||
progressBar.setProgress(100);
|
||||
}
|
||||
progressBar.setProgress(100);
|
||||
}
|
||||
}
|
@ -1,7 +1,5 @@
|
||||
package tourplaner.business;
|
||||
|
||||
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import java.awt.*;
|
||||
import java.io.*;
|
||||
@ -24,37 +22,32 @@ public class HttpHelper {
|
||||
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,19 +1,71 @@
|
||||
package tourplaner.business;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.JsonElement;
|
||||
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);
|
||||
}
|
||||
|
@ -3,17 +3,12 @@ package tourplaner.business;
|
||||
import com.itextpdf.text.*;
|
||||
import com.itextpdf.text.Font;
|
||||
import com.itextpdf.text.Image;
|
||||
import com.sun.scenario.effect.ImageData;
|
||||
import tourplaner.object.Log;
|
||||
import tourplaner.object.Tour;
|
||||
|
||||
|
||||
import com.itextpdf.text.pdf.PdfPCell;
|
||||
import com.itextpdf.text.pdf.PdfPTable;
|
||||
import com.itextpdf.text.pdf.PdfWriter;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
@ -21,6 +16,11 @@ 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 {
|
||||
@ -34,6 +34,65 @@ public class Reporter {
|
||||
private static Font smallBold = new Font(Font.TIMES_ROMAN, 12,
|
||||
Font.BOLD);
|
||||
|
||||
/**
|
||||
* Erstellt den Summary Report
|
||||
*/
|
||||
public static void sumReport(){
|
||||
ArrayList<Tour> tours = TourPlaner.getAllTours();
|
||||
String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "summary.pdf";
|
||||
try {
|
||||
Document document = new Document();
|
||||
PdfWriter.getInstance(document, new FileOutputStream(file));
|
||||
document.open();
|
||||
addSumRepo(document, tours);
|
||||
|
||||
document.close();
|
||||
} catch (DocumentException | FileNotFoundException e) {
|
||||
LogHelper.error(e.getMessage(), e.getClass().getName());
|
||||
}
|
||||
if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1) {
|
||||
FileHelper.openDefault(file);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Content des Sumary reports
|
||||
* @param document Document auf das geschrieben wird
|
||||
* @param touren Touren die berechnet werden
|
||||
* @throws DocumentException Fehler beim schreiben auf das Dokument
|
||||
*/
|
||||
private static void addSumRepo(Document document, ArrayList<Tour> touren) throws DocumentException {
|
||||
double dauer = 0;
|
||||
double strecke = 0;
|
||||
double calDauer = 0;
|
||||
double calStecke = 0;
|
||||
for (Tour tour:touren) {
|
||||
calStecke += tour.getStrecke();
|
||||
calDauer += Double.parseDouble(tour.getDauer());
|
||||
ArrayList<Log> logs = tour.getLogs();
|
||||
for (Log log:logs) {
|
||||
dauer += log.getDauer();
|
||||
strecke += log.getStrecke();
|
||||
}
|
||||
}
|
||||
Anchor anchor = new Anchor(ConfigHelper.getLangIniString("rsummrepo"), catFont);
|
||||
anchor.setName(ConfigHelper.getLangIniString("rsummrepo"));
|
||||
// Second parameter is the number of the chapter
|
||||
Chapter catPart = new Chapter(new Paragraph(anchor), 1);
|
||||
Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("rdaten"), subFont);
|
||||
Section subCatPart = catPart.addSection(subPara);
|
||||
subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + " " + System.getProperty("user.name") + ", " + new Date()));
|
||||
subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("rzeitallerlogs") + " " + dauer)));
|
||||
subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("rstreckeallerlogs") + " " + strecke)));
|
||||
subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("rcalzeitallerlogs") + " " + calDauer)));
|
||||
subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("calstreckeallerloggs") + " " + calStecke)));
|
||||
document.add(catPart);
|
||||
}
|
||||
|
||||
/**
|
||||
* Erstellt einen Tour Report
|
||||
* @param tourname Name der Tour die Gereportet werden soll
|
||||
*/
|
||||
public static void createTourReport(String tourname) {
|
||||
Tour tour = TourPlaner.getTour(tourname);
|
||||
tour.setLog(TourPlaner.getLogs(tourname));
|
||||
@ -49,39 +108,45 @@ public class Reporter {
|
||||
} 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("Tour Report -> " + tour.getName());
|
||||
document.addSubject("Tourplaner by DerGeorg");
|
||||
document.addKeywords("Tourplaner, Tour, Report");
|
||||
document.addAuthor("Tourplaner");
|
||||
document.addCreator("Tourplaner");
|
||||
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("Tour Report von -> " + tour.getName(), catFont);
|
||||
anchor.setName("Tour Report von -> " + tour.getName());
|
||||
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("Tour", subFont);
|
||||
Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("tour"), subFont);
|
||||
Section subCatPart = catPart.addSection(subPara);
|
||||
subCatPart.add(new Paragraph("Report erstellt von: " + System.getProperty("user.name") + ", " + new Date()));
|
||||
subCatPart.add(new Paragraph("Startpunkt der Tour: " + tour.getStart()));
|
||||
subCatPart.add(new Paragraph("Zielpunkt der Tour: " + tour.getZiel()));
|
||||
subCatPart.add(new Paragraph("Berechnete Dauer der Tour: " + tour.getDauer()));
|
||||
subCatPart.add(new Paragraph("Berechnete Strecke der Tour: " + tour.getStrecke()));
|
||||
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);
|
||||
|
||||
@ -97,127 +162,83 @@ public class Reporter {
|
||||
}
|
||||
ArrayList<Log> logs = tour.getLogs();
|
||||
// Second parameter is the number of the chapter
|
||||
anchor = new Anchor("Logs", catFont);
|
||||
anchor.setName("Logs");
|
||||
anchor = new Anchor(ConfigHelper.getLangIniString("logs"), catFont);
|
||||
anchor.setName(ConfigHelper.getLangIniString("logs"));
|
||||
catPart = new Chapter(new Paragraph(anchor), 2);
|
||||
catPart.add(new Paragraph("Anzahl der Logeinträge: " + logs.size()));
|
||||
catPart.add(new Paragraph(ConfigHelper.getLangIniString("countlog") + " " + logs.size()));
|
||||
|
||||
for (Log log: logs) {
|
||||
subPara = new Paragraph("Log vom: " + log.getDatum() , subFont);
|
||||
subPara = new Paragraph(ConfigHelper.getLangIniString("logvom") + " " + log.getDatum() , subFont);
|
||||
subCatPart = catPart.addSection(subPara);
|
||||
subCatPart.add(new Paragraph("Dauer: " + log.getDauer()));
|
||||
subCatPart.add(new Paragraph("Davon Pause: " + log.getPause()));
|
||||
subCatPart.add(new Paragraph("Davon gegangen: " + log.getGegangen()));
|
||||
subCatPart.add(new Paragraph("Berechnete Durchschnittliche Geschwindigkeit: " + log.getAvgspeed()));
|
||||
subCatPart.add(new Paragraph("Entfernung: " + log.getStrecke()));
|
||||
subCatPart.add(new Paragraph("Höhenmeter: " + log.getHightmeter()));
|
||||
subCatPart.add(new Paragraph("Bemerkung: " + log.getBemerkung()));
|
||||
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);
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
}
|
||||
private static void createTable2(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("Dauer"));
|
||||
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
|
||||
table.addCell(c1);
|
||||
|
||||
c1 = new PdfPCell(new Phrase("Davon Gegangen"));
|
||||
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
|
||||
table.addCell(c1);
|
||||
|
||||
c1 = new PdfPCell(new Phrase("Davon Pause"));
|
||||
c1.setHorizontalAlignment(Element.ALIGN_CENTER);
|
||||
table.addCell(c1);
|
||||
|
||||
c1 = new PdfPCell(new Phrase("Bemerkung"));
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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);
|
||||
//
|
||||
// }
|
||||
}
|
||||
|
@ -4,9 +4,11 @@ import org.apache.log4j.Logger;
|
||||
import tourplaner.data.DbConnect;
|
||||
import tourplaner.object.Log;
|
||||
import tourplaner.object.Tour;
|
||||
import tourplaner.ui.ProgressBar;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -38,76 +40,162 @@ public class TourPlaner{
|
||||
* @return false bei error
|
||||
*/
|
||||
public static boolean editTour(String oldname, Tour tour) throws IOException {
|
||||
ProgressBar progressBar = new ProgressBar("Edit...");
|
||||
int step = progressBar.getProgressSize(3, 100);
|
||||
FileHelper.delFile(new File(getImagePath(oldname)));
|
||||
FileHelper.delFile(new File(getImagePdfPath(oldname)));
|
||||
progressBar.addProgress(step);
|
||||
DirectionMap directionMap = new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
|
||||
progressBar.addProgress(step);
|
||||
tour.setDauer(directionMap.getDauer()+"");
|
||||
tour.setStrecke(directionMap.getStrecke());
|
||||
return new DbConnect().editTour(oldname, tour);
|
||||
boolean ret = new DbConnect().editTour(oldname, tour);
|
||||
progressBar.setProgress(100);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Löscht eine Tour
|
||||
* @param tourname Tourname
|
||||
* @return false bei error
|
||||
*/
|
||||
public static boolean delTour(String tourname){
|
||||
ProgressBar progressBar = new ProgressBar("Del...");
|
||||
int step = progressBar.getProgressSize(3, 100);
|
||||
FileHelper.delFile(new File(getImagePath(tourname)));
|
||||
progressBar.addProgress(step);
|
||||
FileHelper.delFile(new File(getImagePdfPath(tourname)));
|
||||
return new DbConnect().delTour(tourname);
|
||||
progressBar.addProgress(step);
|
||||
boolean ret = new DbConnect().delTour(tourname);
|
||||
progressBar.setProgress(100);
|
||||
return ret;
|
||||
}
|
||||
/**
|
||||
* Fügt eine Tour hinzu
|
||||
* @param newTour Neue Tour
|
||||
* @return false bei error
|
||||
*/
|
||||
public static boolean addTour(Tour newTour) throws IOException {
|
||||
public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException {
|
||||
int step = progressBar.getProgressSize(2, 100);
|
||||
DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
|
||||
progressBar.addProgress(step);
|
||||
newTour.setDauer(directionMap.getDauer()+"");
|
||||
newTour.setStrecke(directionMap.getStrecke());
|
||||
return new DbConnect().addTour(newTour);
|
||||
boolean ret = new DbConnect().addTour(newTour);
|
||||
progressBar.setProgress(100);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* Holt das Gui Bild
|
||||
* @param tourname Name der Tour
|
||||
* @return Das Bild
|
||||
* @throws IOException Error beim Bild holen
|
||||
*/
|
||||
public static Image getImage(String tourname) throws IOException {
|
||||
return FileHelper.getImage(new File(getImagePath(tourname)));
|
||||
}
|
||||
|
||||
/**
|
||||
* Path zu dem Bild für die GUI
|
||||
* @param tourname Name der Tour
|
||||
* @return Path zu dem Bild für die GUI
|
||||
*/
|
||||
public static String getImagePath(String tourname){
|
||||
return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
|
||||
}
|
||||
|
||||
/**
|
||||
* Path zu dem Bild für die PDF
|
||||
* @param tourname Name der Tour
|
||||
* @return Path zu dem Bild für die PDF
|
||||
*/
|
||||
public static String getImagePdfPath(String tourname){
|
||||
return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + "_pdf.jpg";
|
||||
}
|
||||
|
||||
/**
|
||||
* Öffnet ein Bild einer Tour
|
||||
* @param tourname Tourname
|
||||
*/
|
||||
public static void openImage(String tourname){
|
||||
if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
|
||||
FileHelper.openDefault(getImagePath(tourname));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Holt alle Logs einer Tour
|
||||
* @param tourname Tourname
|
||||
* @return Alle Logs der Tour
|
||||
*/
|
||||
public static ArrayList<Log> getLogs(String tourname){
|
||||
return new DbConnect().getLogs(tourname);
|
||||
}
|
||||
|
||||
/**
|
||||
* Führt einen Rport aus
|
||||
* @param tourname Name der Tour die gereportet wird
|
||||
*/
|
||||
public static void doReport(String tourname){
|
||||
Reporter.createTourReport(tourname);
|
||||
}
|
||||
|
||||
/**
|
||||
* Holt eine Tour
|
||||
* @param tourname Name der zu holenden Tour
|
||||
* @return Tour die geholt werden soll
|
||||
*/
|
||||
public static Tour getTour(String tourname){
|
||||
return new DbConnect().getTour(tourname);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fügt ein Log hinzu
|
||||
* @param tourname Name der Tour
|
||||
* @param log Neues Log
|
||||
* @return false bei error
|
||||
*/
|
||||
public static boolean addLog(String tourname, Log log){
|
||||
if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
|
||||
return new DbConnect().addLog(tourname, log);
|
||||
}
|
||||
|
||||
/**
|
||||
* Löscht ein Log
|
||||
* @param tourname Name der Tour
|
||||
* @param id Id des Logs
|
||||
* @return false bei error
|
||||
*/
|
||||
public static boolean delLog(String tourname, String id){
|
||||
return new DbConnect().delLog(tourname, id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Editiert ein Log
|
||||
* @param tourname Name der Tour
|
||||
* @param log Neues Log
|
||||
* @return false bei error
|
||||
*/
|
||||
public static boolean editLog(String tourname, Log log){
|
||||
if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
|
||||
return new DbConnect().editLog(tourname, log);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sucht alle touren die den gegebenen tournamen enthalten
|
||||
* @param tourname Name der zu suchen ist
|
||||
* @return Alle touren die auf den Suchterm passen
|
||||
*/
|
||||
public static ArrayList<Tour> sucheTour(String tourname){
|
||||
ArrayList<Tour> touren = new ArrayList<>();
|
||||
getAllTours().forEach(t ->{
|
||||
if(t.getName().contains(tourname)){
|
||||
touren.add(t);
|
||||
}
|
||||
});
|
||||
return touren;
|
||||
}
|
||||
|
||||
public static String getMapJson(String start, String ziel){
|
||||
// TODO: 14.04.2021 Map Quest
|
||||
return start + " " + ziel;
|
||||
}
|
||||
}
|
||||
|
@ -1,13 +1,13 @@
|
||||
package tourplaner.data;
|
||||
|
||||
import javafx.geometry.Pos;
|
||||
import tourplaner.business.LogHelper;
|
||||
import tourplaner.object.Log;
|
||||
import tourplaner.object.Tour;
|
||||
import tourplaner.ui.AlertHelper;
|
||||
import tourplaner.ui.ProgressBar;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.Date;
|
||||
import java.sql.ResultSet;
|
||||
import java.sql.Statement;
|
||||
import java.sql.*;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ArrayList;
|
||||
|
||||
@ -37,7 +37,7 @@ public class DbConnect {
|
||||
errors.add(PostgresHelper.executeUpdateMessage("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);", "Tour Table created"));
|
||||
errors.add(PostgresHelper.executeUpdateMessage("create unique index tour_tourname_uindex on tour (tourname);", "Tour Table unique created"));
|
||||
errors.add(PostgresHelper.executeUpdateMessage("alter table tour add constraint tour_pk primary key (tourname);", "Tour Table primary created"));
|
||||
errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal);", "Log Table created"));
|
||||
errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal,rating varchar);", "Log Table created"));
|
||||
return !errors.contains(false);
|
||||
}
|
||||
|
||||
@ -84,10 +84,25 @@ public class DbConnect {
|
||||
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 ;
|
||||
String id, bemerkung, rating;
|
||||
double dauer, strecke, pause, gegangen, avg, hightmeter;
|
||||
Date datum;
|
||||
|
||||
@ -98,15 +113,14 @@ public class DbConnect {
|
||||
while (rs.next()) {
|
||||
id = rs.getString("id");
|
||||
bemerkung = rs.getString("bemerkung");
|
||||
rating = rs.getString("rating");
|
||||
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));
|
||||
logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause, rating));
|
||||
}else {
|
||||
return null;
|
||||
}
|
||||
@ -130,20 +144,37 @@ public class DbConnect {
|
||||
*/
|
||||
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()+")");
|
||||
System.out.println("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
|
||||
+log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
|
||||
return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
|
||||
+log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
|
||||
}
|
||||
|
||||
public boolean editLog(String tourname, Log log){
|
||||
return PostgresHelper.executeUpdate("UPDATE public.log SET bemerkung = '"+log.getBemerkung()+"', datum = '"+log.getDatum()+"', strecke = "+log.getStrecke()+", avg = "+log.getAvgspeed()+", hightmeter = "+
|
||||
log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
|
||||
log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"', rating = '"+log.getRating()+"'");
|
||||
}
|
||||
|
||||
public boolean delLog(String tourname, String id){
|
||||
System.out.println("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
|
||||
return PostgresHelper.executeUpdate("DELETE FROM public.log WHERE tourname = '"+tourname+"' and id = '"+id+"'");
|
||||
}
|
||||
|
||||
private int getTourSize() throws SQLException {
|
||||
Connection con = PostgresHelper.con();
|
||||
Statement s = con.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE);
|
||||
ResultSet rs = s.executeQuery("SELECT COUNT(*) FROM tour;");
|
||||
int size =0;
|
||||
if (rs != null)
|
||||
{
|
||||
rs.last(); // moves cursor to the last row
|
||||
size = rs.getInt("count"); // get row id
|
||||
con.close();
|
||||
return size;
|
||||
}
|
||||
con.close();
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Holt alle Touren aus der Datenbank
|
||||
* @return Null bei fehler, sonst eine List aus den IDs
|
||||
@ -152,9 +183,11 @@ public class DbConnect {
|
||||
this.c = PostgresHelper.con();
|
||||
String tourname, mapjson, start, ziel;
|
||||
double dauer, strecke;
|
||||
|
||||
ArrayList<Tour> touren = new ArrayList<>();
|
||||
ProgressBar progressBar = new ProgressBar("Get...");
|
||||
try {
|
||||
int tourSize = getTourSize();
|
||||
int step = progressBar.getProgressSize(tourSize, 100);
|
||||
stmt = this.c.createStatement();
|
||||
ResultSet rs = stmt.executeQuery("select * from tour;");
|
||||
while (rs.next()) {
|
||||
@ -165,17 +198,21 @@ public class DbConnect {
|
||||
dauer = rs.getDouble("dauer");
|
||||
strecke = rs.getDouble("strecke");
|
||||
if (!tourname.isEmpty()) {
|
||||
touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel));
|
||||
touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname)));
|
||||
progressBar.addProgress(step);
|
||||
}else {
|
||||
progressBar.setProgress(100);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
progressBar.setProgress(100);
|
||||
rs.close();
|
||||
stmt.close();
|
||||
this.c.close();
|
||||
return touren;
|
||||
} catch (Exception e) {
|
||||
System.err.println(e.getClass().getName() + ": " + e.getMessage());
|
||||
LogHelper.error(e);
|
||||
progressBar.setProgress(100);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@ -6,11 +6,11 @@ import java.time.LocalDate;
|
||||
import java.util.Date;
|
||||
|
||||
public class Log {
|
||||
private String id, bemerkung;
|
||||
private String id, bemerkung, rating;
|
||||
private LocalDate datum;
|
||||
private double strecke, avgspeed, hightmeter, pause, dauer, gegangen;
|
||||
|
||||
public Log(String id, double dauer, LocalDate datum, double strecke, String bemerkung, double hightmeter, double pause) {
|
||||
public Log(String id, double dauer, LocalDate datum, double strecke, String bemerkung, double hightmeter, double pause, String rating) {
|
||||
this.id = id;
|
||||
this.dauer = dauer;
|
||||
this.datum = datum;
|
||||
@ -18,8 +18,20 @@ public class Log {
|
||||
this.bemerkung = bemerkung;
|
||||
this.hightmeter = hightmeter;
|
||||
this.pause = pause;
|
||||
this.rating = rating;
|
||||
this.gegangen = this.dauer - this.pause;
|
||||
this.avgspeed = this.strecke / (this.gegangen);
|
||||
this.avgspeed = this.strecke / (this.gegangen/60);
|
||||
if(Double.isInfinite(this.avgspeed)){
|
||||
this.avgspeed = -1;
|
||||
}
|
||||
}
|
||||
|
||||
public String getRating() {
|
||||
return rating;
|
||||
}
|
||||
|
||||
public void setRating(String rating) {
|
||||
this.rating = rating;
|
||||
}
|
||||
|
||||
public String getBemerkung() {
|
||||
|
@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
* Model einer Tour
|
||||
*/
|
||||
public class Tour {
|
||||
private String dauer, mapJson, name, start, ziel;
|
||||
private String dauer, mapJson, name, start, ziel, rating;
|
||||
private double strecke;
|
||||
private ArrayList<Log> log;
|
||||
|
||||
@ -21,6 +21,16 @@ public class Tour {
|
||||
this.log = new ArrayList<>();
|
||||
}
|
||||
|
||||
public Tour(String name, String dauer, String mapJson, double strecke, String start, String ziel, ArrayList<Log> logs) {
|
||||
this.dauer = dauer;
|
||||
this.mapJson = mapJson;
|
||||
this.strecke = strecke;
|
||||
this.name = name;
|
||||
this.start = start;
|
||||
this.ziel = ziel;
|
||||
this.log = logs;
|
||||
}
|
||||
|
||||
public void setTour(Tour tour){
|
||||
this.dauer = tour.getDauer();
|
||||
this.mapJson = tour.getMapJson();
|
||||
|
@ -45,21 +45,30 @@
|
||||
<menus>
|
||||
<Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
|
||||
<items>
|
||||
<MenuItem fx:id="reportsummary" mnemonicParsing="false" onAction="#reportSum" text="Report Summary" />
|
||||
<MenuItem fx:id="tourreport" mnemonicParsing="false" onAction="#tourReport" text="Tour Report" />
|
||||
<MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
|
||||
</items>
|
||||
</Menu>
|
||||
<Menu mnemonicParsing="false" text="Bearbeiten">
|
||||
<Menu fx:id="menuebearbeiten" mnemonicParsing="false" text="Bearbeiten">
|
||||
<items>
|
||||
<MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
|
||||
<MenuItem fx:id="menueimport" mnemonicParsing="false" onAction="#importBtn" text="Import" />
|
||||
<MenuItem fx:id="menueexport" mnemonicParsing="false" onAction="#exportBtn" text="Export" />
|
||||
</items>
|
||||
</Menu>
|
||||
<Menu mnemonicParsing="false" text="Optionen">
|
||||
<Menu fx:id="menueoptionen" mnemonicParsing="false" text="Optionen">
|
||||
<items>
|
||||
<MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report erstellen" />
|
||||
<MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
|
||||
<CheckMenuItem fx:id="openmap" mnemonicParsing="false" onAction="#openmapaction" text="Map automatisch öffnen" />
|
||||
<CheckMenuItem fx:id="openpdf" mnemonicParsing="false" onAction="#openpdfaction" text="Report automatisch öffnen" />
|
||||
<Menu fx:id="menuesprachen" mnemonicParsing="false" text="Sprache">
|
||||
<items>
|
||||
<RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
|
||||
<RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
|
||||
</items>
|
||||
</Menu>
|
||||
<Menu mnemonicParsing="false" text="Hilfe">
|
||||
</items>
|
||||
</Menu>
|
||||
<Menu fx:id="menuehilfe" mnemonicParsing="false" text="Hilfe">
|
||||
<items>
|
||||
<MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
|
||||
<MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
|
||||
@ -75,7 +84,7 @@
|
||||
<Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+" />
|
||||
<Label layoutX="14.0" layoutY="4.0" text="Tours" />
|
||||
<Button fx:id="tourDel" layoutX="89.0" mnemonicParsing="false" onAction="#delTour" text="-" />
|
||||
<Button layoutX="117.0" mnemonicParsing="false" onAction="#editTourBtn" text="Edit" />
|
||||
<Button fx:id="editTourBtn" layoutX="117.0" mnemonicParsing="false" onAction="#editTourBtn" text="Edit" />
|
||||
</children></AnchorPane>
|
||||
<TextField fx:id="sucheInput" promptText="Suche..." />
|
||||
<Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
|
||||
@ -124,9 +133,9 @@
|
||||
<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">
|
||||
<columns>
|
||||
<TableColumn fx:id="nameCol" maxWidth="1.7976931348623157E308" minWidth="70.0" prefWidth="-1.0" text="Tourname" />
|
||||
<TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="40.0" prefWidth="-1.0" text="Dauer" />
|
||||
<TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="50.0" prefWidth="-1.0" text="Strecke" />
|
||||
<TableColumn fx:id="nameCol" minWidth="100.0" prefWidth="-1.0" text="Tourname" />
|
||||
<TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Dauer" />
|
||||
<TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Strecke" />
|
||||
<TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Startpunk" />
|
||||
<TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Zielpunkt" />
|
||||
</columns>
|
||||
@ -164,7 +173,7 @@
|
||||
<Insets />
|
||||
</HBox.margin>
|
||||
</Button>
|
||||
<Button mnemonicParsing="false" onAction="#editLogBtn" text="Edit" />
|
||||
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn" text="Edit" />
|
||||
</children>
|
||||
<padding>
|
||||
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
|
||||
@ -176,14 +185,15 @@
|
||||
<children>
|
||||
<TableView fx:id="logTableView" onMouseClicked="#logItemSelected" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
|
||||
<columns>
|
||||
<TableColumn fx:id="logDatumCol" prefWidth="49.0" text="Datum" />
|
||||
<TableColumn fx:id="logDauerCol" prefWidth="126.0" text="Dauer" />
|
||||
<TableColumn fx:id="logStreckeCol" prefWidth="240.0" text="Entfernung" />
|
||||
<TableColumn fx:id="logAvgCol" prefWidth="75.0" text="AVG Geschwindigkeit" />
|
||||
<TableColumn fx:id="logHightCol" prefWidth="75.0" text="Höhenmeter" />
|
||||
<TableColumn fx:id="logPauseCol" prefWidth="75.0" text="Davon Pause" />
|
||||
<TableColumn fx:id="logGegangenCol" prefWidth="75.0" text="Davon Unterwegs" />
|
||||
<TableColumn fx:id="logBemerkungCol" prefWidth="75.0" text="Bemerkung" />
|
||||
<TableColumn fx:id="logDatumCol" minWidth="-1.0" prefWidth="-1.0" text="Datum" />
|
||||
<TableColumn fx:id="logDauerCol" minWidth="-1.0" prefWidth="-1.0" text="Dauer" />
|
||||
<TableColumn fx:id="logStreckeCol" minWidth="-1.0" prefWidth="-1.0" text="Entfernung" />
|
||||
<TableColumn fx:id="logAvgCol" minWidth="-1.0" prefWidth="-1.0" text="AVG Geschwindigkeit" />
|
||||
<TableColumn fx:id="logHightCol" minWidth="-1.0" prefWidth="75.0" text="Höhenmeter" />
|
||||
<TableColumn fx:id="logPauseCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Pause" />
|
||||
<TableColumn fx:id="logGegangenCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Unterwegs" />
|
||||
<TableColumn fx:id="logBemerkungCol" minWidth="-1.0" prefWidth="-1.0" text="Bemerkung" />
|
||||
<TableColumn fx:id="logRatingCol1" minWidth="-1.0" prefWidth="-1.0" text="Rating" />
|
||||
</columns>
|
||||
<columnResizePolicy>
|
||||
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
|
||||
@ -201,7 +211,7 @@
|
||||
</SplitPane>
|
||||
<HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER">
|
||||
<children>
|
||||
<Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Left status" HBox.hgrow="ALWAYS">
|
||||
<Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Tourplaner" HBox.hgrow="ALWAYS">
|
||||
<font>
|
||||
<Font size="11.0" fx:id="x3" />
|
||||
</font>
|
||||
@ -210,7 +220,7 @@
|
||||
</textFill>
|
||||
</Label>
|
||||
<AnchorPane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" />
|
||||
<Label font="$x3" maxWidth="-1.0" text="Right status" textFill="$x4" HBox.hgrow="NEVER" />
|
||||
<Label font="$x3" maxWidth="-1.0" text="Georg Reisinger" textFill="$x4" HBox.hgrow="NEVER" />
|
||||
</children>
|
||||
<padding>
|
||||
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
|
||||
|
@ -10,7 +10,13 @@ import javafx.scene.layout.*;
|
||||
import javafx.stage.Stage;
|
||||
import javafx.stage.WindowEvent;
|
||||
import tourplaner.business.ConfigHelper;
|
||||
import tourplaner.business.EinheitenAdder;
|
||||
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.TitledBorder;
|
||||
import javax.swing.event.ChangeEvent;
|
||||
import javax.swing.event.ChangeListener;
|
||||
import java.awt.*;
|
||||
import java.io.PrintWriter;
|
||||
import java.io.StringWriter;
|
||||
import java.time.LocalDate;
|
||||
@ -229,4 +235,24 @@ public class AlertHelper {
|
||||
stage.showAndWait();
|
||||
return selectedDate.get();
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* File Auswahl
|
||||
* @param btn Text des Speichern/Öffnen Btn
|
||||
* @return String des Files, bei error null
|
||||
*/
|
||||
public static String fileChooser(String btn){
|
||||
// JFileChooser-Objekt erstellen
|
||||
JFileChooser chooser = new JFileChooser();
|
||||
// Dialog zum Oeffnen von Dateien anzeigen
|
||||
int rueckgabeWert = chooser.showDialog(null, btn);
|
||||
|
||||
/* Abfrage, ob auf "Öffnen" geklickt wurde */
|
||||
if(rueckgabeWert == JFileChooser.APPROVE_OPTION)
|
||||
{
|
||||
return chooser.getSelectedFile().getAbsolutePath();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
66
src/tourplaner/ui/ProgressBar.java
Normal file
66
src/tourplaner/ui/ProgressBar.java
Normal file
@ -0,0 +1,66 @@
|
||||
package tourplaner.ui;
|
||||
|
||||
import javafx.scene.image.Image;
|
||||
import tourplaner.business.ConfigHelper;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.swing.*;
|
||||
import javax.swing.border.TitledBorder;
|
||||
import java.awt.*;
|
||||
import java.awt.image.BufferedImage;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
public class ProgressBar {
|
||||
private int status;
|
||||
private JFrame frame;
|
||||
private JProgressBar progressBar;
|
||||
|
||||
public ProgressBar(String title){
|
||||
this.frame = new JFrame(title);
|
||||
File pathToFile = new File(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "start", "logo"));
|
||||
try {
|
||||
BufferedImage image = ImageIO.read(pathToFile);
|
||||
this.frame.setIconImage(image);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
this.frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
|
||||
Container content = this.frame.getContentPane();
|
||||
this.progressBar = new JProgressBar();
|
||||
this.progressBar.setValue(0);
|
||||
this.progressBar.setStringPainted(true);
|
||||
TitledBorder border = BorderFactory.createTitledBorder("Laden....");
|
||||
this.progressBar.setBorder(border);
|
||||
content.add(this.progressBar, BorderLayout.NORTH);
|
||||
this.frame.setSize(300, 100);
|
||||
this.frame.setVisible(true);
|
||||
}
|
||||
|
||||
public void addProgress(int add){
|
||||
this.status += add;
|
||||
this.progressBar.setValue(this.status);
|
||||
closeOnFinish();
|
||||
}
|
||||
|
||||
private void closeOnFinish(){
|
||||
if(this.status >= 100){
|
||||
closeProgress();
|
||||
}
|
||||
}
|
||||
|
||||
public void setProgress(int set){
|
||||
this.status = set;
|
||||
closeOnFinish();
|
||||
}
|
||||
|
||||
public void closeProgress(){
|
||||
this.frame.setVisible(false);
|
||||
}
|
||||
|
||||
public int getProgressSize(int todo, int maxLevel){
|
||||
int steps = (progressBar.getValue() - maxLevel) / todo;
|
||||
if(steps < 0) steps = steps*-1;
|
||||
return steps;
|
||||
}
|
||||
}
|
@ -1,10 +1,10 @@
|
||||
package tourplaner.ui;
|
||||
|
||||
import javafx.collections.ObservableList;
|
||||
import javafx.fxml.FXML;
|
||||
import javafx.fxml.Initializable;
|
||||
import javafx.geometry.Orientation;
|
||||
import javafx.scene.control.*;
|
||||
import javafx.scene.control.Button;
|
||||
import javafx.scene.control.Label;
|
||||
import javafx.scene.control.TextField;
|
||||
import javafx.scene.control.cell.PropertyValueFactory;
|
||||
@ -12,20 +12,13 @@ import javafx.scene.image.ImageView;
|
||||
import javafx.scene.input.MouseEvent;
|
||||
import tourplaner.business.ConfigHelper;
|
||||
import tourplaner.business.LogHelper;
|
||||
import tourplaner.business.TourPlaner;
|
||||
import tourplaner.object.Log;
|
||||
import tourplaner.object.Tour;
|
||||
import tourplaner.viewmodels.ViewModel;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.IOException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.time.LocalDate;
|
||||
import java.util.ResourceBundle;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.atomic.AtomicReference;
|
||||
|
||||
public class TourplanerController implements Initializable {
|
||||
//VM
|
||||
@ -41,7 +34,27 @@ public class TourplanerController implements Initializable {
|
||||
public ImageView mapImageView;
|
||||
//Log -> rechts unten
|
||||
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, logRatingCol1;
|
||||
//Menue
|
||||
public CheckMenuItem openmap, openpdf;
|
||||
public RadioMenuItem langenglisch, langdeutsch;
|
||||
private ToggleGroup langgroup;
|
||||
public Menu menueFile, menuebearbeiten, menueoptionen, menuesprachen, menuehilfe;
|
||||
public MenuItem reportsummary, tourreport, beendenButton;
|
||||
//Elemente
|
||||
public Button sucheButton, editBtn, editTourBtn;
|
||||
|
||||
@FXML
|
||||
private void onlangenglisch(){
|
||||
ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langen");
|
||||
langToFxml();
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void onlangdeutsch(){
|
||||
ConfigHelper.setIniString(ConfigHelper.getStandartConfig(), "lang", "lang", "langde");
|
||||
langToFxml();
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void tourReport(){
|
||||
@ -92,17 +105,18 @@ public class TourplanerController implements Initializable {
|
||||
}
|
||||
|
||||
private void syncTour(String selectedItem){
|
||||
beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
|
||||
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().removeIf(s -> true);
|
||||
logTableView.getItems().clear();
|
||||
logTableView.setItems(this.viewModel.getLogData());
|
||||
}
|
||||
|
||||
@ -113,10 +127,13 @@ public class TourplanerController implements Initializable {
|
||||
*/
|
||||
@FXML
|
||||
private void tourListSelectedItem(MouseEvent mouseEvent){
|
||||
ProgressBar progressBar = new ProgressBar("Tour auswählen...");
|
||||
String selectedItem = TourListView.getSelectionModel().getSelectedItem();
|
||||
this.viewModel.selectTour(selectedItem);
|
||||
titleTextView.setText(selectedItem);
|
||||
progressBar.addProgress(10);
|
||||
syncTour(selectedItem);
|
||||
progressBar.addProgress(10);
|
||||
startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
|
||||
zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
|
||||
dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
|
||||
@ -125,8 +142,10 @@ public class TourplanerController implements Initializable {
|
||||
|
||||
//Log anzeigen
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
|
||||
logTableView.getItems().removeIf(s -> true);
|
||||
logTableView.getItems().clear();
|
||||
progressBar.addProgress(10);
|
||||
logTableView.setItems(this.viewModel.getLogData());
|
||||
progressBar.addProgress(10);
|
||||
logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
|
||||
logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
|
||||
logDatumCol.setCellValueFactory(new PropertyValueFactory<Log, String>("datum"));
|
||||
@ -135,8 +154,17 @@ public class TourplanerController implements Initializable {
|
||||
logPauseCol.setCellValueFactory(new PropertyValueFactory<Log, String>("pause"));
|
||||
logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
|
||||
logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
|
||||
|
||||
logRatingCol1.setCellValueFactory(new PropertyValueFactory<Log, String>("rating"));
|
||||
progressBar.addProgress(10);
|
||||
mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
|
||||
if(this.viewModel.isSucheAktiv()){
|
||||
this.viewModel.setSucheAktiv(false);
|
||||
progressBar.addProgress(10);
|
||||
syncTourNamen();
|
||||
progressBar.setProgress(100);
|
||||
this.sucheInput.setText("");
|
||||
}
|
||||
progressBar.setProgress(100);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -154,8 +182,7 @@ public class TourplanerController implements Initializable {
|
||||
*/
|
||||
@FXML
|
||||
private void addTour(){
|
||||
this.viewModel.addTour();
|
||||
this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
|
||||
if(this.viewModel.addTour()) this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -164,7 +191,7 @@ public class TourplanerController implements Initializable {
|
||||
*/
|
||||
@FXML
|
||||
private void delTour(){
|
||||
this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
|
||||
this.beschreibungTableView.getItems().clear(); //löscht alles aus der tabelle
|
||||
this.titleTextView.setText(ConfigHelper.getLangIniString("keinetourselected"));
|
||||
this.viewModel.delTour();
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||
@ -177,7 +204,10 @@ public class TourplanerController implements Initializable {
|
||||
*/
|
||||
@FXML
|
||||
private void suche(){
|
||||
ProgressBar progressBar = new ProgressBar("Suche");
|
||||
this.viewModel.suche(this.sucheInput.getText());
|
||||
progressBar.addProgress(100);
|
||||
progressBar.closeProgress();
|
||||
}
|
||||
|
||||
/**
|
||||
@ -216,12 +246,105 @@ public class TourplanerController implements Initializable {
|
||||
TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
|
||||
TourListView.setOrientation(Orientation.VERTICAL);
|
||||
syncTourNamen();
|
||||
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"));
|
||||
|
||||
this.logRatingCol1.setText("Rating");
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void openpdfaction(){
|
||||
int selected = 0;
|
||||
if(this.openpdf.isSelected()) selected = 1;
|
||||
ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf", selected);
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void openmapaction(){
|
||||
int selected = 0;
|
||||
if(this.openmap.isSelected()) selected = 1;
|
||||
ConfigHelper.setIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap", selected);
|
||||
}
|
||||
|
||||
private void deselectAll(){
|
||||
//Tabs zu Tour -> rechts oben
|
||||
beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||
titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));
|
||||
//Log -> rechts unten
|
||||
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void exportBtn(){
|
||||
this.viewModel.exportData();
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void importBtn(){
|
||||
deselectAll();
|
||||
this.viewModel.importData();
|
||||
syncTourNamen();
|
||||
}
|
||||
|
||||
@FXML
|
||||
private void reportSum(){
|
||||
this.viewModel.sumReport();
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -3,12 +3,11 @@ package tourplaner.viewmodels;
|
||||
import javafx.collections.FXCollections;
|
||||
import javafx.collections.ObservableList;
|
||||
import javafx.scene.image.Image;
|
||||
import tourplaner.business.TourPlaner;
|
||||
import tourplaner.business.*;
|
||||
import tourplaner.ui.AlertHelper;
|
||||
import tourplaner.business.ConfigHelper;
|
||||
import tourplaner.business.LogHelper;
|
||||
import tourplaner.object.Log;
|
||||
import tourplaner.object.Tour;
|
||||
import tourplaner.ui.ProgressBar;
|
||||
|
||||
import java.awt.*;
|
||||
import java.io.IOException;
|
||||
@ -23,13 +22,14 @@ import java.util.concurrent.atomic.AtomicReference;
|
||||
public class ViewModel {
|
||||
//Tour
|
||||
private final ObservableList<Tour> tourData = FXCollections.observableArrayList();
|
||||
private final ObservableList<String> tourNamen = FXCollections.observableArrayList();
|
||||
private ObservableList<String> tourNamen = FXCollections.observableArrayList();
|
||||
private Tour selectedTour;
|
||||
private String neueTourName, neueTourStart, neueTourZiel, neueBemerkung;
|
||||
//Log
|
||||
private final ObservableList<Log> logData = FXCollections.observableArrayList();
|
||||
private Log selectedLog;
|
||||
|
||||
// Suche
|
||||
private boolean sucheAktiv;
|
||||
|
||||
|
||||
public Image getImage(String tourname){
|
||||
@ -79,9 +79,10 @@ public class ViewModel {
|
||||
|
||||
/**
|
||||
* Input mit duplications check des Namens und ohne content im input feld
|
||||
* @return false beim schließen
|
||||
*/
|
||||
private void tourNameInput(){
|
||||
tourNameInputDuplicatCheck("", true);
|
||||
private boolean tourNameInput(){
|
||||
return tourNameInputDuplicatCheck("", true);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -152,24 +153,31 @@ public class ViewModel {
|
||||
/**
|
||||
* Fügt eine neue Tour hinzu
|
||||
*/
|
||||
public void addTour(){
|
||||
tourNameInput();
|
||||
tourStartInput("");
|
||||
tourZielInput("");
|
||||
public boolean addTour(){
|
||||
if(tourNameInput()) {
|
||||
if(tourStartInput("")) {
|
||||
if (tourZielInput("")) {
|
||||
if (getTour(this.neueTourName) == null) {
|
||||
ProgressBar progressBar = new ProgressBar("Add Tour...");
|
||||
Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
|
||||
tourData.add(newTour);
|
||||
tourNamen.add(this.neueTourName);
|
||||
this.selectedTour = newTour;
|
||||
progressBar.addProgress(10);
|
||||
try {
|
||||
TourPlaner.addTour(newTour);
|
||||
TourPlaner.addTour(newTour, progressBar);
|
||||
} catch (IOException e) {
|
||||
e.printStackTrace();
|
||||
LogHelper.error(e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}else return false;
|
||||
}else return false;
|
||||
}else return false;
|
||||
this.neueTourStart = null;
|
||||
this.neueTourZiel = null;
|
||||
this.neueTourName = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
private boolean keineTourSelected(){
|
||||
@ -187,6 +195,9 @@ public class ViewModel {
|
||||
* Bearbeitet einen gewählten Log eintrag
|
||||
*/
|
||||
public void editLog(){
|
||||
System.out.println(this.selectedLog);
|
||||
if(this.selectedTour != null) {
|
||||
if(this.selectedLog != null) {
|
||||
AtomicReference<Tour> tourAkt = new AtomicReference<>();
|
||||
AtomicReference<Log> logAkt = new AtomicReference<>();
|
||||
this.tourData.forEach(tourd -> {
|
||||
@ -202,21 +213,24 @@ public class ViewModel {
|
||||
double dauer = dauerInput(this.selectedLog.getDauer());
|
||||
double strecke = -1;
|
||||
double pause = -1.0;
|
||||
double rating = -1.0;
|
||||
double hightmeter = -1.0;
|
||||
boolean bemerkung = false;
|
||||
LocalDate datum = null;
|
||||
if (dauer >= 0) {
|
||||
strecke = streckeInput(this.selectedLog.getStrecke() + "");
|
||||
if (strecke >= 0) {
|
||||
pause = pauseInput("");
|
||||
pause = pauseInput(this.selectedLog.getPause() + "");
|
||||
if (pause >= 0.0) {
|
||||
hightmeter = hightmeterInput("");
|
||||
hightmeter = hightmeterInput(this.selectedLog.getHightmeter() + "");
|
||||
if (hightmeter >= 0.0) {
|
||||
bemerkung = bemerkungInput("");
|
||||
bemerkung = bemerkungInput(this.selectedLog.getBemerkung());
|
||||
if (bemerkung) {
|
||||
datum = dateInput(this.selectedLog.getDatum());
|
||||
if (datum != null) {
|
||||
Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause);
|
||||
rating = ratingInput(this.selectedLog.getRating());
|
||||
if(rating >= 0.0) {
|
||||
Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause, rating + "");
|
||||
this.logData.removeIf(ld -> ld.getId().equals(this.selectedLog.getId()));
|
||||
this.logData.add(newLog);
|
||||
// tourAkt.get().delLog(this.selectedLog.getId());
|
||||
@ -230,6 +244,15 @@ public class ViewModel {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}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;
|
||||
}
|
||||
|
||||
@ -260,6 +283,30 @@ public class ViewModel {
|
||||
ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
|
||||
}
|
||||
|
||||
/**
|
||||
* Eingabe des Ratings bis sie korrekt ist
|
||||
* @param content Wenn der Content -1.0 ist, wird er nicht in das input feld eingeschleust, sonst schon
|
||||
* @return Die eingegebene des Ratings
|
||||
*/
|
||||
private double ratingInput(String content){
|
||||
String realcontent = "";
|
||||
if (!content.isEmpty()){
|
||||
realcontent = content + "";
|
||||
}
|
||||
double input = -1;
|
||||
while(input <= 0) {
|
||||
input = AlertHelper.inputNumber(ConfigHelper.getLangIniString("bewertung"),
|
||||
ConfigHelper.getLangIniString("bewertungmsg"),
|
||||
ConfigHelper.getLangIniString("bewertung") +
|
||||
ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
|
||||
if(input < 0 && input > 5){
|
||||
input = -1;
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("bewertungeror"), ConfigHelper.getLangIniString("bewertungeror2"));
|
||||
}
|
||||
}
|
||||
return input;
|
||||
}
|
||||
|
||||
/**
|
||||
* Datum eingabe bis diese Korrekt ist
|
||||
* @return Das eingegebene korekte Datum
|
||||
@ -321,6 +368,7 @@ public class ViewModel {
|
||||
double dauer = dauerInput(-1.0);
|
||||
double strecke, pause, hightmeter;
|
||||
boolean bemerkung = false;
|
||||
double rating = -1.0;
|
||||
LocalDate date = null;
|
||||
if(dauer >= 0) {
|
||||
strecke = streckeInput("");
|
||||
@ -333,7 +381,9 @@ public class ViewModel {
|
||||
if (bemerkung){
|
||||
date = dateInput(LocalDate.now());
|
||||
if (date != null) {
|
||||
Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause);
|
||||
rating = ratingInput("");
|
||||
if(rating >= 0.0) {
|
||||
Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause, rating + "");
|
||||
this.logData.add(newLog);
|
||||
TourPlaner.addLog(this.selectedTour.getName(), newLog);
|
||||
s.addLog(newLog);
|
||||
@ -344,6 +394,7 @@ public class ViewModel {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
this.neueBemerkung = null;
|
||||
}
|
||||
@ -398,8 +449,8 @@ public class ViewModel {
|
||||
}
|
||||
|
||||
public ObservableList<Log> getLogData() {
|
||||
logData.removeAll();
|
||||
logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
|
||||
logData.removeIf(s -> true);
|
||||
if(this.selectedTour != null) logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
|
||||
return logData;
|
||||
}
|
||||
|
||||
@ -458,7 +509,7 @@ public class ViewModel {
|
||||
getTourData().forEach(s -> {
|
||||
namen.add(s.getName());
|
||||
});
|
||||
tourNamen.removeAll();
|
||||
tourNamen.clear();
|
||||
tourNamen.addAll(namen);
|
||||
return tourNamen;
|
||||
}
|
||||
@ -480,9 +531,11 @@ public class ViewModel {
|
||||
}
|
||||
|
||||
public ObservableList<Tour> getTourData() {
|
||||
tourData.removeAll();
|
||||
// ObservableList<Tour> data = ;
|
||||
tourData.addAll(TourPlaner.getAllTours());
|
||||
tourData.clear();
|
||||
ArrayList<Tour> touren = TourPlaner.getAllTours();
|
||||
if(touren != null) {
|
||||
tourData.addAll(touren);
|
||||
}
|
||||
return tourData;
|
||||
}
|
||||
|
||||
@ -490,16 +543,18 @@ public class ViewModel {
|
||||
* Entfernt eine Tour anhand der ausgewählten Tour
|
||||
*/
|
||||
public void delTour(){
|
||||
try {
|
||||
if (this.selectedTour != null) {
|
||||
String tourname = this.selectedTour.getName();
|
||||
try {
|
||||
tourData.removeIf(s -> s.getName().equals(tourname));
|
||||
tourNamen.removeIf(s -> s.equals(tourname));
|
||||
logData.removeIf(s -> true);
|
||||
setSelectedTour(null);
|
||||
TourPlaner.delTour(tourname);
|
||||
setSelectedTour(null);
|
||||
} catch (NullPointerException e) {
|
||||
LogHelper.error(ConfigHelper.getLangIniString("keinetourselected"),
|
||||
ConfigHelper.getLangIniString("deltournoselect"));
|
||||
LogHelper.error(e);
|
||||
}
|
||||
}else {
|
||||
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
|
||||
ConfigHelper.getLangIniString("keinetourselected"),
|
||||
ConfigHelper.getLangIniString("deltournoselectmsg"));
|
||||
@ -516,7 +571,20 @@ public class ViewModel {
|
||||
ConfigHelper.getLangIniString("suchfeldleer"),
|
||||
ConfigHelper.getLangIniString("suchtextzuerst"));
|
||||
}
|
||||
// TODO: 19.03.2021 Suchlogik
|
||||
ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput);
|
||||
tourNamen.clear();
|
||||
for (Tour tour:result) {
|
||||
tourNamen.add(tour.getName());
|
||||
}
|
||||
this.sucheAktiv = true;
|
||||
}
|
||||
|
||||
public boolean isSucheAktiv() {
|
||||
return sucheAktiv;
|
||||
}
|
||||
|
||||
public void setSucheAktiv(boolean sucheAktiv) {
|
||||
this.sucheAktiv = sucheAktiv;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -583,4 +651,37 @@ public class ViewModel {
|
||||
TourPlaner.doReport(this.selectedTour.getName());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Exportiert alle daten in ein File das hier gewählt wird
|
||||
*/
|
||||
public void exportData(){
|
||||
String file = AlertHelper.fileChooser("Exportiere");
|
||||
if(file != null){
|
||||
try {
|
||||
new Exporter(file).doExport();
|
||||
} catch (IOException e) {
|
||||
AlertHelper.error("Error", "Export Error", "Fehler beim Exportieren");
|
||||
LogHelper.error(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Importiert alle daten von einem File das hier gewählt wird
|
||||
*/
|
||||
public void importData() {
|
||||
String file = AlertHelper.fileChooser("Importiere");
|
||||
if (file != null){
|
||||
this.tourNamen = FXCollections.observableArrayList();
|
||||
new Exporter(file).doImport();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Erstellt einen Summary Report
|
||||
*/
|
||||
public void sumReport(){
|
||||
Reporter.sumReport();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user