Import Bugfix + Report add rating + readme + edit tour bugfix + add wait cursor

Doxyfile

@@ -38,27 +38,27 @@ PROJECT_NAME           = Tourplaner
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 0.0.2
+PROJECT_NUMBER         = 1
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = DGTP
+PROJECT_BRIEF          = tpl
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
 # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
 # the logo to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = D:/FH_OFFLINE/tourplaner/logo_sm.png
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = C:\Users\georg\OneDrive\FH\Swe\Tourplaner\doxygendoc
+OUTPUT_DIRECTORY       = D:\FH_OFFLINE\tourplaner\doxygendoc
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -864,7 +864,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = C:\Users\georg\OneDrive\FH\Swe\Tourplaner\src\tourplaner
+INPUT                  = D:\FH_OFFLINE\tourplaner\src
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1304,7 +1304,7 @@ HTML_EXTRA_FILES       =
 # Minimum value: 0, maximum value: 359, default value: 220.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_HUE    = 220
+HTML_COLORSTYLE_HUE    = 359
 
 # The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
 # in the HTML output. For a value of 0 the output will use grayscales only. A
@@ -1312,7 +1312,7 @@ HTML_COLORSTYLE_HUE    = 220
 # Minimum value: 0, maximum value: 255, default value: 100.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_SAT    = 100
+HTML_COLORSTYLE_SAT    = 0
 
 # The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
 # luminance component of the colors in the HTML output. Values below 100
@@ -1323,7 +1323,7 @@ HTML_COLORSTYLE_SAT    = 100
 # Minimum value: 40, maximum value: 240, default value: 80.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-HTML_COLORSTYLE_GAMMA  = 80
+HTML_COLORSTYLE_GAMMA  = 240
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
 # page will contain the date and time when the page was generated. Setting this
@@ -1582,7 +1582,7 @@ DISABLE_INDEX          = NO
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-GENERATE_TREEVIEW      = YES
+GENERATE_TREEVIEW      = NO
 
 # The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
 # doxygen will group on one line in the generated HTML documentation.
@@ -1790,7 +1790,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2050,7 +2050,7 @@ RTF_SOURCE_CODE        = NO
 # classes and files.
 # The default value is: NO.
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
@@ -2128,7 +2128,7 @@ XML_NS_MEMB_FILE_SCOPE = NO
 # that can be used to generate PDF.
 # The default value is: NO.
 
-GENERATE_DOCBOOK       = YES
+GENERATE_DOCBOOK       = NO
 
 # The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
@@ -2336,7 +2336,7 @@ EXTERNAL_PAGES         = YES
 # powerful graphs.
 # The default value is: YES.
 
-CLASS_DIAGRAMS         = YES
+CLASS_DIAGRAMS         = NO
 
 # You can include diagrams made with dia in doxygen documentation. Doxygen will
 # then run dia to produce the diagram and insert it in the documentation. The
@@ -2358,7 +2358,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # set to NO
 # The default value is: NO.
 
-HAVE_DOT               = NO
+HAVE_DOT               = YES
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
 # to run in parallel. When set to 0 doxygen will base this on the number of

README.md

@@ -1,8 +1,16 @@
 # Tourplaner
+* JavaDoc: https://dergeorg.at/javadoc
+* DoxygenDoc: https://dergeorg.at/doxygendoc/html
 
 # Config
-* DB informationen müssen in das config.ini.sample unter [db] eingetragen werden
+* DB informationen müssen in das config.ini.sample unter ```[db]``` eingetragen werden
 * Datei muss in config.ini umbenannt werden
-* [langde] beinhaltet alle Deutschen Texte der Gui
+* ```langde.ini``` beinhaltet alle Deutschen Texte der Gui
-* [start] beinhaltet den Title und infos die beim start verabeitet werden
+* ```langen.ini``` beinhaltet alle Englischen Texte der Gui
-* [hilfe] beinhaltet die Links zu den Hilfeseiten
+* Bei ```[map] -> key``` muss ein API Key zu Mapquest eingegeben werden
+* Bei ```[report] -> path``` kann der Path eingestellt werden, wo die Reports gespeichert werden
+* Bei ```[map] -> path``` kann der Path eingestellt werden, wo die Maps gespeichert werden
+
+# UML
+```[UML.svg]``` (https://git.dergeorg.at/dergeorg/tourplaner/src/branch/master/uml.svg)
+![UML.svg](uml.svg)

TourplanerTabellen.sql

@@ -15,6 +15,6 @@ create unique index tour_tourname_uindex
 
 alter table tour add constraint tour_pk primary key (tourname);
 
-#// Log Table
+// Log Table
 
-create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal);
+create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal, rating varchar);

