diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java index aaad16f..65a944d 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java @@ -14,9 +14,11 @@ import javafx.fxml.FXML; import javafx.scene.control.*; import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.GridPane; +import javafx.stage.Modality; import java.sql.SQLException; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -120,6 +122,9 @@ public class StationsHistorieController { btnStatHistEdit.visibleProperty().bind(state.isEqualTo(State.VIEW) .and(tblStationsHistorie.getSelectionModel().selectedItemProperty().isNotNull())); btnStatHistEdit.managedProperty().bind(btnStatHistEdit.visibleProperty()); + + btnStatHistDelete.visibleProperty().bind(btnStatHistEdit.visibleProperty()); + btnStatHistDelete.managedProperty().bind(btnStatHistDelete.visibleProperty()); } private void initStationsFilter(){ @@ -190,6 +195,35 @@ public class StationsHistorieController { setStationsHistorieSelected(null); } + @FXML + private void clickedDelete(){ + StationsHistorie selectedItem = tblStationsHistorie.getSelectionModel().getSelectedItem(); + + if(!LocalDateTime.now().isBefore(selectedItem.getAufnahmeDatum())){ + Alert alert = new Alert(Alert.AlertType.WARNING); + alert.setTitle("Information Dialog"); + alert.setHeaderText(null); + alert.setContentText("I have a great message for you!"); + alert.initOwner(btnStatHistCancel.getScene().getWindow()); + alert.initModality(Modality.APPLICATION_MODAL); + alert.showAndWait(); + return; + } + + try{ + DBHandler.delStationsHistorie(selectedItem); + }catch (Exception e){ + e.printStackTrace(); + } + + mainController.refreshCaseData(); + + + } + + @FXML + Button btnStatHistDelete; + public ObservableList getStationsHistorie() { return stationsHistorie.get(); } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java index 6e61bc6..d5cdb30 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/UntersuchungenController.java @@ -101,7 +101,9 @@ public class UntersuchungenController { setText(item.toString()); if(item.getStorniert()){ setTextFill(Color.GRAY); - setGraphic(new Text(" ")); + Text text = new Text(" "); + text.setFill(Color.RED); + setGraphic(text); }else{ setTextFill(Color.BLACK); setGraphic(null); diff --git a/src/main/resources/stationshistorie.fxml b/src/main/resources/stationshistorie.fxml index 1b953ee..253a5ec 100644 --- a/src/main/resources/stationshistorie.fxml +++ b/src/main/resources/stationshistorie.fxml @@ -63,6 +63,7 @@