Log Rating + Create Table bugfix

conf.ini.sample

@@ -10,6 +10,12 @@ lang = langde
 openpdf = 1
 openmap = 0
 
+[einheiten]
+zeit = min
+strecke = km
+meter = m
+speed = km/h
+
 [db]
 dbname = tourplaner
 url =

langde.ini

@@ -94,3 +94,16 @@ fhilfe = Hilfe
 freposum = Erstelle Report über alle Touren
 frepotour = Erstelle Report über aktuelle Tour
 fbeenden = Beenden
+fpunkte = ...
+
+rzeitallerlogs = Gesammte Zeit aller Logs:
+rstreckeallerlogs = gesammte Strecke aller Logs:
+rcalzeitallerlogs = Berechnete Zeit aller Logs:
+calstreckeallerloggs = Berechnete Strecke aller Touren:
+rdaten = Daten
+rsummrepo = Zusammengefasster Report
+
+bewertung = Bewertung
+bewertungmsg = Bitte die Bewertung zwischen 0 und 5 eingeben
+bewertungeror = Bitte nur Bewertungen von 0 und 5 eingeben
+bewertungerror2 = Bitte nur Zahlen zum Bewerten

langen.ini

@@ -95,3 +95,16 @@ fhilfe = Help
 freposum = Generate summarize-report
 frepotour = Generate tour-report
 fbeenden = Quit
+fpunkte = ...
+
+rzeitallerlogs = Time of all logs:
+rstreckeallerlogs = Distance of all logs:
+rcalzeitallerlogs = Calculated time of all logs:
+calstreckeallerloggs = Calculated distance  of all logs:
+rdaten = Data
+rsummrepo = Summary Report
+
+bewertung = Rating
+bewertungmsg = Please enter a rating from 0 to 5
+bewertungeror = Please enter only a rating from 0 to 5
+bewertungerror2 = Please only enter numbers for rating

src/tourplaner/business/EinheitenAdder.java

@@ -0,0 +1,50 @@
+package tourplaner.business;
+
+/**
+ * Fügt am ende eines Strings die einheiten an
+ */
+public class EinheitenAdder {
+
+    /**
+     * Fügt meter hinzu
+     * @param meter Meter als String
+     * @return Meter mit einheit
+     */
+    public static String addMeter(String meter){
+        return meter + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "meter");
+    }
+
+    public static String addSpeed(String speed){
+        return speed + " " + ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "speed");
+    }
+    
+    /**
+     * Fügt km hinzu
+     * @param km km als String
+     * @return km mit einheit
+     */
+    public static String addKm(String km){
+        return km + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "strecke");
+    }
+    
+    /**
+     * Fügt minuten hinzu
+     * @param min minuten als String
+     * @return minuten mit einheit
+     */
+    public static String addMinuten(String min){
+        return min + " " +ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "einheiten", "zeit");
+    }
+
+    /**
+     * Fügt am ende .json hinzu. Sofern es nicht schon dort ist
+     * @param filename Filename ohne .json am ende
+     * @return Der Filename mit .json am ende-
+     */
+    public static String addJson(String filename){
+        if(!filename.contains(".json")){
+            filename += ".json";
+        }
+        return filename;
+    }
+}

src/tourplaner/business/Exporter.java

@@ -34,8 +34,9 @@ public class Exporter {
         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");
+        FileWriter fileWriter = new FileWriter(EinheitenAdder.addJson(this.path));
         progressBar.addProgress(step);
         JsonHelper.getJsonFromObj(data, fileWriter);
         progressBar.addProgress(step);
@@ -51,7 +52,7 @@ public class Exporter {
     public void doImport() {
         ProgressBar progressBar = new ProgressBar("Import...");
         try {
-            this.touren = JsonHelper.getTourenFromJson(new FileReader(this.path));
+            this.touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path)));
             DbConnect dbConnect = new DbConnect();
             dbConnect.delAllData();
             progressBar.addProgress(5);

src/tourplaner/business/Reporter.java

@@ -3,12 +3,9 @@ package tourplaner.business;
 import com.itextpdf.text.*;
 import com.itextpdf.text.Font;
 import com.itextpdf.text.Image;
-import tourplaner.data.DbConnect;
 import tourplaner.object.Log;
 import tourplaner.object.Tour;
 
-import com.itextpdf.text.pdf.PdfPCell;
-import com.itextpdf.text.pdf.PdfPTable;
 import com.itextpdf.text.pdf.PdfWriter;
 
 import java.awt.*;
@@ -78,17 +75,17 @@ public class Reporter {
                 strecke += log.getStrecke();
             }
         }
