DB -> Tour add, edit, del

.gitignore

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

.idea/dataSources.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
+    <data-source source="LOCAL" name="postgres@postgres.dergeorg.at" uuid="304c5f90-6427-4696-beb2-a9a4e6b29a05">
+      <driver-ref>postgresql</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>org.postgresql.Driver</jdbc-driver>
+      <jdbc-url>jdbc:postgresql://postgres.dergeorg.at:5432/postgres</jdbc-url>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+  </component>
+</project>

.idea/libraries/iText_4_2_0_com_itextpdf.xml

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

Tourplaner.iml

@@ -10,7 +10,6 @@
     <orderEntry type="library" name="lib" level="project" />
     <orderEntry type="library" name="org.ini4j:ini4j:0.5.4" level="project" />
     <orderEntry type="library" name="log4j:log4j:1.2.17" level="project" />
-    <orderEntry type="library" name="org.postgresql:postgresql:42.2.19" level="project" />
-    <orderEntry type="library" name="iText-4.2.0-com.itextpdf" level="project" />
+    <orderEntry type="library" name="org.apache.pdfbox:pdfbox:1.8.9" level="project" />
   </component>
 </module>

conf.ini.sample

@@ -20,9 +20,3 @@ path = ./reports/
 gitrepo = https://git.dergeorg.at/dergeorg/tourplaner
 doxygendoc = https://git.dergeorg.at/dergeorg/tourplaner
 javadoc = https://git.dergeorg.at/dergeorg/tourplaner
-
-[map]
-key =
-size = 1500,400
-path = D:\\TourplanerImages\\
-file_pre = file:///

src/tourplaner/business/DirectionMap.java

@@ -1,33 +0,0 @@
-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;
-
-public class DirectionMap {
-
-    private double dauer, strecke;
-    private String start, end, tourname, file;
-    private Image map;
-
-    public DirectionMap (String start, String ende, String tourname) throws IOException {
-        this.map = getMap(start, ende);
-        this.start = start;
-        this.end = ende;
-        this.tourname = tourname;
-        this.file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + this.tourname + ".jpg";
-        FileHelper.saveImage(this.map, "jpg", new File(file));
-        FileHelper.openDefault(file);
-    }
-
-    private Image getMap(String start, String ende) throws IOException {
-        return HttpHelper.httpGetStaticMap(start, ende);
-    }
-
-
-
-
-}

src/tourplaner/business/FileHelper.java

@@ -1,36 +0,0 @@
-package tourplaner.business;
-
-import javax.imageio.ImageIO;
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-public class FileHelper {
-
-    public static void openDefault(String f){
-        // A reference to a text file
-        File file = new File(f);
-
-        try {
-            Desktop desktop = Desktop.getDesktop();
-
-            // Open a file using the default program for the file type. In the example
-            // we will launch a default registered program to open a text file. For
-            // example on Windows operating system this call might launch a notepad.exe
-            // to open the file.
-            desktop.open(file);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void saveImage(Image img, String type, File file) throws IOException {
-        ImageIO.write(ImgHelper.toBufferedImage(img), type, file);
-    }
-
-    public static BufferedImage getImage(File file) throws IOException {
-        return ImageIO.read(file);
-    }
-}

src/tourplaner/business/HttpHelper.java

@@ -1,14 +0,0 @@
-package tourplaner.business;
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.io.IOException;
-import java.net.URL;
-
-public class HttpHelper {
-
-    public static Image httpGetStaticMap(String start, String end) throws IOException {
-        URL url = new URL("https://www.mapquestapi.com/staticmap/v5/map?start="+start+"&end="+end+"&size="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "size")+"&key="+ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "key"));
-        return ImageIO.read(url);
-    }
-}

src/tourplaner/business/ImgHelper.java

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

src/tourplaner/business/LogHelper.java

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

src/tourplaner/business/Reporter.java

@@ -1,219 +1,34 @@
 package tourplaner.business;
 
-import tourplaner.object.Log;
-import tourplaner.object.Tour;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import org.apache.pdfbox.pdmodel.PDDocument;
+import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
+import org.apache.pdfbox.pdmodel.font.PDFont;
+import org.apache.pdfbox.pdmodel.font.PDType1Font;
 
