diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java index 0efc89e..f228e27 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/LogController.java @@ -33,14 +33,12 @@ public class LogController { public LogController(MainController mainController) { this.mainController = mainController; - } @FXML private void initialize(){ initColumns(); refreshLogFromDb(); - } private void initColumns(){ @@ -95,5 +93,11 @@ public class LogController { } + private void clickedRefresh(){ + refreshLogFromDb(); + } + + + } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java index 379b9a2..94d0a90 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/MainController.java @@ -236,7 +236,9 @@ public class MainController { } setText(item.toString()); if (item.getStorniert()) { - setGraphic(new Label(" ")); + Text text = new Text(" "); + text.setFill(Color.RED); + setGraphic(text); setTextFill(Color.GRAY); //TODO } else { setTextFill(Color.BLACK); 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 65a944d..83f7715 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/StationsHistorieController.java @@ -201,9 +201,9 @@ public class StationsHistorieController { if(!LocalDateTime.now().isBefore(selectedItem.getAufnahmeDatum())){ Alert alert = new Alert(Alert.AlertType.WARNING); - alert.setTitle("Information Dialog"); + alert.setTitle("Stationsaufenthalt kann nicht entfernt werden!"); alert.setHeaderText(null); - alert.setContentText("I have a great message for you!"); + alert.setContentText("Der Aufenthalt muss in der Zukunft liegen, um gel\u00f6scht werden zu k\u00f6nnen!"); alert.initOwner(btnStatHistCancel.getScene().getWindow()); alert.initModality(Modality.APPLICATION_MODAL); alert.showAndWait(); diff --git a/src/main/resources/log.fxml b/src/main/resources/log.fxml index 8c28bda..e0a1893 100644 --- a/src/main/resources/log.fxml +++ b/src/main/resources/log.fxml @@ -8,6 +8,12 @@ + + + +