-        Anchor anchor = new Anchor("Zusammengefasster Report", catFont);
-        anchor.setName("Zusammengefasster Report");
+        Anchor anchor = new Anchor(ConfigHelper.getLangIniString("rsummrepo"), catFont);
+        anchor.setName(ConfigHelper.getLangIniString("rsummrepo"));
         // Second parameter is the number of the chapter
         Chapter catPart = new Chapter(new Paragraph(anchor), 1);
-        Paragraph subPara = new Paragraph("Daten", subFont);
+        Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("rdaten"), subFont);
         Section subCatPart = catPart.addSection(subPara);
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + System.getProperty("user.name") + ", " + new Date()));
-        subCatPart.add(new Paragraph("Gesammte Zeit aller Logs: " + dauer));
-        subCatPart.add(new Paragraph("gesammte Strecke aller Logs: " + strecke));
-        subCatPart.add(new Paragraph("Berechnete Zeit aller Logs: " + calDauer));
-        subCatPart.add(new Paragraph("Berechnete Strecke aller Touren: " + calStecke));
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + " " + System.getProperty("user.name") + ", " + new Date()));
+        subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("rzeitallerlogs") + " " + dauer)));
+        subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("rstreckeallerlogs") + " " + strecke)));
+        subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("rcalzeitallerlogs") + " " + calDauer)));
+        subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("calstreckeallerloggs") + " " + calStecke)));
         document.add(catPart);
     }
 
@@ -120,7 +117,7 @@ public class Reporter {
     // Reader
     // under File -> Properties
     private static void addMetaData(Document document, Tour tour) {
-        document.addTitle(ConfigHelper.getLangIniString("tourreportvon") + tour.getName());
+        document.addTitle(ConfigHelper.getLangIniString("tourreportvon") + " " + tour.getName());
         document.addSubject(ConfigHelper.getLangIniString("tourplanervon"));
         document.addKeywords(ConfigHelper.getLangIniString("reportkeywords"));
         document.addAuthor(ConfigHelper.getLangIniString("tourplaner"));
@@ -142,11 +139,11 @@ public class Reporter {
 
         Paragraph subPara = new Paragraph(ConfigHelper.getLangIniString("tour"), subFont);
         Section subCatPart = catPart.addSection(subPara);
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + System.getProperty("user.name") + ", " + new Date()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportstart") + tour.getStart()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportziel") + tour.getZiel()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportdauercal") + tour.getDauer()));
-        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportstreckecal") + tour.getStrecke()));
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportvon") + " " + System.getProperty("user.name") + ", " + new Date()));
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportstart") + " " + tour.getStart()));
+        subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("reportziel") + " " + tour.getZiel()));
+        subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("reportdauercal") + " " + tour.getDauer())));
+        subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("reportstreckecal") + " " + tour.getStrecke())));
         Paragraph emptyLine = new Paragraph();
         addEmptyLine(emptyLine, 5);
         subCatPart.add(emptyLine);