-
-import com.itextpdf.text.Anchor;
-import com.itextpdf.text.BadElementException;
-import com.itextpdf.text.Chapter;
-import com.itextpdf.text.Document;
-import com.itextpdf.text.DocumentException;
-import com.itextpdf.text.Element;
-import com.itextpdf.text.Font;
-import com.itextpdf.text.List;
-import com.itextpdf.text.ListItem;
-import com.itextpdf.text.Paragraph;
-import com.itextpdf.text.Phrase;
-import com.itextpdf.text.Section;
-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;
-import java.util.ArrayList;
-import java.util.Date;
 
 public class Reporter {
 
-    private static Font catFont = new Font(Font.TIMES_ROMAN, 18,
-            Font.BOLD);
-    private static Font redFont = new Font(Font.TIMES_ROMAN, 12,
-            Font.NORMAL, Color.RED);
-    private static Font subFont = new Font(Font.TIMES_ROMAN, 16,
-            Font.BOLD);
-    private static Font smallBold = new Font(Font.TIMES_ROMAN, 12,
-            Font.BOLD);
+    public static void createTourReport(String tourname) throws IOException, COSVisitorException {
+        PDDocument document = new PDDocument();
+        PDPage page = new PDPage();
+        document.addPage(page);
 
-    public static void createTourReport(String tourname)   {
-        Tour tour = TourPlaner.getTour(tourname);
-        tour.setLog(TourPlaner.getLogs(tourname));
-        String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + tourname+".pdf";
-        try {
-            Document document = new Document();
-            PdfWriter.getInstance(document, new FileOutputStream(file));
-            document.open();
-            addMetaData(document, tour);
-//            addTitlePage(document, tour);
-            addContent(document, tour);
-            document.close();
-        } catch (DocumentException | FileNotFoundException e) {
-            LogHelper.error(e.getMessage(), e.getClass().getName());
-        }
-        FileHelper.openDefault(file);
+        PDFont font = PDType1Font.HELVETICA;
+        PDPageContentStream contentStream = new PDPageContentStream(document, page);
+        contentStream.beginText();
+        contentStream.setFont(font, 12);
+        contentStream.moveTextPositionByAmount(100,700);
+        contentStream.drawString(tourname);
+//        contentStream.drawString();
+        contentStream.endText();
+
+        contentStream.close();
+
+        document.save(ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "test.pdf");
+        document.close();
     }
 
-    // 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");
-    }
-
-    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());
-
-        // Second parameter is the number of the chapter
-        Chapter catPart = new Chapter(new Paragraph(anchor), 1);
-
-        Paragraph subPara = new Paragraph("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()));
-
-
-
-
-
-        // now add all this to the document
-        document.add(catPart);
-
-
-        ArrayList<Log> logs = tour.getLogs();
-        // Second parameter is the number of the chapter
-        anchor = new Anchor("Logs", catFont);
-        anchor.setName("Logs");
-        catPart = new Chapter(new Paragraph(anchor), 2);
-        catPart.add(new Paragraph("Anzahl der Logeinträge: " + logs.size()));
-
-        for (Log log: logs) {
-            subPara = new Paragraph("Log vom: " + 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()));
-        }
-        // 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);
-    }
-
-    private static void addEmptyLine(Paragraph paragraph, int number) {
-        for (int i = 0; i < number; i++) {
-            paragraph.add(new Paragraph(" "));
-        }
-    }
 }

src/tourplaner/business/TourPlaner.java

@@ -2,12 +2,9 @@ package tourplaner.business;
 
 import org.apache.log4j.Logger;
 import tourplaner.data.DbConnect;
-import tourplaner.object.Log;
+import tourplaner.data.PostgresHelper;
 import tourplaner.object.Tour;
 
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 
 /**
@@ -28,7 +25,9 @@ public class TourPlaner{
      * @return Alle touren als ArrayList
      */
     public static ArrayList<Tour> getAllTours(){
-        return new DbConnect().getAllTouren();
+        DbConnect dbConnect = new DbConnect();
+        ArrayList<Tour> touren = dbConnect.getAllTouren();
+        return touren;
     }
 
     /**
@@ -38,60 +37,25 @@ public class TourPlaner{
      * @return false bei error
      */
     public static boolean editTour(String oldname, Tour tour){
-        return new DbConnect().editTour(oldname, tour);
+        DbConnect dbConnect = new DbConnect();
+        return dbConnect.editTour(oldname, tour);
     }
 
     public static boolean delTour(String tourname){
-        return new DbConnect().delTour(tourname);
+        DbConnect dbConnect = new DbConnect();
+        return dbConnect.delTour(tourname);
     }
