dergeorg/tourplaner
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Copy Tour & Log + Progressbar Verbessert

Browse Source
This commit is contained in:
Georg Reisinger 2021-04-27 23:53:05 +02:00
parent e56e77dce0
commit 792aea12c4
10 changed files with 234 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
langde.ini
View File

@ -106,4 +106,7 @@ rsummrepo = Zusammengefasster Report
bewertung = Bewertung bewertung = Bewertung
bewertungmsg = Bitte die Bewertung zwischen 0 und 5 eingeben bewertungmsg = Bitte die Bewertung zwischen 0 und 5 eingeben
bewertungeror = Bitte nur Bewertungen von 0 und 5 eingeben bewertungeror = Bitte nur Bewertungen von 0 und 5 eingeben
bewertungerror2 = Bitte nur Zahlen zum Bewerten bewertungerror2 = Bitte nur Zahlen zum Bewerten
copybtn = Kopieren
rating = Bewertung

5
langen.ini
View File

@ -107,4 +107,7 @@ rsummrepo = Summary Report
bewertung = Rating bewertung = Rating
bewertungmsg = Please enter a rating from 0 to 5 bewertungmsg = Please enter a rating from 0 to 5
bewertungeror = Please enter only a rating from 0 to 5 bewertungeror = Please enter only a rating from 0 to 5
bewertungerror2 = Please only enter numbers for rating bewertungerror2 = Please only enter numbers for rating
copybtn = Copy
rating = Rating

18
src/tourplaner/business/Exporter.java
View File

@ -29,9 +29,9 @@ public class Exporter {
*/ */
public void doExport() throws IOException { public void doExport() throws IOException {
ProgressBar progressBar = new ProgressBar("Export..."); ProgressBar progressBar = new ProgressBar("Export...");
int step = progressBar.getProgressSize(4, 100);
ArrayList<Tour> data = new DbConnect().getAllTouren();
ArrayList<Tour> data = new DbConnect().getAllTouren(progressBar, 15);
int step = progressBar.getProgressSize(4, 100);
progressBar.addProgress(step); progressBar.addProgress(step);
FileWriter fileWriter = new FileWriter(EinheitenAdder.addJson(this.path)); FileWriter fileWriter = new FileWriter(EinheitenAdder.addJson(this.path));
progressBar.addProgress(step); progressBar.addProgress(step);
@ -45,20 +45,18 @@ public class Exporter {
/** /**
* Führt den Imput aus: File holen, Daten in db erstellen * Führt den Imput aus: File holen, Daten in db erstellen
*/ */
public void doImport() { public void doImport(ProgressBar progressBar, int progressMax) {
ProgressBar progressBar = new ProgressBar("Import...");
try { try {
ArrayList<Tour> touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path))); ArrayList<Tour> touren = JsonHelper.getTourenFromJson(new FileReader(EinheitenAdder.addJson(this.path)));
DbConnect dbConnect = new DbConnect(); DbConnect dbConnect = new DbConnect();
ArrayList<Tour> allTours = dbConnect.getAllTouren(); ArrayList<Tour> allTours = dbConnect.getAllTouren(progressBar, 15);
progressBar.addProgress(2); int size = progressBar.getProgressSize(allTours.size(), 35);
int size = progressBar.getProgressSize(allTours.size(), 25);
allTours.forEach(t -> { allTours.forEach(t -> {
TourPlaner.delTour(t.getName()); TourPlaner.delTour(t.getName());
progressBar.addProgress(size); progressBar.addProgress(size);
}); });
int finalSize = progressBar.getProgressSize(touren.size() * 3, 100); int finalSize = progressBar.getProgressSize(touren.size() * 3, progressMax);
for (Tour tour: touren) { for (Tour tour: touren) {
new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName()); new DirectionMap(tour.getStart(), tour.getZiel(), tour.getName());
progressBar.addProgress(finalSize); progressBar.addProgress(finalSize);
@ -72,8 +70,8 @@ public class Exporter {
} }
} catch (IOException e) { } catch (IOException e) {
LogHelper.error(e); LogHelper.error(e);
progressBar.setProgress(100); progressBar.setProgress(progressMax);
} }
progressBar.setProgress(100); progressBar.setProgress(progressMax);
} }
} }