@@ -168,18 +165,18 @@ public class Reporter {
         anchor = new Anchor(ConfigHelper.getLangIniString("logs"), catFont);
         anchor.setName(ConfigHelper.getLangIniString("logs"));
         catPart = new Chapter(new Paragraph(anchor), 2);
-        catPart.add(new Paragraph(ConfigHelper.getLangIniString("countlog") + logs.size()));
+        catPart.add(new Paragraph(ConfigHelper.getLangIniString("countlog") + " " + logs.size()));
 
         for (Log log: logs) {
-            subPara = new Paragraph(ConfigHelper.getLangIniString("logvom") + log.getDatum() , subFont);
+            subPara = new Paragraph(ConfigHelper.getLangIniString("logvom") + " " + log.getDatum() , subFont);
             subCatPart = catPart.addSection(subPara);
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logdauer") + log.getDauer()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logpause") + log.getPause()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("loggegangen") + log.getGegangen()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logavg")+ log.getAvgspeed()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logstrecke") + log.getStrecke()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("loghight") + log.getHightmeter()));
-            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logbemerkung") + log.getBemerkung()));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("logdauer") + " " + log.getDauer())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("logpause") + " " + log.getPause())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMinuten(ConfigHelper.getLangIniString("loggegangen") + " " + log.getGegangen())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addSpeed(ConfigHelper.getLangIniString("logavg") + " " + log.getAvgspeed())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addKm(ConfigHelper.getLangIniString("logstrecke") + " " + log.getStrecke())));
+            subCatPart.add(new Paragraph(EinheitenAdder.addMeter(ConfigHelper.getLangIniString("loghight") + " " + log.getHightmeter())));
+            subCatPart.add(new Paragraph(ConfigHelper.getLangIniString("logbemerkung") + " " + log.getBemerkung()));
         }
         // now add all this to the document
         document.add(catPart);

src/tourplaner/data/DbConnect.java

@@ -37,7 +37,7 @@ public class DbConnect {
         errors.add(PostgresHelper.executeUpdateMessage("create table tour ( tourname varchar not null, dauer decimal, mapjson varchar, start varchar, ziel varchar, strecke decimal);", "Tour Table created"));
         errors.add(PostgresHelper.executeUpdateMessage("create unique index tour_tourname_uindex on tour (tourname);", "Tour Table unique created"));
         errors.add(PostgresHelper.executeUpdateMessage("alter table tour add constraint tour_pk primary key (tourname);", "Tour Table primary created"));
-        errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal);", "Log Table created"));
+        errors.add(PostgresHelper.executeUpdateMessage("create table log(tourname varchar constraint log_tour_tourname_fk references tour,id varchar,bemerkung varchar,datum date,strecke decimal,avg decimal,hightmeter decimal,pause decimal,gegangen decimal,dauer decimal,rating varchar);", "Log Table created"));
         return !errors.contains(false);
     }
 
