Progressbar Bugfixes

src/tourplaner/business/DirectionMap.java

@@ -68,7 +68,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"));
     }

src/tourplaner/business/Exporter.java

@@ -3,7 +3,10 @@ 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;
 
@@ -28,10 +31,16 @@ public class Exporter {
      * @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(path + ".json");
+        progressBar.addProgress(step);
         JsonHelper.getJsonFromObj(data, fileWriter);
+        progressBar.addProgress(step);
         BufferedWriter bufferedWriter = new BufferedWriter(fileWriter);
+        progressBar.setProgress(100);
         bufferedWriter.close();
     }
 
@@ -39,17 +48,29 @@ 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 {
-        this.touren = JsonHelper.getTourenFromJson(new FileReader(this.path));
-        DbConnect dbConnect = new DbConnect();
-        dbConnect.delAllData();
-        for (Tour tour:this.touren) {
-            new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
-            dbConnect.addTour(tour);
-            ArrayList<Log> logs = tour.getLogs();
-            for (Log log:logs) {
-                dbConnect.addLog(tour.getName(), log);
+    public void doImport() {
+        ProgressBar progressBar = new ProgressBar("Import...");
+        try {
+            this.touren = JsonHelper.getTourenFromJson(new FileReader(this.path));
+            DbConnect dbConnect = new DbConnect();
+            dbConnect.delAllData();
+            progressBar.addProgress(5);
+            int size = progressBar.getProgressSize(this.touren.size() * 3, 100);
+            for (Tour tour:this.touren) {
+                    new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
+                progressBar.addProgress(size);
+                dbConnect.addTour(tour);
+                progressBar.addProgress(size);
+                ArrayList<Log> logs = tour.getLogs();
+                for (Log log:logs) {
+                    dbConnect.addLog(tour.getName(), log);
+                }
+                progressBar.addProgress(size);
             }
+        } catch (IOException e) {
+            LogHelper.error(e);
+            progressBar.setProgress(100);
         }
+        progressBar.setProgress(100);
     }
 }

src/tourplaner/business/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;
     }
 
     /**

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,21 +155,38 @@ 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
      */
-    public ArrayList<Tour> getAllTouren(){
+    public ArrayList<Tour> getAllTouren() {
         this.c = PostgresHelper.con();
         String tourname, mapjson, start, ziel;
         double dauer, strecke;
-
         ArrayList<Tour> touren = new ArrayList<>();
+        ProgressBar progressBar = new ProgressBar("Get...");
         try {
+            int tourSize = getTourSize();
+            int step =  progressBar.getProgressSize(tourSize, 100);
             stmt = this.c.createStatement();
             ResultSet rs = stmt.executeQuery("select * from tour;");
             while (rs.next()) {
@@ -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;
         }
     }

src/tourplaner/tourplaner.fxml

@@ -45,6 +45,8 @@
       <menus>
         <Menu fx:id="menueFile" mnemonicParsing="false" text="Datei">
           <items>
+                  <MenuItem mnemonicParsing="false" onAction="#reportSum" text="Report Summary" />
+                  <MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report" />
             <MenuItem fx:id="beendenButton" mnemonicParsing="false" onAction="#quitApp" text="Beenden" />
           </items>
         </Menu>
@@ -52,13 +54,18 @@
                <items>
                   <MenuItem mnemonicParsing="false" onAction="#importBtn" text="Import" />
                   <MenuItem mnemonicParsing="false" onAction="#exportBtn" text="Export" />
-                  <MenuItem mnemonicParsing="false" onAction="#reportSum" text="Report alles" />
-                  <MenuItem mnemonicParsing="false" onAction="#tourReport" text="Tour Report erstellen" />
                </items>
         </Menu>
             <Menu 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">
+                    <items>
+                        <RadioMenuItem mnemonicParsing="false" text="Deutsch" />
+                        <RadioMenuItem mnemonicParsing="false" text="Englisch" />
+                    </items>
+                  </Menu>
                </items>
             </Menu>
         <Menu mnemonicParsing="false" text="Hilfe">

src/tourplaner/ui/AlertHelper.java

@@ -12,6 +12,10 @@ import javafx.stage.WindowEvent;
 import tourplaner.business.ConfigHelper;
 
 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;

src/tourplaner/ui/ProgressBar.java

@@ -0,0 +1,52 @@
+package tourplaner.ui;
+
+import javax.swing.*;
+import javax.swing.border.TitledBorder;
+import java.awt.*;
+
+public class ProgressBar {
+    private int status;
+    private JFrame frame;
+    private JProgressBar progressBar;
+
+    public ProgressBar(String title){
+        this.frame = new JFrame(title);
+        this.frame.setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
+        Container content = this.frame.getContentPane();
+        this.progressBar = new JProgressBar();
+        this.progressBar.setValue(0);
+        this.progressBar.setStringPainted(true);
+        TitledBorder border = BorderFactory.createTitledBorder("Laden....");
+        this.progressBar.setBorder(border);
+        content.add(this.progressBar, BorderLayout.NORTH);
+        this.frame.setSize(300, 100);
+        this.frame.setVisible(true);
+    }
+
+    public void addProgress(int add){
+        this.status += add;
+        this.progressBar.setValue(this.status);
+        closeOnFinish();
+    }
+
+    private void closeOnFinish(){
+        if(this.status >= 100){
+            closeProgress();
+        }
+    }
+
+    public void setProgress(int set){
+        this.status = set;
+        closeOnFinish();
+    }
+
+    public void closeProgress(){
+        this.frame.setVisible(false);
+    }
+
+    public int getProgressSize(int todo, int maxLevel){
+        int steps = (progressBar.getValue() - maxLevel) / todo;
+        if(steps < 0) steps = steps*-1;
+        return steps;
+    }
+}

src/tourplaner/ui/TourplanerController.java

@@ -17,6 +17,7 @@ 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;
@@ -114,10 +115,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"));
@@ -127,7 +131,9 @@ public class TourplanerController implements Initializable {
         //Log anzeigen
         logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
         logTableView.getItems().clear();
+        progressBar.addProgress(10);
         logTableView.setItems(this.viewModel.getLogData());
+        progressBar.addProgress(10);
         logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
         logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
         logDatumCol.setCellValueFactory(new PropertyValueFactory<Log, String>("datum"));
@@ -136,12 +142,16 @@ 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"));
-
+        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.addProgress(40);
+            this.sucheInput.setText("");
         }
+        progressBar.addProgress(50);
     }
 
     /**
@@ -159,8 +169,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()));
     }
 
     /**
@@ -182,7 +191,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();
     }
 
     /**

src/tourplaner/viewmodels/ViewModel.java

@@ -7,9 +7,9 @@ import tourplaner.business.*;
 import tourplaner.ui.AlertHelper;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
+import tourplaner.ui.ProgressBar;
 
 import java.awt.*;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -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("");
-        if (getTour(this.neueTourName) == null) {
-            Tour newTour = new Tour(this.neueTourName, "1", "1", 0, this.neueTourStart, this.neueTourZiel);
-            tourData.add(newTour);
-            tourNamen.add(this.neueTourName);
-            this.selectedTour = newTour;
-            try {
-                TourPlaner.addTour(newTour);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
+    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, progressBar);
+                        } catch (IOException e) {
+                            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(){
@@ -208,11 +216,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) {
@@ -481,7 +489,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;
     }
 
@@ -617,15 +628,9 @@ public class ViewModel {
      */
     public void importData() {
         String file = AlertHelper.fileChooser("Importiere");
-        System.out.println("IMPORT: " + file);
         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);
-            }
+            this.tourNamen = FXCollections.observableArrayList();
+            new Exporter(file).doImport();
         }
     }