Settings -> Deutsch/Englisch verbessert/erweitert

Setting -> Deutsch / Englisch
Map/Report automatisch öffnen einstellung
2021-04-17 22:40:36 +02:00 · 2021-04-17 18:43:24 +02:00 · 2021-04-17 18:17:51 +02:00 · 2021-04-17 18:00:55 +02:00 · 2021-04-17 17:52:36 +02:00
13 changed files with 447 additions and 153 deletions
--- a/conf.ini.sample
+++ b/conf.ini.sample
@ -6,6 +6,10 @@ logo = logo.png
 [lang]
 lang = langde

+[settings]
+openpdf = 1
+openmap = 0
+
 [db]
 dbname = tourplaner
 url =
--- a/langde.ini
+++ b/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
@ -60,3 +60,37 @@ 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
--- a/langen.ini
+++ b/langen.ini
@ -0,0 +1,97 @@
+[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
--- a/src/tourplaner/business/ConfigHelper.java
+++ b/src/tourplaner/business/ConfigHelper.java
@ -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);
        }
    }

--- a/src/tourplaner/business/DirectionMap.java
+++ b/src/tourplaner/business/DirectionMap.java
@ -31,8 +31,10 @@ 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
@ -68,7 +70,10 @@ public class DirectionMap {
     * @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"));
    }
--- a/src/tourplaner/business/Exporter.java
+++ b/src/tourplaner/business/Exporter.java
@ -31,7 +31,7 @@ public class Exporter {
     * @throws IOException Fehler beim File erstellen
     */
    public void doExport() throws IOException {
-        ProgressBar progressBar = new ProgressBar("Exportieren");
+        ProgressBar progressBar = new ProgressBar("Export...");
        int step = progressBar.getProgressSize(4, 100);
        ArrayList<Tour> data = new DbConnect().getAllTouren();
        progressBar.addProgress(step);
@ -40,7 +40,7 @@ public class Exporter {
        JsonHelper.getJsonFromObj(data, fileWriter);
        progressBar.addProgress(step);
        BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
-        progressBar.addProgress(step);
+        progressBar.setProgress(100);
        bufferedWriter.close();
    }

@ -48,11 +48,11 @@ public class Exporter {
     * Führt den Imput aus -> File holen, Daten in db erstellen
     * @throws IOException Fehler beim File öffnen
     */
-    public void doImport() throws IOException {
+    public void doImport() {
+        ProgressBar progressBar = new ProgressBar("Import...");
+        try {
            this.touren = JsonHelper.getTourenFromJson(new FileReader(this.path));
-        ProgressBar progressBar = new ProgressBar("Importiere Daten");
            DbConnect dbConnect = new DbConnect();
-        progressBar.addProgress(5);
            dbConnect.delAllData();
            progressBar.addProgress(5);
            int size = progressBar.getProgressSize(this.touren.size() * 3, 100);
@ -67,6 +67,10 @@ public class Exporter {
                }
                progressBar.addProgress(size);
            }
-        progressBar.addProgress(size);
+        } catch (IOException e) {
+            LogHelper.error(e);
+            progressBar.setProgress(100);
+        }
+        progressBar.setProgress(100);
    }
 }
--- a/src/tourplaner/business/Reporter.java
+++ b/src/tourplaner/business/Reporter.java
@ -53,8 +53,10 @@ 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);
        }
+    }

    /**
     * Content des Sumary reports
@ -109,8 +111,10 @@ 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
--- a/src/tourplaner/business/TourPlaner.java
+++ b/src/tourplaner/business/TourPlaner.java
@ -4,6 +4,7 @@ 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;
@ -39,12 +40,18 @@ 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;
    }

    /**
@ -53,20 +60,30 @@ public class TourPlaner{
     * @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;
    }

    /**
@ -102,8 +119,10 @@ public class TourPlaner{
     * @param tourname Tourname
     */
    public static void openImage(String tourname){
+        if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openmap") == 1) {
            FileHelper.openDefault(getImagePath(tourname));
        }