+
     /**
      * Fügt eine Tour hinzu
      * @param newTour Neue Tour
      * @return false bei error
      */
-    public static boolean addTour(Tour newTour) throws IOException {
-        DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
-        return new DbConnect().addTour(newTour);
+    public static boolean addTour(Tour newTour){
+        DbConnect dbConnect = new DbConnect();
+        return dbConnect.addTour(newTour);
     }
 
-    public static Image getImage(String tourname) throws IOException {
-        return FileHelper.getImage(new File(getImagePath(tourname)));
-    }
-
-    public static String getImagePath(String tourname){
-        return ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "path") + tourname + ".jpg";
-    }
-
-    public static void openImage(String tourname){
-        FileHelper.openDefault(getImagePath(tourname));
-    }
-
-
-    public static ArrayList<Log> getLogs(String tourname){
-        return new DbConnect().getLogs(tourname);
-    }
-
-    public static void doReport(String tourname){
-        Reporter.createTourReport(tourname);
-    }
-
-    public static Tour getTour(String tourname){
-        return new DbConnect().getTour(tourname);
-    }
-
-    public static boolean addLog(String tourname, Log log){
-        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
-        return new DbConnect().addLog(tourname, log);
-    }
-
-    public static boolean delLog(String tourname, String id){
-        return new DbConnect().delLog(tourname, id);
-    }
-
-    public static boolean editLog(String tourname, Log log){
-        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
-        return new DbConnect().editLog(tourname, log);
-    }
 
 
     public static String getMapJson(String start, String ziel){

src/tourplaner/data/DbConnect.java

@@ -1,14 +1,10 @@
 package tourplaner.data;
 
-import javafx.geometry.Pos;
-import tourplaner.object.Log;
 import tourplaner.object.Tour;
 
 import java.sql.Connection;
-import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.Statement;
-import java.time.LocalDate;
 import java.util.ArrayList;
 
 /**
@@ -49,20 +45,9 @@ public class DbConnect {
      * @return false bei error
      */
     public boolean editTour(String oldname, Tour tour) {
-        String tourname = tour.getName();
-        ArrayList<Boolean> result = new ArrayList<>();
-        ArrayList<Log> logs = getLogs(oldname);
-        result.add(delLogs(oldname));
-        result.add(PostgresHelper.executeUpdate("UPDATE public.tour SET tourname = '"+tour.getName()+"', dauer = 1, mapjson = '"+tour.getMapJson()+"', start = '"+tour.getStart()+"', ziel = '"+tour.getZiel()+"', strecke = "+tour.getStrecke()+" WHERE tourname ='" + oldname + "';"));
-        logs.forEach(log -> {
-            result.add(addLog(tourname, log));
-        });
-        return !result.contains(false);
+        return PostgresHelper.executeUpdate("UPDATE public.tour SET tourname = '"+tour.getName()+"', dauer = 1, mapjson = '"+tour.getMapJson()+"', start = '"+tour.getStart()+"', ziel = '"+tour.getZiel()+"', strecke = "+tour.getStrecke()+" WHERE tourname ='" + oldname + "';");
     }
 
-    private boolean delLogs(String tourname){
-        return PostgresHelper.executeUpdate("DELETE FROM public.log WHERE tourname = '"+tourname+"'");
-    }
     /**
      * Fügt eine Tour hinzu
      * @param tour Neue Tour
@@ -78,70 +63,7 @@ public class DbConnect {
      * @return false bei error
      */
     public boolean delTour(String tourname){
-        ArrayList<Boolean> result = new ArrayList<>();
-        result.add(delLogs(tourname));
-        result.add(PostgresHelper.executeUpdate("DELETE FROM public.tour WHERE tourname = '"+tourname+"'"));
-        return !result.contains(false);
-    }
-
-    public ArrayList<Log> getLogs(String tourname){
-
-        this.c = PostgresHelper.con();
-        String id, bemerkung ;
-        double dauer, strecke, pause, gegangen, avg, hightmeter;
-        Date datum;
-
-        ArrayList<Log> logs = new ArrayList<>();
-        try {
-            stmt = this.c.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT * FROM public.log where tourname = '"+ tourname +"'");
-            while (rs.next()) {
-                id = rs.getString("id");
-                bemerkung = rs.getString("bemerkung");
-                datum = rs.getDate("datum");
-                dauer = rs.getDouble("dauer");
-//                avg = rs.getDouble("avg");
-                hightmeter = rs.getDouble("hightmeter");
-                pause = rs.getDouble("pause");
-//                gegangen = rs.getDouble("gegangen");
-                strecke = rs.getDouble("strecke");
-                if (!tourname.isEmpty()) {
-                    logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause));
-                }else {
-                    return null;
-                }
-            }
-            rs.close();
-            stmt.close();
-            this.c.close();
-            return logs;
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            return null;
-        }
-    }
-
-
-    /**
-     * Füght einen Logeintrag ein
-     * @param tourname Zu welcher Tour der Logeintrag gehört
-     * @param log Der Logeintrag
-     * @return false bei error
-     */
-    public boolean addLog(String tourname, Log log){
-        if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
-        return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
-                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+")");
-    }
-
-    public boolean editLog(String tourname, Log log){
-        return PostgresHelper.executeUpdate("UPDATE public.log SET bemerkung = '"+log.getBemerkung()+"', datum = '"+log.getDatum()+"', strecke = "+log.getStrecke()+", avg = "+log.getAvgspeed()+", hightmeter = "+
-                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
-    }
-
-    public boolean delLog(String tourname, String id){
-        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+"'");
+        return  PostgresHelper.executeUpdate("DELETE FROM public.tour WHERE tourname = '"+tourname+"'");
     }
 
     /**
@@ -180,41 +102,4 @@ public class DbConnect {
         }
     }
 
-    /**
-     * Holt eine Tour aus der Datenbank
-     * @param tn Tourname
-     * @return Null bei fehler, sonst eine List aus den IDs
-     */
-    public Tour getTour(String tn){
-        this.c = PostgresHelper.con();
-        String tourname, mapjson, start, ziel;
-        double dauer, strecke;
-
-        Tour touren = null;
-        try {
-            stmt = this.c.createStatement();
-            ResultSet rs = stmt.executeQuery("select * from tour where tourname = '"+tn+"';");
-            while (rs.next()) {
-                tourname = rs.getString("tourname");
-                mapjson = rs.getString("mapjson");
-                start = rs.getString("start");
-                ziel = rs.getString("ziel");
-                dauer = rs.getDouble("dauer");
-                strecke = rs.getDouble("strecke");
-                if (!tourname.isEmpty()) {
-                    touren = new Tour(tourname, dauer + "", mapjson, strecke, start, ziel);
-                }else {
-                    return null;
-                }
-            }
-            rs.close();
-            stmt.close();
-            this.c.close();
-            return touren;
-        } catch (Exception e) {
-            System.err.println(e.getClass().getName() + ": " + e.getMessage());
-            return null;
-        }
-    }
-
 }