src/tourplaner/business/Exporter.java

@@ -50,19 +50,25 @@ public class Exporter {
         try {
             ArrayList<Tour> touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path)));
             DbConnect dbConnect = new DbConnect();
-            dbConnect.delAllData();
+            ArrayList<Tour> allTours = dbConnect.getAllTouren();
-            progressBar.addProgress(5);
+            progressBar.addProgress(2);
-            int size = progressBar.getProgressSize(touren.size() * 3, 100);
+            int size = progressBar.getProgressSize(allTours.size(), 25);
+            allTours.forEach(t -> {
+                TourPlaner.delTour(t.getName());
+                progressBar.addProgress(size);
+            });
+
+            int finalSize = progressBar.getProgressSize(touren.size() * 3, 100);
             for (Tour tour: touren) {
                     new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
-                progressBar.addProgress(size);
+                progressBar.addProgress(finalSize);
                 dbConnect.addTour(tour);
-                progressBar.addProgress(size);
+                progressBar.addProgress(finalSize);
                 ArrayList<Log> logs = tour.getLogs();
                 for (Log log:logs) {
                     dbConnect.addLog(tour.getName(), log);
                 }
-                progressBar.addProgress(size);
+                progressBar.addProgress(finalSize);
             }
         } catch (IOException e) {
             LogHelper.error(e);

src/tourplaner/business/Reporter.java

@@ -40,6 +40,7 @@ public class Reporter {
             Document document = new Document();
             PdfWriter.getInstance(document, new FileOutputStream(file));
             document.open();
+            addMetaData(document, new Tour("Summary", "String dauer", "String mapJson", 1, "String start", "String ziel"));
             addSumRepo(document, tours);
 
             document.close();
@@ -173,6 +174,7 @@ public class Reporter {
             subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("logstrecke") + " " + log.getStrecke())));
             subCatPart.add(new Paragraph(EinheitenAdder.addMeter(ConfigHelper.getLangIniString("loghight") + " " + log.getHightmeter())));
             subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logbemerkung") + " " + log.getBemerkung()));
+            subCatPart.add(new Paragraph( "Rating " + log.getRating()));
         }
         // now add all this to the document
         document.add(catPart);

src/tourplaner/business/TourPlaner.java

@@ -59,14 +59,9 @@ 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)));
-        progressBar.addProgress(step);
         boolean ret = new DbConnect().delTour(tourname);
-        progressBar.setProgress(100);
         return ret;
     }
     /**

src/tourplaner/data/DbConnect.java

@@ -147,7 +147,7 @@ public class DbConnect {
 
     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()+"', rating = '"+log.getRating()+"'");
+                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+", rating = '"+log.getRating()+"' WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
     }
 
     public boolean delLog(String tourname, String id){

src/tourplaner/ui/ProgressBar.java

@@ -28,6 +28,7 @@ public class ProgressBar {
         Container content = this.frame.getContentPane();
         this.progressBar = new JProgressBar();
         this.progressBar.setValue(0);
+        this.progressBar.setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
         this.progressBar.setStringPainted(true);
         TitledBorder border = BorderFactory.createTitledBorder("Laden....");
         this.progressBar.setBorder(border);

src/tourplaner/viewmodels/ViewModel.java

@@ -506,8 +506,10 @@ public class ViewModel {
                 tourData.removeIf(s -> s.getName().equals(tourname));
                 tourNamen.removeIf(s -> s.equals(tourname));
                 logData.removeIf(s -> true);
+                ProgressBar progressBar = new ProgressBar("");
                 TourPlaner.delTour(tourname);
                 setSelectedTour(null);
+                progressBar.setProgress(100);
             } catch (NullPointerException e) {
                 LogHelper.error(e);
             }