5
src/tourplaner/business/Reporter.java
View File

@ -7,6 +7,7 @@ import tourplaner.object.Log;
import tourplaner.object.Tour; import tourplaner.object.Tour;
import com.itextpdf.text.pdf.PdfWriter; import com.itextpdf.text.pdf.PdfWriter;
import tourplaner.ui.ProgressBar;
import java.awt.*; import java.awt.*;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
@ -33,8 +34,8 @@ public class Reporter {
/** /**
* Erstellt den Summary Report * Erstellt den Summary Report
*/ */
public static void sumReport(){ public static void sumReport(ProgressBar progressBar, int maxLevel){
ArrayList<Tour> tours = TourPlaner.getAllTours(); ArrayList<Tour> tours = TourPlaner.getAllTours(progressBar, maxLevel);
String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "summary.pdf"; String file = ConfigHelper.getIniString(ConfigHelper.getStandartConfig(), "report", "path") + "summary.pdf";
try { try {
Document document = new Document(); Document document = new Document();

45
src/tourplaner/business/TourPlaner.java
View File

@ -1,5 +1,6 @@
package tourplaner.business; package tourplaner.business;
import javafx.collections.ObservableList;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import tourplaner.data.DbConnect; import tourplaner.data.DbConnect;
import tourplaner.object.Log; import tourplaner.object.Log;
@ -11,6 +12,8 @@ import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
/** /**
* Haupt Logik des Tourplaners * Haupt Logik des Tourplaners
@ -28,8 +31,8 @@ public class TourPlaner{
* Holt alle touren aus der DB * Holt alle touren aus der DB
* @return Alle touren als ArrayList * @return Alle touren als ArrayList
*/ */
public static ArrayList<Tour> getAllTours(){ public static ArrayList<Tour> getAllTours(ProgressBar progressBar, int maxLevel){
return new DbConnect().getAllTouren(); return new DbConnect().getAllTouren(progressBar, maxLevel);
} }
/** /**
@ -69,20 +72,32 @@ public class TourPlaner{
* Fügt eine Tour hinzu * Fügt eine Tour hinzu
* @param newTour Neue Tour * @param newTour Neue Tour
* @param progressBar Aktuelle Progressbar * @param progressBar Aktuelle Progressbar
* @param progressMax Maximale anzeige der Progress bar
* @return false bei error * @return false bei error
* @throws IOException Fehler beim hinzufügen der Tour * @throws IOException Fehler beim hinzufügen der Tour
*/ */
public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException { public static boolean addTourMax(Tour newTour, ProgressBar progressBar, int progressMax) throws IOException {
int step = progressBar.getProgressSize(2, 100); int step = progressBar.getProgressSize(2, progressMax);
DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName()); DirectionMap directionMap = new DirectionMap(newTour.getStart(), newTour.getZiel(), newTour.getName());
progressBar.addProgress(step); progressBar.addProgress(step);
newTour.setDauer(directionMap.getDauer()+""); newTour.setDauer(directionMap.getDauer()+"");
newTour.setStrecke(directionMap.getStrecke()); newTour.setStrecke(directionMap.getStrecke());
boolean ret = new DbConnect().addTour(newTour); boolean ret = new DbConnect().addTour(newTour);
progressBar.setProgress(100); progressBar.setProgress(progressMax);
return ret; return ret;
} }
/**
* Fügt eine Tour hinzu
* @param newTour Neue Tour
* @param progressBar Aktuelle Progressbar
* @return false bei error
* @throws IOException Fehler beim hinzufügen der Tour
*/
public static boolean addTour(Tour newTour, ProgressBar progressBar) throws IOException {
return addTourMax(newTour, progressBar, 100);
}
/** /**
* Path zu dem Bild für die GUI * Path zu dem Bild für die GUI
* @param tourname Name der Tour * @param tourname Name der Tour
@ -165,9 +180,9 @@ public class TourPlaner{
* @param tourname Name der zu suchen ist * @param tourname Name der zu suchen ist
* @return Alle touren die auf den Suchterm passen * @return Alle touren die auf den Suchterm passen
*/ */
public static ArrayList<Tour> sucheTour(String tourname){ public static ArrayList<Tour> sucheTour(String tourname, ProgressBar progressBar, int maxProgress){
ArrayList<Tour> touren = new ArrayList<>(); ArrayList<Tour> touren = new ArrayList<>();
getAllTours().forEach(t ->{ getAllTours(progressBar, maxProgress).forEach(t ->{
ArrayList<Log> logs = t.getLogs(); ArrayList<Log> logs = t.getLogs();
ArrayList<String> bemerkungen = new ArrayList<>(); ArrayList<String> bemerkungen = new ArrayList<>();
for (Log l:logs) { for (Log l:logs) {
@ -187,4 +202,20 @@ public class TourPlaner{
return touren; return touren;
} }
/**
* Erzeugt eine Neue Log id
* @param logData Alle log daten
* @return Neue log id
*/
public static String newLogId(ObservableList<Log> logData){
AtomicReference<String> newId = new AtomicReference<>();
newId.set(UUID.randomUUID().toString());
logData.forEach(ss -> {
if (ss.getId().equals(newId.get())) {
newId.set(UUID.randomUUID().toString());
}
});
return newId.get();
}
} }

13
src/tourplaner/data/DbConnect.java
View File

@ -167,17 +167,18 @@ public class DbConnect {
/** /**
* Holt alle Touren aus der Datenbank * Holt alle Touren aus der Datenbank
* @param progressBar Aktuelle Progress bar
* @param maxLevel Maximales level der progress bar
* @return Null bei fehler, sonst eine List aus den IDs * @return Null bei fehler, sonst eine List aus den IDs
*/ */
public ArrayList<Tour> getAllTouren() { public ArrayList<Tour> getAllTouren(ProgressBar progressBar, int maxLevel) {
this.c = PostgresHelper.con(); this.c = PostgresHelper.con();
String tourname, mapjson, start, ziel; String tourname, mapjson, start, ziel;
double dauer, strecke; double dauer, strecke;
ArrayList<Tour> touren = new ArrayList<>(); ArrayList<Tour> touren = new ArrayList<>();
ProgressBar progressBar = new ProgressBar("Get...");
try { try {
int tourSize = getTourSize(); int tourSize = getTourSize();
int step = progressBar.getProgressSize(tourSize, 100); int step = progressBar.getProgressSize(tourSize, maxLevel);
stmt = this.c.createStatement(); stmt = this.c.createStatement();
ResultSet rs = stmt.executeQuery("select * from tour;"); ResultSet rs = stmt.executeQuery("select * from tour;");
while (rs.next()) { while (rs.next()) {
@ -191,18 +192,18 @@ public class DbConnect {
touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname))); touren.add(new Tour(tourname, dauer + "", mapjson, strecke, start, ziel, getLogs(tourname)));
progressBar.addProgress(step); progressBar.addProgress(step);
}else { }else {
progressBar.setProgress(100); progressBar.setProgress(maxLevel);
return null; return null;
} }
} }
progressBar.setProgress(100); progressBar.setProgress(maxLevel);
rs.close(); rs.close();
stmt.close(); stmt.close();
this.c.close(); this.c.close();
return touren; return touren;
} catch (Exception e) { } catch (Exception e) {
LogHelper.error(e); LogHelper.error(e);
progressBar.setProgress(100); progressBar.setProgress(maxLevel);
return null; return null;
} }
} }

4
src/tourplaner/object/Log.java
View File

@ -23,6 +23,10 @@ public class Log {
} }
} }
public void setId(String id){
this.id = id;
}
public String getRating() { public String getRating() {
return rating; return rating;
} }

53
src/tourplaner/tourplaner.fxml
View File

@ -68,12 +68,36 @@
<padding> <padding>
<Insets bottom="3.0" left="3.0" right="3.0" top="3.0" /> <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
</padding> </padding>
<AnchorPane HBox.hgrow="ALWAYS"> <HBox>
<Button fx:id="tourAdd" layoutX="58.0" mnemonicParsing="false" onAction="#addTour" text="+" /> <children>
<Label layoutX="14.0" layoutY="4.0" text="Tours" /> <Label text="Tours:">
<Button fx:id="tourDel" layoutX="89.0" mnemonicParsing="false" onAction="#delTour" text="-" /> <HBox.margin>
<Button fx:id="editTourBtn" layoutX="117.0" mnemonicParsing="false" onAction="#editTourBtn" text="Edit" /> <Insets bottom="10.0" left="10.0" right="6.0" top="10.0" />
</AnchorPane> </HBox.margin>
</Label>
<Button fx:id="tourAdd" mnemonicParsing="false" onAction="#addTour" text="+">
<HBox.margin>
<Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin>
</Button>
<Button fx:id="tourDel" mnemonicParsing="false" onAction="#delTour" text="-">
<HBox.margin>
<Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin>
</Button>
<Button fx:id="editTourBtn" mnemonicParsing="false" onAction="#editTourBtn" text="Edit">
<HBox.margin>
<Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin>
</Button>
<Button fx:id="copyTourBtn" mnemonicParsing="false" onAction="#copyTour" text="Copy">
<HBox.margin>
<Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin>
</Button>
</children>
</HBox>
<AnchorPane HBox.hgrow="ALWAYS" />
<TextField fx:id="sucheInput" onKeyPressed="#sucheEnter" promptText="Suche..." /> <TextField fx:id="sucheInput" onKeyPressed="#sucheEnter" promptText="Suche..." />
<Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" /> <Button fx:id="sucheButton" mnemonicParsing="false" onAction="#suche" text="Suchen" />
</HBox> </HBox>
@ -125,20 +149,27 @@
</padding> </padding>
<Label text="Logs:"> <Label text="Logs:">
<HBox.margin> <HBox.margin>
<Insets left="10.0" /> <Insets bottom="10.0" left="10.0" right="6.0" top="10.0" />
</HBox.margin> </HBox.margin>
</Label> </Label>
<Button mnemonicParsing="false" onAction="#addLog" text="+" textAlignment="CENTER"> <Button mnemonicParsing="false" onAction="#addLog" text="+" textAlignment="CENTER">
<HBox.margin> <HBox.margin>
<Insets /> <Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin> </HBox.margin>
</Button> </Button>
<Button fx:id="logDel" mnemonicParsing="false" onAction="#delLog" prefWidth="21.0" text="-" textAlignment="CENTER"> <Button fx:id="logDel" mnemonicParsing="false" onAction="#delLog" text="-" textAlignment="CENTER">
<HBox.margin> <HBox.margin>
<Insets /> <Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin> </HBox.margin>
</Button> </Button>
<Button fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn" text="Edit" /> <Button fx:id="editBtn" mnemonicParsing="false" onAction="#editLogBtn" text="Edit">
<HBox.margin>
<Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin></Button>
<Button fx:id="copyBtn" layoutX="112.0" layoutY="13.0" mnemonicParsing="false" onAction="#copyLogBtn" text="Copy">
<HBox.margin>
<Insets bottom="6.0" right="6.0" top="6.0" />
</HBox.margin></Button>
</HBox> </HBox>
</AnchorPane> </AnchorPane>
<AnchorPane> <AnchorPane>

82
src/tourplaner/ui/TourplanerController.java
View File

@ -41,7 +41,21 @@ public class TourplanerController implements Initializable {
public Menu menueFile, menuebearbeiten, menueoptionen, menuesprachen, menuehilfe; public Menu menueFile, menuebearbeiten, menueoptionen, menuesprachen, menuehilfe;
public MenuItem reportsummary, tourreport, beendenButton; public MenuItem reportsummary, tourreport, beendenButton;
//Elemente //Elemente
public Button sucheButton, editBtn, editTourBtn; public Button sucheButton, editBtn, editTourBtn, copyTourBtn, copyBtn;
@FXML
private void copyTour(){
ProgressBar progressBar = new ProgressBar("Copy");
this.viewModel.copyTour(progressBar, 80);
syncTourNamen(progressBar, 90);
tourFocusOnSelected(progressBar, 100);
}
@FXML
private void copyLogBtn(){
this.viewModel.copyLog();
syncLogs();
}
@FXML @FXML
private void onlangenglisch(){ private void onlangenglisch(){
@ -109,9 +123,9 @@ public class TourplanerController implements Initializable {
mapImageView.setImage(this.viewModel.getImage(selectedItem)); mapImageView.setImage(this.viewModel.getImage(selectedItem));
} }
private void syncTourNamen(){ private void syncTourNamen(ProgressBar progressBar, int maxLevel){
TourListView.getItems().clear(); TourListView.getItems().clear();
TourListView.setItems(this.viewModel.getTourNamen()); TourListView.setItems(this.viewModel.getTourNamen(progressBar, maxLevel));
} }
private void syncLogs(){ private void syncLogs(){
@ -128,12 +142,13 @@ public class TourplanerController implements Initializable {
private void tourListSelectedItem(MouseEvent mouseEvent){ private void tourListSelectedItem(MouseEvent mouseEvent){
//Beschreibung //Beschreibung
ProgressBar progressBar = new ProgressBar("Tour auswählen..."); ProgressBar progressBar = new ProgressBar("Tour auswählen...");
int steps = progressBar.getProgressSize(7, 100);
String selectedItem = TourListView.getSelectionModel().getSelectedItem(); String selectedItem = TourListView.getSelectionModel().getSelectedItem();
this.viewModel.selectTour(selectedItem); this.viewModel.selectTour(selectedItem);
titleTextView.setText(selectedItem); titleTextView.setText(selectedItem);
progressBar.addProgress(10); progressBar.addProgress(steps);
syncTour(selectedItem); syncTour(selectedItem);
progressBar.addProgress(10); progressBar.addProgress(steps);
startCol.setCellValueFactory(new PropertyValueFactory<>("start")); startCol.setCellValueFactory(new PropertyValueFactory<>("start"));
zielCol.setCellValueFactory(new PropertyValueFactory<>("ziel")); zielCol.setCellValueFactory(new PropertyValueFactory<>("ziel"));
dauerCol.setCellValueFactory(new PropertyValueFactory<>("dauer")); dauerCol.setCellValueFactory(new PropertyValueFactory<>("dauer"));
@ -143,9 +158,9 @@ public class TourplanerController implements Initializable {
//Log anzeigen //Log anzeigen
logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden"))); logTableView.setPlaceholder(new Label( ConfigHelper.getLangIniString("keinelogsvorhanden")));
logTableView.getItems().clear(); logTableView.getItems().clear();
progressBar.addProgress(10); progressBar.addProgress(steps);
logTableView.setItems(this.viewModel.getLogData()); logTableView.setItems(this.viewModel.getLogData());
progressBar.addProgress(10); progressBar.addProgress(steps);
logDauerCol.setCellValueFactory(new PropertyValueFactory<>("dauer")); logDauerCol.setCellValueFactory(new PropertyValueFactory<>("dauer"));
logStreckeCol.setCellValueFactory(new PropertyValueFactory<>("strecke")); logStreckeCol.setCellValueFactory(new PropertyValueFactory<>("strecke"));
logDatumCol.setCellValueFactory(new PropertyValueFactory<>("datum")); logDatumCol.setCellValueFactory(new PropertyValueFactory<>("datum"));
@ -155,28 +170,33 @@ public class TourplanerController implements Initializable {
logGegangenCol.setCellValueFactory(new PropertyValueFactory<>("gegangen")); logGegangenCol.setCellValueFactory(new PropertyValueFactory<>("gegangen"));
logBemerkungCol.setCellValueFactory(new PropertyValueFactory<>("bemerkung")); logBemerkungCol.setCellValueFactory(new PropertyValueFactory<>("bemerkung"));
logRatingCol1.setCellValueFactory(new PropertyValueFactory<>("rating")); logRatingCol1.setCellValueFactory(new PropertyValueFactory<>("rating"));
progressBar.addProgress(10); progressBar.addProgress(steps);
mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName())); mapImageView.setImage(this.viewModel.getImage(this.viewModel.getSelectedTour().getName()));
if(this.viewModel.isSucheAktiv()){ if(this.viewModel.isSucheAktiv()){
this.viewModel.setSucheAktiv(false); this.viewModel.setSucheAktiv(false);
progressBar.addProgress(10); syncTourNamen(progressBar, 100 - steps);
syncTourNamen();
progressBar.setProgress(100);
this.sucheInput.setText(""); this.sucheInput.setText("");
//Tour namen select focus tourFocusOnSelected(progressBar, 100);
AtomicInteger index = new AtomicInteger();
AtomicInteger indexF = new AtomicInteger();
this.viewModel.getTourNamen().forEach(tn -> {
index.getAndIncrement();
if(tn.equals(this.viewModel.getSelectedTour().getName())){
indexF.set(index.get());
}
});
TourListView.getFocusModel().focus(indexF.intValue() - 1);
} }
progressBar.setProgress(100); progressBar.setProgress(100);
} }
/**
* Setzt den Focus auf die ausgewählte Tour
*/
private void tourFocusOnSelected(ProgressBar progressBar, int maxLevel){
//Tour namen select focus
AtomicInteger index = new AtomicInteger();
AtomicInteger indexF = new AtomicInteger();
this.viewModel.getTourNamen(progressBar, maxLevel).forEach(tn -> {
index.getAndIncrement();
if(tn.equals(this.viewModel.getSelectedTour().getName())){
indexF.set(index.get());
}
});
TourListView.getFocusModel().focus(indexF.intValue() - 1);
}
/** /**
* Beendet die App * Beendet die App
* Verbunden mit dem Menu -> Datei -> Beenden * Verbunden mit dem Menu -> Datei -> Beenden
@ -215,8 +235,7 @@ public class TourplanerController implements Initializable {
@FXML @FXML
private void suche(){ private void suche(){
ProgressBar progressBar = new ProgressBar("Suche"); ProgressBar progressBar = new ProgressBar("Suche");
this.viewModel.suche(this.sucheInput.getText()); this.viewModel.suche(this.sucheInput.getText(), progressBar, 100);
progressBar.addProgress(100);
progressBar.closeProgress(); progressBar.closeProgress();
} }
@ -262,7 +281,7 @@ public class TourplanerController implements Initializable {
//Tour list -> links //Tour list -> links
TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE); TourListView.getSelectionModel().setSelectionMode(SelectionMode.SINGLE);
TourListView.setOrientation(Orientation.VERTICAL); TourListView.setOrientation(Orientation.VERTICAL);
syncTourNamen(); syncTourNamen(new ProgressBar("Start"), 100);
deselectAll(); deselectAll();
if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){ if(ConfigHelper.getIniInt(ConfigHelper.getStandartConfig(), "settings", "openpdf") == 1){
this.openpdf.setSelected(true); this.openpdf.setSelected(true);
@ -288,6 +307,9 @@ public class TourplanerController implements Initializable {
langToFxml(); langToFxml();
} }
/**
* Setzt jedem Element den Text der gewählten Sprache
*/
private void langToFxml(){ private void langToFxml(){
this.kartenTab.setText(ConfigHelper.getLangIniString("fkarte")); this.kartenTab.setText(ConfigHelper.getLangIniString("fkarte"));
this.beschreibungTab.setText(ConfigHelper.getLangIniString("fbeschreibung")); this.beschreibungTab.setText(ConfigHelper.getLangIniString("fbeschreibung"));
@ -306,7 +328,6 @@ public class TourplanerController implements Initializable {
this.logHightCol.setText(ConfigHelper.getLangIniString("fhight")); this.logHightCol.setText(ConfigHelper.getLangIniString("fhight"));
this.logPauseCol.setText(ConfigHelper.getLangIniString("fpause")); this.logPauseCol.setText(ConfigHelper.getLangIniString("fpause"));
this.logStreckeCol.setText(ConfigHelper.getLangIniString("fstrecke")); this.logStreckeCol.setText(ConfigHelper.getLangIniString("fstrecke"));
this.sucheButton.setText(ConfigHelper.getLangIniString("fsuche")); this.sucheButton.setText(ConfigHelper.getLangIniString("fsuche"));
this.openmap.setText(ConfigHelper.getLangIniString("fopenmapsetting")); this.openmap.setText(ConfigHelper.getLangIniString("fopenmapsetting"));
this.openpdf.setText(ConfigHelper.getLangIniString("fopenpdfsetting")); this.openpdf.setText(ConfigHelper.getLangIniString("fopenpdfsetting"));
@ -320,9 +341,11 @@ public class TourplanerController implements Initializable {
this.reportsummary.setText(ConfigHelper.getLangIniString("freposum")); this.reportsummary.setText(ConfigHelper.getLangIniString("freposum"));
this.tourreport.setText(ConfigHelper.getLangIniString("frepotour")); this.tourreport.setText(ConfigHelper.getLangIniString("frepotour"));
this.beendenButton.setText(ConfigHelper.getLangIniString("fbeenden")); this.beendenButton.setText(ConfigHelper.getLangIniString("fbeenden"));
this.sucheInput.setPromptText(ConfigHelper.getLangIniString("fsuche")+ConfigHelper.getLangIniString("fpunkte")); this.sucheInput.setPromptText(ConfigHelper.getLangIniString("fsuche") + ConfigHelper.getLangIniString("fpunkte"));
this.logRatingCol1.setText(ConfigHelper.getLangIniString("rating"));
this.logRatingCol1.setText("Rating"); this.copyBtn.setText(ConfigHelper.getLangIniString("copybtn"));
this.copyTourBtn.setText(ConfigHelper.getLangIniString("copybtn"));
} }
@FXML @FXML
@ -354,9 +377,10 @@ public class TourplanerController implements Initializable {
@FXML @FXML
private void importBtn(){ private void importBtn(){
ProgressBar progressBar = new ProgressBar("Import");
deselectAll(); deselectAll();
this.viewModel.importData(); this.viewModel.importData(progressBar, 90);
syncTourNamen(); syncTourNamen(progressBar, 100);
} }
@FXML @FXML

86
src/tourplaner/viewmodels/ViewModel.java
View File

@ -356,12 +356,7 @@ public class ViewModel {
this.tourData.forEach(s -> { this.tourData.forEach(s -> {
if (s.getName().equals(this.selectedTour.getName())) { if (s.getName().equals(this.selectedTour.getName())) {
AtomicReference<String> newId = new AtomicReference<>(); AtomicReference<String> newId = new AtomicReference<>();
newId.set(UUID.randomUUID().toString()); newId.set(TourPlaner.newLogId(this.logData));
this.logData.forEach(ss -> {
if (ss.getId().equals(newId.get())) {
newId.set(UUID.randomUUID().toString());
}
});
double dauer = dauerInput(-1.0); double dauer = dauerInput(-1.0);
double strecke, pause, hightmeter; double strecke, pause, hightmeter;
boolean bemerkung = false; boolean bemerkung = false;
@ -476,17 +471,17 @@ public class ViewModel {
return selectedTour; return selectedTour;
} }
public ObservableList<String> getTourNamen() { public ObservableList<String> getTourNamen(ProgressBar progressBar, int maxLevel) {
ArrayList<String> namen = new ArrayList<>(); ArrayList<String> namen = new ArrayList<>();
getTourData().forEach(s -> namen.add(s.getName())); getTourData(progressBar, maxLevel).forEach(s -> namen.add(s.getName()));
tourNamen.clear(); tourNamen.clear();
tourNamen.addAll(namen); tourNamen.addAll(namen);
return tourNamen; return tourNamen;
} }
public ObservableList<Tour> getTourData() { public ObservableList<Tour> getTourData(ProgressBar progressBar, int maxLevel) {
tourData.clear(); tourData.clear();
ArrayList<Tour> touren = TourPlaner.getAllTours(); ArrayList<Tour> touren = TourPlaner.getAllTours(progressBar, maxLevel);
if(touren != null) { if(touren != null) {
tourData.addAll(touren); tourData.addAll(touren);
} }
@ -521,18 +516,21 @@ public class ViewModel {
* Sucht eine Tour * Sucht eine Tour
* @param sucheInput Text nach dem gesucht werden soll * @param sucheInput Text nach dem gesucht werden soll
*/ */
public void suche(String sucheInput){ public void suche(String sucheInput, ProgressBar progressBar, int maxProgress){
if(sucheInput.isEmpty()){ if(sucheInput.isEmpty()){
AlertHelper.warn(ConfigHelper.getLangIniString("achtung"), AlertHelper.warn(ConfigHelper.getLangIniString("achtung"),
ConfigHelper.getLangIniString("suchfeldleer"), ConfigHelper.getLangIniString("suchfeldleer"),
ConfigHelper.getLangIniString("suchtextzuerst")); ConfigHelper.getLangIniString("suchtextzuerst"));
} }
ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput); ArrayList<Tour> result = TourPlaner.sucheTour(sucheInput, progressBar, maxProgress/2);
int steps = progressBar.getProgressSize(result.size(), maxProgress);
tourNamen.clear(); tourNamen.clear();
for (Tour tour:result) { for (Tour tour:result) {
tourNamen.add(tour.getName()); tourNamen.add(tour.getName());
progressBar.addProgress(steps);
} }
this.sucheAktiv = true; this.sucheAktiv = true;
progressBar.setProgress(maxProgress);
} }
public boolean isSucheAktiv() { public boolean isSucheAktiv() {
@ -626,11 +624,11 @@ public class ViewModel {
/** /**
* Importiert alle daten von einem File das hier gewählt wird * Importiert alle daten von einem File das hier gewählt wird
*/ */
public void importData() { public void importData(ProgressBar progressBar, int maxProgress) {
String file = AlertHelper.fileChooser("Importiere"); String file = AlertHelper.fileChooser("Importiere");
if (file != null){ if (file != null){
this.tourNamen = FXCollections.observableArrayList(); this.tourNamen = FXCollections.observableArrayList();
new Exporter(file).doImport(); new Exporter(file).doImport(progressBar, maxProgress);
} }
} }
@ -638,6 +636,64 @@ public class ViewModel {
* Erstellt einen Summary Report * Erstellt einen Summary Report
*/ */
public void sumReport(){ public void sumReport(){
Reporter.sumReport(); Reporter.sumReport(new ProgressBar("Report"), 100);
}
/**
* Gibt das Selected Log zurück
* @return Null wenn nichts selected ist
*/
public Log getSelectedLog() {
return selectedLog;
}
/**
* Kopiert einen Log eintrag und erstellt dafür eine neue Id für das kopierte log
*/
public void copyLog() {
Log selectedLog = getSelectedLog();
Tour selectedTour = getSelectedTour();
if(selectedLog == null && selectedTour == null){
//TODO kein log & keine tour selected error alert
}else {
selectedLog.setId(TourPlaner.newLogId(this.logData));
TourPlaner.addLog(selectedTour.getName(), selectedLog);
}
}
/**
* Kopiert eie Tour und hängt dafür am ende des namens ein _copy an
* @return Der neue Tour name, bei error ""
*/
public String copyTour(ProgressBar progressBar, int maxLevel) {
Tour selectedTour = getSelectedTour();
String newName = "";
if (selectedTour == null){
//TODO keine tour selected
return "";
}else {
newName = selectedTour.getName() + "_copy";
try {
ArrayList<Log> logs = TourPlaner.getLogs(selectedTour.getName());
progressBar.addProgress(10);
TourPlaner.addTourMax(new Tour(newName, selectedTour.getDauer(), selectedTour.getMapJson(), selectedTour.getStrecke(), selectedTour.getStart(), selectedTour.getZiel(), logs), progressBar, 70);
String finalNewName = newName;
int steps = progressBar.getProgressSize(logs.size(), maxLevel-10);
logs.forEach(l -> {
TourPlaner.addLog(finalNewName, l);
progressBar.addProgress(steps);
});
getTourData(progressBar, maxLevel);
// getLogData();
selectTour(newName);
progressBar.setProgress(maxLevel);
return newName;
} catch (IOException e) {
LogHelper.error(e);
progressBar.setProgress(maxLevel);
return "";
}
}
} }
} }