From 09940f6ddf8597a56a5a9b5125211f6a1a0d2dff Mon Sep 17 00:00:00 2001
From: Johannes <johannes.oehm@student.uni-luebeck.de>
Date: Thu, 19 Nov 2015 21:51:39 +0100
Subject: [PATCH] Storno Rot

---
 .../java/de/uniluebeck/mi/projmi6/controller/LogController.java   | 8 ++++++--
 .../java/de/uniluebeck/mi/projmi6/controller/MainController.java  | 4 +++-
 .../mi/projmi6/controller/StationsHistorieController.java         | 4 ++--
 src/main/resources/log.fxml                                       | 6 ++++++
 4 files changed, 17 insertions(+), 5 deletions(-)

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("<storniert> "));
+                        Text text = new Text("<storniert> ");
+                        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 @@
 <?import java.net.URL?>
 <VBox minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="de.uniluebeck.mi.projmi6.controller.LogController">
    <children>
+       <ToolBar prefHeight="40.0" prefWidth="200.0">
+           <items>
+               <Pane HBox.hgrow="ALWAYS" />
+               <Button fx:id="btnRefresh" text="Liste aktualisieren"  onAction="#clickedRefresh"/>
+           </items>
+       </ToolBar>
       <TableView fx:id="tblLog" VBox.vgrow="ALWAYS">
         <columns>
           <TableColumn fx:id="colLogIp" editable="false" prefWidth="75.0" text="Ursprungs-IP" />