+    }


    /**
@ -164,17 +183,6 @@ public class TourPlaner{
        return new DbConnect().editLog(tourname, log);
    }

-    /**
-     * Exportiert die Daten
-     * @param path Path zu den Daten
-     * @throws IOException Fehler beim schreiben der Daten
-     */
-    public static void exportData(String path) throws IOException {
-            Exporter exporter = new Exporter(path);
-            exporter.doExport();
-            FileHelper.openDefault(path);
-    }
-
    /**
     * Sucht alle touren die den gegebenen tournamen enthalten
     * @param tourname Name der zu suchen ist
--- a/src/tourplaner/data/DbConnect.java
+++ b/src/tourplaner/data/DbConnect.java
@ -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;

@ -155,10 +155,25 @@ public class DbConnect {
    }

    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
@ -167,9 +182,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()) {
@ -181,16 +198,20 @@ public class DbConnect {
                strecke = rs.getDouble("strecke");
                if (!tourname.isEmpty()) {
                    touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname)));
+                    progressBar.addProgress(step);
                }else {
+                    progressBar.setProgress(100);
                    return null;
                }
            }
+            progressBar.setProgress(100);
            rs.close();
            stmt.close();
            this.c.close();
            return touren;
        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
+            LogHelper.error(e);
+            progressBar.setProgress(100);
            return null;
        }
    }
--- a/src/tourplaner/tourplaner.fxml
+++ b/src/tourplaner/tourplaner.fxml
@ -45,31 +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" />
-                  <MenuItem mnemonicParsing="false" onAction="#reportSum" text="Report alles" />
-                  <MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report erstellen" />
          </items>
        </Menu>
-        <Menu mnemonicParsing="false" text="Bearbeiten">
+        <Menu fx:id="menuebearbeiten" mnemonicParsing="false" text="Bearbeiten">
               <items>
-                  <MenuItem mnemonicParsing="false" onAction="#importBtn" text="Import" />
-                  <MenuItem mnemonicParsing="false" onAction="#exportBtn" text="Export" />
+                  <MenuItem fx:id="menueimport" mnemonicParsing="false" onAction="#importBtn" text="Import" />
+                  <MenuItem fx:id="menueexport" mnemonicParsing="false" onAction="#exportBtn" text="Export" />
               </items>
        </Menu>
-            <Menu mnemonicParsing="false" text="Optionen">
+            <Menu fx:id="menueoptionen" mnemonicParsing="false" text="Optionen">
               <items>
-                  <MenuItem mnemonicParsing="false" onAction="#nimpButton" text="Keine Funktion" />
-                  <CheckMenuItem mnemonicParsing="false" text="Map automatisch öffnen" />
-                  <CheckMenuItem mnemonicParsing="false" text="Report automatisch öffnen" />
-                  <Menu mnemonicParsing="false" text="Sprache">
+                  <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 mnemonicParsing="false" text="Deutsch" />
-                        <RadioMenuItem mnemonicParsing="false" text="Englisch" />
+                        <RadioMenuItem fx:id="langdeutsch" mnemonicParsing="false" onAction="#onlangdeutsch" text="Deutsch" />
+                        <RadioMenuItem fx:id="langenglisch" mnemonicParsing="false" onAction="#onlangenglisch" text="Englisch" />
                    </items>
                  </Menu>
               </items>
            </Menu>
-        <Menu mnemonicParsing="false" text="Hilfe">
+        <Menu fx:id="menuehilfe" mnemonicParsing="false" text="Hilfe">
          <items>
            <MenuItem mnemonicParsing="false" onAction="#gitWebBrowser" text="Git Repo" />
                  <MenuItem mnemonicParsing="false" onAction="#javaDocBrowser" text="JavaDoc" />
@ -85,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" />
@ -174,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" />
--- a/src/tourplaner/ui/ProgressBar.java
+++ b/src/tourplaner/ui/ProgressBar.java
@ -1,8 +1,15 @@
 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;
@ -11,6 +18,13 @@ public class 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();
@ -25,11 +39,19 @@ public class ProgressBar {

    public void addProgress(int add){
        this.status += add;
-        System.out.println("PROGRESS: " + this.status);
        this.progressBar.setValue(this.status);
-        if(this.status == 100){
-            frame.setVisible(false);
+        closeOnFinish();
    }
+
+    private void closeOnFinish(){
+        if(this.status >= 100){
+            closeProgress();
+        }
+    }
+
+    public void setProgress(int set){
+        this.status = set;
+        closeOnFinish();
    }

    public void closeProgress(){
@ -39,7 +61,6 @@ public class ProgressBar {
    public int getProgressSize(int todo, int maxLevel){
        int steps = (progressBar.getValue() - maxLevel) / todo;
        if(steps < 0) steps = steps*-1;
-        System.out.println("STEPS: " + steps);
        return steps;
    }
 }
--- a/src/tourplaner/ui/TourplanerController.java
+++ b/src/tourplaner/ui/TourplanerController.java
@ -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,21 +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 javax.swing.*;
-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
@ -43,6 +35,26 @@ public class TourplanerController implements Initializable {
    //Log -> rechts unten
    public TableView<Log> logTableView;
    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
    private void tourReport(){
@ -169,8 +181,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()));
    }

    /**
@ -235,7 +246,76 @@ public class TourplanerController implements Initializable {
        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"));
+    }
+
+    @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(){
--- a/src/tourplaner/viewmodels/ViewModel.java
+++ b/src/tourplaner/viewmodels/ViewModel.java
@ -7,10 +7,9 @@ import tourplaner.business.*;
 import tourplaner.ui.AlertHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.ProgressBar;

-import javax.swing.*;
 import java.awt.*;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@ -80,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);
    }

    /**
@ -153,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(){
@ -188,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 -> {
@ -209,11 +219,11 @@ public class ViewModel {
                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) {
@ -231,6 +241,14 @@ 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;
    }

@ -400,7 +418,7 @@ public class ViewModel {

    public ObservableList<Log> getLogData() {
        logData.removeAll();
-        logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
+        if(this.selectedLog != null) logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
        return logData;
    }

@ -482,7 +500,10 @@ public class ViewModel {

    public ObservableList<Tour> getTourData() {
        tourData.clear();
-        tourData.addAll(TourPlaner.getAllTours());
+        ArrayList<Tour> touren = TourPlaner.getAllTours();
+        if(touren != null) {
+            tourData.addAll(touren);
+        }
        return tourData;
    }

@ -490,16 +511,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"));
@ -602,7 +625,6 @@ public class ViewModel {
     */
    public void exportData(){
        String file = AlertHelper.fileChooser("Exportiere");
-        System.out.println("EXPORT: " + file);
        if(file != null){
            try {
                new Exporter(file).doExport();
@ -619,13 +641,8 @@ public class ViewModel {
    public void importData() {
        String file = AlertHelper.fileChooser("Importiere");
        if (file != null){
-            try {
            this.tourNamen = FXCollections.observableArrayList();
            new Exporter(file).doImport();
-            } catch (IOException e) {
-                AlertHelper.error("Error", "Import Error", "Fehler beim Importieren");
-                LogHelper.error(e);
-            }
        }
    }
Author	SHA1	Message	Date
Georg-Notebook	9d010d452c	Settings -> Deutsch/Englisch verbessert/erweitert	2021-04-17 22:40:36 +02:00
Georg-Notebook	58e94e6cbd	Setting -> Deutsch / Englisch	2021-04-17 18:43:24 +02:00
Georg-Notebook	63e736152b	Map/Report automatisch öffnen einstellung	2021-04-17 18:17:51 +02:00
Georg-Notebook	ad5d7d98c4	Progressbar Icon	2021-04-17 18:00:55 +02:00
Georg-Notebook	d8c4680e16	Progressbar Bugfixes	2021-04-17 17:52:36 +02:00