src/tourplaner/object/Tour.java

@@ -31,10 +31,6 @@ public class Tour {
         this.log = tour.getLogs();
     }
 
-    public void setLog(ArrayList<Log> log) {
-        this.log = log;
-    }
-
     /**
      * Holt einen einzigen Log Eintrag anhand der Id
      * @param id Id des Eintrags der zu besorgen ist

src/tourplaner/tourplaner.fxml

@@ -34,7 +34,6 @@
 
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.paint.*?>
 <?import javafx.scene.text.*?>
@@ -113,11 +112,10 @@
                            <children>
                               <TabPane fx:id="viewTabPane" layoutX="1.0" layoutY="69.0" prefWidth="702.0" tabClosingPolicy="UNAVAILABLE" AnchorPane.bottomAnchor="-67.0" AnchorPane.leftAnchor="1.0" AnchorPane.rightAnchor="1.0" AnchorPane.topAnchor="0.0">
                                  <tabs>
-                                     <Tab fx:id="kartenTab" text="Karte">
-                                         <AnchorPane>
-                                             <ImageView fx:id="mapImageView" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="80.0" AnchorPane.leftAnchor="13.0" AnchorPane.rightAnchor="825.0" AnchorPane.topAnchor="0.0" />
-                                         </AnchorPane>
-                                     </Tab>
+                                    <Tab fx:id="kartenTab" text="Karte">
+                                       <content>
+                                          <AnchorPane />
+                                       </content></Tab>
                                     <Tab fx:id="beschreibungTab" text="Beschreibung">
                                        <content>
                                           <AnchorPane>

src/tourplaner/ui/TourplanerController.java

@@ -8,11 +8,9 @@ import javafx.scene.control.*;
 import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
 import javafx.scene.control.cell.PropertyValueFactory;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.MouseEvent;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
-import tourplaner.business.TourPlaner;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
 import tourplaner.viewmodels.ViewModel;
@@ -38,7 +36,6 @@ public class TourplanerController implements Initializable {
     public TableView<Tour> beschreibungTableView;
     public TableColumn<Tour, String> startCol, zielCol, dauerCol, streckeCol, nameCol;
     public TextField titleTextView, sucheInput;
-    public ImageView mapImageView;
     //Log -> rechts unten
     public TableView<Log> logTableView;
     public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
@@ -52,13 +49,13 @@ public class TourplanerController implements Initializable {
     @FXML
     private void editTourBtn(){
         this.viewModel.editTour();
-        syncTour(this.viewModel.getSelectedTour().getName());
+        beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
+        beschreibungTableView.getItems().add(this.viewModel.getTour(this.viewModel.getSelectedTour().getName()));
     }
 
     @FXML
     private void editLogBtn(){
         this.viewModel.editLog();
-        syncLogs();
     }
     /**
      * Öffnet github im standart browser
@@ -87,19 +84,6 @@ public class TourplanerController implements Initializable {
         this.viewModel.doxygenDocBrowser();
     }
 
-    private void syncTour(String selectedItem){
-        beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
-        beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
-    }
-
-    private void syncTourNamen(){
-        TourListView.setItems(this.viewModel.getTourNamen());
-    }
-
-    private void syncLogs(){
-        logTableView.getItems().removeIf(s -> true);
-        logTableView.setItems(this.viewModel.getLogData());
-    }
 
 
     /**
@@ -111,7 +95,8 @@ public class TourplanerController implements Initializable {
         String selectedItem = TourListView.getSelectionModel().getSelectedItem();
         this.viewModel.selectTour(selectedItem);
         titleTextView.setText(selectedItem);
-        syncTour(selectedItem);
+        beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
+        beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
         startCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("start"));
         zielCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("ziel"));
         dauerCol.setCellValueFactory(new PropertyValueFactory<Tour, String>("dauer"));
@@ -120,7 +105,6 @@ public class TourplanerController implements Initializable {
 
         //Log anzeigen
         logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
-        logTableView.getItems().removeIf(s -> true);
         logTableView.setItems(this.viewModel.getLogData());
         logDauerCol.setCellValueFactory(new PropertyValueFactory<Log, String>("dauer"));
         logStreckeCol.setCellValueFactory(new PropertyValueFactory<Log, String>("strecke"));
@@ -131,7 +115,6 @@ public class TourplanerController implements Initializable {
         logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
         logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
 
-        mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
     }
 
     /**
@@ -150,7 +133,6 @@ public class TourplanerController implements Initializable {
     @FXML
     private void addTour(){
         this.viewModel.addTour();
-        this.mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
     }
 
     /**
@@ -181,13 +163,12 @@ public class TourplanerController implements Initializable {
     @FXML
     private void addLog(){
         this.viewModel.addLog();
-        syncLogs();
     }
 
     @FXML
     private void delLog(){
         this.viewModel.delLog();
-        syncLogs();
+
     }
 
     /**
@@ -209,7 +190,7 @@ public class TourplanerController implements Initializable {
         //Tour list -> links
         TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
         TourListView.setOrientation(Orientation.VERTICAL);
-        syncTourNamen();
+        TourListView.setItems(this.viewModel.getTourNamen());
         //Tabs zu Tour -> rechts oben
         beschreibungTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinetourselected")));
         titleTextView.setText( ConfigHelper.getLangIniString("keinetourselected"));

src/tourplaner/viewmodels/ViewModel.java

@@ -2,8 +2,10 @@ package tourplaner.viewmodels;
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import javafx.scene.image.Image;
+import org.apache.pdfbox.exceptions.COSVisitorException;
+import tourplaner.business.Reporter;
 import tourplaner.business.TourPlaner;
+import tourplaner.data.DbConnect;
 import tourplaner.ui.AlertHelper;
 import tourplaner.business.ConfigHelper;
 import tourplaner.business.LogHelper;
@@ -32,10 +34,6 @@ public class ViewModel {
 
 
 
-    public Image getImage(String tourname){
-        return new Image( ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "map", "file_pre") + TourPlaner.getImagePath(tourname));
-    }
-
     /**
      * Bearbeitet eine bereits bestehende Tour
      * prüft ob eine tour ausgewählt ist
@@ -160,12 +158,7 @@ public class ViewModel {
             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();
-            }
+            TourPlaner.addTour(newTour);
         }
         this.neueTourStart = null;
         this.neueTourZiel = null;
@@ -219,11 +212,10 @@ public class ViewModel {
                                 Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause);
                                 this.logData.removeIf(ld -> ld.getId().equals(this.selectedLog.getId()));
                                 this.logData.add(newLog);
-//                                tourAkt.get().delLog(this.selectedLog.getId());
-//                                tourAkt.get().addLog(newLog);
+                                tourAkt.get().delLog(this.selectedLog.getId());
+                                tourAkt.get().addLog(newLog);
                                 this.tourData.removeIf(td -> td.getName().equals(this.selectedTour.getName()));
                                 this.tourData.add(tourAkt.get());
-                                TourPlaner.editLog(this.selectedTour.getName(), newLog);
                             }
                         }
                     }
@@ -335,7 +327,6 @@ public class ViewModel {
                                         if (date != null) {
                                             Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause);
                                             this.logData.add(newLog);
-                                            TourPlaner.addLog(this.selectedTour.getName(), newLog);
                                             s.addLog(newLog);
                                         }
                                     }
@@ -357,8 +348,25 @@ public class ViewModel {
      */
     public void delLog(){
         if(this.selectedLog != null) {
-                TourPlaner.delLog(this.selectedTour.getName(), this.selectedLog.getId());
+            this.logData.removeIf(s -> s.getId().equals(this.selectedLog.getId()));
+            AtomicReference<Tour> tourToEdit = new AtomicReference<>();
+            this.tourData.forEach(s -> {
+                if (s.getLogs() != null) {
+                    s.getLogs().forEach(ss -> {
+                        if (ss.getId().equals(this.selectedLog.getId())) {
+                            tourToEdit.set(s);
+                        }
+                    });
+                }
+            });
+
+            if (tourToEdit.get() != null){
+                Tour toEdit = tourToEdit.get();
+                toEdit.delLog(this.selectedLog.getId());
+                this.tourData.removeIf(s -> s.getName().equals(toEdit.getName()));
+                this.tourData.add(toEdit);
                 this.selectedLog = null;
+            }
         }else{
             AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
                     ConfigHelper.getLangIniString("keinetourselected"),
@@ -398,8 +406,6 @@ public class ViewModel {
     }
 
     public ObservableList<Log> getLogData() {
-        logData.removeAll();
-        logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
         return logData;
     }
 
@@ -580,7 +586,14 @@ public class ViewModel {
                     ConfigHelper.getLangIniString("keinetourselected"),
                     ConfigHelper.getLangIniString("logtournotselectedmsg"));
         }else {
-           TourPlaner.doReport(this.selectedTour.getName());
+            try {
+                Reporter.createTourReport(this.selectedTour.getName());
+            } catch (IOException e) {
+                LogHelper.error(e.getMessage(), e.getClass().getName());
+            } catch (COSVisitorException e) {
+                LogHelper.error(e.getMessage(), e.getClass().getName());
+            }
+
         }
     }
 }