@@ -102,7 +102,7 @@ public class DbConnect {
     public ArrayList<Log> getLogs(String tourname){
 
         this.c = PostgresHelper.con();
-        String id, bemerkung ;
+        String id, bemerkung, rating;
         double dauer, strecke, pause, gegangen, avg, hightmeter;
         Date datum;
 
@@ -113,15 +113,14 @@ public class DbConnect {
             while (rs.next()) {
                 id = rs.getString("id");
                 bemerkung = rs.getString("bemerkung");
+                rating = rs.getString("rating");
                 datum = rs.getDate("datum");
                 dauer = rs.getDouble("dauer");
-//                avg = rs.getDouble("avg");
                 hightmeter = rs.getDouble("hightmeter");
                 pause = rs.getDouble("pause");
-//                gegangen = rs.getDouble("gegangen");
                 strecke = rs.getDouble("strecke");
                 if (!tourname.isEmpty()) {
-                    logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause));
+                    logs.add(new Log(id, dauer, datum.toLocalDate(), strecke, bemerkung,hightmeter, pause, rating));
                 }else {
                     return null;
                 }
@@ -145,13 +144,15 @@ public class DbConnect {
      */
     public boolean addLog(String tourname, Log log){
         if(Double.isInfinite(log.getAvgspeed())) log.setAvgspeed(-1.0);
-        return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
-                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+")");
+        System.out.println("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
+                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
+        return PostgresHelper.executeUpdate("INSERT INTO public.log (tourname, id, bemerkung, datum, strecke, avg, hightmeter, pause, gegangen, dauer, rating) VALUES ('"+tourname+"', '"+log.getId()+"', '"+log.getBemerkung()+"', '"+log.getDatum()+"', "
+                +log.getStrecke()+", "+log.getAvgspeed()+", "+log.getHightmeter()+", "+log.getPause()+", "+log.getGegangen()+", "+log.getDauer()+",'"+log.getRating()+"')");
     }
 
     public boolean editLog(String tourname, Log log){
         return PostgresHelper.executeUpdate("UPDATE public.log SET bemerkung = '"+log.getBemerkung()+"', datum = '"+log.getDatum()+"', strecke = "+log.getStrecke()+", avg = "+log.getAvgspeed()+", hightmeter = "+
-                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"'");
+                log.getHightmeter()+", pause = "+log.getPause()+", gegangen = "+log.getGegangen()+", dauer = "+log.getDauer()+" WHERE tourname = '"+tourname+"' and id = '"+log.getId()+"', rating = '"+log.getRating()+"'");
     }
 
     public boolean delLog(String tourname, String id){

src/tourplaner/object/Log.java

@@ -6,11 +6,11 @@ import java.time.LocalDate;
 import java.util.Date;
 
 public class Log {
-    private String id, bemerkung;
+    private String id, bemerkung, rating;
     private LocalDate datum;
     private double strecke, avgspeed, hightmeter, pause, dauer, gegangen;
 
-    public Log(String id, double dauer, LocalDate datum, double strecke, String bemerkung, double hightmeter, double pause) {
+    public Log(String id, double dauer, LocalDate datum, double strecke, String bemerkung, double hightmeter, double pause, String rating) {
         this.id = id;
         this.dauer = dauer;
         this.datum = datum;
@@ -18,8 +18,20 @@ public class Log {
         this.bemerkung = bemerkung;
         this.hightmeter = hightmeter;
         this.pause = pause;
+        this.rating = rating;
         this.gegangen = this.dauer - this.pause;
-        this.avgspeed = this.strecke / (this.gegangen);
+        this.avgspeed = this.strecke / (this.gegangen/60);
+        if(Double.isInfinite(this.avgspeed)){
+            this.avgspeed = -1;
+        }
+    }
+
+    public String getRating() {
+        return rating;
+    }
+
+    public void setRating(String rating) {
+        this.rating = rating;
     }
 
     public String getBemerkung() {

src/tourplaner/object/Tour.java

@@ -7,7 +7,7 @@ import java.util.concurrent.atomic.AtomicReference;
  * Model einer Tour
  */
 public class Tour {
-    private String dauer, mapJson, name, start, ziel;
+    private String dauer, mapJson, name, start, ziel, rating;
     private double strecke;
     private ArrayList<Log> log;
 

src/tourplaner/tourplaner.fxml

@@ -133,9 +133,9 @@
                                              <children>
                                                 <TableView fx:id="beschreibungTableView" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                                   <columns>
-                                                    <TableColumn fx:id="nameCol" maxWidth="1.7976931348623157E308" minWidth="70.0" prefWidth="-1.0" text="Tourname" />
-                                                    <TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="40.0" prefWidth="-1.0" text="Dauer" />
-                                                      <TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="50.0" prefWidth="-1.0" text="Strecke" />
+                                                    <TableColumn fx:id="nameCol" minWidth="100.0" prefWidth="-1.0" text="Tourname" />
+                                                    <TableColumn fx:id="dauerCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Dauer" />
+                                                      <TableColumn fx:id="streckeCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Strecke" />
                                                       <TableColumn fx:id="startCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Startpunk" />
                                                       <TableColumn fx:id="zielCol" maxWidth="1.7976931348623157E308" minWidth="100.0" prefWidth="-1.0" text="Zielpunkt" />
                                                   </columns>
@@ -185,14 +185,15 @@
                                  <children>
                                     <TableView fx:id="logTableView" onMouseClicked="#logItemSelected" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
                                       <columns>
-                                        <TableColumn fx:id="logDatumCol" prefWidth="49.0" text="Datum" />
-                                        <TableColumn fx:id="logDauerCol" prefWidth="126.0" text="Dauer" />
-                                          <TableColumn fx:id="logStreckeCol" prefWidth="240.0" text="Entfernung" />
-                                          <TableColumn fx:id="logAvgCol" prefWidth="75.0" text="AVG Geschwindigkeit" />
-                                          <TableColumn fx:id="logHightCol" prefWidth="75.0" text="Höhenmeter" />
-                                          <TableColumn fx:id="logPauseCol" prefWidth="75.0" text="Davon Pause" />
-                                          <TableColumn fx:id="logGegangenCol" prefWidth="75.0" text="Davon Unterwegs" />
-                                          <TableColumn fx:id="logBemerkungCol" prefWidth="75.0" text="Bemerkung" />
+                                        <TableColumn fx:id="logDatumCol" minWidth="-1.0" prefWidth="-1.0" text="Datum" />
+                                        <TableColumn fx:id="logDauerCol" minWidth="-1.0" prefWidth="-1.0" text="Dauer" />
+                                          <TableColumn fx:id="logStreckeCol" minWidth="-1.0" prefWidth="-1.0" text="Entfernung" />
+                                          <TableColumn fx:id="logAvgCol" minWidth="-1.0" prefWidth="-1.0" text="AVG Geschwindigkeit" />
+                                          <TableColumn fx:id="logHightCol" minWidth="-1.0" prefWidth="75.0" text="Höhenmeter" />
+                                          <TableColumn fx:id="logPauseCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Pause" />
+                                          <TableColumn fx:id="logGegangenCol" minWidth="-1.0" prefWidth="-1.0" text="Davon Unterwegs" />
+                                          <TableColumn fx:id="logBemerkungCol" minWidth="-1.0" prefWidth="-1.0" text="Bemerkung" />
+                                          <TableColumn fx:id="logRatingCol1" minWidth="-1.0" prefWidth="-1.0" text="Rating" />
                                       </columns>
                                        <columnResizePolicy>
                                           <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
@@ -210,7 +211,7 @@
     </SplitPane>
     <HBox id="HBox" alignment="CENTER_LEFT" spacing="5.0" VBox.vgrow="NEVER">
       <children>
-        <Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Left status" HBox.hgrow="ALWAYS">
+        <Label maxHeight="1.7976931348623157E308" maxWidth="-1.0" text="Tourplaner" HBox.hgrow="ALWAYS">
           <font>
             <Font size="11.0" fx:id="x3" />
           </font>
@@ -219,7 +220,7 @@
           </textFill>
         </Label>
         <AnchorPane prefHeight="-1.0" prefWidth="-1.0" HBox.hgrow="ALWAYS" />
-        <Label font="$x3" maxWidth="-1.0" text="Right status" textFill="$x4" HBox.hgrow="NEVER" />
+        <Label font="$x3" maxWidth="-1.0" text="Georg Reisinger" textFill="$x4" HBox.hgrow="NEVER" />
       </children>
       <padding>
         <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />

src/tourplaner/ui/AlertHelper.java

@@ -10,6 +10,7 @@ import javafx.scene.layout.*;
 import javafx.stage.Stage;
 import javafx.stage.WindowEvent;
 import tourplaner.business.ConfigHelper;
+import tourplaner.business.EinheitenAdder;
 
 import javax.swing.*;
 import javax.swing.border.TitledBorder;

src/tourplaner/ui/TourplanerController.java

@@ -34,7 +34,7 @@ public class TourplanerController implements Initializable {
     public ImageView mapImageView;
     //Log -> rechts unten
     public TableView<Log> logTableView;
-    public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol;
+    public TableColumn<Log, String> logDauerCol, logStreckeCol, logDatumCol, logAvgCol, logHightCol, logPauseCol, logGegangenCol, logBemerkungCol, logRatingCol1;
     //Menue
     public CheckMenuItem openmap, openpdf;
     public RadioMenuItem langenglisch, langdeutsch;
@@ -154,16 +154,17 @@ public class TourplanerController implements Initializable {
         logPauseCol.setCellValueFactory(new PropertyValueFactory<Log, String>("pause"));
         logGegangenCol.setCellValueFactory(new PropertyValueFactory<Log, String>("gegangen"));
         logBemerkungCol.setCellValueFactory(new PropertyValueFactory<Log, String>("bemerkung"));
+        logRatingCol1.setCellValueFactory(new PropertyValueFactory<Log, String>("rating"));
         progressBar.addProgress(10);
         mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
         if(this.viewModel.isSucheAktiv()){
             this.viewModel.setSucheAktiv(false);
             progressBar.addProgress(10);
             syncTourNamen();
-            progressBar.addProgress(40);
+            progressBar.setProgress(100);
             this.sucheInput.setText("");
         }
-        progressBar.addProgress(50);
+        progressBar.setProgress(100);
     }
 
     /**
@@ -302,6 +303,9 @@ public class TourplanerController implements Initializable {
         this.reportsummary.setText(ConfigHelper.getLangIniString("freposum"));
         this.tourreport.setText(ConfigHelper.getLangIniString("frepotour"));
         this.beendenButton.setText(ConfigHelper.getLangIniString("fbeenden"));
+        this.sucheInput.setPromptText(ConfigHelper.getLangIniString("fsuche")+ConfigHelper.getLangIniString("fpunkte"));
+
+        this.logRatingCol1.setText("Rating");
     }
 
     @FXML

src/tourplaner/viewmodels/ViewModel.java

@@ -213,6 +213,7 @@ public class ViewModel {
                 double dauer = dauerInput(this.selectedLog.getDauer());
                 double strecke = -1;
                 double pause = -1.0;
+                double rating = -1.0;
                 double hightmeter = -1.0;
                 boolean bemerkung = false;
                 LocalDate datum = null;
@@ -227,7 +228,9 @@ public class ViewModel {
                                 if (bemerkung) {
                                     datum = dateInput(this.selectedLog.getDatum());
                                     if (datum != null) {
-                                        Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause);
+                                        rating = ratingInput(this.selectedLog.getRating());
+                                        if(rating >= 0.0) {
+                                            Log newLog = new Log(this.selectedLog.getId(), dauer, datum, strecke, this.neueBemerkung, hightmeter, pause, rating + "");
                                             this.logData.removeIf(ld -> ld.getId().equals(this.selectedLog.getId()));
                                             this.logData.add(newLog);
 //                                tourAkt.get().delLog(this.selectedLog.getId());
@@ -241,6 +244,7 @@ public class ViewModel {
                             }
                         }
                     }
+                }
             }else{
                 //Kein log
                 AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("keinlogselected"), ConfigHelper.getLangIniString("keinlogselectedmsg"));
@@ -279,6 +283,30 @@ public class ViewModel {
                         ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
     }
 
+    /**
+     * Eingabe des Ratings bis sie korrekt ist
+     * @param content Wenn der Content -1.0 ist, wird er nicht in das input feld eingeschleust, sonst schon
+     * @return Die eingegebene des Ratings
+     */
+    private double ratingInput(String content){
+        String realcontent = "";
+        if (!content.isEmpty()){
+            realcontent = content + "";
+        }
+        double input = -1;
+        while(input <= 0) {
+            input = AlertHelper.inputNumber(ConfigHelper.getLangIniString("bewertung"),
+                    ConfigHelper.getLangIniString("bewertungmsg"),
+                    ConfigHelper.getLangIniString("bewertung") +
+                            ConfigHelper.getLangIniString("doppelpunkt"), realcontent);
+            if(input < 0 && input > 5){
+                input = -1;
+                AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), ConfigHelper.getLangIniString("bewertungeror"), ConfigHelper.getLangIniString("bewertungeror2"));
+            }
+        }
+        return input;
+    }
+
     /**
      * Datum eingabe bis diese Korrekt ist
      * @return Das eingegebene korekte Datum
@@ -340,6 +368,7 @@ public class ViewModel {
                     double dauer = dauerInput(-1.0);
                     double strecke, pause, hightmeter;
                     boolean bemerkung = false;
+                    double rating = -1.0;
                     LocalDate date = null;
                     if(dauer >= 0) {
                         strecke = streckeInput("");
@@ -352,7 +381,9 @@ public class ViewModel {
                                      if (bemerkung){
                                         date = dateInput(LocalDate.now());
                                         if (date != null) {
-                                            Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause);
+                                            rating = ratingInput("");
+                                            if(rating >= 0.0) {
+                                                Log newLog = new Log(newId.get(), dauer, date, strecke, this.neueBemerkung, hightmeter, pause, rating + "");
                                                 this.logData.add(newLog);
                                                 TourPlaner.addLog(this.selectedTour.getName(), newLog);
                                                 s.addLog(newLog);
@@ -363,6 +394,7 @@ public class ViewModel {
                             }
                         }
                     }
+                }
             });
             this.neueBemerkung = null;
         }
@@ -417,8 +449,8 @@ public class ViewModel {
     }
 
     public ObservableList<Log> getLogData() {
-        logData.removeAll();
-        if(this.selectedLog != null) logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
+        logData.removeIf(s -> true);
+        if(this.selectedTour != null) logData.addAll(TourPlaner.getLogs(this.selectedTour.getName()));
         return logData;
     }