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

Del Tour

Browse Source
This commit is contained in:
Georg Reisinger 2021-03-17 15:20:31 +01:00
parent 33aaaebe89
commit a7479726ac
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tourplaner/tourplaner.fxml
View File

@ -126,11 +126,7 @@
<items> <items>
<AnchorPane prefWidth="239.0"> <AnchorPane prefWidth="239.0">
<children> <children>
<ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <ListView fx:id="TourListView" layoutX="-1.0" onMouseClicked="#tourListSelectedItem" prefHeight="520.0" prefWidth="190.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0" />
<padding>
<Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
</padding>
</ListView>
</children> </children>
</AnchorPane> </AnchorPane>
<SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0"> <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0">

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

@ -29,6 +29,7 @@ public class TourplanerController implements Initializable {
@FXML @FXML
private void tourListSelectedItem(MouseEvent mouseEvent){ private void tourListSelectedItem(MouseEvent mouseEvent){
String selectedItem = TourListView.getSelectionModel().getSelectedItem(); String selectedItem = TourListView.getSelectionModel().getSelectedItem();
this.viewModel.selectTour(selectedItem);
titleTextView.setText(selectedItem); titleTextView.setText(selectedItem);
beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem)); beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
@ -46,6 +47,8 @@ public class TourplanerController implements Initializable {
@FXML @FXML
private void delTour(){ private void delTour(){
this.beschreibungTableView.getItems().removeIf(s -> true); //löscht alles aus der tabelle
this.titleTextView.setText("Keine Tour ausgewählt!");
this.viewModel.delTour(); this.viewModel.delTour();
} }
@ -63,5 +66,6 @@ public class TourplanerController implements Initializable {
TourListView.setOrientation(Orientation.VERTICAL); TourListView.setOrientation(Orientation.VERTICAL);
TourListView.setItems(this.viewModel.getTourNamen()); TourListView.setItems(this.viewModel.getTourNamen());
this.beschreibungTableView.setPlaceholder(new Label("Keine Tour ausgewählt!")); this.beschreibungTableView.setPlaceholder(new Label("Keine Tour ausgewählt!"));
this.titleTextView.setText("Keine Tour ausgewählt!");
} }
} }

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

@ -11,7 +11,8 @@ import java.util.concurrent.atomic.AtomicReference;
public class ViewModel { public class ViewModel {
private final ObservableList<Tour> tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3, "Wien", "Graz"),new Tour("Test 2", "210", "json dings", 42.3, "Da", "Dort")); private final ObservableList<Tour> tourData = FXCollections.observableArrayList(new Tour("Test 1", "120", "json dings", 22.3, "Wien", "Graz"),new Tour("Test 2", "210", "json dings", 42.3, "Da", "Dort"));
private final ObservableList<String> tourNamen = FXCollections.observableArrayList("Test 1", "Test 2"); private final ObservableList<String> tourNamen = FXCollections.observableArrayList("Test 1", "Test 2");
private final ObservableList<Tour> selectedTour = FXCollections.observableArrayList(); //private final ObservableList<Tour> selectedTour = FXCollections.observableArrayList();
private Tour selectedTour;
private String neueTourName, neueTourStart, neueTourZiel; private String neueTourName, neueTourStart, neueTourZiel;
public void addTour(){ public void addTour(){
@ -47,15 +48,6 @@ public class ViewModel {
}); });
} }
/**
* Entfernt eine Tour anhand des Tournamens
* @param tourname Name der zu entfernenden Tour
*/
public void removeTour(String tourname){
tourData.removeIf(s -> s.getName().equals(tourname));
tourNamen.removeIf(s -> s.equals(tourname));
}
/** /**
* Holt das Tourobjekt anhand des Namens * Holt das Tourobjekt anhand des Namens
* @param tourname Name der Tour * @param tourname Name der Tour
@ -71,12 +63,13 @@ public class ViewModel {
return returnTour.get(); return returnTour.get();
} }
// public void selectTour(String tourname){ public void selectTour(String tourname){
this.selectedTour = getTour(tourname);
// this.selectedTour.removeIf(s -> true);//Alle deselect // this.selectedTour.removeIf(s -> true);//Alle deselect
// this.selectedTour.add(getTour(tourname)); // this.selectedTour.add(getTour(tourname));
// } }
public ObservableList<Tour> getSelectedTour() { public Tour getSelectedTour() {
return selectedTour; return selectedTour;
} }
@ -112,7 +105,13 @@ public class ViewModel {
return tourData; return tourData;
} }
public void delTour() { /**
* Entfernt eine Tour anhand der ausgewählten Tour
*/
public void delTour(){
String tourname = this.selectedTour.getName();
tourData.removeIf(s -> s.getName().equals(tourname));
tourNamen.removeIf(s -> s.equals(tourname));
} }
public void suche(){ public void suche(){