From a7479726ac36412b27314403addaec358137e71d Mon Sep 17 00:00:00 2001
From: Georg-Notebook <georg@dergeorg.at>
Date: Wed, 17 Mar 2021 15:20:31 +0100
Subject: [PATCH] Del Tour

---
 src/tourplaner/tourplaner.fxml              |  6 +----
 src/tourplaner/ui/TourplanerController.java |  4 +++
 src/tourplaner/viewmodels/ViewModel.java    | 27 ++++++++++-----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/tourplaner/tourplaner.fxml b/src/tourplaner/tourplaner.fxml
index 3b5be09..a09b8b2 100644
--- a/src/tourplaner/tourplaner.fxml
+++ b/src/tourplaner/tourplaner.fxml
@@ -126,11 +126,7 @@
       <items>
             <AnchorPane prefWidth="239.0">
                <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">
-                     <padding>
-                        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-                     </padding>
-                  </ListView>
+                  <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" />
                </children>
             </AnchorPane>
             <SplitPane dividerPositions="0.5" orientation="VERTICAL" prefHeight="496.0" prefWidth="620.0">
diff --git a/src/tourplaner/ui/TourplanerController.java b/src/tourplaner/ui/TourplanerController.java
index bea7ea4..effdeee 100644
--- a/src/tourplaner/ui/TourplanerController.java
+++ b/src/tourplaner/ui/TourplanerController.java
@@ -29,6 +29,7 @@ public class TourplanerController implements Initializable {
     @FXML
     private void tourListSelectedItem(MouseEvent mouseEvent){
         String selectedItem = TourListView.getSelectionModel().getSelectedItem();
+        this.viewModel.selectTour(selectedItem);
         titleTextView.setText(selectedItem);
         beschreibungTableView.getItems().removeIf(s -> true); //Leert die Table View komplett
         beschreibungTableView.getItems().add(this.viewModel.getTour(selectedItem));
@@ -46,6 +47,8 @@ public class TourplanerController implements Initializable {
 
     @FXML
     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();
     }
 
@@ -63,5 +66,6 @@ public class TourplanerController implements Initializable {
         TourListView.setOrientation(Orientation.VERTICAL);
         TourListView.setItems(this.viewModel.getTourNamen());
         this.beschreibungTableView.setPlaceholder(new Label("Keine Tour ausgewählt!"));
+        this.titleTextView.setText("Keine Tour ausgewählt!");
     }
 }
diff --git a/src/tourplaner/viewmodels/ViewModel.java b/src/tourplaner/viewmodels/ViewModel.java
index f411562..6479838 100644
--- a/src/tourplaner/viewmodels/ViewModel.java
+++ b/src/tourplaner/viewmodels/ViewModel.java
@@ -11,7 +11,8 @@ import java.util.concurrent.atomic.AtomicReference;
 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<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;
 
     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
      * @param tourname Name der Tour
@@ -71,12 +63,13 @@ public class ViewModel {
         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.add(getTour(tourname));
-//    }
+    }
 
-    public ObservableList<Tour> getSelectedTour() {
+    public Tour getSelectedTour() {
         return selectedTour;
     }
 
@@ -112,7 +105,13 @@ public class ViewModel {
         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(){